From 8924e75f3477b20f0ef4e3df64b56bf496b197ae Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jurica.bradaric@avl.com>
Date: Thu, 2 Mar 2017 23:04:57 +0100
Subject: [PATCH 001/257] vim-patch:7.4.2170

Problem:    Cannot get information about timers.
Solution:   Add timer_info().

https://github.com/vim/vim/commit/8e97bd74b5377753597e3d98e7123d8985c7fffd
---
 runtime/doc/eval.txt | 31 +++++++++++++++++++++----
 src/nvim/eval.c      | 55 ++++++++++++++++++++++++++++++++++++++++++++
 src/nvim/eval.lua    |  1 +
 src/nvim/version.c   |  2 +-
 4 files changed, 83 insertions(+), 6 deletions(-)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index e1a8ba079a..37ce0e1b5f 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2297,6 +2297,7 @@ tan({expr})			Float	tangent of {expr}
 tanh({expr})			Float	hyperbolic tangent of {expr}
 tempname()			String	name for a temporary file
 test_garbagecollect_now()	none	free memory right now for testing
+timer_info([{id}])		List	information about timers
 timer_start({time}, {callback} [, {options}])
 				Number	create a timer
 timer_stop({timer})		none	stop a timer
@@ -3198,8 +3199,12 @@ exepath({expr})						*exepath()*
 
 							*exists()*
 exists({expr})	The result is a Number, which is |TRUE| if {expr} is
-		defined, zero otherwise.  The {expr} argument is a string,
-		which contains one of these:
+		defined, zero otherwise.
+
+		For checking for a supported feature use |has()|.
+		For checking if a file exists use |filereadable()|.
+
+		The {expr} argument is a string, which contains one of these:
 			&option-name	Vim option (only checks if it exists,
 					not if it really works)
 			+option-name	Vim option that works.
@@ -3247,7 +3252,6 @@ exists({expr})	The result is a Number, which is |TRUE| if {expr} is
 					event and pattern.
 			##event		autocommand for this event is
 					supported.
-		For checking for a supported feature use |has()|.
 
 		Examples: >
 			exists("&mouse")
@@ -5329,7 +5333,8 @@ matchadd({group}, {pattern}[, {priority}[, {id} [, {dict}]]])
 		available from |getmatches()|.	All matches can be deleted in
 		one operation by |clearmatches()|.
 
-matchaddpos({group}, {pos}[, {priority}[, {id}[, {dict}]]])		*matchaddpos()*
+							*matchaddpos()*
+matchaddpos({group}, {pos}[, {priority}[, {id}[, {dict}]]])
 		Same as |matchadd()|, but requires a list of positions {pos}
 		instead of a pattern. This command is faster than |matchadd()|
 		because it does not require to handle regular expressions and
@@ -7513,6 +7518,22 @@ tanh({expr})						*tanh()*
 <			-0.761594
 
 
+							*timer_info()*
+timer_info([{id}])
+		Return a list with information about timers.
+		When {id} is given only information about this timer is
+		returned.  When timer {id} does not exist an empty list is
+		returned.
+		When {id} is omitted information about all timers is returned.
+
+		For each timer the information is stored in a Dictionary with
+		these items:
+		    "id"	    the timer ID
+		    "time"	    time the timer was started with
+		    "repeat"	    number of times the timer will still fire;
+				    -1 means forever
+		    "callback"	    the callback
+
 							*timer_start()*
 timer_start({time}, {callback} [, {options}])
 		Create a timer and return the timer ID.
@@ -7542,7 +7563,7 @@ timer_start({time}, {callback} [, {options}])
 timer_stop({timer})					*timer_stop()*
 		Stop a timer.  The timer callback will no longer be invoked.
 		{timer} is an ID returned by timer_start(), thus it must be a
-		Number.
+		Number.  If {timer} does not exist there is no error.
 
 tolower({expr})						*tolower()*
 		The result is a copy of the String given, with all uppercase
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index d4daffb469..537e9e696f 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -17931,6 +17931,61 @@ static bool set_ref_in_callback(Callback *callback, int copyID,
   return false;
 }
 
+static void add_timer_info(typval_T *rettv, timer_T *timer)
+{
+  list_T *list = rettv->vval.v_list;
+  dict_T *dict = dict_alloc();
+
+  list_append_dict(list, dict);
+  dict_add_nr_str(dict, "id", (long)timer->timer_id, NULL);
+  dict_add_nr_str(dict, "time", timer->timeout, NULL);
+
+  dict_add_nr_str(dict, "repeat",
+                  (long)(timer->repeat_count < 0 ? -1 : timer->repeat_count),
+                  NULL);
+
+  dictitem_T *di = dictitem_alloc((char_u *)"callback");
+  if (dict_add(dict, di) == FAIL) {
+    xfree(di);
+    return;
+  }
+
+  if (timer->callback.type == kCallbackPartial) {
+    di->di_tv.v_type = VAR_PARTIAL;
+    di->di_tv.vval.v_partial = timer->callback.data.partial;
+    timer->callback.data.partial->pt_refcount++;
+  } else if (timer->callback.type == kCallbackFuncref) {
+    di->di_tv.v_type = VAR_FUNC;
+    di->di_tv.vval.v_string = vim_strsave(timer->callback.data.funcref);
+  }
+  di->di_tv.v_lock = 0;
+}
+
+static void add_timer_info_all(typval_T *rettv)
+{
+  timer_T *timer;
+  map_foreach_value(timers, timer, {
+    add_timer_info(rettv, timer);
+  })
+}
+
+/// "timer_info([timer])" function
+static void f_timer_info(typval_T *argvars, typval_T *rettv, FunPtr fptr)
+{
+  rettv_list_alloc(rettv);
+  if (argvars[0].v_type != VAR_UNKNOWN) {
+    if (argvars[0].v_type != VAR_NUMBER) {
+      EMSG(_(e_number_exp));
+    } else {
+      timer_T *timer = pmap_get(uint64_t)(timers, get_tv_number(&argvars[0]));
+      if (timer != NULL) {
+        add_timer_info(rettv, timer);
+      }
+    }
+  } else {
+    add_timer_info_all(rettv);
+  }
+}
 
 /// "timer_start(timeout, callback, opts)" function
 static void f_timer_start(typval_T *argvars, typval_T *rettv, FunPtr fptr)
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index e3c5981b32..e923fee316 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -306,6 +306,7 @@ return {
     tempname={},
     termopen={args={1, 2}},
     test_garbagecollect_now={},
+    timer_info={args={0,1}},
     timer_start={args={2,3}},
     timer_stop={args=1},
     tolower={args=1},
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 8fd0fce329..b283059c7a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -271,7 +271,7 @@ static int included_patches[] = {
   // 2173,
   // 2172,
   // 2171,
-  // 2170,
+  2170,
   // 2169,
   // 2168 NA
   // 2167 NA

From 5b8ce2feed6b528bae4bceba6f234be000949971 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jurica.bradaric@avl.com>
Date: Sun, 5 Mar 2017 16:25:40 +0100
Subject: [PATCH 002/257] vim-patch:7.4.2180

Problem:    There is no easy way to stop all timers.  There is no way to
            temporary pause a timer.
Solution:   Add timer_stopall() and timer_pause().

https://github.com/vim/vim/commit/b73598e2f022a22fec512ea681c70d2775e8fd87
---
 runtime/doc/eval.txt             | 22 +++++++-
 src/nvim/eval.c                  | 34 +++++++++++--
 src/nvim/eval.lua                |  2 +
 src/nvim/testdir/shared.vim      | 17 +++++++
 src/nvim/testdir/test_timers.vim | 86 ++++++++++++++++++++++++++------
 src/nvim/version.c               |  2 +-
 6 files changed, 141 insertions(+), 22 deletions(-)
 create mode 100644 src/nvim/testdir/shared.vim

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 37ce0e1b5f..8d3bd6aeb7 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1947,7 +1947,7 @@ assert_exception( {error} [, {msg}]) none  assert {error} is in v:exception
 assert_fails( {cmd} [, {error}])     none  assert {cmd} fails
 assert_false({actual} [, {msg}])     none  assert {actual} is false
 assert_inrange({lower}, {upper}, {actual} [, {msg}])
-				none  	assert {actual} is inside the range
+				none	assert {actual} is inside the range
 assert_match( {pat}, {text} [, {msg}]) none  assert {pat} matches {text}
 assert_notequal( {exp}, {act} [, {msg}]) none  assert {exp} is not equal {act}
 assert_notmatch( {pat}, {text} [, {msg}]) none  assert {pat} not matches {text}
@@ -2298,9 +2298,11 @@ tanh({expr})			Float	hyperbolic tangent of {expr}
 tempname()			String	name for a temporary file
 test_garbagecollect_now()	none	free memory right now for testing
 timer_info([{id}])		List	information about timers
+timer_pause({id}, {pause})	none	pause or unpause a timer
 timer_start({time}, {callback} [, {options}])
 				Number	create a timer
 timer_stop({timer})		none	stop a timer
+timer_stopall()			none	stop all timers
 tolower({expr})			String	the String {expr} switched to lowercase
 toupper({expr})			String	the String {expr} switched to uppercase
 tr({src}, {fromstr}, {tostr})	String	translate chars of {src} in {fromstr}
@@ -7534,6 +7536,19 @@ timer_info([{id}])
 				    -1 means forever
 		    "callback"	    the callback
 
+timer_pause({timer}, {paused})				*timer_pause()*
+		Pause or unpause a timer.  A paused timer does not invoke its
+		callback, while the time it would is not changed.  Unpausing a
+		timer may cause the callback to be invoked almost immediately
+		if enough time has passed.
+
+		Pausing a timer is useful to avoid the callback to be called
+		for a short time.
+
+		If {paused} evaluates to a non-zero Number or a non-empty
+		String, then the timer is paused, otherwise it is unpaused.
+		See |non-zero-arg|.
+
 							*timer_start()*
 timer_start({time}, {callback} [, {options}])
 		Create a timer and return the timer ID.
@@ -7565,6 +7580,11 @@ timer_stop({timer})					*timer_stop()*
 		{timer} is an ID returned by timer_start(), thus it must be a
 		Number.  If {timer} does not exist there is no error.
 
+timer_stopall()						*timer_stopall()*
+		Stop all timers.  The timer callbacks will no longer be
+		invoked.  Useful if some timers is misbehaving.  If there are
+		no timers there is no error.
+
 tolower({expr})						*tolower()*
 		The result is a copy of the String given, with all uppercase
 		characters turned into lowercase (just like applying |gu| to
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 537e9e696f..062999e73b 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -446,6 +446,7 @@ typedef struct {
   int refcount;
   long timeout;
   bool stopped;
+  bool paused;
   Callback callback;
 } timer_T;
 
@@ -17939,6 +17940,7 @@ static void add_timer_info(typval_T *rettv, timer_T *timer)
   list_append_dict(list, dict);
   dict_add_nr_str(dict, "id", (long)timer->timer_id, NULL);
   dict_add_nr_str(dict, "time", timer->timeout, NULL);
+  dict_add_nr_str(dict, "paused", (long)timer->paused, NULL);
 
   dict_add_nr_str(dict, "repeat",
                   (long)(timer->repeat_count < 0 ? -1 : timer->repeat_count),
@@ -17965,7 +17967,9 @@ static void add_timer_info_all(typval_T *rettv)
 {
   timer_T *timer;
   map_foreach_value(timers, timer, {
-    add_timer_info(rettv, timer);
+    if (!timer->stopped) {
+      add_timer_info(rettv, timer);
+    }
   })
 }
 
@@ -17978,7 +17982,7 @@ static void f_timer_info(typval_T *argvars, typval_T *rettv, FunPtr fptr)
       EMSG(_(e_number_exp));
     } else {
       timer_T *timer = pmap_get(uint64_t)(timers, get_tv_number(&argvars[0]));
-      if (timer != NULL) {
+      if (timer != NULL && !timer->stopped) {
         add_timer_info(rettv, timer);
       }
     }
@@ -17987,6 +17991,20 @@ static void f_timer_info(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   }
 }
 
+/// "timer_pause(timer, paused)" function
+static void f_timer_pause(typval_T *argvars, typval_T *unused, FunPtr fptr)
+{
+  if (argvars[0].v_type != VAR_NUMBER) {
+    EMSG(_(e_number_exp));
+  } else {
+    int paused = (bool)get_tv_number(&argvars[1]);
+    timer_T *timer = pmap_get(uint64_t)(timers, get_tv_number(&argvars[0]));
+    if (timer != NULL) {
+      timer->paused = paused;
+    }
+  }
+}
+
 /// "timer_start(timeout, callback, opts)" function
 static void f_timer_start(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
@@ -18019,6 +18037,7 @@ static void f_timer_start(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   timer = xmalloc(sizeof *timer);
   timer->refcount = 1;
   timer->stopped = false;
+  timer->paused = false;
   timer->repeat_count = repeat;
   timer->timeout = timeout;
   timer->timer_id = last_timer_id++;
@@ -18028,8 +18047,7 @@ static void f_timer_start(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   timer->tw.events = multiqueue_new_child(main_loop.events);
   // if main loop is blocked, don't queue up multiple events
   timer->tw.blockable = true;
-  time_watcher_start(&timer->tw, timer_due_cb, timeout,
-                     timeout * (repeat != 1));
+  time_watcher_start(&timer->tw, timer_due_cb, timeout, timeout);
 
   pmap_put(uint64_t)(timers, timer->timer_id, timer);
   rettv->vval.v_number = timer->timer_id;
@@ -18053,13 +18071,19 @@ static void f_timer_stop(typval_T *argvars, typval_T *rettv, FunPtr fptr)
     timer_stop(timer);
 }
 
+static void f_timer_stopall(typval_T *argvars, typval_T *unused, FunPtr fptr)
+{
+  timer_teardown();
+}
+
 // invoked on the main loop
 static void timer_due_cb(TimeWatcher *tw, void *data)
 {
   timer_T *timer = (timer_T *)data;
-  if (timer->stopped) {
+  if (timer->stopped || timer->paused) {
     return;
   }
+
   timer->refcount++;
   // if repeat was negative repeat forever
   if (timer->repeat_count >= 0 && --timer->repeat_count == 0) {
diff --git a/src/nvim/eval.lua b/src/nvim/eval.lua
index e923fee316..d30d34135b 100644
--- a/src/nvim/eval.lua
+++ b/src/nvim/eval.lua
@@ -307,8 +307,10 @@ return {
     termopen={args={1, 2}},
     test_garbagecollect_now={},
     timer_info={args={0,1}},
+    timer_pause={args=2},
     timer_start={args={2,3}},
     timer_stop={args=1},
+    timer_stopall={args=0},
     tolower={args=1},
     toupper={args=1},
     tr={args=3},
diff --git a/src/nvim/testdir/shared.vim b/src/nvim/testdir/shared.vim
new file mode 100644
index 0000000000..9573f5a9c3
--- /dev/null
+++ b/src/nvim/testdir/shared.vim
@@ -0,0 +1,17 @@
+" Functions shared by several tests.
+
+" Wait for up to a second for "expr" to become true.
+" Return time slept in milliseconds.
+func WaitFor(expr)
+  let slept = 0
+  for i in range(100)
+    try
+      if eval(a:expr)
+       return slept
+      endif
+    catch
+    endtry
+    let slept += 10
+    sleep 10m
+  endfor
+endfunc
diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim
index 56f9feef66..b03295bd01 100644
--- a/src/nvim/testdir/test_timers.vim
+++ b/src/nvim/testdir/test_timers.vim
@@ -4,8 +4,10 @@ if !has('timers')
   finish
 endif
 
+source shared.vim
+
 func MyHandler(timer)
-  let s:val += 1
+  let g:val += 1
 endfunc
 
 func MyHandlerWithLists(lists, timer)
@@ -13,44 +15,98 @@ func MyHandlerWithLists(lists, timer)
 endfunc
 
 func Test_oneshot()
-  let s:val = 0
+  let g:val = 0
   let timer = timer_start(50, 'MyHandler')
-  sleep 200m
-  call assert_equal(1, s:val)
+  let slept = WaitFor('g:val == 1')
+  call assert_equal(1, g:val)
+  call assert_inrange(30, 100, slept)
 endfunc
 
 func Test_repeat_three()
-  let s:val = 0
+  let g:val = 0
   let timer = timer_start(50, 'MyHandler', {'repeat': 3})
-  sleep 500m
-  call assert_equal(3, s:val)
+  let slept = WaitFor('g:val == 3')
+  call assert_equal(3, g:val)
+  call assert_inrange(100, 250, slept)
 endfunc
 
 func Test_repeat_many()
-  let s:val = 0
+  let g:val = 0
   let timer = timer_start(50, 'MyHandler', {'repeat': -1})
   sleep 200m
   call timer_stop(timer)
-  call assert_true(s:val > 1)
-  call assert_true(s:val < 5)
+  call assert_inrange(2, 4, g:val)
 endfunc
 
 func Test_with_partial_callback()
-  let s:val = 0
+  let g:val = 0
   let s:meow = {}
   function s:meow.bite(...)
-    let s:val += 1
+    let g:val += 1
   endfunction
 
   call timer_start(50, s:meow.bite)
-  sleep 200m
-  call assert_equal(1, s:val)
+  let slept = WaitFor('g:val == 1')
+  call assert_equal(1, g:val)
+  call assert_inrange(30, 100, slept)
 endfunc
 
 func Test_retain_partial()
-  call timer_start(100, function('MyHandlerWithLists', [['a']]))
+  call timer_start(50, function('MyHandlerWithLists', [['a']]))
   call garbagecollect()
+  sleep 100m
+endfunc
+
+func Test_info()
+  let id = timer_start(1000, 'MyHandler')
+  let info = timer_info(id)
+  call assert_equal(id, info[0]['id'])
+  call assert_equal(1000, info[0]['time'])
+  call assert_equal("function('MyHandler')", string(info[0]['callback']))
+
+  let found = 0
+  for info in timer_info()
+    if info['id'] == id
+      let found += 1
+    endif
+  endfor
+  call assert_equal(1, found)
+
+  call timer_stop(id)
+  call assert_equal([], timer_info(id))
+endfunc
+
+func Test_stopall()
+  let id1 = timer_start(1000, 'MyHandler')
+  let id2 = timer_start(2000, 'MyHandler')
+  let info = timer_info()
+  call assert_equal(2, len(info))
+
+  call timer_stopall()
+  let info = timer_info()
+  call assert_equal(0, len(info))
+endfunc
+
+func Test_paused()
+  let g:val = 0
+
+  let id = timer_start(50, 'MyHandler')
+  let info = timer_info(id)
+  call assert_equal(0, info[0]['paused'])
+
+  call timer_pause(id, 1)
+  let info = timer_info(id)
+  call assert_equal(1, info[0]['paused'])
   sleep 200m
+  call assert_equal(0, g:val)
+
+  call timer_pause(id, 0)
+  let info = timer_info(id)
+  call assert_equal(0, info[0]['paused'])
+
+  let slept = WaitFor('g:val == 1')
+  call assert_equal(1, g:val)
+  call assert_inrange(0, 10, slept)
 endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/nvim/version.c b/src/nvim/version.c
index b283059c7a..4da970d43b 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -261,7 +261,7 @@ static int included_patches[] = {
   2183,
   // 2182 NA
   // 2181,
-  // 2180,
+  2180,
   // 2179,
   // 2178,
   // 2177,

From 420a9955fa969ee0460f41798c60c1374476fd08 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jurica.bradaric@avl.com>
Date: Mon, 6 Mar 2017 07:15:19 +0100
Subject: [PATCH 003/257] version.c: Mark 7.4.2171 and 7.4.2181 as NA.

---
 src/nvim/version.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nvim/version.c b/src/nvim/version.c
index 4da970d43b..0bf0f10b56 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -260,7 +260,7 @@ static int included_patches[] = {
   // 2184,
   2183,
   // 2182 NA
-  // 2181,
+  // 2181 NA
   2180,
   // 2179,
   // 2178,
@@ -270,7 +270,7 @@ static int included_patches[] = {
   2174,
   // 2173,
   // 2172,
-  // 2171,
+  // 2171 NA
   2170,
   // 2169,
   // 2168 NA

From 5c2f1e29e3dfdfab8c2a9b31962d9cc12c171e46 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Mon, 20 Mar 2017 20:52:54 +0100
Subject: [PATCH 004/257] vim-patch:7.4.2240

Problem:    Tests using the sleep time can be flaky.
Solution:   Use reltime() if available. (Partly by Shane Harper)

https://github.com/vim/vim/commit/f267f8bdf777073e392ada5b31d837c7b6090eb4
---
 src/nvim/testdir/shared.vim      | 21 ++++++++++++++++-----
 src/nvim/testdir/test_timers.vim | 24 ++++++++++++++++++++----
 src/nvim/version.c               |  2 +-
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/nvim/testdir/shared.vim b/src/nvim/testdir/shared.vim
index 9573f5a9c3..1138ceba4d 100644
--- a/src/nvim/testdir/shared.vim
+++ b/src/nvim/testdir/shared.vim
@@ -1,17 +1,28 @@
 " Functions shared by several tests.
 
-" Wait for up to a second for "expr" to become true.
-" Return time slept in milliseconds.
+" Return time slept in milliseconds.  With the +reltime feature this can be
+" more than the actual waiting time.  Without +reltime it can also be less.
 func WaitFor(expr)
-  let slept = 0
+  " using reltime() is more accurate, but not always available
+  if has('reltime')
+    let start = reltime()
+  else
+    let slept = 0
+  endif
   for i in range(100)
     try
       if eval(a:expr)
-       return slept
+        if has('reltime')
+          return float2nr(reltimefloat(reltime(start)) * 1000)
+        endif
+        return slept
       endif
     catch
     endtry
-    let slept += 10
+    if !has('reltime')
+      let slept += 10
+    endif
     sleep 10m
   endfor
+  return 1000
 endfunc
diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim
index b03295bd01..2a5fa5c662 100644
--- a/src/nvim/testdir/test_timers.vim
+++ b/src/nvim/testdir/test_timers.vim
@@ -19,7 +19,11 @@ func Test_oneshot()
   let timer = timer_start(50, 'MyHandler')
   let slept = WaitFor('g:val == 1')
   call assert_equal(1, g:val)
-  call assert_inrange(30, 100, slept)
+  if has('reltime')
+    call assert_inrange(50, 100, slept)
+  else
+    call assert_inrange(20, 100, slept)
+  endif
 endfunc
 
 func Test_repeat_three()
@@ -27,7 +31,11 @@ func Test_repeat_three()
   let timer = timer_start(50, 'MyHandler', {'repeat': 3})
   let slept = WaitFor('g:val == 3')
   call assert_equal(3, g:val)
-  call assert_inrange(100, 250, slept)
+  if has('reltime')
+    call assert_inrange(150, 200, slept)
+  else
+    call assert_inrange(80, 200, slept)
+  endif
 endfunc
 
 func Test_repeat_many()
@@ -48,7 +56,11 @@ func Test_with_partial_callback()
   call timer_start(50, s:meow.bite)
   let slept = WaitFor('g:val == 1')
   call assert_equal(1, g:val)
-  call assert_inrange(30, 100, slept)
+  if has('reltime')
+    call assert_inrange(50, 100, slept)
+  else
+    call assert_inrange(20, 100, slept)
+  endif
 endfunc
 
 func Test_retain_partial()
@@ -106,7 +118,11 @@ func Test_paused()
 
   let slept = WaitFor('g:val == 1')
   call assert_equal(1, g:val)
-  call assert_inrange(0, 10, slept)
+  if has('reltime')
+    call assert_inrange(0, 30, slept)
+  else
+    call assert_inrange(0, 10, slept)
+  endif
 endfunc
 
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 0bf0f10b56..ef6c9d1454 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -201,7 +201,7 @@ static int included_patches[] = {
   // 2243 NA
   // 2242,
   // 2241,
-  // 2240,
+  2240,
   // 2239,
   // 2238 NA
   2237,

From 3558f89d22faad613e0049592d2187ad35f5bec8 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Mon, 20 Mar 2017 21:11:24 +0100
Subject: [PATCH 005/257] vim-patch:7.4.2241

Problem:    Timer test sometimes fails.
Solution:   Increase the maximum time for repeating timer.

https://github.com/vim/vim/commit/973365dcc40a41e6b72ece56f15cebfee69b1329
---
 src/nvim/testdir/test_timers.vim | 2 +-
 src/nvim/version.c               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim
index 2a5fa5c662..8829b5de59 100644
--- a/src/nvim/testdir/test_timers.vim
+++ b/src/nvim/testdir/test_timers.vim
@@ -32,7 +32,7 @@ func Test_repeat_three()
   let slept = WaitFor('g:val == 3')
   call assert_equal(3, g:val)
   if has('reltime')
-    call assert_inrange(150, 200, slept)
+    call assert_inrange(150, 250, slept)
   else
     call assert_inrange(80, 200, slept)
   endif
diff --git a/src/nvim/version.c b/src/nvim/version.c
index ef6c9d1454..b7516e443a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -200,7 +200,7 @@ static int included_patches[] = {
   // 2244,
   // 2243 NA
   // 2242,
-  // 2241,
+  2241,
   2240,
   // 2239,
   // 2238 NA

From 4f69a8fb8854698adb2de8956ad0d86ff35a6f68 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Mon, 20 Mar 2017 21:12:31 +0100
Subject: [PATCH 006/257] vim-patch:7.4.2242

Problem:    Timer test sometimes fails.
Solution:   Increase the maximum time for callback timer test.

https://github.com/vim/vim/commit/17f1347b867cbcc0ce380bf9a2466b4c31896f04
---
 src/nvim/testdir/test_timers.vim | 2 +-
 src/nvim/version.c               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim
index 8829b5de59..db10f351ae 100644
--- a/src/nvim/testdir/test_timers.vim
+++ b/src/nvim/testdir/test_timers.vim
@@ -57,7 +57,7 @@ func Test_with_partial_callback()
   let slept = WaitFor('g:val == 1')
   call assert_equal(1, g:val)
   if has('reltime')
-    call assert_inrange(50, 100, slept)
+    call assert_inrange(50, 130, slept)
   else
     call assert_inrange(20, 100, slept)
   endif
diff --git a/src/nvim/version.c b/src/nvim/version.c
index b7516e443a..91c37658aa 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -199,7 +199,7 @@ static int included_patches[] = {
   // 2245,
   // 2244,
   // 2243 NA
-  // 2242,
+  2242,
   2241,
   2240,
   // 2239,

From 6a6bbbc6d8fa79a0c14fb913baa3ba2d7046419c Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Thu, 6 Apr 2017 08:54:30 -0400
Subject: [PATCH 007/257] vim-patch:7.4.2281

Problem:    Timer test fails sometimes.
Solution:   Reduce minimum time by 1 msec.

https://github.com/vim/vim/commit/0426bae2abede764d0dd366a28663d1c6e6ab0fe
---
 src/nvim/testdir/test_timers.vim | 6 +++---
 src/nvim/version.c               | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim
index db10f351ae..16c70b166b 100644
--- a/src/nvim/testdir/test_timers.vim
+++ b/src/nvim/testdir/test_timers.vim
@@ -20,7 +20,7 @@ func Test_oneshot()
   let slept = WaitFor('g:val == 1')
   call assert_equal(1, g:val)
   if has('reltime')
-    call assert_inrange(50, 100, slept)
+    call assert_inrange(49, 100, slept)
   else
     call assert_inrange(20, 100, slept)
   endif
@@ -32,7 +32,7 @@ func Test_repeat_three()
   let slept = WaitFor('g:val == 3')
   call assert_equal(3, g:val)
   if has('reltime')
-    call assert_inrange(150, 250, slept)
+    call assert_inrange(149, 250, slept)
   else
     call assert_inrange(80, 200, slept)
   endif
@@ -57,7 +57,7 @@ func Test_with_partial_callback()
   let slept = WaitFor('g:val == 1')
   call assert_equal(1, g:val)
   if has('reltime')
-    call assert_inrange(50, 130, slept)
+    call assert_inrange(49, 130, slept)
   else
     call assert_inrange(20, 100, slept)
   endif
diff --git a/src/nvim/version.c b/src/nvim/version.c
index ca520c7af5..3944551cb4 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -160,7 +160,7 @@ static const int included_patches[] = {
   2284,
   2283,
   // 2282 NA
-  // 2281 NA
+  2281,
   2280,
   2279,
   // 2278 NA

From 0f99645b8faf3e5970e46c185c0cbbd7a9cfe318 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Thu, 6 Apr 2017 08:55:51 -0400
Subject: [PATCH 008/257] vim-patch:7.4.2304

Problem:    In a timer callback the timer itself can't be found or stopped.
            (Thinca)
Solution:   Do not remove the timer from the list, remember whether it was
            freed.

https://github.com/vim/vim/commit/417ccd7138d4d230d328de8b0d3892dd82ff1bee
---
 src/nvim/testdir/test_timers.vim | 15 +++++++++++++++
 src/nvim/version.c               |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim
index 16c70b166b..6a8b09c898 100644
--- a/src/nvim/testdir/test_timers.vim
+++ b/src/nvim/testdir/test_timers.vim
@@ -125,4 +125,19 @@ func Test_paused()
   endif
 endfunc
 
+func StopMyself(timer)
+  let g:called += 1
+  if g:called == 2
+    call timer_stop(a:timer)
+  endif
+endfunc
+
+func Test_delete_myself()
+  let g:called = 0
+  let t = timer_start(10, 'StopMyself', {'repeat': -1})
+  call WaitFor('g:called == 2')
+  call assert_equal(2, g:called)
+  call assert_equal([], timer_info(t))
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 3944551cb4..beb23090ec 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -137,7 +137,7 @@ static const int included_patches[] = {
   2307,
   2306,
   2305,
-  // 2304 NA
+  2304,
   2303,
   // 2302 NA
   // 2301 NA

From 9edbeec07716cff5607202dbd20b81917416030f Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Thu, 6 Apr 2017 08:56:53 -0400
Subject: [PATCH 009/257] vim-patch:7.4.2332

Problem:    Crash when stop_timer() is called in a callback of a callback.
            Vim hangs when the timer callback uses too much time.
Solution:   Set tr_id to -1 when a timer is to be deleted. Don't keep calling
            callbacks forever. (Ozaki Kiichi)

https://github.com/vim/vim/commit/75537a93e985ef32e6c267b06ce93629855dd983
---
 src/nvim/testdir/test_timers.vim | 30 ++++++++++++++++++++++++++++++
 src/nvim/version.c               |  2 +-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim
index 6a8b09c898..2a768585ce 100644
--- a/src/nvim/testdir/test_timers.vim
+++ b/src/nvim/testdir/test_timers.vim
@@ -140,4 +140,34 @@ func Test_delete_myself()
   call assert_equal([], timer_info(t))
 endfunc
 
+func StopTimer1(timer)
+  let g:timer2 = timer_start(10, 'StopTimer2')
+  " avoid maxfuncdepth error
+  call timer_pause(g:timer1, 1)
+  sleep 40m
+endfunc
+
+func StopTimer2(timer)
+  call timer_stop(g:timer1)
+endfunc
+
+func Test_stop_in_callback()
+  let g:timer1 = timer_start(10, 'StopTimer1')
+  sleep 40m
+endfunc
+
+func StopTimerAll(timer)
+  call timer_stopall()
+endfunc
+
+func Test_stop_all_in_callback()
+  let g:timer1 = timer_start(10, 'StopTimerAll')
+  let info = timer_info()
+  call assert_equal(1, len(info))
+  sleep 40m
+  let info = timer_info()
+  call assert_equal(0, len(info))
+endfunc
+
+
 " vim: shiftwidth=2 sts=2 expandtab
diff --git a/src/nvim/version.c b/src/nvim/version.c
index beb23090ec..d16eab7201 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -109,7 +109,7 @@ static const int included_patches[] = {
   2335,
   2334,
   2333,
-  // 2332 NA
+  2332,
   2331,
   2330,
   2329,

From 071f2da66bacfd5a2d4ab87bda275d3848ddcc0e Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Thu, 6 Apr 2017 08:58:18 -0400
Subject: [PATCH 010/257] vim-patch:7.4.2359

Problem:    Memory leak in timer_start().
Solution:   Check the right field to be NULL.

https://github.com/vim/vim/commit/26fe0d56912e42c2b16a61b2480e19ba569aee98
---
 src/nvim/testdir/test_timers.vim | 8 ++++----
 src/nvim/version.c               | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim
index 2a768585ce..fd2b50b495 100644
--- a/src/nvim/testdir/test_timers.vim
+++ b/src/nvim/testdir/test_timers.vim
@@ -48,12 +48,12 @@ endfunc
 
 func Test_with_partial_callback()
   let g:val = 0
-  let s:meow = {}
-  function s:meow.bite(...)
-    let g:val += 1
+  let meow = {'one': 1}
+  function meow.bite(...)
+    let g:val += self.one
   endfunction
 
-  call timer_start(50, s:meow.bite)
+  call timer_start(50, meow.bite)
   let slept = WaitFor('g:val == 1')
   call assert_equal(1, g:val)
   if has('reltime')
diff --git a/src/nvim/version.c b/src/nvim/version.c
index d16eab7201..9a5d7ce169 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -82,7 +82,7 @@ static const int included_patches[] = {
   2362,
   // 2361 NA
   // 2360,
-  // 2359 NA
+  2359,
   // 2358 NA
   2357,
   // 2356,

From 19044a15f9d41a7424e94fb3f0e257537e7afa5e Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Thu, 6 Apr 2017 21:21:11 +0300
Subject: [PATCH 011/257] strings: Replace vim_strchr implementation with a
 saner one

Removes dead code (enc_utf8, enc_dbcs and has_mbyte now have hardcoded values),
relies on libc implementation being more optimized. Also where previously
negative character just would never be found it is an assertion error now.

Ref #1476
---
 src/nvim/strings.c | 64 ++++++++++++++--------------------------------
 1 file changed, 19 insertions(+), 45 deletions(-)

diff --git a/src/nvim/strings.c b/src/nvim/strings.c
index 5dcffe00e0..c4bc9b204a 100644
--- a/src/nvim/strings.c
+++ b/src/nvim/strings.c
@@ -401,54 +401,28 @@ int vim_strnicmp(const char *s1, const char *s2, size_t len)
 }
 #endif
 
-/*
- * Version of strchr() and strrchr() that handle unsigned char strings
- * with characters from 128 to 255 correctly.  It also doesn't return a
- * pointer to the NUL at the end of the string.
- */
-char_u *vim_strchr(const char_u *string, int c)
-  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_PURE
+/// strchr() version which handles multibyte strings
+///
+/// @param[in]  string  String to search in.
+/// @param[in]  c  Character to search for. Must be a valid character.
+///
+/// @return Pointer to the first byte of the found character in string or NULL
+///         if it was not found. NUL character is never found, use `strlen()`
+///         instead.
+char_u *vim_strchr(const char_u *const string, const int c)
+  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
 {
-  int b;
-
-  const char_u *p = string;
-  if (enc_utf8 && c >= 0x80) {
-    while (*p != NUL) {
-      int l = (*mb_ptr2len)(p);
-
-      // Avoid matching an illegal byte here.
-      if (l > 1 && utf_ptr2char(p) == c) {
-        return (char_u *) p;
-      }
-      p += l;
-    }
+  assert(c >= 0);
+  if (c == 0) {
     return NULL;
+  } else if (c < 0x80) {
+    return (char_u *)strchr((const char *)string, c);
+  } else {
+    char u8char[MB_MAXBYTES + 1];
+    const int len = utf_char2bytes(c, (char_u *)u8char);
+    u8char[len] = NUL;
+    return (char_u *)strstr((const char *)string, u8char);
   }
-  if (enc_dbcs != 0 && c > 255) {
-    int n2 = c & 0xff;
-
-    c = ((unsigned)c >> 8) & 0xff;
-    while ((b = *p) != NUL) {
-      if (b == c && p[1] == n2)
-        return (char_u *) p;
-      p += (*mb_ptr2len)(p);
-    }
-    return NULL;
-  }
-  if (has_mbyte) {
-    while ((b = *p) != NUL) {
-      if (b == c)
-        return (char_u *) p;
-      p += (*mb_ptr2len)(p);
-    }
-    return NULL;
-  }
-  while ((b = *p) != NUL) {
-    if (b == c)
-      return (char_u *) p;
-    ++p;
-  }
-  return NULL;
 }
 
 /*

From 171baaee93c8e257ef593b30c05405d03ac30c96 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Thu, 6 Apr 2017 21:31:37 +0300
Subject: [PATCH 012/257] strings: Remove vim_strbyte

Ref #1476
---
 src/nvim/ex_cmds.c    | 13 ++++++-------
 src/nvim/getchar.c    |  4 ++--
 src/nvim/mbyte.c      |  6 +++---
 src/nvim/regexp.c     | 42 +++++++++++++++---------------------------
 src/nvim/regexp_nfa.c | 13 +++----------
 src/nvim/strings.c    | 18 ------------------
 6 files changed, 29 insertions(+), 67 deletions(-)

diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 9a847a4c0a..8485a1ca66 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -5087,14 +5087,13 @@ static void helptags_one(char_u *dir, char_u *ext, char_u *tagfname,
       }
       p1 = vim_strchr(IObuff, '*');             /* find first '*' */
       while (p1 != NULL) {
-        /* Use vim_strbyte() instead of vim_strchr() so that when
-         * 'encoding' is dbcs it still works, don't find '*' in the
-         * second byte. */
-        p2 = vim_strbyte(p1 + 1, '*');          /* find second '*' */
-        if (p2 != NULL && p2 > p1 + 1) {        /* skip "*" and "**" */
-          for (s = p1 + 1; s < p2; ++s)
-            if (*s == ' ' || *s == '\t' || *s == '|')
+        p2 = (char_u *)strchr((const char *)p1 + 1, '*');  // Find second '*'.
+        if (p2 != NULL && p2 > p1 + 1) {  // Skip "*" and "**".
+          for (s = p1 + 1; s < p2; s++) {
+            if (*s == ' ' || *s == '\t' || *s == '|') {
               break;
+            }
+          }
 
           /*
            * Only accept a *tag* when it consists of valid
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index b83681ad01..56493a300d 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -3588,8 +3588,8 @@ int check_abbr(int c, char_u *ptr, int col, int mincol)
       char_u *q = mp->m_keys;
       int match;
 
-      if (vim_strbyte(mp->m_keys, K_SPECIAL) != NULL) {
-        /* might have CSI escaped mp->m_keys */
+      if (strchr((const char *)mp->m_keys, K_SPECIAL) != NULL) {
+        // Might have CSI escaped mp->m_keys.
         q = vim_strsave(mp->m_keys);
         vim_unescape_csi(q);
         qlen = (int)STRLEN(q);
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index d96848754c..c31fee44af 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -356,10 +356,10 @@ int bomb_size(void)
  */
 void remove_bom(char_u *s)
 {
-  char_u *p = s;
+  char *p = (char *)s;
 
-  while ((p = vim_strbyte(p, 0xef)) != NULL) {
-    if (p[1] == 0xbb && p[2] == 0xbf) {
+  while ((p = strchr(p, 0xef)) != NULL) {
+    if ((uint8_t)p[1] == 0xbb && (uint8_t)p[2] == 0xbf) {
       STRMOVE(p, p + 3);
     } else {
       p++;
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 9baa53d2a2..e9c9b491fd 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -3429,32 +3429,26 @@ static long bt_regexec_both(char_u *line,
       c = *prog->regmust;
     s = line + col;
 
-    /*
-     * This is used very often, esp. for ":global".  Use three versions of
-     * the loop to avoid overhead of conditions.
-     */
-    if (!ireg_ic
-        && !has_mbyte
-        )
-      while ((s = vim_strbyte(s, c)) != NULL) {
-        if (cstrncmp(s, prog->regmust, &prog->regmlen) == 0)
-          break;                        /* Found it. */
-        ++s;
-      }
-    else if (!ireg_ic || (!enc_utf8 && mb_char2len(c) > 1))
+    // This is used very often, esp. for ":global".  Use two versions of
+    // the loop to avoid overhead of conditions.
+    if (!ireg_ic) {
       while ((s = vim_strchr(s, c)) != NULL) {
-        if (cstrncmp(s, prog->regmust, &prog->regmlen) == 0)
-          break;                        /* Found it. */
+        if (cstrncmp(s, prog->regmust, &prog->regmlen) == 0) {
+          break;  // Found it.
+        }
         mb_ptr_adv(s);
       }
-    else
+    } else {
       while ((s = cstrchr(s, c)) != NULL) {
-        if (cstrncmp(s, prog->regmust, &prog->regmlen) == 0)
-          break;                        /* Found it. */
+        if (cstrncmp(s, prog->regmust, &prog->regmlen) == 0) {
+          break;  // Found it.
+        }
         mb_ptr_adv(s);
       }
-    if (s == NULL)              /* Not present. */
+    }
+    if (s == NULL) {  // Not present.
       goto theend;
+    }
   }
 
   regline = line;
@@ -3484,14 +3478,8 @@ static long bt_regexec_both(char_u *line,
     /* Messy cases:  unanchored match. */
     while (!got_int) {
       if (prog->regstart != NUL) {
-        /* Skip until the char we know it must start with.
-         * Used often, do some work to avoid call overhead. */
-        if (!ireg_ic
-            && !has_mbyte
-            )
-          s = vim_strbyte(regline + col, prog->regstart);
-        else
-          s = cstrchr(regline + col, prog->regstart);
+        // Skip until the char we know it must start with.
+        s = cstrchr(regline + col, prog->regstart);
         if (s == NULL) {
           retval = 0;
           break;
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c
index 5b49ab38f0..a77978884e 100644
--- a/src/nvim/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
@@ -4855,17 +4855,10 @@ static int failure_chance(nfa_state_T *state, int depth)
  */
 static int skip_to_start(int c, colnr_T *colp)
 {
-  char_u *s;
-
-  /* Used often, do some work to avoid call overhead. */
-  if (!ireg_ic
-      && !has_mbyte
-      )
-    s = vim_strbyte(regline + *colp, c);
-  else
-    s = cstrchr(regline + *colp, c);
-  if (s == NULL)
+  const char_u *const s = cstrchr(regline + *colp, c);
+  if (s == NULL) {
     return FAIL;
+  }
   *colp = (int)(s - regline);
   return OK;
 }
diff --git a/src/nvim/strings.c b/src/nvim/strings.c
index c4bc9b204a..ada4c108cf 100644
--- a/src/nvim/strings.c
+++ b/src/nvim/strings.c
@@ -425,24 +425,6 @@ char_u *vim_strchr(const char_u *const string, const int c)
   }
 }
 
-/*
- * Version of strchr() that only works for bytes and handles unsigned char
- * strings with characters above 128 correctly. It also doesn't return a
- * pointer to the NUL at the end of the string.
- */
-char_u *vim_strbyte(const char_u *string, int c)
-  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_PURE
-{
-  const char_u *p = string;
-
-  while (*p != NUL) {
-    if (*p == c)
-      return (char_u *) p;
-    ++p;
-  }
-  return NULL;
-}
-
 /*
  * Search for last occurrence of "c" in "string".
  * Return NULL if not found.

From ac1cb1c72fa762b39ff457153c7fa6ecf1eaedc3 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Thu, 6 Apr 2017 21:56:49 +0300
Subject: [PATCH 013/257] regexp: Refactor cstrchr

Ref #1476
---
 src/nvim/regexp.c | 59 ++++++++++++++++++++++-------------------------
 1 file changed, 27 insertions(+), 32 deletions(-)

diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index e9c9b491fd..175aa1b970 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -6287,43 +6287,38 @@ static int cstrncmp(char_u *s1, char_u *s2, int *n)
 /*
  * cstrchr: This function is used a lot for simple searches, keep it fast!
  */
-static char_u *cstrchr(char_u *s, int c)
+static inline char_u *cstrchr(const char_u *const s, const int c)
+  FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
+  FUNC_ATTR_ALWAYS_INLINE
 {
-  char_u      *p;
-  int cc;
-
-  if (!ireg_ic
-      || (!enc_utf8 && mb_char2len(c) > 1)
-      )
+  if (!ireg_ic) {
     return vim_strchr(s, c);
+  }
 
-  /* tolower() and toupper() can be slow, comparing twice should be a lot
-   * faster (esp. when using MS Visual C++!).
-   * For UTF-8 need to use folded case. */
-  if (enc_utf8 && c > 0x80)
-    cc = utf_fold(c);
-  else if (vim_isupper(c))
-    cc = vim_tolower(c);
-  else if (vim_islower(c))
-    cc = vim_toupper(c);
-  else
-    return vim_strchr(s, c);
-
-  if (has_mbyte) {
-    for (p = s; *p != NUL; p += (*mb_ptr2len)(p)) {
-      if (enc_utf8 && c > 0x80) {
-        if (utf_fold(utf_ptr2char(p)) == cc)
-          return p;
-      } else if (*p == c || *p == cc)
-        return p;
+  // tolower() and toupper() can be slow, comparing twice should be a lot
+  // faster (esp. when using MS Visual C++!).
+  // For UTF-8 need to use folded case.
+  if (c > 0x80) {
+    const int folded_c = utf_fold(c);
+    for (const char_u *p = s; *p != NUL; p += utfc_ptr2len(p)) {
+      if (utf_fold(utf_ptr2char(p)) == folded_c) {
+        return (char_u *)p;
+      }
     }
-  } else
-    /* Faster version for when there are no multi-byte characters. */
-    for (p = s; *p != NUL; ++p)
-      if (*p == c || *p == cc)
-        return p;
+    return NULL;
+  }
 
-  return NULL;
+  int cc;
+  if (vim_isupper(c)) {
+    cc = vim_tolower(c);
+  } else if (vim_islower(c)) {
+    cc = vim_toupper(c);
+  } else {
+    return vim_strchr(s, c);
+  }
+
+  char tofind[] = { (char)c, (char)cc, NUL };
+  return (char_u *)strpbrk((const char *)s, tofind);
 }
 
 /***************************************************************

From caeff6e1aff227bb5826ad575362d2a24adebaa9 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Fri, 7 Apr 2017 23:18:36 +0300
Subject: [PATCH 014/257] regexp: Do not use locale-dependent functions in
 cstrchr

---
 src/nvim/regexp.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 175aa1b970..893089f06d 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -6309,10 +6309,10 @@ static inline char_u *cstrchr(const char_u *const s, const int c)
   }
 
   int cc;
-  if (vim_isupper(c)) {
-    cc = vim_tolower(c);
-  } else if (vim_islower(c)) {
-    cc = vim_toupper(c);
+  if (ASCII_ISUPPER(c)) {
+    cc = TOLOWER_ASC(c);
+  } else if (ASCII_ISLOWER(c)) {
+    cc = TOUPPER_ASC(c);
   } else {
     return vim_strchr(s, c);
   }

From acc52a953b99f78435c34337b8ca9b6716a057a1 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 8 Apr 2017 02:55:51 +0300
Subject: [PATCH 015/257] regexp: Update comment in cstrchr()

---
 src/nvim/regexp.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 893089f06d..96884aa87f 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -6295,9 +6295,8 @@ static inline char_u *cstrchr(const char_u *const s, const int c)
     return vim_strchr(s, c);
   }
 
-  // tolower() and toupper() can be slow, comparing twice should be a lot
-  // faster (esp. when using MS Visual C++!).
-  // For UTF-8 need to use folded case.
+  // Use folded case for UTF-8, slow! For ASCII use libc strpbrk which is
+  // expected to be highly optimized.
   if (c > 0x80) {
     const int folded_c = utf_fold(c);
     for (const char_u *p = s; *p != NUL; p += utfc_ptr2len(p)) {

From ebfcf2fa386853b39f6d8b9541cbe41fdc3e4009 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 10 Apr 2017 13:24:31 +0300
Subject: [PATCH 016/257] scripts: Create script which checks Neovim with
 PVS-studio

---
 scripts/pvscheck.sh | 96 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100755 scripts/pvscheck.sh

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
new file mode 100755
index 0000000000..0a3d7486f2
--- /dev/null
+++ b/scripts/pvscheck.sh
@@ -0,0 +1,96 @@
+#!/bin/sh
+set -x
+set -e
+
+get_jobs_num() {
+  local num="$(cat /proc/cpuinfo | grep -c "^processor")"
+  num="$(echo $(( num + 1 )))"
+  num="${num:-1}"
+  echo $num
+}
+
+get_pvs_comment() {
+  cat > pvs-comment << EOF
+// This is an open source non-commercial project. Dear PVS-Studio, please check it.
+// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+EOF
+}
+
+install_pvs() {
+  mkdir pvs-studio
+  cd pvs-studio
+
+  curl -o pvs-studio.tar.gz "$PVS_URL"
+  tar xzf pvs-studio.tar.gz
+  rm pvs-studio.tar.gz
+  local pvsdir="$(find . -maxdepth 1 -mindepth 1)"
+  find "$pvsdir" -maxdepth 1 -mindepth 1 -exec mv '{}' . \;
+  rmdir "$pvsdir"
+
+  export PATH="$PWD/bin${PATH+:}${PATH}"
+
+  cd ..
+}
+
+create_compile_commands() {
+  mkdir build
+  cd build
+  env \
+    CC=clang \
+    CFLAGS=' -O0 ' \
+    cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="$PWD/root"
+  make -j"$(get_jobs_num)"
+  find src/nvim/auto -name '*.test-include.c' -delete
+
+  cd ..
+}
+
+patch_sources() {
+  get_pvs_comment
+
+  local sh_script='
+    cat pvs-comment "$1" > "$1.tmp"
+    mv "$1.tmp" "$1"
+  '
+
+  find \
+    src/nvim test/functional/fixtures test/unit/fixtures \
+    -name '*.[ch]' \
+    -exec /bin/sh -c "$sh_script" - '{}' \;
+
+  find \
+    build/src/nvim/auto build/config \
+    -name '*.[ch]' -not -name '*.test-include.c' \
+    -exec /bin/sh -c "$sh_script" - '{}' \;
+}
+
+main() {
+  local PVS_URL="http://files.viva64.com/pvs-studio-6.14.21446.1-x86_64.tgz"
+
+  local tgt="${1:-$PWD/../neovim-pvs}"
+  local branch="${2:-master}"
+
+  git worktree add "$tgt" "$branch"
+
+  cd "$tgt"
+
+  install_pvs
+
+  create_compile_commands
+
+  patch_sources
+
+  pvs-studio-analyzer \
+    analyze \
+      --threads "$(get_jobs_num)" \
+      --output-file PVS-studio.log \
+      --verbose \
+      --file build/compile_commands.json \
+      --sourcetree-root .
+
+  plog-converter -t xml -o PVS-studio.xml PVS-studio.log
+  plog-converter -t errorfile -o PVS-studio.err PVS-studio.log
+  plog-converter -t tasklist -o PVS-studio.tsk PVS-studio.log
+}
+
+main "$@"

From 59f0cbc282b1f110dd0281d835f52cfeb62c91d4 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 10 Apr 2017 13:41:09 +0300
Subject: [PATCH 017/257] pvscheck: Add help

---
 scripts/pvscheck.sh | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index 0a3d7486f2..00f2d481ea 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -64,9 +64,25 @@ patch_sources() {
     -exec /bin/sh -c "$sh_script" - '{}' \;
 }
 
+help() {
+  echo 'Usage: pvscheck.sh [target-directory [branch]]'
+  echo
+  echo '  target-directory: Directory where build should occur'
+  echo '                    Default: ../neovim-pvs'
+  echo
+  echo '  branch: Branch to check'
+  echo '          Must not be already checked out: uses git worktree.'
+  echo '          Default: master'
+}
+
 main() {
   local PVS_URL="http://files.viva64.com/pvs-studio-6.14.21446.1-x86_64.tgz"
 
+  if test "x$1" = "x--help" ; then
+    help
+    return 0
+  fi
+
   local tgt="${1:-$PWD/../neovim-pvs}"
   local branch="${2:-master}"
 

From 3bd11f29116510baf0f7700503d0977d84bb218b Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 10 Apr 2017 13:42:31 +0300
Subject: [PATCH 018/257] pvsscript: Use git clone and not git worktree

---
 scripts/pvscheck.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index 00f2d481ea..0e1b9ba404 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -80,13 +80,13 @@ main() {
 
   if test "x$1" = "x--help" ; then
     help
-    return 0
+    return
   fi
 
   local tgt="${1:-$PWD/../neovim-pvs}"
   local branch="${2:-master}"
 
-  git worktree add "$tgt" "$branch"
+  git clone --depth=1 --branch="$branch" . "$tgt"
 
   cd "$tgt"
 

From d7086f44f46cea5d949452e22c6ca1286bd9db77 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 10 Apr 2017 13:45:33 +0300
Subject: [PATCH 019/257] pvscheck: Do not trace help

---
 scripts/pvscheck.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index 0e1b9ba404..cd8bf60a92 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-set -x
 set -e
 
 get_jobs_num() {
@@ -82,6 +81,7 @@ main() {
     help
     return
   fi
+  set -x
 
   local tgt="${1:-$PWD/../neovim-pvs}"
   local branch="${2:-master}"

From 2b13c87fa241c877f56366ab632fd2057fe297d8 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 10 Apr 2017 13:47:31 +0300
Subject: [PATCH 020/257] pvscheck: Do not use --depth

---
 scripts/pvscheck.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index cd8bf60a92..3b21c65702 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -86,7 +86,7 @@ main() {
   local tgt="${1:-$PWD/../neovim-pvs}"
   local branch="${2:-master}"
 
-  git clone --depth=1 --branch="$branch" . "$tgt"
+  git clone --branch="$branch" . "$tgt"
 
   cd "$tgt"
 

From 55292685d36c0aff7733982033a4567b6e7a6ee3 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 10 Apr 2017 14:07:26 +0300
Subject: [PATCH 021/257] pvscheck: Add --recheck argument

---
 scripts/pvscheck.sh | 101 +++++++++++++++++++++++++++++---------------
 1 file changed, 68 insertions(+), 33 deletions(-)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index 3b21c65702..2e4f990693 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -8,6 +8,20 @@ get_jobs_num() {
   echo $num
 }
 
+help() {
+  echo 'Usage:'
+  echo '  pvscheck.sh [target-directory [branch]]'
+  echo '  pvscheck.sh [--recheck] [target-directory]'
+  echo
+  echo '    --recheck: run analysis on a prepared target directory'
+  echo
+  echo '    target-directory: Directory where build should occur'
+  echo '                      Default: ../neovim-pvs'
+  echo
+  echo '    branch: Branch to check'
+  echo '            Default: master'
+}
+
 get_pvs_comment() {
   cat > pvs-comment << EOF
 // This is an open source non-commercial project. Dear PVS-Studio, please check it.
@@ -63,39 +77,7 @@ patch_sources() {
     -exec /bin/sh -c "$sh_script" - '{}' \;
 }
 
-help() {
-  echo 'Usage: pvscheck.sh [target-directory [branch]]'
-  echo
-  echo '  target-directory: Directory where build should occur'
-  echo '                    Default: ../neovim-pvs'
-  echo
-  echo '  branch: Branch to check'
-  echo '          Must not be already checked out: uses git worktree.'
-  echo '          Default: master'
-}
-
-main() {
-  local PVS_URL="http://files.viva64.com/pvs-studio-6.14.21446.1-x86_64.tgz"
-
-  if test "x$1" = "x--help" ; then
-    help
-    return
-  fi
-  set -x
-
-  local tgt="${1:-$PWD/../neovim-pvs}"
-  local branch="${2:-master}"
-
-  git clone --branch="$branch" . "$tgt"
-
-  cd "$tgt"
-
-  install_pvs
-
-  create_compile_commands
-
-  patch_sources
-
+run_analysis() {
   pvs-studio-analyzer \
     analyze \
       --threads "$(get_jobs_num)" \
@@ -109,4 +91,57 @@ main() {
   plog-converter -t tasklist -o PVS-studio.tsk PVS-studio.log
 }
 
+do_check() {
+  local tgt="${1}"
+  local branch="${2}"
+
+  git clone --branch="$branch" . "$tgt"
+
+  cd "$tgt"
+
+  install_pvs
+
+  create_compile_commands
+
+  patch_sources
+
+  run_analysis
+}
+
+do_recheck() {
+  local tgt="${1}"
+
+  cd "$tgt"
+
+  export PATH="$PWD/pvs-studio/bin${PATH+:}${PATH}"
+
+  run_analysis
+}
+
+main() {
+  local PVS_URL="http://files.viva64.com/pvs-studio-6.14.21446.1-x86_64.tgz"
+
+  if test "x$1" = "x--help" ; then
+    help
+    return
+  fi
+
+  set -x
+
+  local recheck=
+  if test "x$1" = "x--recheck" ; then
+    recheck=1
+    shift
+  fi
+
+  local tgt="${1:-$PWD/../neovim-pvs}"
+  local branch="${2:-master}"
+
+  if test "x$recheck" = "x" ; then
+    do_check "$tgt" "$branch"
+  else
+    do_recheck "$tgt"
+  fi
+}
+
 main "$@"

From 0ce961891887acc7623162ac3db1fa00156dd2bb Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 10 Apr 2017 19:12:56 +0200
Subject: [PATCH 022/257] test/rmdir(): Remove `readonly` attr on Windows.

---
 test/functional/helpers.lua              | 27 ++++++++++++++++++++++--
 test/functional/spell/spellfile_spec.lua |  4 +++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 13b06e7f1b..a27b0e7783 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -428,6 +428,16 @@ local function expect_any(contents)
   return ok(nil ~= string.find(curbuf_contents(), contents, 1, true))
 end
 
+local function win_remove_readonly_attr(abspath)
+  assert(os_name() == "windows")
+  local cmd = 'attrib -h -r "'..abspath..'"'
+  -- TODO: Lua 5.2 io.popen():close() returns better info:
+  -- http://stackoverflow.com/a/14031974
+  -- https://www.lua.org/manual/5.2/manual.html#pdf-file:close
+  local exitcode = os.execute(cmd)
+  return (exitcode == 0), exitcode
+end
+
 local function do_rmdir(path)
   if lfs.attributes(path, 'mode') ~= 'directory' then
     return nil
@@ -443,8 +453,21 @@ local function do_rmdir(path)
       else
         local ret, err = os.remove(abspath)
         if not ret then
-          error('os.remove: '..err)
-          return nil
+          if os_name() == "windows" then
+            -- Remove `readonly` attribute (if any)...
+            local attr_status, attr_rv = win_remove_readonly_attr(abspath)
+            if not attr_status then
+              error('win_remove_readonly_attr: '..attr_rv)
+              return nil
+            end
+            -- ...then try again.
+            ret, err = os.remove(abspath)
+          end
+
+          if not ret then
+            error('os.remove: '..err)
+            return nil
+          end
         end
       end
     end
diff --git a/test/functional/spell/spellfile_spec.lua b/test/functional/spell/spellfile_spec.lua
index e7cd10d2ac..afd2c1bce4 100644
--- a/test/functional/spell/spellfile_spec.lua
+++ b/test/functional/spell/spellfile_spec.lua
@@ -5,6 +5,7 @@ local eq = helpers.eq
 local clear = helpers.clear
 local meths = helpers.meths
 local exc_exec = helpers.exc_exec
+local rmdir = helpers.rmdir
 local write_file = helpers.write_file
 
 local testdir = 'Xtest-functional-spell-spellfile.d'
@@ -12,11 +13,12 @@ local testdir = 'Xtest-functional-spell-spellfile.d'
 describe('spellfile', function()
   before_each(function()
     clear()
+    rmdir(testdir)
     lfs.mkdir(testdir)
     lfs.mkdir(testdir .. '/spell')
   end)
   after_each(function()
-    lfs.rmdir(testdir)
+    rmdir(testdir)
   end)
   --                   ┌ Magic string (#VIMSPELLMAGIC)
   --                   │       ┌ Spell file version (#VIMSPELLVERSION)

From 6cbf290d56d618601635d301969c697cfcc2b653 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 10 Apr 2017 22:57:49 +0200
Subject: [PATCH 023/257] test/rmdir(): fallback to Nvim delete()

Lua has too many pitfalls here:
- os.execute() requires shell-escaping
- os.execute() has breaking changes between Lua 5.1 and 5.2
- No native way in Lua to handle "readonly" etc. on Windows
---
 test/functional/helpers.lua | 40 ++++++++++---------------------------
 1 file changed, 11 insertions(+), 29 deletions(-)

diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index a27b0e7783..bb46f57691 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -428,45 +428,28 @@ local function expect_any(contents)
   return ok(nil ~= string.find(curbuf_contents(), contents, 1, true))
 end
 
-local function win_remove_readonly_attr(abspath)
-  assert(os_name() == "windows")
-  local cmd = 'attrib -h -r "'..abspath..'"'
-  -- TODO: Lua 5.2 io.popen():close() returns better info:
-  -- http://stackoverflow.com/a/14031974
-  -- https://www.lua.org/manual/5.2/manual.html#pdf-file:close
-  local exitcode = os.execute(cmd)
-  return (exitcode == 0), exitcode
-end
-
 local function do_rmdir(path)
   if lfs.attributes(path, 'mode') ~= 'directory' then
-    return nil
+    return  -- Don't complain.
   end
   for file in lfs.dir(path) do
     if file ~= '.' and file ~= '..' then
       local abspath = path..'/'..file
       if lfs.attributes(abspath, 'mode') == 'directory' then
-        local ret = do_rmdir(abspath)  -- recurse
-        if not ret then
-          return nil
-        end
+        do_rmdir(abspath)  -- recurse
       else
         local ret, err = os.remove(abspath)
         if not ret then
-          if os_name() == "windows" then
-            -- Remove `readonly` attribute (if any)...
-            local attr_status, attr_rv = win_remove_readonly_attr(abspath)
-            if not attr_status then
-              error('win_remove_readonly_attr: '..attr_rv)
-              return nil
-            end
-            -- ...then try again.
-            ret, err = os.remove(abspath)
-          end
-
-          if not ret then
+          if not session then
             error('os.remove: '..err)
-            return nil
+          else
+            -- Try Nvim delete(): it handles `readonly` attribute on Windows,
+            -- and avoids Lua cross-version/platform incompatibilities.
+            if -1 == nvim_call('delete', abspath) then
+              local hint = (os_name() == 'windows'
+                and ' (hint: try :%bwipeout! before rmdir())' or '')
+              error('delete() failed'..hint..': '..abspath)
+            end
           end
         end
       end
@@ -476,7 +459,6 @@ local function do_rmdir(path)
   if not ret then
     error('lfs.rmdir('..path..'): '..err)
   end
-  return ret
 end
 
 local function rmdir(path)

From 2d296387447cbf89308a4a136cce866e4691cca8 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 10 Apr 2017 01:38:20 +0200
Subject: [PATCH 024/257] test: `:file {name}`

---
 test/functional/ex_cmds/file_spec.lua | 35 +++++++++++++++++++++++++++
 test/functional/helpers.lua           | 13 +++-------
 2 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 test/functional/ex_cmds/file_spec.lua

diff --git a/test/functional/ex_cmds/file_spec.lua b/test/functional/ex_cmds/file_spec.lua
new file mode 100644
index 0000000000..771c283134
--- /dev/null
+++ b/test/functional/ex_cmds/file_spec.lua
@@ -0,0 +1,35 @@
+local helpers = require('test.functional.helpers')(after_each)
+local lfs = require('lfs')
+local clear = helpers.clear
+local command = helpers.command
+local eq = helpers.eq
+local funcs = helpers.funcs
+local rmdir = helpers.rmdir
+
+describe(':file', function()
+  local swapdir = lfs.currentdir()..'/Xtest-file_spec'
+  before_each(function()
+    clear()
+    rmdir(swapdir)
+    lfs.mkdir(swapdir)
+  end)
+  after_each(function()
+    command('%bwipeout!')
+    rmdir(swapdir)
+  end)
+
+  it("rename does not lose swapfile #6487", function()
+    local testfile = 'test-file_spec'
+    local testfile_renamed = testfile..'-renamed'
+    -- Note: `set swapfile` *must* go after `set directory`: otherwise it may
+    -- attempt to create a swapfile in different directory.
+    command('set directory^='..swapdir..'//')
+    command('set swapfile fileformat=unix undolevels=-1')
+
+    command('edit! '..testfile)
+    -- Before #6487 this gave "E301: Oops, lost the swap file !!!" on Windows.
+    command('file '..testfile_renamed)
+    eq(testfile_renamed..'.swp',
+       string.match(funcs.execute('swapname'), '[^%%]+$'))
+  end)
+end)
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index bb46f57691..7edb2381e8 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -32,20 +32,15 @@ local nvim_set  = 'set shortmess+=I background=light noswapfile noautoindent'
                   ..' belloff= noshowcmd noruler nomore'
 local nvim_argv = {nvim_prog, '-u', 'NONE', '-i', 'NONE', '-N',
                    '--cmd', nvim_set, '--embed'}
-
-local mpack = require('mpack')
-
-local tmpname = global_helpers.tmpname
-local uname = global_helpers.uname
-
--- Formulate a path to the directory containing nvim.  We use this to
--- help run test executables.  It helps to keep the tests working, even
--- when the build is not in the default location.
+-- Directory containing nvim.
 local nvim_dir = nvim_prog:gsub("[/\\][^/\\]+$", "")
 if nvim_dir == nvim_prog then
   nvim_dir = "."
 end
 
+local mpack = require('mpack')
+local tmpname = global_helpers.tmpname
+local uname = global_helpers.uname
 local prepend_argv
 
 if os.getenv('VALGRIND') then

From 4a63d9e5f88feb16ec513b8dba1f8d02bd2ff4d6 Mon Sep 17 00:00:00 2001
From: erw7 <erw7.github@gmail.com>
Date: Sun, 9 Apr 2017 12:31:54 +0900
Subject: [PATCH 025/257] win: mch_open_rw: specify S_IWRITE #6487

On Windows, `mch_open_rw` is not actually doing what it claims. This
manifests as "E301: Oops, lost the swap file !!!" when filename is
changed with :file {name}.

Steps to reproduce (covered by test/functional/ex_cmds/file_spec.lua):
    nvim -u NONE
    :edit test
    :file test2
    E301 Oops, lost the swap file!!!

From libuv/src/win/fs.c:
    void fs__open(uv_fs_t* req) {
      ...
      attributes |= FILE_ATTRIBUTE_NORMAL;
      if (flags & _O_CREAT) {
        if (!((req->fs.info.mode & ~current_umask) & _S_IWRITE)) {
          attributes |= FILE_ATTRIBUTE_READONLY;
        }
      }
---
 src/nvim/macros.h | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/nvim/macros.h b/src/nvim/macros.h
index 22fd48de9d..9131f8be84 100644
--- a/src/nvim/macros.h
+++ b/src/nvim/macros.h
@@ -120,8 +120,10 @@
 /* mch_open_rw(): invoke os_open() with third argument for user R/W. */
 #if defined(UNIX)  /* open in rw------- mode */
 # define mch_open_rw(n, f)      os_open((n), (f), (mode_t)0600)
+#elif defined(WIN32)
+# define mch_open_rw(n, f)      os_open((n), (f), S_IREAD | S_IWRITE)
 #else
-#  define mch_open_rw(n, f)     os_open((n), (f), 0)
+# define mch_open_rw(n, f)      os_open((n), (f), 0)
 #endif
 
 # define REPLACE_NORMAL(s) (((s) & REPLACE_FLAG) && !((s) & VREPLACE_FLAG))

From dab3f86d092706514bd207dd9900740bab785859 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 10 Apr 2017 19:53:19 +0200
Subject: [PATCH 026/257] win/test: Enable recover_spec.lua

---
 test/functional/ex_cmds/recover_spec.lua | 43 ++++++++++++------------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/test/functional/ex_cmds/recover_spec.lua b/test/functional/ex_cmds/recover_spec.lua
index 36bf85015a..cb68c29b9a 100644
--- a/test/functional/ex_cmds/recover_spec.lua
+++ b/test/functional/ex_cmds/recover_spec.lua
@@ -1,12 +1,11 @@
--- Tests for :recover
-
 local helpers = require('test.functional.helpers')(after_each)
 local lfs = require('lfs')
 local feed_command, eq, clear, eval, feed, expect, source =
   helpers.feed_command, helpers.eq, helpers.clear, helpers.eval, helpers.feed,
   helpers.expect, helpers.source
-
-if helpers.pending_win32(pending) then return end
+local command = helpers.command
+local ok = helpers.ok
+local rmdir = helpers.rmdir
 
 describe(':recover', function()
   before_each(clear)
@@ -23,30 +22,29 @@ describe(':preserve', function()
   local swapdir = lfs.currentdir()..'/testdir_recover_spec'
   before_each(function()
     clear()
-    helpers.rmdir(swapdir)
+    rmdir(swapdir)
     lfs.mkdir(swapdir)
   end)
   after_each(function()
-    helpers.rmdir(swapdir)
+    command('%bwipeout!')
+    rmdir(swapdir)
   end)
 
   it("saves to custom 'directory' and (R)ecovers (issue #1836)", function()
     local testfile = 'testfile_recover_spec'
+    -- Put swapdir at the start of the 'directory' list. #1836
     -- Note: `set swapfile` *must* go after `set directory`: otherwise it may
     -- attempt to create a swapfile in different directory.
     local init = [[
-      set directory^=]]..swapdir..[[//
+      set directory^=]]..swapdir:gsub([[\]], [[\\]])..[[//
       set swapfile fileformat=unix undolevels=-1
     ]]
 
     source(init)
-    feed_command('set swapfile fileformat=unix undolevels=-1')
-    -- Put swapdir at the start of the 'directory' list. #1836
-    feed_command('set directory^='..swapdir..'//')
-    feed_command('edit '..testfile)
+    command('edit! '..testfile)
     feed('isometext<esc>')
-    feed_command('preserve')
-    source('redir => g:swapname | swapname | redir END')
+    command('preserve')
+    source('redir => g:swapname | silent swapname | redir END')
 
     local swappath1 = eval('g:swapname')
 
@@ -59,19 +57,20 @@ describe(':preserve', function()
     source(init)
 
     -- Use the "SwapExists" event to choose the (R)ecover choice at the dialog.
-    feed_command('autocmd SwapExists * let v:swapchoice = "r"')
-    feed_command('silent edit '..testfile)
-    source('redir => g:swapname | swapname | redir END')
+    command('autocmd SwapExists * let v:swapchoice = "r"')
+    command('silent edit! '..testfile)
+    source('redir => g:swapname | silent swapname | redir END')
 
     local swappath2 = eval('g:swapname')
 
-    -- swapfile from session 1 should end in .swp
-    assert(testfile..'.swp' == string.match(swappath1, '[^%%]+$'))
-
-    -- swapfile from session 2 should end in .swo
-    assert(testfile..'.swo' == string.match(swappath2, '[^%%]+$'))
-
     expect('sometext')
+    -- swapfile from session 1 should end in .swp
+    eq(testfile..'.swp', string.match(swappath1, '[^%%]+$'))
+    -- swapfile from session 2 should end in .swo
+    eq(testfile..'.swo', string.match(swappath2, '[^%%]+$'))
+    -- Verify that :swapname was not truncated (:help 'shortmess').
+    ok(nil == string.find(swappath1, '%.%.%.'))
+    ok(nil == string.find(swappath2, '%.%.%.'))
   end)
 
 end)

From 119f0ca85463b7d9fb7dffe47d0fcee2c9604c53 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 10 Apr 2017 21:54:19 +0200
Subject: [PATCH 027/257] test: helpers.execute() => helpers.feed_command()

---
 test/benchmark/bench_re_freeze_spec.lua | 21 +++++++++------------
 test/functional/normal/lang_spec.lua    |  6 +++---
 test/functional/ui/inccommand_spec.lua  | 24 ++++++++++++------------
 test/functional/ui/screen.lua           | 17 ++++++-----------
 4 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/test/benchmark/bench_re_freeze_spec.lua b/test/benchmark/bench_re_freeze_spec.lua
index 53041b042b..ea41953014 100644
--- a/test/benchmark/bench_re_freeze_spec.lua
+++ b/test/benchmark/bench_re_freeze_spec.lua
@@ -1,8 +1,8 @@
 -- Test for benchmarking RE engine.
 
-local helpers = require('test.functional.helpers')
+local helpers = require('test.functional.helpers')(after_each)
 local insert, source = helpers.insert, helpers.source
-local clear, execute, wait = helpers.clear, helpers.execute, helpers.wait
+local clear, command = helpers.clear, helpers.command
 
 -- Temporary file for gathering benchmarking results for each regexp engine.
 local result_file = 'benchmark.out'
@@ -31,7 +31,7 @@ describe('regexp search', function()
     clear()
     source(measure_script)
     insert('" Benchmark_results:')
-    execute('write! ' .. result_file)
+    command('write! ' .. result_file)
   end)
 
   -- At the end of the test run we just print the contents of the result file
@@ -46,22 +46,19 @@ describe('regexp search', function()
 
   it('is working with regexpengine=0', function()
     local regexpengine = 0
-    execute(string.format(measure_cmd, regexpengine))
-    execute('write')
-    wait()
+    command(string.format(measure_cmd, regexpengine))
+    command('write')
   end)
 
   it('is working with regexpengine=1', function()
     local regexpengine = 1
-    execute(string.format(measure_cmd, regexpengine))
-    execute('write')
-    wait()
+    command(string.format(measure_cmd, regexpengine))
+    command('write')
   end)
 
   it('is working with regexpengine=2', function()
     local regexpengine = 2
-    execute(string.format(measure_cmd, regexpengine))
-    execute('write')
-    wait()
+    command(string.format(measure_cmd, regexpengine))
+    command('write')
   end)
 end)
diff --git a/test/functional/normal/lang_spec.lua b/test/functional/normal/lang_spec.lua
index 464b85d684..1da1d4679d 100644
--- a/test/functional/normal/lang_spec.lua
+++ b/test/functional/normal/lang_spec.lua
@@ -1,6 +1,6 @@
 local helpers = require('test.functional.helpers')(after_each)
 local clear, insert, eq = helpers.clear, helpers.insert, helpers.eq
-local execute, expect = helpers.execute, helpers.expect
+local command, expect = helpers.command, helpers.expect
 local feed, eval = helpers.feed, helpers.eval
 local exc_exec = helpers.exc_exec
 
@@ -32,7 +32,7 @@ describe('gu and gU', function()
     end
 
     before_each(function()
-      execute('lang ctype tr_TR.UTF-8')
+      command('lang ctype tr_TR.UTF-8')
     end)
 
     it('with default casemap', function()
@@ -46,7 +46,7 @@ describe('gu and gU', function()
     end)
 
     it('with casemap=""', function()
-      execute('set casemap=')
+      command('set casemap=')
       -- expect Turkish locale behavior
       insert("iI")
       feed("VgU")
diff --git a/test/functional/ui/inccommand_spec.lua b/test/functional/ui/inccommand_spec.lua
index b7a33cb64d..a7be1a9dc8 100644
--- a/test/functional/ui/inccommand_spec.lua
+++ b/test/functional/ui/inccommand_spec.lua
@@ -1,6 +1,7 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear = helpers.clear
+local command = helpers.command
 local curbufmeths = helpers.curbufmeths
 local eq = helpers.eq
 local eval = helpers.eval
@@ -21,9 +22,9 @@ local default_text = [[
 
 local function common_setup(screen, inccommand, text)
   if screen then
-    feed_command("syntax on")
-    feed_command("set nohlsearch")
-    feed_command("hi Substitute guifg=red guibg=yellow")
+    command("syntax on")
+    command("set nohlsearch")
+    command("hi Substitute guifg=red guibg=yellow")
     screen:attach()
     screen:set_default_attr_ids({
       [1]  = {foreground = Screen.colors.Fuchsia},
@@ -46,7 +47,7 @@ local function common_setup(screen, inccommand, text)
     })
   end
 
-  feed_command("set inccommand=" .. (inccommand and inccommand or ""))
+  command("set inccommand=" .. (inccommand and inccommand or ""))
 
   if text then
     insert(text)
@@ -456,7 +457,7 @@ describe(":substitute, 'inccommand' preserves undo", function()
       insert("X")
       feed("IY<esc>")
       feed(":%s/tw/MO/<esc>")
-      -- execute("undo") here would cause "Press ENTER".
+      -- feed_command("undo") here would cause "Press ENTER".
       feed("u")
       expect(default_text:gsub("Inc", "XInc"))
       feed("u")
@@ -514,7 +515,7 @@ describe(":substitute, 'inccommand' preserves undo", function()
       feed("Ay<esc>")
       feed("Az<esc>")
       feed(":%s/tw/AR<esc>")
-      -- using execute("undo") here will result in a "Press ENTER" prompt
+      -- feed_command("undo") here would cause "Press ENTER".
       feed("u")
       expect(default_text:gsub("lines", "linesxy"))
       feed("u")
@@ -603,7 +604,7 @@ describe(":substitute, 'inccommand' preserves undo", function()
 
       feed_command("set undolevels=-1")
       feed(":%s/tw/MO/g<enter>")
-      -- using execute("undo") here will result in a "Press ENTER" prompt
+      -- feed_command("undo") here will result in a "Press ENTER" prompt
       feed("u")
       if case == "split" then
         screen:expect([[
@@ -804,7 +805,6 @@ describe(":substitute, inccommand=split", function()
   it('does not show split window for :s/', function()
     feed("2gg")
     feed(":s/tw")
-    wait()
     screen:expect([[
       Inc substitution on           |
       two lines                     |
@@ -1291,14 +1291,14 @@ describe("'inccommand' and :cnoremap", function()
   it('work with remapped characters', function()
     for _, case in pairs(cases) do
       refresh(case)
-      local command = "%s/lines/LINES/g"
+      local cmd = "%s/lines/LINES/g"
 
-      for i = 1, string.len(command) do
-        local c = string.sub(command, i, i)
+      for i = 1, string.len(cmd) do
+        local c = string.sub(cmd, i, i)
         feed_command("cnoremap ".. c .. " " .. c)
       end
 
-      feed_command(command)
+      feed_command(cmd)
       expect([[
         Inc substitution on
         two LINES
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index 2f2cc85dab..afbcd222c7 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -284,18 +284,13 @@ function Screen:wait(check, timeout)
 
   if failure_after_success then
     print([[
-Warning: Screen changes have been received after the expected state was seen.
-This is probably due to an indeterminism in the test. Try adding
-`wait()` (or even a separate `screen:expect(...)`) at a point of possible
-indeterminism, typically in between a `feed()` or `execute()` which is non-
-synchronous, and a synchronous api call.
 
-Note that sometimes a `wait` can trigger redraws and consequently generate more
-indeterminism. If adding `wait` calls seems to increase the frequency of these
-messages, try removing every `wait` call in the test.
-
-If everything else fails, use Screen:redraw_debug to help investigate what is
-  causing the problem.
+Warning: Screen changes were received after the expected state. This indicates
+indeterminism in the test. Try adding wait() (or screen:expect(...)) between
+asynchronous (feed(), nvim_input()) and synchronous API calls.
+  - Use Screen:redraw_debug() to investigate the problem.
+  - wait() can trigger redraws and consequently generate more indeterminism.
+    In that case try removing every wait().
       ]])
     local tb = debug.traceback()
     local index = string.find(tb, '\n%s*%[C]')

From de378477cc3ebface5da5dbd24015959755f137e Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 10 Apr 2017 22:16:05 +0200
Subject: [PATCH 028/257] ci/appveyor: fix cache pattern

---
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 8027aee166..edb679d223 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -7,7 +7,7 @@ build_script:
 - call ci\build.bat
 cache:
 - C:\msys64\var\cache\pacman\pkg -> ci\build.bat
-- .deps -> third-party/**
+- .deps -> third-party\**
 artifacts:
 - path: build/Neovim.zip
 - path: build/bin/nvim.exe

From 69775f603f0b21cb28adec99daaaa9356581ddd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Linse?= <bjorn.linse@gmail.com>
Date: Mon, 10 Apr 2017 19:48:45 +0200
Subject: [PATCH 029/257] ci: install Turkish locale and make locale tests more
 reliable

---
 .travis.yml                          |  2 ++
 test/functional/normal/lang_spec.lua | 30 ++++++++++++++++------------
 2 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 62d9ebebda..1f00b5c880 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -104,9 +104,11 @@ addons:
       - gcc-5-multilib
       - gcc-multilib
       - gdb
+      - language-pack-tr
       - libc6-dev-i386
       - libtool
       - llvm-3.9-dev
+      - locales
       - pkg-config
       - unzip
       - valgrind
diff --git a/test/functional/normal/lang_spec.lua b/test/functional/normal/lang_spec.lua
index 1da1d4679d..24d1262f5f 100644
--- a/test/functional/normal/lang_spec.lua
+++ b/test/functional/normal/lang_spec.lua
@@ -17,13 +17,7 @@ describe('gu and gU', function()
   end)
 
   describe('works in Turkish locale', function()
-    if helpers.pending_win32(pending) then return end
-
     clear()
-    if eval('has("mac")') ~= 0 then
-      pending("not yet on macOS", function() end)
-      return
-    end
 
     local err = exc_exec('lang ctype tr_TR.UTF-8')
     if err ~= 0 then
@@ -47,13 +41,23 @@ describe('gu and gU', function()
 
     it('with casemap=""', function()
       command('set casemap=')
-      -- expect Turkish locale behavior
-      insert("iI")
-      feed("VgU")
-      expect("İI")
-      feed("Vgu")
-      expect("iı")
+      -- expect either Turkish locale behavior or ASCII behavior
+      local iupper = eval("toupper('i')")
+      if iupper == "İ" then
+        insert("iI")
+        feed("VgU")
+        expect("İI")
+        feed("Vgu")
+        expect("iı")
+      elseif iupper == "I" then
+        insert("iI")
+        feed("VgU")
+        expect("II")
+        feed("Vgu")
+        expect("ii")
+      else
+        error("expected toupper('i') to be either 'I' or 'İ'")
+      end
     end)
-
   end)
 end)

From 2d72d85b23761383ac7838faed2f7b53bdce8817 Mon Sep 17 00:00:00 2001
From: Felipe Oliveira Carvalho <felipekde@gmail.com>
Date: Tue, 11 Apr 2017 22:44:48 +0200
Subject: [PATCH 030/257] refactor: pos_T macros to functions (#6496)

---
 src/nvim/charset.c  |  3 ++-
 src/nvim/ex_getln.c |  1 +
 src/nvim/indent.c   |  3 ++-
 src/nvim/indent_c.c |  1 +
 src/nvim/macros.h   | 19 -------------------
 src/nvim/mark.h     | 40 ++++++++++++++++++++++++++++++++++++++++
 src/nvim/screen.c   |  1 +
 src/nvim/spell.c    |  1 +
 8 files changed, 48 insertions(+), 21 deletions(-)

diff --git a/src/nvim/charset.c b/src/nvim/charset.c
index 645139f696..3037cfe669 100644
--- a/src/nvim/charset.c
+++ b/src/nvim/charset.c
@@ -15,6 +15,7 @@
 #include "nvim/func_attr.h"
 #include "nvim/indent.h"
 #include "nvim/main.h"
+#include "nvim/mark.h"
 #include "nvim/mbyte.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
@@ -1366,7 +1367,7 @@ void getvcols(win_T *wp, pos_T *pos1, pos_T *pos2, colnr_T *left,
   colnr_T to1;
   colnr_T to2;
 
-  if (ltp(pos1, pos2)) {
+  if (lt(*pos1, *pos2)) {
     getvvcol(wp, pos1, &from1, NULL, &to1);
     getvvcol(wp, pos2, &from2, NULL, &to2);
   } else {
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 9d74f554ba..0b6036ace9 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -30,6 +30,7 @@
 #include "nvim/if_cscope.h"
 #include "nvim/indent.h"
 #include "nvim/main.h"
+#include "nvim/mark.h"
 #include "nvim/mbyte.h"
 #include "nvim/memline.h"
 #include "nvim/menu.h"
diff --git a/src/nvim/indent.c b/src/nvim/indent.c
index 7f31bb8c5c..8fbad38495 100644
--- a/src/nvim/indent.c
+++ b/src/nvim/indent.c
@@ -7,6 +7,7 @@
 #include "nvim/eval.h"
 #include "nvim/charset.h"
 #include "nvim/cursor.h"
+#include "nvim/mark.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/misc1.h"
@@ -598,7 +599,7 @@ int get_lisp_indent(void)
     paren = *pos;
     pos = findmatch(NULL, '[');
 
-    if ((pos == NULL) || ltp(pos, &paren)) {
+    if ((pos == NULL) || lt(*pos, paren)) {
       pos = &paren;
     }
   }
diff --git a/src/nvim/indent_c.c b/src/nvim/indent_c.c
index 4a73fbaf61..8f5547544d 100644
--- a/src/nvim/indent_c.c
+++ b/src/nvim/indent_c.c
@@ -10,6 +10,7 @@
 #include "nvim/edit.h"
 #include "nvim/indent.h"
 #include "nvim/indent_c.h"
+#include "nvim/mark.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
 #include "nvim/option.h"
diff --git a/src/nvim/macros.h b/src/nvim/macros.h
index 9131f8be84..b816b34b39 100644
--- a/src/nvim/macros.h
+++ b/src/nvim/macros.h
@@ -28,25 +28,6 @@
 /// @return `s, sizeof(s) - 1`
 #define S_LEN(s) (s), (sizeof(s) - 1)
 
-/*
- * Position comparisons
- */
-# define lt(a, b) (((a).lnum != (b).lnum) \
-                   ? (a).lnum < (b).lnum \
-                   : (a).col != (b).col \
-                   ? (a).col < (b).col \
-                   : (a).coladd < (b).coladd)
-# define ltp(a, b) (((a)->lnum != (b)->lnum) \
-                    ? (a)->lnum < (b)->lnum \
-                    : (a)->col != (b)->col \
-                    ? (a)->col < (b)->col \
-                    : (a)->coladd < (b)->coladd)
-# define equalpos(a, b) (((a).lnum == (b).lnum) && ((a).col == (b).col) && \
-                         ((a).coladd == (b).coladd))
-# define clearpos(a) {(a)->lnum = 0; (a)->col = 0; (a)->coladd = 0; }
-
-#define ltoreq(a, b) (lt(a, b) || equalpos(a, b))
-
 /*
  * lineempty() - return TRUE if the line is empty
  */
diff --git a/src/nvim/mark.h b/src/nvim/mark.h
index c22a102926..a356c1f398 100644
--- a/src/nvim/mark.h
+++ b/src/nvim/mark.h
@@ -4,6 +4,7 @@
 #include "nvim/macros.h"
 #include "nvim/ascii.h"
 #include "nvim/buffer_defs.h"
+#include "nvim/func_attr.h"
 #include "nvim/mark_defs.h"
 #include "nvim/memory.h"
 #include "nvim/pos.h"
@@ -75,6 +76,45 @@ static inline int mark_local_index(const char name)
                    : -1))));
 }
 
+static inline bool lt(pos_T, pos_T) REAL_FATTR_CONST REAL_FATTR_ALWAYS_INLINE;
+static inline bool equalpos(pos_T, pos_T)
+  REAL_FATTR_CONST REAL_FATTR_ALWAYS_INLINE;
+static inline bool ltoreq(pos_T, pos_T)
+  REAL_FATTR_CONST REAL_FATTR_ALWAYS_INLINE;
+static inline void clearpos(pos_T *) REAL_FATTR_ALWAYS_INLINE;
+
+/// Return true if position a is before (less than) position b.
+static inline bool lt(pos_T a, pos_T b)
+{
+  if (a.lnum != b.lnum) {
+    return a.lnum < b.lnum;
+  } else if (a.col != b.col) {
+    return a.col < b.col;
+  } else {
+    return a.coladd < b.coladd;
+  }
+}
+
+/// Return true if position a and b are equal.
+static inline bool equalpos(pos_T a, pos_T b)
+{
+  return (a.lnum == b.lnum) && (a.col == b.col) && (a.coladd == b.coladd);
+}
+
+/// Return true if position a is less than or equal to b.
+static inline bool ltoreq(pos_T a, pos_T b)
+{
+  return lt(a, b) || equalpos(a, b);
+}
+
+/// Clear the pos_T structure pointed to by a.
+static inline void clearpos(pos_T *a)
+{
+  a->lnum = 0;
+  a->col = 0;
+  a->coladd = 0;
+}
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "mark.h.generated.h"
 #endif
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index d9a21aa81f..febca105e9 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -102,6 +102,7 @@
 #include "nvim/indent.h"
 #include "nvim/getchar.h"
 #include "nvim/main.h"
+#include "nvim/mark.h"
 #include "nvim/mbyte.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"
diff --git a/src/nvim/spell.c b/src/nvim/spell.c
index 18febda1d8..17016be35f 100644
--- a/src/nvim/spell.c
+++ b/src/nvim/spell.c
@@ -92,6 +92,7 @@
 #include "nvim/func_attr.h"
 #include "nvim/getchar.h"
 #include "nvim/hashtab.h"
+#include "nvim/mark.h"
 #include "nvim/mbyte.h"
 #include "nvim/memline.h"
 #include "nvim/memory.h"

From d6e5f94ae945308d96be414c9c1fb3f0ae71355e Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 24 Mar 2017 02:54:50 +0100
Subject: [PATCH 031/257] win: defaults: 'shellredir', 'shellxquote',
 'shellxescape'

---
 runtime/doc/eval.txt                   | 19 +++++++-----
 runtime/doc/options.txt                | 41 +++++---------------------
 src/nvim/misc1.c                       |  6 ++--
 src/nvim/options.lua                   | 18 +++++++++--
 src/nvim/os/shell.c                    |  2 --
 test/functional/terminal/edit_spec.lua |  3 +-
 6 files changed, 39 insertions(+), 50 deletions(-)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 16f9a2ea6e..1ed919a241 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1524,13 +1524,18 @@ v:errors	Errors found by assert functions, such as |assert_true()|.
 		list by the assert function.
 
 					*v:event* *event-variable*
-v:event		Dictionary of event data for the current |autocommand|.  The
-		available keys differ per event type and are specified at the
-		documentation for each |event|.  The possible keys are:
-			operator	The operation performed.  Unlike
-					|v:operator|, it is set also for an Ex
-					mode command.  For instance, |:yank| is
-					translated to "|y|".
+v:event		Dictionary of event data for the current |autocommand|.  Valid
+		only during the autocommand lifetime: storing or passing
+		`v:event` is invalid.  Copy it instead: >
+			au TextYankPost * let g:foo = deepcopy(v:event)
+<		Keys vary by event; see the documentation for the specific
+		event, e.g. |TextYankPost|.
+			KEY		DESCRIPTION ~
+			operator	The current |operator|.  Also set for
+					Ex commands (unlike |v:operator|). For
+					example if |TextYankPost| is triggered
+					by the |:yank| Ex command then
+					`v:event['operator']` is "y".
 			regcontents	Text stored in the register as a
 					|readfile()|-style list of lines.
 			regname 	Requested register (e.g "x" for "xyy)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index c30a88f48d..42d665b42e 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2765,8 +2765,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 
 						*'grepprg'* *'gp'*
 'grepprg' 'gp'		string	(default "grep -n ",
-					Unix: "grep -n $* /dev/null",
-					Win32: "findstr /n" or "grep -n")
+				 Unix: "grep -n $* /dev/null")
 			global or local to buffer |global-local|
 	Program to use for the |:grep| command.  This option may contain '%'
 	and '#' characters, which are expanded like when used in a command-
@@ -2781,8 +2780,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|:vimgrepadd| and |:lgrepadd| like |:lvimgrepadd|.
 	See also the section |:make_makeprg|, since most of the comments there
 	apply equally to 'grepprg'.
-	For Win32, the default is "findstr /n" if "findstr.exe" can be found,
-	otherwise it's "grep -n".
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
@@ -5251,9 +5248,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	security reasons.
 
 						*'shellcmdflag'* *'shcf'*
-'shellcmdflag' 'shcf'	string	(default: "-c";
-				 Windows, when 'shell' does not
-				 contain "sh" somewhere: "/c")
+'shellcmdflag' 'shcf'	string	(default: "-c"; Windows: "/c")
 			global
 	Flag passed to the shell to execute "!" and ":!" commands; e.g.,
 	"bash.exe -c ls" or "cmd.exe /c dir".  For Windows
@@ -5264,15 +5259,12 @@ A jump table for the options with a short description can be found at |Q_op|.
 	See |option-backslash| about including spaces and backslashes.
 	See |shell-unquoting| which talks about separating this option into 
 	multiple arguments.
-	Also see |dos-shell| for Windows.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
 						*'shellpipe'* *'sp'*
 'shellpipe' 'sp'	string	(default ">", "| tee", "|& tee" or "2>&1| tee")
 			global
-			{not available when compiled without the |+quickfix|
-			feature}
 	String to be used to put the output of the ":make" command in the
 	error file.  See also |:make_makeprg|.  See |option-backslash| about
 	including spaces and backslashes.
@@ -5314,7 +5306,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	third-party shells on Windows systems, such as the MKS Korn Shell
 	or bash, where it should be "\"".  The default is adjusted according
 	the value of 'shell', to reduce the need to set this option by the
-	user.  See |dos-shell|.
+	user.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
@@ -5346,7 +5338,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			*'shellslash'* *'ssl'* *'noshellslash'* *'nossl'*
 'shellslash' 'ssl'	boolean	(default off)
 			global
-			{only for MSDOS and MS-Windows}
+			{only for Windows}
 	When set, a forward slash is used when expanding file names.  This is
 	useful when a Unix-like shell is used instead of command.com or
 	cmd.exe.  Backward slashes can still be typed, but they are changed to
@@ -5363,10 +5355,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 	When on, use temp files for shell commands.  When off use a pipe.
 	When using a pipe is not possible temp files are used anyway.
-	Currently a pipe is only supported on Unix and MS-Windows 2K and
-	later.  You can check it with: >
-		:if has("filterpipe")
-<	The advantage of using a pipe is that nobody can read the temp file
+	The advantage of using a pipe is that nobody can read the temp file
 	and the 'shell' command does not need to support redirection.
 	The advantage of using a temp file is that the file type and encoding
 	can be detected.
@@ -5376,8 +5365,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|system()| does not respect this option, it always uses pipes.
 
 						*'shellxescape'* *'sxe'*
-'shellxescape' 'sxe'	string	(default: "";
-				 for Windows: "\"&|<>()@^")
+'shellxescape' 'sxe'	string	(default: ""; Windows: "\"&|<>()@^")
 			global
 	When 'shellxquote' is set to "(" then the characters listed in this
 	option will be escaped with a '^' character.  This makes it possible
@@ -5402,7 +5390,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	strips off the first and last quote on a command, or 3rd-party shells
 	such as the MKS Korn Shell or bash, where it should be "\"".  The
 	default is adjusted according the value of 'shell', to reduce the need
-	to set this option by the user.  See |dos-shell|.
+	to set this option by the user.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
@@ -6413,8 +6401,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'title'* *'notitle'*
 'title'			boolean	(default off, on when title can be restored)
 			global
-			{not available when compiled without the |+title|
-			feature}
 	When on, the title of the window will be set to the value of
 	'titlestring' (if it is not empty), or to:
 		filename [+=-] (path) - VIM
@@ -6426,16 +6412,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 		=+		indicates the file is read-only and modified
 		(path)		is the path of the file being edited
 		- VIM		the server name |v:servername| or "VIM"
-	Only works if the terminal supports setting window titles
-	(currently Win32 console, all GUI versions and terminals with a non-
-	empty 't_ts' option - this is Unix xterm by default, where 't_ts' is
-	taken from the builtin termcap).
 
 								*'titlelen'*
 'titlelen'		number	(default 85)
 			global
-			{not available when compiled without the |+title|
-			feature}
 	Gives the percentage of 'columns' to use for the length of the window
 	title.  When the title is longer, only the end of the path name is
 	shown.  A '<' character before the path name is used to indicate this.
@@ -6449,8 +6429,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'titleold'*
 'titleold'		string	(default "Thanks for flying Vim")
 			global
-			{only available when compiled with the |+title|
-			feature}
 	This option will be used for the window title when exiting Vim if the
 	original title cannot be restored.  Only happens if 'title' is on or
 	'titlestring' is not empty.
@@ -6459,13 +6437,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'titlestring'*
 'titlestring'		string	(default "")
 			global
-			{not available when compiled without the |+title|
-			feature}
 	When this option is not empty, it will be used for the title of the
 	window.  This happens only when the 'title' option is on.
-	Only works if the terminal supports setting window titles (currently
-	Win32 console, all GUI versions and terminals with a non-empty 't_ts'
-	option).
 	When this option contains printf-style '%' items, they will be
 	expanded according to the rules used for 'statusline'.
 	Example: >
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c
index 0b74b4437e..8d93505be3 100644
--- a/src/nvim/misc1.c
+++ b/src/nvim/misc1.c
@@ -2678,7 +2678,8 @@ void fast_breakcheck(void)
   }
 }
 
-// Call shell. Calls os_call_shell, with 'shellxquote' added.
+// os_call_shell wrapper. Handles 'verbose', :profile, and v:shell_error.
+// Invalidates cached tags.
 int call_shell(char_u *cmd, ShellOpts opts, char_u *extra_shell_arg)
 {
   int retval;
@@ -2686,8 +2687,7 @@ int call_shell(char_u *cmd, ShellOpts opts, char_u *extra_shell_arg)
 
   if (p_verbose > 3) {
     verbose_enter();
-    smsg(_("Calling shell to execute: \"%s\""),
-         cmd == NULL ? p_sh : cmd);
+    smsg(_("Calling shell to execute: \"%s\""), cmd == NULL ? p_sh : cmd);
     ui_putc('\n');
     verbose_leave();
   }
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 4ca63f2efe..774c39808f 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -2051,7 +2051,11 @@ return {
       secure=true,
       vi_def=true,
       varname='p_srr',
-      defaults={if_true={vi=">"}}
+      defaults={
+        condition='WIN32',
+        if_true={vi=">%s 2>&1"},
+        if_false={vi=">"}
+      }
     },
     {
       full_name='shellslash', abbreviation='ssl',
@@ -2073,7 +2077,11 @@ return {
       secure=true,
       vi_def=true,
       varname='p_sxq',
-      defaults={if_true={vi=""}}
+      defaults={
+        condition='WIN32',
+        if_true={vi="("},
+        if_false={vi=""}
+      }
     },
     {
       full_name='shellxescape', abbreviation='sxe',
@@ -2081,7 +2089,11 @@ return {
       secure=true,
       vi_def=true,
       varname='p_sxe',
-      defaults={if_true={vi=""}}
+      defaults={
+        condition='WIN32',
+        if_true={vi='"&|<>()@^'},
+        if_false={vi=""}
+      }
     },
     {
       full_name='shiftround', abbreviation='sr',
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c
index b449cc3d5a..5cc9d4b79b 100644
--- a/src/nvim/os/shell.c
+++ b/src/nvim/os/shell.c
@@ -124,11 +124,9 @@ int os_call_shell(char_u *cmd, ShellOpts opts, char_u *extra_args)
   }
 
   size_t nread;
-
   int exitcode = do_os_system(shell_build_argv((char *)cmd, (char *)extra_args),
                               input.data, input.len, output_ptr, &nread,
                               emsg_silent, forward_output);
-
   xfree(input.data);
 
   if (output) {
diff --git a/test/functional/terminal/edit_spec.lua b/test/functional/terminal/edit_spec.lua
index 42a5c768bb..f691a58f6c 100644
--- a/test/functional/terminal/edit_spec.lua
+++ b/test/functional/terminal/edit_spec.lua
@@ -8,6 +8,7 @@ local command = helpers.command
 local meths = helpers.meths
 local clear = helpers.clear
 local eq = helpers.eq
+local iswin = helpers.iswin
 
 describe(':edit term://*', function()
   local get_screen = function(columns, lines)
@@ -46,7 +47,7 @@ describe(':edit term://*', function()
     local winheight = curwinmeths.get_height()
     local buf_cont_start = rep_size - sb - winheight + 2
     local function bufline (i)
-      return ('%d: foobar'):format(i)
+      return (iswin() and '%d: (foobar)' or '%d: foobar'):format(i)
     end
     for i = buf_cont_start,(rep_size - 1) do
       bufcontents[#bufcontents + 1] = bufline(i)

From f7611d74e73329a4192666ff59911ff214f462ab Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 24 Mar 2017 14:42:42 +0100
Subject: [PATCH 032/257] win: vim_strsave_shellescape: Handle 'shellslash'.

From Vim, misc2.c:vim_strsave_shellescape
---
 src/nvim/strings.c | 36 ++++++++++++++++++++++++++++++++----
 1 file changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/nvim/strings.c b/src/nvim/strings.c
index 87e066d80a..8a1a3beddd 100644
--- a/src/nvim/strings.c
+++ b/src/nvim/strings.c
@@ -198,8 +198,16 @@ char_u *vim_strsave_shellescape(const char_u *string,
   /* First count the number of extra bytes required. */
   size_t length = STRLEN(string) + 3;       // two quotes and a trailing NUL
   for (const char_u *p = string; *p != NUL; mb_ptr_adv(p)) {
-    if (*p == '\'')
-      length += 3;                      /* ' => '\'' */
+#ifdef WIN32
+    if (!p_ssl) {
+      if (*p == '"') {
+        length++;                       // " -> ""
+      }
+    } else
+#endif
+    if (*p == '\'') {
+      length += 3;                      // ' => '\''
+    }
     if ((*p == '\n' && (csh_like || do_newline))
         || (*p == '!' && (csh_like || do_special))) {
       ++length;                         /* insert backslash */
@@ -216,10 +224,25 @@ char_u *vim_strsave_shellescape(const char_u *string,
   escaped_string = xmalloc(length);
   d = escaped_string;
 
-  /* add opening quote */
+  // add opening quote
+#ifdef WIN32
+  if (!p_ssl) {
+    *d++ = '"';
+  } else
+#endif
   *d++ = '\'';
 
   for (const char_u *p = string; *p != NUL; ) {
+#ifdef WIN32
+    if (!p_ssl) {
+      if (*p == '"') {
+        *d++ = '"';
+        *d++ = '"';
+        p++;
+        continue;
+      }
+    } else
+#endif
     if (*p == '\'') {
       *d++ = '\'';
       *d++ = '\\';
@@ -246,7 +269,12 @@ char_u *vim_strsave_shellescape(const char_u *string,
     MB_COPY_CHAR(p, d);
   }
 
-  /* add terminating quote and finish with a NUL */
+  // add terminating quote and finish with a NUL
+# ifdef WIN32
+  if (!p_ssl) {
+    *d++ = '"';
+  } else
+# endif
   *d++ = '\'';
   *d = NUL;
 

From 799443c9942fa145320d9cc7c4638bdaa8c8d67a Mon Sep 17 00:00:00 2001
From: Rui Abreu Ferreira <rap-ep@gmx.com>
Date: Sat, 25 Mar 2017 22:47:38 +0000
Subject: [PATCH 033/257] win/test: Enable more system() tests

---
 test/functional/eval/system_spec.lua | 74 ++++++++++++++++++++--------
 test/functional/helpers.lua          |  2 +-
 2 files changed, 54 insertions(+), 22 deletions(-)

diff --git a/test/functional/eval/system_spec.lua b/test/functional/eval/system_spec.lua
index bf95752e3b..83d8028b56 100644
--- a/test/functional/eval/system_spec.lua
+++ b/test/functional/eval/system_spec.lua
@@ -94,17 +94,26 @@ describe('system()', function()
     end)
   end)
 
-  if helpers.pending_win32(pending) then return end
-
   it('sets v:shell_error', function()
-    eval([[system("sh -c 'exit'")]])
-    eq(0, eval('v:shell_error'))
-    eval([[system("sh -c 'exit 1'")]])
-    eq(1, eval('v:shell_error'))
-    eval([[system("sh -c 'exit 5'")]])
-    eq(5, eval('v:shell_error'))
-    eval([[system('this-should-not-exist')]])
-    eq(127, eval('v:shell_error'))
+    if helpers.os_name() == 'windows' then
+      eval([[system("cmd.exe /c exit")]])
+      eq(0, eval('v:shell_error'))
+      eval([[system("cmd.exe /c exit 1")]])
+      eq(1, eval('v:shell_error'))
+      eval([[system("cmd.exe /c exit 5")]])
+      eq(5, eval('v:shell_error'))
+      eval([[system('this-should-not-exist')]])
+      eq(1, eval('v:shell_error'))
+    else
+      eval([[system("sh -c 'exit'")]])
+      eq(0, eval('v:shell_error'))
+      eval([[system("sh -c 'exit 1'")]])
+      eq(1, eval('v:shell_error'))
+      eval([[system("sh -c 'exit 5'")]])
+      eq(5, eval('v:shell_error'))
+      eval([[system('this-should-not-exist')]])
+      eq(127, eval('v:shell_error'))
+    end
   end)
 
   describe('executes shell function if passed a string', function()
@@ -120,6 +129,15 @@ describe('system()', function()
         screen:detach()
     end)
 
+    it('escapes inner double quotes #6329', function()
+      if helpers.os_name() == 'windows' then
+        -- In Windows cmd.exe's echo prints the quotes
+        eq('""\n', eval([[system('echo ""')]]))
+      else
+        eq('\n', eval([[system('echo ""')]]))
+      end
+    end)
+
     it('`echo` and waits for its return', function()
       feed(':call system("echo")<cr>')
       screen:expect([[
@@ -180,7 +198,11 @@ describe('system()', function()
 
   describe('passing no input', function()
     it('returns the program output', function()
-      eq("echoed", eval('system("echo -n echoed")'))
+      if helpers.os_name() == 'windows' then
+        eq("echoed\n", eval('system("echo echoed")'))
+      else
+        eq("echoed", eval('system("echo -n echoed")'))
+      end
     end)
     it('to backgrounded command does not crash', function()
       -- This is indeterminate, just exercise the codepath. May get E5677.
@@ -277,21 +299,30 @@ describe('system()', function()
   end)
 end)
 
-if helpers.pending_win32(pending) then return end
-
 describe('systemlist()', function()
   -- Similar to `system()`, but returns List instead of String.
   before_each(clear)
 
   it('sets the v:shell_error variable', function()
-    eval([[systemlist("sh -c 'exit'")]])
-    eq(0, eval('v:shell_error'))
-    eval([[systemlist("sh -c 'exit 1'")]])
-    eq(1, eval('v:shell_error'))
-    eval([[systemlist("sh -c 'exit 5'")]])
-    eq(5, eval('v:shell_error'))
-    eval([[systemlist('this-should-not-exist')]])
-    eq(127, eval('v:shell_error'))
+    if helpers.os_name() == 'windows' then
+      eval([[systemlist("cmd.exe /c exit")]])
+      eq(0, eval('v:shell_error'))
+      eval([[systemlist("cmd.exe /c exit 1")]])
+      eq(1, eval('v:shell_error'))
+      eval([[systemlist("cmd.exe /c exit 5")]])
+      eq(5, eval('v:shell_error'))
+      eval([[systemlist('this-should-not-exist')]])
+      eq(1, eval('v:shell_error'))
+    else
+      eval([[systemlist("sh -c 'exit'")]])
+      eq(0, eval('v:shell_error'))
+      eval([[systemlist("sh -c 'exit 1'")]])
+      eq(1, eval('v:shell_error'))
+      eval([[systemlist("sh -c 'exit 5'")]])
+      eq(5, eval('v:shell_error'))
+      eval([[systemlist('this-should-not-exist')]])
+      eq(127, eval('v:shell_error'))
+    end
   end)
 
   describe('exectues shell function', function()
@@ -389,6 +420,7 @@ describe('systemlist()', function()
     after_each(delete_file(fname))
 
     it('replaces NULs by newline characters', function()
+      if helpers.pending_win32(pending) then return end
       eq({'part1\npart2\npart3'}, eval('systemlist("cat '..fname..'")'))
     end)
   end)
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 7edb2381e8..5882758b5a 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -348,7 +348,7 @@ end
 local function set_shell_powershell()
   source([[
     set shell=powershell shellquote=\" shellpipe=\| shellredir=>
-    set shellcmdflag=\ -ExecutionPolicy\ RemoteSigned\ -Command
+    set shellcmdflag=\ -NoProfile\ -ExecutionPolicy\ RemoteSigned\ -Command
     let &shellxquote=' '
   ]])
 end

From f3cc843755a6d638ada77dc31721aa53b3ff2364 Mon Sep 17 00:00:00 2001
From: Rui Abreu Ferreira <raf-ep@gmx.com>
Date: Tue, 28 Mar 2017 16:03:53 +0100
Subject: [PATCH 034/257] win: libuv_process_spawn(): special-case cmd.exe

Disable CommandLineToArgvW-standard quoting for cmd.exe.

libuv assumes spawned processes follow the convention expected by
CommandLineToArgvW(). But cmd.exe is non-conformant, so for cmd.exe:
- With system([]), the caller has full control (and responsibility) to
  quote arguments correctly.
- With system(''), shell* options are used.

libuv quoting is disabled if argv[0] is:
- cmd.exe
- cmd
- $COMSPEC resolving to a path with filename cmd.exe

Closes #6329
References #6387
---
 runtime/doc/eval.txt                 | 20 ++++++++-------
 src/nvim/event/libuv_process.c       | 22 ++++++++++++++++
 test/functional/eval/system_spec.lua | 38 +++++++++++++++++++++++-----
 3 files changed, 64 insertions(+), 16 deletions(-)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 1ed919a241..aa979ae42c 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -4852,16 +4852,18 @@ jobstart({cmd}[, {opts}])				{Nvim} *jobstart()*
 		Spawns {cmd} as a job.  If {cmd} is a |List| it is run
 		directly.  If {cmd} is a |String| it is processed like this: >
 		  :call jobstart(split(&shell) + split(&shellcmdflag) + ['{cmd}'])
-<		NOTE: This only shows the idea; see |shell-unquoting| before
-		constructing lists with 'shell' or 'shellcmdflag'.
+<		(Only shows the idea; see |shell-unquoting| for full details.)
+
+		NOTE: on Windows if {cmd} is a List:
+		  - cmd[0] must be executable. If it is in $PATH it can be
+		    called by name, with or without an extension: >
+		      :call jobstart(['ping', 'neovim.io'])
+<		    If it is a path (not a name), extension is required: >
+		      :call jobstart(['System32\ping.exe', 'neovim.io'])
+<		  - {cmd} is quoted per the convention expected by
+		    CommandLineToArgvW https://msdn.microsoft.com/bb776391
+		    unless the first argument is some form of "cmd.exe".
 
-		NOTE: On Windows if {cmd} is a List, cmd[0] must be a valid
-		executable (.exe, .com).  If the executable is in $PATH it can
-		be called by name, with or without an extension: >
-		   :call jobstart(['ping', 'neovim.io'])
-<		If it is a path (not a name), it must include the extension: >
-		   :call jobstart(['System32\ping.exe', 'neovim.io'])
-<
 		{opts} is a dictionary with these keys:
 		  on_stdout: stdout event handler (function name or |Funcref|)
 		  on_stderr: stderr event handler (function name or |Funcref|)
diff --git a/src/nvim/event/libuv_process.c b/src/nvim/event/libuv_process.c
index 3da0c386b4..ab69bea04c 100644
--- a/src/nvim/event/libuv_process.c
+++ b/src/nvim/event/libuv_process.c
@@ -8,6 +8,8 @@
 #include "nvim/event/process.h"
 #include "nvim/event/libuv_process.h"
 #include "nvim/log.h"
+#include "nvim/path.h"
+#include "nvim/os/os.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "event/libuv_process.c.generated.h"
@@ -24,6 +26,26 @@ int libuv_process_spawn(LibuvProcess *uvproc)
   if (proc->detach) {
       uvproc->uvopts.flags |= UV_PROCESS_DETACHED;
   }
+#ifdef WIN32
+  // libuv assumes spawned processes follow the convention from
+  // CommandLineToArgvW(), cmd.exe does not. Disable quoting since it will
+  // result in unexpected behaviour, the caller is left with the responsibility
+  // to quote arguments accordingly. system('') has shell* options for this.
+  //
+  // Disable quoting for cmd, cmd.exe and $COMSPEC with a cmd.exe filename
+  bool is_cmd = STRICMP(proc->argv[0], "cmd.exe") == 0
+                || STRICMP(proc->argv[0], "cmd") == 0;
+  if (!is_cmd) {
+    const char_u *comspec = (char_u *)os_getenv("COMSPEC");
+    const char_u *comspecshell = path_tail((char_u *)proc->argv[0]);
+    is_cmd = comspec != NULL && STRICMP(proc->argv[0], comspec) == 0
+             && STRICMP("cmd.exe", (char *)comspecshell) == 0;
+  }
+
+  if (is_cmd) {
+    uvproc->uvopts.flags |= UV_PROCESS_WINDOWS_VERBATIM_ARGUMENTS;
+  }
+#endif
   uvproc->uvopts.exit_cb = exit_cb;
   uvproc->uvopts.cwd = proc->cwd;
   uvproc->uvopts.env = NULL;
diff --git a/test/functional/eval/system_spec.lua b/test/functional/eval/system_spec.lua
index 83d8028b56..45ca69707d 100644
--- a/test/functional/eval/system_spec.lua
+++ b/test/functional/eval/system_spec.lua
@@ -129,14 +129,38 @@ describe('system()', function()
         screen:detach()
     end)
 
-    it('escapes inner double quotes #6329', function()
-      if helpers.os_name() == 'windows' then
-        -- In Windows cmd.exe's echo prints the quotes
+    if helpers.os_name() == 'windows' then
+      it('with the default cmd.exe shell', function()
         eq('""\n', eval([[system('echo ""')]]))
-      else
-        eq('\n', eval([[system('echo ""')]]))
-      end
-    end)
+        eq('"a b"\n', eval([[system('echo "a b"')]]))
+        -- TODO: consistent with Vim, but it should be fixed
+        eq('a & echo b\n', eval([[system('echo a & echo b')]]))
+        eval([[system('cd "C:\Program Files"')]])
+        eq(0, eval('v:shell_error'))
+      end)
+
+      it('with set shell="cmd"', function()
+        helpers.source('let &shell="cmd"')
+        eq('"a b"\n', eval([[system('echo "a b"')]]))
+      end)
+
+      it('works with cmd.exe from $COMSPEC', function()
+        local comspecshell = eval("fnamemodify($COMSPEC, ':t')")
+        if comspecshell == 'cmd.exe' then
+          helpers.source('let &shell=$COMSPEC')
+          eq('"a b"\n', eval([[system('echo "a b"')]]))
+        else
+          pending('$COMSPEC is not cmd.exe ' .. comspecshell)
+        end
+      end)
+
+      it('works with powershell', function()
+        helpers.set_shell_powershell()
+        eq('a\nb\n', eval([[system('echo a b')]]))
+        eq('C:\\\n', eval([[system('cd c:\; (Get-Location).Path')]]))
+        eq('a b\n', eval([[system('echo "a b"')]]))
+      end)
+    end
 
     it('`echo` and waits for its return', function()
       feed(':call system("echo")<cr>')

From d31d177a0c2c9997c2cdb04975bc3354b9a23fb8 Mon Sep 17 00:00:00 2001
From: Rui Abreu Ferreira <rap-ep@gmx.com>
Date: Thu, 30 Mar 2017 23:41:52 +0100
Subject: [PATCH 035/257] win: default shellxescape, shellxquote to empty

Calling cmd.exe in Windows follows a very different pattern from Vim.
The primary difference is that Vim does a nested call to cmd.exe, e.g.
the following call in Vim

    system('echo a 2>&1')

spawns the following processes

    "C:\Program Files (x86)\Vim\vim80\vimrun" -s C:\Windows\system32\cmd.exe /c (echo a 2^>^&1
        ^>C:\Users\dummy\AppData\Local\Temp\VIoC169.tmp 2^>^&1)
    C:\Windows\system32\cmd.exe /c C:\Windows\system32\cmd.exe /c (echo a 2^>^&1
        ^>C:\Users\dummy\AppData\Local\Temp\VIo3C6C.tmp 2^>^&1)
    C:\Windows\system32\cmd.exe  /c (echo a 2>&1
        >C:\Users\dummy\AppData\Local\Temp\VIo3C6C.tmp 2>&1)

The escaping with ^ is needed because cmd.exe calls itself and needs to
preserve the special metacharacters for the last call. However in nvim
no nested call is made, system('') spawns a single cmd.exe process.
Setting shellxescape to "" disables escaping with ^.

The previous default for shellxquote=( wrapped any command in
parenthesis, in Vim this is more meaningful due to the use of tempfiles
to store the output and redirection (also see &shellquote). There is
a slight benefit in having the default be empty because some expressions
that run in console will not run within parens e.g. due to unbalanced
double quotes

    system('echo "a b')
---
 runtime/doc/options.txt                | 14 ++---------
 src/nvim/options.lua                   | 12 ++-------
 test/functional/eval/system_spec.lua   | 34 ++++++++++++++------------
 test/functional/terminal/edit_spec.lua |  6 +----
 4 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 42d665b42e..9be7dae84d 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -5365,18 +5365,14 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|system()| does not respect this option, it always uses pipes.
 
 						*'shellxescape'* *'sxe'*
-'shellxescape' 'sxe'	string	(default: ""; Windows: "\"&|<>()@^")
+'shellxescape' 'sxe'	string	(default: "")
 			global
 	When 'shellxquote' is set to "(" then the characters listed in this
 	option will be escaped with a '^' character.  This makes it possible
 	to execute most external commands with cmd.exe.
 
 						*'shellxquote'* *'sxq'*
-'shellxquote' 'sxq'	string	(default: "";
-					for Win32, when 'shell' is cmd.exe: "("
-					for Win32, when 'shell' contains "sh"
-					somewhere: "\""
-					for Unix, when using system(): "\"")
+'shellxquote' 'sxq'	string	(default: "")
 			global
 	Quoting character(s), put around the command passed to the shell, for
 	the "!" and ":!" commands.  Includes the redirection.  See
@@ -5385,12 +5381,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 	When the value is '(' then ')' is appended. When the value is '"('
 	then ')"' is appended.
 	When the value is '(' then also see 'shellxescape'.
-	This is an empty string by default on most systems, but is known to be
-	useful for on Win32 version, either for cmd.exe which automatically
-	strips off the first and last quote on a command, or 3rd-party shells
-	such as the MKS Korn Shell or bash, where it should be "\"".  The
-	default is adjusted according the value of 'shell', to reduce the need
-	to set this option by the user.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 774c39808f..4e7be63b63 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -2077,11 +2077,7 @@ return {
       secure=true,
       vi_def=true,
       varname='p_sxq',
-      defaults={
-        condition='WIN32',
-        if_true={vi="("},
-        if_false={vi=""}
-      }
+      defaults={if_true={vi=""}}
     },
     {
       full_name='shellxescape', abbreviation='sxe',
@@ -2089,11 +2085,7 @@ return {
       secure=true,
       vi_def=true,
       varname='p_sxe',
-      defaults={
-        condition='WIN32',
-        if_true={vi='"&|<>()@^'},
-        if_false={vi=""}
-      }
+      defaults={if_true={vi=""}}
     },
     {
       full_name='shiftround', abbreviation='sr',
diff --git a/test/functional/eval/system_spec.lua b/test/functional/eval/system_spec.lua
index 45ca69707d..7e213e2156 100644
--- a/test/functional/eval/system_spec.lua
+++ b/test/functional/eval/system_spec.lua
@@ -4,6 +4,8 @@ local nvim_dir = helpers.nvim_dir
 local eq, call, clear, eval, feed_command, feed, nvim =
   helpers.eq, helpers.call, helpers.clear, helpers.eval, helpers.feed_command,
   helpers.feed, helpers.nvim
+local command = helpers.command
+local iswin = helpers.iswin
 
 local Screen = require('test.functional.ui.screen')
 
@@ -33,8 +35,7 @@ describe('system()', function()
 
   describe('command passed as a List', function()
     local function printargs_path()
-      return nvim_dir..'/printargs-test'
-        .. (helpers.os_name() == 'windows' and '.exe' or '')
+      return nvim_dir..'/printargs-test' .. (iswin() and '.exe' or '')
     end
 
     it('sets v:shell_error if cmd[0] is not executable', function()
@@ -88,14 +89,14 @@ describe('system()', function()
     end)
 
     it('does NOT run in shell', function()
-      if helpers.os_name() ~= 'windows' then
+      if not iswin() then
         eq("* $PATH %PATH%\n", eval("system(['echo', '*', '$PATH', '%PATH%'])"))
       end
     end)
   end)
 
   it('sets v:shell_error', function()
-    if helpers.os_name() == 'windows' then
+    if iswin() then
       eval([[system("cmd.exe /c exit")]])
       eq(0, eval('v:shell_error'))
       eval([[system("cmd.exe /c exit 1")]])
@@ -129,28 +130,29 @@ describe('system()', function()
         screen:detach()
     end)
 
-    if helpers.os_name() == 'windows' then
-      it('with the default cmd.exe shell', function()
+    if iswin() then
+      it('with shell=cmd.exe', function()
+        command('set shell=cmd.exe')
         eq('""\n', eval([[system('echo ""')]]))
         eq('"a b"\n', eval([[system('echo "a b"')]]))
-        -- TODO: consistent with Vim, but it should be fixed
-        eq('a & echo b\n', eval([[system('echo a & echo b')]]))
+        eq('a \nb\n', eval([[system('echo a & echo b')]]))
+        eq('a \n', eval([[system('echo a 2>&1')]]))
         eval([[system('cd "C:\Program Files"')]])
         eq(0, eval('v:shell_error'))
       end)
 
-      it('with set shell="cmd"', function()
-        helpers.source('let &shell="cmd"')
+      it('with shell=cmd', function()
+        command('set shell=cmd')
         eq('"a b"\n', eval([[system('echo "a b"')]]))
       end)
 
-      it('works with cmd.exe from $COMSPEC', function()
+      it('with shell=$COMSPEC', function()
         local comspecshell = eval("fnamemodify($COMSPEC, ':t')")
         if comspecshell == 'cmd.exe' then
-          helpers.source('let &shell=$COMSPEC')
+          command('set shell=$COMSPEC')
           eq('"a b"\n', eval([[system('echo "a b"')]]))
         else
-          pending('$COMSPEC is not cmd.exe ' .. comspecshell)
+          pending('$COMSPEC is not cmd.exe: ' .. comspecshell)
         end
       end)
 
@@ -222,7 +224,7 @@ describe('system()', function()
 
   describe('passing no input', function()
     it('returns the program output', function()
-      if helpers.os_name() == 'windows' then
+      if iswin() then
         eq("echoed\n", eval('system("echo echoed")'))
       else
         eq("echoed", eval('system("echo -n echoed")'))
@@ -327,8 +329,8 @@ describe('systemlist()', function()
   -- Similar to `system()`, but returns List instead of String.
   before_each(clear)
 
-  it('sets the v:shell_error variable', function()
-    if helpers.os_name() == 'windows' then
+  it('sets v:shell_error', function()
+    if iswin() then
       eval([[systemlist("cmd.exe /c exit")]])
       eq(0, eval('v:shell_error'))
       eval([[systemlist("cmd.exe /c exit 1")]])
diff --git a/test/functional/terminal/edit_spec.lua b/test/functional/terminal/edit_spec.lua
index f691a58f6c..d2b2d8a60c 100644
--- a/test/functional/terminal/edit_spec.lua
+++ b/test/functional/terminal/edit_spec.lua
@@ -8,7 +8,6 @@ local command = helpers.command
 local meths = helpers.meths
 local clear = helpers.clear
 local eq = helpers.eq
-local iswin = helpers.iswin
 
 describe(':edit term://*', function()
   local get_screen = function(columns, lines)
@@ -46,11 +45,8 @@ describe(':edit term://*', function()
     local bufcontents = {}
     local winheight = curwinmeths.get_height()
     local buf_cont_start = rep_size - sb - winheight + 2
-    local function bufline (i)
-      return (iswin() and '%d: (foobar)' or '%d: foobar'):format(i)
-    end
     for i = buf_cont_start,(rep_size - 1) do
-      bufcontents[#bufcontents + 1] = bufline(i)
+      bufcontents[#bufcontents + 1] = ('%d: foobar'):format(i)
     end
     bufcontents[#bufcontents + 1] = ''
     bufcontents[#bufcontents + 1] = '[Process exited 0]'

From 7c4e5dfd2722b8c25641cbbc66c5b0133d0e2f03 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 12 Apr 2017 01:35:17 +0200
Subject: [PATCH 036/257] win: os_shell_is_cmdexe() + tests

---
 runtime/doc/eval.txt           | 12 ++++++------
 src/nvim/event/libuv_process.c | 20 +++-----------------
 src/nvim/memory.c              |  7 +++++++
 src/nvim/os/env.c              | 22 ++++++++++++++++++----
 test/unit/os/env_spec.lua      | 27 ++++++++++++++++++++++++++-
 5 files changed, 60 insertions(+), 28 deletions(-)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index aa979ae42c..77db2699f8 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -4855,14 +4855,14 @@ jobstart({cmd}[, {opts}])				{Nvim} *jobstart()*
 <		(Only shows the idea; see |shell-unquoting| for full details.)
 
 		NOTE: on Windows if {cmd} is a List:
-		  - cmd[0] must be executable. If it is in $PATH it can be
-		    called by name, with or without an extension: >
+		  - cmd[0] must be an executable (not a "built-in"). If it is
+		    in $PATH it can be called by name, without an extension: >
 		      :call jobstart(['ping', 'neovim.io'])
-<		    If it is a path (not a name), extension is required: >
+<		    If it is a full or partial path, extension is required: >
 		      :call jobstart(['System32\ping.exe', 'neovim.io'])
-<		  - {cmd} is quoted per the convention expected by
-		    CommandLineToArgvW https://msdn.microsoft.com/bb776391
-		    unless the first argument is some form of "cmd.exe".
+<		  - {cmd} is collapsed to a string of quoted args as expected
+		    by CommandLineToArgvW https://msdn.microsoft.com/bb776391
+		    unless cmd[0] is some form of "cmd.exe".
 
 		{opts} is a dictionary with these keys:
 		  on_stdout: stdout event handler (function name or |Funcref|)
diff --git a/src/nvim/event/libuv_process.c b/src/nvim/event/libuv_process.c
index ab69bea04c..f5a41d151b 100644
--- a/src/nvim/event/libuv_process.c
+++ b/src/nvim/event/libuv_process.c
@@ -8,7 +8,6 @@
 #include "nvim/event/process.h"
 #include "nvim/event/libuv_process.h"
 #include "nvim/log.h"
-#include "nvim/path.h"
 #include "nvim/os/os.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
@@ -27,22 +26,9 @@ int libuv_process_spawn(LibuvProcess *uvproc)
       uvproc->uvopts.flags |= UV_PROCESS_DETACHED;
   }
 #ifdef WIN32
-  // libuv assumes spawned processes follow the convention from
-  // CommandLineToArgvW(), cmd.exe does not. Disable quoting since it will
-  // result in unexpected behaviour, the caller is left with the responsibility
-  // to quote arguments accordingly. system('') has shell* options for this.
-  //
-  // Disable quoting for cmd, cmd.exe and $COMSPEC with a cmd.exe filename
-  bool is_cmd = STRICMP(proc->argv[0], "cmd.exe") == 0
-                || STRICMP(proc->argv[0], "cmd") == 0;
-  if (!is_cmd) {
-    const char_u *comspec = (char_u *)os_getenv("COMSPEC");
-    const char_u *comspecshell = path_tail((char_u *)proc->argv[0]);
-    is_cmd = comspec != NULL && STRICMP(proc->argv[0], comspec) == 0
-             && STRICMP("cmd.exe", (char *)comspecshell) == 0;
-  }
-
-  if (is_cmd) {
+  // libuv collapses the argv to a CommandLineToArgvW()-style string. cmd.exe
+  // expects a different syntax (must be prepared by the caller before now).
+  if (os_shell_is_cmdexe(proc->argv[0])) {
     uvproc->uvopts.flags |= UV_PROCESS_WINDOWS_VERBATIM_ARGUMENTS;
   }
 #endif
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index b4fdd86a6d..85ec916ba0 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -495,6 +495,13 @@ bool strequal(const char *a, const char *b)
   return (a == NULL && b == NULL) || (a && b && strcmp(a, b) == 0);
 }
 
+/// Case-insensitive `strequal`.
+bool striequal(const char *a, const char *b)
+  FUNC_ATTR_PURE FUNC_ATTR_WARN_UNUSED_RESULT
+{
+  return (a == NULL && b == NULL) || (a && b && STRICMP(a, b) == 0);
+}
+
 /*
  * Avoid repeating the error message many times (they take 1 second each).
  * Did_outofmem_msg is reset when a character is read.
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
index 12c2da6152..ad51e598c1 100644
--- a/src/nvim/os/env.c
+++ b/src/nvim/os/env.c
@@ -1,11 +1,8 @@
-// env.c -- environment variable access
+// Environment inspection
 
 #include <assert.h>
-
 #include <uv.h>
 
-// vim.h must be included before charset.h (and possibly others) or things
-// blow up
 #include "nvim/vim.h"
 #include "nvim/ascii.h"
 #include "nvim/charset.h"
@@ -919,3 +916,20 @@ bool os_term_is_nice(void)
     || NULL != os_getenv("KONSOLE_DBUS_SESSION");
 #endif
 }
+
+/// Returns true if `sh` looks like it resolves to "cmd.exe".
+bool os_shell_is_cmdexe(const char *sh)
+  FUNC_ATTR_NONNULL_ALL
+{
+  if (*sh == NUL) {
+    return false;
+  }
+  if (striequal(sh, "$COMSPEC")) {
+    const char *comspec = os_getenv("COMSPEC");
+    return striequal("cmd.exe", (char *)path_tail((char_u *)comspec));
+  }
+  if (striequal(sh, "cmd.exe") || striequal(sh, "cmd")) {
+    return true;
+  }
+  return striequal("cmd.exe", (char *)path_tail((char_u *)sh));
+}
diff --git a/test/unit/os/env_spec.lua b/test/unit/os/env_spec.lua
index 823b6d6a85..575787a25e 100644
--- a/test/unit/os/env_spec.lua
+++ b/test/unit/os/env_spec.lua
@@ -67,12 +67,37 @@ describe('env function', function()
     end)
   end)
 
+  describe('os_shell_is_cmdexe', function()
+    itp('returns true for expected names', function()
+      eq(true, cimp.os_shell_is_cmdexe(to_cstr('cmd.exe')))
+      eq(true, cimp.os_shell_is_cmdexe(to_cstr('cmd')))
+      eq(true, cimp.os_shell_is_cmdexe(to_cstr('CMD.EXE')))
+      eq(true, cimp.os_shell_is_cmdexe(to_cstr('CMD')))
+
+      os_setenv('COMSPEC', '/foo/bar/cmd.exe', 0)
+      eq(true, cimp.os_shell_is_cmdexe(to_cstr('$COMSPEC')))
+      os_setenv('COMSPEC', [[C:\system32\cmd.exe]], 0)
+      eq(true, cimp.os_shell_is_cmdexe(to_cstr('$COMSPEC')))
+    end)
+    itp('returns false for unexpected names', function()
+      eq(false, cimp.os_shell_is_cmdexe(to_cstr('')))
+      eq(false, cimp.os_shell_is_cmdexe(to_cstr('powershell')))
+      eq(false, cimp.os_shell_is_cmdexe(to_cstr(' cmd.exe ')))
+      eq(false, cimp.os_shell_is_cmdexe(to_cstr('cm')))
+      eq(false, cimp.os_shell_is_cmdexe(to_cstr('md')))
+      eq(false, cimp.os_shell_is_cmdexe(to_cstr('cmd.ex')))
+
+      os_setenv('COMSPEC', '/foo/bar/cmd', 0)
+      eq(false, cimp.os_shell_is_cmdexe(to_cstr('$COMSPEC')))
+    end)
+  end)
+
   describe('os_getenv', function()
     itp('reads an env variable', function()
       local name = 'NVIM_UNIT_TEST_GETENV_1N'
       local value = 'NVIM_UNIT_TEST_GETENV_1V'
       eq(NULL, os_getenv(name))
-      -- need to use os_setenv, because lua dosn't have a setenv function
+      -- Use os_setenv because Lua dosen't have setenv.
       os_setenv(name, value, 1)
       eq(value, os_getenv(name))
     end)

From 45b5ebea9ddf029b3453ab21d20ae41f32c8de97 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 14 Apr 2017 17:41:59 +0200
Subject: [PATCH 037/257] perf: tv_clear(): Cache gettext() result. (#6519)

Closes #6437
---
 src/nvim/eval/typval.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
index 779bb18175..eb6db9547b 100644
--- a/src/nvim/eval/typval.c
+++ b/src/nvim/eval/typval.c
@@ -1837,9 +1837,12 @@ static inline void _nothing_conv_dict_end(typval_T *const tv,
 /// @param[in,out]  tv  Value to free.
 void tv_clear(typval_T *const tv)
 {
+  static char *objname = NULL;  // cached because gettext() is slow. #6437
+  if (objname == NULL) {
+    objname = xstrdup(_("tv_clear() argument"));
+  }
   if (tv != NULL && tv->v_type != VAR_UNKNOWN) {
-    const int evn_ret = encode_vim_to_nothing(NULL, tv,
-                                              _("tv_clear() argument"));
+    const int evn_ret = encode_vim_to_nothing(NULL, tv, objname);
     (void)evn_ret;
     assert(evn_ret == OK);
   }

From 58d2ce9bdbb6feab7176f451ca0248c78606aa2e Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 14 Apr 2017 20:34:54 +0200
Subject: [PATCH 038/257] test: check_cores(): Escape $TMPDIR path. (#6520)

Lua string:match() considers hyphen to be a special char, we want the
path to be a literal match. Also remove "./", etc.

References #6483
---
 test/helpers.lua | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/test/helpers.lua b/test/helpers.lua
index d0b1ad552b..d60d5ba242 100644
--- a/test/helpers.lua
+++ b/test/helpers.lua
@@ -32,6 +32,9 @@ local function glob(initial_path, re, exc_re)
     return false
   end
 
+  if is_excluded(initial_path) then
+    return ret
+  end
   while #paths_to_check > 0 do
     local cur_path = paths_to_check[#paths_to_check]
     paths_to_check[#paths_to_check] = nil
@@ -185,7 +188,11 @@ local function check_cores(app, force)
   local gdb_db_cmd = 'gdb -n -batch -ex "thread apply all bt full" "$_NVIM_TEST_APP" -c "$_NVIM_TEST_CORE"'
   local lldb_db_cmd = 'lldb -Q -o "bt all" -f "$_NVIM_TEST_APP" -c "$_NVIM_TEST_CORE"'
   local random_skip = false
-  local local_tmpdir = tmpdir_is_local(tmpdir_get()) and tmpdir_get() or nil
+  -- Workspace-local $TMPDIR, scrubbed and pattern-escaped.
+  -- "./Xtest-tmpdir/" => "Xtest%-tmpdir"
+  local local_tmpdir = (tmpdir_is_local(tmpdir_get())
+    and tmpdir_get():gsub('^[ ./]+',''):gsub('%/+$',''):gsub('([^%w])', '%%%1')
+    or nil)
   local db_cmd
   if hasenv('NVIM_TEST_CORE_GLOB_DIRECTORY') then
     initial_path = os.getenv('NVIM_TEST_CORE_GLOB_DIRECTORY')

From b2942d1e729c4cfa8ec9d3bedcdc7ad838a689ef Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Thu, 13 Apr 2017 19:16:32 +0300
Subject: [PATCH 039/257] eval: Change the point at which arg_errmsg and its
 length are changed

Ref #6437
---
 src/nvim/eval.c        | 130 ++++++++++++++++++++++-------------------
 src/nvim/eval/typval.c |  22 +++++--
 src/nvim/eval/typval.h |  11 ++++
 3 files changed, 98 insertions(+), 65 deletions(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 0663e19b9a..e81378bcaa 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -2378,9 +2378,9 @@ static void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv,
                      &tv, &di, true, false) == OK) {
         if ((di == NULL
              || (!var_check_ro(di->di_flags, (const char *)lp->ll_name,
-                               STRLEN(lp->ll_name))
+                               TV_CSTRING)
                  && !tv_check_lock(di->di_tv.v_lock, (const char *)lp->ll_name,
-                                   STRLEN(lp->ll_name))))
+                                   TV_CSTRING)))
             && eexe_mod_op(&tv, rettv, (const char *)op) == OK) {
           set_var(lp->ll_name, lp->ll_name_len, &tv, false);
         }
@@ -2393,7 +2393,7 @@ static void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv,
   } else if (tv_check_lock(lp->ll_newkey == NULL
                            ? lp->ll_tv->v_lock
                            : lp->ll_tv->vval.v_dict->dv_lock,
-                           (const char *)lp->ll_name, STRLEN(lp->ll_name))) {
+                           (const char *)lp->ll_name, TV_CSTRING)) {
   } else if (lp->ll_range) {
     listitem_T *ll_li = lp->ll_li;
     int ll_n1 = lp->ll_n1;
@@ -2402,7 +2402,7 @@ static void set_var_lval(lval_T *lp, char_u *endp, typval_T *rettv,
     for (listitem_T *ri = rettv->vval.v_list->lv_first;
          ri != NULL && ll_li != NULL; ) {
       if (tv_check_lock(ll_li->li_tv.v_lock, (const char *)lp->ll_name,
-                        STRLEN(lp->ll_name))) {
+                        TV_CSTRING)) {
         return;
       }
       ri = ri->li_next;
@@ -2992,14 +2992,14 @@ int do_unlet(const char *const name, const size_t name_len, const int forceit)
     }
     if (hi != NULL && !HASHITEM_EMPTY(hi)) {
       dictitem_T *const di = TV_DICT_HI2DI(hi);
-      if (var_check_fixed(di->di_flags, (const char *)name, STRLEN(name))
-          || var_check_ro(di->di_flags, (const char *)name, STRLEN(name))
-          || tv_check_lock(d->dv_lock, (const char *)name, STRLEN(name))) {
+      if (var_check_fixed(di->di_flags, (const char *)name, TV_CSTRING)
+          || var_check_ro(di->di_flags, (const char *)name, TV_CSTRING)
+          || tv_check_lock(d->dv_lock, (const char *)name, TV_CSTRING)) {
         return FAIL;
       }
 
       if (d == NULL
-          || tv_check_lock(d->dv_lock, (const char *)name, STRLEN(name))) {
+          || tv_check_lock(d->dv_lock, (const char *)name, TV_CSTRING)) {
         return FAIL;
       }
 
@@ -6553,10 +6553,8 @@ static void f_add(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 
   rettv->vval.v_number = 1;   /* Default: Failed */
   if (argvars[0].v_type == VAR_LIST) {
-    const char *const arg_errmsg = _("add() argument");
-    const size_t arg_errmsg_len = strlen(arg_errmsg);
     if ((l = argvars[0].vval.v_list) != NULL
-        && !tv_check_lock(l->lv_lock, arg_errmsg, arg_errmsg_len)) {
+        && !tv_check_lock(l->lv_lock, "add() argument", TV_TRANSLATE)) {
       tv_list_append_tv(l, &argvars[1]);
       tv_copy(&argvars[0], rettv);
     }
@@ -8152,7 +8150,6 @@ static void f_expand(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 static void f_extend(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   const char *const arg_errmsg = N_("extend() argument");
-  const size_t arg_errmsg_len = strlen(arg_errmsg);
 
   if (argvars[0].v_type == VAR_LIST && argvars[1].v_type == VAR_LIST) {
     long before;
@@ -8161,13 +8158,13 @@ static void f_extend(typval_T *argvars, typval_T *rettv, FunPtr fptr)
     list_T *const l1 = argvars[0].vval.v_list;
     list_T *const l2 = argvars[1].vval.v_list;
     if (l1 == NULL) {
-      const bool locked = tv_check_lock(VAR_FIXED, arg_errmsg, arg_errmsg_len);
+      const bool locked = tv_check_lock(VAR_FIXED, arg_errmsg, TV_TRANSLATE);
       (void)locked;
       assert(locked == true);
     } else if (l2 == NULL) {
       // Do nothing
       tv_copy(&argvars[0], rettv);
-    } else if (!tv_check_lock(l1->lv_lock, arg_errmsg, arg_errmsg_len)) {
+    } else if (!tv_check_lock(l1->lv_lock, arg_errmsg, TV_TRANSLATE)) {
       listitem_T *item;
       if (argvars[2].v_type != VAR_UNKNOWN) {
         before = tv_get_number_chk(&argvars[2], &error);
@@ -8195,13 +8192,13 @@ static void f_extend(typval_T *argvars, typval_T *rettv, FunPtr fptr)
     dict_T *const d1 = argvars[0].vval.v_dict;
     dict_T *const d2 = argvars[1].vval.v_dict;
     if (d1 == NULL) {
-      const bool locked = tv_check_lock(VAR_FIXED, arg_errmsg, arg_errmsg_len);
+      const bool locked = tv_check_lock(VAR_FIXED, arg_errmsg, TV_TRANSLATE);
       (void)locked;
       assert(locked == true);
     } else if (d2 == NULL) {
       // Do nothing
       tv_copy(&argvars[0], rettv);
-    } else if (!tv_check_lock(d1->dv_lock, arg_errmsg, arg_errmsg_len)) {
+    } else if (!tv_check_lock(d1->dv_lock, arg_errmsg, TV_TRANSLATE)) {
       const char *action = "force";
       // Check the third argument.
       if (argvars[2].v_type != VAR_UNKNOWN) {
@@ -8349,20 +8346,19 @@ static void filter_map(typval_T *argvars, typval_T *rettv, int map)
   int todo;
   char_u *ermsg = (char_u *)(map ? "map()" : "filter()");
   const char *const arg_errmsg = (map
-                                  ? _("map() argument")
-                                  : _("filter() argument"));
-  const size_t arg_errmsg_len = strlen(arg_errmsg);
+                                  ? N_("map() argument")
+                                  : N_("filter() argument"));
   int save_did_emsg;
   int idx = 0;
 
   if (argvars[0].v_type == VAR_LIST) {
     if ((l = argvars[0].vval.v_list) == NULL
-        || (!map && tv_check_lock(l->lv_lock, arg_errmsg, arg_errmsg_len))) {
+        || (!map && tv_check_lock(l->lv_lock, arg_errmsg, TV_TRANSLATE))) {
       return;
     }
   } else if (argvars[0].v_type == VAR_DICT) {
     if ((d = argvars[0].vval.v_dict) == NULL
-        || (!map && tv_check_lock(d->dv_lock, arg_errmsg, arg_errmsg_len))) {
+        || (!map && tv_check_lock(d->dv_lock, arg_errmsg, TV_TRANSLATE))) {
       return;
     }
   } else {
@@ -8395,8 +8391,8 @@ static void filter_map(typval_T *argvars, typval_T *rettv, int map)
 
           di = TV_DICT_HI2DI(hi);
           if (map
-              && (tv_check_lock(di->di_tv.v_lock, arg_errmsg, arg_errmsg_len)
-                  || var_check_ro(di->di_flags, arg_errmsg, arg_errmsg_len))) {
+              && (tv_check_lock(di->di_tv.v_lock, arg_errmsg, TV_TRANSLATE)
+                  || var_check_ro(di->di_flags, arg_errmsg, TV_TRANSLATE))) {
             break;
           }
 
@@ -8407,8 +8403,8 @@ static void filter_map(typval_T *argvars, typval_T *rettv, int map)
             break;
           }
           if (!map && rem) {
-            if (var_check_fixed(di->di_flags, arg_errmsg, arg_errmsg_len)
-                || var_check_ro(di->di_flags, arg_errmsg, arg_errmsg_len)) {
+            if (var_check_fixed(di->di_flags, arg_errmsg, TV_TRANSLATE)
+                || var_check_ro(di->di_flags, arg_errmsg, TV_TRANSLATE)) {
               break;
             }
             tv_dict_item_remove(d, di);
@@ -8421,7 +8417,7 @@ static void filter_map(typval_T *argvars, typval_T *rettv, int map)
 
       for (li = l->lv_first; li != NULL; li = nli) {
         if (map
-            && tv_check_lock(li->li_tv.v_lock, arg_errmsg, arg_errmsg_len)) {
+            && tv_check_lock(li->li_tv.v_lock, arg_errmsg, TV_TRANSLATE)) {
           break;
         }
         nli = li->li_next;
@@ -11158,13 +11154,12 @@ static void f_insert(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   list_T *l;
   bool error = false;
-  const char *const arg_errmsg = _("insert() argument");
-  const size_t arg_errmsg_len = strlen(arg_errmsg);
 
   if (argvars[0].v_type != VAR_LIST) {
     EMSG2(_(e_listarg), "insert()");
   } else if ((l = argvars[0].vval.v_list) != NULL
-             && !tv_check_lock(l->lv_lock, arg_errmsg, arg_errmsg_len)) {
+             && !tv_check_lock(l->lv_lock, N_("insert() argument"),
+                               TV_TRANSLATE)) {
     long before = 0;
     if (argvars[2].v_type != VAR_UNKNOWN) {
       before = tv_get_number_chk(&argvars[2], &error);
@@ -13205,21 +13200,20 @@ static void f_remove(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   long end;
   dict_T      *d;
   dictitem_T  *di;
-  const char *const arg_errmsg = _("remove() argument");
-  const size_t arg_errmsg_len = strlen(arg_errmsg);
+  const char *const arg_errmsg = N_("remove() argument");
 
   if (argvars[0].v_type == VAR_DICT) {
     if (argvars[2].v_type != VAR_UNKNOWN) {
       EMSG2(_(e_toomanyarg), "remove()");
     } else if ((d = argvars[0].vval.v_dict) != NULL
-               && !tv_check_lock(d->dv_lock, arg_errmsg, arg_errmsg_len)) {
+               && !tv_check_lock(d->dv_lock, arg_errmsg, TV_TRANSLATE)) {
       const char *key = tv_get_string_chk(&argvars[1]);
       if (key != NULL) {
         di = tv_dict_find(d, key, -1);
         if (di == NULL) {
           EMSG2(_(e_dictkey), key);
-        } else if (!var_check_fixed(di->di_flags, arg_errmsg, arg_errmsg_len)
-                   && !var_check_ro(di->di_flags, arg_errmsg, arg_errmsg_len)) {
+        } else if (!var_check_fixed(di->di_flags, arg_errmsg, TV_TRANSLATE)
+                   && !var_check_ro(di->di_flags, arg_errmsg, TV_TRANSLATE)) {
           *rettv = di->di_tv;
           di->di_tv = TV_INITIAL_VALUE;
           tv_dict_item_remove(d, di);
@@ -13232,7 +13226,7 @@ static void f_remove(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   } else if (argvars[0].v_type != VAR_LIST) {
     EMSG2(_(e_listdictarg), "remove()");
   } else if ((l = argvars[0].vval.v_list) != NULL
-             && !tv_check_lock(l->lv_lock, arg_errmsg, arg_errmsg_len)) {
+             && !tv_check_lock(l->lv_lock, arg_errmsg, TV_TRANSLATE)) {
     bool error = false;
 
     idx = tv_get_number_chk(&argvars[1], &error);
@@ -13503,14 +13497,12 @@ static void f_resolve(typval_T *argvars, typval_T *rettv, FunPtr fptr)
  */
 static void f_reverse(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
-  const char *const arg_errmsg = _("reverse() argument");
-  const size_t arg_errmsg_len = strlen(arg_errmsg);
-
   list_T *l;
   if (argvars[0].v_type != VAR_LIST) {
     EMSG2(_(e_listarg), "reverse()");
   } else if ((l = argvars[0].vval.v_list) != NULL
-             && !tv_check_lock(l->lv_lock, arg_errmsg, arg_errmsg_len)) {
+             && !tv_check_lock(l->lv_lock, N_("reverse() argument"),
+                               TV_TRANSLATE)) {
     listitem_T *li = l->lv_last;
     l->lv_first = l->lv_last = NULL;
     l->lv_len = 0;
@@ -15202,16 +15194,14 @@ static void do_sort_uniq(typval_T *argvars, typval_T *rettv, bool sort)
   sortinfo = &info;
 
   const char *const arg_errmsg = (sort
-                                  ? _("sort() argument")
-                                  : _("uniq() argument"));
-  const size_t arg_errmsg_len = strlen(arg_errmsg);
+                                  ? N_("sort() argument")
+                                  : N_("uniq() argument"));
 
   if (argvars[0].v_type != VAR_LIST) {
     EMSG2(_(e_listarg), sort ? "sort()" : "uniq()");
   } else {
     l = argvars[0].vval.v_list;
-    if (l == NULL
-        || tv_check_lock(l->lv_lock, arg_errmsg, arg_errmsg_len)) {
+    if (l == NULL || tv_check_lock(l->lv_lock, arg_errmsg, TV_TRANSLATE)) {
         goto theend;
     }
     rettv->vval.v_list = l;
@@ -18876,24 +18866,37 @@ static void set_var(const char *name, const size_t name_len, typval_T *const tv,
 ///
 /// @param[in]  flags  di_flags attribute value.
 /// @param[in]  name  Variable name, for use in error message.
-/// @param[in]  name_len  Variable name length.
+/// @param[in]  name_len  Variable name length. Use #TV_TRANSLATE to translate
+///                       variable name and compute the length. Use #TV_CSTRING
+///                       to compute the length with strlen() without
+///                       translating.
 ///
 /// @return True if variable is read-only: either always or in sandbox when
 ///         sandbox is enabled, false otherwise.
-bool var_check_ro(const int flags, const char *const name,
-                  const size_t name_len)
+bool var_check_ro(const int flags, const char *name,
+                  size_t name_len)
   FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
 {
+  const char *error_message = NULL;
   if (flags & DI_FLAGS_RO) {
-    emsgf(_(e_readonlyvar), (int)name_len, name);
-    return true;
+    error_message = N_(e_readonlyvar);
+  } else if ((flags & DI_FLAGS_RO_SBX) && sandbox) {
+    error_message = N_("E794: Cannot set variable in the sandbox: \"%.*s\"");
   }
-  if ((flags & DI_FLAGS_RO_SBX) && sandbox) {
-    emsgf(_("E794: Cannot set variable in the sandbox: \"%.*s\""),
-          (int)name_len, name);
-    return true;
+
+  if (error_message == NULL) {
+    return false;
   }
-  return false;
+  if (name_len == TV_TRANSLATE) {
+    name = _(name);
+    name_len = strlen(name);
+  } else if (name_len == TV_CSTRING) {
+    name_len = strlen(name);
+  }
+
+  emsgf(_(error_message), (int)name_len, name);
+
+  return true;
 }
 
 /// Check whether variable is fixed (DI_FLAGS_FIX)
@@ -18902,14 +18905,23 @@ bool var_check_ro(const int flags, const char *const name,
 ///
 /// @param[in]  flags  di_flags attribute value.
 /// @param[in]  name  Variable name, for use in error message.
-/// @param[in]  name_len  Variable name length.
+/// @param[in]  name_len  Variable name length. Use #TV_TRANSLATE to translate
+///                       variable name and compute the length. Use #TV_CSTRING
+///                       to compute the length with strlen() without
+///                       translating.
 ///
 /// @return True if variable is fixed, false otherwise.
-static bool var_check_fixed(const int flags, const char *const name,
-                            const size_t name_len)
+static bool var_check_fixed(const int flags, const char *name,
+                            size_t name_len)
   FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
 {
   if (flags & DI_FLAGS_FIX) {
+    if (name_len == TV_TRANSLATE) {
+      name = _(name);
+      name_len = strlen(name);
+    } else if (name_len == TV_CSTRING) {
+      name_len = strlen(name);
+    }
     emsgf(_("E795: Cannot delete variable %.*s"), (int)name_len, name);
     return true;
   }
@@ -19716,12 +19728,12 @@ void ex_function(exarg_T *eap)
     }
     if (fudi.fd_di == NULL) {
       if (tv_check_lock(fudi.fd_dict->dv_lock, (const char *)eap->arg,
-                        STRLEN(eap->arg))) {
+                        TV_CSTRING)) {
         // Can't add a function to a locked dictionary
         goto erret;
       }
     } else if (tv_check_lock(fudi.fd_di->di_tv.v_lock, (const char *)eap->arg,
-                             STRLEN(eap->arg))) {
+                             TV_CSTRING)) {
       // Can't change an existing function if it is locked
       goto erret;
     }
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
index eb6db9547b..c29c67124f 100644
--- a/src/nvim/eval/typval.c
+++ b/src/nvim/eval/typval.c
@@ -2045,11 +2045,14 @@ bool tv_islocked(const typval_T *const tv)
 ///
 /// @param[in]  lock  Lock status.
 /// @param[in]  name  Variable name, used in the error message.
-/// @param[in]  name_len  Variable name length.
+/// @param[in]  name_len  Variable name length. Use #TV_TRANSLATE to translate
+///                       variable name and compute the length. Use #TV_CSTRING
+///                       to compute the length with strlen() without
+///                       translating.
 ///
 /// @return true if variable is locked, false otherwise.
-bool tv_check_lock(const VarLockStatus lock, const char *const name,
-                   const size_t name_len)
+bool tv_check_lock(const VarLockStatus lock, const char *name,
+                   size_t name_len)
   FUNC_ATTR_WARN_UNUSED_RESULT
 {
   const char *error_message = NULL;
@@ -2068,10 +2071,17 @@ bool tv_check_lock(const VarLockStatus lock, const char *const name,
   }
   assert(error_message != NULL);
 
-  const char *const unknown_name = _("Unknown");
+  if (name == NULL) {
+    name = _("Unknown");
+    name_len = strlen(name);
+  } else if (name_len == TV_TRANSLATE) {
+    name = _(name);
+    name_len = strlen(name);
+  } else if (name_len == TV_CSTRING) {
+    name_len = strlen(name);
+  }
 
-  emsgf(_(error_message), (name != NULL ? name_len : strlen(unknown_name)),
-        (name != NULL ? name : unknown_name));
+  emsgf(_(error_message), (int)name_len, name);
 
   return true;
 }
diff --git a/src/nvim/eval/typval.h b/src/nvim/eval/typval.h
index 7eab22bc12..df46222067 100644
--- a/src/nvim/eval/typval.h
+++ b/src/nvim/eval/typval.h
@@ -423,6 +423,17 @@ static inline bool tv_is_func(const typval_T tv)
   return tv.v_type == VAR_FUNC || tv.v_type == VAR_PARTIAL;
 }
 
+/// Specify that argument needs to be translated
+///
+/// Used for size_t length arguments to avoid calling gettext() and strlen()
+/// unless needed.
+#define TV_TRANSLATE (SIZE_MAX)
+
+/// Specify that argument is a NUL-terminated C string
+///
+/// Used for size_t length arguments to avoid calling strlen() unless needed.
+#define TV_CSTRING (SIZE_MAX - 1)
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "eval/typval.h.generated.h"
 #endif

From 276ee1f7fb989b931a9ddfabfd4aaf1782bcbb77 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Thu, 13 Apr 2017 23:42:51 +0300
Subject: [PATCH 040/257] eval: Add comment regarding why special values are
 needed

---
 src/nvim/eval.c        | 12 ++++++++++++
 src/nvim/eval/typval.c |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index e81378bcaa..281b80a915 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -18871,6 +18871,12 @@ static void set_var(const char *name, const size_t name_len, typval_T *const tv,
 ///                       to compute the length with strlen() without
 ///                       translating.
 ///
+///                       Both #TV_… values are used for optimization purposes:
+///                       variable name with its length is needed only in case
+///                       of error, when no error occurs computing them is
+///                       a waste of CPU resources. This especially applies to
+///                       gettext.
+///
 /// @return True if variable is read-only: either always or in sandbox when
 ///         sandbox is enabled, false otherwise.
 bool var_check_ro(const int flags, const char *name,
@@ -18910,6 +18916,12 @@ bool var_check_ro(const int flags, const char *name,
 ///                       to compute the length with strlen() without
 ///                       translating.
 ///
+///                       Both #TV_… values are used for optimization purposes:
+///                       variable name with its length is needed only in case
+///                       of error, when no error occurs computing them is
+///                       a waste of CPU resources. This especially applies to
+///                       gettext.
+///
 /// @return True if variable is fixed, false otherwise.
 static bool var_check_fixed(const int flags, const char *name,
                             size_t name_len)
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
index c29c67124f..b70554c1ef 100644
--- a/src/nvim/eval/typval.c
+++ b/src/nvim/eval/typval.c
@@ -2050,6 +2050,12 @@ bool tv_islocked(const typval_T *const tv)
 ///                       to compute the length with strlen() without
 ///                       translating.
 ///
+///                       Both #TV_… values are used for optimization purposes:
+///                       variable name with its length is needed only in case
+///                       of error, when no error occurs computing them is
+///                       a waste of CPU resources. This especially applies to
+///                       gettext.
+///
 /// @return true if variable is locked, false otherwise.
 bool tv_check_lock(const VarLockStatus lock, const char *name,
                    size_t name_len)

From b54e5c220f0b1bff31ce65c6988f70cbb9780b5e Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Fri, 14 Apr 2017 00:12:05 +0300
Subject: [PATCH 041/257] unittests: Add a test for TV_CSTRING
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Not using enum{} because SIZE_MAX exceeds integer and I do not really like how
enum definition is described in C99:

1. Even though all values must fit into the chosen type (6.7.2.2, p 4) the type
   to choose is still implementation-defined.
2. 6.4.4.3 explicitly states that “an identifier declared as an enumeration
   constant has type `int`”. So it looks like “no matter what type was chosen
   for enumeration, constants will be integers”. Yet the following simple
   program:

        #include <stdint.h>
        #include <stdio.h>
        #include <stddef.h>

        enum { X=SIZE_MAX };

        int main(int argc, char **argv)
        {
          printf("x:%zu m:%zu t:%zu v:%zu",
                 sizeof(X), sizeof(SIZE_MAX), sizeof(size_t), (size_t)X);
        }

    yields one of the following using different compilers:

    - clang/gcc/pathcc: `x:8 m:8 t:8 v:18446744073709551615`
    - pcc/tcc: `x:4 m:8 t:8 v:1844674407370955161`

    If I remove the cast of X to size_t then pcc/tcc both yield `x:4 m:8 t:8
    v:4294967295`, other compilers’ output does not change.

    All compilers were called with `$compiler -std=c99 -xc -` (feeding program
    from echo), except for `tcc` which has missing `-std=c99`. `pcc` seems to
    ignore the argument though: it is perfectly fine with `-std=c1000`.
---
 src/nvim/eval/typval.h         | 7 +++++++
 test/unit/eval/typval_spec.lua | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/src/nvim/eval/typval.h b/src/nvim/eval/typval.h
index df46222067..0f659727ee 100644
--- a/src/nvim/eval/typval.h
+++ b/src/nvim/eval/typval.h
@@ -17,6 +17,7 @@
 #include "nvim/pos.h"      // for linenr_T
 #include "nvim/gettext.h"
 #include "nvim/message.h"
+#include "nvim/macros.h"
 
 /// Type used for VimL VAR_NUMBER values
 typedef int varnumber_T;
@@ -434,6 +435,12 @@ static inline bool tv_is_func(const typval_T tv)
 /// Used for size_t length arguments to avoid calling strlen() unless needed.
 #define TV_CSTRING (SIZE_MAX - 1)
 
+#ifdef UNIT_TESTING
+// Do not use enum constants, see commit message.
+EXTERN const size_t kTVCstring INIT(= TV_CSTRING);
+EXTERN const size_t kTVTranslate INIT(= TV_TRANSLATE);
+#endif
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "eval/typval.h.generated.h"
 #endif
diff --git a/test/unit/eval/typval_spec.lua b/test/unit/eval/typval_spec.lua
index a1edfcfb7c..6308ae7367 100644
--- a/test/unit/eval/typval_spec.lua
+++ b/test/unit/eval/typval_spec.lua
@@ -2450,6 +2450,10 @@ describe('typval.c', function()
                                'E741: Value is locked: Unknown'))
         eq(true, tv_check_lock(lib.VAR_FIXED, nil, 0,
                                'E742: Cannot change value of Unknown'))
+        eq(true, tv_check_lock(lib.VAR_LOCKED, nil, lib.kTVCstring,
+                               'E741: Value is locked: Unknown'))
+        eq(true, tv_check_lock(lib.VAR_FIXED, 'test', lib.kTVCstring,
+                               'E742: Cannot change value of test'))
       end)
     end)
     describe('equal()', function()

From 31fd6d4bbf80d0f50893ab6144aa5eb70c95c351 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Fri, 14 Apr 2017 23:57:44 +0300
Subject: [PATCH 042/257] eval/typval: Do not translate tv_clear argument, this
 is useless

---
 src/nvim/eval/typval.c | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
index b70554c1ef..d5177138b0 100644
--- a/src/nvim/eval/typval.c
+++ b/src/nvim/eval/typval.c
@@ -1799,11 +1799,13 @@ static inline void _nothing_conv_dict_end(typval_T *const tv,
 #define TYPVAL_ENCODE_NAME nothing
 #define TYPVAL_ENCODE_FIRST_ARG_TYPE const void *const
 #define TYPVAL_ENCODE_FIRST_ARG_NAME ignored
+#define TYPVAL_ENCODE_TRANSLATE_OBJECT_NAME
 #include "nvim/eval/typval_encode.c.h"
 #undef TYPVAL_ENCODE_SCOPE
 #undef TYPVAL_ENCODE_NAME
 #undef TYPVAL_ENCODE_FIRST_ARG_TYPE
 #undef TYPVAL_ENCODE_FIRST_ARG_NAME
+#undef TYPVAL_ENCODE_TRANSLATE_OBJECT_NAME
 
 #undef TYPVAL_ENCODE_ALLOW_SPECIALS
 #undef TYPVAL_ENCODE_CONV_NIL
@@ -1837,12 +1839,14 @@ static inline void _nothing_conv_dict_end(typval_T *const tv,
 /// @param[in,out]  tv  Value to free.
 void tv_clear(typval_T *const tv)
 {
-  static char *objname = NULL;  // cached because gettext() is slow. #6437
-  if (objname == NULL) {
-    objname = xstrdup(_("tv_clear() argument"));
-  }
   if (tv != NULL && tv->v_type != VAR_UNKNOWN) {
-    const int evn_ret = encode_vim_to_nothing(NULL, tv, objname);
+    // WARNING: do not translate the string here, gettext is slow and function
+    // is used *very* often. At the current state encode_vim_to_nothing() does
+    // not error out and does not use the argument anywhere.
+    //
+    // If situation changes and this argument will be used, translate it in the
+    // place where it is used.
+    const int evn_ret = encode_vim_to_nothing(NULL, tv, "tv_clear() argument");
     (void)evn_ret;
     assert(evn_ret == OK);
   }

From c289986c89dd0189ed8ab709bf2eb822c493542a Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 15 Apr 2017 00:08:50 +0300
Subject: [PATCH 043/257] =?UTF-8?q?eval/encode:=20Do=20translate=20?=
 =?UTF-8?q?=E2=80=9C=E2=80=A6=20argument=E2=80=9D=20strings,=20but=20only?=
 =?UTF-8?q?=20in=20conv=5Ferror?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/nvim/eval/encode.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/nvim/eval/encode.c b/src/nvim/eval/encode.c
index d74913a481..c058c3a9c0 100644
--- a/src/nvim/eval/encode.c
+++ b/src/nvim/eval/encode.c
@@ -179,9 +179,9 @@ static int conv_error(const char *const msg, const MPConvStack *const mpstack,
       }
     }
   }
-  EMSG3(msg, objname, (kv_size(*mpstack) == 0
-                       ? _("itself")
-                       : (char *) msg_ga.ga_data));
+  emsgf(msg, _(objname), (kv_size(*mpstack) == 0
+                          ? _("itself")
+                          : (char *)msg_ga.ga_data));
   ga_clear(&msg_ga);
   return FAIL;
 }
@@ -790,7 +790,7 @@ char *encode_tv2string(typval_T *tv, size_t *len)
   garray_T ga;
   ga_init(&ga, (int)sizeof(char), 80);
   const int evs_ret = encode_vim_to_string(&ga, tv,
-                                           "encode_tv2string() argument");
+                                           N_("encode_tv2string() argument"));
   (void)evs_ret;
   assert(evs_ret == OK);
   did_echo_string_emsg = false;
@@ -818,7 +818,7 @@ char *encode_tv2echo(typval_T *tv, size_t *len)
       ga_concat(&ga, tv->vval.v_string);
     }
   } else {
-    const int eve_ret = encode_vim_to_echo(&ga, tv, ":echo argument");
+    const int eve_ret = encode_vim_to_echo(&ga, tv, N_(":echo argument"));
     (void)eve_ret;
     assert(eve_ret == OK);
   }
@@ -841,7 +841,8 @@ char *encode_tv2json(typval_T *tv, size_t *len)
 {
   garray_T ga;
   ga_init(&ga, (int)sizeof(char), 80);
-  const int evj_ret = encode_vim_to_json(&ga, tv, "encode_tv2json() argument");
+  const int evj_ret = encode_vim_to_json(&ga, tv,
+                                         N_("encode_tv2json() argument"));
   if (!evj_ret) {
     ga_clear(&ga);
   }

From 12fc1defd6a1b13d1f801173e0b6a1cef28527ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Linse?= <bjorn.linse@gmail.com>
Date: Sat, 15 Apr 2017 11:19:40 +0200
Subject: [PATCH 044/257] ops: fix i<c-r> with multi-byte text (#6524)

---
 src/nvim/getchar.c                     |  4 ++--
 test/functional/insert/ctrl_r_spec.lua | 19 +++++++++++++++++++
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 test/functional/insert/ctrl_r_spec.lua

diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index b83681ad01..3b248c4bc6 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -302,13 +302,13 @@ static void add_num_buff(buffheader_T *buf, long n)
  */
 static void add_char_buff(buffheader_T *buf, int c)
 {
-  char bytes[MB_MAXBYTES + 1];
+  uint8_t bytes[MB_MAXBYTES + 1];
 
   int len;
   if (IS_SPECIAL(c)) {
     len = 1;
   } else {
-    len = (*mb_char2bytes)(c, (char_u *)bytes);
+    len = mb_char2bytes(c, bytes);
   }
 
   for (int i = 0; i < len; i++) {
diff --git a/test/functional/insert/ctrl_r_spec.lua b/test/functional/insert/ctrl_r_spec.lua
new file mode 100644
index 0000000000..adc3c4b406
--- /dev/null
+++ b/test/functional/insert/ctrl_r_spec.lua
@@ -0,0 +1,19 @@
+local helpers = require('test.functional.helpers')(after_each)
+local clear, feed = helpers.clear, helpers.feed
+local expect, command = helpers.expect, helpers.command
+
+describe('insert-mode Ctrl-R', function()
+  before_each(clear)
+
+  it('works', function()
+    command("let @@ = 'test'")
+    feed('i<C-r>"')
+    expect('test')
+  end)
+
+  it('works with multi-byte text', function()
+    command("let @@ = 'påskägg'")
+    feed('i<C-r>"')
+    expect('påskägg')
+  end)
+end)

From a8f7872f445a9ec18be40b203a65d809adb05cd1 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 15 Apr 2017 08:50:43 -0400
Subject: [PATCH 045/257] test_timers.vim: Adjust timing to handle difference
 in implementation

---
 src/nvim/testdir/test_timers.vim | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/nvim/testdir/test_timers.vim b/src/nvim/testdir/test_timers.vim
index fd2b50b495..d377062780 100644
--- a/src/nvim/testdir/test_timers.vim
+++ b/src/nvim/testdir/test_timers.vim
@@ -20,7 +20,7 @@ func Test_oneshot()
   let slept = WaitFor('g:val == 1')
   call assert_equal(1, g:val)
   if has('reltime')
-    call assert_inrange(49, 100, slept)
+    call assert_inrange(40, 100, slept)
   else
     call assert_inrange(20, 100, slept)
   endif
@@ -32,7 +32,7 @@ func Test_repeat_three()
   let slept = WaitFor('g:val == 3')
   call assert_equal(3, g:val)
   if has('reltime')
-    call assert_inrange(149, 250, slept)
+    call assert_inrange(120, 250, slept)
   else
     call assert_inrange(80, 200, slept)
   endif
@@ -57,7 +57,7 @@ func Test_with_partial_callback()
   let slept = WaitFor('g:val == 1')
   call assert_equal(1, g:val)
   if has('reltime')
-    call assert_inrange(49, 130, slept)
+    call assert_inrange(40, 130, slept)
   else
     call assert_inrange(20, 100, slept)
   endif
@@ -119,7 +119,7 @@ func Test_paused()
   let slept = WaitFor('g:val == 1')
   call assert_equal(1, g:val)
   if has('reltime')
-    call assert_inrange(0, 30, slept)
+    call assert_inrange(0, 60, slept)
   else
     call assert_inrange(0, 10, slept)
   endif

From c70ab1a2e2d78832e0246bd64c53c8b92912f0ef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Linse?= <bjorn.linse@gmail.com>
Date: Sat, 15 Apr 2017 15:06:50 +0200
Subject: [PATCH 046/257] test: make locale dependent oldtest more reliable
 (#6526)

---
 src/nvim/testdir/test_normal.vim | 40 +++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/nvim/testdir/test_normal.vim b/src/nvim/testdir/test_normal.vim
index c529971528..6261625801 100644
--- a/src/nvim/testdir/test_normal.vim
+++ b/src/nvim/testdir/test_normal.vim
@@ -1606,12 +1606,13 @@ fun! Test_normal30_changecase()
   norm! V~
   call assert_equal('THIS IS A simple test: äüöss', getline('.'))
 
-  " Turkish ASCII turns to multi-byte.  On Mac the Turkish locale is available
-  " but toupper()/tolower() don't do the right thing.
-  if !has('mac') && !has('osx')
-    try
-      lang tr_TR.UTF-8
-      set casemap=
+  " Turkish ASCII turns to multi-byte.  On some systems Turkish locale
+  " is available but toupper()/tolower() don't do the right thing.
+  try
+    lang tr_TR.UTF-8
+    set casemap=
+    let iupper = toupper('i')
+    if iupper == "\u0130"
       call setline(1, 'iI')
       1normal gUU
       call assert_equal("\u0130I", getline(1))
@@ -1621,8 +1622,7 @@ fun! Test_normal30_changecase()
       1normal guu
       call assert_equal("i\u0131", getline(1))
       call assert_equal("i\u0131", tolower("iI"))
-
-      set casemap&
+    elseif iupper == "I"
       call setline(1, 'iI')
       1normal gUU
       call assert_equal("II", getline(1))
@@ -1632,13 +1632,25 @@ fun! Test_normal30_changecase()
       1normal guu
       call assert_equal("ii", getline(1))
       call assert_equal("ii", tolower("iI"))
+    else
+      call assert_true(false, "expected toupper('i') to be either 'I' or '\u0131'")
+    endif
+    set casemap&
+    call setline(1, 'iI')
+    1normal gUU
+    call assert_equal("II", getline(1))
+    call assert_equal("II", toupper("iI"))
 
-      lang en_US.UTF-8
-    catch /E197:/
-      " can't use Turkish locale
-      throw 'Skipped: Turkish locale not available'
-    endtry
-  endif
+    call setline(1, 'iI')
+    1normal guu
+    call assert_equal("ii", getline(1))
+    call assert_equal("ii", tolower("iI"))
+
+    lang en_US.UTF-8
+  catch /E197:/
+    " can't use Turkish locale
+    throw 'Skipped: Turkish locale not available'
+  endtry
 
   " clean up
   bw!

From 0dddd8a27caac1060dedbe55b285e3564e81e995 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 15 Apr 2017 19:13:43 +0300
Subject: [PATCH 047/257] os/fileio: Remove FUNC_ATTR_MALLOC for file_open_new

fp contains pointer to rbuffer
---
 src/nvim/os/fileio.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/os/fileio.c b/src/nvim/os/fileio.c
index 4b7b53fc7f..3c47c66196 100644
--- a/src/nvim/os/fileio.c
+++ b/src/nvim/os/fileio.c
@@ -100,7 +100,7 @@ int file_open(FileDescriptor *const ret_fp, const char *const fname,
 /// @return [allocated] Opened file or NULL in case of error.
 FileDescriptor *file_open_new(int *const error, const char *const fname,
                               const int flags, const int mode)
-  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_MALLOC FUNC_ATTR_WARN_UNUSED_RESULT
+  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
 {
   FileDescriptor *const fp = xmalloc(sizeof(*fp));
   if ((*error = file_open(fp, fname, flags, mode)) != 0) {

From b08b71c7288ed7bbeae6066ab36a1366d0673bf5 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 15 Apr 2017 19:16:00 +0300
Subject: [PATCH 048/257] eval/typval: Remove FUNC_ATTR_MALLOC from
 tv_list_alloc

Allocated list points to previously allocated list.
Allocated list is saved to gc_first_list.
---
 src/nvim/eval/typval.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
index eb6db9547b..14db330dba 100644
--- a/src/nvim/eval/typval.c
+++ b/src/nvim/eval/typval.c
@@ -136,7 +136,7 @@ void tv_list_watch_fix(list_T *const l, const listitem_T *const item)
 ///
 /// @return [allocated] new list.
 list_T *tv_list_alloc(void)
-  FUNC_ATTR_NONNULL_RET FUNC_ATTR_MALLOC
+  FUNC_ATTR_NONNULL_RET
 {
   list_T *const list = xcalloc(1, sizeof(list_T));
 

From b9004d744811f530922fbb194ea02033d332f375 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 15 Apr 2017 19:16:40 +0300
Subject: [PATCH 049/257] eval/typval: Remove FUNC_ATTR_MALLOC from
 tv_dict_item_copy

Allocated storage may receive pointer to the list after tv_copy().
---
 src/nvim/eval/typval.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
index 14db330dba..4d1400484a 100644
--- a/src/nvim/eval/typval.c
+++ b/src/nvim/eval/typval.c
@@ -1011,7 +1011,6 @@ void tv_dict_item_free(dictitem_T *const item)
 /// @return [allocated] new dictionary item.
 static dictitem_T *tv_dict_item_copy(dictitem_T *const di)
   FUNC_ATTR_NONNULL_RET FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
-  FUNC_ATTR_MALLOC
 {
   dictitem_T *const new_di = tv_dict_item_alloc((const char *)di->di_key);
   tv_copy(&di->di_tv, &new_di->di_tv);

From af3579d5f7bc86a25fd73e94c6de0e73ae9d8e12 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 15 Apr 2017 19:18:25 +0300
Subject: [PATCH 050/257] eval/typval: Remove FUNC_ATTR_MALLOC from
 tv_dict_alloc

Allocated dict points to previously allocated dict.
Queue in allocated dict points to itself.
Hashtab in allocated dict points to inside itself.
Allocated dict is saved to gc_first_dict.
---
 src/nvim/eval/typval.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
index 4d1400484a..9e954be9b3 100644
--- a/src/nvim/eval/typval.c
+++ b/src/nvim/eval/typval.c
@@ -1039,7 +1039,7 @@ void tv_dict_item_remove(dict_T *const dict, dictitem_T *const item)
 ///
 /// @return [allocated] new dictionary.
 dict_T *tv_dict_alloc(void)
-  FUNC_ATTR_NONNULL_RET FUNC_ATTR_MALLOC FUNC_ATTR_WARN_UNUSED_RESULT
+  FUNC_ATTR_NONNULL_RET FUNC_ATTR_WARN_UNUSED_RESULT
 {
   dict_T *const d = xmalloc(sizeof(dict_T));
 

From 82ba2891ae905fabacafc58daebedc80533b8334 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 15 Apr 2017 19:19:22 +0300
Subject: [PATCH 051/257] eval/typval: Remove FUNC_ATTR_MALLOC from
 tv_list_alloc_ret

Same as tv_list_alloc, but additionally ret_tv receives pointer to the newly
allocated list.
---
 src/nvim/eval/typval.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
index 9e954be9b3..70ec3dfe39 100644
--- a/src/nvim/eval/typval.c
+++ b/src/nvim/eval/typval.c
@@ -1576,7 +1576,7 @@ void tv_dict_set_keys_readonly(dict_T *const dict)
 ///
 /// @return [allocated] pointer to the created list.
 list_T *tv_list_alloc_ret(typval_T *const ret_tv)
-  FUNC_ATTR_NONNULL_ALL FUNC_ATTR_MALLOC
+  FUNC_ATTR_NONNULL_ALL
 {
   list_T *const l = tv_list_alloc();
   ret_tv->vval.v_list = l;

From d191ba1db38cf4bad3e4ed3e3346f3f8a9c015cf Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 15 Apr 2017 19:23:00 +0300
Subject: [PATCH 052/257] option: Remove FUNC_ATTR_MALLOC from
 get_winbuf_options

Same as tv_dict_alloc() and additionally it saves some strings inside
a dictionary.
---
 src/nvim/option.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/option.c b/src/nvim/option.c
index 458d80716c..0070a0056d 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -6974,7 +6974,7 @@ bool signcolumn_on(win_T *wp)
 
 /// Get window or buffer local options
 dict_T *get_winbuf_options(const int bufopt)
-  FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_MALLOC
+  FUNC_ATTR_WARN_UNUSED_RESULT
 {
   dict_T *const d = tv_dict_alloc();
 

From ac47e64ecad6b21d4d29066b37ab4018fcd8da48 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 15 Apr 2017 19:25:00 +0300
Subject: [PATCH 053/257] ops: Remove FUNC_ATTR_MALLOC from copy_register

Returned storage has a pointer to a newly allocated array.
---
 src/nvim/ops.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index f11d6b69b2..5212ec45ab 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -802,7 +802,6 @@ static bool is_append_register(int regname)
 /// Returns a copy of contents in register `name`
 /// for use in do_put. Should be freed by caller.
 yankreg_T *copy_register(int name)
-  FUNC_ATTR_MALLOC
   FUNC_ATTR_NONNULL_RET
 {
   yankreg_T *reg = get_yank_register(name, YREG_PASTE);

From d76a13bb65574f4811313ada6454f7d34cde2a2c Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 15 Apr 2017 19:39:53 +0300
Subject: [PATCH 054/257] os/shell: Remove FUNC_ATTR_MALLOC from
 shell_build_argv

Returns an array of allocated strings.
---
 src/nvim/os/shell.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c
index 5cc9d4b79b..29c0431521 100644
--- a/src/nvim/os/shell.c
+++ b/src/nvim/os/shell.c
@@ -47,7 +47,7 @@ typedef struct {
 /// @param extra_args Extra arguments to the shell, or NULL.
 /// @return Newly allocated argument vector. Must be freed with shell_free_argv.
 char **shell_build_argv(const char *cmd, const char *extra_args)
-  FUNC_ATTR_NONNULL_RET FUNC_ATTR_MALLOC
+  FUNC_ATTR_NONNULL_RET
 {
   size_t argc = tokenize(p_sh, NULL) + (cmd ? tokenize(p_shcf, NULL) : 0);
   char **rv = xmalloc((argc + 4) * sizeof(*rv));

From ec0fabd4d5129c7293c8b8fcf0d0946ae5bd5fd4 Mon Sep 17 00:00:00 2001
From: Jurica Bradaric <jbradaric@gmail.com>
Date: Sat, 15 Apr 2017 18:45:47 +0200
Subject: [PATCH 055/257] eval.c: Code style fixes

---
 src/nvim/eval.c | 31 ++++++++++++++++++-------------
 1 file changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 6a18baf2e2..33a553436f 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -16696,11 +16696,11 @@ static void f_timer_info(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   if (argvars[0].v_type != VAR_UNKNOWN) {
     if (argvars[0].v_type != VAR_NUMBER) {
       EMSG(_(e_number_exp));
-    } else {
-      timer_T *timer = pmap_get(uint64_t)(timers, tv_get_number(&argvars[0]));
-      if (timer != NULL && !timer->stopped) {
-        add_timer_info(rettv, timer);
-      }
+      return;
+    }
+    timer_T *timer = pmap_get(uint64_t)(timers, tv_get_number(&argvars[0]));
+    if (timer != NULL && !timer->stopped) {
+      add_timer_info(rettv, timer);
     }
   } else {
     add_timer_info_all(rettv);
@@ -16712,12 +16712,12 @@ static void f_timer_pause(typval_T *argvars, typval_T *unused, FunPtr fptr)
 {
   if (argvars[0].v_type != VAR_NUMBER) {
     EMSG(_(e_number_exp));
-  } else {
-    int paused = (bool)tv_get_number(&argvars[1]);
-    timer_T *timer = pmap_get(uint64_t)(timers, tv_get_number(&argvars[0]));
-    if (timer != NULL) {
-      timer->paused = paused;
-    }
+    return;
+  }
+  int paused = (bool)tv_get_number(&argvars[1]);
+  timer_T *timer = pmap_get(uint64_t)(timers, tv_get_number(&argvars[0]));
+  if (timer != NULL) {
+    timer->paused = paused;
   }
 }
 
@@ -16790,7 +16790,7 @@ static void f_timer_stop(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 
 static void f_timer_stopall(typval_T *argvars, typval_T *unused, FunPtr fptr)
 {
-  timer_teardown();
+  timer_stop_all();
 }
 
 // invoked on the main loop
@@ -16853,7 +16853,7 @@ static void timer_decref(timer_T *timer)
   }
 }
 
-void timer_teardown(void)
+static void timer_stop_all(void)
 {
   timer_T *timer;
   map_foreach_value(timers, timer, {
@@ -16861,6 +16861,11 @@ void timer_teardown(void)
   })
 }
 
+void timer_teardown(void)
+{
+  timer_stop_all();
+}
+
 /*
  * "tolower(string)" function
  */

From 33952a7661927f875ebf40a60e236831c789de58 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 18:53:02 +0300
Subject: [PATCH 056/257] *: Silence some false positives

---
 src/nvim/api/private/helpers.h  | 1 +
 src/nvim/buffer.h               | 3 ++-
 src/nvim/eval/typval_encode.c.h | 4 ++--
 src/nvim/globals.h              | 1 +
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/nvim/api/private/helpers.h b/src/nvim/api/private/helpers.h
index 9fe8c351cf..20b4015fb5 100644
--- a/src/nvim/api/private/helpers.h
+++ b/src/nvim/api/private/helpers.h
@@ -8,6 +8,7 @@
 #include "nvim/memory.h"
 #include "nvim/lib/kvec.h"
 
+// -V:api_set_error:618
 #define api_set_error(err, errtype, ...) \
   do { \
     snprintf((err)->msg, \
diff --git a/src/nvim/buffer.h b/src/nvim/buffer.h
index 016c5ce3b7..39b9faf8b1 100644
--- a/src/nvim/buffer.h
+++ b/src/nvim/buffer.h
@@ -103,7 +103,8 @@ static inline void buf_set_changedtick(buf_T *const buf, const int changedtick)
   assert(changedtick_di->di_flags == (DI_FLAGS_RO|DI_FLAGS_FIX));
 # endif
   assert(changedtick_di == (dictitem_T *)&buf->changedtick_di);
-  assert(&buf->b_changedtick == &buf->changedtick_di.di_tv.vval.v_number);
+  assert(&buf->b_changedtick  // -V501
+         == &buf->changedtick_di.di_tv.vval.v_number);
 #endif
   buf->b_changedtick = changedtick;
 }
diff --git a/src/nvim/eval/typval_encode.c.h b/src/nvim/eval/typval_encode.c.h
index ad54eef4a0..3487880bd2 100644
--- a/src/nvim/eval/typval_encode.c.h
+++ b/src/nvim/eval/typval_encode.c.h
@@ -611,7 +611,7 @@ _convert_one_value_regular_dict: {}
 typval_encode_stop_converting_one_item:
   return OK;
   // Prevent “unused label” warnings.
-  goto typval_encode_stop_converting_one_item;
+  goto typval_encode_stop_converting_one_item;  // -V779
 }
 
 TYPVAL_ENCODE_SCOPE int _TYPVAL_ENCODE_ENCODE(
@@ -814,6 +814,6 @@ encode_vim_to__error_ret:
   _mp_destroy(mpstack);
   return FAIL;
   // Prevent “unused label” warnings.
-  goto typval_encode_stop_converting_one_item;
+  goto typval_encode_stop_converting_one_item;  // -V779
 }
 #endif  // NVIM_EVAL_TYPVAL_ENCODE_C_H
diff --git a/src/nvim/globals.h b/src/nvim/globals.h
index 3c705d88a5..df9f418951 100644
--- a/src/nvim/globals.h
+++ b/src/nvim/globals.h
@@ -548,6 +548,7 @@ EXTERN win_T    *prevwin INIT(= NULL);  /* previous window */
   FOR_ALL_TABS(tp) \
     FOR_ALL_WINDOWS_IN_TAB(wp, tp)
 
+// -V:FOR_ALL_WINDOWS_IN_TAB:501
 # define FOR_ALL_WINDOWS_IN_TAB(wp, tp) \
   for (win_T *wp = ((tp) == curtab) \
               ? firstwin : (tp)->tp_firstwin; wp != NULL; wp = wp->w_next)

From a096766ee3edc1197039d236c3a5c42365d60d4d Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 19:27:17 +0300
Subject: [PATCH 057/257] diff: Silence -V519
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Not exactly a false positive, but previous assignment is a part of the pattern
“change global, run code which uses it, change global back”.
---
 src/nvim/diff.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index ff76abc01f..49574fbbfc 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -1076,8 +1076,8 @@ void diff_win_options(win_T *wp, int addbuf)
   if (!wp->w_p_diff) {
     wp->w_p_wrap_save = wp->w_p_wrap;
   }
-  wp->w_p_wrap = FALSE;
-  curwin = wp;
+  wp->w_p_wrap = false;
+  curwin = wp;  // -V519
   curbuf = curwin->w_buffer;
 
   if (!wp->w_p_diff) {

From 2901921a1b5bf72cb404fed0ed0510124eaf6e8b Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 19:30:18 +0300
Subject: [PATCH 058/257] digraph: Ignore false positive

Reversed order is intentional, digraphs allow swapping characters.
---
 src/nvim/digraph.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c
index 560205fe7d..fb4a8c6d0d 100644
--- a/src/nvim/digraph.c
+++ b/src/nvim/digraph.c
@@ -1569,7 +1569,8 @@ int getdigraph(int char1, int char2, int meta_char)
 
   if (((retval = getexactdigraph(char1, char2, meta_char)) == char2)
       && (char1 != char2)
-      && ((retval = getexactdigraph(char2, char1, meta_char)) == char1)) {
+      && ((retval = getexactdigraph(char2, char1, meta_char))  // -V764
+          == char1)) {
     return char2;
   }
   return retval;

From 4f0fc1f06a6b551c081f1e4abf1a119588c6a386 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 19:32:38 +0300
Subject: [PATCH 059/257] digraph: Fix errors due to has_mbyte and friends
 being fixed

---
 src/nvim/digraph.c | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c
index fb4a8c6d0d..66fb525920 100644
--- a/src/nvim/digraph.c
+++ b/src/nvim/digraph.c
@@ -1676,11 +1676,7 @@ static void printdigraph(digr_T *dp)
 
   int list_width;
 
-  if ((dy_flags & DY_UHEX) || has_mbyte) {
-    list_width = 13;
-  } else {
-    list_width = 11;
-  }
+  list_width = 13;
 
   if (dp->result != 0) {
     if (msg_col > Columns - list_width) {
@@ -1701,15 +1697,11 @@ static void printdigraph(digr_T *dp)
     *p++ = dp->char2;
     *p++ = ' ';
 
-    if (has_mbyte) {
-      // add a space to draw a composing char on
-      if (enc_utf8 && utf_iscomposing(dp->result)) {
-        *p++ = ' ';
-      }
-      p += (*mb_char2bytes)(dp->result, p);
-    } else {
-      *p++ = (char_u)dp->result;
+    // add a space to draw a composing char on
+    if (utf_iscomposing(dp->result)) {
+      *p++ = ' ';
     }
+    p += (*mb_char2bytes)(dp->result, p);
 
     if (char2cells(dp->result) == 1) {
       *p++ = ' ';

From 9e9ba14e0e443beff4c1418cdaff412c394852c0 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 19:38:16 +0300
Subject: [PATCH 060/257] edit: Fix strange code

Based on the flow it looks like ptr could not be NULL here: if ptr_arg is NULL
ptr is compl_leader, if compl_leader is NULL function exits. This also applies
to Vim as far as I see.
---
 src/nvim/edit.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index fe00027dec..1ca5424736 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -3427,10 +3427,11 @@ static void ins_compl_fixRedoBufForLeader(char_u *ptr_arg)
       len -= (*mb_head_off)(p, p + len);
     for (p += len; *p != NUL; mb_ptr_adv(p))
       AppendCharToRedobuff(K_BS);
-  } else
+  } else {
     len = 0;
-  if (ptr != NULL)
-    AppendToRedobuffLit(ptr + len, -1);
+  }
+  assert(ptr != NULL);
+  AppendToRedobuffLit(ptr + len, -1);
 }
 
 /*

From fb4754104b50baa0eb489e5c9b50c1d37523f2d3 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 19:39:55 +0300
Subject: [PATCH 061/257] macros: Fix excessive check

---
 src/nvim/macros.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/macros.h b/src/nvim/macros.h
index b816b34b39..214af82422 100644
--- a/src/nvim/macros.h
+++ b/src/nvim/macros.h
@@ -75,7 +75,7 @@
   do { \
     if (*p_langmap \
         && (condition) \
-        && (p_lrm || (!p_lrm && KeyTyped)) \
+        && (p_lrm || KeyTyped) \
         && !KeyStuffed \
         && (c) >= 0) \
     { \

From dd5b0cc17a1ec6925c6cd7a5be23eb78bf953f76 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 19:50:23 +0300
Subject: [PATCH 062/257] edit: Copy assert to before the warning

---
 src/nvim/edit.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 1ca5424736..51d0847bc7 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -3419,6 +3419,7 @@ static void ins_compl_fixRedoBufForLeader(char_u *ptr_arg)
     else
       return;        /* nothing to do */
   }
+  assert(ptr != NULL);
   if (compl_orig_text != NULL) {
     p = compl_orig_text;
     for (len = 0; p[len] != NUL && p[len] == ptr[len]; ++len)

From d70a0f6895048a3dcb5ec841afd01daee4866be4 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 19:51:35 +0300
Subject: [PATCH 063/257] eval/typval_encode: Silence then/else equivalence
 warning

---
 src/nvim/eval/typval_encode.c.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/eval/typval_encode.c.h b/src/nvim/eval/typval_encode.c.h
index 3487880bd2..b4a70fb188 100644
--- a/src/nvim/eval/typval_encode.c.h
+++ b/src/nvim/eval/typval_encode.c.h
@@ -489,7 +489,7 @@ static int _TYPVAL_ENCODE_CONVERT_ONE_VALUE(
             }
             if (is_string) {
               TYPVAL_ENCODE_CONV_STR_STRING(tv, buf, len);
-            } else {
+            } else {  // -V523
               TYPVAL_ENCODE_CONV_STRING(tv, buf, len);
             }
             xfree(buf);

From 05c1829a8ccf2df07927bec502467faa443d90d8 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 19:55:49 +0300
Subject: [PATCH 064/257] eval: Silence eap->skip false positives

`lnum` starts at `eap->line2` in case of skipping, so cycle is always run at
least once.
---
 src/nvim/eval.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 772994de31..49e3590185 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -2747,7 +2747,7 @@ void ex_call(exarg_T *eap)
   } else
     lnum = eap->line1;
   for (; lnum <= eap->line2; ++lnum) {
-    if (!eap->skip && eap->addr_count > 0) {
+    if (!eap->skip && eap->addr_count > 0) {  // -V560
       curwin->w_cursor.lnum = lnum;
       curwin->w_cursor.col = 0;
       curwin->w_cursor.coladd = 0;
@@ -2768,7 +2768,7 @@ void ex_call(exarg_T *eap)
     }
 
     tv_clear(&rettv);
-    if (doesrange || eap->skip) {
+    if (doesrange || eap->skip) {  // -V560
       break;
     }
 

From 97a1ccf8e7470d8c781c86253f8a7795fe50dc50 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 19:56:55 +0300
Subject: [PATCH 065/257] eval: Fix V547: `d == NULL` was already checked at
 line 2986

---
 src/nvim/eval.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 49e3590185..4cc400799d 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -2999,8 +2999,7 @@ int do_unlet(const char *const name, const size_t name_len, const int forceit)
         return FAIL;
       }
 
-      if (d == NULL
-          || tv_check_lock(d->dv_lock, (const char *)name, STRLEN(name))) {
+      if (tv_check_lock(d->dv_lock, (const char *)name, STRLEN(name))) {
         return FAIL;
       }
 

From 7c9e3d6cadb441aaa40c8539de41e302228196a9 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:02:06 +0300
Subject: [PATCH 066/257] eval: Refactor f_char2nr

With has_mbyte equal to 1 and &encoding always UTF-8 second argument is no
longer useful: utf_ptr2char is the same as mb_ptr2char.

Also changes function behaviour a bit: now if second argument is not a number it
immediately returns with error, without bothering to get a character.
---
 src/nvim/eval.c | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 4cc400799d..bfc9f6eaa6 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -7305,18 +7305,14 @@ static void f_changenr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
  */
 static void f_char2nr(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
-  if (has_mbyte) {
-    int utf8 = 0;
-
-    if (argvars[1].v_type != VAR_UNKNOWN) {
-      utf8 = tv_get_number_chk(&argvars[1], NULL);
+  if (argvars[1].v_type != VAR_UNKNOWN) {
+    if (!tv_check_num(&argvars[1])) {
+      return;
     }
-
-    rettv->vval.v_number = (utf8 ? *utf_ptr2char : *mb_ptr2char)(
-        (const char_u *)tv_get_string(&argvars[0]));
-  } else {
-    rettv->vval.v_number = (uint8_t)(tv_get_string(&argvars[0])[0]);
   }
+
+  rettv->vval.v_number = utf_ptr2char(
+      (const char_u *)tv_get_string(&argvars[0]));
 }
 
 /*

From 31190879cc85cb3e8a056d544ea0c3ed63ce21df Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:07:54 +0300
Subject: [PATCH 067/257] eval: Fix useless NULL check

partial_name() as it is written now really cannot return NULL
---
 src/nvim/eval.c | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index bfc9f6eaa6..f8afc03c1c 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -8977,13 +8977,10 @@ static void f_get(typval_T *argvars, typval_T *rettv, FunPtr fptr)
       if (strcmp(what, "func") == 0 || strcmp(what, "name") == 0) {
         rettv->v_type = (*what == 'f' ? VAR_FUNC : VAR_STRING);
         const char *const n = (const char *)partial_name(pt);
-        if (n == NULL) {
-          rettv->vval.v_string = NULL;
-        } else {
-          rettv->vval.v_string = (char_u *)xstrdup(n);
-          if (rettv->v_type == VAR_FUNC) {
-            func_ref(rettv->vval.v_string);
-          }
+        assert(n != NULL);
+        rettv->vval.v_string = (char_u *)xstrdup(n);
+        if (rettv->v_type == VAR_FUNC) {
+          func_ref(rettv->vval.v_string);
         }
       } else if (strcmp(what, "dict") == 0) {
         rettv->v_type = VAR_DICT;

From 3c5f4b382f62d9f3cf5d54720592ff75d3a1f86d Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:08:56 +0300
Subject: [PATCH 068/257] eval: Silence octal constant warning

---
 src/nvim/eval.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index f8afc03c1c..a259bbf0eb 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -12538,7 +12538,7 @@ static void f_min(typval_T *argvars, typval_T *rettv, FunPtr fptr)
  */
 static void f_mkdir(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
-  int prot = 0755;
+  int prot = 0755;  // -V536
 
   rettv->vval.v_number = FAIL;
   if (check_restricted() || check_secure())

From fbdef2e6f2d65d3cc6f3c8a8dcd8b3cddf41c474 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:16:32 +0300
Subject: [PATCH 069/257] eval: Refactor nr2char()

Adds error messages, checks type and ignores the second argument.

Currently utf_char2bytes is able to handle any 31-bit character, not
limited by a unicode range. So checking for INT_MAX and not for
something else: function yet uses `int`.
---
 src/nvim/eval.c | 39 +++++++++++++++++++++++----------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index a259bbf0eb..71af801986 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -12763,25 +12763,32 @@ static void f_nextnonblank(typval_T *argvars, typval_T *rettv, FunPtr fptr)
  */
 static void f_nr2char(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
-  char_u buf[NUMBUFLEN];
-
-  if (has_mbyte) {
-    int utf8 = 0;
-
-    if (argvars[1].v_type != VAR_UNKNOWN) {
-      utf8 = tv_get_number_chk(&argvars[1], NULL);
+  if (argvars[1].v_type != VAR_UNKNOWN) {
+    if (!tv_check_num(&argvars[1])) {
+      return;
     }
-    if (utf8) {
-      buf[(*utf_char2bytes)((int)tv_get_number(&argvars[0]), buf)] = NUL;
-    } else {
-      buf[(*mb_char2bytes)((int)tv_get_number(&argvars[0]), buf)] = NUL;
-    }
-  } else {
-    buf[0] = (char_u)tv_get_number(&argvars[0]);
-    buf[1] = NUL;
   }
+
+  bool error = false;
+  const varnumber_T num = tv_get_number_chk(&argvars[0], &error);
+  if (error) {
+    return;
+  }
+  if (num < 0) {
+    emsgf(_("E5070: Character number could not be less then zero"));
+    return;
+  }
+  if (num > INT_MAX) {
+    emsgf(_("E5071: Character number could not be greater then INT_MAX (%i)"),
+          INT_MAX);
+    return;
+  }
+
+  char buf[MB_MAXBYTES];
+  const int len = utf_char2bytes((int)num, (char_u *)buf);
+
   rettv->v_type = VAR_STRING;
-  rettv->vval.v_string = vim_strsave(buf);
+  rettv->vval.v_string = xmemdupz(buf, (size_t)len);
 }
 
 /*

From 787d71a3afbe619a301ba7898e2c43fdcffdc8ec Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:19:10 +0300
Subject: [PATCH 070/257] eval: Fix condition in f_serverstop

---
 src/nvim/eval.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 71af801986..2a725c49f7 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -14306,7 +14306,7 @@ static void f_serverstop(typval_T *argvars, typval_T *rettv, FunPtr fptr)
     return;
   }
 
-  if (argvars[0].v_type == VAR_UNKNOWN || argvars[0].v_type != VAR_STRING) {
+  if (argvars[0].v_type != VAR_STRING) {
     EMSG(_(e_invarg));
     return;
   }

From 9b1dd084257fc2b5f50e29b283be698c13d4a509 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:20:38 +0300
Subject: [PATCH 071/257] eval: Remove unneeded varp check

---
 src/nvim/eval.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 2a725c49f7..6e204be481 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -14330,7 +14330,7 @@ static void f_setbufvar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   buf_T *const buf = get_buf_tv(&argvars[0], false);
   typval_T *varp = &argvars[2];
 
-  if (buf != NULL && varname != NULL && varp != NULL) {
+  if (buf != NULL && varname != NULL) {
     if (*varname == '&') {
       long numval;
       bool error = false;

From 9dd1926df01a27c913dd19ef0a4f79d06842508a Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:20:53 +0300
Subject: [PATCH 072/257] eval: Remove unneeded varp check

---
 src/nvim/eval.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 6e204be481..30b776c887 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -14874,7 +14874,7 @@ static void f_settabvar(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   const char *const varname = tv_get_string_chk(&argvars[1]);
   typval_T *const varp = &argvars[2];
 
-  if (varname != NULL && varp != NULL && tp != NULL) {
+  if (varname != NULL && tp != NULL) {
     tabpage_T *const save_curtab = curtab;
     goto_tabpage_tp(tp, false, false);
 

From 1bc080078793aafcecfae95620f6dac917c737dc Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:22:12 +0300
Subject: [PATCH 073/257] eval: Remove unneeded !eap->skip check

Already checked in the outer if().
---
 src/nvim/eval.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 30b776c887..67d5465896 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -19462,8 +19462,9 @@ void ex_function(exarg_T *eap)
      * interrupt, or an exception.
      */
     if (!aborting()) {
-      if (!eap->skip && fudi.fd_newkey != NULL)
+      if (fudi.fd_newkey != NULL) {
         EMSG2(_(e_dictkey), fudi.fd_newkey);
+      }
       xfree(fudi.fd_newkey);
       return;
     } else

From c5010c98ae8532f7f2778ce0e89a01d9e1ca68f9 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:22:58 +0300
Subject: [PATCH 074/257] eval: Fix position of buf declaration

---
 src/nvim/eval.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 67d5465896..cf55b42bdf 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -21048,8 +21048,8 @@ void call_user_func(ufunc_T *fp, int argcount, typval_T *argvars,
             char *s = tofree;
             emsg_off--;
             if (s != NULL) {
+              char buf[MSG_BUF_LEN];
               if (vim_strsize((char_u *)s) > MSG_BUF_CLEN) {
-                char buf[MSG_BUF_LEN];
                 trunc_string((char_u *)s, (char_u *)buf, MSG_BUF_CLEN,
                              sizeof(buf));
                 s = buf;

From d766607dc9e3c54a7575102ecf025eb184d9f648 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:24:30 +0300
Subject: [PATCH 075/257] farsi: Simplify condition

---
 src/nvim/farsi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/farsi.c b/src/nvim/farsi.c
index e7e93f756f..2d37d1284e 100644
--- a/src/nvim/farsi.c
+++ b/src/nvim/farsi.c
@@ -321,7 +321,7 @@ static void put_curr_and_l_to_X(char_u c)
   }
 
   if ((curwin->w_cursor.col < (colnr_T)STRLEN(get_cursor_line_ptr()))) {
-    if ((p_ri && curwin->w_cursor.col) || !p_ri) {
+    if (!p_ri || curwin->w_cursor.col) {
       if (p_ri) {
         dec_cursor();
       } else {

From a894c82defc00fcd0ed14a6d157130d9dc63f314 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:25:00 +0300
Subject: [PATCH 076/257] ex_docmd: Remove excessive assignment

---
 src/nvim/ex_docmd.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 0fd4ae48be..3d1136b7ac 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -1304,7 +1304,6 @@ static char_u * do_one_cmd(char_u **cmdlinep,
     /*
      * 2. Handle command modifiers.
      */
-    p = ea.cmd;
     p = skip_range(ea.cmd, NULL);
     switch (*p) {
     /* When adding an entry, also modify cmd_exists(). */

From 87e107d92143e108ec3ec5f91851ca3cb3768175 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:27:20 +0300
Subject: [PATCH 077/257] ex_docmd: Remove :Ni! easter egg

---
 src/nvim/ex_docmd.c | 20 +-------------------
 1 file changed, 1 insertion(+), 19 deletions(-)

diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 3d1136b7ac..60d3bb07a3 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -1726,11 +1726,7 @@ static char_u * do_one_cmd(char_u **cmdlinep,
       errormsg = (char_u *)_("E464: Ambiguous use of user-defined command");
     goto doend;
   }
-  /* Check for wrong commands. */
-  if (*p == '!' && ea.cmd[1] == 0151 && ea.cmd[0] == 78) {
-    errormsg = uc_fun_cmd();
-    goto doend;
-  }
+  // Check for wrong commands.
   if (ea.cmdidx == CMD_SIZE) {
     if (!ea.skip) {
       STRCPY(IObuff, _("E492: Not an editor command"));
@@ -4961,20 +4957,6 @@ static void uc_list(char_u *name, size_t name_len)
     MSG(_("No user-defined commands found"));
 }
 
-static char_u *uc_fun_cmd(void)
-{
-  static char_u fcmd[] = {0x84, 0xaf, 0x60, 0xb9, 0xaf, 0xb5, 0x60, 0xa4,
-                          0xa5, 0xad, 0xa1, 0xae, 0xa4, 0x60, 0xa1, 0x60,
-                          0xb3, 0xa8, 0xb2, 0xb5, 0xa2, 0xa2, 0xa5, 0xb2,
-                          0xb9, 0x7f, 0};
-  int i;
-
-  for (i = 0; fcmd[i]; ++i)
-    IObuff[i] = fcmd[i] - 0x40;
-  IObuff[i] = 0;
-  return IObuff;
-}
-
 static int uc_scan_attr(char_u *attr, size_t len, uint32_t *argt, long *def,
                         int *flags, int * compl, char_u **compl_arg,
                         int *addr_type_arg)

From fe01e9c947b8c2fcb328e79b8b91ceebfd8c04cc Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:27:47 +0300
Subject: [PATCH 078/257] ex_docmd: Remove unneeded if()

---
 src/nvim/ex_docmd.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 60d3bb07a3..0e399c9fb3 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -4097,12 +4097,11 @@ int expand_filename(exarg_T *eap, char_u **cmdlinep, char_u **errormsgp)
         options += WILD_ICASE;
       p = ExpandOne(&xpc, eap->arg, NULL,
           options, WILD_EXPAND_FREE);
-      if (p == NULL)
+      if (p == NULL) {
         return FAIL;
-      if (p != NULL) {
-        (void)repl_cmdline(eap, eap->arg, STRLEN(eap->arg), p, cmdlinep);
-        xfree(p);
       }
+      (void)repl_cmdline(eap, eap->arg, STRLEN(eap->arg), p, cmdlinep);
+      xfree(p);
     }
   }
   return OK;

From d88ae748b51963d0188fe41f0abd6ea208bd2eef Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:29:19 +0300
Subject: [PATCH 079/257] getchar: Fix if block indentation

---
 src/nvim/getchar.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 3b248c4bc6..e056ff488c 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -1849,11 +1849,12 @@ static int vgetorpeek(int advance)
                     mp_match = mp;
                     mp_match_len = keylen;
                   }
-                } else
-                /* No match; may have to check for
-                 * termcode at next character. */
-                if (max_mlen < mlen)
-                  max_mlen = mlen;
+                } else {
+                  // No match; may have to check for termcode at next character.
+                  if (max_mlen < mlen) {
+                    max_mlen = mlen;
+                  }
+                }
               }
             }
 

From e3de83a8291cf0ef1481a2631dda04b37b6e3412 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:32:10 +0300
Subject: [PATCH 080/257] hardcopy: Remove unneeded prt_do_conv assignment

---
 src/nvim/hardcopy.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c
index 4cb05ffc12..b2cbe30a43 100644
--- a/src/nvim/hardcopy.c
+++ b/src/nvim/hardcopy.c
@@ -2576,13 +2576,12 @@ int mch_print_begin(prt_settings_T *psettings)
 
   prt_conv.vc_type = CONV_NONE;
   if (!(enc_canon_props(p_enc) & enc_canon_props(p_encoding) & ENC_8BIT)) {
-    /* Set up encoding conversion if required */
-    if (FAIL == convert_setup(&prt_conv, p_enc, p_encoding)) {
-      EMSG2(_("E620: Unable to convert to print encoding \"%s\""),
-          p_encoding);
-      return FALSE;
+    // Set up encoding conversion if required
+    if (convert_setup(&prt_conv, p_enc, p_encoding) == FAIL) {
+      emsgf(_("E620: Unable to convert to print encoding \"%s\""),
+            p_encoding);
+      return false;
     }
-    prt_do_conv = TRUE;
   }
   prt_do_conv = prt_conv.vc_type != CONV_NONE;
 

From 0f7c260cd873c996da9badb42b9135cd15bee285 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:39:57 +0300
Subject: [PATCH 081/257] fileio: Simlify help files encoding detection

Most of code is dead when enc_utf8 is always true. Given that `c` is being
reused for other purposes I left it set to 1 just in case.
---
 src/nvim/fileio.c | 43 ++++++++-----------------------------------
 1 file changed, 8 insertions(+), 35 deletions(-)

diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index c1b8203ed1..74fa5aa1de 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -730,43 +730,16 @@ readfile (
     fenc = (char_u *)"";                /* binary: don't convert */
     fenc_alloced = FALSE;
   } else if (curbuf->b_help) {
-    char_u firstline[80];
-    int fc;
+    // Help files are either utf-8 or latin1.  Try utf-8 first, if this
+    // fails it must be latin1.
+    // It is needed when the first line contains non-ASCII characters.
+    // That is only in *.??x files.
+    fenc_next = (char_u *)"latin1";
+    fenc = (char_u *)"utf-8";
 
-    /* Help files are either utf-8 or latin1.  Try utf-8 first, if this
-     * fails it must be latin1.
-     * Always do this when 'encoding' is "utf-8".  Otherwise only do
-     * this when needed to avoid [converted] remarks all the time.
-     * It is needed when the first line contains non-ASCII characters.
-     * That is only in *.??x files. */
-    fenc = (char_u *)"latin1";
-    c = enc_utf8;
-    if (!c && !read_stdin) {
-      fc = fname[STRLEN(fname) - 1];
-      if (TOLOWER_ASC(fc) == 'x') {
-        /* Read the first line (and a bit more).  Immediately rewind to
-         * the start of the file.  If the read() fails "len" is -1. */
-        len = read_eintr(fd, firstline, 80);
-        lseek(fd, (off_t)0L, SEEK_SET);
-        for (p = firstline; p < firstline + len; ++p)
-          if (*p >= 0x80) {
-            c = TRUE;
-            break;
-          }
-      }
-    }
+    fenc_alloced = false;
 
-    if (c) {
-      fenc_next = fenc;
-      fenc = (char_u *)"utf-8";
-
-      /* When the file is utf-8 but a character doesn't fit in
-       * 'encoding' don't retry.  In help text editing utf-8 bytes
-       * doesn't make sense. */
-      if (!enc_utf8)
-        keep_dest_enc = TRUE;
-    }
-    fenc_alloced = FALSE;
+    c = 1;
   } else if (*p_fencs == NUL) {
     fenc = curbuf->b_p_fenc;            /* use format from buffer */
     fenc_alloced = FALSE;

From 2394c9f2b79e5c9c121c21dcb324f9c18b473853 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:47:06 +0300
Subject: [PATCH 082/257] =?UTF-8?q?memline:=20Silence=20=E2=80=9Cbuffer=20?=
 =?UTF-8?q?underflow=E2=80=9D=20warning,=20looks=20like=20false=20positive?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/nvim/memline.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index 5ea2397db3..45e16554e6 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -616,7 +616,7 @@ static bool ml_check_b0_strings(ZERO_BL *b0p)
   return (memchr(b0p->b0_version, NUL, 10)
           && memchr(b0p->b0_uname, NUL, B0_UNAME_SIZE)
           && memchr(b0p->b0_hname, NUL, B0_HNAME_SIZE)
-          && memchr(b0p->b0_fname, NUL, B0_FNAME_SIZE_CRYPT));
+          && memchr(b0p->b0_fname, NUL, B0_FNAME_SIZE_CRYPT));  // -V512
 }
 
 /*

From 10ce00efa8c9d4e9f2b588063ce04f7d49050d8b Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:55:29 +0300
Subject: [PATCH 083/257] =?UTF-8?q?memline:=20Fix=20=E2=80=9CNULL=20pointe?=
 =?UTF-8?q?r=20dereference=E2=80=9D=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It was actually a false positive indicating always-true condition, not real
dereference.
---
 src/nvim/memline.c | 41 ++++++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 19 deletions(-)

diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index 45e16554e6..b31ca136dd 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -3362,29 +3362,32 @@ static char *findswapname(buf_T *buf, char **dirp, char *old_fname,
           }
 
           if (swap_exists_action != SEA_NONE && choice == 0) {
-            char *name;
+            const char *const sw_msg_1 = _("Swap file \"");
+            const char *const sw_msg_2 = _("\" already exists!");
 
             const size_t fname_len = strlen(fname);
-            name = xmalloc(fname_len
-                           + strlen(_("Swap file \""))
-                           + strlen(_("\" already exists!")) + 5);
-            STRCPY(name, _("Swap file \""));
-            home_replace(NULL, (char_u *) fname, (char_u *)&name[strlen(name)],
-                fname_len, true);
-            STRCAT(name, _("\" already exists!"));
-            choice = do_dialog(VIM_WARNING,
-                (char_u *)_("VIM - ATTENTION"),
-                (char_u *)(name == NULL
-                           ? _("Swap file already exists!")
-                           : name),
+            const size_t sw_msg_1_len = strlen(sw_msg_1);
+            const size_t sw_msg_2_len = strlen(sw_msg_2);
+
+            const size_t name_len = sw_msg_1_len + fname_len + sw_msg_2_len + 5;
+
+            char *const name = xmalloc(name_len);
+            memcpy(name, sw_msg_1, sw_msg_1_len + 1);
+            home_replace(NULL, (char_u *)fname, (char_u *)&name[sw_msg_1_len],
+                         fname_len, true);
+            xstrlcat(name, sw_msg_2, name_len);
+            choice = do_dialog(VIM_WARNING, (char_u *)_("VIM - ATTENTION"),
+                               (char_u *)name,
 # if defined(UNIX)
-                process_still_running
-                ? (char_u *)_(
-                    "&Open Read-Only\n&Edit anyway\n&Recover\n&Quit\n&Abort") :
+                               process_still_running
+                               ? (char_u *)_(
+                                   "&Open Read-Only\n&Edit anyway\n&Recover"
+                                   "\n&Quit\n&Abort") :
 # endif
-                (char_u *)_(
-                    "&Open Read-Only\n&Edit anyway\n&Recover\n&Delete it\n&Quit\n&Abort"),
-                1, NULL, FALSE);
+                               (char_u *)_(
+                                   "&Open Read-Only\n&Edit anyway\n&Recover"
+                                   "\n&Delete it\n&Quit\n&Abort"),
+                               1, NULL, false);
 
 # if defined(UNIX)
             if (process_still_running && choice >= 4)

From 083792e1374100f1b0c48c72987935f56ebbd8ad Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:56:30 +0300
Subject: [PATCH 084/257] =?UTF-8?q?message:=20Remove=20some=20enc=5Futf8/?=
 =?UTF-8?q?=E2=80=A6=20checks?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/nvim/message.c | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 3e4a1e10b6..91dfc79e38 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1165,15 +1165,9 @@ int msg_outtrans_len_attr(char_u *msgstr, int len, int attr)
    * Normal characters are printed several at a time.
    */
   while (--len >= 0) {
-    if (enc_utf8) {
-      // Don't include composing chars after the end.
-      mb_l = utfc_ptr2len_len((char_u *)str, len + 1);
-    } else if (has_mbyte) {
-      mb_l = (*mb_ptr2len)((char_u *)str);
-    } else {
-      mb_l = 1;
-    }
-    if (has_mbyte && mb_l > 1) {
+    // Don't include composing chars after the end.
+    mb_l = utfc_ptr2len_len((char_u *)str, len + 1);
+    if (mb_l > 1) {
       c = (*mb_ptr2char)((char_u *)str);
       if (vim_isprintc(c)) {
         // Printable multi-byte char: count the cells.

From 0718d0e6d44536547dac2248c65b15547e56fc10 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:58:19 +0300
Subject: [PATCH 085/257] message: Some more has_mbyte/enc_utf8 removal

---
 src/nvim/message.c | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/nvim/message.c b/src/nvim/message.c
index 91dfc79e38..42e1fd1cf9 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1657,16 +1657,13 @@ static void msg_puts_display(const char_u *str, int maxlen, int attr,
 
       // Display char in last column before showing more-prompt.
       if (*s >= ' ' && !cmdmsg_rl) {
-        if (has_mbyte) {
-          if (enc_utf8 && maxlen >= 0)
-            /* avoid including composing chars after the end */
-            l = utfc_ptr2len_len(s, (int)((str + maxlen) - s));
-          else
-            l = (*mb_ptr2len)(s);
-          s = screen_puts_mbyte((char_u *)s, l, attr);
+        if (maxlen >= 0) {
+          // Avoid including composing chars after the end.
+          l = utfc_ptr2len_len(s, (int)((str + maxlen) - s));
         } else {
-          msg_screen_putchar(*s++, attr);
+          l = utfc_ptr2len(s);
         }
+        s = screen_puts_mbyte((char_u *)s, l, attr);
         did_last_char = true;
       } else {
         did_last_char = false;

From dc523eed8ec2ea238dde21f39fdbb6343227c16e Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 20:59:44 +0300
Subject: [PATCH 086/257] =?UTF-8?q?fileio:=20Silence=20=E2=80=9C!=3D=20ide?=
 =?UTF-8?q?ntical=20subexpressions=E2=80=9D=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/nvim/os/fileio.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/nvim/os/fileio.c b/src/nvim/os/fileio.c
index 3c47c66196..27eb448c3d 100644
--- a/src/nvim/os/fileio.c
+++ b/src/nvim/os/fileio.c
@@ -47,6 +47,7 @@ int file_open(FileDescriptor *const ret_fp, const char *const fname,
   int os_open_flags = 0;
   int fd;
   TriState wr = kNone;
+  // -V:FLAG:501
 #define FLAG(flags, flag, fcntl_flags, wrval, cond) \
   do { \
     if (flags & flag) { \

From 84aa457ccdf88baeee1e87ba763fafe0ff77095e Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:02:43 +0300
Subject: [PATCH 087/257] =?UTF-8?q?os/env:=20Fix=20=E2=80=9Cinvalid=20poin?=
 =?UTF-8?q?ter=20to=20local=E2=80=9D=20false=20positive?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/nvim/os/env.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
index ad51e598c1..f3187de182 100644
--- a/src/nvim/os/env.c
+++ b/src/nvim/os/env.c
@@ -641,7 +641,7 @@ char *vim_getenv(const char *name)
             exe_name,
             "share" _PATHSEPSTR "nvim" _PATHSEPSTR "runtime" _PATHSEPSTR,
             MAXPATHL) == OK) {
-          vim_path = exe_name;
+          vim_path = exe_name;  // -V507
         }
       }
     }
@@ -675,6 +675,7 @@ char *vim_getenv(const char *name)
         vim_path = NULL;
       }
     }
+    assert(vim_path != exe_name);
   }
 
 #ifdef HAVE_PATHDEF

From cdbfff077b23d666036bd9967756938df9044b38 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:05:50 +0300
Subject: [PATCH 088/257] =?UTF-8?q?ops:=20Silence=20=E2=80=9Ccounter=20not?=
 =?UTF-8?q?=20used=20in=20loop=E2=80=9D=20false=20positive?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/nvim/ops.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 5212ec45ab..6ea3a45049 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -2785,7 +2785,7 @@ void do_put(int regname, yankreg_T *reg, int dir, long count, int flags)
   }
 
   if (curbuf->terminal) {
-    for (int i = 0; i < count; i++) {
+    for (int i = 0; i < count; i++) {  // -V756
       // feed the lines to the terminal
       for (size_t j = 0; j < y_size; j++) {
         if (j) {

From 54bd78b8a8d212a0278b1d9517dd0dcc4df79a0b Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:06:22 +0300
Subject: [PATCH 089/257] normal: Remove unneeded assignment

---
 src/nvim/normal.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 388ddfc8bb..1809b98586 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -694,7 +694,6 @@ static void normal_get_additional_char(NormalState *s)
     if (langmap_active) {
       // Undo the decrement done above
       no_mapping++;
-      State = NORMAL_BUSY;
     }
     State = NORMAL_BUSY;
     s->need_flushbuf |= add_to_showcmd(*cp);

From b5db7cde366ae159aee6826167b68c3aff0cdf19 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:08:12 +0300
Subject: [PATCH 090/257] normal: Clarify the code

Current variant works only because of PUT_FIXINDENT being equal to true.
---
 src/nvim/normal.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 1809b98586..d7c7c7d48c 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -2336,7 +2336,8 @@ do_mouse (
         if ((State & REPLACE_FLAG) && !yank_register_mline(regname))
           insert_reg(regname, true);
         else {
-          do_put(regname, NULL, BACKWARD, 1L, fixindent | PUT_CURSEND);
+          do_put(regname, NULL, BACKWARD, 1L,
+                 (fixindent ? PUT_FIXINDENT : 0) | PUT_CURSEND);
 
           /* Repeat it with CTRL-R CTRL-O r or CTRL-R CTRL-P r */
           AppendCharToRedobuff(Ctrl_R);
@@ -2688,7 +2689,8 @@ do_mouse (
      */
     if (restart_edit != 0)
       where_paste_started = curwin->w_cursor;
-    do_put(regname, NULL, dir, count, fixindent | PUT_CURSEND);
+    do_put(regname, NULL, dir, count,
+           (fixindent ? PUT_FIXINDENT : 0)| PUT_CURSEND);
   }
   /*
    * Ctrl-Mouse click or double click in a quickfix window jumps to the

From aa3b1f695f699e189d5190c57e6c5e2bce4b0c9e Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:09:31 +0300
Subject: [PATCH 091/257] normal: Add figure braces so that code is clearer

---
 src/nvim/normal.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index d7c7c7d48c..9340a45f62 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -7613,11 +7613,13 @@ static void nv_record(cmdarg_T *cap)
     if (cap->nchar == ':' || cap->nchar == '/' || cap->nchar == '?') {
       stuffcharReadbuff(cap->nchar);
       stuffcharReadbuff(K_CMDWIN);
-    } else
-    /* (stop) recording into a named register, unless executing a
-     * register */
-    if (!Exec_reg && do_record(cap->nchar) == false)
-      clearopbeep(cap->oap);
+    } else {
+      // (stop) recording into a named register, unless executing a
+      // register.
+      if (!Exec_reg && do_record(cap->nchar) == false) {
+        clearopbeep(cap->oap);
+      }
+    }
   }
 }
 

From be9d98cb45aab402b7666776ad1288b9a79bb0c1 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:10:40 +0300
Subject: [PATCH 092/257] quickfix: Remove unneeded condition

fmt_ptr was checked for being NULL in if() condition earlier.
---
 src/nvim/quickfix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 4fa5c85abd..33b832c033 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -856,7 +856,7 @@ restofline:
     if (fmt_ptr == NULL) {
       qi->qf_multiline = qi->qf_multiignore = false;
     }
-  } else if (fmt_ptr != NULL) {
+  } else {
     // honor %> item
     if (fmt_ptr->conthere) {
       fmt_start = fmt_ptr;

From 4e7150ee94d967ff51cbef24a7e18f71290ed9a2 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:11:37 +0300
Subject: [PATCH 093/257] quicfix: Remove duplicate condition

---
 src/nvim/quickfix.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 33b832c033..af055e9b75 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -3284,7 +3284,6 @@ void ex_cc(exarg_T *eap)
       || eap->cmdidx == CMD_lrewind
       || eap->cmdidx == CMD_lfirst
       || eap->cmdidx == CMD_llast
-      || eap->cmdidx == CMD_llast
       || eap->cmdidx == CMD_ldo
       || eap->cmdidx == CMD_lfdo) {
     qi = GET_LOC_LIST(curwin);
@@ -3341,7 +3340,6 @@ void ex_cnext(exarg_T *eap)
       || eap->cmdidx == CMD_lnfile
       || eap->cmdidx == CMD_lNfile
       || eap->cmdidx == CMD_lpfile
-      || eap->cmdidx == CMD_lpfile
       || eap->cmdidx == CMD_ldo
       || eap->cmdidx == CMD_lfdo) {
     qi = GET_LOC_LIST(curwin);

From b396a3f72edb3fb345e516a12b92991b249da572 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:13:49 +0300
Subject: [PATCH 094/257] quicfix: Avoid possible NULL dereference

---
 src/nvim/quickfix.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index af055e9b75..1241841885 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -984,7 +984,7 @@ qf_init_ext(
   }
 
   // Use the local value of 'errorformat' if it's set.
-  if (errorformat == p_efm && tv == NULL && *buf->b_p_efm != NUL) {
+  if (errorformat == p_efm && tv == NULL && buf && *buf->b_p_efm != NUL) {
     efm = buf->b_p_efm;
   } else {
     efm = errorformat;

From a65867542d291cda6cdd68e56e0d5d3866dbbb72 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:17:08 +0300
Subject: [PATCH 095/257] screen: Remove unneeded check

---
 src/nvim/screen.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index febca105e9..79596f73cd 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -1016,9 +1016,7 @@ static void win_update(win_T *wp)
     linenr_T from, to;
 
     if (VIsual_active) {
-      if (VIsual_active
-          && (VIsual_mode != wp->w_old_visual_mode
-              || type == INVERTED_ALL)) {
+      if (VIsual_mode != wp->w_old_visual_mode || type == INVERTED_ALL) {
         /*
          * If the type of Visual selection changed, redraw the whole
          * selection.  Also when the ownership of the X selection is

From 7cf4b0ac06c7d6675a05924b6aff3850fde3bcf2 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:18:00 +0300
Subject: [PATCH 096/257] =?UTF-8?q?screen:=20Silence=20=E2=80=9Cbuffer=20u?=
 =?UTF-8?q?nderflow=E2=80=9D=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/nvim/screen.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 79596f73cd..cf116e1930 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -2447,7 +2447,7 @@ win_line (
       } else {
         /* Long line, use only the last SPWORDLEN bytes. */
         nextlinecol = v - SPWORDLEN;
-        memmove(nextline, line + nextlinecol, SPWORDLEN);
+        memmove(nextline, line + nextlinecol, SPWORDLEN);  // -V512
         nextline_idx = SPWORDLEN + 1;
       }
     }

From 48ad8e0ff1ba721a5607c20f48e813400041299c Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:22:02 +0300
Subject: [PATCH 097/257] screen: Silence NULL dereference false positive

Based on the loop condition when shl_flag is true cur != NULL.
---
 src/nvim/screen.c | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index cf116e1930..db757a54f5 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -2579,13 +2579,14 @@ win_line (
    * Do this for both search_hl and the match list.
    */
   cur = wp->w_match_head;
-  shl_flag = FALSE;
-  while (cur != NULL || shl_flag == FALSE) {
-    if (shl_flag == FALSE) {
+  shl_flag = false;
+  while (cur != NULL || !shl_flag) {
+    if (!shl_flag) {
       shl = &search_hl;
-      shl_flag = TRUE;
-    } else
-      shl = &cur->hl;
+      shl_flag = true;
+    } else {
+      shl = &cur->hl;  // -V595
+    }
     shl->startcol = MAXCOL;
     shl->endcol = MAXCOL;
     shl->attr_cur = 0;
@@ -5536,13 +5537,14 @@ static void prepare_search_hl(win_T *wp, linenr_T lnum)
    * Do this both for search_hl and the match list.
    */
   cur = wp->w_match_head;
-  shl_flag = FALSE;
-  while (cur != NULL || shl_flag == FALSE) {
-    if (shl_flag == FALSE) {
+  shl_flag = false;
+  while (cur != NULL || shl_flag == false) {
+    if (shl_flag == false) {
       shl = &search_hl;
-      shl_flag = TRUE;
-    } else
-      shl = &cur->hl;
+      shl_flag = true;
+    } else {
+      shl = &cur->hl;  // -V595
+    }
     if (shl->rm.regprog != NULL
         && shl->lnum == 0
         && re_multiline(shl->rm.regprog)) {

From e131194db71c5fc20148ea6e463de997917f6c0a Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:22:46 +0300
Subject: [PATCH 098/257] screen: Remove unneeded condition

Already checked in outer if()
---
 src/nvim/screen.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index db757a54f5..431f74508d 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -2784,8 +2784,8 @@ win_line (
       // draw 'breakindent': indent wrapped text accodringly
       if (draw_state == WL_BRI - 1 && n_extra == 0) {
         draw_state = WL_BRI;
-        if (wp->w_p_bri && n_extra == 0 && row != startrow && filler_lines == 0) {
-          char_attr = 0; // was: hl_attr(HLF_AT);
+        if (wp->w_p_bri && row != startrow && filler_lines == 0) {
+          char_attr = 0;  // was: hl_attr(HLF_AT);
 
           if (diff_hlf != (hlf_T)0) {
             char_attr = hl_attr(diff_hlf);

From c0cbc507202231d5dd9c5c8669e6116f3344d535 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:26:07 +0300
Subject: [PATCH 099/257] screen: Remove another portion of
 has_mbyte/friends-checking stuff

---
 src/nvim/screen.c | 95 +++++++++++++++++++++--------------------------
 1 file changed, 43 insertions(+), 52 deletions(-)

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 431f74508d..66b52c3b25 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -5330,43 +5330,39 @@ void screen_puts_len(char_u *text, int textlen, int row, int col, int attr)
     c = *ptr;
     /* check if this is the first byte of a multibyte */
     if (l_has_mbyte) {
-      if (l_enc_utf8 && len > 0)
+      if (len > 0) {
         mbyte_blen = utfc_ptr2len_len(ptr, (int)((text + len) - ptr));
-      else
-        mbyte_blen = (*mb_ptr2len)(ptr);
-      if (l_enc_dbcs == DBCS_JPNU && c == 0x8e)
-        mbyte_cells = 1;
-      else if (l_enc_dbcs != 0)
-        mbyte_cells = mbyte_blen;
-      else {            /* enc_utf8 */
-        if (len >= 0)
-          u8c = utfc_ptr2char_len(ptr, u8cc,
-              (int)((text + len) - ptr));
-        else
-          u8c = utfc_ptr2char(ptr, u8cc);
-        mbyte_cells = utf_char2cells(u8c);
-        if (p_arshape && !p_tbidi && arabic_char(u8c)) {
-          /* Do Arabic shaping. */
-          if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) {
-            /* Past end of string to be displayed. */
-            nc = NUL;
-            nc1 = NUL;
-          } else {
-            nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc,
-                (int)((text + len) - ptr - mbyte_blen));
-            nc1 = pcc[0];
-          }
-          pc = prev_c;
-          prev_c = u8c;
-          u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc);
-        } else
-          prev_c = u8c;
-        if (col + mbyte_cells > screen_Columns) {
-          /* Only 1 cell left, but character requires 2 cells:
-           * display a '>' in the last column to avoid wrapping. */
-          c = '>';
-          mbyte_cells = 1;
+      } else {
+        mbyte_blen = utfc_ptr2len(ptr);
+      }
+      if (len >= 0) {
+        u8c = utfc_ptr2char_len(ptr, u8cc, (int)((text + len) - ptr));
+      } else {
+        u8c = utfc_ptr2char(ptr, u8cc);
+      }
+      mbyte_cells = utf_char2cells(u8c);
+      if (p_arshape && !p_tbidi && arabic_char(u8c)) {
+        // Do Arabic shaping.
+        if (len >= 0 && (int)(ptr - text) + mbyte_blen >= len) {
+          // Past end of string to be displayed.
+          nc = NUL;
+          nc1 = NUL;
+        } else {
+          nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc,
+              (int)((text + len) - ptr - mbyte_blen));
+          nc1 = pcc[0];
         }
+        pc = prev_c;
+        prev_c = u8c;
+        u8c = arabic_shape(u8c, &c, &u8cc[0], nc, nc1, pc);
+      } else {
+        prev_c = u8c;
+      }
+      if (col + mbyte_cells > screen_Columns) {
+        // Only 1 cell left, but character requires 2 cells:
+        // display a '>' in the last column to avoid wrapping. */
+        c = '>';
+        mbyte_cells = 1;
       }
     }
 
@@ -5374,16 +5370,11 @@ void screen_puts_len(char_u *text, int textlen, int row, int col, int attr)
     force_redraw_next = FALSE;
 
     need_redraw = ScreenLines[off] != c
-                  || (mbyte_cells == 2
-                      && ScreenLines[off + 1] != (l_enc_dbcs ? ptr[1] : 0))
-                  || (l_enc_dbcs == DBCS_JPNU
-                      && c == 0x8e
-                      && ScreenLines2[off] != ptr[1])
-                  || (l_enc_utf8
-                      && (ScreenLinesUC[off] !=
-                          (u8char_T)(c < 0x80 && u8cc[0] == 0 ? 0 : u8c)
-                          || (ScreenLinesUC[off] != 0
-                              && screen_comp_differs(off, u8cc))))
+                  || (mbyte_cells == 2 && ScreenLines[off + 1] != 0)
+                  || (ScreenLinesUC[off] !=
+                      (u8char_T)(c < 0x80 && u8cc[0] == 0 ? 0 : u8c)
+                      || (ScreenLinesUC[off] != 0
+                          && screen_comp_differs(off, u8cc)))
                   || ScreenAttrs[off] != attr
                   || exmode_active;
 
@@ -6103,8 +6094,7 @@ retry:
     if (new_ScreenLinesC[i] == NULL)
       break;
   if (new_ScreenLines == NULL
-      || (l_enc_utf8 && (new_ScreenLinesUC == NULL || i != p_mco))
-      || (l_enc_dbcs == DBCS_JPNU && new_ScreenLines2 == NULL)
+      || (new_ScreenLinesUC == NULL || i != p_mco)
       || new_ScreenAttrs == NULL
       || new_LineOffset == NULL
       || new_LineWraps == NULL
@@ -6189,13 +6179,14 @@ retry:
                   ScreenLinesC[i] + LineOffset[old_row],
                   (size_t)len * sizeof(u8char_T));
           }
-          if (l_enc_dbcs == DBCS_JPNU && ScreenLines2 != NULL)
+          if (ScreenLines2 != NULL) {
             memmove(new_ScreenLines2 + new_LineOffset[new_row],
-                ScreenLines2 + LineOffset[old_row],
-                (size_t)len * sizeof(schar_T));
+                    ScreenLines2 + LineOffset[old_row],
+                    (size_t)len * sizeof(schar_T));
+          }
           memmove(new_ScreenAttrs + new_LineOffset[new_row],
-              ScreenAttrs + LineOffset[old_row],
-              (size_t)len * sizeof(sattr_T));
+                  ScreenAttrs + LineOffset[old_row],
+                  (size_t)len * sizeof(sattr_T));
         }
       }
     }

From 316789e14c3910c0b4c5dd710a1c82ebd7b01ac2 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:33:10 +0300
Subject: [PATCH 100/257] =?UTF-8?q?tag:=20Silence=20=E2=80=9Cbuffer=20unde?=
 =?UTF-8?q?rflow=E2=80=9D=20warning?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/nvim/tag.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index f01b8b8ab1..1ce2a4e2eb 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -1222,9 +1222,9 @@ find_tags (
   if (has_re && orgpat.regmatch.regprog == NULL)
     goto findtag_end;
 
-  /* This is only to avoid a compiler warning for using search_info
-   * uninitialised. */
-  memset(&search_info, 0, (size_t)1);
+  // This is only to avoid a compiler warning for using search_info
+  // uninitialised.
+  memset(&search_info, 0, 1);  // -V512
 
   /*
    * When finding a specified number of matches, first try with matching

From 76783963ebc90ca565311489bb2206b208d2e147 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:34:15 +0300
Subject: [PATCH 101/257] =?UTF-8?q?tag:=20Fix=20=E2=80=9Cinitialized=20twi?=
 =?UTF-8?q?ce=20successively=E2=80=9D=20false=20positive?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/nvim/tag.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index 1ce2a4e2eb..0c7244cbb3 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -2534,7 +2534,7 @@ jumpto_tag (
         }
       }
       p_ws = save_p_ws;
-      p_ic = save_p_ic;
+      p_ic = save_p_ic;  // -V519
       p_scs = save_p_scs;
 
       /* A search command may have positioned the cursor beyond the end

From 69ebfb8d8ea26061a4fbfe9ee07d7bfff49e6a2b Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:35:50 +0300
Subject: [PATCH 102/257] regexp: Fix warning about octal constant

---
 src/nvim/regexp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 4b5e17b00b..e15a2eebe5 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -2398,7 +2398,7 @@ collection:
               regc('\b');
               break;
             case CLASS_ESCAPE:
-              regc('\033');
+              regc(ESC);
               break;
             }
           } else {

From b7118a008af1f0a15f7cfbe070a1f590310cc7b5 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:36:53 +0300
Subject: [PATCH 103/257] =?UTF-8?q?regexp:=20Remove=20another=20has=5Fmbyt?=
 =?UTF-8?q?e/=E2=80=A6-checking=20stuff?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/nvim/regexp.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index e15a2eebe5..284cb27c40 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -2923,13 +2923,8 @@ static void skipchr(void)
   else
     prevchr_len = 0;
   if (regparse[prevchr_len] != NUL) {
-    if (enc_utf8)
-      /* exclude composing chars that mb_ptr2len does include */
-      prevchr_len += utf_ptr2len(regparse + prevchr_len);
-    else if (has_mbyte)
-      prevchr_len += (*mb_ptr2len)(regparse + prevchr_len);
-    else
-      ++prevchr_len;
+    // Exclude composing chars that utfc_ptr2len does include.
+    prevchr_len += utf_ptr2len(regparse + prevchr_len);
   }
   regparse += prevchr_len;
   prev_at_start = at_start;

From 30561afe4128ab0c5371af00641d5c5a682d6270 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:38:06 +0300
Subject: [PATCH 104/257] regexp: Silence octal constant warning

---
 src/nvim/regexp.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 284cb27c40..7be89c2d7e 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -3047,7 +3047,7 @@ static int getoctchrs(void)
   int c;
   int i;
 
-  for (i = 0; i < 3 && nr < 040; ++i) {
+  for (i = 0; i < 3 && nr < 040; i++) {  // -V536
     c = regparse[0];
     if (c < '0' || c > '7')
       break;

From 372b6af8ea09bced16e8c793cbab304d2393bfa6 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:41:55 +0300
Subject: [PATCH 105/257] =?UTF-8?q?regexp=5Fnfa:=20Remove=20another=20has?=
 =?UTF-8?q?=5Fmbyte/=E2=80=A6-checking=20code?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/nvim/regexp_nfa.c | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c
index caf26fdd35..67a405daf5 100644
--- a/src/nvim/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
@@ -2772,15 +2772,10 @@ static int nfa_max_width(nfa_state_T *startstate, int depth)
     case NFA_ANY:
     case NFA_START_COLL:
     case NFA_START_NEG_COLL:
-      /* matches some character, including composing chars */
-      if (enc_utf8)
-        len += MB_MAXBYTES;
-      else if (has_mbyte)
-        len += 2;
-      else
-        ++len;
+      // Matches some character, including composing chars.
+      len += MB_MAXBYTES;
       if (state->c != NFA_ANY) {
-        /* skip over the characters */
+        // Skip over the characters.
         state = state->out1->out;
         continue;
       }

From 9d302c60f084c33c05b758cae12cc2dfa775e48e Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 21:42:20 +0300
Subject: [PATCH 106/257] regexp_nfa: Remove octal constant

---
 src/nvim/regexp_nfa.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c
index 67a405daf5..506e6277e9 100644
--- a/src/nvim/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
@@ -4407,8 +4407,9 @@ static int check_char_class(int class, int c)
       return OK;
     break;
   case NFA_CLASS_ESCAPE:
-    if (c == '\033')
+    if (c == ESC) {
       return OK;
+    }
     break;
 
   default:

From 58300d70d26969546e204983f8b4e505771ec8dd Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 22:20:19 +0300
Subject: [PATCH 107/257] *: Fix linter errors

---
 src/nvim/eval.c     |  9 +++++----
 src/nvim/ex_docmd.c |  3 +--
 src/nvim/normal.c   |  6 +++---
 src/nvim/screen.c   | 10 ++++------
 4 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index cf55b42bdf..7c5b23f567 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -2742,11 +2742,12 @@ void ex_call(exarg_T *eap)
    * call, and the loop is broken.
    */
   if (eap->skip) {
-    ++emsg_skip;
-    lnum = eap->line2;          /* do it once, also with an invalid range */
-  } else
+    emsg_skip++;
+    lnum = eap->line2;  // Do it once, also with an invalid range.
+  } else {
     lnum = eap->line1;
-  for (; lnum <= eap->line2; ++lnum) {
+  }
+  for (; lnum <= eap->line2; lnum++) {
     if (!eap->skip && eap->addr_count > 0) {  // -V560
       curwin->w_cursor.lnum = lnum;
       curwin->w_cursor.col = 0;
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 0e399c9fb3..17b3b512ef 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -4095,8 +4095,7 @@ int expand_filename(exarg_T *eap, char_u **cmdlinep, char_u **errormsgp)
       xpc.xp_context = EXPAND_FILES;
       if (p_wic)
         options += WILD_ICASE;
-      p = ExpandOne(&xpc, eap->arg, NULL,
-          options, WILD_EXPAND_FREE);
+      p = ExpandOne(&xpc, eap->arg, NULL, options, WILD_EXPAND_FREE);
       if (p == NULL) {
         return FAIL;
       }
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 9340a45f62..7f087dcd20 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -2333,9 +2333,9 @@ do_mouse (
         if (regname == 0 && eval_has_provider("clipboard")) {
           regname = '*';
         }
-        if ((State & REPLACE_FLAG) && !yank_register_mline(regname))
+        if ((State & REPLACE_FLAG) && !yank_register_mline(regname)) {
           insert_reg(regname, true);
-        else {
+        } else {
           do_put(regname, NULL, BACKWARD, 1L,
                  (fixindent ? PUT_FIXINDENT : 0) | PUT_CURSEND);
 
@@ -7616,7 +7616,7 @@ static void nv_record(cmdarg_T *cap)
     } else {
       // (stop) recording into a named register, unless executing a
       // register.
-      if (!Exec_reg && do_record(cap->nchar) == false) {
+      if (!Exec_reg && do_record(cap->nchar) == FAIL) {
         clearopbeep(cap->oap);
       }
     }
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 66b52c3b25..a8993be4e5 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -1017,11 +1017,9 @@ static void win_update(win_T *wp)
 
     if (VIsual_active) {
       if (VIsual_mode != wp->w_old_visual_mode || type == INVERTED_ALL) {
-        /*
-         * If the type of Visual selection changed, redraw the whole
-         * selection.  Also when the ownership of the X selection is
-         * gained or lost.
-         */
+        // If the type of Visual selection changed, redraw the whole
+        // selection.  Also when the ownership of the X selection is
+        // gained or lost.
         if (curwin->w_cursor.lnum < VIsual.lnum) {
           from = curwin->w_cursor.lnum;
           to = VIsual.lnum;
@@ -5349,7 +5347,7 @@ void screen_puts_len(char_u *text, int textlen, int row, int col, int attr)
           nc1 = NUL;
         } else {
           nc = utfc_ptr2char_len(ptr + mbyte_blen, pcc,
-              (int)((text + len) - ptr - mbyte_blen));
+                                 (int)((text + len) - ptr - mbyte_blen));
           nc1 = pcc[0];
         }
         pc = prev_c;

From 2eb9150a4fcb8f43599e5f470cbcb3a12195d910 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sun, 16 Apr 2017 23:58:32 +0300
Subject: [PATCH 108/257] buffer: Adjust where do_buffer call is located

It is located there in Vim, but in dd7657c1605246e8f7ade35184069a09dc254e84
position was for some reason swapped.
---
 src/nvim/buffer.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 292eb03a16..e48b7846ae 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -741,12 +741,13 @@ static void clear_wininfo(buf_T *buf)
  */
 void goto_buffer(exarg_T *eap, int start, int dir, int count)
 {
-  (void)do_buffer(*eap->cmd == 's' ? DOBUF_SPLIT : DOBUF_GOTO,
-                  start, dir, count, eap->forceit);
   bufref_T old_curbuf;
   set_bufref(&old_curbuf, curbuf);
   swap_exists_action = SEA_DIALOG;
 
+  (void)do_buffer(*eap->cmd == 's' ? DOBUF_SPLIT : DOBUF_GOTO,
+                  start, dir, count, eap->forceit);
+
   if (swap_exists_action == SEA_QUIT && *eap->cmd == 's') {
     cleanup_T cs;
 

From 263849b2dd4dc98bbe0870f5654c77809caeb965 Mon Sep 17 00:00:00 2001
From: Matthew Malcomson <hardenedapple@gmail.com>
Date: Sun, 16 Apr 2017 20:15:50 +0100
Subject: [PATCH 109/257] fold: foldMoveRange(): fix :move bug #6534

Closes #6540

In #6221 there was a mistake in calculating which folds need to be
re-ordered. When there are no folds after those that have been adjusted,
then `move_end` remains 0. This results in reverse_fold_order()
swapping folds that have been adjusted with uninitialised folds in the
remainder of the grow array.

Add a check in foldMoveRange() to account for this case.
---
 src/nvim/fold.c                      | 11 +++++++----
 test/functional/normal/fold_spec.lua | 19 +++++++++++++++++++
 2 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index d810aee0ce..34db4d2171 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -2765,10 +2765,13 @@ void foldMoveRange(garray_T *gap, const linenr_T line1, const linenr_T line2,
   }
   dest_index = FOLD_INDEX(fp, gap);
 
-  // All folds are now correct, but they are not necessarily in the correct
-  // order.
-  // We have to swap folds in the range [move_end, dest_index) with those in
-  // the range [move_start, move_end).
+  // All folds are now correct, but not necessarily in the correct order.
+  // We must swap folds in the range [move_end, dest_index) with those in the
+  // range [move_start, move_end).
+  if (move_end == 0) {
+    // There are no folds after those moved, so none were moved out of order.
+    return;
+  }
   reverse_fold_order(gap, move_start, dest_index - 1);
   reverse_fold_order(gap, move_start, move_start + dest_index - move_end - 1);
   reverse_fold_order(gap, move_start + dest_index - move_end, dest_index - 1);
diff --git a/test/functional/normal/fold_spec.lua b/test/functional/normal/fold_spec.lua
index 85e4631b61..00e83bedc8 100644
--- a/test/functional/normal/fold_spec.lua
+++ b/test/functional/normal/fold_spec.lua
@@ -232,6 +232,25 @@ a
 a]], '2,3m0')
       eq({1, 2, 0, 0, 0}, get_folds())
     end)
+    it('handles shifting all remaining folds', function()
+      test_move_indent([[
+	a
+		a
+		a
+		a
+	a
+		a
+		a
+		a
+	a
+		a
+		a
+		a
+		a
+	a
+a]], '13m7')
+      eq({1, 2, 2, 2, 1, 2, 2, 1, 1, 1, 2, 2, 2, 1, 0}, get_folds())
+    end)
   end)
   it('updates correctly on :read', function()
     -- luacheck: ignore 621

From 3345382cc2afd3b3a027d9abb5c101507ebb57d7 Mon Sep 17 00:00:00 2001
From: Matthieu Coudron <mattator@gmail.com>
Date: Mon, 17 Apr 2017 00:00:04 +0200
Subject: [PATCH 110/257] highlight: default Cursor to guibg=fg, guifg=bg

Closes #6508
---
 src/nvim/syntax.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index 1ed65ec52a..d5ff3707e8 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -5898,6 +5898,8 @@ static void syntime_report(void)
 static char *highlight_init_both[] =
 {
   "Conceal      ctermbg=DarkGrey ctermfg=LightGrey guibg=DarkGrey guifg=LightGrey",
+  "Cursor       guibg=fg guifg=bg",
+  "lCursor      guibg=fg guifg=bg",
   "DiffText     cterm=bold ctermbg=Red gui=bold guibg=Red",
   "ErrorMsg     ctermbg=DarkRed ctermfg=White guibg=Red guifg=White",
   "IncSearch    cterm=reverse gui=reverse",

From 45aa465fba73a9422a5c37779666eb59e0616142 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 17 Apr 2017 03:53:29 +0200
Subject: [PATCH 111/257] test: Cursor after `:hi clear|syntax reset`

Also enable tests on Windows.
---
 test/functional/ui/highlight_spec.lua | 45 +++++++++++++++------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/test/functional/ui/highlight_spec.lua b/test/functional/ui/highlight_spec.lua
index 5f8fafef07..2bda907c33 100644
--- a/test/functional/ui/highlight_spec.lua
+++ b/test/functional/ui/highlight_spec.lua
@@ -2,23 +2,23 @@ local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local os = require('os')
 local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
+local command = helpers.command
+local eval = helpers.eval
 local feed_command, request, eq = helpers.feed_command, helpers.request, helpers.eq
 
-if helpers.pending_win32(pending) then return end
-
-describe('color scheme compatibility', function()
+describe('colorscheme compatibility', function()
   before_each(function()
     clear()
   end)
 
   it('t_Co is set to 256 by default', function()
-    eq('256', request('vim_eval', '&t_Co'))
+    eq('256', eval('&t_Co'))
     request('nvim_set_option', 't_Co', '88')
-    eq('88', request('vim_eval', '&t_Co'))
+    eq('88', eval('&t_Co'))
   end)
 end)
 
-describe('manual syntax highlight', function()
+describe('highlight: `:syntax manual`', function()
   -- When using manual syntax highlighting, it should be preserved even when
   -- switching buffers... bug did only occur without :set hidden
   -- Ref: vim patch 7.4.1236
@@ -63,32 +63,32 @@ describe('manual syntax highlight', function()
   end)
 
   it("works with buffer switch and 'nohidden'", function()
-    feed_command('e tmp1.vim')
-    feed_command('e Xtest-functional-ui-highlight.tmp.vim')
-    feed_command('filetype on')
-    feed_command('syntax manual')
-    feed_command('set ft=vim')
-    feed_command('set syntax=ON')
+    command('e tmp1.vim')
+    command('e Xtest-functional-ui-highlight.tmp.vim')
+    command('filetype on')
+    command('syntax manual')
+    command('set filetype=vim fileformat=unix')
+    command('set syntax=ON')
     feed('iecho 1<esc>0')
 
-    feed_command('set nohidden')
-    feed_command('w')
-    feed_command('bn')
-    feed_command('bp')
+    command('set nohidden')
+    command('w')
+    command('silent bn')
+    eq("tmp1.vim", eval("fnamemodify(bufname('%'), ':t')"))
+    feed_command('silent bp')
+    eq("Xtest-functional-ui-highlight.tmp.vim", eval("fnamemodify(bufname('%'), ':t')"))
     screen:expect([[
       {1:^echo} 1              |
       {0:~                   }|
       {0:~                   }|
       {0:~                   }|
-      <ht.tmp.vim" 1L, 7C |
+      :silent bp          |
     ]])
   end)
 end)
 
 
-describe('Default highlight groups', function()
-  -- Test the default attributes for highlight groups shown by the :highlight
-  -- command
+describe('highlight defaults', function()
   local screen
 
   before_each(function()
@@ -281,6 +281,11 @@ describe('Default highlight groups', function()
     ]], {[0] = {bold=true, foreground=Screen.colors.Blue}})
   end)
 
+  it('Cursor after `:hi clear|syntax reset` #6508', function()
+    command('highlight clear|syntax reset')
+    eq('guifg=bg guibg=fg', eval([[matchstr(execute('hi Cursor'), '\v(gui|cterm).*$')]]))
+  end)
+
   it('Whitespace highlight', function()
     screen:try_resize(53, 4)
     feed_command('highlight NonText gui=NONE guifg=#FF0000')

From 14b1becb5466003a65fa6be0517352abb7bc0f42 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Wed, 19 Apr 2017 03:20:05 +0300
Subject: [PATCH 112/257] doc: fix typo (#6504)

---
 src/nvim/buffer.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index e48b7846ae..1f44e1adb0 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -1839,9 +1839,7 @@ int buflist_getfile(int n, linenr_T lnum, int options, int forceit)
   return FAIL;
 }
 
-/*
- * go to the last know line number for the current buffer
- */
+// Go to the last known line number for the current buffer.
 void buflist_getfpos(void)
 {
   pos_T       *fpos;
@@ -2339,9 +2337,7 @@ linenr_T buflist_findlnum(buf_T *buf)
   return buflist_findfpos(buf)->lnum;
 }
 
-/*
- * List all know file names (for :files and :buffers command).
- */
+// List all known file names (for :files and :buffers command).
 void buflist_list(exarg_T *eap)
 {
   buf_T       *buf;

From 440133e0d5d576e46bd5ffa555f6a9c534789b48 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 18 Apr 2017 01:57:19 +0200
Subject: [PATCH 113/257] health.vim: Set 'iskeyword' to that of ft=help.

---
 runtime/autoload/health.vim             | 4 ++--
 runtime/autoload/health/provider.vim    | 2 +-
 runtime/autoload/provider/clipboard.vim | 2 +-
 runtime/autoload/provider/python.vim    | 2 +-
 runtime/autoload/provider/python3.vim   | 2 +-
 runtime/autoload/provider/pythonx.vim   | 5 ++---
 6 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/runtime/autoload/health.vim b/runtime/autoload/health.vim
index b0791eb19d..05c024f585 100644
--- a/runtime/autoload/health.vim
+++ b/runtime/autoload/health.vim
@@ -33,7 +33,7 @@ function! health#check(plugin_names) abort
   setlocal wrap breakindent
   setlocal filetype=markdown
   setlocal conceallevel=2 concealcursor=nc
-  setlocal keywordprg=:help
+  setlocal keywordprg=:help iskeyword=@,48-57,_,192-255,-,#
   call s:enhance_syntax()
 
   if empty(healthchecks)
@@ -88,7 +88,7 @@ endfunction
 
 " Changes ':h clipboard' to ':help |clipboard|'.
 function! s:help_to_link(s) abort
-  return substitute(a:s, '\v[''"]?:h%[elp] ([^''"]+)[''"]?', '":help |\1|"', 'g')
+  return substitute(a:s, '\v:h%[elp] ([^|][^''"\r\n]+)', ':help |\1|', 'g')
 endfunction
 
 " Format a message for a specific report item
diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim
index 9f3f492ef6..9db209849b 100644
--- a/runtime/autoload/health/provider.vim
+++ b/runtime/autoload/health/provider.vim
@@ -117,7 +117,7 @@ function! s:check_clipboard() abort
   if empty(clipboard_tool)
     call health#report_warn(
           \ "No clipboard tool found. Clipboard registers will not work.",
-          \ ['See ":help clipboard".'])
+          \ [':help clipboard'])
   else
     call health#report_ok('Clipboard tool found: '. clipboard_tool)
   endif
diff --git a/runtime/autoload/provider/clipboard.vim b/runtime/autoload/provider/clipboard.vim
index 1bcc1dea74..a3210046b1 100644
--- a/runtime/autoload/provider/clipboard.vim
+++ b/runtime/autoload/provider/clipboard.vim
@@ -86,7 +86,7 @@ function! provider#clipboard#Executable() abort
     return 'win32yank'
   endif
 
-  let s:err = 'clipboard: No clipboard tool available. See :help clipboard'
+  let s:err = 'clipboard: No clipboard tool available. :help clipboard'
   return ''
 endfunction
 
diff --git a/runtime/autoload/provider/python.vim b/runtime/autoload/provider/python.vim
index b99a046375..81fe194cb9 100644
--- a/runtime/autoload/provider/python.vim
+++ b/runtime/autoload/provider/python.vim
@@ -1,5 +1,5 @@
 " The Python provider uses a Python host to emulate an environment for running
-" python-vim plugins. See ":help provider".
+" python-vim plugins. :help provider
 "
 " Associating the plugin with the Python host is the first step because plugins
 " will be passed as command-line arguments
diff --git a/runtime/autoload/provider/python3.vim b/runtime/autoload/provider/python3.vim
index 4f47a03a9b..0c3b75b73d 100644
--- a/runtime/autoload/provider/python3.vim
+++ b/runtime/autoload/provider/python3.vim
@@ -1,5 +1,5 @@
 " The Python3 provider uses a Python3 host to emulate an environment for running
-" python3 plugins. See ":help provider".
+" python3 plugins. :help provider
 "
 " Associating the plugin with the Python3 host is the first step because
 " plugins will be passed as command-line arguments
diff --git a/runtime/autoload/provider/pythonx.vim b/runtime/autoload/provider/pythonx.vim
index 08a0f39b01..2f64c22c71 100644
--- a/runtime/autoload/provider/pythonx.vim
+++ b/runtime/autoload/provider/pythonx.vim
@@ -112,15 +112,14 @@ function! s:check_interpreter(prog, major_ver) abort
   endif
 
   if v:shell_error == 2
-    return [0, prog_path . ' does not have the neovim module installed. '
-          \ . 'See ":help provider-python".']
+    return [0, prog_path.' does not have the "neovim" module. :help provider-python']
   elseif v:shell_error == 127
     " This can happen with pyenv's shims.
     return [0, prog_path . ' does not exist: ' . prog_ver]
   elseif v:shell_error
     return [0, 'Checking ' . prog_path . ' caused an unknown error. '
           \ . '(' . v:shell_error . ', output: ' . prog_ver . ')'
-          \ . ' Please report this at github.com/neovim/neovim.']
+          \ . ' Report this at https://github.com/neovim/neovim']
   endif
 
   return [1, '']

From 29ab8c1ae2b6a13f11f80c9485fa2720f3365b8b Mon Sep 17 00:00:00 2001
From: Nikolai Aleksandrovich Pavlov <kp-pav@yandex.ru>
Date: Fri, 7 Apr 2017 01:31:39 +0300
Subject: [PATCH 114/257] doc/CONTRIBUTING.md: Recommend merge-based workflow.

References #6435
---
 CONTRIBUTING.md | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index f7389ece75..52584c25d8 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -31,12 +31,22 @@ Pull requests ("PRs")
 - Avoid cosmetic changes to unrelated files in the same commit: extra noise
   makes reviews more difficult.
 - Use a [feature branch][git-feature-branch] instead of the master branch.
-- [Rebase your feature branch][git-rebasing] onto (upstream) master before
-  opening the PR.
-- After addressing the review comments, it's fine to rebase and force-push to
-  your review.
-- Try to [tidy your history][git-history-rewriting]: combine related commits
-  with interactive rebasing, separate monolithic commits, etc.
+- Edit history with `ri` alias: add
+
+        [alias]
+        	ri = "!sh -c 't=\"${1:-master}\" ; s=\"${2:-HEAD}\" ; if git merge-base --is-ancestor \"$t\" \"$s\" ; then o=\"$t\" ; else mb=\"$(git merge-base \"$t\" \"$s\")\" ; if test \"x$mb\" = x ; then o=\"$t\" ; else lm=\"$(git log -n1 --merges \"$t..$s\" --pretty=%H)\" ; if test \"x$lm\" = x ; then o=\"$mb\" ; else o=\"$lm\" ; fi ; fi ; fi ; [ $# -gt 0 ] && shift ; [ $# -gt 0 ] && shift ; git rebase --interactive \"$o\" \"$@\"' -"
+
+    to your `~/.gitconfig`.
+
+    This avoids unnecessary rebases yet still allows you to combine related
+    commits, separate monolithic commits, etc.
+- Rebase relatively small PRs, using `exec make -C build unittest` after
+  each pick/edit/reword, after all following squash/fixup.
+- Merge in `master` of bigger PRs. Do not do excessive merging: merge
+  in case of merge conflicts or when master introduces changes which break
+  your PR.
+
+  Do not edit commits which come before the merge commit.
 
 ### Stages: WIP, RFC, RDY
 

From 6bc6d94ec8c8f7e291454ebc888c0fa8435908c8 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 17 Apr 2017 23:52:38 +0200
Subject: [PATCH 115/257] doc: api-contract, CONTRIBUTING.md

---
 CONTRIBUTING.md         | 48 ++++++++++++++++++--------------
 runtime/doc/api.txt     | 25 +++++++++++++++--
 runtime/doc/develop.txt | 61 ++++++++++++++++++++++++-----------------
 runtime/doc/map.txt     | 51 ++++++----------------------------
 runtime/doc/syntax.txt  |  5 +---
 5 files changed, 96 insertions(+), 94 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 52584c25d8..f442ceb672 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -6,10 +6,15 @@ Getting started
 If you want to help but don't know where to start, here are some
 low-risk/isolated tasks:
 
-- Help us [review pull requests](#reviewing)!
 - Merge a [Vim patch].
 - Try a [complexity:low] issue.
-- Fix [clang-scan] or [coverity](#coverity) warnings.
+- Fix [clang-scan], [coverity](#coverity), and [PVS](#pvs-studio) warnings.
+
+Developer guidelines
+--------------------
+
+- Nvim developers should read `:help dev-help`.
+- External UI developers should read `:help dev-ui`.
 
 Reporting problems
 ------------------
@@ -26,27 +31,25 @@ Reporting problems
 Pull requests ("PRs")
 ---------------------
 
-- To avoid duplicate work, you may want to create a `[WIP]` pull request so that
-  others know what you are working on.
-- Avoid cosmetic changes to unrelated files in the same commit: extra noise
-  makes reviews more difficult.
+- To avoid duplicate work, create a `[WIP]` pull request as soon as possible.
+- Avoid cosmetic changes to unrelated files in the same commit: noise makes
+  reviews take longer.
 - Use a [feature branch][git-feature-branch] instead of the master branch.
-- Edit history with `ri` alias: add
-
-        [alias]
-        	ri = "!sh -c 't=\"${1:-master}\" ; s=\"${2:-HEAD}\" ; if git merge-base --is-ancestor \"$t\" \"$s\" ; then o=\"$t\" ; else mb=\"$(git merge-base \"$t\" \"$s\")\" ; if test \"x$mb\" = x ; then o=\"$t\" ; else lm=\"$(git log -n1 --merges \"$t..$s\" --pretty=%H)\" ; if test \"x$lm\" = x ; then o=\"$mb\" ; else o=\"$lm\" ; fi ; fi ; fi ; [ $# -gt 0 ] && shift ; [ $# -gt 0 ] && shift ; git rebase --interactive \"$o\" \"$@\"' -"
-
-    to your `~/.gitconfig`.
-
+- Use a **rebase workflow** for small PRs.
+  - After addressing review comments, it's fine to rebase and force-push.
+- Use a **merge workflow** for big, high-risk PRs.
+  - Merge `master` into your PR when there are conflicts or when master
+    introduces breaking changes.
+  - Use the `ri` git alias:
+    ```
+    [alias]
+    ri = "!sh -c 't=\"${1:-master}\" ; s=\"${2:-HEAD}\" ; if git merge-base --is-ancestor \"$t\" \"$s\" ; then o=\"$t\" ; else mb=\"$(git merge-base \"$t\" \"$s\")\" ; if test \"x$mb\" = x ; then o=\"$t\" ; else lm=\"$(git log -n1 --merges \"$t..$s\" --pretty=%H)\" ; if test \"x$lm\" = x ; then o=\"$mb\" ; else o=\"$lm\" ; fi ; fi ; fi ; [ $# -gt 0 ] && shift ; [ $# -gt 0 ] && shift ; git rebase --interactive \"$o\" \"$@\"' -"
+    ```
     This avoids unnecessary rebases yet still allows you to combine related
     commits, separate monolithic commits, etc.
-- Rebase relatively small PRs, using `exec make -C build unittest` after
-  each pick/edit/reword, after all following squash/fixup.
-- Merge in `master` of bigger PRs. Do not do excessive merging: merge
-  in case of merge conflicts or when master introduces changes which break
-  your PR.
-
-  Do not edit commits which come before the merge commit.
+  - Do not edit commits that come before the merge commit.
+- During a squash/fixup, use `exec make -C build unittest` between each
+  pick/edit/reword.
 
 ### Stages: WIP, RFC, RDY
 
@@ -121,6 +124,11 @@ Use this commit-message format for coverity fixes:
 
 where `<id>` is the Coverity ID (CID). For example see [#804](https://github.com/neovim/neovim/pull/804).
 
+### PVS-Studio
+
+Run `scripts/pvscheck.sh` to check the codebase with [PVS
+Studio](https://www.viva64.com/en/pvs-studio/).
+
 Reviewing
 ---------
 
diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 2bcc996d8b..a118690876 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -9,8 +9,7 @@ Nvim API							   *API* *api*
 Nvim exposes a powerful API that can be used by plugins and external processes
 via |msgpack-rpc|, Lua and VimL (|eval-api|).
 
-Nvim can also be embedded in C applications as libnvim, so the application
-can control the embedded instance by calling the C API directly.
+Applications can also embed libnvim to work with the C API directly.
 
 ==============================================================================
 API Types							   *api-types*
@@ -54,6 +53,28 @@ error_types		Possible error types returned by API functions
 
 External programs ("clients") can use the metadata to discover the |rpc-api|.
 
+==============================================================================
+API contract                                                     *api-contract*
+
+The API is made of functions and events. Clients call functions like those
+described at |api-global|, and may "attach" in order to receive rich events,
+described at |rpc-remote-ui|.
+
+As Nvim develops, its API may change only according the following "contract":
+
+- New functions and events may be added.
+  - Any such extensions are OPTIONAL: old clients may ignore them.
+- Function signatures will NOT CHANGE (after release).
+  - Functions introduced in the development (unreleased) version MAY CHANGE.
+    (Clients can dynamically check `api_prerelease`, etc. |api-metadata|)
+- Event parameters will not be removed or reordered (after release).
+- Events may be EXTENDED: new parameters may be added.
+- New items may be ADDED to map/list parameters/results of functions and
+  events.
+  - Any such new items are OPTIONAL: old clients may ignore them.
+  - Existing items will not be removed (after release).
+- Deprecated functions will not be removed until Nvim version 2.0
+
 ==============================================================================
 Buffer highlighting					       *api-highlights*
 
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index 76ccc42546..0e909aac65 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -6,22 +6,20 @@
 
 Development of Nvim.					*development*
 
-1. Design goals		|design-goals|
-2. Design decisions	|design-decisions|
+1. Design goals		        |design-goals|
+2. Developer guidelines	        |dev-help|
 
 Nvim is open source software.  Everybody is encouraged to contribute.
     https://github.com/neovim/neovim/blob/master/CONTRIBUTING.md
 
-See src/nvim/README.md for a high-level overview of the source code:
-    https://github.com/neovim/neovim/blob/master/src/nvim/README.md
+See src/nvim/README.md for an overview of the source code.
 
 ==============================================================================
-1. Design goals						*design-goals*
+Design goals						*design-goals*
 
 Most important things come first (roughly).
 
-Note that quite a few items are contradicting.  This is intentional.  A
-balance must be found between them.
+Note that some items conflict; this is intentional.  A balance must be found.
 
 
 NVIM IS... IMPROVED					*design-improved*
@@ -41,7 +39,7 @@ completely different editor.  Extensions are done with a "Vi spirit".
 - There are many first-time and inexperienced Vim users.  Make it easy for
   them to start using Vim and learn more over time.
 - There is no limit to the features that can be added.  Selecting new features
-  is one based on (1) what users ask for, (2) how much effort it takes to
+  is based on (1) what users ask for, (2) how much effort it takes to
   implement and (3) someone actually implementing it.
 
 
@@ -56,20 +54,14 @@ Vim tries to help as many users on as many platforms as possible.
 - Support many compilers and libraries.  Not everybody is able or allowed to
   install another compiler or GUI library.
 - People switch from one platform to another, and from GUI to terminal
-  version.  Features should be present in all versions, or at least in as many
-  as possible with a reasonable effort.  Try to avoid that users must switch
-  between platforms to accomplish their work efficiently.
-- That a feature is not possible on some platforms, or only possible on one
-  platform, does not mean it cannot be implemented.  [This intentionally
-  contradicts the previous item, these two must be balanced.]
+  version.  Features should be present in all versions.
 
 
 NVIM IS... WELL DOCUMENTED				*design-documented*
 
 - A feature that isn't documented is a useless feature.  A patch for a new
   feature must include the documentation.
-- Documentation should be comprehensive and understandable.  Using examples is
-  recommended.
+- Documentation should be comprehensive and understandable.  Use examples.
 - Don't make the text unnecessarily long.  Less documentation means that an
   item is easier to find.
 - Do not prefix doc-tags with "nvim-". Use |vim_diff.txt| to document
@@ -77,12 +69,12 @@ NVIM IS... WELL DOCUMENTED				*design-documented*
   to mark a specific feature. No other distinction is necessary.
 - If a feature is removed, delete its doc entry and move its tag to
   |vim_diff.txt|.
+- Move deprecated features to |deprecated.txt|.
 
 
 NVIM IS... HIGH SPEED AND SMALL IN SIZE			*design-speed-size*
 
-Using Vim must not be a big attack on system resources.  Keep it small and
-fast.
+Keep Nvim small and fast.
 - Computers are becoming faster and bigger each year.  Vim can grow too, but
   no faster than computers are growing.  Keep Vim usable on older systems.
 - Many users start Vim from a shell very often.  Startup time must be short.
@@ -118,13 +110,14 @@ NVIM IS... NOT						*design-not*
 
 Nvim is not an operating system; instead it should be composed with other
 tools or hosted as a component. Marvim once said: "Unlike Emacs, Nvim does not
-include the kitchen sink... but you can use it for plumbing."
+include the kitchen sink... but it's good for plumbing."
 
 
 ==============================================================================
-2. Design decisions					*design-decisions*
+Developer guidelines				        *dev-help*
 
-JARGON	 							*dev-jargon*
+
+JARGON	 						*dev-jargon*
 
 API client ~
 All external UIs and remote plugins (as opposed to regular Vim plugins) are
@@ -150,15 +143,14 @@ the xterm window, a window inside Vim to view a buffer.
 To avoid confusion, other items that are sometimes called window have been
 given another name.  Here is an overview of the related items:
 
-screen		The whole display.  For the GUI it's something like 1024x768
-		pixels.  The Vim shell can use the whole screen or part of it.
+screen		The whole display.
 shell		The Vim application.  This can cover the whole screen (e.g.,
 		when running in a console) or part of it (xterm or GUI).
 window		View on a buffer.  There can be several windows in Vim,
 		together with the command line, menubar, toolbar, etc. they
 		fit in the shell.
 
-PROVIDERS 							*dev-provider*
+PROVIDERS 						*dev-provider*
 
 A goal of Nvim is to allow extension of the editor without special knowledge
 in the core. But some Vim components are too tightly coupled; in those cases
@@ -202,7 +194,7 @@ Python host isn't installed then the plugin will "think" it is running in
 a Vim compiled without the |+python| feature.
 
 
-API								*dev-api*
+API							*dev-api*
 
 Use this pattern to name new API functions:
     nvim_{thing}_{action}_{arbitrary-qualifiers}
@@ -233,4 +225,23 @@ _not_ a Buffer). The common {action} "list" indicates that it lists all
 bufs (plural) in the global context.
 
 
+EXTERNAL UI 						*dev-ui*
+
+External UIs should be aware of the |api-contract|. In particular, future
+versions of Nvim may add optional, new items to existing events. The API is
+strongly backwards-compatible, but clients must not break if new fields are
+added to existing events.
+
+External UIs are expected to implement some common features.
+
+- Users may want to configure UI-specific options. The UI should publish the
+  |GUIEnter| autocmd after attaching to Nvim: >
+    doautocmd GUIEnter
+- Options can be monitored for changes by the |OptionSet| autocmd. E.g. if the
+  user sets the 'guifont' option, this autocmd notifies channel 42: >
+    autocmd OptionSet guifont call rpcnotify(42, 'option-changed', 'guifont', &guifont)
+- cursor-shape change: 'guicursor' properties are sent in the mode_info_set UI
+  event.
+
+
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index db349eca71..3ba1ce1f17 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -720,9 +720,6 @@ special key: >
 Don't type a real <Esc>, Vim will recognize the key code and replace it with
 <F1> anyway.
 
-Another problem may be that when keeping ALT or Meta pressed the terminal
-prepends ESC instead of setting the 8th bit.  See |:map-alt-keys|.
-
 						*recursive_mapping*
 If you include the {lhs} in the {rhs} you have a recursive mapping.  When
 {lhs} is typed, it will be replaced with {rhs}.  When the {lhs} which is
@@ -762,46 +759,14 @@ in the original Vi, you would get back the text before the first undo).
 
 1.10 MAPPING ALT-KEYS					*:map-alt-keys*
 
-In the GUI Vim handles the Alt key itself, thus mapping keys with ALT should
-always work.  But in a terminal Vim gets a sequence of bytes and has to figure
-out whether ALT was pressed or not.
-
-By default Vim assumes that pressing the ALT key sets the 8th bit of a typed
-character.  Most decent terminals can work that way, such as xterm, aterm and
-rxvt.  If your <A-k> mappings don't work it might be that the terminal is
-prefixing the character with an ESC character.  But you can just as well type
-ESC before a character, thus Vim doesn't know what happened (except for
-checking the delay between characters, which is not reliable).
-
-As of this writing, some mainstream terminals like gnome-terminal and konsole
-use the ESC prefix.  There doesn't appear a way to have them use the 8th bit
-instead.  Xterm should work well by default.  Aterm and rxvt should work well
-when started with the "--meta8" argument.  You can also tweak resources like
-"metaSendsEscape", "eightBitInput" and "eightBitOutput".
-
-On the Linux console, this behavior can be toggled with the "setmetamode"
-command.  Bear in mind that not using an ESC prefix could get you in trouble
-with other programs.  You should make sure that bash has the "convert-meta"
-option set to "on" in order for your Meta keybindings to still work on it
-(it's the default readline behavior, unless changed by specific system
-configuration).  For that, you can add the line: >
-
-	set convert-meta on
-
-to your ~/.inputrc file. If you're creating the file, you might want to use: >
-
-	$include /etc/inputrc
-
-as the first line, if that file exists on your system, to keep global options.
-This may cause a problem for entering special characters, such as the umlaut.
-Then you should use CTRL-V before that character.
-
-Bear in mind that convert-meta has been reported to have troubles when used in
-UTF-8 locales.  On terminals like xterm, the "metaSendsEscape" resource can be
-toggled on the fly through the "Main Options" menu, by pressing Ctrl-LeftClick
-on the terminal; that's a good last resource in case you want to send ESC when
-using other applications but not when inside VIM.
-
+In the GUI Nvim handles the |ALT| key itself, thus mapping keys with ALT
+should always work.  But in a terminal Nvim gets a sequence of bytes and has
+to figure out whether ALT was pressed.  Terminals may use ESC to indicate that
+ALT was pressed.  If ESC is followed by a {key} within 'ttimeoutlen'
+milliseconds, the ESC is interpreted as:
+        <ALT-{key}>
+otherwise it is interpreted as two key presses:
+        <ESC> {key}
 
 1.11 MAPPING AN OPERATOR				*:map-operator*
 
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index f7c2c0e120..50208640ce 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -4803,10 +4803,7 @@ guisp={color-name}					*highlight-guisp*
 	    Black	White
 	    Orange	Purple		Violet
 
-	In the Win32 GUI version, additional system colors are available.  See
-	|win32-colors|.
-
-	You can also specify a color by its Red, Green and Blue values.
+	You can also specify a color by its RGB (red, green, blue) values.
 	The format is "#rrggbb", where
 		"rr"	is the Red value
 		"gg"	is the Green value

From 38b2bc9a883d88b5257673048f687c5ac1fe7446 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Wed, 19 Apr 2017 18:55:32 +0300
Subject: [PATCH 116/257] scripts: Make pvs do not patch separate directory,
 add patch mode

---
 scripts/pvscheck.sh | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index 2e4f990693..faa6f92c9a 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -12,20 +12,24 @@ help() {
   echo 'Usage:'
   echo '  pvscheck.sh [target-directory [branch]]'
   echo '  pvscheck.sh [--recheck] [target-directory]'
+  echo '  pvscheck.sh --patch'
   echo
-  echo '    --recheck: run analysis on a prepared target directory'
+  echo '    --patch: patch sources in the current directory.'
+  echo '             Does not run analysis.'
   echo
-  echo '    target-directory: Directory where build should occur'
+  echo '    --recheck: run analysis on a prepared target directory.'
+  echo
+  echo '    target-directory: Directory where build should occur.'
   echo '                      Default: ../neovim-pvs'
   echo
-  echo '    branch: Branch to check'
-  echo '            Default: master'
+  echo '    branch: Branch to check.'
+  echo '            Default: master.'
 }
 
 get_pvs_comment() {
   cat > pvs-comment << EOF
-// This is an open source non-commercial project. Dear PVS-Studio, please check it.
-// PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 EOF
 }
 
@@ -75,6 +79,8 @@ patch_sources() {
     build/src/nvim/auto build/config \
     -name '*.[ch]' -not -name '*.test-include.c' \
     -exec /bin/sh -c "$sh_script" - '{}' \;
+
+  rm pvs-comment
 }
 
 run_analysis() {
@@ -103,8 +109,6 @@ do_check() {
 
   create_compile_commands
 
-  patch_sources
-
   run_analysis
 }
 
@@ -128,6 +132,11 @@ main() {
 
   set -x
 
+  if test "x$1" = "x--patch" ; then
+    patch_sources
+    exit $?
+  fi
+
   local recheck=
   if test "x$1" = "x--recheck" ; then
     recheck=1

From 9fd048d901e1191dc56066e4be70014c3387c9fe Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Wed, 19 Apr 2017 19:04:00 +0300
Subject: [PATCH 117/257] scripts: Do not patch already patched sources in
 patch mode

Also do not patch header files, that is not needed.
---
 scripts/pvscheck.sh | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index faa6f92c9a..e2d2a2eada 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -15,6 +15,7 @@ help() {
   echo '  pvscheck.sh --patch'
   echo
   echo '    --patch: patch sources in the current directory.'
+  echo '             Does not patch already patched files.'
   echo '             Does not run analysis.'
   echo
   echo '    --recheck: run analysis on a prepared target directory.'
@@ -66,18 +67,22 @@ patch_sources() {
   get_pvs_comment
 
   local sh_script='
-    cat pvs-comment "$1" > "$1.tmp"
-    mv "$1.tmp" "$1"
+    pvs_comment="$(cat pvs-comment ; echo -n EOS)"
+    filehead="$(head -c $(( ${#pvs_comment} - 3 )) "$1" ; echo -n EOS)"
+    if test "x$filehead" != "x$pvs_comment" ; then
+      cat pvs-comment "$1" > "$1.tmp"
+      mv "$1.tmp" "$1"
+    fi
   '
 
   find \
     src/nvim test/functional/fixtures test/unit/fixtures \
-    -name '*.[ch]' \
+    -name '*.c' \
     -exec /bin/sh -c "$sh_script" - '{}' \;
 
   find \
     build/src/nvim/auto build/config \
-    -name '*.[ch]' -not -name '*.test-include.c' \
+    -name '*.c' -not -name '*.test-include.c' \
     -exec /bin/sh -c "$sh_script" - '{}' \;
 
   rm pvs-comment

From 4555bf9e7f8829053e3a687f814a2036d72ce0e1 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Wed, 19 Apr 2017 19:08:27 +0300
Subject: [PATCH 118/257] scripts: Allow patching only build files

---
 scripts/pvscheck.sh | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index e2d2a2eada..5020d5f86a 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -12,12 +12,14 @@ help() {
   echo 'Usage:'
   echo '  pvscheck.sh [target-directory [branch]]'
   echo '  pvscheck.sh [--recheck] [target-directory]'
-  echo '  pvscheck.sh --patch'
+  echo '  pvscheck.sh --patch [--only-build]'
   echo
   echo '    --patch: patch sources in the current directory.'
   echo '             Does not patch already patched files.'
   echo '             Does not run analysis.'
   echo
+  echo '    --only-build: Only patch files in ./build directory.'
+  echo
   echo '    --recheck: run analysis on a prepared target directory.'
   echo
   echo '    target-directory: Directory where build should occur.'
@@ -75,10 +77,12 @@ patch_sources() {
     fi
   '
 
-  find \
-    src/nvim test/functional/fixtures test/unit/fixtures \
-    -name '*.c' \
-    -exec /bin/sh -c "$sh_script" - '{}' \;
+  if test "x$1" != "x--only-build" ; then
+    find \
+      src/nvim test/functional/fixtures test/unit/fixtures \
+      -name '*.c' \
+      -exec /bin/sh -c "$sh_script" - '{}' \;
+  fi
 
   find \
     build/src/nvim/auto build/config \
@@ -138,7 +142,13 @@ main() {
   set -x
 
   if test "x$1" = "x--patch" ; then
-    patch_sources
+    shift
+    if test "x$1" = "x--only-build" ; then
+      shift
+      patch_sources --only-build
+    else
+      patch_sources
+    fi
     exit $?
   fi
 

From 3351016dcde8f8d400c247baaca4a5575d94535d Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Wed, 19 Apr 2017 19:11:37 +0300
Subject: [PATCH 119/257] scripts: Add newline after the comment

---
 scripts/pvscheck.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index 5020d5f86a..32d63646aa 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -33,6 +33,7 @@ get_pvs_comment() {
   cat > pvs-comment << EOF
 // This is an open source non-commercial project. Dear PVS-Studio, please check
 // it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 EOF
 }
 

From c2f3e361c52ec4e7149ea1d8c6a1202e0873da8e Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Wed, 19 Apr 2017 19:11:50 +0300
Subject: [PATCH 120/257] *: Add comment to all C files

---
 src/nvim/api/buffer.c                     | 3 +++
 src/nvim/api/private/dispatch.c           | 3 +++
 src/nvim/api/private/handle.c             | 3 +++
 src/nvim/api/private/helpers.c            | 3 +++
 src/nvim/api/tabpage.c                    | 3 +++
 src/nvim/api/ui.c                         | 3 +++
 src/nvim/api/vim.c                        | 3 +++
 src/nvim/api/window.c                     | 3 +++
 src/nvim/arabic.c                         | 3 +++
 src/nvim/buffer.c                         | 3 +++
 src/nvim/charset.c                        | 3 +++
 src/nvim/cursor.c                         | 3 +++
 src/nvim/cursor_shape.c                   | 3 +++
 src/nvim/diff.c                           | 3 +++
 src/nvim/digraph.c                        | 3 +++
 src/nvim/edit.c                           | 3 +++
 src/nvim/eval.c                           | 3 +++
 src/nvim/eval/decode.c                    | 3 +++
 src/nvim/eval/encode.c                    | 3 +++
 src/nvim/eval/executor.c                  | 3 +++
 src/nvim/eval/gc.c                        | 3 +++
 src/nvim/eval/typval.c                    | 3 +++
 src/nvim/event/libuv_process.c            | 3 +++
 src/nvim/event/loop.c                     | 3 +++
 src/nvim/event/multiqueue.c               | 3 +++
 src/nvim/event/process.c                  | 3 +++
 src/nvim/event/rstream.c                  | 3 +++
 src/nvim/event/signal.c                   | 3 +++
 src/nvim/event/socket.c                   | 3 +++
 src/nvim/event/stream.c                   | 3 +++
 src/nvim/event/time.c                     | 3 +++
 src/nvim/event/wstream.c                  | 3 +++
 src/nvim/ex_cmds.c                        | 3 +++
 src/nvim/ex_cmds2.c                       | 3 +++
 src/nvim/ex_docmd.c                       | 3 +++
 src/nvim/ex_eval.c                        | 3 +++
 src/nvim/ex_getln.c                       | 3 +++
 src/nvim/farsi.c                          | 3 +++
 src/nvim/file_search.c                    | 3 +++
 src/nvim/fileio.c                         | 3 +++
 src/nvim/fold.c                           | 3 +++
 src/nvim/garray.c                         | 3 +++
 src/nvim/getchar.c                        | 3 +++
 src/nvim/hardcopy.c                       | 3 +++
 src/nvim/hashtab.c                        | 3 +++
 src/nvim/if_cscope.c                      | 3 +++
 src/nvim/indent.c                         | 3 +++
 src/nvim/indent_c.c                       | 3 +++
 src/nvim/keymap.c                         | 3 +++
 src/nvim/log.c                            | 3 +++
 src/nvim/main.c                           | 3 +++
 src/nvim/map.c                            | 3 +++
 src/nvim/mark.c                           | 3 +++
 src/nvim/mbyte.c                          | 3 +++
 src/nvim/memfile.c                        | 3 +++
 src/nvim/memline.c                        | 3 +++
 src/nvim/memory.c                         | 3 +++
 src/nvim/menu.c                           | 3 +++
 src/nvim/message.c                        | 3 +++
 src/nvim/misc1.c                          | 3 +++
 src/nvim/mouse.c                          | 3 +++
 src/nvim/move.c                           | 3 +++
 src/nvim/msgpack_rpc/channel.c            | 3 +++
 src/nvim/msgpack_rpc/helpers.c            | 3 +++
 src/nvim/msgpack_rpc/server.c             | 3 +++
 src/nvim/normal.c                         | 3 +++
 src/nvim/ops.c                            | 3 +++
 src/nvim/option.c                         | 3 +++
 src/nvim/os/dl.c                          | 3 +++
 src/nvim/os/env.c                         | 3 +++
 src/nvim/os/fileio.c                      | 3 +++
 src/nvim/os/fs.c                          | 3 +++
 src/nvim/os/input.c                       | 3 +++
 src/nvim/os/mem.c                         | 3 +++
 src/nvim/os/pty_process_unix.c            | 3 +++
 src/nvim/os/shell.c                       | 3 +++
 src/nvim/os/signal.c                      | 3 +++
 src/nvim/os/stdpaths.c                    | 3 +++
 src/nvim/os/time.c                        | 3 +++
 src/nvim/os/users.c                       | 3 +++
 src/nvim/os_unix.c                        | 3 +++
 src/nvim/path.c                           | 3 +++
 src/nvim/popupmnu.c                       | 3 +++
 src/nvim/profile.c                        | 3 +++
 src/nvim/quickfix.c                       | 3 +++
 src/nvim/rbuffer.c                        | 3 +++
 src/nvim/regexp.c                         | 3 +++
 src/nvim/regexp_nfa.c                     | 3 +++
 src/nvim/screen.c                         | 3 +++
 src/nvim/search.c                         | 3 +++
 src/nvim/sha256.c                         | 3 +++
 src/nvim/shada.c                          | 3 +++
 src/nvim/spell.c                          | 3 +++
 src/nvim/spellfile.c                      | 3 +++
 src/nvim/state.c                          | 3 +++
 src/nvim/strings.c                        | 3 +++
 src/nvim/syntax.c                         | 3 +++
 src/nvim/tag.c                            | 3 +++
 src/nvim/terminal.c                       | 3 +++
 src/nvim/testdir/samples/memfile_test.c   | 3 +++
 src/nvim/tui/input.c                      | 3 +++
 src/nvim/tui/tui.c                        | 3 +++
 src/nvim/ugrid.c                          | 3 +++
 src/nvim/ui.c                             | 3 +++
 src/nvim/ui_bridge.c                      | 3 +++
 src/nvim/undo.c                           | 3 +++
 src/nvim/version.c                        | 3 +++
 src/nvim/window.c                         | 3 +++
 test/functional/fixtures/printargs-test.c | 3 +++
 test/functional/fixtures/shell-test.c     | 3 +++
 test/functional/fixtures/tty-test.c       | 3 +++
 test/unit/fixtures/multiqueue.c           | 3 +++
 test/unit/fixtures/rbuffer.c              | 3 +++
 113 files changed, 339 insertions(+)

diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index 26f9a6f592..1b3592679b 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 // Much of this code was adapted from 'if_py_both.h' from the original
 // vim source
 #include <stdbool.h>
diff --git a/src/nvim/api/private/dispatch.c b/src/nvim/api/private/dispatch.c
index 9b3bcc380a..f8eebcdb10 100644
--- a/src/nvim/api/private/dispatch.c
+++ b/src/nvim/api/private/dispatch.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <inttypes.h>
 #include <stdbool.h>
 #include <stdint.h>
diff --git a/src/nvim/api/private/handle.c b/src/nvim/api/private/handle.c
index acb0fb332a..eb96192af2 100644
--- a/src/nvim/api/private/handle.c
+++ b/src/nvim/api/private/handle.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <stdint.h>
 
diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index fe15b28041..5877b848fc 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <inttypes.h>
 #include <stdbool.h>
diff --git a/src/nvim/api/tabpage.c b/src/nvim/api/tabpage.c
index 0f0c33f621..29592408fc 100644
--- a/src/nvim/api/tabpage.c
+++ b/src/nvim/api/tabpage.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c
index de60339e5f..3cc2870792 100644
--- a/src/nvim/api/ui.c
+++ b/src/nvim/api/ui.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <stddef.h>
 #include <stdint.h>
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 6926436d2f..e5ef4a35c1 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <stdint.h>
 #include <inttypes.h>
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index 3c564ada99..e1bb70ee0d 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <stdbool.h>
 #include <stdint.h>
 #include <stdlib.h>
diff --git a/src/nvim/arabic.c b/src/nvim/arabic.c
index db97bd9dc4..1ef51d2a2a 100644
--- a/src/nvim/arabic.c
+++ b/src/nvim/arabic.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// @file arabic.c
 ///
 /// Functions for Arabic language.
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 1f44e1adb0..46f2cdac79 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * buffer.c: functions for dealing with the buffer structure
  */
diff --git a/src/nvim/charset.c b/src/nvim/charset.c
index 3037cfe669..ee58e0af91 100644
--- a/src/nvim/charset.c
+++ b/src/nvim/charset.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// @file charset.c
 ///
 /// Code related to character sets.
diff --git a/src/nvim/cursor.c b/src/nvim/cursor.c
index 45abd314fc..60002f3cea 100644
--- a/src/nvim/cursor.c
+++ b/src/nvim/cursor.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <stdbool.h>
 #include <inttypes.h>
 
diff --git a/src/nvim/cursor_shape.c b/src/nvim/cursor_shape.c
index 34ee53bf75..24a5672d0f 100644
--- a/src/nvim/cursor_shape.c
+++ b/src/nvim/cursor_shape.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <stdint.h>
 #include "nvim/vim.h"
diff --git a/src/nvim/diff.c b/src/nvim/diff.c
index 49574fbbfc..0bd3f59cf2 100644
--- a/src/nvim/diff.c
+++ b/src/nvim/diff.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// @file diff.c
 ///
 /// Code for diff'ing two, three or four buffers.
diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c
index 66fb525920..32e71f61f7 100644
--- a/src/nvim/digraph.c
+++ b/src/nvim/digraph.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// @file digraph.c
 ///
 /// code for digraphs
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 51d0847bc7..678fa851eb 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * edit.c: functions for Insert mode
  */
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index dcbd7ab152..16f054957f 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * eval.c: Expression evaluation.
  */
diff --git a/src/nvim/eval/decode.c b/src/nvim/eval/decode.c
index a7dc6b205d..8905317f15 100644
--- a/src/nvim/eval/decode.c
+++ b/src/nvim/eval/decode.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <stddef.h>
 
 #include <msgpack.h>
diff --git a/src/nvim/eval/encode.c b/src/nvim/eval/encode.c
index d74913a481..e32f893faa 100644
--- a/src/nvim/eval/encode.c
+++ b/src/nvim/eval/encode.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// @file encode.c
 ///
 /// File containing functions for encoding and decoding VimL values.
diff --git a/src/nvim/eval/executor.c b/src/nvim/eval/executor.c
index ec6c86ac64..91bb61323f 100644
--- a/src/nvim/eval/executor.c
+++ b/src/nvim/eval/executor.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include "nvim/eval/typval.h"
 #include "nvim/eval/executor.h"
 #include "nvim/eval.h"
diff --git a/src/nvim/eval/gc.c b/src/nvim/eval/gc.c
index 5ce52ddd70..2bbf78d827 100644
--- a/src/nvim/eval/gc.c
+++ b/src/nvim/eval/gc.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include "nvim/eval/typval.h"
 #include "nvim/eval/gc.h"
 
diff --git a/src/nvim/eval/typval.c b/src/nvim/eval/typval.c
index 70ec3dfe39..a57dd42f6e 100644
--- a/src/nvim/eval/typval.c
+++ b/src/nvim/eval/typval.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <stdio.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/src/nvim/event/libuv_process.c b/src/nvim/event/libuv_process.c
index f5a41d151b..3116adbde8 100644
--- a/src/nvim/event/libuv_process.c
+++ b/src/nvim/event/libuv_process.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 
 #include <uv.h>
diff --git a/src/nvim/event/loop.c b/src/nvim/event/loop.c
index 0e1775d01b..6963978581 100644
--- a/src/nvim/event/loop.c
+++ b/src/nvim/event/loop.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <stdarg.h>
 #include <stdint.h>
 
diff --git a/src/nvim/event/multiqueue.c b/src/nvim/event/multiqueue.c
index 79b4dd9458..a17bae31e3 100644
--- a/src/nvim/event/multiqueue.c
+++ b/src/nvim/event/multiqueue.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 // Multi-level queue for selective async event processing.
 // Not threadsafe; access must be synchronized externally.
 //
diff --git a/src/nvim/event/process.c b/src/nvim/event/process.c
index 4429a65f92..ffda10a494 100644
--- a/src/nvim/event/process.c
+++ b/src/nvim/event/process.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <stdlib.h>
 
diff --git a/src/nvim/event/rstream.c b/src/nvim/event/rstream.c
index 2737dad305..854af474b2 100644
--- a/src/nvim/event/rstream.c
+++ b/src/nvim/event/rstream.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/src/nvim/event/signal.c b/src/nvim/event/signal.c
index 11ce15a882..fec46da4ff 100644
--- a/src/nvim/event/signal.c
+++ b/src/nvim/event/signal.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <uv.h>
 
 #include "nvim/event/loop.h"
diff --git a/src/nvim/event/socket.c b/src/nvim/event/socket.c
index 8f9327f3d4..e536d79a2a 100644
--- a/src/nvim/event/socket.c
+++ b/src/nvim/event/socket.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <stdint.h>
 
diff --git a/src/nvim/event/stream.c b/src/nvim/event/stream.c
index 26083c20f4..860a957b3e 100644
--- a/src/nvim/event/stream.c
+++ b/src/nvim/event/stream.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <stdio.h>
 #include <stdbool.h>
diff --git a/src/nvim/event/time.c b/src/nvim/event/time.c
index 77260546db..80289c27d1 100644
--- a/src/nvim/event/time.c
+++ b/src/nvim/event/time.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <stdint.h>
 
 #include <uv.h>
diff --git a/src/nvim/event/wstream.c b/src/nvim/event/wstream.c
index fc7aad8eb9..f453e5898d 100644
--- a/src/nvim/event/wstream.c
+++ b/src/nvim/event/wstream.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 9a847a4c0a..117ef6a507 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * ex_cmds.c: some functions for command line commands
  */
diff --git a/src/nvim/ex_cmds2.c b/src/nvim/ex_cmds2.c
index eeace789b2..a1a32d9f52 100644
--- a/src/nvim/ex_cmds2.c
+++ b/src/nvim/ex_cmds2.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// @file ex_cmds2.c
 ///
 /// Some more functions for command line commands
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 17b3b512ef..7568d71ac0 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * ex_docmd.c: functions for executing an Ex command line.
  */
diff --git a/src/nvim/ex_eval.c b/src/nvim/ex_eval.c
index 65112c4dd8..5d664b94a8 100644
--- a/src/nvim/ex_eval.c
+++ b/src/nvim/ex_eval.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 // TODO(ZyX-I): move to eval/executor
 
 /// @file ex_eval.c
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 0b6036ace9..1affdb2fe7 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * ex_getln.c: Functions for entering and editing an Ex command line.
  */
diff --git a/src/nvim/farsi.c b/src/nvim/farsi.c
index 2d37d1284e..1053cb3ac2 100644
--- a/src/nvim/farsi.c
+++ b/src/nvim/farsi.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// @file farsi.c
 ///
 /// Functions for Farsi language
diff --git a/src/nvim/file_search.c b/src/nvim/file_search.c
index db745bdd15..8094a1b266 100644
--- a/src/nvim/file_search.c
+++ b/src/nvim/file_search.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 // File searching functions for 'path', 'tags' and 'cdpath' options.
 //
 // External visible functions:
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 74fa5aa1de..3e062aecc0 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * fileio.c: read from and write to a file
  */
diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 34db4d2171..2aa9a9cb5e 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 // vim: set fdm=marker fdl=1 fdc=3
 
 /*
diff --git a/src/nvim/garray.c b/src/nvim/garray.c
index 9ed3b901ef..2d2af54c95 100644
--- a/src/nvim/garray.c
+++ b/src/nvim/garray.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// @file garray.c
 ///
 /// Functions for handling growing arrays.
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index e056ff488c..9d32df5a68 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * getchar.c
  *
diff --git a/src/nvim/hardcopy.c b/src/nvim/hardcopy.c
index b2cbe30a43..abc4773d84 100644
--- a/src/nvim/hardcopy.c
+++ b/src/nvim/hardcopy.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * hardcopy.c: printing to paper
  */
diff --git a/src/nvim/hashtab.c b/src/nvim/hashtab.c
index 354c9718ba..3397788b00 100644
--- a/src/nvim/hashtab.c
+++ b/src/nvim/hashtab.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// @file hashtab.c
 ///
 /// Handling of a hashtable with Vim-specific properties.
diff --git a/src/nvim/if_cscope.c b/src/nvim/if_cscope.c
index b647b8146a..e1c7df9175 100644
--- a/src/nvim/if_cscope.c
+++ b/src/nvim/if_cscope.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * CSCOPE support for Vim added by Andy Kahn <kahn@zk3.dec.com>
  * Ported to Win32 by Sergey Khorev <sergey.khorev@gmail.com>
diff --git a/src/nvim/indent.c b/src/nvim/indent.c
index 8fbad38495..5471b41b2c 100644
--- a/src/nvim/indent.c
+++ b/src/nvim/indent.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <inttypes.h>
 #include <stdbool.h>
diff --git a/src/nvim/indent_c.c b/src/nvim/indent_c.c
index 8f5547544d..4806f46705 100644
--- a/src/nvim/indent_c.c
+++ b/src/nvim/indent_c.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <inttypes.h>
 #include <stdint.h>
diff --git a/src/nvim/keymap.c b/src/nvim/keymap.c
index 72b0d0aa40..0fe2ffe6f2 100644
--- a/src/nvim/keymap.c
+++ b/src/nvim/keymap.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <inttypes.h>
 #include <limits.h>
diff --git a/src/nvim/log.c b/src/nvim/log.c
index bbb4dfb944..d059e28d5d 100644
--- a/src/nvim/log.c
+++ b/src/nvim/log.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <inttypes.h>
 #include <stdarg.h>
diff --git a/src/nvim/main.c b/src/nvim/main.c
index 7ad42d6776..1095d4d3b5 100644
--- a/src/nvim/main.c
+++ b/src/nvim/main.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #define EXTERN
 #include <assert.h>
 #include <stdint.h>
diff --git a/src/nvim/map.c b/src/nvim/map.c
index 73af487f90..54a9e559af 100644
--- a/src/nvim/map.c
+++ b/src/nvim/map.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <stdlib.h>
 #include <stdbool.h>
 #include <string.h>
diff --git a/src/nvim/mark.c b/src/nvim/mark.c
index ae94ec7ecd..675fe4d57f 100644
--- a/src/nvim/mark.c
+++ b/src/nvim/mark.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * mark.c: functions for setting marks and jumping to them
  */
diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index b18459a2b5..b21ec944c1 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// mbyte.c: Code specifically for handling multi-byte characters.
 /// Multibyte extensions partly by Sung-Hoon Baek
 ///
diff --git a/src/nvim/memfile.c b/src/nvim/memfile.c
index 5d6639c4d0..efaf1f94c5 100644
--- a/src/nvim/memfile.c
+++ b/src/nvim/memfile.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// An abstraction to handle blocks of memory which can be stored in a file.
 /// This is the implementation of a sort of virtual memory.
 ///
diff --git a/src/nvim/memline.c b/src/nvim/memline.c
index b31ca136dd..40a6761225 100644
--- a/src/nvim/memline.c
+++ b/src/nvim/memline.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /* for debugging */
 /* #define CHECK(c, s)	if (c) EMSG(s) */
 #define CHECK(c, s)
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index 85ec916ba0..0ee4776581 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
  // Various routines dealing with allocation and deallocation of memory.
 
 #include <assert.h>
diff --git a/src/nvim/menu.c b/src/nvim/menu.c
index 529978e3f0..4e621b49c1 100644
--- a/src/nvim/menu.c
+++ b/src/nvim/menu.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * Code for menus.  Used for the GUI and 'wildmenu'.
  * GUI/Motif support by Robert Webb
diff --git a/src/nvim/message.c b/src/nvim/message.c
index 42e1fd1cf9..146937c25a 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * message.c: functions for displaying messages on the command line
  */
diff --git a/src/nvim/misc1.c b/src/nvim/misc1.c
index 8d93505be3..6de74fddf2 100644
--- a/src/nvim/misc1.c
+++ b/src/nvim/misc1.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * misc1.c: functions that didn't seem to fit elsewhere
  */
diff --git a/src/nvim/mouse.c b/src/nvim/mouse.c
index 2ebe199f47..6088488388 100644
--- a/src/nvim/mouse.c
+++ b/src/nvim/mouse.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <stdbool.h>
 
 #include "nvim/mouse.h"
diff --git a/src/nvim/move.c b/src/nvim/move.c
index 4feabf624b..d5be4cb8c3 100644
--- a/src/nvim/move.c
+++ b/src/nvim/move.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * move.c: Functions for moving the cursor and scrolling text.
  *
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
index 259dcc523c..b2c6ef852c 100644
--- a/src/nvim/msgpack_rpc/channel.c
+++ b/src/nvim/msgpack_rpc/channel.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <stdbool.h>
 #include <string.h>
 #include <inttypes.h>
diff --git a/src/nvim/msgpack_rpc/helpers.c b/src/nvim/msgpack_rpc/helpers.c
index 4d8a9984e1..967ce31c1b 100644
--- a/src/nvim/msgpack_rpc/helpers.c
+++ b/src/nvim/msgpack_rpc/helpers.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <stdint.h>
 #include <stdbool.h>
 #include <inttypes.h>
diff --git a/src/nvim/msgpack_rpc/server.c b/src/nvim/msgpack_rpc/server.c
index d7c2926a0f..b6958088ca 100644
--- a/src/nvim/msgpack_rpc/server.c
+++ b/src/nvim/msgpack_rpc/server.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 7f087dcd20..51da9429b6 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * normal.c:	Contains the main routine for processing characters in command
  *		mode.  Communicates closely with the code in ops.c to handle
diff --git a/src/nvim/ops.c b/src/nvim/ops.c
index 6ea3a45049..c77781b1d1 100644
--- a/src/nvim/ops.c
+++ b/src/nvim/ops.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * ops.c: implementation of various operators: op_shift, op_delete, op_tilde,
  *        op_change, op_yank, do_put, do_join
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 0070a0056d..bade4af8e3 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 // User-settable options. Checklist for adding a new option:
 // - Put it in options.lua
 // - For a global option: Add a variable for it in option_defs.h.
diff --git a/src/nvim/os/dl.c b/src/nvim/os/dl.c
index fef02cc784..267cf5ae4b 100644
--- a/src/nvim/os/dl.c
+++ b/src/nvim/os/dl.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// Functions for using external native libraries
 
 #include <stdbool.h>
diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
index f3187de182..72bd0bf788 100644
--- a/src/nvim/os/env.c
+++ b/src/nvim/os/env.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 // Environment inspection
 
 #include <assert.h>
diff --git a/src/nvim/os/fileio.c b/src/nvim/os/fileio.c
index 27eb448c3d..4309ac723c 100644
--- a/src/nvim/os/fileio.c
+++ b/src/nvim/os/fileio.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// @file fileio.c
 ///
 /// Buffered reading/writing to a file. Unlike fileio.c this is not dealing with
diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c
index c33e1140e8..c39ff5d358 100644
--- a/src/nvim/os/fs.c
+++ b/src/nvim/os/fs.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 // fs.c -- filesystem access
 #include <stdbool.h>
 #include <stddef.h>
diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c
index 5f0f2ec677..80457eaa14 100644
--- a/src/nvim/os/input.c
+++ b/src/nvim/os/input.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <string.h>
 #include <stdbool.h>
diff --git a/src/nvim/os/mem.c b/src/nvim/os/mem.c
index 871ece7a0e..eccb3c97e5 100644
--- a/src/nvim/os/mem.c
+++ b/src/nvim/os/mem.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// Functions for accessing system memory information.
 
 #include <uv.h>
diff --git a/src/nvim/os/pty_process_unix.c b/src/nvim/os/pty_process_unix.c
index 71a5e13de5..eb9335b03c 100644
--- a/src/nvim/os/pty_process_unix.c
+++ b/src/nvim/os/pty_process_unix.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 // Some of the code came from pangoterm and libuv
 #include <stdbool.h>
 #include <stdlib.h>
diff --git a/src/nvim/os/shell.c b/src/nvim/os/shell.c
index 29c0431521..fc8ab7dc8f 100644
--- a/src/nvim/os/shell.c
+++ b/src/nvim/os/shell.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <string.h>
 #include <assert.h>
 #include <stdbool.h>
diff --git a/src/nvim/os/signal.c b/src/nvim/os/signal.c
index 1ac6d3f5e1..fd6d3b32e4 100644
--- a/src/nvim/os/signal.c
+++ b/src/nvim/os/signal.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <stdbool.h>
 
diff --git a/src/nvim/os/stdpaths.c b/src/nvim/os/stdpaths.c
index afb9bdec31..a41fb7c621 100644
--- a/src/nvim/os/stdpaths.c
+++ b/src/nvim/os/stdpaths.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <stdbool.h>
 
 #include "nvim/os/stdpaths_defs.h"
diff --git a/src/nvim/os/time.c b/src/nvim/os/time.c
index 8ce2ecf4f4..c471352c02 100644
--- a/src/nvim/os/time.c
+++ b/src/nvim/os/time.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <stdint.h>
 #include <stdbool.h>
diff --git a/src/nvim/os/users.c b/src/nvim/os/users.c
index 1c94ef0067..82bb918f70 100644
--- a/src/nvim/os/users.c
+++ b/src/nvim/os/users.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 // users.c -- operating system user information
 
 #include <uv.h>
diff --git a/src/nvim/os_unix.c b/src/nvim/os_unix.c
index acd86f06dc..c5a42204be 100644
--- a/src/nvim/os_unix.c
+++ b/src/nvim/os_unix.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * os_unix.c -- code for all flavors of Unix (BSD, SYSV, SVR4, POSIX, ...)
  *
diff --git a/src/nvim/path.c b/src/nvim/path.c
index 205fc2ed62..12952f49db 100644
--- a/src/nvim/path.c
+++ b/src/nvim/path.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <inttypes.h>
 #include <stdbool.h>
diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c
index 6346951c05..6e81c5a171 100644
--- a/src/nvim/popupmnu.c
+++ b/src/nvim/popupmnu.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// @file popupmnu.c
 ///
 /// Popup menu (PUM)
diff --git a/src/nvim/profile.c b/src/nvim/profile.c
index 97d7d77359..8fb8e92add 100644
--- a/src/nvim/profile.c
+++ b/src/nvim/profile.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <stdio.h>
 #include <math.h>
 #include <assert.h>
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 1241841885..112498ae20 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * quickfix.c: functions for quickfix mode, using a file with error messages
  */
diff --git a/src/nvim/rbuffer.c b/src/nvim/rbuffer.c
index 111af0d0fb..18d453cbe9 100644
--- a/src/nvim/rbuffer.c
+++ b/src/nvim/rbuffer.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <stddef.h>
 #include <string.h>
diff --git a/src/nvim/regexp.c b/src/nvim/regexp.c
index 7be89c2d7e..7a00ee27bb 100644
--- a/src/nvim/regexp.c
+++ b/src/nvim/regexp.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * Handling of regular expressions: vim_regcomp(), vim_regexec(), vim_regsub()
  *
diff --git a/src/nvim/regexp_nfa.c b/src/nvim/regexp_nfa.c
index 506e6277e9..139772d51e 100644
--- a/src/nvim/regexp_nfa.c
+++ b/src/nvim/regexp_nfa.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * NFA regular expression implementation.
  *
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index a8993be4e5..818c2c577d 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * screen.c: code for displaying on the screen
  *
diff --git a/src/nvim/search.c b/src/nvim/search.c
index 91a558045f..c662e3ba40 100644
--- a/src/nvim/search.c
+++ b/src/nvim/search.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * search.c: code for normal mode searching commands
  */
diff --git a/src/nvim/sha256.c b/src/nvim/sha256.c
index c72dafd08e..a2378cc202 100644
--- a/src/nvim/sha256.c
+++ b/src/nvim/sha256.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// @file sha256.c
 ///
 /// FIPS-180-2 compliant SHA-256 implementation
diff --git a/src/nvim/shada.c b/src/nvim/shada.c
index 8c5d6dff65..a6d8cb6563 100644
--- a/src/nvim/shada.c
+++ b/src/nvim/shada.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <stdlib.h>
 #include <stddef.h>
 #include <stdbool.h>
diff --git a/src/nvim/spell.c b/src/nvim/spell.c
index 17016be35f..25ae562e65 100644
--- a/src/nvim/spell.c
+++ b/src/nvim/spell.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 // spell.c: code for spell checking
 //
 // See spellfile.c for the Vim spell file format.
diff --git a/src/nvim/spellfile.c b/src/nvim/spellfile.c
index 1da71dc4f9..d34d69b3a4 100644
--- a/src/nvim/spellfile.c
+++ b/src/nvim/spellfile.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 // spellfile.c: code for reading and writing spell files.
 //
 // See spell.c for information about spell checking.
diff --git a/src/nvim/state.c b/src/nvim/state.c
index 44c6441e40..210708c3f4 100644
--- a/src/nvim/state.c
+++ b/src/nvim/state.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 
 #include "nvim/lib/kvec.h"
diff --git a/src/nvim/strings.c b/src/nvim/strings.c
index 8a1a3beddd..743b43c2e5 100644
--- a/src/nvim/strings.c
+++ b/src/nvim/strings.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <inttypes.h>
 #include <stdarg.h>
 #include <stdbool.h>
diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index d5ff3707e8..ce48547163 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * syntax.c: code for syntax highlighting
  */
diff --git a/src/nvim/tag.c b/src/nvim/tag.c
index 0c7244cbb3..b8b86bf979 100644
--- a/src/nvim/tag.c
+++ b/src/nvim/tag.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * Code to handle tags and the tag stack
  */
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
index 85c4950b42..19b9bdc19f 100644
--- a/src/nvim/terminal.c
+++ b/src/nvim/terminal.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 // VT220/xterm-like terminal emulator.
 // Powered by libvterm http://www.leonerd.org.uk/code/libvterm
 //
diff --git a/src/nvim/testdir/samples/memfile_test.c b/src/nvim/testdir/samples/memfile_test.c
index 0fa1e14c40..3c8f108255 100644
--- a/src/nvim/testdir/samples/memfile_test.c
+++ b/src/nvim/testdir/samples/memfile_test.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /* vi:set ts=8 sts=4 sw=4 noet:
  *
  * VIM - Vi IMproved	by Bram Moolenaar
diff --git a/src/nvim/tui/input.c b/src/nvim/tui/input.c
index 8e5adb14f9..3f2ccd4746 100644
--- a/src/nvim/tui/input.c
+++ b/src/nvim/tui/input.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 
 #include "nvim/tui/input.h"
 #include "nvim/vim.h"
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index f34f5f1bc4..941fdb2570 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 // Terminal UI functions. Invoked (by ui_bridge.c) on the TUI thread.
 
 #include <assert.h>
diff --git a/src/nvim/ugrid.c b/src/nvim/ugrid.c
index 127b18feb6..7a0a16687e 100644
--- a/src/nvim/ugrid.c
+++ b/src/nvim/ugrid.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <stdbool.h>
 #include <stdio.h>
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 28f71b7ef2..cfa186987c 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <inttypes.h>
 #include <stdbool.h>
diff --git a/src/nvim/ui_bridge.c b/src/nvim/ui_bridge.c
index 9f780663ac..2c70b46c14 100644
--- a/src/nvim/ui_bridge.c
+++ b/src/nvim/ui_bridge.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 // UI wrapper that sends requests to the UI thread.
 // Used by the built-in TUI and libnvim-based UIs.
 
diff --git a/src/nvim/undo.c b/src/nvim/undo.c
index 571ad7204f..290d5d7553 100644
--- a/src/nvim/undo.c
+++ b/src/nvim/undo.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /*
  * undo.c: multi level undo facility
  *
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 9a5d7ce169..29ce741ba0 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 /// @file version.c
 ///
 /// Nvim was forked from Vim 7.4.160.
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 6020159af9..60bba19b07 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <assert.h>
 #include <inttypes.h>
 #include <stdbool.h>
diff --git a/test/functional/fixtures/printargs-test.c b/test/functional/fixtures/printargs-test.c
index 2c25cf8447..be54605817 100644
--- a/test/functional/fixtures/printargs-test.c
+++ b/test/functional/fixtures/printargs-test.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <stdio.h>
 
 int main(int argc, char **argv)
diff --git a/test/functional/fixtures/shell-test.c b/test/functional/fixtures/shell-test.c
index 3f3976ece5..8dbec2aaee 100644
--- a/test/functional/fixtures/shell-test.c
+++ b/test/functional/fixtures/shell-test.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <stdio.h>
 #include <string.h>
 #include <stdint.h>
diff --git a/test/functional/fixtures/tty-test.c b/test/functional/fixtures/tty-test.c
index 778e7f3cd3..3406b3a202 100644
--- a/test/functional/fixtures/tty-test.c
+++ b/test/functional/fixtures/tty-test.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/test/unit/fixtures/multiqueue.c b/test/unit/fixtures/multiqueue.c
index da63e55919..a8dca0a844 100644
--- a/test/unit/fixtures/multiqueue.c
+++ b/test/unit/fixtures/multiqueue.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include <string.h>
 #include <stdlib.h>
 #include "nvim/event/multiqueue.h"
diff --git a/test/unit/fixtures/rbuffer.c b/test/unit/fixtures/rbuffer.c
index d587d6b054..3f4062fa18 100644
--- a/test/unit/fixtures/rbuffer.c
+++ b/test/unit/fixtures/rbuffer.c
@@ -1,3 +1,6 @@
+// This is an open source non-commercial project. Dear PVS-Studio, please check
+// it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
+
 #include "nvim/rbuffer.h"
 #include "rbuffer.h"
 

From 5da8bb92fcdd6688c80e803cb557e7b24c6ee391 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 16 Apr 2017 16:52:47 +0200
Subject: [PATCH 121/257] vim-patch:dc1f1645cb49

Updated runtime files.

https://github.com/vim/vim/commit/dc1f1645cb495fa6bfbe216d7359f23539a0e25d
---
 runtime/doc/eval.txt    | 18 +++++++++---------
 runtime/doc/index.txt   |  2 +-
 runtime/doc/options.txt |  2 +-
 runtime/doc/syntax.txt  |  2 +-
 runtime/doc/vi_diff.txt | 12 +++++++++++-
 runtime/indent/yaml.vim | 35 ++++++++++++++++++++++++++++++-----
 6 files changed, 53 insertions(+), 18 deletions(-)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index b68f121b74..ca247f1c65 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1214,7 +1214,7 @@ The arguments are optional.  Example: >
 							*closure*
 Lambda expressions can access outer scope variables and arguments.  This is
 often called a closure.  Example where "i" a and "a:arg" are used in a lambda
-while they exists in the function scope.  They remain valid even after the
+while they exist in the function scope.  They remain valid even after the
 function returns: >
 	:function Foo(arg)
 	:  let i = 3
@@ -1991,7 +1991,7 @@ cos({expr})			Float	cosine of {expr}
 cosh({expr})			Float	hyperbolic cosine of {expr}
 count({list}, {expr} [, {ic} [, {start}]])
 				Number	 count how many {expr} are in {list}
-cscope_connection([{num} , {dbpath} [, {prepend}]])
+cscope_connection([{num}, {dbpath} [, {prepend}]])
 				Number	checks existence of cscope connection
 cursor({lnum}, {col} [, {off}])
 				Number	move cursor to {lnum}, {col}, {off}
@@ -4278,7 +4278,7 @@ getreg([{regname} [, 1 [, {list}]]])			*getreg()*
 		The result is a String, which is the contents of register
 		{regname}.  Example: >
 			:let cliptext = getreg('*')
-<		When {regname} was not set the result is a empty string.
+<		When {regname} was not set the result is an empty string.
 
 		getreg('=') returns the last evaluated value of the expression
 		register.  (For use in maps.)
@@ -4317,7 +4317,7 @@ gettabinfo([{arg}])					*gettabinfo()*
 			nr		tab page number.
 			variables	a reference to the dictionary with
 					tabpage-local variables
-			windows		List of window IDs in the tag page.
+			windows		List of window IDs in the tab page.
 
 gettabvar({tabnr}, {varname} [, {def}])				*gettabvar()*
 		Get the value of a tab-local variable {varname} in tab page
@@ -7404,7 +7404,7 @@ systemlist({cmd} [, {input} [, {keepempty}]])		*systemlist()*
 tabpagebuflist([{arg}])					*tabpagebuflist()*
 		The result is a |List|, where each item is the number of the
 		buffer associated with each window in the current tab page.
-		{arg} specifies the number of tab page to be used.  When
+		{arg} specifies the number of the tab page to be used. When
 		omitted the current tab page is used.
 		When {arg} is invalid the number zero is returned.
 		To get a list of all buffers in all tabs use this: >
@@ -7553,9 +7553,9 @@ timer_info([{id}])
 
 timer_pause({timer}, {paused})				*timer_pause()*
 		Pause or unpause a timer.  A paused timer does not invoke its
-		callback, while the time it would is not changed.  Unpausing a
-		timer may cause the callback to be invoked almost immediately
-		if enough time has passed.
+		callback when its time expires.  Unpausing a timer may cause
+		the callback to be invoked almost immediately if enough time
+		has passed.
 
 		Pausing a timer is useful to avoid the callback to be called
 		for a short time.
@@ -7564,7 +7564,7 @@ timer_pause({timer}, {paused})				*timer_pause()*
 		String, then the timer is paused, otherwise it is unpaused.
 		See |non-zero-arg|.
 
-							*timer_start()*
+						*timer_start()* *timer* *timers*
 timer_start({time}, {callback} [, {options}])
 		Create a timer and return the timer ID.
 
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index bab15bcbb6..b06baa6497 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1202,7 +1202,7 @@ tag	      command	      action ~
 |:display|	:di[splay]	display registers
 |:djump|	:dj[ump]	jump to #define
 |:dl|		:dl		short for |:delete| with the 'l' flag
-|:dl|		:del[ete]l	short for |:delete| with the 'l' flag
+|:del|		:del[ete]l	short for |:delete| with the 'l' flag
 |:dlist|	:dli[st]	list #defines
 |:doautocmd|	:do[autocmd]	apply autocommands to current buffer
 |:doautoall|	:doautoa[ll]	apply autocommands for all loaded buffers
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 9be7dae84d..e269fd30c5 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3499,7 +3499,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	if you want to use Vim as a modeless editor.
 	These Insert mode commands will be useful:
 	- Use the cursor keys to move around.
-	- Use CTRL-O to execute one Normal mode command |i_CTRL-O|).  When
+	- Use CTRL-O to execute one Normal mode command |i_CTRL-O|.  When
 	  this is a mapping, it is executed as if 'insertmode' was off.
 	  Normal mode remains active until the mapping is finished.
 	- Use CTRL-L to execute a number of Normal mode commands, then use
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 50208640ce..3b54f9f268 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -3739,7 +3739,7 @@ Whether or not it is actually concealed depends on the value of the
 'conceallevel' option.  The 'concealcursor' option is used to decide whether
 concealable items in the current line are displayed unconcealed to be able to
 edit the line.
-Another way to conceal text with with |matchadd()|.
+Another way to conceal text is with |matchadd()|.
 
 concealends						*:syn-concealends*
 
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index 1a108caeaf..1fbd96f749 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -60,7 +60,7 @@ Support for different systems.
 	- Windows (XP SP 2 or greater)
 	- OS X
 
-Multi level undo.					|undo|
+Multi level persistent undo.					|undo|
 	'u' goes backward in time, 'CTRL-R' goes forward again.  Set option
 	'undolevels' to the number of changes to be remembered (default 1000).
 	Set 'undolevels' to 0 for a Vi-compatible one level undo.  Set it to
@@ -71,6 +71,9 @@ Multi level undo.					|undo|
 	create a branch in the undo tree.  This means you can go back to any
 	state of the text, there is no risk of a change causing text to be
 	lost forever. |undo-tree|
+	The undo information is stored in a file when the 'undofile' option is
+	set.  This means you can exit Vim, start Vim on a previously edited
+	file and undo changes that were made before exiting Vim.
 
 Graphical User Interface (GUI).				|gui|
 	Included support for GUI: menu's, mouse, scrollbars, etc.  You can
@@ -124,6 +127,13 @@ Plugins.						|add-plugin|
 	right directory.  That's an easy way to start using Vim scripts
 	written by others.  Plugins can be for all kind of files, or
 	specifically for a filetype.
+	Packages make this even easier. |packages|
+
+Asynchronous communication and timers.			|job-control| |timer|
+	Vim can exchange messages with other processes in the background.
+	Vim can start a job, communicate with it and stop it. |job-control|
+	Timers can fire once or repeatedly and invoke a function to do any
+	work. |timer|
 
 Repeat a series of commands.				|q|
 	"q{c}" starts recording typed characters into named register {c}.
diff --git a/runtime/indent/yaml.vim b/runtime/indent/yaml.vim
index aa4906ce0a..3201462fbc 100644
--- a/runtime/indent/yaml.vim
+++ b/runtime/indent/yaml.vim
@@ -37,7 +37,7 @@ function s:FindPrevLessIndentedLine(lnum, ...)
     let curindent = a:0 ? a:1 : indent(a:lnum)
     while           prevlnum
                 \&&  indent(prevlnum) >=  curindent
-                \&& getline(prevlnum) !~# '^\s*#'
+                \&& getline(prevlnum) =~# '^\s*#'
         let prevlnum = prevnonblank(prevlnum-1)
     endwhile
     return prevlnum
@@ -51,11 +51,33 @@ function s:FindPrevLEIndentedLineMatchingRegex(lnum, regex)
     return plilnum
 endfunction
 
-let s:mapkeyregex='\v^\s*%(\''%([^'']|'''')*\'''.
-                \        '|\"%([^"\\]|\\.)*\"'.
-                \        '|%(%(\:\ )@!.)*)\:%(\ |$)'
+let s:mapkeyregex='\v^\s*\#@!\S@=%(\''%([^'']|\''\'')*\'''.
+                \                 '|\"%([^"\\]|\\.)*\"'.
+                \                 '|%(%(\:\ )@!.)*)\:%(\ |$)'
 let s:liststartregex='\v^\s*%(\-%(\ |$))'
 
+let s:c_ns_anchor_char = '\v%([\n\r\uFEFF \t,[\]{}]@!\p)'
+let s:c_ns_anchor_name = s:c_ns_anchor_char.'+'
+let s:c_ns_anchor_property =  '\v\&'.s:c_ns_anchor_name
+
+let s:ns_word_char = '\v[[:alnum:]_\-]'
+let s:ns_tag_char  = '\v%(%\x\x|'.s:ns_word_char.'|[#/;?:@&=+$.~*''()])'
+let s:c_named_tag_handle     = '\v\!'.s:ns_word_char.'+\!'
+let s:c_secondary_tag_handle = '\v\!\!'
+let s:c_primary_tag_handle   = '\v\!'
+let s:c_tag_handle = '\v%('.s:c_named_tag_handle.
+            \            '|'.s:c_secondary_tag_handle.
+            \            '|'.s:c_primary_tag_handle.')'
+let s:c_ns_shorthand_tag = '\v'.s:c_tag_handle . s:ns_tag_char.'+'
+let s:c_non_specific_tag = '\v\!'
+let s:ns_uri_char  = '\v%(%\x\x|'.s:ns_word_char.'\v|[#/;?:@&=+$,.!~*''()[\]])'
+let s:c_verbatim_tag = '\v\!\<'.s:ns_uri_char.'+\>'
+let s:c_ns_tag_property = '\v'.s:c_verbatim_tag.
+            \               '\v|'.s:c_ns_shorthand_tag.
+            \               '\v|'.s:c_non_specific_tag
+
+let s:block_scalar_header = '\v[|>]%([+-]?[1-9]|[1-9]?[+-])?'
+
 function GetYAMLIndent(lnum)
     if a:lnum == 1 || !prevnonblank(a:lnum-1)
         return 0
@@ -127,7 +149,10 @@ function GetYAMLIndent(lnum)
         " - List with
         "   multiline scalar
         return previndent+2
-    elseif prevline =~# s:mapkeyregex
+    elseif prevline =~# s:mapkeyregex . '\v\s*%(%('.s:c_ns_tag_property.
+                \                              '\v|'.s:c_ns_anchor_property.
+                \                              '\v|'.s:block_scalar_header.
+                \                             '\v)%(\s+|\s*%(\#.*)?$))*'
         " Mapping with: value
         "     that is multiline scalar
         return previndent+s:shiftwidth()

From c1edb4c39a7267226d48ef034c0fea62f11ea5b3 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 16 Apr 2017 17:08:35 +0200
Subject: [PATCH 122/257] vim-patch:7571d55f7dcc

Updated runtime files.

https://github.com/vim/vim/commit/7571d55f7dcc009a375b2124cce2c8b21f361234
---
 runtime/doc/eval.txt                 | 92 ++++++++++++++-------------
 runtime/doc/sign.txt                 |  6 +-
 runtime/doc/windows.txt              |  2 +-
 runtime/filetype.vim                 |  5 +-
 runtime/indent/teraterm.vim          | 10 ++-
 runtime/keymap/russian-jcukenmac.vim | 94 ++++++++++++++++++++++++++++
 runtime/syntax/rst.vim               | 14 ++---
 runtime/syntax/teraterm.vim          |  6 +-
 8 files changed, 164 insertions(+), 65 deletions(-)
 create mode 100644 runtime/keymap/russian-jcukenmac.vim

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index ca247f1c65..44b82ef67e 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -38,7 +38,7 @@ done, the features in this document are not available.	See |+eval| and
 There are six types of variables:
 
 Number		A 32 or 64 bit signed number.  |expr-number| *Number*
-		Examples:  -123  0x10  0177
+		Examples:  -123  0x10  0177  0b1011
 
 Float		A floating point number. |floating-point-format| *Float*
 		Examples: 123.456  1.15e-6  -1.1e3
@@ -1022,9 +1022,10 @@ When expr8 is a |Funcref| type variable, invoke the function it refers to.
 number
 ------
 number			number constant			*expr-number* 
-						*hex-number* *octal-number*
+				*hex-number* *octal-number* *binary-number*
 
-Decimal, Hexadecimal (starting with 0x or 0X), or Octal (starting with 0).
+Decimal, Hexadecimal (starting with 0x or 0X), Binary (starting with 0b or 0B)
+and Octal (starting with 0).
 
 						*floating-point-format*
 Floating point numbers can be written in two forms:
@@ -1425,8 +1426,8 @@ v:beval_winnr	The number of the window, over which the mouse pointer is. Only
 		window gets a number).
 
 					*v:beval_winid* *beval_winid-variable*
-v:beval_winid	The window ID of the window, over which the mouse pointer is.
-		Otherwise like v:beval_winnr.
+v:beval_winid	The |window-ID| of the window, over which the mouse pointer
+		is.  Otherwise like v:beval_winnr.
 
 					*v:char* *char-variable*
 v:char		Argument for evaluating 'formatexpr' and used for the typed
@@ -1686,7 +1687,7 @@ v:mouse_win	Window number for a mouse click obtained with |getchar()|.
 		zero when there was no mouse button click.
 
 					*v:mouse_winid* *mouse_winid-variable*
-v:mouse_winid	Window ID for a mouse click obtained with |getchar()|.
+v:mouse_winid	|window-ID| for a mouse click obtained with |getchar()|.
 		The value is zero when there was no mouse button click.
 
 					*v:mouse_lnum* *mouse_lnum-variable*
@@ -1922,9 +1923,10 @@ v:vim_did_enter	Zero until most of startup is done.  It is set to one just
 v:warningmsg	Last given warning message.  It's allowed to set this variable.
 
 					*v:windowid* *windowid-variable*
-v:windowid	Application-specific window ID ("window handle" in MS-Windows)
-		which may be set by any attached UI. Defaults to zero.
-		Note: for windows inside Vim use |winnr()| or |win_getid()|.
+v:windowid	Application-specific window "handle" which may be set by any
+		attached UI. Defaults to zero.
+		Note: For Nvim |windows| use |winnr()| or |win_getid()|, see
+		|window-ID|.
 
 ==============================================================================
 4. Builtin Functions					*functions*
@@ -1968,7 +1970,7 @@ buflisted({expr})		Number	|TRUE| if buffer {expr} is listed
 bufloaded({expr})		Number	|TRUE| if buffer {expr} is loaded
 bufname({expr})		String	Name of the buffer {expr}
 bufnr({expr} [, {create}])	Number	Number of the buffer {expr}
-bufwinid({expr})		Number	window ID of buffer {expr}
+bufwinid({expr})		Number	|window-ID| of buffer {expr}
 bufwinnr({expr})		Number	window number of buffer {expr}
 byte2line({byte})		Number	line number at byte count {byte}
 byteidx({expr}, {nr})		Number	byte index of {nr}'th char in {expr}
@@ -2323,10 +2325,10 @@ virtcol({expr})			Number	screen column of cursor or mark
 visualmode([expr])		String	last visual mode used
 wildmenumode()			Number	whether 'wildmenu' mode is active
 win_findbuf({bufnr})		List	find windows containing {bufnr}
-win_getid([{win} [, {tab}]])	Number	get window ID for {win} in {tab}
-win_gotoid({expr})		Number	go to window with ID {expr}
-win_id2tabwin({expr})		List	get tab and window nr from window ID
-win_id2win({expr})		Number	get window nr from window ID
+win_getid([{win} [, {tab}]])	Number	get |window-ID| for {win} in {tab}
+win_gotoid({expr})		Number	go to |window-ID| {expr}
+win_id2tabwin({expr})		List	get tab and window nr from |window-ID|
+win_id2win({expr})		Number	get window nr from |window-ID|
 winbufnr({nr})			Number	buffer number of window {nr}
 wincol()			Number	window column of the cursor
 winheight({nr})			Number	height of window {nr}
@@ -2417,7 +2419,7 @@ arglistid([{winnr} [, {tabnr}]])
 		With {winnr} only use this window in the current tab page.
 		With {winnr} and {tabnr} use the window in the specified tab
 		page.
-		{winnr} can be the window number or the window ID.
+		{winnr} can be the window number or the |window-ID|.
 
 							*argv()*
 argv([{nr}])	The result is the {nr}th file in the argument list of the
@@ -2652,7 +2654,7 @@ bufnr({expr} [, {create}])
 		them.  Use bufexists() to test for the existence of a buffer.
 
 bufwinid({expr})					*bufwinid()*
-		The result is a Number, which is the window ID of the first
+		The result is a Number, which is the |window-ID| of the first
 		window associated with buffer {expr}.  For the use of {expr},
 		see |bufname()| above.  If buffer {expr} doesn't exist or
 		there is no such window, -1 is returned.  Example: >
@@ -4071,7 +4073,7 @@ getcwd([{winnr}[, {tabnr}]])				*getcwd()*
 			getcwd(0)
 			getcwd(0, 0)
 <		If {winnr} is -1 it is ignored, only the tab is resolved.
-		{winnr} can be the window number or the window ID.
+		{winnr} can be the window number or the |window-ID|.
 
 
 getfsize({fname})					*getfsize()*
@@ -4166,7 +4168,7 @@ getline({lnum} [, {end}])
 
 getloclist({nr},[, {what}])				*getloclist()*
 		Returns a list with all the entries in the location list for
-		window {nr}. {nr} can be the window number or the window ID.
+		window {nr}.  {nr} can be the window number or the |window-ID|.
 		When {nr} is zero the current window is used.
 
 		For a location list window, the displayed location list is
@@ -4241,7 +4243,7 @@ getqflist([{what}])					*getqflist()*
 			type	type of the error, 'E', '1', etc.
 			valid	|TRUE|: recognized error message
 
-		When there is no error list or it's empty an empty list is
+		When there is no error list or it's empty, an empty list is
 		returned. Quickfix list entries with non-existing buffer
 		number are returned with "bufnr" set to zero.
 
@@ -4256,8 +4258,8 @@ getqflist([{what}])					*getqflist()*
 		returns only the items listed in {what} as a dictionary. The
 		following string items are supported in {what}:
 			nr	get information for this quickfix list
-			title	get list title
-			winid	get window id (if opened)
+			title	get the list title
+			winid	get the |window-ID| (if opened)
 			all	all of the above quickfix properties
 		Non-string items in {what} are ignored.
 		If "nr" is not present then the current quickfix list is used.
@@ -4267,7 +4269,7 @@ getqflist([{what}])					*getqflist()*
 		The returned dictionary contains the following entries:
 			nr	quickfix list number
 			title	quickfix list title text
-			winid	quickfix window id (if opened)
+			winid	quickfix |window-ID| (if opened)
 
 		Examples: >
 			:echo getqflist({'all': 1})
@@ -4314,10 +4316,10 @@ gettabinfo([{arg}])					*gettabinfo()*
 		empty List is returned.
 
 		Each List item is a Dictionary with the following entries:
-			nr		tab page number.
+			tabnr		tab page number.
 			variables	a reference to the dictionary with
 					tabpage-local variables
-			windows		List of window IDs in the tab page.
+			windows		List of |window-ID|s in the tag page.
 
 gettabvar({tabnr}, {varname} [, {def}])				*gettabvar()*
 		Get the value of a tab-local variable {varname} in tab page
@@ -4341,7 +4343,7 @@ gettabwinvar({tabnr}, {winnr}, {varname} [, {def}])		*gettabwinvar()*
 		Note that {varname} must be the name without "w:".
 		Tabs are numbered starting with one.  For the current tabpage
 		use |getwinvar()|.
-		{winnr} can be the window number or the window ID.
+		{winnr} can be the window number or the |window-ID|.
 		When {winnr} is zero the current window is used.
 		This also works for a global option, buffer-local option and
 		window-local option, but it doesn't work for a global variable
@@ -4369,20 +4371,20 @@ getwininfo([{winid}])					*getwininfo()*
 		is returned.  If the window does not exist the result is an
 		empty list.
 
-		Without an information about all the windows in all the tab
-		pages is returned.
+		Without {winid} information about all the windows in all the
+		tab pages is returned.
 
 		Each List item is a Dictionary with the following entries:
-			bufnum		number of buffer in the window
+			bufnr		number of buffer in the window
 			height		window height
 			loclist		1 if showing a location list
-			nr		window number
 			quickfix	1 if quickfix or location list window
-			tpnr		tab page number
+			tabnr		tab page number
 			variables	a reference to the dictionary with
 					window-local variables
 			width		window width
-			winid		window ID
+			winid		|window-ID|
+			winnr		window number
 
 		To obtain all window-local variables use: >
 			gettabwinvar({tabnr}, {winnr}, '&')
@@ -4486,9 +4488,8 @@ has_key({dict}, {key})					*has_key()*
 		an entry with key {key}.  Zero otherwise.
 
 haslocaldir([{winnr}[, {tabnr}]])			*haslocaldir()*
-		The result is a Number, which is 1 when the specified tabpage
-		or window has a local path set via |:lcd| or |:tcd|, and
-		0 otherwise.
+		The result is a Number, which is 1 when the tabpage or window
+		has set a local path via |:tcd| or |:lcd|, otherwise 0.
 
 		Tabs and windows are identified by their respective numbers,
 		0 means current tab or window. Missing argument implies 0.
@@ -4496,7 +4497,9 @@ haslocaldir([{winnr}[, {tabnr}]])			*haslocaldir()*
 			haslocaldir()
 			haslocaldir(0)
 			haslocaldir(0, 0)
-<		{winnr} can be the window number or the window ID.
+<		With {winnr} use that window in the current tabpage.
+		With {winnr} and {tabnr} use the window in that tabpage.
+		{winnr} can be the window number or the |window-ID|.
 		If {winnr} is -1 it is ignored, only the tab is resolved.
 
 hasmapto({what} [, {mode} [, {abbr}]])			*hasmapto()*
@@ -5814,6 +5817,9 @@ printf({fmt}, {expr1} ...)				*printf()*
 		s	The text of the String argument is used.  If a
 			precision is specified, no more bytes than the number
 			specified are used.
+			If the argument is not a String type, it is
+			automatically converted to text with the same format
+			as ":echo".
 							*printf-S*
 		S	The text of the String argument is used.  If a
 			precision is specified, no more display cells than the
@@ -6537,7 +6543,7 @@ setline({lnum}, {text})					*setline()*
 
 setloclist({nr}, {list} [, {action}[, {what}]])		*setloclist()*
 		Create or replace or add to the location list for window {nr}.
-		{nr} can be the window number or the window ID.
+		{nr} can be the window number or the |window-ID|.
 		When {nr} is zero the current window is used.
 
 		For a location list window, the displayed location list is
@@ -6729,7 +6735,7 @@ settabwinvar({tabnr}, {winnr}, {varname}, {val})	*settabwinvar()*
 		{val}.
 		Tabs are numbered starting with one.  For the current tabpage
 		use |setwinvar()|.
-		{winnr} can be the window number or the window ID.
+		{winnr} can be the window number or the |window-ID|.
 		When {winnr} is zero the current window is used.
 		This also works for a global or local buffer option, but it
 		doesn't work for a global or local buffer variable.
@@ -7800,11 +7806,11 @@ wildmenumode()					*wildmenumode()*
 
 
 win_findbuf({bufnr})					*win_findbuf()*
-		Returns a list with window IDs for windows that contain buffer
-		{bufnr}.  When there is none the list is empty.
+		Returns a list with |window-ID|s for windows that contain
+		buffer {bufnr}.  When there is none the list is empty.
 
 win_getid([{win} [, {tab}]])				*win_getid()*
-		Get the window ID for the specified window.
+		Get the |window-ID| for the specified window.
 		When {win} is missing use the current window.
 		With {win} this is the window number.  The top window has
 		number 1.
@@ -7829,7 +7835,7 @@ win_id2win({expr})					*win_id2win()*
 							*winbufnr()*
 winbufnr({nr})	The result is a Number, which is the number of the buffer
 		associated with window {nr}.  {nr} can be the window number or
-		the window ID.
+		the |window-ID|.
 		When {nr} is zero, the number of the buffer in the current
 		window is returned.
 		When window {nr} doesn't exist, -1 is returned.
@@ -7843,7 +7849,7 @@ wincol()	The result is a Number, which is the virtual column of the
 
 winheight({nr})						*winheight()*
 		The result is a Number, which is the height of window {nr}.
-		{nr} can be the window number or the window ID.
+		{nr} can be the window number or the |window-ID|.
 		When {nr} is zero, the height of the current window is
 		returned.  When window {nr} doesn't exist, -1 is returned.
 		An existing window always has a height of zero or more.
@@ -7923,7 +7929,7 @@ winsaveview()	Returns a |Dictionary| that contains information to restore
 
 winwidth({nr})						*winwidth()*
 		The result is a Number, which is the width of window {nr}.
-		{nr} can be the window number or the window ID.
+		{nr} can be the window number or the |window-ID|.
 		When {nr} is zero, the width of the current window is
 		returned.  When window {nr} doesn't exist, -1 is returned.
 		An existing window always has a width of zero or more.
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index e5a6b0be39..466a030e0c 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -188,7 +188,9 @@ JUMPING TO A SIGN					*:sign-jump* *E157*
 		If the file isn't displayed in window and the current file can
 		not be |abandon|ed this fails.
 
-:sign jump {id} buffer={nr}
-		Same, but use buffer {nr}.
+:sign jump {id} buffer={nr}					*E934*
+		Same, but use buffer {nr}.  This fails if buffer {nr} does not
+		have a name.
+
 
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index 4ed7b68194..2719517db9 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -69,7 +69,7 @@ places where a Normal mode command can't be used or is inconvenient.
 
 The main Vim window can hold several split windows.  There are also tab pages
 |tab-page|, each of which can hold multiple windows.
-
+							*window-ID*
 Each window has a unique identifier called the window ID.  This identifier
 will not change within a Vim session. The |win_getid()| and |win_id2tabwin()|
 functions can be used to convert between the window/tab number and the
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index f9d7f86a97..f891ebe35c 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Jul 21
+" Last Change:	2016 Aug 18
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -775,8 +775,7 @@ au BufNewFile,BufRead *.mo,*.gdmo		setf gdmo
 au BufNewFile,BufRead *.ged,lltxxxxx.txt	setf gedcom
 
 " Git
-au BufNewFile,BufRead COMMIT_EDITMSG		setf gitcommit
-au BufNewFile,BufRead MERGE_MSG			setf gitcommit
+au BufNewFile,BufRead COMMIT_EDITMSG,MERGE_MSG,TAG_EDITMSG setf gitcommit
 au BufNewFile,BufRead *.git/config,.gitconfig,.gitmodules setf gitconfig
 au BufNewFile,BufRead *.git/modules/*/config	setf gitconfig
 au BufNewFile,BufRead */.config/git/config	setf gitconfig
diff --git a/runtime/indent/teraterm.vim b/runtime/indent/teraterm.vim
index ba24257b02..8467cefcc0 100644
--- a/runtime/indent/teraterm.vim
+++ b/runtime/indent/teraterm.vim
@@ -1,9 +1,9 @@
 " Vim indent file
 " Language:	Tera Term Language (TTL)
-"		Based on Tera Term Version 4.86
+"		Based on Tera Term Version 4.92
 " Maintainer:	Ken Takata
 " URL:		https://github.com/k-takata/vim-teraterm
-" Last Change:	2015 Jun 4
+" Last Change:	2016 Aug 17
 " Filenames:	*.ttl
 " License:	VIM License
 
@@ -25,9 +25,7 @@ endif
 " The shiftwidth() function is relatively new.
 " Don't require it to exist.
 if exists('*shiftwidth')
-  function s:sw() abort
-    return shiftwidth()
-  endfunction
+  let s:sw = function('shiftwidth')
 else
   function s:sw() abort
     return &shiftwidth
@@ -48,7 +46,7 @@ function! GetTeraTermIndent(lnum)
 
   let l:ind = l:previ
 
-  if l:prevl =~ '^\s*if\>.*\<then\s*$'
+  if l:prevl =~ '^\s*if\>.*\<then\>'
     " previous line opened a block
     let l:ind += s:sw()
   endif
diff --git a/runtime/keymap/russian-jcukenmac.vim b/runtime/keymap/russian-jcukenmac.vim
new file mode 100644
index 0000000000..e2120ca1d4
--- /dev/null
+++ b/runtime/keymap/russian-jcukenmac.vim
@@ -0,0 +1,94 @@
+" Vim Keymap file for russian characters, layout 'jcuken', Mac variant
+
+" Derived from russian-jcuken.vim by Artem Chuprina <ran@ran.pp.ru>
+" Maintainer:   Anton Fonarev <avfonarev@gmail.com>
+" Last Changed: 2016 August 17
+
+" All characters are given literally, conversion to another encoding (e.g.,
+" UTF-8) should work.
+
+scriptencoding utf-8
+
+let b:keymap_name = "ru"
+
+loadkeymap
+
+\|  Ё   CYRILLIC CAPITAL LETTER IO
+\\  ё   CYRILLIC SMALL LETTER IO
+
+F   А   CYRILLIC CAPITAL LETTER A
+<   Б   CYRILLIC CAPITAL LETTER BE
+D   В   CYRILLIC CAPITAL LETTER VE
+U   Г   CYRILLIC CAPITAL LETTER GHE
+L   Д   CYRILLIC CAPITAL LETTER DE
+T   Е   CYRILLIC CAPITAL LETTER IE
+:   Ж   CYRILLIC CAPITAL LETTER ZHE
+P   З   CYRILLIC CAPITAL LETTER ZE
+B   И   CYRILLIC CAPITAL LETTER I
+Q   Й   CYRILLIC CAPITAL LETTER SHORT I
+R   К   CYRILLIC CAPITAL LETTER KA
+K   Л   CYRILLIC CAPITAL LETTER EL
+V   М   CYRILLIC CAPITAL LETTER EM
+Y   Н   CYRILLIC CAPITAL LETTER EN
+J   О   CYRILLIC CAPITAL LETTER O
+G   П   CYRILLIC CAPITAL LETTER PE
+H   Р   CYRILLIC CAPITAL LETTER ER
+C   С   CYRILLIC CAPITAL LETTER ES
+N   Т   CYRILLIC CAPITAL LETTER TE
+E   У   CYRILLIC CAPITAL LETTER U
+A   Ф   CYRILLIC CAPITAL LETTER EF
+{   Х   CYRILLIC CAPITAL LETTER HA
+W   Ц   CYRILLIC CAPITAL LETTER TSE
+X   Ч   CYRILLIC CAPITAL LETTER CHE
+I   Ш   CYRILLIC CAPITAL LETTER SHA
+O   Щ   CYRILLIC CAPITAL LETTER SHCHA
+}   Ъ   CYRILLIC CAPITAL LETTER HARD SIGN
+S   Ы   CYRILLIC CAPITAL LETTER YERU
+M   Ь   CYRILLIC CAPITAL LETTER SOFT SIGN
+\"  Э   CYRILLIC CAPITAL LETTER E
+>   Ю   CYRILLIC CAPITAL LETTER YU
+Z   Я   CYRILLIC CAPITAL LETTER YA
+f   а   CYRILLIC SMALL LETTER A
+,   б   CYRILLIC SMALL LETTER BE
+d   в   CYRILLIC SMALL LETTER VE
+u   г   CYRILLIC SMALL LETTER GHE
+l   д   CYRILLIC SMALL LETTER DE
+t   е   CYRILLIC SMALL LETTER IE
+;   ж   CYRILLIC SMALL LETTER ZHE
+p   з   CYRILLIC SMALL LETTER ZE
+b   и   CYRILLIC SMALL LETTER I
+q   й   CYRILLIC SMALL LETTER SHORT I
+r   к   CYRILLIC SMALL LETTER KA
+k   л   CYRILLIC SMALL LETTER EL
+v   м   CYRILLIC SMALL LETTER EM
+y   н   CYRILLIC SMALL LETTER EN
+j   о   CYRILLIC SMALL LETTER O
+g   п   CYRILLIC SMALL LETTER PE
+h   р   CYRILLIC SMALL LETTER ER
+c   с   CYRILLIC SMALL LETTER ES
+n   т   CYRILLIC SMALL LETTER TE
+e   у   CYRILLIC SMALL LETTER U
+a   ф   CYRILLIC SMALL LETTER EF
+[   х   CYRILLIC SMALL LETTER HA
+w   ц   CYRILLIC SMALL LETTER TSE
+x   ч   CYRILLIC SMALL LETTER CHE
+i   ш   CYRILLIC SMALL LETTER SHA
+o   щ   CYRILLIC SMALL LETTER SHCHA
+]   ъ   CYRILLIC SMALL LETTER HARD SIGN
+s   ы   CYRILLIC SMALL LETTER YERU
+m   ь   CYRILLIC SMALL LETTER SOFT SIGN
+'   э   CYRILLIC SMALL LETTER E
+.   ю   CYRILLIC SMALL LETTER YU
+z   я   CYRILLIC SMALL LETTER YA
+
+§   >
+±   <
+@   "
+#   №
+$   %
+%   :
+^   ,
+&   .
+*   ;
+`   ]
+~   [
diff --git a/runtime/syntax/rst.vim b/runtime/syntax/rst.vim
index ef07b22676..232d2a7de3 100644
--- a/runtime/syntax/rst.vim
+++ b/runtime/syntax/rst.vim
@@ -2,7 +2,8 @@
 " Language: reStructuredText documentation format
 " Maintainer: Marshall Ward <marshall.ward@gmail.com>
 " Previous Maintainer: Nikolai Weibull <now@bitwi.se>
-" Latest Revision: 2016-06-17
+" Website: https://github.com/marshallward/vim-restructuredtext
+" Latest Revision: 2016-08-18
 
 if exists("b:current_syntax")
   finish
@@ -89,7 +90,7 @@ function! s:DefineOneInlineMarkup(name, start, middle, end, char_left, char_righ
         \ ' start=+' . a:char_left . '\zs' . a:start .
         \ '\ze[^[:space:]' . a:char_right . a:start[strlen(a:start) - 1] . ']+' .
         \ a:middle .
-        \ ' end=+\S' . a:end . '\ze\%($\|\s\|[''")\]}>/:.,;!?\\-]\)+'
+        \ ' end=+\S' . a:end . '\ze\%($\|\s\|[''"’)\]}>/:.,;!?\\-]\)+'
 endfunction
 
 function! s:DefineInlineMarkup(name, start, middle, end)
@@ -103,6 +104,8 @@ function! s:DefineInlineMarkup(name, start, middle, end)
   call s:DefineOneInlineMarkup(a:name, a:start, middle, a:end, '\[', '\]')
   call s:DefineOneInlineMarkup(a:name, a:start, middle, a:end, '{', '}')
   call s:DefineOneInlineMarkup(a:name, a:start, middle, a:end, '<', '>')
+  call s:DefineOneInlineMarkup(a:name, a:start, middle, a:end, '’', '’')
+  " TODO: Additional Unicode Pd, Po, Pi, Pf, Ps characters
 
   call s:DefineOneInlineMarkup(a:name, a:start, middle, a:end, '\%(^\|\s\|[/:]\)', '')
 
@@ -186,11 +189,8 @@ hi def link rstHyperlinkTarget              String
 hi def link rstExDirective                  String
 hi def link rstSubstitutionDefinition       rstDirective
 hi def link rstDelimiter                    Delimiter
-hi def link rstEmphasis                     Underlined
-hi def link rstStrongEmphasis               Special
-" TODO Append these atttributes somehow
-"hi def rstEmphasis term=italic cterm=italic gui=italic
-"hi def rstStrongEmphasis term=bold cterm=bold gui=bold
+hi def rstEmphasis ctermfg=13 term=italic cterm=italic gui=italic
+hi def rstStrongEmphasis ctermfg=1 term=bold cterm=bold gui=bold
 hi def link rstInterpretedTextOrHyperlinkReference  Identifier
 hi def link rstInlineLiteral                String
 hi def link rstSubstitutionReference        PreProc
diff --git a/runtime/syntax/teraterm.vim b/runtime/syntax/teraterm.vim
index 521331d8ce..1924996738 100644
--- a/runtime/syntax/teraterm.vim
+++ b/runtime/syntax/teraterm.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
 " Language:	Tera Term Language (TTL)
-"		Based on Tera Term Version 4.86
+"		Based on Tera Term Version 4.92
 " Maintainer:	Ken Takata
 " URL:		https://github.com/k-takata/vim-teraterm
-" Last Change:	2015 Jun 24
+" Last Change:	2016 Aug 17
 " Filenames:	*.ttl
 " License:	VIM License
 
@@ -33,7 +33,7 @@ syn keyword ttlOperator	and or xor not
 
 syn match ttlVar	"\<groupmatchstr\d\>"
 syn match ttlVar	"\<param\d\>"
-syn keyword ttlVar	inputstr matchstr paramcnt result timeout mtimeout
+syn keyword ttlVar	inputstr matchstr paramcnt params result timeout mtimeout
 
 
 syn match ttlLine nextgroup=ttlStatement "^"

From d194380de93023c8901eb77b2820b0f74e8a5283 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 16 Apr 2017 17:42:41 +0200
Subject: [PATCH 123/257] vim-patch:e4a3bcf28d92

Updated runtime files.  Add Scala files.

https://github.com/vim/vim/commit/e4a3bcf28d92d0bde9ca227ccb40d401038185e5
---
 runtime/doc/eval.txt          |    2 +-
 runtime/doc/index.txt         |    1 +
 runtime/doc/options.txt       |    4 +
 runtime/doc/quickref.txt      |    2 +-
 runtime/doc/tagsrch.txt       |   38 +-
 runtime/doc/windows.txt       |    6 +-
 runtime/filetype.vim          |   13 +-
 runtime/ftplugin/rmd.vim      |   16 +-
 runtime/ftplugin/scala.vim    |   37 +
 runtime/indent/fortran.vim    |   10 +-
 runtime/indent/javascript.vim |   96 +-
 runtime/indent/rnoweb.vim     |   14 +-
 runtime/indent/scala.vim      |  609 +++
 runtime/keymap/pinyin.vim     |    2 +-
 runtime/optwin.vim            |    6 +-
 runtime/plugin/matchit.vim    |   24 +-
 runtime/syntax/fortran.vim    |   34 +-
 runtime/syntax/muttrc.vim     |  346 +-
 runtime/syntax/python.vim     |   31 +-
 runtime/syntax/r.vim          |    6 +-
 runtime/syntax/rhelp.vim      |    3 +-
 runtime/syntax/rmd.vim        |    4 +-
 runtime/syntax/rrst.vim       |    4 +-
 runtime/syntax/scala.vim      |  231 +
 runtime/syntax/sh.vim         |   48 +-
 runtime/syntax/vim.vim        |    4 +-
 src/nvim/po/fi.po             | 8629 ++++++++++++++++-----------------
 27 files changed, 5420 insertions(+), 4800 deletions(-)
 create mode 100644 runtime/ftplugin/scala.vim
 create mode 100644 runtime/indent/scala.vim
 create mode 100644 runtime/syntax/scala.vim

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 44b82ef67e..107dd28ecd 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -7186,7 +7186,7 @@ strwidth({expr})					*strwidth()*
 		Ambiguous, this function's return value depends on 'ambiwidth'.
 		Also see |strlen()|, |strdisplaywidth()| and |strchars()|.
 
-submatch({nr}[, {list}])				*submatch()*
+submatch({nr}[, {list}])			*submatch()* *E935*
 		Only for an expression in a |:substitute| command or
 		substitute() function.
 		Returns the {nr}'th submatch of the matched text.  When {nr}
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index b06baa6497..0dc8fff975 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1234,6 +1234,7 @@ tag	      command	      action ~
 |:file|		:f[ile]		show or set the current file name
 |:files|	:files		list all files in the buffer list
 |:filetype|	:filet[ype]	switch file type detection on/off
+|:filter|	:filt[er]	filter output of following command
 |:find|		:fin[d]		find file in 'path' and edit it
 |:finally|	:fina[lly]	part of a :try command
 |:finish|	:fini[sh]	quit sourcing a Vim script
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index e269fd30c5..6b96271c4a 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3689,6 +3689,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	be able to execute Normal mode commands.
 	This is the opposite of the 'keymap' option, where characters are
 	mapped in Insert mode.
+	Also consider resetting 'langremap' to avoid 'langmap' applies to
+	characters resulting from a mapping.
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 
@@ -5025,6 +5027,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	"inclusive" means that the last character of the selection is included
 	in an operation.  For example, when "x" is used to delete the
 	selection.
+	When "old" is used and 'virtualedit' allows the cursor to move past
+	the end of line the line break still isn't included.
 	Note that when "exclusive" is used and selecting from the end
 	backwards, you cannot include the last character of a line, when
 	starting in Normal mode and 'virtualedit' empty.
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index a918a4d34a..420f570c99 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -751,7 +751,7 @@ Short explanation of each option:		*option-list*
 'keywordprg'	  'kp'	    program to use for the "K" command
 'langmap'	  'lmap'    alphabetic characters for other language mode
 'langmenu'	  'lm'	    language to be used for the menus
-'langnoremap'	  'lnr'	    do not apply 'langmap' to mapped characters
+'langremap'	  'lrm'	    do apply 'langmap' to mapped characters
 'laststatus'	  'ls'	    tells when last window has status lines
 'lazyredraw'	  'lz'	    don't redraw while executing macros
 'linebreak'	  'lbr'     wrap long lines at a blank
diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt
index 2c090a66fa..b47053e17b 100644
--- a/runtime/doc/tagsrch.txt
+++ b/runtime/doc/tagsrch.txt
@@ -90,7 +90,7 @@ The ignore-case matches are not found for a ":tag" command when:
 - 'tagcase' is "followscs" and 'smartcase' option is on and the pattern
   contains an upper case character.
 
-The gnore-case matches are found when:
+The ignore-case matches are found when:
 - a pattern is used (starting with a "/")
 - for ":tselect"
 - when 'tagcase' is "followic" and 'ignorecase' is off
@@ -432,9 +432,9 @@ The next file in the list is not used when:
 This also depends on whether case is ignored.  Case is ignored when:
 - 'tagcase' is "followic" and 'ignorecase' is set
 - 'tagcase' is "ignore"
-- 'tagcase' is "smart" and and the pattern only contains lower case
+- 'tagcase' is "smart" and the pattern only contains lower case
   characters.
-- 'tagcase' is "followscs" and 'smartcase' is set and and the pattern only
+- 'tagcase' is "followscs" and 'smartcase' is set and the pattern only
   contains lower case characters.
 If case is not ignored, and the tags file only has a match without matching
 case, the next tags file is searched for a match with matching case.  If no
@@ -803,24 +803,24 @@ CTRL-W d		Open a new window, with the cursor on the first
 
 								*:search-args*
 Common arguments for the commands above:
-[!]   When included, find matches in lines that are recognized as comments.
-      When excluded, a match is ignored when the line is recognized as a
-      comment (according to 'comments'), or the match is in a C comment (after
-      "//" or inside /* */).  Note that a match may be missed if a line is
-      recognized as a comment, but the comment ends halfway through the line.
-      And  if the line is a comment, but it is not recognized (according to
-      'comments') a match may be found in it anyway.  Example: >
+[!]	When included, find matches in lines that are recognized as comments.
+	When excluded, a match is ignored when the line is recognized as a
+	comment (according to 'comments'), or the match is in a C comment
+	(after "//" or inside /* */).  Note that a match may be missed if a
+	line is recognized as a comment, but the comment ends halfway the line.
+	And if the line is a comment, but it is not recognized (according to
+	'comments') a match may be found in it anyway.  Example: >
 		/* comment
 		   foobar */
-<     A match for "foobar" is found, because this line is not recognized as a
-      comment (even though syntax highlighting does recognize it).
-      Note: Since a macro definition mostly doesn't look like a comment, the
-      [!] makes no difference for ":dlist", ":dsearch" and ":djump".
-[/]   A pattern can be surrounded by '/'.  Without '/' only whole words are
-      matched, using the pattern "\<pattern\>".  Only after the second '/' a
-      next command can be appended with '|'.  Example: >
+<	A match for "foobar" is found, because this line is not recognized as
+	a comment (even though syntax highlighting does recognize it).
+	Note: Since a macro definition mostly doesn't look like a comment, the
+	[!] makes no difference for ":dlist", ":dsearch" and ":djump".
+[/]	A pattern can be surrounded by '/'.  Without '/' only whole words are
+	matched, using the pattern "\<pattern\>".  Only after the second '/' a
+	next command can be appended with '|'.  Example: >
 	:isearch /string/ | echo "the last one"
-<     For a ":djump", ":dsplit", ":dlist" and ":dsearch" command the pattern
-      is used as a literal string, not as a search pattern.
+<	For a ":djump", ":dsplit", ":dlist" and ":dsearch" command the pattern
+	is used as a literal string, not as a search pattern.
 
  vim:tw=78:ts=8:ft=help:norl:
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index 2719517db9..fa7a7f2a81 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -69,7 +69,7 @@ places where a Normal mode command can't be used or is inconvenient.
 
 The main Vim window can hold several split windows.  There are also tab pages
 |tab-page|, each of which can hold multiple windows.
-							*window-ID*
+					*window-ID* *winid* *windowid*
 Each window has a unique identifier called the window ID.  This identifier
 will not change within a Vim session. The |win_getid()| and |win_id2tabwin()|
 functions can be used to convert between the window/tab number and the
@@ -1026,6 +1026,10 @@ list of buffers. |unlisted-buffer|
 			h+	hidden buffers which are modified
 			a+	active buffers which are modified
 
+		When using |:filter| the pattern is matched against the
+		displayed buffer name, e.g.: >
+			filter /\.vim/ ls
+<
 						*:bad* *:badd*
 :bad[d]	[+lnum] {fname}
 		Add file name {fname} to the buffer list, without loading it.
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index f891ebe35c..43155aa27e 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Aug 18
+" Last Change:	2016 Aug 26
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -688,8 +688,8 @@ func! s:FTe()
     let n = 1
     while n < 100 && n < line("$")
       if getline(n) =~ "^\\s*\\(<'\\|'>\\)\\s*$"
-        setf specman
-        return
+	setf specman
+	return
       endif
       let n = n + 1
     endwhile
@@ -1776,6 +1776,9 @@ au BufNewFile,BufRead *.sass			setf sass
 " Sather
 au BufNewFile,BufRead *.sa			setf sather
 
+" Scala
+au BufNewFile,BufRead *.scala			setf scala
+
 " Scilab
 au BufNewFile,BufRead *.sci,*.sce		setf scilab
 
@@ -2048,7 +2051,7 @@ func! s:FTRules()
     if line =~ s:ft_rules_udev_rules_pattern
       let udev_rules = substitute(line, s:ft_rules_udev_rules_pattern, '\1', "")
       if dir == udev_rules
-        setf udevrules
+	setf udevrules
       endif
       break
     endif
@@ -2300,7 +2303,7 @@ au BufNewFile,BufRead */etc/updatedb.conf	setf updatedb
 au BufNewFile,BufRead */usr/share/upstart/*.conf	       setf upstart
 au BufNewFile,BufRead */usr/share/upstart/*.override	       setf upstart
 au BufNewFile,BufRead */etc/init/*.conf,*/etc/init/*.override  setf upstart
-au BufNewFile,BufRead */.init/*.conf,*/.init/*.override        setf upstart
+au BufNewFile,BufRead */.init/*.conf,*/.init/*.override	       setf upstart
 au BufNewFile,BufRead */.config/upstart/*.conf		       setf upstart
 au BufNewFile,BufRead */.config/upstart/*.override	       setf upstart
 
diff --git a/runtime/ftplugin/rmd.vim b/runtime/ftplugin/rmd.vim
index ec64a07675..8c092ac13f 100644
--- a/runtime/ftplugin/rmd.vim
+++ b/runtime/ftplugin/rmd.vim
@@ -1,9 +1,9 @@
 " Vim filetype plugin file
-" Language: R help file
+" Language: R Markdown file
 " Maintainer: Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Tue Apr 07, 2015  04:37PM
-" Original work by Alex Zvoleff (adjusted for rmd by Michel Kuhlmann)
+" Last Change:	Mon Jun 06, 2016  09:41PM
+" Original work by Alex Zvoleff (adjusted from R help for rmd by Michel Kuhlmann)
 
 " Only do this when not yet done for this buffer
 if exists("b:did_ftplugin")
@@ -12,6 +12,16 @@ endif
 
 runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
 
+" Nvim-R plugin needs this
+if exists("*CompleteR")
+  if &omnifunc == "CompleteR"
+    let b:rplugin_nonr_omnifunc = ""
+  else
+    let b:rplugin_nonr_omnifunc = &omnifunc
+  endif
+  set omnifunc=CompleteR
+endif
+
 setlocal comments=fb:*,fb:-,fb:+,n:> commentstring=>\ %s
 setlocal formatoptions+=tcqln
 setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^\\s*[-*+]\\s\\+
diff --git a/runtime/ftplugin/scala.vim b/runtime/ftplugin/scala.vim
new file mode 100644
index 0000000000..e409950107
--- /dev/null
+++ b/runtime/ftplugin/scala.vim
@@ -0,0 +1,37 @@
+" Vim filetype plugin file
+" Language:             Scala
+" Maintainer:           Derek Wyatt
+" URL:                  https://github.com/derekwyatt/vim-scala
+" License:              Same as Vim
+" Last Change:          02 August 2016
+" ----------------------------------------------------------------------------
+
+if exists('b:did_ftplugin') || &cp
+  finish
+endif
+let b:did_ftplugin = 1
+
+" j is fairly new in Vim, so don't complain if it's not there
+setlocal formatoptions-=t formatoptions+=croqnl
+silent! setlocal formatoptions+=j
+
+" Just like c.vim, but additionally doesn't wrap text onto /** line when
+" formatting. Doesn't bungle bulleted lists when formatting.
+if get(g:, 'scala_scaladoc_indent', 0)
+  setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s2:/**,mb:*,ex:*/,s1:/*,mb:*,ex:*/,://
+else
+  setlocal comments=sO:*\ -,mO:*\ \ ,exO:*/,s1:/**,mb:*,ex:*/,s1:/*,mb:*,ex:*/,://
+endif
+setlocal commentstring=//\ %s
+
+setlocal shiftwidth=2 softtabstop=2 expandtab
+
+setlocal include='^\s*import'
+setlocal includeexpr='substitute(v:fname,"\\.","/","g")'
+
+setlocal path+=src/main/scala,src/test/scala
+setlocal suffixesadd=.scala
+
+compiler sbt
+
+" vim:set sw=2 sts=2 ts=8 et:
diff --git a/runtime/indent/fortran.vim b/runtime/indent/fortran.vim
index e19a19fb1f..be2f0866d5 100644
--- a/runtime/indent/fortran.vim
+++ b/runtime/indent/fortran.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
-" Version:	0.44
-" Last Change:	2016 Jan. 26
+" Version:	0.45
+" Last Change:	2016 Aug. 18
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
 " Usage:	For instructions, do :help fortran-indent from Vim
 " Credits:
@@ -121,7 +121,7 @@ function FortranGetIndent(lnum)
     let prefix='\(\(pure\|impure\|elemental\|recursive\)\s\+\)\{,2}'
     let type='\(\(integer\|real\|double\s\+precision\|complex\|logical'
           \.'\|character\|type\|class\)\s*\S*\s\+\)\='
-    if prevstat =~? '^\s*\(module\|contains\|program\)\>'
+    if prevstat =~? '^\s*\(module\|contains\/submodule\|program\)\>'
             \ ||prevstat =~? '^\s*'.prefix.'subroutine\>'
             \ ||prevstat =~? '^\s*'.prefix.type.'function\>'
             \ ||prevstat =~? '^\s*'.type.prefix.'function\>'
@@ -129,14 +129,14 @@ function FortranGetIndent(lnum)
     endif
     if getline(v:lnum) =~? '^\s*contains\>'
           \ ||getline(v:lnum)=~? '^\s*end\s*'
-          \ .'\(function\|subroutine\|module\|program\)\>'
+          \ .'\(function\|subroutine\|module\/submodule\|program\)\>'
       let ind = ind - shiftwidth()
     endif
   endif
 
   "Subtract a shiftwidth from else, else if, elsewhere, case, end if,
   " end where, end select, end forall, end interface, end associate,
-  " end enum, and end type statements
+  " end enum, end type, end block and end type statements
   if getline(v:lnum) =~? '^\s*\(\d\+\s\)\=\s*'
         \. '\(else\|else\s*if\|else\s*where\|case\|'
         \. 'end\s*\(if\|where\|select\|interface\|'
diff --git a/runtime/indent/javascript.vim b/runtime/indent/javascript.vim
index 3507e305ed..0d6c11d151 100644
--- a/runtime/indent/javascript.vim
+++ b/runtime/indent/javascript.vim
@@ -1,8 +1,8 @@
 " Vim indent file
 " Language: Javascript
-" Maintainer: vim-javascript community
+" Maintainer: Chris Paul ( https://github.com/bounceme )
 " URL: https://github.com/pangloss/vim-javascript
-" Last Change: August 12, 2016
+" Last Change: August 25, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -12,11 +12,11 @@ let b:did_indent = 1
 
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetJavascriptIndent()
-setlocal nolisp
+setlocal nolisp noautoindent nosmartindent
 setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e
 setlocal cinoptions+=j1,J1
 
-let b:undo_indent = 'setlocal indentexpr< indentkeys< cinoptions<'
+let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys< cinoptions<'
 
 " Only define the function once.
 if exists('*GetJavascriptIndent')
@@ -37,7 +37,7 @@ else
   endfunction
 endif
 
-let s:line_pre = '^\s*\%(\/\*.\{-}\*\/\s*\)*'
+let s:line_pre = '^\s*\%(\%(\%(\/\*.\{-}\)\=\*\+\/\s*\)\=\)\@>'
 let s:expr_case = s:line_pre . '\%(\%(case\>.\+\)\|default\)\s*:'
 " Regex of syntax group names that are or delimit string or are comments.
 let s:syng_strcom = '\%(s\%(tring\|pecial\)\|comment\|regex\|doc\|template\)'
@@ -46,63 +46,63 @@ let s:syng_strcom = '\%(s\%(tring\|pecial\)\|comment\|regex\|doc\|template\)'
 let s:syng_comment = '\%(comment\|doc\)'
 
 " Expression used to check whether we should skip a match with searchpair().
-let s:skip_expr = "line('.') < (prevnonblank(v:lnum) - 2000) ? dummy : synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
+let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 
-function s:lookForParens(start,end,flags,time)
-  if has('reltime')
-    return searchpair(a:start,'',a:end,a:flags,s:skip_expr,0,a:time)
-  else
-    return searchpair(a:start,'',a:end,a:flags,0,0)
-  endif
-endfunction
+if has('reltime')
+  function s:GetPair(start,end,flags,time)
+    return searchpair(a:start,'',a:end,a:flags,s:skip_expr,max([prevnonblank(v:lnum) - 2000,0]),a:time)
+  endfunction
+else
+  function s:GetPair(start,end,flags,n)
+    return searchpair(a:start,'',a:end,a:flags,0,max([prevnonblank(v:lnum) - 2000,0]))
+  endfunction
+endif
 
-let s:line_term = '\%(\s*\%(\/\*.\{-}\*\/\s*\)\=\)\@>$'
+let s:line_term = '\s*\%(\%(\/\%(\%(\*.\{-}\*\/\)\|\%(\*\+\)\)\)\s*\)\=$'
 
 " configurable regexes that define continuation lines, not including (, {, or [.
 if !exists('g:javascript_opfirst')
-  let g:javascript_opfirst = '\%([<>,:?^%]\|\([-/.+]\)\%(\1\|\*\|\/\)\@!\|\*\/\@!\|=>\@!\||\|&\|in\%(stanceof\)\=\>\)'
+  let g:javascript_opfirst = '\%([<>,:?^%|*&]\|\/[^/*]\|\([-.+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
 endif
-let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
-
 if !exists('g:javascript_continuation')
-  let g:javascript_continuation = '\%([<*,.?:^%]\|+\@<!+\|-\@<!-\|=\@<!>\|\*\@<!\/\|=\||\|&\|\<in\%(stanceof\)\=\)'
+  let g:javascript_continuation = '\%([<=,.?/*:^%|&]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)'
 endif
+
+let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
 let g:javascript_continuation .= s:line_term
 
-function s:Onescope(lnum,text,add)
-  return a:text =~# '\%(\<else\|\<do\|=>' . (a:add ? '\|\<try\|\<finally' : '' ) . '\)' . s:line_term ||
+function s:OneScope(lnum,text,add)
+  return a:text =~# '\%(\<else\|\<do\|=>\)' . s:line_term ? 'no b' :
         \ ((a:add && a:text =~ s:line_pre . '$' && search('\%' . s:PrevCodeLine(a:lnum - 1) . 'l.)' . s:line_term)) ||
         \ cursor(a:lnum, match(a:text, ')' . s:line_term)) > -1) &&
-        \ s:lookForParens('(', ')', 'cbW', 100) > 0 && search((a:add ?
-        \ '\%(function\*\|[[:lower:][:upper:]_$][[:digit:][:lower:][:upper:]_$]*\)' :
-        \ '\<\%(for\%(\s\+each\)\=\|if\|let\|w\%(hile\|ith\)\)') . '\_s*\%#\C','bW') &&
-        \ (a:add || (expand('<cword>') ==# 'while' ? !s:lookForParens('\<do\>\C', '\<while\>\C','bW',100) : 1))
+        \ s:GetPair('(', ')', 'cbW', 100) > 0 && search('\C\l\+\_s*\%#','bW') &&
+        \ (a:add || ((expand('<cword>') !=# 'while' || !s:GetPair('\C\<do\>', '\C\<while\>','nbW',100)) &&
+        \ (expand('<cword>') !=# 'each' || search('\C\<for\_s\+\%#','nbW')))) ? expand('<cword>') : ''
+endfunction
+
+" https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
+function s:IsBlock()
+  return getline(line('.'))[col('.')-1] == '{' && !search(
+        \ '\C\%(\<return\s*\|\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|import\|export\%(\_s\+default\)\=\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\)\_s*\)\%#','bnW') &&
+        \ (!search(':\_s*\%#','bW') || (!s:GetPair('[({[]','[])}]','bW',200) || s:IsBlock()))
 endfunction
 
 " Auxiliary Functions {{{2
 
-" strip line of comment
-function s:StripLine(c)
-  return a:c !~# s:expr_case ? substitute(a:c, '\%(:\@<!\/\/.*\)$', '','') : a:c
-endfunction
-
 " Find line above 'lnum' that isn't empty, in a comment, or in a string.
 function s:PrevCodeLine(lnum)
   let l:lnum = prevnonblank(a:lnum)
-  while l:lnum > 0
+  while l:lnum
     if synIDattr(synID(l:lnum,matchend(getline(l:lnum), '^\s*[^''"]'),0),'name') !~? s:syng_strcom
-      break
+      return l:lnum
     endif
     let l:lnum = prevnonblank(l:lnum - 1)
   endwhile
-  return l:lnum
 endfunction
 
 " Check if line 'lnum' has a balanced amount of parentheses.
 function s:Balanced(lnum)
-  let open_0 = 0
-  let open_2 = 0
-  let open_4 = 0
+  let [open_0,open_2,open_4] = [0,0,0]
   let l:line = getline(a:lnum)
   let pos = match(l:line, '[][(){}]', 0)
   while pos != -1
@@ -129,7 +129,7 @@ function GetJavascriptIndent()
   let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
 
   " start with strings,comments,etc.{{{2
-  if (l:line !~ '^[''"`]' && syns =~? 'string\|template') ||
+  if (l:line !~ '^[''"`]' && syns =~? '\%(string\|template\)') ||
         \ (l:line !~ '^\s*[/*]' && syns =~? s:syng_comment)
     return -1
   endif
@@ -153,15 +153,15 @@ function GetJavascriptIndent()
   " the containing paren, bracket, curly. Memoize, last lineNr either has the
   " same scope or starts a new one, unless if it closed a scope.
   call cursor(v:lnum,1)
-  if b:js_cache[0] >= l:lnum  && b:js_cache[0] <= v:lnum && b:js_cache[0] &&
+  if b:js_cache[0] >= l:lnum  && b:js_cache[0] < v:lnum && b:js_cache[0] &&
         \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum) > 0)
     let num = b:js_cache[1]
   elseif syns != '' && l:line[0] =~ '\s'
     let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
           \ syns =~? 'jsbracket'? ['\[','\]'] : ['[({[]','[])}]']
-    let num = s:lookForParens(pattern[0],pattern[1],'bW',2000)
+    let num = s:GetPair(pattern[0],pattern[1],'bW',2000)
   else
-    let num = s:lookForParens('[({[]','[])}]','bW',2000)
+    let num = s:GetPair('[({[]','[])}]','bW',2000)
   endif
   let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
 
@@ -169,17 +169,19 @@ function GetJavascriptIndent()
     return indent(num)
   endif
 
-  let pline = s:StripLine(getline(l:lnum))
-  let inb = num == 0 ? 1 : (s:Onescope(num, s:StripLine(strpart(getline(num),0,b:js_cache[2] - 1)),1) ||
-        \ (l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term)) && num < l:lnum
-  let switch_offset = (!inb || num == 0) || expand("<cword>") !=# 'switch' ? 0 : &cino !~ ':' || !has('float') ?  s:sw() :
+  call cursor(b:js_cache[1],b:js_cache[2])
+
+  let swcase = getline(l:lnum) =~# s:expr_case
+  let pline = swcase ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','')
+  let inb = num == 0 || num < l:lnum && ((l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term) || s:IsBlock())
+  let switch_offset = num == 0 || s:OneScope(num, strpart(getline(num),0,b:js_cache[2] - 1),1) !=# 'switch' ? 0 :
+        \ &cino !~ ':' || !has('float') ?  s:sw() :
         \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
 
   " most significant, find the indent amount
-  if (inb && (l:line =~# g:javascript_opfirst ||
-        \ (pline =~# g:javascript_continuation && pline !~# s:expr_case && (pline !~ ':' . s:line_term || l:line !~#
-        \ s:line_pre . '\%(d\%(o\|ebugger\)\|else\|f\%(or\|inally\)\|if\|let\|switch\|t\%(hrow\|ry\)\|w\%(hile\|ith\)\)\>')))) ||
-        \ (num < l:lnum && s:Onescope(l:lnum,pline,0) && l:line !~ s:line_pre . '{')
+  if inb && !swcase && ((l:line =~# g:javascript_opfirst || pline =~# g:javascript_continuation) ||
+        \ num < l:lnum && s:OneScope(l:lnum,pline,0) =~# '\<\%(for\|each\|if\|let\|no\sb\|w\%(hile\|ith\)\)\>' &&
+        \ l:line !~ s:line_pre . '{')
     return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
   elseif num > 0
     return indent(num) + s:sw() + switch_offset
diff --git a/runtime/indent/rnoweb.vim b/runtime/indent/rnoweb.vim
index 29fa5bc78f..8c11e85cb3 100644
--- a/runtime/indent/rnoweb.vim
+++ b/runtime/indent/rnoweb.vim
@@ -2,7 +2,7 @@
 " Language:	Rnoweb
 " Author:	Jakson Alves de Aquino <jalvesaq@gmail.com>
 " Homepage:     https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	Tue Apr 07, 2015  04:38PM
+" Last Change:	Fri Apr 15, 2016  10:58PM
 
 
 " Only load this indent file when no other was loaded.
@@ -10,7 +10,17 @@ if exists("b:did_indent")
   finish
 endif
 runtime indent/tex.vim
-let s:TeXIndent = function(substitute(&indentexpr, "()", "", ""))
+
+function! s:NoTeXIndent()
+  return indent(line("."))
+endfunction
+
+if &indentexpr == "" || &indentexpr == "GetRnowebIndent()"
+  let s:TeXIndent = function("s:NoTeXIndent")
+else
+  let s:TeXIndent = function(substitute(&indentexpr, "()", "", ""))
+endif
+
 unlet b:did_indent
 runtime indent/r.vim
 let s:RIndent = function(substitute(&indentexpr, "()", "", ""))
diff --git a/runtime/indent/scala.vim b/runtime/indent/scala.vim
new file mode 100644
index 0000000000..f97c79bbab
--- /dev/null
+++ b/runtime/indent/scala.vim
@@ -0,0 +1,609 @@
+" Vim indent file
+" Language:             Scala (http://scala-lang.org/)
+" Original Author:      Stefan Matthias Aust
+" Modifications By:     Derek Wyatt
+" URL:                  https://github.com/derekwyatt/vim-scala
+" Last Change:          2016 Aug 26
+
+if exists("b:did_indent")
+  finish
+endif
+let b:did_indent = 1
+
+setlocal autoindent
+setlocal indentexpr=GetScalaIndent()
+setlocal indentkeys=0{,0},0),!^F,<>>,o,O,e,=case,<CR>
+
+if exists("*GetScalaIndent")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+let s:defMatcher = '\%(\%(private\|protected\)\%(\[[^\]]*\]\)\?\s\+\|abstract\s\+\|override\s\+\)*\<def\>'
+let s:funcNameMatcher = '\w\+'
+let s:typeSpecMatcher = '\%(\s*\[\_[^\]]*\]\)'
+let s:defArgMatcher = '\%((\_.\{-})\)'
+let s:returnTypeMatcher = '\%(:\s*\w\+' . s:typeSpecMatcher . '\?\)'
+let g:fullDefMatcher = '^\s*' . s:defMatcher . '\s\+' . s:funcNameMatcher . '\s*' . s:typeSpecMatcher . '\?\s*' . s:defArgMatcher . '\?\s*' . s:returnTypeMatcher . '\?\s*[={]'
+
+function! scala#ConditionalConfirm(msg)
+  if 0
+    call confirm(a:msg)
+  endif
+endfunction
+
+function! scala#GetLine(lnum)
+  let line = substitute(getline(a:lnum), '//.*$', '', '')
+  let line = substitute(line, '"\(.\|\\"\)\{-}"', '""', 'g')
+  return line
+endfunction
+
+function! scala#CountBrackets(line, openBracket, closedBracket)
+  let line = substitute(a:line, '"\(.\|\\"\)\{-}"', '', 'g')
+  let open = substitute(line, '[^' . a:openBracket . ']', '', 'g')
+  let close = substitute(line, '[^' . a:closedBracket . ']', '', 'g')
+  return strlen(open) - strlen(close)
+endfunction
+
+function! scala#CountParens(line)
+  return scala#CountBrackets(a:line, '(', ')')
+endfunction
+
+function! scala#CountCurlies(line)
+  return scala#CountBrackets(a:line, '{', '}')
+endfunction
+
+function! scala#LineEndsInIncomplete(line)
+  if a:line =~ '[.,]\s*$'
+    return 1
+  else
+    return 0
+  endif
+endfunction
+
+function! scala#LineIsAClosingXML(line)
+  if a:line =~ '^\s*</\w'
+    return 1
+  else
+    return 0
+  endif
+endfunction
+
+function! scala#LineCompletesXML(lnum, line)
+  let savedpos = getpos('.')
+  call setpos('.', [savedpos[0], a:lnum, 0, savedpos[3]])
+  let tag = substitute(a:line, '^.*</\([^>]*\)>.*$', '\1', '')
+  let [lineNum, colnum] = searchpairpos('<' . tag . '>', '', '</' . tag . '>', 'Wbn')
+  call setpos('.', savedpos)
+  let pline = scala#GetLine(prevnonblank(lineNum - 1))
+  if pline =~ '=\s*$'
+    return 1
+  else
+    return 0
+  endif
+endfunction
+
+function! scala#IsParentCase()
+  let savedpos = getpos('.')
+  call setpos('.', [savedpos[0], savedpos[1], 0, savedpos[3]])
+  let [l, c] = searchpos('^\s*\%(' . s:defMatcher . '\|\%(\<case\>\)\)', 'bnW')
+  let retvalue = -1
+  if l != 0 && search('\%' . l . 'l\s*\<case\>', 'bnW')
+    let retvalue = l
+  endif
+  call setpos('.', savedpos)
+  return retvalue
+endfunction
+
+function! scala#CurlyMatcher()
+  let matchline = scala#GetLineThatMatchesBracket('{', '}')
+  if scala#CountParens(scala#GetLine(matchline)) < 0
+    let savedpos = getpos('.')
+    call setpos('.', [savedpos[0], matchline, 9999, savedpos[3]])
+    call searchpos('{', 'Wbc')
+    call searchpos(')', 'Wb')
+    let [lnum, colnum] = searchpairpos('(', '', ')', 'Wbn')
+    call setpos('.', savedpos)
+    let line = scala#GetLine(lnum)
+    if line =~ '^\s*' . s:defMatcher
+      return lnum
+    else
+      return matchline
+    endif
+  else
+    return matchline
+  endif
+endfunction
+
+function! scala#GetLineAndColumnThatMatchesCurly()
+  return scala#GetLineAndColumnThatMatchesBracket('{', '}')
+endfunction
+
+function! scala#GetLineAndColumnThatMatchesParen()
+  return scala#GetLineAndColumnThatMatchesBracket('(', ')')
+endfunction
+
+function! scala#GetLineAndColumnThatMatchesBracket(openBracket, closedBracket)
+  let savedpos = getpos('.')
+  let curline = scala#GetLine(line('.'))
+  if curline =~ a:closedBracket . '.*' . a:openBracket . '.*' . a:closedBracket
+    call setpos('.', [savedpos[0], savedpos[1], 0, savedpos[3]])
+    call searchpos(a:closedBracket . '\ze[^' . a:closedBracket . a:openBracket . ']*' . a:openBracket, 'W')
+  else
+    call setpos('.', [savedpos[0], savedpos[1], 9999, savedpos[3]])
+    call searchpos(a:closedBracket, 'Wbc')
+  endif
+  let [lnum, colnum] = searchpairpos(a:openBracket, '', a:closedBracket, 'Wbn')
+  call setpos('.', savedpos)
+  return [lnum, colnum]
+endfunction
+
+function! scala#GetLineThatMatchesCurly()
+  return scala#GetLineThatMatchesBracket('{', '}')
+endfunction
+
+function! scala#GetLineThatMatchesParen()
+  return scala#GetLineThatMatchesBracket('(', ')')
+endfunction
+
+function! scala#GetLineThatMatchesBracket(openBracket, closedBracket)
+  let [lnum, colnum] = scala#GetLineAndColumnThatMatchesBracket(a:openBracket, a:closedBracket)
+  return lnum
+endfunction
+
+function! scala#NumberOfBraceGroups(line)
+  let line = substitute(a:line, '[^()]', '', 'g')
+  if strlen(line) == 0
+    return 0
+  endif
+  let line = substitute(line, '^)*', '', 'g')
+  if strlen(line) == 0
+    return 0
+  endif
+  let line = substitute(line, '^(', '', 'g')
+  if strlen(line) == 0
+    return 0
+  endif
+  let c = 1
+  let counter = 0
+  let groupCount = 0
+  while counter < strlen(line)
+    let char = strpart(line, counter, 1)
+    if char == '('
+      let c = c + 1
+    elseif char == ')'
+      let c = c - 1
+    endif
+    if c == 0
+      let groupCount = groupCount + 1
+    endif
+    let counter = counter + 1
+  endwhile
+  return groupCount
+endfunction
+
+function! scala#MatchesIncompleteDefValr(line)
+  if a:line =~ '^\s*\%(' . s:defMatcher . '\|\<va[lr]\>\).*[=({]\s*$'
+    return 1
+  else
+    return 0
+  endif
+endfunction
+
+function! scala#LineIsCompleteIf(line)
+  if scala#CountBrackets(a:line, '{', '}') == 0 &&
+   \ scala#CountBrackets(a:line, '(', ')') == 0 &&
+   \ a:line =~ '^\s*\<if\>\s*([^)]*)\s*\S.*$'
+    return 1
+  else
+    return 0
+  endif
+endfunction
+
+function! scala#LineCompletesIfElse(lnum, line)
+  if a:line =~ '^\s*\%(\<if\>\|\%(}\s*\)\?\<else\>\)'
+    return 0
+  endif
+  let result = search('^\%(\s*\<if\>\s*(.*).*\n\|\s*\<if\>\s*(.*)\s*\n.*\n\)\%(\s*\<else\>\s*\<if\>\s*(.*)\s*\n.*\n\)*\%(\s*\<else\>\s*\n\|\s*\<else\>[^{]*\n\)\?\%' . a:lnum . 'l', 'Wbn')
+  if result != 0 && scala#GetLine(prevnonblank(a:lnum - 1)) !~ '{\s*$'
+    return result
+  endif
+  return 0
+endfunction
+
+function! scala#GetPrevCodeLine(lnum)
+  " This needs to skip comment lines
+  return prevnonblank(a:lnum - 1)
+endfunction
+
+function! scala#InvertBracketType(openBracket, closedBracket)
+  if a:openBracket == '('
+    return [ '{', '}' ]
+  else
+    return [ '(', ')' ]
+  endif
+endfunction
+
+function! scala#Testhelper(lnum, line, openBracket, closedBracket, iteration)
+  let bracketCount = scala#CountBrackets(a:line, a:openBracket, a:closedBracket)
+  " There are more '}' braces than '{' on this line so it may be completing the function definition
+  if bracketCount < 0
+    let [matchedLNum, matchedColNum] = scala#GetLineAndColumnThatMatchesBracket(a:openBracket, a:closedBracket)
+    if matchedLNum == a:lnum
+      return -1
+    endif
+    let matchedLine = scala#GetLine(matchedLNum)
+    if ! scala#MatchesIncompleteDefValr(matchedLine)
+      let bracketLine = substitute(substitute(matchedLine, '\%' . matchedColNum . 'c.*$', '', ''), '[^{}()]', '', 'g')
+      if bracketLine =~ '}$'
+        return scala#Testhelper(matchedLNum, matchedLine, '{', '}', a:iteration + 1)
+      elseif bracketLine =~ ')$'
+        return scala#Testhelper(matchedLNum, matchedLine, '(', ')', a:iteration + 1)
+      else
+        let prevCodeLNum = scala#GetPrevCodeLine(matchedLNum)
+        if scala#MatchesIncompleteDefValr(scala#GetLine(prevCodeLNum))
+          return prevCodeLNum
+        else
+          return -1
+        endif
+      endif
+    else
+      " return indent value instead
+      return matchedLNum
+    endif
+  " There's an equal number of '{' and '}' on this line so it may be a single line function definition
+  elseif bracketCount == 0
+    if a:iteration == 0
+      let otherBracketType = scala#InvertBracketType(a:openBracket, a:closedBracket)
+      return scala#Testhelper(a:lnum, a:line, otherBracketType[0], otherBracketType[1], a:iteration + 1)
+    else
+      let prevCodeLNum = scala#GetPrevCodeLine(a:lnum)
+      let prevCodeLine = scala#GetLine(prevCodeLNum)
+      if scala#MatchesIncompleteDefValr(prevCodeLine) && prevCodeLine !~ '{\s*$'
+        return prevCodeLNum
+      else
+        let possibleIfElse = scala#LineCompletesIfElse(a:lnum, a:line)
+        if possibleIfElse != 0
+          let defValrLine = prevnonblank(possibleIfElse - 1)
+          let possibleDefValr = scala#GetLine(defValrLine)
+          if scala#MatchesIncompleteDefValr(possibleDefValr) && possibleDefValr =~ '^.*=\s*$'
+            return possibleDefValr
+          else
+            return -1
+          endif
+        else
+          return -1
+        endif
+      endif
+    endif
+  else
+    return -1
+  endif
+endfunction
+
+function! scala#Test(lnum, line, openBracket, closedBracket)
+  return scala#Testhelper(a:lnum, a:line, a:openBracket, a:closedBracket, 0)
+endfunction
+
+function! scala#LineCompletesDefValr(lnum, line)
+  let bracketCount = scala#CountBrackets(a:line, '{', '}')
+  if bracketCount < 0
+    let matchedBracket = scala#GetLineThatMatchesBracket('{', '}')
+    if ! scala#MatchesIncompleteDefValr(scala#GetLine(matchedBracket))
+      let possibleDefValr = scala#GetLine(prevnonblank(matchedBracket - 1))
+      if matchedBracket != -1 && scala#MatchesIncompleteDefValr(possibleDefValr)
+        return 1
+      else
+        return 0
+      endif
+    else
+      return 0
+    endif
+  elseif bracketCount == 0
+    let bracketCount = scala#CountBrackets(a:line, '(', ')')
+    if bracketCount < 0
+      let matchedBracket = scala#GetLineThatMatchesBracket('(', ')')
+      if ! scala#MatchesIncompleteDefValr(scala#GetLine(matchedBracket))
+        let possibleDefValr = scala#GetLine(prevnonblank(matchedBracket - 1))
+        if matchedBracket != -1 && scala#MatchesIncompleteDefValr(possibleDefValr)
+          return 1
+        else
+          return 0
+        endif
+      else
+        return 0
+      endif
+    elseif bracketCount == 0
+      let possibleDefValr = scala#GetLine(prevnonblank(a:lnum - 1))
+      if scala#MatchesIncompleteDefValr(possibleDefValr) && possibleDefValr =~ '^.*=\s*$'
+        return 1
+      else
+        let possibleIfElse = scala#LineCompletesIfElse(a:lnum, a:line)
+        if possibleIfElse != 0
+          let possibleDefValr = scala#GetLine(prevnonblank(possibleIfElse - 1))
+          if scala#MatchesIncompleteDefValr(possibleDefValr) && possibleDefValr =~ '^.*=\s*$'
+            return 2
+          else
+            return 0
+          endif
+        else
+          return 0
+        endif
+      endif
+    else
+      return 0
+    endif
+  endif
+endfunction
+
+function! scala#SpecificLineCompletesBrackets(lnum, openBracket, closedBracket)
+  let savedpos = getpos('.')
+  call setpos('.', [savedpos[0], a:lnum, 9999, savedpos[3]])
+  let retv = scala#LineCompletesBrackets(a:openBracket, a:closedBracket)
+  call setpos('.', savedpos)
+
+  return retv
+endfunction
+
+function! scala#LineCompletesBrackets(openBracket, closedBracket)
+  let savedpos = getpos('.')
+  let offline = 0
+  while offline == 0
+    let [lnum, colnum] = searchpos(a:closedBracket, 'Wb')
+    let [lnumA, colnumA] = searchpairpos(a:openBracket, '', a:closedBracket, 'Wbn')
+    if lnum != lnumA
+      let [lnumB, colnumB] = searchpairpos(a:openBracket, '', a:closedBracket, 'Wbnr')
+      let offline = 1
+    endif
+  endwhile
+  call setpos('.', savedpos)
+  if lnumA == lnumB && colnumA == colnumB
+    return lnumA
+  else
+    return -1
+  endif
+endfunction
+
+function! GetScalaIndent()
+  " Find a non-blank line above the current line.
+  let prevlnum = prevnonblank(v:lnum - 1)
+
+  " Hit the start of the file, use zero indent.
+  if prevlnum == 0
+    return 0
+  endif
+
+  let ind = indent(prevlnum)
+  let originalIndentValue = ind
+  let prevline = scala#GetLine(prevlnum)
+  let curlnum = v:lnum
+  let curline = scala#GetLine(curlnum)
+  if get(g:, 'scala_scaladoc_indent', 0)
+    let star_indent = 2
+  else
+    let star_indent = 1
+  end
+
+  if prevline =~ '^\s*/\*\*'
+    if prevline =~ '\*/\s*$'
+      return ind
+    else
+      return ind + star_indent
+    endif
+  endif
+
+  if curline =~ '^\s*\*'
+    return cindent(curlnum)
+  endif
+
+  " If this line starts with a { then make it indent the same as the previous line
+  if curline =~ '^\s*{'
+    call scala#ConditionalConfirm("1")
+    " Unless, of course, the previous one is a { as well
+    if prevline !~ '^\s*{'
+      call scala#ConditionalConfirm("2")
+      return indent(prevlnum)
+    endif
+  endif
+
+  " '.' continuations
+  if curline =~ '^\s*\.'
+    if prevline =~ '^\s*\.'
+      return ind
+    else
+      return ind + &shiftwidth
+    endif
+  endif
+
+  " Indent html literals
+  if prevline !~ '/>\s*$' && prevline =~ '^\s*<[a-zA-Z][^>]*>\s*$'
+    call scala#ConditionalConfirm("3")
+    return ind + &shiftwidth
+  endif
+
+  " assumes curly braces around try-block
+  if curline =~ '^\s*}\s*\<catch\>'
+    return ind - &shiftwidth
+  elseif curline =~ '^\s*\<catch\>'
+    return ind
+  endif
+
+  " Add a 'shiftwidth' after lines that start a block
+  " If 'if', 'for' or 'while' end with ), this is a one-line block
+  " If 'val', 'var', 'def' end with =, this is a one-line block
+  if (prevline =~ '^\s*\<\%(\%(}\?\s*else\s\+\)\?if\|for\|while\)\>.*[)=]\s*$' && scala#NumberOfBraceGroups(prevline) <= 1)
+        \ || prevline =~ '^\s*' . s:defMatcher . '.*=\s*$'
+        \ || prevline =~ '^\s*\<va[lr]\>.*[=]\s*$'
+        \ || prevline =~ '^\s*\%(}\s*\)\?\<else\>\s*$'
+        \ || prevline =~ '=\s*$'
+    call scala#ConditionalConfirm("4")
+    let ind = ind + &shiftwidth
+  elseif prevline =~ '^\s*\<\%(}\?\s*else\s\+\)\?if\>' && curline =~ '^\s*}\?\s*\<else\>'
+    return ind
+  endif
+
+  let lineCompletedBrackets = 0
+  let bracketCount = scala#CountBrackets(prevline, '{', '}')
+  if bracketCount > 0 || prevline =~ '.*{\s*$'
+    call scala#ConditionalConfirm("5b")
+    let ind = ind + &shiftwidth
+  elseif bracketCount < 0
+    call scala#ConditionalConfirm("6b")
+    " if the closing brace actually completes the braces entirely, then we
+    " have to indent to line that started the whole thing
+    let completeLine = scala#LineCompletesBrackets('{', '}')
+    if completeLine != -1
+      call scala#ConditionalConfirm("8b")
+      let prevCompleteLine = scala#GetLine(prevnonblank(completeLine - 1))
+      " However, what actually started this part looks like it was a function
+      " definition, so we need to indent to that line instead.  This is
+      " actually pretty weak at the moment.
+      if prevCompleteLine =~ '=\s*$'
+        call scala#ConditionalConfirm("9b")
+        let ind = indent(prevnonblank(completeLine - 1))
+      else
+        call scala#ConditionalConfirm("10b")
+        let ind = indent(completeLine)
+      endif
+    else
+      let lineCompletedBrackets = 1
+    endif
+  endif
+
+  if ind == originalIndentValue
+    let bracketCount = scala#CountBrackets(prevline, '(', ')')
+    if bracketCount > 0 || prevline =~ '.*(\s*$'
+      call scala#ConditionalConfirm("5a")
+      let ind = ind + &shiftwidth
+    elseif bracketCount < 0
+      call scala#ConditionalConfirm("6a")
+      " if the closing brace actually completes the braces entirely, then we
+      " have to indent to line that started the whole thing
+      let completeLine = scala#LineCompletesBrackets('(', ')')
+      if completeLine != -1 && prevline !~ '^.*{\s*$'
+        call scala#ConditionalConfirm("8a")
+        let prevCompleteLine = scala#GetLine(prevnonblank(completeLine - 1))
+        " However, what actually started this part looks like it was a function
+        " definition, so we need to indent to that line instead.  This is
+        " actually pretty weak at the moment.
+        if prevCompleteLine =~ '=\s*$'
+          call scala#ConditionalConfirm("9a")
+          let ind = indent(prevnonblank(completeLine - 1))
+        else
+          call scala#ConditionalConfirm("10a")
+          let ind = indent(completeLine)
+        endif
+      else
+        " This is the only part that's different from from the '{', '}' one below
+        " Yup... some refactoring is necessary at some point.
+        let ind = ind + (bracketCount * &shiftwidth)
+        let lineCompletedBrackets = 1
+      endif
+    endif
+  endif
+
+  if curline =~ '^\s*}\?\s*\<else\>\%(\s\+\<if\>\s*(.*)\)\?\s*{\?\s*$' &&
+   \ ! scala#LineIsCompleteIf(prevline) &&
+   \ prevline !~ '^.*}\s*$'
+    let ind = ind - &shiftwidth
+  endif
+
+  " Subtract a 'shiftwidth' on '}' or html
+  let curCurlyCount = scala#CountCurlies(curline)
+  if curCurlyCount < 0
+    call scala#ConditionalConfirm("14a")
+    let matchline = scala#CurlyMatcher()
+    return indent(matchline)
+  elseif curline =~ '^\s*</[a-zA-Z][^>]*>'
+    call scala#ConditionalConfirm("14c")
+    return ind - &shiftwidth
+  endif
+
+  let prevParenCount = scala#CountParens(prevline)
+  if prevline =~ '^\s*\<for\>.*$' && prevParenCount > 0
+    call scala#ConditionalConfirm("15")
+    let ind = indent(prevlnum) + 5
+  endif
+
+  let prevCurlyCount = scala#CountCurlies(prevline)
+  if prevCurlyCount == 0 && prevline =~ '^.*\%(=>\|⇒\)\s*$' && prevline !~ '^\s*this\s*:.*\%(=>\|⇒\)\s*$' && curline !~ '^\s*\<case\>'
+    call scala#ConditionalConfirm("16")
+    let ind = ind + &shiftwidth
+  endif
+
+  if ind == originalIndentValue && curline =~ '^\s*\<case\>'
+    call scala#ConditionalConfirm("17")
+    let parentCase = scala#IsParentCase()
+    if parentCase != -1
+      call scala#ConditionalConfirm("17a")
+      return indent(parentCase)
+    endif
+  endif
+
+  if prevline =~ '^\s*\*/'
+   \ || prevline =~ '*/\s*$'
+    call scala#ConditionalConfirm("18")
+    let ind = ind - star_indent
+  endif
+
+  if scala#LineEndsInIncomplete(prevline)
+    call scala#ConditionalConfirm("19")
+    return ind
+  endif
+
+  if scala#LineIsAClosingXML(prevline)
+    if scala#LineCompletesXML(prevlnum, prevline)
+      call scala#ConditionalConfirm("20a")
+      return ind - &shiftwidth
+    else
+      call scala#ConditionalConfirm("20b")
+      return ind
+    endif
+  endif
+
+  if ind == originalIndentValue
+    "let indentMultiplier = scala#LineCompletesDefValr(prevlnum, prevline)
+    "if indentMultiplier != 0
+    "  call scala#ConditionalConfirm("19a")
+    "  let ind = ind - (indentMultiplier * &shiftwidth)
+    let defValrLine = scala#Test(prevlnum, prevline, '{', '}')
+    if defValrLine != -1
+      call scala#ConditionalConfirm("21a")
+      let ind = indent(defValrLine)
+    elseif lineCompletedBrackets == 0
+      call scala#ConditionalConfirm("21b")
+      if scala#GetLine(prevnonblank(prevlnum - 1)) =~ '^.*\<else\>\s*\%(//.*\)\?$'
+        call scala#ConditionalConfirm("21c")
+        let ind = ind - &shiftwidth
+      elseif scala#LineCompletesIfElse(prevlnum, prevline)
+        call scala#ConditionalConfirm("21d")
+        let ind = ind - &shiftwidth
+      elseif scala#CountParens(curline) < 0 && curline =~ '^\s*)' && scala#GetLine(scala#GetLineThatMatchesBracket('(', ')')) =~ '.*(\s*$'
+        " Handles situations that look like this:
+        "
+        "   val a = func(
+        "     10
+        "   )
+        "
+        " or
+        "
+        "   val a = func(
+        "     10
+        "   ).somethingHere()
+        call scala#ConditionalConfirm("21e")
+        let ind = ind - &shiftwidth
+      endif
+    endif
+  endif
+
+  call scala#ConditionalConfirm("returning " . ind)
+
+  return ind
+endfunction
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim:set sw=2 sts=2 ts=8 et:
+" vim600:fdm=marker fdl=1 fdc=0:
diff --git a/runtime/keymap/pinyin.vim b/runtime/keymap/pinyin.vim
index 757850b83f..253814c753 100644
--- a/runtime/keymap/pinyin.vim
+++ b/runtime/keymap/pinyin.vim
@@ -1,5 +1,5 @@
 " Vim Keymap file for Hanyu Pinyin tone marks through numbers.
-" Maintainer: Fredrik Roubert <roubert@df.lth.se>
+" Maintainer: Fredrik Roubert <fredrik@roubert.name>
 " Last Changed: February 15, 2004
 
 " All characters are given literally.
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 2053b2d860..36d1741362 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Aug 12
+" Last Change:	2016 Aug 21
 
 " If there already is an option window, jump to that one.
 if bufwinnr("option-window") > 0
@@ -1146,8 +1146,8 @@ endif
 if has("langmap")
   call append("$", "langmap\tlist of characters that are translated in Normal mode")
   call <SID>OptionG("lmap", &lmap)
-  call append("$", "langnoremap\tdon't apply 'langmap' to mapped characters")
-  call <SID>BinOptionG("lnr", &lnr)
+  call append("$", "langremap\tapply 'langmap' to mapped characters")
+  call <SID>BinOptionG("lrm", &lrm)
 endif
 if has("xim")
   call append("$", "imdisable\twhen set never use IM; overrules following IM options")
diff --git a/runtime/plugin/matchit.vim b/runtime/plugin/matchit.vim
index c0f1f08027..f275f7b36d 100644
--- a/runtime/plugin/matchit.vim
+++ b/runtime/plugin/matchit.vim
@@ -1,8 +1,10 @@
 "  matchit.vim: (global plugin) Extended "%" matching
-"  Last Change: Fri Jul 29 01:20 AM 2016 EST
+"  Last Change: 2016 Aug 21
 "  Maintainer:  Benji Fisher PhD   <benji@member.AMS.org>
 "  Version:     1.13.2, for Vim 6.3+
 "		Fix from Tommy Allen included.
+"		Fix from Fernando Torres included.
+"		Improvement from Ken Takata included.
 "  URL:		http://www.vim.org/script.php?script_id=39
 
 " Documentation:
@@ -44,6 +46,7 @@ endif
 let loaded_matchit = 1
 let s:last_mps = ""
 let s:last_words = ":"
+let s:patBR = ""
 
 let s:save_cpo = &cpo
 set cpo&vim
@@ -121,8 +124,8 @@ function! s:Match_wrapper(word, forward, mode) range
     execute "let match_words =" b:match_words
   endif
 " Thanks to Preben "Peppe" Guldberg and Bram Moolenaar for this suggestion!
-  if (match_words != s:last_words) || (&mps != s:last_mps) ||
-    \ exists("b:match_debug")
+  if (match_words != s:last_words) || (&mps != s:last_mps)
+      \ || exists("b:match_debug")
     let s:last_mps = &mps
     " The next several lines were here before
     " BF started messing with this script.
@@ -148,6 +151,10 @@ function! s:Match_wrapper(word, forward, mode) range
     if exists("b:match_debug")
       let b:match_pat = s:pat
     endif
+    " Reconstruct the version with unresolved backrefs.
+    let s:patBR = substitute(match_words.',',
+      \ s:notslash.'\zs[,:]*,[,:]*', ',', 'g')
+    let s:patBR = substitute(s:patBR, s:notslash.'\zs:\{2,}', ':', 'g')
   endif
 
   " Second step:  set the following local variables:
@@ -192,14 +199,10 @@ function! s:Match_wrapper(word, forward, mode) range
   " group = colon-separated list of patterns, one of which matches
   "       = ini:mid:fin or ini:fin
   "
-  " Reconstruct the version with unresolved backrefs.
-  let patBR = substitute(match_words.',',
-    \ s:notslash.'\zs[,:]*,[,:]*', ',', 'g')
-  let patBR = substitute(patBR, s:notslash.'\zs:\{2,}', ':', 'g')
   " Now, set group and groupBR to the matching group: 'if:endif' or
   " 'while:endwhile' or whatever.  A bit of a kluge:  s:Choose() returns
   " group . "," . groupBR, and we pick it apart.
-  let group = s:Choose(s:pat, matchline, ",", ":", prefix, suffix, patBR)
+  let group = s:Choose(s:pat, matchline, ",", ":", prefix, suffix, s:patBR)
   let i = matchend(group, s:notslash . ",")
   let groupBR = strpart(group, i)
   let group = strpart(group, 0, i-1)
@@ -656,6 +659,7 @@ fun! s:MultiMatch(spflag, mode)
     \ exists("b:match_debug")
     let s:last_words = match_words
     let s:last_mps = &mps
+    let match_words = match_words . (strlen(match_words) ? "," : "") . default
     if match_words !~ s:notslash . '\\\d'
       let s:do_BR = 0
       let s:pat = match_words
@@ -663,8 +667,8 @@ fun! s:MultiMatch(spflag, mode)
       let s:do_BR = 1
       let s:pat = s:ParseWords(match_words)
     endif
-    let s:all = '\%(' . substitute(s:pat . (strlen(s:pat)?",":"") . default,
-      \	'[,:]\+','\\|','g') . '\)'
+    let s:all = '\%(' . substitute(s:pat . (strlen(s:pat) ? "," : "") . default,
+	\ '[,:]\+', '\\|', 'g') . '\)'
     if exists("b:match_debug")
       let b:match_pat = s:pat
     endif
diff --git a/runtime/syntax/fortran.vim b/runtime/syntax/fortran.vim
index b470e56f60..06e5390c60 100644
--- a/runtime/syntax/fortran.vim
+++ b/runtime/syntax/fortran.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
-" Version:	0.97
-" Last Change:	2016 Feb. 26
+" Version:	0.98
+" Last Change:	2016 Aug. 26
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
 " Usage:	For instructions, do :help fortran-syntax from Vim
 " Credits:
@@ -10,7 +10,8 @@
 "  in chronological 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, and Jan Hermann.
+"  Andrew Griffiths, Joe Krahn, Hendrik Merx, Matt Thompson, Jan Hermann,
+"  Stefano Zaghi and Vishnu Krishnan.
 
 if exists("b:current_syntax")
   finish
@@ -108,6 +109,7 @@ syn match fortranUnitHeader	"\<subroutine\>"
 syn keyword fortranCall		call
 syn match fortranUnitHeader	"\<function\>"
 syn match fortranUnitHeader	"\<program\>"
+syn match fortranUnitHeader	"\<block\>"
 syn keyword fortranKeyword	return stop
 syn keyword fortranConditional	else then
 syn match fortranConditional	"\<if\>"
@@ -208,6 +210,7 @@ syn match fortranStorageClass	"\<kind\s*="me=s+4
 syn match fortranStorageClass	"\<len\s*="me=s+3
 
 syn match fortranUnitHeader	"\<module\>"
+syn match fortranUnitHeader	"\<submodule\>"
 syn keyword fortranUnitHeader	use only contains
 syn keyword fortranUnitHeader	result operator assignment
 syn match fortranUnitHeader	"\<interface\>"
@@ -231,8 +234,10 @@ syn match fortranIntrinsic	"\<kind\>\s*[(,]"me=s+4
 syn match  fortranUnitHeader	"\<end\s*function"
 syn match  fortranUnitHeader	"\<end\s*interface"
 syn match  fortranUnitHeader	"\<end\s*module"
+syn match  fortranUnitHeader	"\<end\s*submodule"
 syn match  fortranUnitHeader	"\<end\s*program"
 syn match  fortranUnitHeader	"\<end\s*subroutine"
+syn match  fortranUnitHeader	"\<end\s*block"
 syn match  fortranRepeat	"\<end\s*do"
 syn match  fortranConditional	"\<end\s*where"
 syn match  fortranConditional	"\<select\s*case"
@@ -267,6 +272,7 @@ syn match fortranRepeat		"\<end\s*forall"
 syn keyword fortranIntrinsic	null cpu_time
 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*\>"
 endif
@@ -286,8 +292,9 @@ if b:fortran_dialect == "f08"
 
   syn keyword fortranReadWrite	flush wait
   syn keyword fortranIO 	      decimal round iomsg
-  syn keyword fortranType             asynchronous nopass non_overridable pass protected volatile abstract extends import
+  syn keyword fortranType             asynchronous nopass non_overridable pass protected volatile extends import
   syn keyword fortranType             non_intrinsic value bind deferred generic final enumerator
+  syn match fortranType               "\<abstract\>"
   syn match fortranType               "\<class\>"
   syn match fortranType               "\<associate\>"
   syn match fortranType               "\<end\s*associate"
@@ -305,6 +312,7 @@ if b:fortran_dialect == "f08"
   syn keyword fortranIntrinsic        bge bgt ble blt dshiftl dshiftr findloc iall iany iparity image_index lcobound ucobound maskl maskr num_images parity popcnt poppar shifta shiftl shiftr this_image
   syn keyword fortranIO               newunit
   syn keyword fortranType             contiguous
+  syn keyword fortranRepeat           concurrent
 
 " CUDA fortran
   syn match fortranTypeCUDA           "\<attributes\>"
@@ -383,20 +391,22 @@ if exists("fortran_fold")
 
   if (b:fortran_fixed_source == 1)
     syn region fortranProgram transparent fold keepend start="^\s*program\s\+\z(\a\w*\)" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*\(program\(\s\+\z1\>\)\=\|$\)" contains=ALLBUT,fortranModule
+    syn region fortranModule transparent fold keepend start="^\s*submodule\s\+(\a\w*\s*\(:\a\w*\s*\)*)\s*\z\(\a\w*\)" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*\(submodule\(\s\+\z1\>\)\=\|$\)" contains=ALLBUT,fortranProgram,fortranModule
     syn region fortranModule transparent fold keepend start="^\s*module\s\+\(procedure\)\@!\z(\a\w*\)" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*\(module\(\s\+\z1\>\)\=\|$\)" contains=ALLBUT,fortranProgram
-    syn region fortranFunction transparent fold keepend extend start="^\s*\(elemental \|pure \|recursive \)\=\s*\(\(\(real \|integer \|logical \|complex \|double \s*precision \)\s*\((\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\|type\s\+(\s*\w\+\s*) \|character \((\(\s*len\s*=\)\=\s*\d\+\s*)\|(\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\=\s*function\s\+\z(\a\w*\)" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*\($\|function\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule
-    syn region fortranSubroutine transparent fold keepend extend start="^\s*\(elemental \|pure \|recursive \)\=\s*subroutine\s\+\z(\a\w*\)" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*\($\|subroutine\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule
+    syn region fortranFunction transparent fold keepend extend start="^\s*\(elemental \|pure \|impure \|module \|recursive \)\=\s*\(\(\(real \|integer \|logical \|complex \|double \s*precision \)\s*\((\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\|type\s\+(\s*\w\+\s*) \|character \((\(\s*len\s*=\)\=\s*\d\+\s*)\|(\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\=\s*function\s\+\z(\a\w*\)" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*\($\|function\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule
+    syn region fortranSubroutine transparent fold keepend extend start="^\s*\(elemental \|pure \|impure \|module \|recursive \)\=\s*subroutine\s\+\z(\a\w*\)" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*\($\|subroutine\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule
     syn region fortranBlockData transparent fold keepend start="\<block\s*data\(\s\+\z(\a\w*\)\)\=" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*\($\|block\s*data\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
-    syn region fortranInterface transparent fold keepend extend start="^\s*interface\>" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*interface\>" contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
-    syn region fortranTypeDef transparent fold keepend extend start="^\s*type\s*\(,\s*\(public\|private\)\)\=\s*::" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*type\>" contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
+    syn region fortranInterface transparent fold keepend extend start="^\s*\(abstract \)\=\s*interface\>" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*interface\>" contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
+    syn region fortranTypeDef transparent fold keepend extend start="^\s*type\s*\(,\s*\(public\|private\|abstract\)\)\=\s*::" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*type\>" contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock,fortranInterface
   else
     syn region fortranProgram transparent fold keepend start="^\s*program\s\+\z(\a\w*\)" skip="^\s*[!#].*$" excludenl end="\<end\s*\(program\(\s\+\z1\>\)\=\|$\)" contains=ALLBUT,fortranModule
+    syn region fortranModule transparent fold keepend start="^\s*submodule\s\+(\a\w*\s*\(:\a\w*\s*\)*)\s*\z\(\a\w*\)" skip="^\s*[!#].*$" excludenl end="\<end\s*\(submodule\(\s\+\z1\>\)\=\|$\)" contains=ALLBUT,fortranProgram,fortranModule
     syn region fortranModule transparent fold keepend start="^\s*module\s\+\(procedure\)\@!\z(\a\w*\)" skip="^\s*[!#].*$" excludenl end="\<end\s*\(module\(\s\+\z1\>\)\=\|$\)" contains=ALLBUT,fortranProgram
-    syn region fortranFunction transparent fold keepend extend start="^\s*\(elemental \|pure \|recursive \)\=\s*\(\(\(real \|integer \|logical \|complex \|double \s*precision \)\s*\((\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\|type\s\+(\s*\w\+\s*) \|character \((\(\s*len\s*=\)\=\s*\d\+\s*)\|(\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\=\s*function\s\+\z(\a\w*\)" skip="^\s*[!#].*$" excludenl end="\<end\s*\($\|function\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule
-    syn region fortranSubroutine transparent fold keepend extend start="^\s*\(elemental \|pure \|recursive \)\=\s*subroutine\s\+\z(\a\w*\)" skip="^\s*[!#].*$" excludenl end="\<end\s*\($\|subroutine\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule
+    syn region fortranFunction transparent fold keepend extend start="^\s*\(elemental \|pure \|impure \|module \|recursive \)\=\s*\(\(\(real \|integer \|logical \|complex \|double \s*precision \)\s*\((\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\|type\s\+(\s*\w\+\s*) \|character \((\(\s*len\s*=\)\=\s*\d\+\s*)\|(\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\=\s*function\s\+\z(\a\w*\)" skip="^\s*[!#].*$" excludenl end="\<end\s*\($\|function\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule
+    syn region fortranSubroutine transparent fold keepend extend start="^\s*\(elemental \|pure \|impure \|module \|recursive \)\=\s*subroutine\s\+\z(\a\w*\)" skip="^\s*[!#].*$" excludenl end="\<end\s*\($\|subroutine\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule
     syn region fortranBlockData transparent fold keepend start="\<block\s*data\(\s\+\z(\a\w*\)\)\=" skip="^\s*[!#].*$" excludenl end="\<end\s*\($\|block\s*data\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
-    syn region fortranInterface transparent fold keepend extend start="^\s*interface\>" skip="^\s*[!#].*$" excludenl end="\<end\s*interface\>" contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
-    syn region fortranTypeDef transparent fold keepend extend start="^\s*type\s*\(,\s*\(public\|private\)\)\=\s*::" skip="^\s*[!#].*$" excludenl end="\<end\s*type\>" contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
+    syn region fortranInterface transparent fold keepend extend start="^\s*\(abstract \)\=\s*interface\>" skip="^\s*[!#].*$" excludenl end="\<end\s*interface\>" contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
+    syn region fortranTypeDef transparent fold keepend extend start="^\s*type\s*\(,\s*\(public\|private\|abstract\)\)\=\s*::" skip="^\s*[!#].*$" excludenl end="\<end\s*type\>" contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock,fortranInterface
   endif
 
   if exists("fortran_fold_conditionals")
diff --git a/runtime/syntax/muttrc.vim b/runtime/syntax/muttrc.vim
index abe9bfd76b..94b27313b2 100644
--- a/runtime/syntax/muttrc.vim
+++ b/runtime/syntax/muttrc.vim
@@ -2,10 +2,9 @@
 " Language:	Mutt setup files
 " Original:	Preben 'Peppe' Guldberg <peppe-vim@wielders.org>
 " Maintainer:	Kyle Wheeler <kyle-muttrc.vim@memoryhole.net>
-" Last Change:	2 Feb 2012
+" Last Change:	18 August 2016
 
-" This file covers mutt version 1.5.21 (and most of the mercurial tip)
-" Included are also a few features from 1.4.2.1
+" This file covers mutt version 1.7.0
 
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
@@ -98,7 +97,7 @@ syn match muttrcSetNumAssignment contained skipwhite /=\s*'\d\+'/hs=s+1 nextgrou
 
 " Now catch some email addresses and headers (purified version from mail.vim)
 syn match muttrcEmail		"[a-zA-Z0-9._-]\+@[a-zA-Z0-9./-]\+"
-syn match muttrcHeader		"\<\%(From\|To\|C[Cc]\|B[Cc][Cc]\|Reply-To\|Subject\|Return-Path\|Received\|Date\|Replied\|Attach\)\>:\="
+syn match muttrcHeader		"\<\c\%(From\|To\|C[Cc]\|B[Cc][Cc]\|Reply-To\|Subject\|Return-Path\|Received\|Date\|Replied\|Attach\)\>:\="
 
 syn match   muttrcKeySpecial	contained +\%(\\[Cc'"]\|\^\|\\[01]\d\{2}\)+
 syn match   muttrcKey		contained "\S\+"			contains=muttrcKeySpecial,muttrcKeyName
@@ -109,143 +108,146 @@ syn match   muttrcKeyName	contained "\\[trne]"
 syn match   muttrcKeyName	contained "\c<\%(BackSpace\|BackTab\|Delete\|Down\|End\|Enter\|Esc\|Home\|Insert\|Left\|PageDown\|PageUp\|Return\|Right\|Space\|Tab\|Up\)>"
 syn match   muttrcKeyName	contained "<F[0-9]\+>"
 
-syn keyword muttrcVarBool	skipwhite contained allow_8bit allow_ansi arrow_cursor ascii_chars askbcc askcc attach_split auto_tag autoedit beep beep_new nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained bounce_delivered braille_friendly check_new check_mbox_size nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained collapse_unread confirmappend confirmcreate crypt_autoencrypt nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained crypt_autopgp crypt_autosign crypt_autosmime crypt_replyencrypt nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained crypt_replysign crypt_replysignencrypted crypt_timestamp nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained crypt_use_gpgme crypt_use_pka delete_untag digest_collapse duplicate_threads nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained edit_hdrs edit_headers encode_from envelope_from fast_reply nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained fcc_clear followup_to force_name forw_decode nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained forw_decrypt forw_quote forward_decode forward_decrypt nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained forward_quote hdrs header help hidden_host hide_limited nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained hide_missing hide_thread_subject hide_top_limited nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained hide_top_missing honor_disposition ignore_linear_white_space ignore_list_reply_to imap_check_subscribed nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained imap_list_subscribed imap_passive imap_peek imap_servernoise nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained implicit_autoview include_onlyfirst keep_flagged nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained mailcap_sanitize maildir_header_cache_verify maildir_trash nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained mark_old markers menu_move_off menu_scroll message_cache_clean meta_key nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained metoo mh_purge mime_forward_decode narrow_tree pager_stop nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained pgp_auto_decode pgp_auto_traditional pgp_autoencrypt nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained pgp_autoinline pgp_autosign pgp_check_exit nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained pgp_create_traditional pgp_ignore_subkeys pgp_long_ids nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained pgp_replyencrypt pgp_replyinline pgp_replysign nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained pgp_replysignencrypted pgp_retainable_sigs pgp_show_unusable nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained pgp_strict_enc pgp_use_gpg_agent pipe_decode pipe_split nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained pop_auth_try_all pop_last print_decode print_split nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained prompt_after read_only reply_self resolve reverse_alias nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained reverse_name reverse_realname rfc2047_parameters save_address nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained save_empty save_name score sig_dashes sig_on_top nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained smart_wrap smime_ask_cert_label smime_decrypt_use_default_key nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained smime_is_default sort_re ssl_force_tls ssl_use_sslv2 nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained ssl_use_sslv3 ssl_use_tlsv1 ssl_usesystemcerts ssl_verify_dates ssl_verify_host status_on_top nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained strict_mime strict_threads suspend text_flowed thorough_search nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained thread_received tilde uncollapse_jump use_8bitmime nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained use_domain use_envelope_from use_from use_idn use_ipv6 nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained user_agent wait_key weed wrap_search write_bcc nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn keyword muttrcVarBool	skipwhite contained 
+			\ allow_8bit allow_ansi arrow_cursor ascii_chars askbcc askcc attach_split
+			\ auto_tag autoedit beep beep_new bounce_delivered braille_friendly
+			\ check_mbox_size check_new collapse_unread confirmappend confirmcreate
+			\ crypt_autoencrypt crypt_autopgp crypt_autosign crypt_autosmime
+			\ crypt_confirmhook crypt_opportunistic_encrypt crypt_replyencrypt
+			\ crypt_replysign crypt_replysignencrypted crypt_timestamp crypt_use_gpgme
+			\ crypt_use_pka delete_untag digest_collapse duplicate_threads edit_hdrs
+			\ edit_headers encode_from envelope_from fast_reply fcc_clear followup_to
+			\ force_name forw_decode forw_decrypt forw_quote forward_decode forward_decrypt
+			\ forward_quote hdrs header help hidden_host hide_limited hide_missing
+			\ hide_thread_subject hide_top_limited hide_top_missing honor_disposition
+			\ idn_decode idn_encode ignore_linear_white_space ignore_list_reply_to
+			\ imap_check_subscribed imap_list_subscribed imap_passive imap_peek
+			\ imap_servernoise implicit_autoview include_onlyfirst keep_flagged
+			\ mail_check_recent mail_check_stats mailcap_sanitize maildir_check_cur
+			\ maildir_header_cache_verify maildir_trash mark_old markers menu_move_off
+			\ menu_scroll message_cache_clean meta_key metoo mh_purge mime_forward_decode
+			\ narrow_tree pager_stop pgp_auto_decode pgp_auto_traditional pgp_autoencrypt
+			\ pgp_autoinline pgp_autosign pgp_check_exit pgp_create_traditional
+			\ pgp_ignore_subkeys pgp_long_ids pgp_replyencrypt pgp_replyinline pgp_replysign
+			\ pgp_replysignencrypted pgp_retainable_sigs pgp_show_unusable pgp_strict_enc
+			\ pgp_use_gpg_agent pipe_decode pipe_split pop_auth_try_all pop_last
+			\ postpone_encrypt postpone_encrypt_as print_decode print_split prompt_after
+			\ read_only reflow_space_quotes reflow_text reflow_wrap reply_self resolve
+			\ resume_draft_files resume_edited_draft_files reverse_alias reverse_name
+			\ reverse_realname rfc2047_parameters save_address save_empty save_name score
+			\ sidebar_folder_indent sidebar_new_mail_only sidebar_next_new_wrap
+			\ sidebar_short_path sidebar_sort sidebar_visible sig_dashes sig_on_top
+			\ smart_wrap smime_ask_cert_label smime_decrypt_use_default_key smime_is_default
+			\ sort_re ssl_force_tls ssl_use_sslv2 ssl_use_sslv3 ssl_use_tlsv1
+			\ ssl_usesystemcerts ssl_verify_dates ssl_verify_host status_on_top strict_mime
+			\ strict_threads suspend text_flowed thorough_search thread_received tilde
+			\ ts_enabled uncollapse_jump use_8bitmime use_domain use_envelope_from use_from
+			\ use_idn use_ipv6 user_agent wait_key weed wrap_search write_bcc
+			\ nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
-syn keyword muttrcVarBool	skipwhite contained noallow_8bit noallow_ansi noarrow_cursor noascii_chars noaskbcc nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained noaskcc noattach_split noauto_tag noautoedit nobeep nobeep_new nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nobounce_delivered nobraille_friendly nocheck_new nocollapse_unread nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained noconfirmappend noconfirmcreate nocrypt_autoencrypt nocrypt_autopgp nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nocrypt_autosign nocrypt_autosmime nocrypt_replyencrypt nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nocrypt_replysign nocrypt_replysignencrypted nocrypt_timestamp nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nocrypt_use_gpgme nodelete_untag nodigest_collapse noduplicate_threads nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained noedit_hdrs noedit_headers noencode_from noenvelope_from nofast_reply nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nofcc_clear nofollowup_to noforce_name noforw_decode nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained noforw_decrypt noforw_quote noforward_decode noforward_decrypt nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained noforward_quote nohdrs noheader nohelp nohidden_host nohide_limited nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nohide_missing nohide_thread_subject nohide_top_limited nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nohide_top_missing nohonor_disposition noignore_list_reply_to noimap_check_subscribed nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained noimap_list_subscribed noimap_passive noimap_peek noimap_servernoise nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained noimplicit_autoview noinclude_onlyfirst nokeep_flagged nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nomailcap_sanitize nomaildir_header_cache_verify nomaildir_trash nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nomark_old nomarkers nomenu_move_off nomenu_scroll nometa_key nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nometoo nomh_purge nomime_forward_decode nonarrow_tree nopager_stop nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nopgp_auto_decode nopgp_auto_traditional nopgp_autoencrypt nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nopgp_autoinline nopgp_autosign nopgp_check_exit nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nopgp_create_traditional nopgp_ignore_subkeys nopgp_long_ids nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nopgp_replyencrypt nopgp_replyinline nopgp_replysign nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nopgp_replysignencrypted nopgp_retainable_sigs nopgp_show_unusable nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nopgp_strict_enc nopgp_use_gpg_agent nopipe_decode nopipe_split nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nopop_auth_try_all nopop_last noprint_decode noprint_split nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained noprompt_after noread_only noreply_self noresolve noreverse_alias nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained noreverse_name noreverse_realname norfc2047_parameters nosave_address nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nosave_empty nosave_name noscore nosig_dashes nosig_on_top nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nosmart_wrap nosmime_ask_cert_label nosmime_decrypt_use_default_key nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nosmime_is_default nosort_re nossl_force_tls nossl_use_sslv2 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nossl_use_sslv3 nossl_use_tlsv1 nossl_usesystemcerts nostatus_on_top nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nostrict_threads nosuspend notext_flowed nothorough_search nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nothread_received notilde nouncollapse_jump nouse_8bitmime nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nouse_domain nouse_envelope_from nouse_from nouse_idn nouse_ipv6 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained nouser_agent nowait_key noweed nowrap_search nowrite_bcc nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn keyword muttrcVarBool	skipwhite contained 
+			\ noallow_8bit noallow_ansi noarrow_cursor noascii_chars noaskbcc noaskcc noattach_split
+			\ noauto_tag noautoedit nobeep nobeep_new nobounce_delivered nobraille_friendly
+			\ nocheck_mbox_size nocheck_new nocollapse_unread noconfirmappend noconfirmcreate
+			\ nocrypt_autoencrypt nocrypt_autopgp nocrypt_autosign nocrypt_autosmime
+			\ nocrypt_confirmhook nocrypt_opportunistic_encrypt nocrypt_replyencrypt
+			\ nocrypt_replysign nocrypt_replysignencrypted nocrypt_timestamp nocrypt_use_gpgme
+			\ nocrypt_use_pka nodelete_untag nodigest_collapse noduplicate_threads noedit_hdrs
+			\ noedit_headers noencode_from noenvelope_from nofast_reply nofcc_clear nofollowup_to
+			\ noforce_name noforw_decode noforw_decrypt noforw_quote noforward_decode noforward_decrypt
+			\ noforward_quote nohdrs noheader nohelp nohidden_host nohide_limited nohide_missing
+			\ nohide_thread_subject nohide_top_limited nohide_top_missing nohonor_disposition
+			\ noidn_decode noidn_encode noignore_linear_white_space noignore_list_reply_to
+			\ noimap_check_subscribed noimap_list_subscribed noimap_passive noimap_peek
+			\ noimap_servernoise noimplicit_autoview noinclude_onlyfirst nokeep_flagged
+			\ nomail_check_recent nomail_check_stats nomailcap_sanitize nomaildir_check_cur
+			\ nomaildir_header_cache_verify nomaildir_trash nomark_old nomarkers nomenu_move_off
+			\ nomenu_scroll nomessage_cache_clean nometa_key nometoo nomh_purge nomime_forward_decode
+			\ nonarrow_tree nopager_stop nopgp_auto_decode nopgp_auto_traditional nopgp_autoencrypt
+			\ nopgp_autoinline nopgp_autosign nopgp_check_exit nopgp_create_traditional
+			\ nopgp_ignore_subkeys nopgp_long_ids nopgp_replyencrypt nopgp_replyinline nopgp_replysign
+			\ nopgp_replysignencrypted nopgp_retainable_sigs nopgp_show_unusable nopgp_strict_enc
+			\ nopgp_use_gpg_agent nopipe_decode nopipe_split nopop_auth_try_all nopop_last
+			\ nopostpone_encrypt nopostpone_encrypt_as noprint_decode noprint_split noprompt_after
+			\ noread_only noreflow_space_quotes noreflow_text noreflow_wrap noreply_self noresolve
+			\ noresume_draft_files noresume_edited_draft_files noreverse_alias noreverse_name
+			\ noreverse_realname norfc2047_parameters nosave_address nosave_empty nosave_name noscore
+			\ nosidebar_folder_indent nosidebar_new_mail_only nosidebar_next_new_wrap
+			\ nosidebar_short_path nosidebar_sort nosidebar_visible nosig_dashes nosig_on_top
+			\ nosmart_wrap nosmime_ask_cert_label nosmime_decrypt_use_default_key nosmime_is_default
+			\ nosort_re nossl_force_tls nossl_use_sslv2 nossl_use_sslv3 nossl_use_tlsv1
+			\ nossl_usesystemcerts nossl_verify_dates nossl_verify_host nostatus_on_top nostrict_mime
+			\ nostrict_threads nosuspend notext_flowed nothorough_search nothread_received notilde
+			\ nots_enabled nouncollapse_jump nouse_8bitmime nouse_domain nouse_envelope_from nouse_from
+			\ nouse_idn nouse_ipv6 nouser_agent nowait_key noweed nowrap_search nowrite_bcc
+			\ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
-syn keyword muttrcVarBool	skipwhite contained invallow_8bit invallow_ansi invarrow_cursor invascii_chars invaskbcc nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invaskcc invattach_split invauto_tag invautoedit invbeep invbeep_new nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invbounce_delivered invbraille_friendly invcheck_new invcollapse_unread nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invconfirmappend invconfirmcreate invcrypt_autoencrypt invcrypt_autopgp nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invcrypt_autosign invcrypt_autosmime invcrypt_replyencrypt nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invcrypt_replysign invcrypt_replysignencrypted invcrypt_timestamp nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invcrypt_use_gpgme invdelete_untag invdigest_collapse invduplicate_threads nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invedit_hdrs invedit_headers invencode_from invenvelope_from invfast_reply nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invfcc_clear invfollowup_to invforce_name invforw_decode nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invforw_decrypt invforw_quote invforward_decode invforward_decrypt nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invforward_quote invhdrs invheader invhelp invhidden_host invhide_limited nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invhide_missing invhide_thread_subject invhide_top_limited nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invhide_top_missing invhonor_disposition invignore_list_reply_to invimap_check_subscribed nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invimap_list_subscribed invimap_passive invimap_peek invimap_servernoise nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invimplicit_autoview invinclude_onlyfirst invkeep_flagged nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invmailcap_sanitize invmaildir_header_cache_verify invmaildir_trash nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invmark_old invmarkers invmenu_move_off invmenu_scroll invmeta_key nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invmetoo invmh_purge invmime_forward_decode invnarrow_tree invpager_stop nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invpgp_auto_decode invpgp_auto_traditional invpgp_autoencrypt nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invpgp_autoinline invpgp_autosign invpgp_check_exit nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invpgp_create_traditional invpgp_ignore_subkeys invpgp_long_ids nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invpgp_replyencrypt invpgp_replyinline invpgp_replysign nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invpgp_replysignencrypted invpgp_retainable_sigs invpgp_show_unusable nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invpgp_strict_enc invpgp_use_gpg_agent invpipe_decode invpipe_split nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invpop_auth_try_all invpop_last invprint_decode invprint_split nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invprompt_after invread_only invreply_self invresolve invreverse_alias nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invreverse_name invreverse_realname invrfc2047_parameters invsave_address nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invsave_empty invsave_name invscore invsig_dashes invsig_on_top nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invsmart_wrap invsmime_ask_cert_label invsmime_decrypt_use_default_key nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invsmime_is_default invsort_re invssl_force_tls invssl_use_sslv2 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invssl_use_sslv3 invssl_use_tlsv1 invssl_usesystemcerts invstatus_on_top nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invstrict_threads invsuspend invtext_flowed invthorough_search nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invthread_received invtilde invuncollapse_jump invuse_8bitmime nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invuse_domain invuse_envelope_from invuse_from invuse_idn invuse_ipv6 nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarBool	skipwhite contained invuser_agent invwait_key invweed invwrap_search invwrite_bcc nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-if use_mutt_sidebar == 1
-    syn keyword muttrcVarBool skipwhite contained sidebar_visible sidebar_sort nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-endif
+syn keyword muttrcVarBool	skipwhite contained
+			\ invallow_8bit invallow_ansi invarrow_cursor invascii_chars invaskbcc invaskcc invattach_split
+			\ invauto_tag invautoedit invbeep invbeep_new invbounce_delivered invbraille_friendly
+			\ invcheck_mbox_size invcheck_new invcollapse_unread invconfirmappend invconfirmcreate
+			\ invcrypt_autoencrypt invcrypt_autopgp invcrypt_autosign invcrypt_autosmime
+			\ invcrypt_confirmhook invcrypt_opportunistic_encrypt invcrypt_replyencrypt
+			\ invcrypt_replysign invcrypt_replysignencrypted invcrypt_timestamp invcrypt_use_gpgme
+			\ invcrypt_use_pka invdelete_untag invdigest_collapse invduplicate_threads invedit_hdrs
+			\ invedit_headers invencode_from invenvelope_from invfast_reply invfcc_clear invfollowup_to
+			\ invforce_name invforw_decode invforw_decrypt invforw_quote invforward_decode invforward_decrypt
+			\ invforward_quote invhdrs invheader invhelp invhidden_host invhide_limited invhide_missing
+			\ invhide_thread_subject invhide_top_limited invhide_top_missing invhonor_disposition
+			\ invidn_decode invidn_encode invignore_linear_white_space invignore_list_reply_to
+			\ invimap_check_subscribed invimap_list_subscribed invimap_passive invimap_peek
+			\ invimap_servernoise invimplicit_autoview invinclude_onlyfirst invkeep_flagged
+			\ invmail_check_recent invmail_check_stats invmailcap_sanitize invmaildir_check_cur
+			\ invmaildir_header_cache_verify invmaildir_trash invmark_old invmarkers invmenu_move_off
+			\ invmenu_scroll invmessage_cache_clean invmeta_key invmetoo invmh_purge invmime_forward_decode
+			\ invnarrow_tree invpager_stop invpgp_auto_decode invpgp_auto_traditional invpgp_autoencrypt
+			\ invpgp_autoinline invpgp_autosign invpgp_check_exit invpgp_create_traditional
+			\ invpgp_ignore_subkeys invpgp_long_ids invpgp_replyencrypt invpgp_replyinline invpgp_replysign
+			\ invpgp_replysignencrypted invpgp_retainable_sigs invpgp_show_unusable invpgp_strict_enc
+			\ invpgp_use_gpg_agent invpipe_decode invpipe_split invpop_auth_try_all invpop_last
+			\ invpostpone_encrypt invpostpone_encrypt_as invprint_decode invprint_split invprompt_after
+			\ invread_only invreflow_space_quotes invreflow_text invreflow_wrap invreply_self invresolve
+			\ invresume_draft_files invresume_edited_draft_files invreverse_alias invreverse_name
+			\ invreverse_realname invrfc2047_parameters invsave_address invsave_empty invsave_name invscore
+			\ invsidebar_folder_indent invsidebar_new_mail_only invsidebar_next_new_wrap
+			\ invsidebar_short_path invsidebar_sort invsidebar_visible invsig_dashes invsig_on_top
+			\ invsmart_wrap invsmime_ask_cert_label invsmime_decrypt_use_default_key invsmime_is_default
+			\ invsort_re invssl_force_tls invssl_use_sslv2 invssl_use_sslv3 invssl_use_tlsv1
+			\ invssl_usesystemcerts invssl_verify_dates invssl_verify_host invstatus_on_top invstrict_mime
+			\ invstrict_threads invsuspend invtext_flowed invthorough_search invthread_received invtilde
+			\ invts_enabled invuncollapse_jump invuse_8bitmime invuse_domain invuse_envelope_from invuse_from
+			\ invuse_idn invuse_ipv6 invuser_agent invwait_key invweed invwrap_search invwrite_bcc
+			\ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
-syn keyword muttrcVarQuad	skipwhite contained abort_nosubject abort_unmodified bounce copy nextgroup=muttrcSetQuadAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarQuad	skipwhite contained crypt_verify_sig delete fcc_attach forward_edit honor_followup_to nextgroup=muttrcSetQuadAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarQuad	skipwhite contained include mime_forward mime_forward_rest mime_fwd move nextgroup=muttrcSetQuadAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarQuad	skipwhite contained pgp_mime_auto pgp_verify_sig pop_delete pop_reconnect nextgroup=muttrcSetQuadAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarQuad	skipwhite contained postpone print quit recall reply_to ssl_starttls nextgroup=muttrcSetQuadAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn keyword muttrcVarQuad	skipwhite contained
+			\ abort_nosubject abort_unmodified bounce copy crypt_verify_sig delete
+			\ fcc_attach forward_edit honor_followup_to include mime_forward
+			\ mime_forward_rest mime_fwd move pgp_mime_auto pgp_verify_sig pop_delete
+			\ pop_reconnect postpone print quit recall reply_to ssl_starttls
+			\ nextgroup=muttrcSetQuadAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
-syn keyword muttrcVarQuad	skipwhite contained noabort_nosubject noabort_unmodified nobounce nocopy nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarQuad	skipwhite contained nocrypt_verify_sig nodelete nofcc_attach noforward_edit nohonor_followup_to nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarQuad	skipwhite contained noinclude nomime_forward nomime_forward_rest nomime_fwd nomove nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarQuad	skipwhite contained nopgp_mime_auto nopgp_verify_sig nopop_delete nopop_reconnect nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarQuad	skipwhite contained nopostpone noprint noquit norecall noreply_to nossl_starttls nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn keyword muttrcVarQuad	skipwhite contained
+			\ noabort_nosubject noabort_unmodified nobounce nocopy nocrypt_verify_sig nodelete
+			\ nofcc_attach noforward_edit nohonor_followup_to noinclude nomime_forward
+			\ nomime_forward_rest nomime_fwd nomove nopgp_mime_auto nopgp_verify_sig nopop_delete
+			\ nopop_reconnect nopostpone noprint noquit norecall noreply_to nossl_starttls
+			\ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
-syn keyword muttrcVarQuad	skipwhite contained invabort_nosubject invabort_unmodified invbounce invcopy nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarQuad	skipwhite contained invcrypt_verify_sig invdelete invfcc_attach invforward_edit invhonor_followup_to nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarQuad	skipwhite contained invinclude invmime_forward invmime_forward_rest invmime_fwd invmove nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarQuad	skipwhite contained invpgp_mime_auto invpgp_verify_sig invpop_delete invpop_reconnect nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarQuad	skipwhite contained invpostpone invprint invquit invrecall invreply_to invssl_starttls nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
+syn keyword muttrcVarQuad	skipwhite contained
+			\ invabort_nosubject invabort_unmodified invbounce invcopy invcrypt_verify_sig invdelete
+			\ invfcc_attach invforward_edit invhonor_followup_to invinclude invmime_forward
+			\ invmime_forward_rest invmime_fwd invmove invpgp_mime_auto invpgp_verify_sig invpop_delete
+			\ invpop_reconnect invpostpone invprint invquit invrecall invreply_to invssl_starttls
+			\ nextgroup=muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
-syn keyword muttrcVarNum	skipwhite contained connect_timeout history imap_keepalive imap_pipeline_depth mail_check nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarNum	skipwhite contained menu_context net_inc pager_context pager_index_lines pgp_timeout nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarNum	skipwhite contained pop_checkinterval read_inc save_history score_threshold_delete nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarNum	skipwhite contained score_threshold_flag score_threshold_read search_context sendmail_wait sleep_time nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarNum	skipwhite contained smime_timeout ssl_min_dh_prime_bits timeout time_inc wrap wrapmargin nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarNum	skipwhite contained write_inc nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-if use_mutt_sidebar == 1
-    syn keyword muttrcVarNum skipwhite contained sidebar_width nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-endif
+syn keyword muttrcVarNum	skipwhite contained
+			\ connect_timeout history imap_keepalive imap_pipeline_depth mail_check
+			\ mail_check_stats_interval menu_context net_inc pager_context pager_index_lines
+			\ pgp_timeout pop_checkinterval read_inc save_history score_threshold_delete
+			\ score_threshold_flag score_threshold_read search_context sendmail_wait
+			\ sidebar_width sleep_time smime_timeout ssl_min_dh_prime_bits time_inc timeout
+			\ wrap wrap_headers wrapmargin write_inc
+			\ nextgroup=muttrcSetNumAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
 syn match muttrcFormatErrors contained /%./
 
@@ -349,7 +351,7 @@ syn keyword muttrcVarStr	contained skipwhite query_format nextgroup=muttrcVarEqu
 syn match muttrcVarEqualsQueryFmt contained skipwhite "=" nextgroup=muttrcQueryFormatStr
 syn keyword muttrcVarStr	contained skipwhite pgp_decode_command pgp_verify_command pgp_decrypt_command pgp_clearsign_command pgp_sign_command pgp_encrypt_sign_command pgp_encrypt_only_command pgp_import_command pgp_export_command pgp_verify_key_command pgp_list_secring_command pgp_list_pubring_command nextgroup=muttrcVarEqualsPGPCmdFmt
 syn match muttrcVarEqualsPGPCmdFmt contained skipwhite "=" nextgroup=muttrcPGPCmdFormatStr
-syn keyword muttrcVarStr	contained skipwhite status_format nextgroup=muttrcVarEqualsStatusFmt
+syn keyword muttrcVarStr	contained skipwhite ts_icon_format ts_status_format status_format nextgroup=muttrcVarEqualsStatusFmt
 syn match muttrcVarEqualsStatusFmt contained skipwhite "=" nextgroup=muttrcStatusFormatStr
 syn keyword muttrcVarStr	contained skipwhite pgp_getkeys_command nextgroup=muttrcVarEqualsPGPGetKeysFmt
 syn match muttrcVarEqualsPGPGetKeysFmt contained skipwhite "=" nextgroup=muttrcPGPGetKeysFormatStr
@@ -361,34 +363,29 @@ syn match muttrcVarEqualsStrftimeFmt contained skipwhite "=" nextgroup=muttrcStr
 syn match muttrcVPrefix		contained /[?&]/ nextgroup=muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
 syn match muttrcVarStr		contained skipwhite 'my_[a-zA-Z0-9_]\+' nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite alias_file assumed_charset attach_charset attach_sep nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite certificate_file charset config_charset content_type nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite default_hook display_filter dotlock_program dsn_notify nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite dsn_return editor entropy_file envelope_from_address escape folder nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite forw_format forward_format from gecos_mask hdr_format nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite header_cache header_cache_compress header_cache_pagesize nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite history_file hostname imap_authenticators nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite imap_delim_chars imap_headers imap_idle imap_login imap_pass nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite imap_user indent_str indent_string ispell locale mailcap_path nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite mask mbox mbox_type message_cachedir mh_seq_flagged mh_seq_replied nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite mh_seq_unseen mixmaster msg_format pager nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite pgp_good_sign  nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite pgp_mime_signature_filename nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite pgp_mime_signature_description pgp_sign_as nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite pgp_sort_keys nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite pipe_sep pop_authenticators pop_host pop_pass pop_user post_indent_str nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite post_indent_string postponed preconnect print_cmd print_command nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite query_command quote_regexp realname record reply_regexp send_charset nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite sendmail shell signature simple_search smileys smime_ca_location nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite smime_certificates smime_default_key nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite smime_encrypt_with nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite smime_keys smime_sign_as nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite smtp_url smtp_authenticators smtp_pass sort sort_alias sort_aux nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite sort_browser spam_separator spoolfile ssl_ca_certificates_file ssl_client_cert nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-syn keyword muttrcVarStr	contained skipwhite status_chars tmpdir to_chars tunnel visual nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-if use_mutt_sidebar == 1
-    syn keyword muttrcVarStr skipwhite contained sidebar_delim nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
-endif
+syn keyword muttrcVarStr	contained skipwhite
+			\ alias_file assumed_charset attach_charset attach_sep certificate_file charset
+			\ config_charset content_type default_hook display_filter dotlock_program
+			\ dsn_notify dsn_return editor entropy_file envelope_from_address escape folder
+			\ forw_format forward_format from gecos_mask hdr_format header_cache
+			\ header_cache_compress header_cache_pagesize history_file hostname
+			\ imap_authenticators imap_delim_chars imap_headers imap_idle imap_login
+			\ imap_pass imap_user indent_str indent_string ispell locale mailcap_path mask
+			\ mbox mbox_type message_cachedir mh_seq_flagged mh_seq_replied mh_seq_unseen
+			\ mixmaster msg_format pager pgp_decryption_okay pgp_good_sign
+			\ pgp_mime_signature_description pgp_mime_signature_filename pgp_sign_as
+			\ pgp_sort_keys pipe_sep pop_authenticators pop_host pop_pass pop_user
+			\ post_indent_str post_indent_string postpone_encrypt_as postponed preconnect
+			\ print_cmd print_command query_command quote_regexp realname record
+			\ reply_regexp send_charset sendmail shell sidebar_delim sidebar_delim_chars
+			\ sidebar_divider_char sidebar_format sidebar_indent_string sidebar_sort_method
+			\ signature simple_search smileys smime_ca_location smime_certificates
+			\ smime_default_key smime_encrypt_with smime_keys smime_sign_as
+			\ smime_sign_digest_alg smtp_authenticators smtp_pass smtp_url sort sort_alias
+			\ sort_aux sort_browser spam_separator spoolfile ssl_ca_certificates_file
+			\ ssl_ciphers ssl_client_cert status_chars tmpdir to_chars trash ts_icon_format
+			\ ts_status_format tunnel visual
+			\ nextgroup=muttrcSetStrAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
 
 " Present in 1.4.2.1 (pgp_create_traditional was a bool then)
 syn keyword muttrcVarBool	contained skipwhite imap_force_ssl noimap_force_ssl invimap_force_ssl nextgroup=muttrcSetBoolAssignment,muttrcVPrefix,muttrcVarBool,muttrcVarQuad,muttrcVarNum,muttrcVarStr
@@ -401,12 +398,11 @@ syn match muttrcMenuCommas /,/ contained
 
 syn keyword muttrcHooks		contained skipwhite account-hook charset-hook iconv-hook message-hook folder-hook mbox-hook save-hook fcc-hook fcc-save-hook send-hook send2-hook reply-hook crypt-hook
 
-syn keyword muttrcCommand	auto_view alternative_order exec unalternative_order
-syn keyword muttrcCommand	hdr_order iconv-hook ignore mailboxes my_hdr unmailboxes
-syn keyword muttrcCommand	pgp-hook push score source unauto_view unhdr_order
-syn keyword muttrcCommand	unignore unmono unmy_hdr unscore
-syn keyword muttrcCommand	mime_lookup unmime_lookup ungroup
-syn keyword muttrcCommand	unalternative_order
+syn keyword muttrcCommand	skipwhite
+			\ alternative_order auto_view exec hdr_order iconv-hook ignore mailboxes
+			\ mailto_allow mime_lookup my_hdr pgp-hook push score sidebar_whitelist source
+			\ unalternative_order unalternative_order unauto_view ungroup unhdr_order
+			\ unignore unmailboxes unmailto_allow unmime_lookup unmono unmy_hdr unscore
 syn keyword muttrcCommand	skipwhite charset-hook nextgroup=muttrcRXString
 syn keyword muttrcCommand	skipwhite unhook nextgroup=muttrcHooks
 
@@ -441,7 +437,7 @@ syn match muttrcVariableInner	contained "\$[a-zA-Z_-]\+"
 syn match muttrcEscapedVariable	contained "\\\$[a-zA-Z_-]\+"
 
 syn match muttrcBadAction	contained "[^<>]\+" contains=muttrcEmail
-syn match muttrcFunction	contained "\<\%(attach\|bounce\|copy\|delete\|display\|flag\|forward\|parent\|pipe\|postpone\|print\|recall\|resend\|save\|send\|tag\|undelete\)-message\>"
+syn match muttrcFunction	contained "\<\%(attach\|bounce\|copy\|delete\|display\|flag\|forward\|parent\|pipe\|postpone\|print\|purge\|recall\|resend\|save\|send\|tag\|undelete\)-message\>"
 syn match muttrcFunction	contained "\<\%(delete\|next\|previous\|read\|tag\|break\|undelete\)-thread\>"
 syn match muttrcFunction	contained "\<link-threads\>"
 syn match muttrcFunction	contained "\<\%(backward\|capitalize\|downcase\|forward\|kill\|upcase\)-word\>"
@@ -465,11 +461,13 @@ syn match muttrcFunction	contained "\<show-\%(limit\|version\)\>"
 syn match muttrcFunction	contained "\<sort-\%(mailbox\|reverse\)\>"
 syn match muttrcFunction	contained "\<tag-\%(pattern\|\%(sub\)\?thread\|prefix\%(-cond\)\?\)\>"
 syn match muttrcFunction	contained "\<end-cond\>"
+syn match muttrcFunction	contained "\<sidebar-\%(next\|next-new\|open\|page-down\|page-up\|prev\|prev-new\|toggle-visible\)\>"
 syn match muttrcFunction	contained "\<toggle-\%(mailboxes\|new\|quoted\|subscribed\|unlink\|write\)\>"
 syn match muttrcFunction	contained "\<undelete-\%(pattern\|subthread\)\>"
 syn match muttrcFunction	contained "\<collapse-\%(parts\|thread\|all\)\>"
 syn match muttrcFunction	contained "\<view-\%(attach\|attachments\|file\|mailcap\|name\|text\)\>"
 syn match muttrcFunction	contained "\<\%(backspace\|backward-char\|bol\|bottom\|bottom-page\|buffy-cycle\|clear-flag\|complete\%(-query\)\?\|copy-file\|create-alias\|detach-file\|eol\|exit\|extract-keys\|\%(imap-\)\?fetch-mail\|forget-passphrase\|forward-char\|group-reply\|help\|ispell\|jump\|limit\|list-reply\|mail\|mail-key\|mark-as-new\|middle-page\|new-mime\|noop\|pgp-menu\|query\|query-append\|quit\|quote-char\|read-subthread\|redraw-screen\|refresh\|rename-file\|reply\|select-new\|set-flag\|shell-escape\|skip-quoted\|sort\|subscribe\|sync-mailbox\|top\|top-page\|transpose-chars\|unsubscribe\|untag-pattern\|verify-key\|what-key\|write-fcc\)\>"
+syn keyword muttrcFunction	contained imap-logout-all
 if use_mutt_sidebar == 1
     syn match muttrcFunction    contained "\<sidebar-\%(prev\|next\|open\|scroll-up\|scroll-down\)"
 endif
@@ -578,7 +576,11 @@ syn match muttrcColorMatchCount	contained "[0-9]\+"
 syn match muttrcColorMatchCountNL contained skipwhite skipnl "\s*\\$" nextgroup=muttrcColorMatchCount,muttrcColorMatchCountNL
 syn region muttrcColorRXPat	contained start=+\s*'+ skip=+\\'+ end=+'\s*+ keepend skipwhite contains=muttrcRXString2 nextgroup=muttrcColorMatchCount,muttrcColorMatchCountNL
 syn region muttrcColorRXPat	contained start=+\s*"+ skip=+\\"+ end=+"\s*+ keepend skipwhite contains=muttrcRXString2 nextgroup=muttrcColorMatchCount,muttrcColorMatchCountNL
-syn keyword muttrcColorField	contained attachment body bold error hdrdefault header index indicator markers message normal quoted search signature status tilde tree underline
+syn keyword muttrcColorField	skipwhite contained
+			\ attachment body bold error hdrdefault header index indicator markers message
+			\ normal prompt quoted search sidebar-divider sidebar-flagged sidebar-highlight
+			\ sidebar-indicator sidebar-new sidebar-spoolfile signature status tilde tree
+			\ underline
 syn match   muttrcColorField	contained "\<quoted\d\=\>"
 if use_mutt_sidebar == 1
     syn keyword muttrcColorField contained sidebar_new
diff --git a/runtime/syntax/python.vim b/runtime/syntax/python.vim
index fa42b3e2d2..f0f03a8c8d 100644
--- a/runtime/syntax/python.vim
+++ b/runtime/syntax/python.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Python
 " Maintainer:	Zvezdan Petkovic <zpetkovic@acm.org>
-" Last Change:	2016 Jul 21
+" Last Change:	2016 Aug 14
 " Credits:	Neil Schemenauer <nas@python.ca>
 "		Dmitry Vasiliev
 "
@@ -84,14 +84,30 @@ syn keyword pythonInclude	from import
 syn keyword pythonAsync		async await
 
 " Decorators (new in Python 2.4)
-syn match   pythonDecorator	"@" display nextgroup=pythonFunction skipwhite
-" The zero-length non-grouping match before the function name is
-" extremely important in pythonFunction.  Without it, everything is
-" interpreted as a function inside the contained environment of
-" doctests.
+" Python 3.5 introduced the use of the same symbol for matrix
+" multiplication.  We now have to exclude the symbol from being
+" highlighted when used in that context. Hence, the check that it's
+" preceded by empty space only (possibly in a docstring/doctest) and
+" followed by decorator name, optional parenthesized list of arguments,
+" and the next line with either def, class, or another decorator.
+syn match   pythonDecorator
+  \ "\%(\%(^\s*\)\%(\%(>>>\|\.\.\.\)\s\+\)\=\)\zs@\%(\s*\h\%(\w\|\.\)*\%(([^)]*)\)\=\s*\n\s*\%(\.\.\.\s\+\)\=\%(@\s*\h\|\%(def\|class\)\s\+\)\)\@="
+  \ display nextgroup=pythonDecoratorName skipwhite
+
 " A dot must be allowed because of @MyClass.myfunc decorators.
+" It must be preceded by a decorator symbol and on a separate line from
+" a function/class it decorates.
+syn match   pythonDecoratorName
+  \ "\%(@\s*\)\@<=\h\%(\w\|\.\)*\%(\%(([^)]*)\)\=\s*\n\)\@="
+  \ contained display nextgroup=pythonFunction skipnl
+
+" The zero-length non-grouping match of def or class before the function
+" name is extremely important in pythonFunction.  Without it, everything
+" is interpreted as a function inside the contained environment of
+" doctests.
 syn match   pythonFunction
-      \ "\%(\%(def\s\|class\s\|@\)\s*\)\@<=\h\%(\w\|\.\)*" contained
+  \ "\%(\%(^\s*\)\%(\%(>>>\|\.\.\.\)\s\+\)\=\%(def\|class\)\s\+\)\@<=\h\w*"
+  \ contained
 
 syn match   pythonComment	"#.*$" contains=pythonTodo,@Spell
 syn keyword pythonTodo		FIXME NOTE NOTES TODO XXX contained
@@ -293,6 +309,7 @@ if version >= 508 || !exists("did_python_syn_inits")
   HiLink pythonInclude		Include
   HiLink pythonAsync		Statement
   HiLink pythonDecorator	Define
+  HiLink pythonDecoratorName	Function
   HiLink pythonFunction		Function
   HiLink pythonComment		Comment
   HiLink pythonTodo		Todo
diff --git a/runtime/syntax/r.vim b/runtime/syntax/r.vim
index d96bf96acb..30a5b23f84 100644
--- a/runtime/syntax/r.vim
+++ b/runtime/syntax/r.vim
@@ -5,7 +5,7 @@
 " 		      Tom Payne <tom@tompayne.org>
 " Contributor:        Johannes Ranke <jranke@uni-bremen.de>
 " Homepage:           https://github.com/jalvesaq/R-Vim-runtime
-" Last Change:	      Thu Mar 10, 2016  12:26PM
+" Last Change:	      Thu Aug 25, 2016  08:52PM
 " Filenames:	      *.R *.r *.Rhistory *.Rt
 "
 " NOTE: The highlighting of R functions is defined in
@@ -26,7 +26,7 @@ if exists("b:current_syntax")
   finish
 endif
 
-setlocal iskeyword=@,48-57,_,.
+syn iskeyword @,48-57,_,.
 
 if exists("g:r_syntax_folding") && g:r_syntax_folding
   setlocal foldmethod=syntax
@@ -174,8 +174,6 @@ endif
 if g:R_hi_fun
   " Nvim-R:
   runtime R/functions.vim
-  " Vim-R-plugin:
-  runtime r-plugin/functions.vim
 endif
 
 syn match rDollar display contained "\$"
diff --git a/runtime/syntax/rhelp.vim b/runtime/syntax/rhelp.vim
index 47c764e296..8cac585bb0 100644
--- a/runtime/syntax/rhelp.vim
+++ b/runtime/syntax/rhelp.vim
@@ -3,7 +3,7 @@
 " Maintainer: Jakson Aquino <jalvesaq@gmail.com>
 " Former Maintainer: Johannes Ranke <jranke@uni-bremen.de>
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change: Sat Feb 06, 2016  11:34AM
+" Last Change: Tue Jun 28, 2016  08:53AM
 " Remarks:     - Includes R syntax highlighting in the appropriate
 "                sections if an r.vim file is in the same directory or in the
 "                default debian location.
@@ -17,7 +17,6 @@ if exists("b:current_syntax")
 endif 
 
 scriptencoding utf-8
-setlocal iskeyword=@,48-57,_,.
 
 syn case match
 
diff --git a/runtime/syntax/rmd.vim b/runtime/syntax/rmd.vim
index 4cde7441d3..48fb5e079c 100644
--- a/runtime/syntax/rmd.vim
+++ b/runtime/syntax/rmd.vim
@@ -1,7 +1,7 @@
 " markdown Text with R statements
 " Language: markdown with R code chunks
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change: Sat Feb 06, 2016  06:45AM
+" Last Change: Tue Jun 28, 2016  10:09AM
 "
 " CONFIGURATION:
 "   To highlight chunk headers as R code, put in your vimrc:
@@ -72,8 +72,6 @@ if rmdIsPandoc == 0
   hi def link rmdLaTeXRegDelim Special
 endif
 
-setlocal iskeyword=@,48-57,_,.
-
 syn sync match rmdSyncChunk grouphere rmdChunk "^[ \t]*``` *{r"
 
 hi def link rmdChunkDelim Special
diff --git a/runtime/syntax/rrst.vim b/runtime/syntax/rrst.vim
index 24d3844df0..b643af3285 100644
--- a/runtime/syntax/rrst.vim
+++ b/runtime/syntax/rrst.vim
@@ -2,7 +2,7 @@
 " Language: reST with R code chunks
 " Maintainer: Alex Zvoleff, azvoleff@mail.sdsu.edu
 " Homepage: https://github.com/jalvesaq/R-Vim-runtime
-" Last Change: Sat Feb 06, 2016  06:45AM
+" Last Change: Tue Jun 28, 2016  08:53AM
 "
 " CONFIGURATION:
 "   To highlight chunk headers as R code, put in your vimrc:
@@ -19,8 +19,6 @@ unlet b:current_syntax
 " load all of the r syntax highlighting rules into @R
 syntax include @R syntax/r.vim
 
-setlocal iskeyword=@,48-57,_,.
-
 " highlight R chunks
 if exists("g:rrst_syn_hl_chunk")
   " highlight R code inside chunk header
diff --git a/runtime/syntax/scala.vim b/runtime/syntax/scala.vim
new file mode 100644
index 0000000000..b04af3be5b
--- /dev/null
+++ b/runtime/syntax/scala.vim
@@ -0,0 +1,231 @@
+" Vim syntax file
+" Language:             Scala
+" Maintainer:           Derek Wyatt
+" URL:                  https://github.com/derekwyatt/vim-scala
+" License:              Same as Vim
+" Last Change:          20 May 2016
+" ----------------------------------------------------------------------------
+
+if !exists('main_syntax')
+  if version < 600
+    syntax clear
+  elseif exists("b:current_syntax")
+    finish
+  endif
+  let main_syntax = 'scala'
+endif
+
+scriptencoding utf-8
+
+let b:current_syntax = "scala"
+
+" Allows for embedding, see #59; main_syntax convention instead? Refactor TOP
+"
+" The @Spell here is a weird hack, it means *exclude* if the first group is
+" TOP. Otherwise we get spelling errors highlighted on code elements that
+" match scalaBlock, even with `syn spell notoplevel`.
+function! s:ContainedGroup()
+  try
+    silent syn list @scala
+    return '@scala,@NoSpell'
+  catch /E392/
+    return 'TOP,@Spell'
+  endtry
+endfunction
+
+unlet! b:current_syntax
+
+syn case match
+syn sync minlines=200 maxlines=1000
+
+syn keyword scalaKeyword catch do else final finally for forSome if
+syn keyword scalaKeyword match return throw try while yield macro
+syn keyword scalaKeyword class trait object extends with nextgroup=scalaInstanceDeclaration skipwhite
+syn keyword scalaKeyword case nextgroup=scalaKeyword,scalaCaseFollowing skipwhite
+syn keyword scalaKeyword val nextgroup=scalaNameDefinition,scalaQuasiQuotes skipwhite
+syn keyword scalaKeyword def var nextgroup=scalaNameDefinition skipwhite
+hi link scalaKeyword Keyword
+
+exe 'syn region scalaBlock start=/{/ end=/}/ contains=' . s:ContainedGroup() . ' fold'
+
+syn keyword scalaAkkaSpecialWord when goto using startWith initialize onTransition stay become unbecome
+hi link scalaAkkaSpecialWord PreProc
+
+syn keyword scalatestSpecialWord shouldBe
+syn match scalatestShouldDSLA /^\s\+\zsit should/
+syn match scalatestShouldDSLB /\<should\>/
+hi link scalatestSpecialWord PreProc
+hi link scalatestShouldDSLA PreProc
+hi link scalatestShouldDSLB PreProc
+
+syn match scalaSymbol /'[_A-Za-z0-9$]\+/
+hi link scalaSymbol Number
+
+syn match scalaChar /'.'/
+syn match scalaChar /'\\[\\"'ntbrf]'/ contains=scalaEscapedChar
+syn match scalaChar /'\\u[A-Fa-f0-9]\{4}'/ contains=scalaUnicodeChar
+syn match scalaEscapedChar /\\[\\"'ntbrf]/
+syn match scalaUnicodeChar /\\u[A-Fa-f0-9]\{4}/
+hi link scalaChar Character
+hi link scalaEscapedChar Function
+hi link scalaUnicodeChar Special
+
+syn match scalaOperator "||"
+syn match scalaOperator "&&"
+hi link scalaOperator Special
+
+syn match scalaNameDefinition /\<[_A-Za-z0-9$]\+\>/ contained nextgroup=scalaPostNameDefinition,scalaVariableDeclarationList
+syn match scalaNameDefinition /`[^`]\+`/ contained nextgroup=scalaPostNameDefinition
+syn match scalaVariableDeclarationList /\s*,\s*/ contained nextgroup=scalaNameDefinition
+syn match scalaPostNameDefinition /\_s*:\_s*/ contained nextgroup=scalaTypeDeclaration
+hi link scalaNameDefinition Function
+
+syn match scalaInstanceDeclaration /\<[_\.A-Za-z0-9$]\+\>/ contained nextgroup=scalaInstanceHash
+syn match scalaInstanceDeclaration /`[^`]\+`/ contained
+syn match scalaInstanceHash /#/ contained nextgroup=scalaInstanceDeclaration
+hi link scalaInstanceDeclaration Special
+hi link scalaInstanceHash Type
+
+syn match scalaUnimplemented /???/
+hi link scalaUnimplemented ERROR
+
+syn match scalaCapitalWord /\<[A-Z][A-Za-z0-9$]*\>/
+hi link scalaCapitalWord Special
+
+" Handle type declarations specially
+syn region scalaTypeStatement matchgroup=Keyword start=/\<type\_s\+\ze/ end=/$/ contains=scalaTypeTypeDeclaration,scalaSquareBrackets,scalaTypeTypeEquals,scalaTypeStatement
+
+" Ugh... duplication of all the scalaType* stuff to handle special highlighting
+" of `type X =` declarations
+syn match scalaTypeTypeDeclaration /(/ contained nextgroup=scalaTypeTypeExtension,scalaTypeTypeEquals contains=scalaRoundBrackets skipwhite
+syn match scalaTypeTypeDeclaration /\%(⇒\|=>\)\ze/ contained nextgroup=scalaTypeTypeDeclaration contains=scalaTypeTypeExtension skipwhite
+syn match scalaTypeTypeDeclaration /\<[_\.A-Za-z0-9$]\+\>/ contained nextgroup=scalaTypeTypeExtension,scalaTypeTypeEquals skipwhite
+syn match scalaTypeTypeEquals /=\ze[^>]/ contained nextgroup=scalaTypeTypePostDeclaration skipwhite
+syn match scalaTypeTypeExtension /)\?\_s*\zs\%(⇒\|=>\|<:\|:>\|=:=\|::\|#\)/ contained nextgroup=scalaTypeTypeDeclaration skipwhite
+syn match scalaTypeTypePostDeclaration /\<[_\.A-Za-z0-9$]\+\>/ contained nextgroup=scalaTypeTypePostExtension skipwhite
+syn match scalaTypeTypePostExtension /\%(⇒\|=>\|<:\|:>\|=:=\|::\)/ contained nextgroup=scalaTypeTypePostDeclaration skipwhite
+hi link scalaTypeTypeDeclaration Type
+hi link scalaTypeTypeExtension Keyword
+hi link scalaTypeTypePostDeclaration Special
+hi link scalaTypeTypePostExtension Keyword
+
+syn match scalaTypeDeclaration /(/ contained nextgroup=scalaTypeExtension contains=scalaRoundBrackets skipwhite
+syn match scalaTypeDeclaration /\%(⇒\|=>\)\ze/ contained nextgroup=scalaTypeDeclaration contains=scalaTypeExtension skipwhite
+syn match scalaTypeDeclaration /\<[_\.A-Za-z0-9$]\+\>/ contained nextgroup=scalaTypeExtension skipwhite
+syn match scalaTypeExtension /)\?\_s*\zs\%(⇒\|=>\|<:\|:>\|=:=\|::\|#\)/ contained nextgroup=scalaTypeDeclaration skipwhite
+hi link scalaTypeDeclaration Type
+hi link scalaTypeExtension Keyword
+hi link scalaTypePostExtension Keyword
+
+syn match scalaTypeAnnotation /\%([_a-zA-Z0-9$\s]:\_s*\)\ze[_=(\.A-Za-z0-9$]\+/ skipwhite nextgroup=scalaTypeDeclaration contains=scalaRoundBrackets
+syn match scalaTypeAnnotation /)\_s*:\_s*\ze[_=(\.A-Za-z0-9$]\+/ skipwhite nextgroup=scalaTypeDeclaration
+hi link scalaTypeAnnotation Normal
+
+syn match scalaCaseFollowing /\<[_\.A-Za-z0-9$]\+\>/ contained
+syn match scalaCaseFollowing /`[^`]\+`/ contained
+hi link scalaCaseFollowing Special
+
+syn keyword scalaKeywordModifier abstract override final lazy implicit implicitly private protected sealed null require super
+hi link scalaKeywordModifier Function
+
+syn keyword scalaSpecial this true false ne eq
+syn keyword scalaSpecial new nextgroup=scalaInstanceDeclaration skipwhite
+syn match scalaSpecial "\%(=>\|⇒\|<-\|←\|->\|→\)"
+syn match scalaSpecial /`[^`]\+`/  " Backtick literals
+hi link scalaSpecial PreProc
+
+syn keyword scalaExternal package import
+hi link scalaExternal Include
+
+syn match scalaStringEmbeddedQuote /\\"/ contained
+syn region scalaString start=/"/ end=/"/ contains=scalaStringEmbeddedQuote,scalaEscapedChar,scalaUnicodeChar
+hi link scalaString String
+hi link scalaStringEmbeddedQuote String
+
+syn region scalaIString matchgroup=scalaInterpolationBrackets start=/\<[a-zA-Z][a-zA-Z0-9_]*"/ skip=/\\"/ end=/"/ contains=scalaInterpolation,scalaInterpolationB,scalaEscapedChar,scalaUnicodeChar
+syn region scalaTripleIString matchgroup=scalaInterpolationBrackets start=/\<[a-zA-Z][a-zA-Z0-9_]*"""/ end=/"""\%([^"]\|$\)/ contains=scalaInterpolation,scalaInterpolationB,scalaEscapedChar,scalaUnicodeChar
+hi link scalaIString String
+hi link scalaTripleIString String
+
+syn match scalaInterpolation /\$[a-zA-Z0-9_$]\+/ contained
+exe 'syn region scalaInterpolationB matchgroup=scalaInterpolationBoundary start=/\${/ end=/}/ contained contains=' . s:ContainedGroup()
+hi link scalaInterpolation Function
+hi link scalaInterpolationB Normal
+
+syn region scalaFString matchgroup=scalaInterpolationBrackets start=/f"/ skip=/\\"/ end=/"/ contains=scalaFInterpolation,scalaFInterpolationB,scalaEscapedChar,scalaUnicodeChar
+syn match scalaFInterpolation /\$[a-zA-Z0-9_$]\+\(%[-A-Za-z0-9\.]\+\)\?/ contained
+exe 'syn region scalaFInterpolationB matchgroup=scalaInterpolationBoundary start=/${/ end=/}\(%[-A-Za-z0-9\.]\+\)\?/ contained contains=' . s:ContainedGroup()
+hi link scalaFString String
+hi link scalaFInterpolation Function
+hi link scalaFInterpolationB Normal
+
+syn region scalaTripleString start=/"""/ end=/"""\%([^"]\|$\)/ contains=scalaEscapedChar,scalaUnicodeChar
+syn region scalaTripleFString matchgroup=scalaInterpolationBrackets start=/f"""/ end=/"""\%([^"]\|$\)/ contains=scalaFInterpolation,scalaFInterpolationB,scalaEscapedChar,scalaUnicodeChar
+hi link scalaTripleString String
+hi link scalaTripleFString String
+
+hi link scalaInterpolationBrackets Special
+hi link scalaInterpolationBoundary Function
+
+syn match scalaNumber /\<0[dDfFlL]\?\>/ " Just a bare 0
+syn match scalaNumber /\<[1-9]\d*[dDfFlL]\?\>/  " A multi-digit number - octal numbers with leading 0's are deprecated in Scala
+syn match scalaNumber /\<0[xX][0-9a-fA-F]\+[dDfFlL]\?\>/ " Hex number
+syn match scalaNumber /\%(\<\d\+\.\d*\|\.\d\+\)\%([eE][-+]\=\d\+\)\=[fFdD]\=/ " exponential notation 1
+syn match scalaNumber /\<\d\+[eE][-+]\=\d\+[fFdD]\=\>/ " exponential notation 2
+syn match scalaNumber /\<\d\+\%([eE][-+]\=\d\+\)\=[fFdD]\>/ " exponential notation 3
+hi link scalaNumber Number
+
+syn region scalaRoundBrackets start="(" end=")" skipwhite contained contains=scalaTypeDeclaration,scalaSquareBrackets,scalaRoundBrackets
+
+syn region scalaSquareBrackets matchgroup=scalaSquareBracketsBrackets start="\[" end="\]" skipwhite nextgroup=scalaTypeExtension contains=scalaTypeDeclaration,scalaSquareBrackets,scalaTypeOperator,scalaTypeAnnotationParameter
+syn match scalaTypeOperator /[-+=:<>]\+/ contained
+syn match scalaTypeAnnotationParameter /@\<[`_A-Za-z0-9$]\+\>/ contained
+hi link scalaSquareBracketsBrackets Type
+hi link scalaTypeOperator Keyword
+hi link scalaTypeAnnotationParameter Function
+
+syn match scalaShebang "\%^#!.*" display
+syn region scalaMultilineComment start="/\*" end="\*/" contains=scalaMultilineComment,scalaDocLinks,scalaParameterAnnotation,scalaCommentAnnotation,scalaTodo,scalaCommentCodeBlock,@Spell keepend fold
+syn match scalaCommentAnnotation "@[_A-Za-z0-9$]\+" contained
+syn match scalaParameterAnnotation "\%(@tparam\|@param\|@see\)" nextgroup=scalaParamAnnotationValue skipwhite contained
+syn match scalaParamAnnotationValue /[.`_A-Za-z0-9$]\+/ contained
+syn region scalaDocLinks start="\[\[" end="\]\]" contained
+syn region scalaCommentCodeBlock matchgroup=Keyword start="{{{" end="}}}" contained
+syn match scalaTodo "\vTODO|FIXME|XXX" contained
+hi link scalaShebang Comment
+hi link scalaMultilineComment Comment
+hi link scalaDocLinks Function
+hi link scalaParameterAnnotation Function
+hi link scalaParamAnnotationValue Keyword
+hi link scalaCommentAnnotation Function
+hi link scalaCommentCodeBlockBrackets String
+hi link scalaCommentCodeBlock String
+hi link scalaTodo Todo
+
+syn match scalaAnnotation /@\<[`_A-Za-z0-9$]\+\>/
+hi link scalaAnnotation PreProc
+
+syn match scalaTrailingComment "//.*$" contains=scalaTodo,@Spell
+hi link scalaTrailingComment Comment
+
+syn match scalaAkkaFSM /goto([^)]*)\_s\+\<using\>/ contains=scalaAkkaFSMGotoUsing
+syn match scalaAkkaFSM /stay\_s\+using/
+syn match scalaAkkaFSM /^\s*stay\s*$/
+syn match scalaAkkaFSM /when\ze([^)]*)/
+syn match scalaAkkaFSM /startWith\ze([^)]*)/
+syn match scalaAkkaFSM /initialize\ze()/
+syn match scalaAkkaFSM /onTransition/
+syn match scalaAkkaFSM /onTermination/
+syn match scalaAkkaFSM /whenUnhandled/
+syn match scalaAkkaFSMGotoUsing /\<using\>/
+syn match scalaAkkaFSMGotoUsing /\<goto\>/
+hi link scalaAkkaFSM PreProc
+hi link scalaAkkaFSMGotoUsing PreProc
+
+let b:current_syntax = 'scala'
+
+if main_syntax ==# 'scala'
+  unlet main_syntax
+endif
+
+" vim:set sw=2 sts=2 ts=8 et:
diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index 34b8ab79e4..2fe13fbde6 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -2,8 +2,8 @@
 " Language:		shell (sh) Korn shell (ksh) bash (sh)
 " Maintainer:		Charles E. Campbell  <NdrOchipS@PcampbellAfamily.Mbiz>
 " Previous Maintainer:	Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change:		Jul 29, 2016
-" Version:		155
+" Last Change:		Aug 23, 2016
+" Version:		161
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
 " For options and settings, please use:      :help ft-sh-syntax
 " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr)
@@ -127,11 +127,11 @@ syn cluster shErrorList	contains=shDoError,shIfError,shInError,shCaseError,shEsa
 if exists("b:is_kornshell")
  syn cluster ErrorList add=shDTestError
 endif
-syn cluster shArithParenList	contains=shArithmetic,shCaseEsac,shComment,shDeref,shDo,shDerefSimple,shEcho,shEscape,shNumber,shOperator,shPosnParm,shExSingleQuote,shExDoubleQuote,shRedir,shSingleQuote,shDoubleQuote,shStatement,shVariable,shAlias,shTest,shCtrlSeq,shSpecial,shParen,bashSpecialVariables,bashStatement,shIf,shFor
+syn cluster shArithParenList	contains=shArithmetic,shCaseEsac,shComment,shDeref,shDo,shDerefSimple,shEcho,shEscape,shNumber,shOperator,shPosnParm,shExSingleQuote,shExDoubleQuote,shHereString,shRedir,shSingleQuote,shDoubleQuote,shStatement,shVariable,shAlias,shTest,shCtrlSeq,shSpecial,shParen,bashSpecialVariables,bashStatement,shIf,shFor
 syn cluster shArithList	contains=@shArithParenList,shParenError
 syn cluster shCaseEsacList	contains=shCaseStart,shCase,shCaseBar,shCaseIn,shComment,shDeref,shDerefSimple,shCaseCommandSub,shCaseExSingleQuote,shCaseSingleQuote,shCaseDoubleQuote,shCtrlSeq,@shErrorList,shStringSpecial,shCaseRange
-syn cluster shCaseList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shHereDoc,shIf,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq
-syn cluster shCommandSubList	contains=shAlias,shArithmetic,shComment,shCmdParenRegion,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shEcho,shEscape,shExDoubleQuote,shExpr,shExSingleQuote,shHereDoc,shNumber,shOperator,shOption,shPosnParm,shSingleQuote,shSpecial,shStatement,shSubSh,shTest,shVariable
+syn cluster shCaseList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shHereDoc,shIf,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq
+syn cluster shCommandSubList	contains=shAlias,shArithmetic,shComment,shCmdParenRegion,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shEcho,shEscape,shExDoubleQuote,shExpr,shExSingleQuote,shHereDoc,shNumber,shOperator,shOption,shPosnParm,shHereString,shRedir,shSingleQuote,shSpecial,shStatement,shSubSh,shTest,shVariable
 syn cluster shCurlyList	contains=shNumber,shComma,shDeref,shDerefSimple,shDerefSpecial
 syn cluster shDblQuoteList	contains=shCommandSub,shDeref,shDerefSimple,shEscape,shPosnParm,shCtrlSeq,shSpecial
 syn cluster shDerefList	contains=shDeref,shDerefSimple,shDerefVar,shDerefSpecial,shDerefWordError,shDerefPSR,shDerefPPS
@@ -139,7 +139,7 @@ syn cluster shDerefVarList	contains=shDerefOff,shDerefOp,shDerefVarArray,shDeref
 syn cluster shEchoList	contains=shArithmetic,shCommandSub,shDeref,shDerefSimple,shEscape,shExpr,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shCtrlSeq,shEchoQuote
 syn cluster shExprList1	contains=shCharClass,shNumber,shOperator,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shExpr,shDblBrace,shDeref,shDerefSimple,shCtrlSeq
 syn cluster shExprList2	contains=@shExprList1,@shCaseList,shTest
-syn cluster shFunctionList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shHereDoc,shIf,shOption,shRedir,shSetList,shSource,shStatement,shVariable,shOperator,shCtrlSeq
+syn cluster shFunctionList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shHereDoc,shIf,shOption,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shOperator,shCtrlSeq
 if exists("b:is_kornshell") || exists("b:is_bash")
  syn cluster shFunctionList	add=shRepeat
  syn cluster shFunctionList	add=shDblBrace,shDblParen
@@ -147,11 +147,11 @@ endif
 syn cluster shHereBeginList	contains=@shCommandSubList
 syn cluster shHereList	contains=shBeginHere,shHerePayload
 syn cluster shHereListDQ	contains=shBeginHere,@shDblQuoteList,shHerePayload
-syn cluster shIdList	contains=shCommandSub,shWrapLineOperator,shSetOption,shDeref,shDerefSimple,shRedir,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shExpr,shCtrlSeq,shStringSpecial,shAtExpr
-syn cluster shIfList	contains=@shLoopList,shDblBrace,shDblParen,shFunctionKey,shFunctionOne,shFunctionTwo
+syn cluster shIdList	contains=shCommandSub,shWrapLineOperator,shSetOption,shDeref,shDerefSimple,shHereString,shRedir,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shExpr,shCtrlSeq,shStringSpecial,shAtExpr
+syn cluster shIfList	contains=@shLoopList,shDblBrace,shDblParen,shFunctionKey,shFunctionOne,shFunctionTwo,shParen
 syn cluster shLoopList	contains=@shCaseList,@shErrorList,shCaseEsac,shConditional,shDblBrace,shExpr,shFor,shForPP,shIf,shOption,shSet,shTest,shTestOpr,shTouch
 syn cluster shPPSRightList	contains=shComment,shDeref,shDerefSimple,shEscape,shPosnParm
-syn cluster shSubShList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shIf,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq,shOperator
+syn cluster shSubShList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shIf,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq,shOperator
 syn cluster shTestList	contains=shCharClass,shCommandSub,shCtrlSeq,shDeref,shDerefSimple,shDoubleQuote,shExDoubleQuote,shExpr,shExSingleQuote,shNumber,shOperator,shSingleQuote,shTest,shTestOpr
 
 " Echo: {{{1
@@ -216,8 +216,8 @@ syn match   shPattern	"\<\S\+\())\)\@="	contained contains=shExSingleQuote,shSin
 
 " Subshells: {{{1
 " ==========
-syn region shExpr  transparent matchgroup=shExprRegion  start="{" end="}"		contains=@shExprList2 nextgroup=shMoreSpecial
-syn region shSubSh transparent matchgroup=shSubShRegion start="[^(]\zs(" end=")"	contains=@shSubShList nextgroup=shMoreSpecial
+syn region shExpr  transparent matchgroup=shExprRegion  start="{" end="}"		contains=@shExprList2 nextgroup=shSpecialNxt
+syn region shSubSh transparent matchgroup=shSubShRegion start="[^(]\zs(" end=")"	contains=@shSubShList nextgroup=shSpecialNxt
 
 " Tests: {{{1
 "=======
@@ -339,8 +339,8 @@ if exists("b:is_bash")
  syn match   shSpecial	"^\(\\\\\)*\zs\\\o\o\o\|\\x\x\x\|\\c[^"]\|\\[abefnrtv]"	contained
 endif
 if exists("b:is_bash")
- syn region  shExSingleQuote	matchgroup=shQuote start=+\$'+ skip=+\\\\\|\\.+ end=+'+	contains=shStringSpecial,shSpecial
- syn region  shExDoubleQuote	matchgroup=shQuote start=+\$"+ skip=+\\\\\|\\.\|\\"+ end=+"+	contains=@shDblQuoteList,shStringSpecial,shSpecial
+ syn region  shExSingleQuote	matchgroup=shQuote start=+\$'+ skip=+\\\\\|\\.+ end=+'+	contains=shStringSpecial,shSpecial		nextgroup=shSpecialNxt
+ syn region  shExDoubleQuote	matchgroup=shQuote start=+\$"+ skip=+\\\\\|\\.\|\\"+ end=+"+	contains=@shDblQuoteList,shStringSpecial,shSpecial	nextgroup=shSpecialNxt
 elseif !exists("g:sh_no_error")
  syn region  shExSingleQuote	matchGroup=Error start=+\$'+ skip=+\\\\\|\\.+ end=+'+	contains=shStringSpecial
  syn region  shExDoubleQuote	matchGroup=Error start=+\$"+ skip=+\\\\\|\\.+ end=+"+	contains=shStringSpecial
@@ -351,7 +351,7 @@ syn match   shStringSpecial	"[^[:print:] \t]"			contained
 syn match   shStringSpecial	"[^\\]\zs\%(\\\\\)*\\[\\"'`$()#]"
 syn match   shSpecial	"[^\\]\zs\%(\\\\\)*\\[\\"'`$()#]"		nextgroup=shBkslshSnglQuote,shBkslshDblQuote
 syn match   shSpecial	"^\%(\\\\\)*\\[\\"'`$()#]"
-syn match   shMoreSpecial	"[^\\]\zs\%(\\\\\)*\\[\\"'`$()#]"		nextgroup=shMoreSpecial contained
+syn match   shSpecialNxt	contained	"\\[\\"'`$()#]"
 syn region  shBkslshSnglQuote	contained	matchgroup=shQuote start=+'+ end=+'+	contains=@Spell
 syn region  shBkslshDblQuote	contained	matchgroup=shQuote start=+"+ skip=+\\"+ end=+"+	contains=@shDblQuoteList,shStringSpecial,@Spell
 
@@ -386,7 +386,7 @@ ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc15 start="<<-\s*\\\z([^ \
 " =============
 " available for: bash; ksh (really should be ksh93 only) but not if its a posix
 if exists("b:is_bash") || (exists("b:is_kornshell") && !exists("g:is_posix"))
- syn match shRedir "<<<"	skipwhite	nextgroup=shCmdParenRegion
+ syn match shHereString "<<<"	skipwhite	nextgroup=shCmdParenRegion
 endif
 
 " Identifiers: {{{1
@@ -431,6 +431,7 @@ syn match  shDerefSimple	"\$\%(\h\w*\|\d\)"
 syn region shDeref	matchgroup=PreProc start="\${" end="}"	contains=@shDerefList,shDerefVarArray
 syn match  shDerefSimple	"\$[-#*@!?]"
 syn match  shDerefSimple	"\$\$"
+syn match  shDerefSimple	"\${\d}"
 if exists("b:is_bash") || exists("b:is_kornshell")
  syn region shDeref	matchgroup=PreProc start="\${##\=" end="}"	contains=@shDerefList
  syn region shDeref	matchgroup=PreProc start="\${\$\$" end="}"	contains=@shDerefList
@@ -455,6 +456,7 @@ endif
 syn match  shDerefSpecial	contained	"{\@<=[-*@?0]"		nextgroup=shDerefOp,shDerefOpError
 syn match  shDerefSpecial	contained	"\({[#!]\)\@<=[[:alnum:]*@_]\+"	nextgroup=@shDerefVarList,shDerefOp
 syn match  shDerefVar	contained	"{\@<=\h\w*"		nextgroup=@shDerefVarList
+syn match  shDerefVar	contained	'\d'                            nextgroup=@shDerefVarList
 if exists("b:is_kornshell")
   syn match  shDerefVar	contained	"{\@<=\h\w*[[:alnum:]_.]*"	nextgroup=@shDerefVarList
 endif
@@ -482,24 +484,24 @@ endif
 syn match  shDerefOp	contained	":\=[-=?]"	nextgroup=@shDerefPatternList
 syn match  shDerefOp	contained	":\=+"	nextgroup=@shDerefPatternList
 if exists("b:is_bash") || exists("b:is_kornshell")
- syn match  shDerefOp	contained	"#\{1,2}"	nextgroup=@shDerefPatternList
- syn match  shDerefOp	contained	"%\{1,2}"	nextgroup=@shDerefPatternList
- syn match  shDerefPattern	contained	"[^{}]\+"	contains=shDeref,shDerefSimple,shDerefPattern,shDerefString,shCommandSub,shDerefEscape nextgroup=shDerefPattern
+ syn match  shDerefOp	contained	"#\{1,2}"		nextgroup=@shDerefPatternList
+ syn match  shDerefOp	contained	"%\{1,2}"		nextgroup=@shDerefPatternList
+ syn match  shDerefPattern	contained	"[^{}]\+"		contains=shDeref,shDerefSimple,shDerefPattern,shDerefString,shCommandSub,shDerefEscape nextgroup=shDerefPattern
  syn region shDerefPattern	contained	start="{" end="}"	contains=shDeref,shDerefSimple,shDerefString,shCommandSub nextgroup=shDerefPattern
  syn match  shDerefEscape	contained	'\%(\\\\\)*\\.'
 endif
 if exists("b:is_bash")
  syn match  shDerefOp	contained	"[,^]\{1,2}"	nextgroup=@shDerefPatternList
 endif
-syn region shDerefString	contained	matchgroup=shDerefDelim start=+\%(\\\)\@<!'+ end=+'+		contains=shStringSpecial
+syn region shDerefString	contained	matchgroup=shDerefDelim start=+\%(\\\)\@<!'+ end=+'+	contains=shStringSpecial
 syn region shDerefString	contained	matchgroup=shDerefDelim start=+\%(\\\)\@<!"+ skip=+\\"+ end=+"+	contains=@shDblQuoteList,shStringSpecial
 syn match  shDerefString	contained	"\\["']"	nextgroup=shDerefPattern
 
 if exists("b:is_bash")
  " bash : ${parameter:offset}
  " bash : ${parameter:offset:length}
- syn region shDerefOff	contained	start=':'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple	nextgroup=shDerefLen,shDeref,shDerefSimple
- syn region shDerefOff	contained	start=':\s-'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple	nextgroup=shDerefLen,shDeref,shDerefSimple
+ syn region shDerefOff	contained	start=':'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple,shDerefEscape	nextgroup=shDerefLen,shDeref,shDerefSimple
+ syn region shDerefOff	contained	start=':\s-'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple,shDerefEscape	nextgroup=shDerefLen,shDeref,shDerefSimple
  syn match  shDerefLen	contained	":[^}]\+"	contains=shDeref,shDerefSimple
 
  " bash : ${parameter//pattern/string}
@@ -602,14 +604,16 @@ hi def link shEcho	shString
 hi def link shEchoDelim	shOperator
 hi def link shEchoQuote	shString
 hi def link shForPP	shLoop
+hi def link shFunction	Function
 hi def link shEmbeddedEcho	shString
 hi def link shEscape	shCommandSub
 hi def link shExDoubleQuote	shDoubleQuote
 hi def link shExSingleQuote	shSingleQuote
 hi def link shHereDoc	shString
+hi def link shHereString	shRedir
 hi def link shHerePayload	shHereDoc
 hi def link shLoop	shStatement
-hi def link shMoreSpecial	shSpecial
+hi def link shSpecialNxt	shSpecial
 hi def link shNoQuote	shDoubleQuote
 hi def link shOption	shCommandSub
 hi def link shPattern	shString
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index bb3fa1f6c9..91f70c6a1a 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -53,10 +53,10 @@ syn case ignore
 syn keyword vimGroup contained	Comment Constant String Character Number Boolean Float Identifier Function Statement Conditional Repeat Label Operator Keyword Exception PreProc Include Define Macro PreCondit Type StorageClass Structure Typedef Special SpecialChar Tag Delimiter SpecialComment Debug Underlined Ignore Error Todo 
 
 " Default highlighting groups {{{2
-syn keyword vimHLGroup contained	ColorColumn Cursor CursorColumn CursorIM CursorLine CursorLineNr DiffAdd DiffChange DiffDelete DiffText Directory ErrorMsg FoldColumn Folded IncSearch LineNr MatchParen Menu ModeMsg MoreMsg NonText Normal Pmenu PmenuSbar PmenuSel PmenuThumb Question Scrollbar Search SignColumn SpecialKey SpellBad SpellCap SpellLocal SpellRare StatusLine StatusLineNC TabLine TabLineFill TabLineSel Title Tooltip VertSplit Visual WarningMsg WildMenu
+syn keyword vimHLGroup contained	ColorColumn Cursor CursorColumn CursorIM CursorLine CursorLineNr DiffAdd DiffChange DiffDelete DiffText Directory EndOfBuffer ErrorMsg FoldColumn Folded IncSearch LineNr MatchParen Menu ModeMsg MoreMsg NonText Normal Pmenu PmenuSbar PmenuSel PmenuThumb Question Scrollbar Search SignColumn SpecialKey SpellBad SpellCap SpellLocal SpellRare StatusLine StatusLineNC TabLine TabLineFill TabLineSel Title Tooltip VertSplit Visual WarningMsg WildMenu 
 syn match vimHLGroup contained	"Conceal"
 syn keyword vimOnlyHLGroup contained	VisualNOS
-syn keyword nvimHLGroup contained	EndOfBuffer Substitute TermCursor TermCursorNC QuickFixLine
+syn keyword nvimHLGroup contained	Substitute TermCursor TermCursorNC QuickFixLine
 "}}}2
 syn case match
 " Special Vim Highlighting (not automatic) {{{1
diff --git a/src/nvim/po/fi.po b/src/nvim/po/fi.po
index d30faeb554..d817144151 100644
--- a/src/nvim/po/fi.po
+++ b/src/nvim/po/fi.po
@@ -1,247 +1,419 @@
 # Finnish translation for Vim.
 # Copyright (C) 2003-2006 Free Software Foundation, Inc.
-# 2007-2010, Flammie Pirinen <flammie@iki.fi>
+# 2007-2016, Flammie Pirinen <flammie@iki.fi>
 #
-# Vimin k�ytt�j�t on n�rttej�. Sanasto on jargonia :-p
-#
-# L�hinn� latin-1:t�, sill� vim pit�� portata ilmeisen obskuureille
-# alustoille. My�s: pluralit puuttuu, ohjelman k�ytt�liittym�n fontti
-# tasav�linen, tila rajattu, jne. jne., luovia ratkaisuja edess�.
+# Jargonia ei ole yritetty suotta kotoperäistää missä teknisempi lainasanasto
+# tulee paremmin kyseeseen.
 #
 # Sanastosta:
-# Fold on sellainen moderneissa ohjelmointi-IDE:iss� oleva toiminto, jolla
-#   lohko koodia esim. funktio piilotetaan n�kym�st�: suom. taitos alkup.
+# * Fold on sellainen moderneissa ohjelmointi-IDE:issä oleva toiminto, jolla
+#   lohko koodia esim. funktio piilotetaan näkymästä: suom. taitos alkup.
 #   analogian mukaan
-# source v. lataa tiedoston, kuten bash-komento source (tai .)
+# * source, v. lataa tiedoston, kuten bash-komento source (tai .)
+# * dictionary (dict) on vaihtelevasti sanakirja tai tietorakenne
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-26 14:21+0200\n"
-"PO-Revision-Date: 2010-08-09 02:35+0300\n"
-"Last-Translator: Flammie Pirinen <flammie@iki.fi>\n"
+"POT-Creation-Date: 2017-04-19 16:46+0200\n"
+"PO-Revision-Date: 2016-08-29 11:27+0200\n"
+"Last-Translator: Flammie A Pirinen <flammie@iki.fi>\n"
 "Language-Team: Finnish <laatu@lokalisointi.org>\n"
 "Language: fi\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../api/private/helpers.c:201
 #, fuzzy
-msgid "Unable to get option value"
-msgstr "Roskaa argumentin per�ss�"
+#~ msgid "Index out of bounds"
+#~ msgstr "ei löytynyt "
 
-#: ../api/private/helpers.c:204
-msgid "internal error: unknown option type"
-msgstr ""
+#, fuzzy
+#~ msgid "Line index is too high"
+#~ msgstr "ikkunan indeksi alueen ulkopuolella"
+
+#~ msgid "Argument \"start\" is higher than \"end\""
+#~ msgstr ""
+
+#~ msgid "All items in the replacement array must be strings"
+#~ msgstr ""
+
+msgid "string cannot contain newlines"
+msgstr "merkkijono ei saa sisältää rivinvaihtoja"
+
+#, fuzzy
+#~ msgid "Failed to save undo information"
+#~ msgstr "ei voitu tallentaa kumoustietoja"
+
+#, fuzzy
+#~ msgid "Failed to delete line"
+#~ msgstr "ei voitu poistaa riviä"
+
+#~ msgid "Index value is too high"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Failed to replace line"
+#~ msgstr "ei voitu korvata riviä"
+
+#, fuzzy
+#~ msgid "Failed to insert line"
+#~ msgstr "ei voitu lisätä riviä"
+
+#, fuzzy
+#~ msgid "Failed to rename buffer"
+#~ msgstr "ei voity uudelleennimetä puskuria"
+
+#, fuzzy
+#~ msgid "Mark name must be a single character"
+#~ msgstr "merkin nimen pitää olla yksi merkki"
+
+#, fuzzy
+#~ msgid "Invalid mark name"
+#~ msgstr "virheellinen merkin nimi"
+
+#, fuzzy
+#~ msgid "Line number outside range"
+#~ msgstr "rivinumero arvoalueen ulkopuolella"
+
+#, fuzzy
+#~ msgid "Column value outside range"
+#~ msgstr "rivinumero arvoalueen ulkopuolella"
+
+#, fuzzy
+#~ msgid "Keyboard interrupt"
+#~ msgstr "näppäimistökeskeytys"
+
+#, fuzzy
+#~ msgid "Key not found"
+#~ msgstr "ei löytynyt "
+
+#, fuzzy
+#~ msgid "Dictionary is locked"
+#~ msgstr "dictionary on lukittu"
+
+#, fuzzy
+#~ msgid "Empty variable names aren't allowed"
+#~ msgstr "tyhjiä avaimia ei voi käyttää"
+
+#, fuzzy
+#~ msgid "Key length is too high"
+#~ msgstr "Liian pitkä polku"
+
+#, c-format
+#~ msgid "Key is read-only: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Key is fixed: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Key is locked: %s"
+#~ msgstr "E741: Arvo on lukittu: %s"
+
+#. Doesn't exist, fail
+#, fuzzy, c-format
+#~ msgid "Key \"%s\" doesn't exist"
+#~ msgstr "Tiedostoa %s ei ole"
+
+#, fuzzy
+#~ msgid "Empty option name"
+#~ msgstr "E792: tyhjä valikkonimi"
+
+#, fuzzy, c-format
+#~ msgid "Invalid option name \"%s\""
+#~ msgstr "E755: Virheellinen alue kohteelle %s"
+
+#, fuzzy, c-format
+#~ msgid "Unable to get value for option \"%s\""
+#~ msgstr "ei voi tyhjentää yleistä asetusta %s"
+
+#, fuzzy, c-format
+#~ msgid "Unknown type for option \"%s\""
+#~ msgstr "E113: Tuntematon asetus: %s"
+
+#, fuzzy, c-format
+#~ msgid "Unable to unset option \"%s\""
+#~ msgstr "ei voi tyhjentää yleistä asetusta %s"
+
+#, fuzzy, c-format
+#~ msgid "Cannot unset option \"%s\" because it doesn't have a global value"
+#~ msgstr "ei voi tyhjentää asetusta %s jolla ei ole yleistä arvoa"
+
+#, c-format
+#~ msgid "Option \"%s\" requires a boolean value"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Option \"%s\" requires an integer value"
+#~ msgstr "E709: [:] toimii vain listalla"
+
+#, c-format
+#~ msgid "Value for option \"%s\" is outside range"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Option \"%s\" requires a string value"
+#~ msgstr "E709: [:] toimii vain listalla"
+
+#, fuzzy
+#~ msgid "Invalid buffer id"
+#~ msgstr "virheellinen puskurinumero"
+
+#, fuzzy
+#~ msgid "Invalid window id"
+#~ msgstr "E534: Viallinen leveä fontti"
+
+#, fuzzy
+#~ msgid "Invalid tabpage id"
+#~ msgstr "Väärä argumentti valitsimelle"
+
+#~ msgid "Integer value outside range"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Empty dictionary keys aren't allowed"
+#~ msgstr "tyhjiä avaimia ei voi käyttää"
+
+#, fuzzy
+#~ msgid "Problem while switching windows"
+#~ msgstr "virhe ikkunaa vaihtaessa"
+
+#, fuzzy
+#~ msgid "UI already attached for channel"
+#~ msgstr "Vanhimmassa muutoksessa"
+
+#~ msgid "Expected width > 0 and height > 0"
+#~ msgstr ""
+
+#~ msgid "UI is not attached for channel"
+#~ msgstr ""
+
+#~ msgid "rgb must be a Boolean"
+#~ msgstr ""
+
+#~ msgid "popupmenu_external must be a Boolean"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "No such ui option"
+#~ msgstr "E24: Lyhennettä ei ole"
+
+#~ msgid "Function called with too many arguments."
+#~ msgstr ""
+
+#~ msgid "Error calling function."
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "String length is too high"
+#~ msgstr "Liian pitkä polku"
+
+#~ msgid "Directory string is too long"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Failed to change directory"
+#~ msgstr "hakemistoa ei voitu muuttaa"
+
+#, fuzzy, c-format
+#~ msgid "Failed to switch to buffer %d"
+#~ msgstr "ei voitu vaihtaa puskuriin %d"
+
+#, fuzzy, c-format
+#~ msgid "Failed to switch to window %d"
+#~ msgstr "ei voitu vaihtaa puskuriin %d"
+
+#, fuzzy, c-format
+#~ msgid "Failed to switch to tabpage %d"
+#~ msgstr "ei voitu vaihtaa puskuriin %d"
+
+#~ msgid "All items in calls array must be arrays"
+#~ msgstr ""
+
+#~ msgid "All items in calls array must be arrays of size 2"
+#~ msgstr ""
+
+#~ msgid "name must be String"
+#~ msgstr ""
+
+#~ msgid "args must be Array"
+#~ msgstr ""
+
+# datarakenteita
+#, fuzzy
+#~ msgid "Argument \"pos\" must be a [row, col] array"
+#~ msgstr "E712: Argumentin %s pitää olla lista tai sanakirja"
+
+#, fuzzy
+#~ msgid "Cursor position outside buffer"
+#~ msgstr "kursorin sijainti puskurin ulkopuolella"
+
+#~ msgid "Height value outside range"
+#~ msgstr ""
+
+#~ msgid "Width value outside range"
+#~ msgstr ""
 
-#: ../buffer.c:92
 msgid "[Location List]"
 msgstr "[Sijaintiluettelo]"
 
-#: ../buffer.c:93
 msgid "[Quickfix List]"
 msgstr "[Pikakorjausluettelo]"
 
-#: ../buffer.c:94
-#, fuzzy
 msgid "E855: Autocommands caused command to abort"
-msgstr "E812: Autocommands muutti puskurin tai sen nimen"
+msgstr "E855: Autocommands lopetti komennon"
 
-#: ../buffer.c:135
 msgid "E82: Cannot allocate any buffer, exiting..."
-msgstr "E82: Mit��n puskuria ei voitu varata, lopetetaan..."
+msgstr "E82: Mitään puskuria ei voitu varata, lopetetaan..."
 
-#: ../buffer.c:138
 msgid "E83: Cannot allocate buffer, using other one..."
-msgstr "E83: Puskuria ei voitu varata, k�ytet��n toista..."
+msgstr "E83: Puskuria ei voitu varata, käytetään toista..."
+
+#, fuzzy
+#~ msgid "E937: Attempt to delete a buffer that is in use"
+#~ msgstr "E934: Ei voida hypätä puskuriin jolla ei ole nimeä"
 
-#: ../buffer.c:763
 msgid "E515: No buffers were unloaded"
 msgstr "E515: Puskureita ei vapautettu"
 
-#: ../buffer.c:765
 msgid "E516: No buffers were deleted"
 msgstr "E516: Puskureita ei poistettu"
 
-#: ../buffer.c:767
 msgid "E517: No buffers were wiped out"
 msgstr "E517: Puskureita ei pyyhitty"
 
-#: ../buffer.c:772
 msgid "1 buffer unloaded"
 msgstr "1 puskuri vapautettiin"
 
-#: ../buffer.c:774
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "%d puskuria vapautettiin"
 
-#: ../buffer.c:777
 msgid "1 buffer deleted"
 msgstr "1 puskuri poistettu"
 
-#: ../buffer.c:779
 #, c-format
 msgid "%d buffers deleted"
 msgstr "%d puskuria poistettu"
 
-#: ../buffer.c:782
 msgid "1 buffer wiped out"
 msgstr "1 puskuri pyyhitty"
 
-#: ../buffer.c:784
 #, c-format
 msgid "%d buffers wiped out"
 msgstr "%d puskuria pyyhitty"
 
-#: ../buffer.c:806
 msgid "E90: Cannot unload last buffer"
-msgstr "E90: Ei voi vapauttaa viimeist� puskuria"
+msgstr "E90: Ei voi vapauttaa viimeistä puskuria"
 
-#: ../buffer.c:874
 msgid "E84: No modified buffer found"
 msgstr "E84: Ei muokattuja puskureita"
 
 #. back where we started, didn't find anything.
-#: ../buffer.c:903
 msgid "E85: There is no listed buffer"
 msgstr "E85: Luetteloitua puskuria ei ole"
 
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: Puskuria %<PRId64> ei ole"
-
-#: ../buffer.c:915
 msgid "E87: Cannot go beyond last buffer"
-msgstr "E87: Viimeisen puskurin ohi ei voi edet�"
+msgstr "E87: Viimeisen puskurin ohi ei voi edetä"
 
-#: ../buffer.c:917
 msgid "E88: Cannot go before first buffer"
-msgstr "E88: Ensimm�isen puskurin ohi ei voi edet�"
+msgstr "E88: Ensimmäisen puskurin ohi ei voi edetä"
 
-#: ../buffer.c:945
-#, c-format
+#, fuzzy, c-format
+#~ msgid "E89: %s will be killed(add ! to override)"
+#~ msgstr "E189: %s on jo olemassa (lisää komentoon ! ohittaaksesi)"
+
+#, fuzzy, c-format
 msgid ""
 "E89: No write since last change for buffer %<PRId64> (add ! to override)"
 msgstr ""
-"E89: Puskurin %<PRId64> muutoksia ei ole tallennettu (lis�� komentoon ! "
+"E89: Puskurin %ld muutoksia ei ole tallennettu (lisää komentoon ! "
 "ohittaaksesi)"
 
 #. wrap around (may cause duplicates)
-#: ../buffer.c:1423
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Varoitus: Tiedostonimiluettelon ylivuoto"
 
-#: ../buffer.c:1555 ../quickfix.c:3361
-#, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: Puskuria %<PRId64> ei l�ydy"
+#, fuzzy, c-format
+#~ msgid "E92: Buffer %<PRId64> not found"
+#~ msgstr "E92: Puskuria %ld ei löydy"
 
-#: ../buffer.c:1798
 #, c-format
 msgid "E93: More than one match for %s"
-msgstr "E93: %s t�sm�� useampaan kuin yhteen puskuriin"
+msgstr "E93: %s täsmää useampaan kuin yhteen puskuriin"
 
-#: ../buffer.c:1800
 #, c-format
 msgid "E94: No matching buffer for %s"
-msgstr "E94: %s ei t�sm�� yhteenk��n puskuriin"
+msgstr "E94: %s ei täsmää yhteenkään puskuriin"
 
-#: ../buffer.c:2161
-#, c-format
-msgid "line %<PRId64>"
-msgstr "rivi %<PRId64>"
+#, fuzzy, c-format
+#~ msgid "line %<PRId64>"
+#~ msgstr "rivi %ld"
 
-#: ../buffer.c:2233
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Samanniminen puskuri on jo olemassa"
 
-#: ../buffer.c:2498
 msgid " [Modified]"
 msgstr " [Muokattu]"
 
-#: ../buffer.c:2501
 msgid "[Not edited]"
 msgstr "[Muokkaamaton]"
 
-#: ../buffer.c:2504
 msgid "[New file]"
 msgstr "[Uusi tiedosto]"
 
-#: ../buffer.c:2505
 msgid "[Read errors]"
-msgstr "[Lukuvirheit�]"
+msgstr "[Lukuvirheitä]"
 
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
 msgid "[RO]"
 msgstr "[Luku]"
 
-#: ../buffer.c:2507 ../fileio.c:1807
 msgid "[readonly]"
 msgstr "[kirjoitussuojattu]"
 
-#: ../buffer.c:2524
 #, c-format
 msgid "1 line --%d%%--"
 msgstr "1 rivi --%d %%--"
 
-#: ../buffer.c:2526
-#, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> rivi� --%d %%--"
+#, fuzzy, c-format
+#~ msgid "%<PRId64> lines --%d%%--"
+#~ msgstr "%ld riviä --%d %%--"
 
-#: ../buffer.c:2530
-#, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "rivi %<PRId64>/%<PRId64> --%d %%-- sarake "
+#, fuzzy, c-format
+#~ msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
+#~ msgstr "rivi %ld/%ld --%d %%-- sarake "
 
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
 msgid "[No Name]"
-msgstr "[Nimet�n]"
+msgstr "[Nimetön]"
 
 #. must be a help buffer
-#: ../buffer.c:2667
 msgid "help"
 msgstr "ohje"
 
-#: ../buffer.c:3225 ../screen.c:4883
 msgid "[Help]"
 msgstr "[Ohje]"
 
-#: ../buffer.c:3254 ../screen.c:4887
 msgid "[Preview]"
 msgstr "[Esikatselu]"
 
 # sijainti tiedostossa -indikaattoreja:
-# 4 merkki� sais riitt��
-#: ../buffer.c:3528
+# 4 merkkiä sais riittää
 msgid "All"
 msgstr "Kaik"
 
-#: ../buffer.c:3528
 msgid "Bot"
 msgstr "Loppu"
 
-#: ../buffer.c:3531
 msgid "Top"
 msgstr "Alku"
 
-#: ../buffer.c:4244
-msgid ""
-"\n"
-"# Buffer list:\n"
-msgstr ""
-"\n"
-"# Puskuriluettelo:\n"
-
-#: ../buffer.c:4289
 msgid "[Scratch]"
 msgstr "[Raapust]"
 
-#: ../buffer.c:4529
 msgid ""
 "\n"
 "--- Signs ---"
@@ -249,795 +421,669 @@ msgstr ""
 "\n"
 "--- Merkit ---"
 
-#: ../buffer.c:4538
 #, c-format
 msgid "Signs for %s:"
 msgstr "Merkit kohteelle %s:"
 
-#: ../buffer.c:4543
-#, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    rivi=%<PRId64>  id=%d  nimi=%s"
+#, fuzzy, c-format
+#~ msgid "    line=%<PRId64>  id=%d  name=%s"
+#~ msgstr "    rivi=%ld  id=%d  nimi=%s"
 
-#: ../cursor_shape.c:68
 msgid "E545: Missing colon"
 msgstr "E545: Kaksoispiste puuttuu"
 
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
 msgid "E546: Illegal mode"
 msgstr "E546: Virheellinen tila"
 
-#: ../cursor_shape.c:134
 msgid "E548: digit expected"
-msgstr "E548: pit�� olla numero"
+msgstr "E548: pitää olla numero"
 
-#: ../cursor_shape.c:138
 msgid "E549: Illegal percentage"
 msgstr "E549: Virheellinen prosenttiluku"
 
-#: ../diff.c:146
-#, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: Ei voi diffata enemp�� kuin %<PRId64> puskuria"
+#, fuzzy, c-format
+#~ msgid "E96: Cannot diff more than %<PRId64> buffers"
+#~ msgstr "E96: Ei voi diffata enempää kuin %ld puskuria"
 
-#: ../diff.c:753
 msgid "E810: Cannot read or write temp files"
-msgstr "E810: Ei voi lukea tai kirjoittaa v�liaikaistiedostoja"
+msgstr "E810: Ei voi lukea tai kirjoittaa väliaikaistiedostoja"
 
-#: ../diff.c:755
 msgid "E97: Cannot create diffs"
-msgstr "E97: Ei voi luoda diffej�"
+msgstr "E97: Ei voi luoda diffejä"
 
-#: ../diff.c:966
 msgid "E816: Cannot read patch output"
 msgstr "E816: Ei voi lukea patchin tulostetta"
 
-#: ../diff.c:1220
 msgid "E98: Cannot read diff output"
 msgstr "E98: Ei voi lukea diffin tulostetta"
 
-#: ../diff.c:2081
 msgid "E99: Current buffer is not in diff mode"
-msgstr "E99: T�m� puskuri ei ole diff-tilassa"
+msgstr "E99: Tämä puskuri ei ole diff-tilassa"
 
-#: ../diff.c:2100
 msgid "E793: No other buffer in diff mode is modifiable"
-msgstr "E793: Yksik��n muu diff-tilan puskurit ei ole muokattavissa"
+msgstr "E793: Yksikään muu diff-tilan puskurit ei ole muokattavissa"
 
-#: ../diff.c:2102
 msgid "E100: No other buffer in diff mode"
-msgstr "E100: Yksik��n muu puskuri ei ole diff-tilassa"
+msgstr "E100: Yksikään muu puskuri ei ole diff-tilassa"
 
-#: ../diff.c:2112
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
-msgstr "E101: Monta puskuria on diff-tilassa, k�ytett�v�n valinta ei onnistu"
+msgstr "E101: Monta puskuria on diff-tilassa, käytettävän valinta ei onnistu"
 
-#: ../diff.c:2141
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
-msgstr "E102: Puskuria %s ei l�ydy"
+msgstr "E102: Puskuria %s ei löydy"
 
-#: ../diff.c:2152
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: Puskuri %s ei ole diff-tilassa"
 
-#: ../diff.c:2193
 msgid "E787: Buffer changed unexpectedly"
 msgstr "E787: Puskuri vaihtui odottamatta"
 
-#: ../digraph.c:1598
 msgid "E104: Escape not allowed in digraph"
-msgstr "E104: Escapea ei voi k�ytt�� digraafissa"
+msgstr "E104: Escapea ei voi käyttää digraafissa"
 
-#: ../digraph.c:1760
 msgid "E544: Keymap file not found"
-msgstr "E544: N�pp�inkarttaa ei l�ydy"
+msgstr "E544: Näppäinkarttaa ei löydy"
 
-#: ../digraph.c:1785
 msgid "E105: Using :loadkeymap not in a sourced file"
-msgstr "E105: K�ytet��n :loadkeymapia ladatun tiedoston ulkopuolella"
+msgstr "E105: Käytetään :loadkeymapia ladatun tiedoston ulkopuolella"
 
-#: ../digraph.c:1821
 msgid "E791: Empty keymap entry"
-msgstr "E791: Tyhj� keymap-kentt�"
+msgstr "E791: Tyhjä keymap-kenttä"
 
-#: ../edit.c:82
 msgid " Keyword completion (^N^P)"
-msgstr " Avainsanat�ydennys (^N^P)"
+msgstr " Avainsanatäydennys (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
 msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 msgstr " ^X-tila (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
-#: ../edit.c:85
 msgid " Whole line completion (^L^N^P)"
-msgstr " T�ysrivit�ydennys (^L^N^P)"
+msgstr " Täysrivitäydennys (^L^N^P)"
 
-#: ../edit.c:86
 msgid " File name completion (^F^N^P)"
-msgstr " Tiedostonimit�ydennys (^F^N^P)"
+msgstr " Tiedostonimitäydennys (^F^N^P)"
 
-#: ../edit.c:87
 msgid " Tag completion (^]^N^P)"
-msgstr " T�git�ydennys (^]^N^P)"
+msgstr " Tägitäydennys (^]^N^P)"
 
-#: ../edit.c:88
 msgid " Path pattern completion (^N^P)"
-msgstr " Polkukuviot�ydennys (^N^P)"
+msgstr " Polkukuviotäydennys (^N^P)"
 
-#: ../edit.c:89
 msgid " Definition completion (^D^N^P)"
-msgstr " M��ritelm�t�ydennys (^D^N^P)"
+msgstr " Määritelmätäydennys (^D^N^P)"
 
-#: ../edit.c:91
 msgid " Dictionary completion (^K^N^P)"
-msgstr " Sanakirjat�ydennys (^K^N^P)"
+msgstr " Sanakirjatäydennys (^K^N^P)"
 
-#: ../edit.c:92
 msgid " Thesaurus completion (^T^N^P)"
-msgstr " Thesaurus-t�ydennys (^T^N^P)"
+msgstr " Thesaurus-täydennys (^T^N^P)"
 
-#: ../edit.c:93
 msgid " Command-line completion (^V^N^P)"
-msgstr " Komentorivit�ydennys (^V^N^P)"
+msgstr " Komentorivitäydennys (^V^N^P)"
 
-#: ../edit.c:94
 msgid " User defined completion (^U^N^P)"
-msgstr " K�ytt�j�n m��rittelem� t�ydennys (^U^N^P)"
+msgstr " Käyttäjän määrittelemä täydennys (^U^N^P)"
 
-#: ../edit.c:95
 msgid " Omni completion (^O^N^P)"
-msgstr " Omnit�ydennys (^O^N^P)"
+msgstr " Omnitäydennys (^O^N^P)"
 
-#: ../edit.c:96
 msgid " Spelling suggestion (s^N^P)"
 msgstr " Oikaisulukuehdotus (s^N^P)"
 
-#: ../edit.c:97
 msgid " Keyword Local completion (^N^P)"
-msgstr " Avainsanan paikallinen t�ydennys (^N^P)"
+msgstr " Avainsanan paikallinen täydennys (^N^P)"
 
-#: ../edit.c:100
 msgid "Hit end of paragraph"
 msgstr "Kappaleen loppu tuli vastaan"
 
-#: ../edit.c:101
-#, fuzzy
 msgid "E839: Completion function changed window"
-msgstr "E813: Ei voi sulkea autocmd-ikkunaa"
+msgstr "E839: Täydennys vaihtoi ikkunaa"
 
-#: ../edit.c:102
 msgid "E840: Completion function deleted text"
-msgstr ""
+msgstr "E840: Täydennys poisti tekstiä"
 
-#: ../edit.c:1847
 msgid "'dictionary' option is empty"
-msgstr "dictionary-asetus on tyhj�"
+msgstr "dictionary-asetus on tyhjä"
 
-#: ../edit.c:1848
 msgid "'thesaurus' option is empty"
-msgstr "thesaurus-asetus on tyhj�"
+msgstr "thesaurus-asetus on tyhjä"
 
-#: ../edit.c:2655
 #, c-format
 msgid "Scanning dictionary: %s"
 msgstr "Luetaan sanakirjaa: %s"
 
-#: ../edit.c:3079
 msgid " (insert) Scroll (^E/^Y)"
-msgstr " (sy�tt�) Vieritys (^E/^Y)"
+msgstr " (syöttö) Vieritys (^E/^Y)"
 
-#: ../edit.c:3081
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (korvaus) Vieritys (^E/^Y)"
 
-#: ../edit.c:3587
 #, c-format
 msgid "Scanning: %s"
 msgstr "Luetaan: %s"
 
-#: ../edit.c:3614
 msgid "Scanning tags."
-msgstr "Luetaan t�gej�."
+msgstr "Luetaan tägejä."
 
-#: ../edit.c:4519
 msgid " Adding"
-msgstr " Lis�t��n"
+msgstr " Lisätään"
 
 #. showmode might reset the internal line pointers, so it must
 #. * be called before line = ml_get(), or when this address is no
 #. * longer needed.  -- Acevedo.
 #.
-#: ../edit.c:4562
 msgid "-- Searching..."
 msgstr "-- Haetaan..."
 
-#: ../edit.c:4618
 msgid "Back at original"
-msgstr "Takaisin l�ht�pisteess�"
+msgstr "Takaisin lähtöpisteessä"
 
-#: ../edit.c:4621
 msgid "Word from other line"
-msgstr "Sana toisella rivill�"
+msgstr "Sana toisella rivillä"
 
-#: ../edit.c:4624
 msgid "The only match"
-msgstr "Ainoa t�sm�ys"
+msgstr "Ainoa täsmäys"
 
-#: ../edit.c:4680
 #, c-format
 msgid "match %d of %d"
-msgstr "t�sm�ys %d/%d"
+msgstr "täsmäys %d/%d"
 
-#: ../edit.c:4684
 #, c-format
 msgid "match %d"
-msgstr "t�sm�ys %d"
+msgstr "täsmäys %d"
 
-#: ../eval.c:137
 msgid "E18: Unexpected characters in :let"
-msgstr "E18: Odottamattomia merkkej� komennossa :let"
+msgstr "E18: Odottamattomia merkkejä komennossa :let"
 
-#: ../eval.c:138
-#, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: Indeksi %<PRId64> luettelon rajojen ulkopuolella"
-
-#: ../eval.c:139
-#, c-format
-msgid "E121: Undefined variable: %s"
-msgstr "E121: M��rittelem�t�n muuttuja: %s"
-
-#: ../eval.c:140
 msgid "E111: Missing ']'"
 msgstr "E111: ] puuttuu"
 
-#: ../eval.c:141
 #, c-format
 msgid "E686: Argument of %s must be a List"
-msgstr "E686: Argumentin %s pit�� olla lista"
+msgstr "E686: Argumentin %s pitää olla lista"
 
 # datarakenteita
-#: ../eval.c:143
 #, c-format
 msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: Argumentin %s pit�� olla lista tai sanakirja"
+msgstr "E712: Argumentin %s pitää olla lista tai sanakirja"
 
-#: ../eval.c:144
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: Sanakirjassa ei voi olla tyhji� avaimia"
-
-#: ../eval.c:145
 msgid "E714: List required"
 msgstr "E714: Lista tarvitaan"
 
-#: ../eval.c:146
 msgid "E715: Dictionary required"
 msgstr "E715: Sanakirja tarvitaan"
 
-#: ../eval.c:147
+msgid "E928: String required"
+msgstr "E928: Merkkijono puuttuu"
+
 #, c-format
 msgid "E118: Too many arguments for function: %s"
 msgstr "E118: Liikaa argumentteja funktiolle: %s"
 
-#: ../eval.c:148
 #, c-format
 msgid "E716: Key not present in Dictionary: %s"
 msgstr "E716: Avainta %s ei ole sanakirjassa"
 
-#: ../eval.c:150
 #, c-format
 msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: Funktio %s on jo olemassa, lis�� ! korvataksesi"
+msgstr "E122: Funktio %s on jo olemassa, lisää ! korvataksesi"
 
-#: ../eval.c:151
 msgid "E717: Dictionary entry already exists"
 msgstr "E717: Sanakirja-alkio on jo olemassa"
 
-#: ../eval.c:152
 msgid "E718: Funcref required"
 msgstr "E718: Funcref tarvitaan"
 
-#: ../eval.c:153
 msgid "E719: Cannot use [:] with a Dictionary"
-msgstr "E719: Sanakirjassa ei voi k�ytt�� merkint�� [:]"
+msgstr "E719: Sanakirjassa ei voi käyttää merkintää [:]"
 
-#: ../eval.c:154
-#, c-format
-msgid "E734: Wrong variable type for %s="
-msgstr "E734: V��r� muuttujatyyppi muuttujalle %s="
-
-#: ../eval.c:155
 #, c-format
 msgid "E130: Unknown function: %s"
 msgstr "E130: Tuntematon funktio: %s"
 
-#: ../eval.c:156
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: Virheellinen muuttujanimi: %s"
 
-#: ../eval.c:157
-msgid "E806: using Float as a String"
-msgstr "E806: Float ei k�y merkkijonosta"
+#, fuzzy, c-format
+#~ msgid "E46: Cannot change read-only variable \"%.*s\""
+#~ msgstr "E46: Kirjoitussuojattua muuttujaa %s ei voi muuttaa"
+
+#. TODO(ZyX-I): move to eval/executor
+#, c-format
+msgid "E734: Wrong variable type for %s="
+msgstr "E734: Väärä muuttujatyyppi muuttujalle %s="
 
-#: ../eval.c:1830
 msgid "E687: Less targets than List items"
-msgstr "E687: Kohteita on v�hemm�n kuin listan alkioita"
+msgstr "E687: Kohteita on vähemmän kuin listan alkioita"
 
-#: ../eval.c:1834
 msgid "E688: More targets than List items"
-msgstr "E688: Kohteita on enemm�n kuin listan alkioita"
+msgstr "E688: Kohteita on enemmän kuin listan alkioita"
 
-#: ../eval.c:1906
 msgid "Double ; in list of variables"
-msgstr "Kaksi ;:tt� listan muuttujissa"
+msgstr "Kaksi ;:ttä listan muuttujissa"
 
-#: ../eval.c:2078
 #, c-format
 msgid "E738: Can't list variables for %s"
 msgstr "E738: Kohteen %s muuttujia ei voi listata"
 
-#: ../eval.c:2391
+#, fuzzy, c-format
+#~ msgid "E121: Undefined variable: %.*s"
+#~ msgstr "E121: Määrittelemätön muuttuja: %s"
+
 msgid "E689: Can only index a List or Dictionary"
-msgstr "E689: Vain listalla ja sanakirjalla voi olla indeksej�"
+msgstr "E689: Vain listalla ja sanakirjalla voi olla indeksejä"
 
-#: ../eval.c:2396
 msgid "E708: [:] must come last"
-msgstr "E708: [:]:n pit�� olla viimeisen�"
+msgstr "E708: [:]:n pitää olla viimeisenä"
+
+#, fuzzy
+#~ msgid "E713: Cannot use empty key after ."
+#~ msgstr "E713: Sanakirjassa ei voi olla tyhjiä avaimia"
 
-#: ../eval.c:2439
 msgid "E709: [:] requires a List value"
 msgstr "E709: [:] toimii vain listalla"
 
-#: ../eval.c:2674
 msgid "E710: List value has more items than target"
-msgstr "E710: Listalla on enemm�n alkioita kuin kohteella"
+msgstr "E710: Listalla on enemmän alkioita kuin kohteella"
 
-#: ../eval.c:2678
 msgid "E711: List value has not enough items"
 msgstr "E711: Listalla ei ole tarpeeksi alkioita"
 
-#: ../eval.c:2867
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: :for-kommenolta puuttuu in"
 
-#: ../eval.c:3063
 #, c-format
 msgid "E107: Missing parentheses: %s"
 msgstr "E107: Sulkeita puuttuu: %s"
 
-#: ../eval.c:3263
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: Muuttujaa %s ei ole"
 
-#: ../eval.c:3333
-msgid "E743: variable nested too deep for (un)lock"
-msgstr "E743: muuttujassa liian monta tasoa lukituksen k�sittelyyn"
+#. For historical reasons this error is not given for Lists and
+#. Dictionaries. E.g. b: dictionary may be locked/unlocked.
+#, fuzzy, c-format
+#~ msgid "E940: Cannot lock or unlock variable %s"
+#~ msgstr "E46: Kirjoitussuojattua muuttujaa %s ei voi muuttaa"
 
-#: ../eval.c:3630
 msgid "E109: Missing ':' after '?'"
-msgstr "E109: ?:n j�lkeen puuttuu :"
+msgstr "E109: ?:n jälkeen puuttuu :"
 
-#: ../eval.c:3893
 msgid "E691: Can only compare List with List"
 msgstr "E691: Listaa voi verrata vain listaan"
 
-#: ../eval.c:3895
-msgid "E692: Invalid operation for Lists"
+msgid "E692: Invalid operation for List"
 msgstr "E692: Virheellinen toiminto listalle"
 
-#: ../eval.c:3915
 msgid "E735: Can only compare Dictionary with Dictionary"
 msgstr "E735: Sanakirjaa voi verrata vain sanakirjaan"
 
-#: ../eval.c:3917
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: Virheellinen toiminto sanakirjalle"
 
-#: ../eval.c:3932
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: Funcrefi� voi verrata vain funcrefiin"
-
-#: ../eval.c:3934
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: Virheellinen toiminto funcrefille"
 
-#: ../eval.c:4277
 msgid "E804: Cannot use '%' with Float"
-msgstr "E804: Ei voi k�ytt�� '%':a Floatin kanssa"
+msgstr "E804: Ei voi käyttää '%':a Floatin kanssa"
 
-#: ../eval.c:4478
 msgid "E110: Missing ')'"
 msgstr "E110: ) puuttuu"
 
-#: ../eval.c:4609
 msgid "E695: Cannot index a Funcref"
-msgstr "E695: Funcrefi� ei voi indeksoida"
+msgstr "E695: Funcrefiä ei voi indeksoida"
+
+msgid "E909: Cannot index a special variable"
+msgstr "E909: erikoismuuttujaa ei voi indeksoida"
 
-#: ../eval.c:4839
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: Asetuksen nimi puuttuu: %s"
 
-#: ../eval.c:4855
 #, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: Tuntematon asetus: %s"
 
-#: ../eval.c:4904
 #, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: Puuttuva lainausmerkki: %s"
 
-#: ../eval.c:5020
 #, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: Puuttuva lainausmerkki: %s"
 
-#: ../eval.c:5084
 #, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Listasta puuttuu pilkku: %s"
 
-#: ../eval.c:5091
 #, c-format
 msgid "E697: Missing end of List ']': %s"
 msgstr "E697: Listan lopusta puuttuu ]: %s"
 
-#: ../eval.c:6475
+msgid "Not enough memory to set references, garbage collection aborted!"
+msgstr ""
+"Ei tarpeeksi muistia viitteiden asettamista varten, roskiekeruu peruttiin."
+
 #, c-format
 msgid "E720: Missing colon in Dictionary: %s"
 msgstr "E720: Sanakirjasta puuttuu kaksoispiste: %s"
 
-#: ../eval.c:6499
 #, c-format
 msgid "E721: Duplicate key in Dictionary: \"%s\""
 msgstr "E721: Kaksi samaa avainta sanakirjassa: %s"
 
-#: ../eval.c:6517
 #, c-format
 msgid "E722: Missing comma in Dictionary: %s"
 msgstr "E722: Sanakirjasta puuttuu pilkku: %s"
 
-#: ../eval.c:6524
 #, c-format
 msgid "E723: Missing end of Dictionary '}': %s"
 msgstr "E723: Sanakirjan lopusta puuttuu }: %s"
 
-#: ../eval.c:6555
-msgid "E724: variable nested too deep for displaying"
-msgstr "E724: muuttuja on upotettu liian syv�lle n�ytett�v�ksi"
-
-#: ../eval.c:7188
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: Liikaa argumentteja funktiolle %s"
-
-#: ../eval.c:7190
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: V��ri� argumentteja funktiolle %s"
-
-#: ../eval.c:7377
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: Tuntematon funktio: %s"
-
-#: ../eval.c:7383
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: Liikaa argumentteja funktiolle %s"
-
-#: ../eval.c:7387
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: <SID> skriptin ulkopuolella: %s"
-
-#: ../eval.c:7391
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: dict-funktio ilman sanakirjaa: %s"
-
-#: ../eval.c:7453
-msgid "E808: Number or Float required"
-msgstr "E808: Number tai Float vaaditaan"
-
-#: ../eval.c:7503
-#, fuzzy
-msgid "add() argument"
-msgstr "-c-argumentti"
-
-#: ../eval.c:7907
-msgid "E699: Too many arguments"
-msgstr "E699: Liikaa argumentteja"
-
-#: ../eval.c:8073
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete() toimii vain sy�tt�tilassa"
-
-#: ../eval.c:8156
-msgid "&Ok"
-msgstr "&Ok"
-
-#: ../eval.c:8676
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: Avain on jo olemassa: %s"
-
-#: ../eval.c:8692
-#, fuzzy
-msgid "extend() argument"
-msgstr "--cmd-argumentti"
-
-#: ../eval.c:8915
-#, fuzzy
-msgid "map() argument"
-msgstr "-c-argumentti"
-
-#: ../eval.c:8916
-#, fuzzy
-msgid "filter() argument"
-msgstr "-c-argumentti"
-
-#: ../eval.c:9229
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld rivi�: "
-
-#: ../eval.c:9291
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700: Tuntematon funktio: %s"
-
-#: ../eval.c:10729
-msgid "called inputrestore() more often than inputsave()"
-msgstr "inputrestore() suoritettu useammin kuin inputsave()"
-
-#: ../eval.c:10771
-#, fuzzy
-msgid "insert() argument"
-msgstr "-c-argumentti"
-
-#: ../eval.c:10841
-msgid "E786: Range not allowed"
-msgstr "E786: Aluetta ei voi k�ytt��"
-
-#: ../eval.c:11140
-msgid "E701: Invalid type for len()"
-msgstr "E701: Virheellinen tyyppi funktiolle len()"
-
-#: ../eval.c:11980
-msgid "E726: Stride is zero"
-msgstr "E726: Stride on nolla"
-
-#: ../eval.c:11982
-msgid "E727: Start past end"
-msgstr "E727: Alku on lopun j�lkeen"
-
-#: ../eval.c:12024 ../eval.c:15297
-msgid "<empty>"
-msgstr "<tyhj�>"
-
-#: ../eval.c:12282
-#, fuzzy
-msgid "remove() argument"
-msgstr "--cmd-argumentti"
-
-#: ../eval.c:12466
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: Liikaa symbolisia linkkej� (mahdollinen sykli)"
-
-#: ../eval.c:12593
-#, fuzzy
-msgid "reverse() argument"
-msgstr "-c-argumentti"
-
-#: ../eval.c:13721
-#, fuzzy
-msgid "sort() argument"
-msgstr "-c-argumentti"
-
-#: ../eval.c:13721
-#, fuzzy
-msgid "uniq() argument"
-msgstr "-c-argumentti"
-
-#: ../eval.c:13776
-msgid "E702: Sort compare function failed"
-msgstr "E702: Lajittelun vertausfunktio ei onnistunut"
-
-#: ../eval.c:13806
-#, fuzzy
-msgid "E882: Uniq compare function failed"
-msgstr "E702: Lajittelun vertausfunktio ei onnistunut"
-
-#: ../eval.c:14085
-msgid "(Invalid)"
-msgstr "(Virheellinen)"
-
-#: ../eval.c:14590
-msgid "E677: Error writing temp file"
-msgstr "E677: V�liaikaistiedostoon kirjoittaminen ei onnistunut"
-
-#: ../eval.c:16159
-msgid "E805: Using a Float as a Number"
-msgstr "E805: Float ei k�y Numberista"
-
-#: ../eval.c:16162
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: Funcref ei k�y Numberista"
-
-#: ../eval.c:16170
-msgid "E745: Using a List as a Number"
-msgstr "E745: Lista ei k�y Numberista"
-
-#: ../eval.c:16173
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: Sanakirja ei k�y Numberista"
-
-#: ../eval.c:16259
-msgid "E729: using Funcref as a String"
-msgstr "E729: Funcref ei k�y merkkijonosta"
-
-#: ../eval.c:16262
-msgid "E730: using List as a String"
-msgstr "E730: Lista ei k�y merkkijonosta"
-
-#: ../eval.c:16265
-msgid "E731: using Dictionary as a String"
-msgstr "E731: Sanakirja ei k�y merkkijonosta"
-
-#: ../eval.c:16619
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: Muuttujatyyppi ei t�sm��: %s"
-
-#: ../eval.c:16705
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: Muuttujaa %s ei voi poistaa"
-
-#: ../eval.c:16724
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: Funcrefin muuttujanimen pit�� alkaa suuraakkosella: %s"
-
-#: ../eval.c:16732
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: Muuttujanimi on sama kuin olemassaolevan funktion: %s"
-
-#: ../eval.c:16763
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: Arvo on lukittu: %s"
-
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
-msgid "Unknown"
-msgstr "Tuntematon"
-
-#: ../eval.c:16768
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: Ei voi muuttaa muuttujan %s arvoa"
-
-#: ../eval.c:16838
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: muuttuja on upotettu liian syv�lle kopioitavaksi"
-
-#: ../eval.c:17249
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: Tuntematon funktio: %s"
-
-#: ../eval.c:17260
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: ( puuttuu: %s"
-
-#: ../eval.c:17293
-#, fuzzy
-msgid "E862: Cannot use g: here"
-msgstr "E284: Ei voi asettaa IC-arvoja"
-
-#: ../eval.c:17312
 #, c-format
 msgid "E125: Illegal argument: %s"
 msgstr "E125: Virheellinen argumentti: %s"
 
-#: ../eval.c:17323
-#, fuzzy, c-format
+#, c-format
 msgid "E853: Duplicate argument name: %s"
-msgstr "Kaksoiskappale kent�n nimest�: %s"
+msgstr "E853: Kaksoiskappale argumentin nimestä: %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: Liikaa argumentteja funktiolle %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: Vääriä argumentteja funktiolle %s"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: Tuntematon funktio: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: Funktion nimi poistettu: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: Liikaa argumentteja funktiolle %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: <SID> skriptin ulkopuolella: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: dict-funktio ilman sanakirjaa: %s"
+
+#, fuzzy, c-format
+#~ msgid "Error converting the call result: %s"
+#~ msgstr "virhe Schemestä Vimiin konversiossa"
+
+msgid "add() argument"
+msgstr "add()-argumentti"
+
+msgid "E699: Too many arguments"
+msgstr "E699: Liikaa argumentteja"
+
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() toimii vain syöttötilassa"
+
+msgid "&Ok"
+msgstr "&Ok"
+
+#, fuzzy
+#~ msgid "dictwatcheradd() argument"
+#~ msgstr "add()-argumentti"
+
+msgid "extend() argument"
+msgstr "extend()-argumentti"
+
+msgid "map() argument"
+msgstr "map()-argumentti"
+
+msgid "filter() argument"
+msgstr "filter()-argumentti"
+
+#, fuzzy, c-format
+#~ msgid "+-%s%3ld lines: "
+#~ msgstr "+-%s%3ld rivi: "
+
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: Tuntematon funktio: %s"
+
+msgid "E922: expected a dict"
+msgstr "E922: odotettiin dictiä"
+
+# datarakenteita
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: toisen function()-argumentin pitää olla lista tai sanakirja"
+
+#, fuzzy
+#~ msgid "E5000: Cannot find tab number."
+#~ msgstr "E695: Funcrefiä ei voi indeksoida"
+
+#~ msgid "E5001: Higher scope cannot be -1 if lower scope is >= 0."
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E5002: Cannot find window number."
+#~ msgstr "E671: Ikkunan otsikkoa ei löydy %s"
+
+msgid "called inputrestore() more often than inputsave()"
+msgstr "inputrestore() suoritettu useammin kuin inputsave()"
+
+msgid "insert() argument"
+msgstr "insert()-argumentti"
+
+msgid "E786: Range not allowed"
+msgstr "E786: Aluetta ei voi käyttää"
+
+#~ msgid "Invalid stream on rpc job, use jobclose(id, 'rpc')"
+#~ msgstr ""
+
+#~ msgid "Invalid job stream: Not an rpc job"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Invalid job stream \"%s\""
+#~ msgstr ""
+
+#~ msgid "Can't send data to the job: stdin is closed"
+#~ msgstr ""
+
+#~ msgid "Can't send raw data to rpc channel"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E474: Failed to convert list to string"
+#~ msgstr "ei voitu konvertoida tyypistä %s vim-listaksi"
+
+#, fuzzy, c-format
+#~ msgid "E474: Failed to parse %.*s"
+#~ msgstr "E241: Kohteeseen %s lähettäminen ei onnistunut"
+
+msgid "E701: Invalid type for len()"
+msgstr "E701: Virheellinen tyyppi funktiolle len()"
+
+#, fuzzy, c-format
+#~ msgid "msgpackdump() argument, index %i"
+#~ msgstr "map()-argumentti"
+
+#, fuzzy
+#~ msgid "E5070: Character number must not be less than zero"
+#~ msgstr "luvun on oltava nollaa suurempi"
+
+#, fuzzy, c-format
+#~ msgid "E5071: Character number must not be greater than INT_MAX (%i)"
+#~ msgstr "luvun on oltava nollaa suurempi"
+
+msgid "E726: Stride is zero"
+msgstr "E726: Stride on nolla"
+
+msgid "E727: Start past end"
+msgstr "E727: Alku on lopun jälkeen"
+
+msgid "<empty>"
+msgstr "<tyhjä>"
+
+msgid "remove() argument"
+msgstr "remove()-argumentti"
+
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: Liikaa symbolisia linkkejä (mahdollinen sykli)"
+
+msgid "reverse() argument"
+msgstr "reverse()-argumentti"
+
+#, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: Viallinen toiminto: %s"
+
+msgid "sort() argument"
+msgstr "sort()-argumentti"
+
+msgid "uniq() argument"
+msgstr "uniq()-argumentti"
+
+msgid "E702: Sort compare function failed"
+msgstr "E702: Lajittelun vertausfunktio ei onnistunut"
+
+msgid "E882: Uniq compare function failed"
+msgstr "E882: Uniqin vertausfunktio ei onnistunut"
+
+msgid "(Invalid)"
+msgstr "(Virheellinen)"
+
+#, c-format
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: Virheellinen alitäsmäyksen numero: %d"
+
+#~ msgid "Can only call this function in an unmodified buffer"
+#~ msgstr ""
+
+msgid "E921: Invalid callback argument"
+msgstr "E921: Virheellinen callback-argumentti"
+
+#, fuzzy, c-format
+#~ msgid "E80: Error while writing: %s"
+#~ msgstr "E80: Kirjoitusvirhe"
+
+#. Using %s, p and not %c, *p to preserve multibyte characters
+#, fuzzy, c-format
+#~ msgid "E5060: Unknown flag: %s"
+#~ msgstr "E235: Tuntematon fontti: %s"
+
+#, fuzzy
+#~ msgid "E482: Can't open file with an empty name"
+#~ msgstr "E212: Tiedoston avaus kirjoittamista varten ei onnistu"
+
+#, fuzzy, c-format
+#~ msgid "E482: Can't open file %s for writing: %s"
+#~ msgstr "E212: Tiedoston avaus kirjoittamista varten ei onnistu"
+
+#, fuzzy, c-format
+#~ msgid "E80: Error when closing file %s: %s"
+#~ msgstr "E209: Virhe suljettaessa tiedostoa %s"
+
+#, fuzzy, c-format
+#~ msgid "E794: Cannot set variable in the sandbox: \"%.*s\""
+#~ msgstr "E794: Muuttujaa ei voi asettaa hiekkalaatikossa: %s"
+
+#, fuzzy, c-format
+#~ msgid "E795: Cannot delete variable %.*s"
+#~ msgstr "E795: Muuttujaa %s ei voi poistaa"
+
+#, c-format
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: Funcrefin muuttujanimen pitää alkaa suuraakkosella: %s"
+
+#, c-format
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: Muuttujanimi on sama kuin olemassaolevan funktion: %s"
+
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: muuttuja on upotettu liian syvälle kopioitavaksi"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: Tuntematon funktio: %s"
+
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: ( puuttuu: %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: g: ei toimi täällä"
+
+#, fuzzy, c-format
+#~ msgid "E932: Closure function should not be at top level: %s"
+#~ msgstr "E932 Sulkeumafunktio ei voi olla uloimmalla tasolla: %s"
 
-#: ../eval.c:17416
 msgid "E126: Missing :endfunction"
 msgstr "E126: :endfunction puuttuu"
 
-#: ../eval.c:17537
 #, c-format
 msgid "E707: Function name conflicts with variable: %s"
 msgstr "E707: Funktion nimi on ristiriidassa muuttujan kanssa: %s"
 
-#: ../eval.c:17549
 #, c-format
 msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: Funktiota %s ei voi m��ritell� uudestaan, koska se on k�yt�ss�"
+msgstr "E127: Funktiota %s ei voi määritellä uudestaan, koska se on käytössä"
 
-#: ../eval.c:17604
 #, c-format
 msgid "E746: Function name does not match script file name: %s"
 msgstr "E746: Funktion nimi ei ole sama kuin skriptin tiedostonnimi: %s"
 
-#: ../eval.c:17716
 msgid "E129: Function name required"
 msgstr "E129: Funktion nimi puuttuu"
 
-#: ../eval.c:17824
-#, fuzzy, c-format
+#, c-format
 msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr ""
-"E128: Funktion nimen pit�� alkaa suuraakkosella tai sis�lt�� kaksoispisteen: "
-"%s"
+msgstr "E128: Funktion nimen pitää alkaa suuraakkosella tai merkeillä ’s:’: %s"
 
-#: ../eval.c:17833
-#, fuzzy, c-format
+#, c-format
 msgid "E884: Function name cannot contain a colon: %s"
-msgstr ""
-"E128: Funktion nimen pit�� alkaa suuraakkosella tai sis�lt�� kaksoispisteen: "
-"%s"
+msgstr "E884: Funktion nimessä ei saa olla kaksoispistettä: %s"
 
-#: ../eval.c:18336
 #, c-format
 msgid "E131: Cannot delete function %s: It is in use"
 msgstr "E131: Funktiota %s ei voi poistaa"
 
-#: ../eval.c:18441
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: Funktiokutsujen syvyys on enemm�n kuin maxfuncdepth"
+#, fuzzy, c-format
+#~ msgid "Cannot delete function %s: It is being used internally"
+#~ msgstr "E131: Funktiota %s ei voi poistaa"
+
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr "E132: Funktiokutsujen syvyys on enemmän kuin maxfuncdepth"
 
-#: ../eval.c:18568
 #, c-format
 msgid "calling %s"
 msgstr "kutsutaan funktiota %s"
 
-#: ../eval.c:18651
 #, c-format
 msgid "%s aborted"
 msgstr "%s keskeytettiin"
 
-#: ../eval.c:18653
-#, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s palaa kohdassa #%<PRId64>"
+#, fuzzy, c-format
+#~ msgid "%s returning #%<PRId64>"
+#~ msgstr "%s palaa kohdassa #%ld"
 
-#: ../eval.c:18670
 #, c-format
 msgid "%s returning %s"
 msgstr "%s palaa kohdassa %s"
 
-#: ../eval.c:18691 ../ex_cmds2.c:2695
 #, c-format
 msgid "continuing in %s"
 msgstr "jatkaa kohdassa %s"
 
-#: ../eval.c:18795
 msgid "E133: :return not inside a function"
-msgstr "E133: :return ei ole funktion sis�ll�"
+msgstr "E133: :return ei ole funktion sisällä"
 
-#: ../eval.c:19159
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# globaalit muuttujat:\n"
-
-#: ../eval.c:19254
 msgid ""
 "\n"
 "\tLast set from "
@@ -1045,154 +1091,396 @@ msgstr ""
 "\n"
 "\tViimeksi asetettu kohteesta "
 
-#: ../eval.c:19272
 msgid "No old files"
 msgstr "Ei vanhoja tiedostoja"
 
+#, c-format
+#~ msgid "E474: Expected comma before list item: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E474: Expected colon before dictionary value: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E474: Expected string key: %s"
+#~ msgstr "E415: odotuksenvastainen =-merkki: %s"
+
+#, fuzzy, c-format
+#~ msgid "E474: Expected comma before dictionary key: %s"
+#~ msgstr "E722: Sanakirjasta puuttuu pilkku: %s"
+
+#, fuzzy, c-format
+#~ msgid "E474: Unfinished escape sequence: %.*s"
+#~ msgstr "E540: Sulkematon lausekesarja"
+
+#, c-format
+#~ msgid "E474: Unfinished unicode escape sequence: %.*s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E474: Expected four hex digits after \\u: %.*s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E474: Unknown escape sequence: %.*s"
+#~ msgstr "E409: Tuntematon ryhmän nimi: %s"
+
+#, c-format
+#~ msgid "E474: ASCII control characters cannot be present inside string: %.*s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E474: Only UTF-8 strings allowed: %.*s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ "E474: Only UTF-8 code points up to U+10FFFF are allowed to appear unescaped: "
+#~ "%.*s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E474: Expected string end: %.*s"
+#~ msgstr "E415: odotuksenvastainen =-merkki: %s"
+
+#, fuzzy, c-format
+#~ msgid "E474: Leading zeroes are not allowed: %.*s"
+#~ msgstr "E786: Aluetta ei voi käyttää"
+
+#, fuzzy, c-format
+#~ msgid "E474: Missing number after minus sign: %.*s"
+#~ msgstr "E526: Lukuarvo puuttuu merkkijonon <%s> jälkeen"
+
+#, fuzzy, c-format
+#~ msgid "E474: Missing number after decimal dot: %.*s"
+#~ msgstr "E526: Lukuarvo puuttuu merkkijonon <%s> jälkeen"
+
+#, fuzzy, c-format
+#~ msgid "E474: Missing exponent: %.*s"
+#~ msgstr "E114: Puuttuva lainausmerkki: %s"
+
+#, c-format
+#~ msgid ""
+#~ "E685: internal error: while converting number \"%.*s\" to float string2float "
+#~ "consumed %zu bytes in place of %zu"
+#~ msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ "E685: internal error: while converting number \"%.*s\" to integer vim_str2nr "
+#~ "consumed %i bytes in place of %zu"
+#~ msgstr ""
+
+#~ msgid "E474: Attempt to decode a blank string"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E474: No container to close: %.*s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E474: Closing list with curly bracket: %.*s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E474: Closing dictionary with square bracket: %.*s"
+#~ msgstr "E725: dict-funktio ilman sanakirjaa: %s"
+
+#, fuzzy, c-format
+#~ msgid "E474: Trailing comma: %.*s"
+#~ msgstr "E488: Ylimääräisiä merkkejä perässä"
+
+#, c-format
+#~ msgid "E474: Expected value after colon: %.*s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E474: Expected value: %.*s"
+#~ msgstr "E415: odotuksenvastainen =-merkki: %s"
+
+#, c-format
+#~ msgid "E474: Comma not inside container: %.*s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E474: Duplicate comma: %.*s"
+#~ msgstr "E721: Kaksi samaa avainta sanakirjassa: %s"
+
+#, fuzzy, c-format
+#~ msgid "E474: Comma after colon: %.*s"
+#~ msgstr "E254: Väriä %s ei voi määritellä"
+
+#, fuzzy, c-format
+#~ msgid "E474: Using comma in place of colon: %.*s"
+#~ msgstr "E722: Sanakirjasta puuttuu pilkku: %s"
+
+#, c-format
+#~ msgid "E474: Leading comma: %.*s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E474: Colon not inside container: %.*s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E474: Using colon not in dictionary: %.*s"
+#~ msgstr "E720: Sanakirjasta puuttuu kaksoispiste: %s"
+
+#, fuzzy, c-format
+#~ msgid "E474: Unexpected colon: %.*s"
+#~ msgstr "E415: odotuksenvastainen =-merkki: %s"
+
+#, c-format
+#~ msgid "E474: Colon after comma: %.*s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E474: Duplicate colon: %.*s"
+#~ msgstr "E721: Kaksi samaa avainta sanakirjassa: %s"
+
+#, fuzzy, c-format
+#~ msgid "E474: Expected null: %.*s"
+#~ msgstr "E415: odotuksenvastainen =-merkki: %s"
+
+#, fuzzy, c-format
+#~ msgid "E474: Expected true: %.*s"
+#~ msgstr "E270: odotuksenvastainen redo"
+
+#, fuzzy, c-format
+#~ msgid "E474: Expected false: %.*s"
+#~ msgstr "E415: odotuksenvastainen =-merkki: %s"
+
+#, fuzzy, c-format
+#~ msgid "E474: Unidentified byte: %.*s"
+#~ msgstr "E121: Määrittelemätön muuttuja: %s"
+
+#, fuzzy, c-format
+#~ msgid "E474: Trailing characters: %.*s"
+#~ msgstr "E488: Ylimääräisiä merkkejä perässä"
+
+#, fuzzy, c-format
+#~ msgid "E474: Unexpected end of input: %.*s"
+#~ msgstr "E415: odotuksenvastainen =-merkki: %s"
+
+#, c-format
+#~ msgid "key %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "key %s at index %i from special map"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "index %i"
+#~ msgstr ""
+
+#~ msgid "partial"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "argument %i"
+#~ msgstr "-c-argumentti"
+
+#, fuzzy
+#~ msgid "partial self dictionary"
+#~ msgstr "ei voida muuttaa kiinnitettyä sanakirjaa"
+
+#~ msgid "itself"
+#~ msgstr ""
+
+#. Only give this message once for a recursive call to avoid
+#. flooding the user with errors.
+#~ msgid "E724: unable to correctly dump variable with self-referencing container"
+#~ msgstr ""
+
+#~ msgid "E474: Unable to represent NaN value in JSON"
+#~ msgstr ""
+
+#~ msgid "E474: Unable to represent infinity in JSON"
+#~ msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ "E474: String \"%.*s\" contains byte that does not start any UTF-8 character"
+#~ msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ "E474: UTF-8 string contains code point which belongs to a surrogate pair: "
+#~ "%.*s"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E474: Unable to convert EXT string to JSON"
+#~ msgstr "E620: Tulostuskoodaukseen %s muunto ei onnistu"
+
+#, c-format
+#~ msgid "E474: Error while dumping %s, %s: attempt to dump function reference"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E474: Invalid key in special dictionary"
+#~ msgstr "E736: Virheellinen toiminto sanakirjalle"
+
+#, c-format
+#~ msgid "E5004: Error while dumping %s, %s: attempt to dump function reference"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "E5005: Unable to dump %s: container references itself in %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E684: list index out of range: %<PRId64>"
+#~ msgstr "E684: Indeksi %ld luettelon rajojen ulkopuolella"
+
+#~ msgid "E6000: Argument is not a function or function name"
+#~ msgstr ""
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: Avain on jo olemassa: %s"
+
+#, fuzzy
+#~ msgid "tv_clear() argument"
+#~ msgstr "filter()-argumentti"
+
+msgid "E743: variable nested too deep for (un)lock"
+msgstr "E743: muuttujassa liian monta tasoa lukituksen käsittelyyn"
+
+#, fuzzy, c-format
+#~ msgid "E741: Value is locked: %.*s"
+#~ msgstr "E741: Arvo on lukittu: %s"
+
+#, fuzzy, c-format
+#~ msgid "E742: Cannot change value of %.*s"
+#~ msgstr "E742: Ei voi muuttaa muuttujan %s arvoa"
+
+msgid "Unknown"
+msgstr "Tuntematon"
+
+#, fuzzy
+#~ msgid "E805: Expected a Number or a String, Float found"
+#~ msgstr "E807: Odotettiin Float-argumenttia printf():lle"
+
+#~ msgid "E703: Expected a Number or a String, Funcref found"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E745: Expected a Number or a String, List found"
+#~ msgstr "E807: Odotettiin Float-argumenttia printf():lle"
+
+#~ msgid "E728: Expected a Number or a String, Dictionary found"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "E5300: Expected a Number or a String"
+#~ msgstr "E807: Odotettiin Float-argumenttia printf():lle"
+
+msgid "E745: Using a List as a Number"
+msgstr "E745: Lista ei käy Numberista"
+
+msgid "E728: Using a Dictionary as a Number"
+msgstr "E728: Sanakirja ei käy Numberista"
+
+msgid "E805: Using a Float as a Number"
+msgstr "E805: Float ei käy Numberista"
+
+#, fuzzy
+#~ msgid "E685: using an invalid value as a Number"
+#~ msgstr "E908: huono arvo merkkijonolle"
+
+msgid "E730: using List as a String"
+msgstr "E730: Lista ei käy merkkijonosta"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: Sanakirja ei käy merkkijonosta"
+
+msgid "E908: using an invalid value as a String"
+msgstr "E908: huono arvo merkkijonolle"
+
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: Funcref ei käy Floatista"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: String ei käy Floatista"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: Lista ei käy Floatista"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: Sanakirja ei käy Floatista"
+
+msgid "E907: Using a special value as a Float"
+msgstr "E907: Käytettiin erikoisarvoa Floattina"
+
+msgid "E808: Number or Float required"
+msgstr "E808: Number tai Float vaaditaan"
+
 # puhutaan merkin ulkoasusta snprintf(..., c, c, c, c)
-#: ../ex_cmds.c:122
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d, heksana %02x, oktaalina %03o"
 
-#: ../ex_cmds.c:145
 #, c-format
 msgid "> %d, Hex %04x, Octal %o"
 msgstr "> %d, heksana %04x, oktaalina %o"
 
-#: ../ex_cmds.c:146
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, hekdana %08x, oktaalina %o"
 
-#: ../ex_cmds.c:684
 msgid "E134: Move lines into themselves"
-msgstr "E134: Rivien siirto itsejens� p��lle"
+msgstr "E134: Rivien siirto itsejensä päälle"
 
-#: ../ex_cmds.c:747
 msgid "1 line moved"
 msgstr "1 rivi siirretty"
 
-#: ../ex_cmds.c:749
-#, c-format
-msgid "%<PRId64> lines moved"
-msgstr "%<PRId64> rivi� siirretty"
+#, fuzzy, c-format
+#~ msgid "%<PRId64> lines moved"
+#~ msgstr "%ld riviä siirretty"
 
-#: ../ex_cmds.c:1175
 #, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "%<PRId64> rivi� suodatettu"
+msgid "E482: Can't create file %s"
+msgstr "E482: Tiedostoa %s ei voi luoda"
+
+#, fuzzy, c-format
+#~ msgid "%<PRId64> lines filtered"
+#~ msgstr "%ld riviä suodatettu"
 
-#: ../ex_cmds.c:1194
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filter*-autocommand ei voi vaihtaa puskuria"
 
-#: ../ex_cmds.c:1244
 msgid "[No write since last change]\n"
-msgstr "[Viimeisint� muutosta ei ole kirjoitettu]\n"
+msgstr "[Viimeisintä muutosta ei ole kirjoitettu]\n"
 
-#: ../ex_cmds.c:1424
-#, c-format
-msgid "%sviminfo: %s in line: "
-msgstr "%sviminfo: %s rivill�: "
-
-#: ../ex_cmds.c:1431
-msgid "E136: viminfo: Too many errors, skipping rest of file"
-msgstr "E136: viminfo: liikaa virheit�, ohitetaan lopputiedosto"
-
-#: ../ex_cmds.c:1458
-#, c-format
-msgid "Reading viminfo file \"%s\"%s%s%s"
-msgstr "Luetaan viminfo-tiedostoa \"%s\"%s%s%s"
-
-#: ../ex_cmds.c:1460
-msgid " info"
-msgstr " info"
-
-#: ../ex_cmds.c:1461
-msgid " marks"
-msgstr " merkit"
-
-#: ../ex_cmds.c:1462
-msgid " oldfiles"
-msgstr " vanhaatiedostoa"
-
-#: ../ex_cmds.c:1463
-msgid " FAILED"
-msgstr " EP�ONNISTUI"
-
-#. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
-#, c-format
-msgid "E137: Viminfo file is not writable: %s"
-msgstr "E137: Viminfo-tiedostoon ei voitu kirjoittaa: %s"
-
-#: ../ex_cmds.c:1626
-#, c-format
-msgid "E138: Can't write viminfo file %s!"
-msgstr "E138: Viminfo-tiedoston kirjoittaminen ei onnistu %s"
-
-#: ../ex_cmds.c:1635
-#, c-format
-msgid "Writing viminfo file \"%s\""
-msgstr "Kirjoitetaan viminfo-tiedostoa %s"
-
-#. Write the info:
-#: ../ex_cmds.c:1720
-#, c-format
-msgid "# This viminfo file was generated by Vim %s.\n"
-msgstr "# Vimin %s generoima viminfo-tiedosto.\n"
-
-#: ../ex_cmds.c:1722
-msgid ""
-"# You may edit it if you're careful!\n"
-"\n"
-msgstr ""
-"# Muokkaa varovasti!\n"
-"\n"
-
-#: ../ex_cmds.c:1723
-msgid "# Value of 'encoding' when this file was written\n"
-msgstr "# encoding-muuttujan arvo tiedostoa kirjoitettaessa\n"
-
-#: ../ex_cmds.c:1800
-msgid "Illegal starting char"
-msgstr "Virheellinen aloitusmerkki"
-
-#: ../ex_cmds.c:2162
 msgid "Write partial file?"
 msgstr "Kirjoita osittainen tiedosto"
 
-#: ../ex_cmds.c:2166
 msgid "E140: Use ! to write partial buffer"
-msgstr "E140: K�yt� !-komentoa osittaisen puskurin kirjoittamiseen"
+msgstr "E140: Käytä !-komentoa osittaisen puskurin kirjoittamiseen"
 
-#: ../ex_cmds.c:2281
 #, c-format
 msgid "Overwrite existing file \"%s\"?"
 msgstr "Ylikirjoitetaanko olemassaoleva tiedosto %s?"
 
-#: ../ex_cmds.c:2317
 #, c-format
 msgid "Swap file \"%s\" exists, overwrite anyway?"
 msgstr "Swap-tiedosto %s on olemassa, ylikirjoitetaanko?"
 
-#: ../ex_cmds.c:2326
 #, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Swap-tiedosto on jo olemassa: %s (komento :silent! ohittaa)"
 
-#: ../ex_cmds.c:2381
-#, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: Ei tiedostonime� puskurille %<PRId64>"
+#, fuzzy, c-format
+#~ msgid "E141: No file name for buffer %<PRId64>"
+#~ msgstr "E141: Ei tiedostonimeä puskurille %ld"
 
-#: ../ex_cmds.c:2412
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr ""
-"E142: Tiedostoa ei kirjoitettu; write-asetus poistaa kirjoituksen k�yt�st�"
+"E142: Tiedostoa ei kirjoitettu; write-asetus poistaa kirjoituksen käytöstä"
 
-#: ../ex_cmds.c:2434
 #, c-format
 msgid ""
 "'readonly' option is set for \"%s\".\n"
@@ -1201,7 +1489,6 @@ msgstr ""
 "readonly asetettu tiedostolle \"%s\".\n"
 "Kirjoitetaanko?"
 
-#: ../ex_cmds.c:2439
 #, c-format
 msgid ""
 "File permissions of \"%s\" are read-only.\n"
@@ -1210,799 +1497,599 @@ msgid ""
 msgstr ""
 "Tiedosto %s on kirjoitussuojattu.\n"
 "Siihen saattaa voida silti kirjoittaa.\n"
-"Yritet��nk�?"
+"Yritetäänkö?"
 
-#: ../ex_cmds.c:2451
 #, c-format
 msgid "E505: \"%s\" is read-only (add ! to override)"
-msgstr "E505: %s on kirjoitussuojattu (lis�� komentoon ! ohittaaksesi)"
+msgstr "E505: %s on kirjoitussuojattu (lisää komentoon ! ohittaaksesi)"
 
-#: ../ex_cmds.c:3120
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: Autocommand poisti uuden puskurin odotuksen vastaisesti %s"
 
-#: ../ex_cmds.c:3313
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: :z:n argumentti ei ole numero"
 
-#: ../ex_cmds.c:3404
-msgid "E145: Shell commands not allowed in rvim"
-msgstr "E145: Kuoren komennot eiv�t toimi rvimiss�"
+#, fuzzy
+#~ msgid "E145: Shell commands not allowed in restricted mode"
+#~ msgstr "E145: Kuoren komennot eivät toimi rvimissä"
 
-#: ../ex_cmds.c:3498
 msgid "E146: Regular expressions can't be delimited by letters"
-msgstr "E146: S��nn�llist� ilmausta ei voi rajata kirjaimilla"
+msgstr "E146: Säännöllistä ilmausta ei voi rajata kirjaimilla"
 
-#: ../ex_cmds.c:3964
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "korvaa kohteella %s (y/n/a/q/l/^E/^Y)?"
 
-#: ../ex_cmds.c:4379
 msgid "(Interrupted) "
 msgstr "(Keskeytetty)"
 
-#: ../ex_cmds.c:4384
 msgid "1 match"
-msgstr "1 t�sm�ys"
+msgstr "1 täsmäys"
 
-#: ../ex_cmds.c:4384
 msgid "1 substitution"
 msgstr "1 korvaus"
 
-#: ../ex_cmds.c:4387
-#, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> t�sm�yst�"
+#, fuzzy, c-format
+#~ msgid "%<PRId64> matches"
+#~ msgstr "%ld täsmäystä"
 
-#: ../ex_cmds.c:4388
-#, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64> korvausta"
+#, fuzzy, c-format
+#~ msgid "%<PRId64> substitutions"
+#~ msgstr "%ld korvausta"
 
-#: ../ex_cmds.c:4392
 msgid " on 1 line"
-msgstr " 1 rivill�"
+msgstr " 1 rivillä"
 
-#: ../ex_cmds.c:4395
-#, c-format
-msgid " on %<PRId64> lines"
-msgstr " %<PRId64> rivill�"
+#, fuzzy, c-format
+#~ msgid " on %<PRId64> lines"
+#~ msgstr " %ld rivillä"
 
-#: ../ex_cmds.c:4438
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :globalia ei voi suorittaa rekursiivisesti"
 
-#: ../ex_cmds.c:4467
 msgid "E148: Regular expression missing from global"
-msgstr "E148: S��nn�llinen ilmaus puuttuu globaalista"
+msgstr "E148: Säännöllinen ilmaus puuttuu globaalista"
 
-#: ../ex_cmds.c:4508
 #, c-format
 msgid "Pattern found in every line: %s"
-msgstr "Kuvio l�ytyi joka rivilt�: %s"
+msgstr "Kuvio löytyi joka riviltä: %s"
 
-#: ../ex_cmds.c:4510
-#, fuzzy, c-format
+#, c-format
 msgid "Pattern not found: %s"
-msgstr "Kuviota ei l�ydy"
+msgstr "Kuviota ei löydy: %s"
 
-#: ../ex_cmds.c:4587
-msgid ""
-"\n"
-"# Last Substitute String:\n"
-"$"
-msgstr ""
-"\n"
-"# Viimeisin korvausmerkkijono:\n"
-"$"
-
-#: ../ex_cmds.c:4679
 msgid "E478: Don't panic!"
-msgstr "E478: �l� panikoi."
+msgstr "E478: Älä panikoi."
 
-#: ../ex_cmds.c:4717
 #, c-format
 msgid "E661: Sorry, no '%s' help for %s"
-msgstr "E661: Sori, ei l�ydy %s-ohjetta kohteelle %s"
+msgstr "E661: ei löydy %s-ohjetta kohteelle %s"
 
-#: ../ex_cmds.c:4719
 #, c-format
 msgid "E149: Sorry, no help for %s"
-msgstr "E149: Sori, ei l�ydy ohjetta kohteelle %s"
+msgstr "E149: ei löydy ohjetta kohteelle %s"
 
-#: ../ex_cmds.c:4751
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
-msgstr "Sori, ohjetiedostoa %s ei l�ydy"
+msgstr "ohjetiedostoa %s ei löydy"
 
-#: ../ex_cmds.c:5323
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: Ei ole hakemisto: %s"
-
-#: ../ex_cmds.c:5446
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: Ei voi avata tiedostoa %s kirjoittamista varten"
 
-#: ../ex_cmds.c:5471
 #, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: Ei voi avata tiedostoa %s lukemista varten"
 
-#: ../ex_cmds.c:5500
 #, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
-msgstr "E670: Monia ohjetiedostokoodauksia kieless�: %s"
+msgstr "E670: Monia ohjetiedostokoodauksia kielessä: %s"
 
-#: ../ex_cmds.c:5565
 #, c-format
 msgid "E154: Duplicate tag \"%s\" in file %s/%s"
-msgstr "E154: Kaksoiskappale t�gist� %s tiedostossa %s/%s"
+msgstr "E154: Kaksoiskappale tägistä %s tiedostossa %s/%s"
+
+#, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: Ei ole hakemisto: %s"
 
-#: ../ex_cmds.c:5687
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: Tuntematon merkkikomento: %s"
 
-#: ../ex_cmds.c:5704
 msgid "E156: Missing sign name"
 msgstr "E156: Merkki puuttuu"
 
-#: ../ex_cmds.c:5746
 msgid "E612: Too many signs defined"
-msgstr "E612: Liikaa merkkej� m��ritelty"
+msgstr "E612: Liikaa merkkejä määritelty"
 
-#: ../ex_cmds.c:5813
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: Virheellinen merkkiteksti: %s"
 
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: Tuntematon merkki: %s"
 
-#: ../ex_cmds.c:5877
 msgid "E159: Missing sign number"
 msgstr "E159: Merkin numero puuttuu"
 
-#: ../ex_cmds.c:5971
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Virheellinen puskurin nimi: %s"
 
-#: ../ex_cmds.c:6008
-#, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: Virheellinen merkin tunnus: %<PRId64>"
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: Ei voida hypätä puskuriin jolla ei ole nimeä"
+
+#, fuzzy, c-format
+#~ msgid "E157: Invalid sign ID: %<PRId64>"
+#~ msgstr "E157: Virheellinen merkin tunnus: %ld"
+
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: Ei voida muuttaa merkkiä %s"
 
-#: ../ex_cmds.c:6066
 msgid " (not supported)"
 msgstr " (ei tuettu)"
 
-#: ../ex_cmds.c:6169
 msgid "[Deleted]"
 msgstr "[Poistettu]"
 
-#: ../ex_cmds2.c:139
 msgid "Entering Debug mode.  Type \"cont\" to continue."
-msgstr "Siirryt��n vianetsint�tilaan, kirjoita cont jatkaaksesi."
+msgstr "Siirrytään vianetsintätilaan, kirjoita cont jatkaaksesi."
 
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
-#, c-format
-msgid "line %<PRId64>: %s"
-msgstr "rivi %<PRId64>: %s"
+#, fuzzy, c-format
+#~ msgid "line %<PRId64>: %s"
+#~ msgstr "rivi %ld: %s"
 
-#: ../ex_cmds2.c:145
 #, c-format
 msgid "cmd: %s"
 msgstr "kmnt: %s"
 
-#: ../ex_cmds2.c:322
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "Katkaisukohta %s%s rivill� %<PRId64>"
+msgid "frame is zero"
+msgstr "kehys on nolla"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "kehys ylimmällä tasolla: %d"
+
+#, fuzzy, c-format
+#~ msgid "Breakpoint in \"%s%s\" line %<PRId64>"
+#~ msgstr "Katkaisukohta %s%s rivillä %ld"
 
-#: ../ex_cmds2.c:581
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: Katkaisukohta puuttuu: %s"
 
-#: ../ex_cmds2.c:611
 msgid "No breakpoints defined"
 msgstr "Ei katkaisukohtia"
 
-#: ../ex_cmds2.c:617
-#, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s  rivi %<PRId64>"
+#, fuzzy, c-format
+#~ msgid "%3d  %s %s  line %<PRId64>"
+#~ msgstr "%3d  %s %s  rivi %ld"
 
-#: ../ex_cmds2.c:942
 msgid "E750: First use \":profile start {fname}\""
-msgstr "E750: Aloita k�skyll� :profile start {fname}"
+msgstr "E750: Aloita käskyllä :profile start {fname}"
 
-#: ../ex_cmds2.c:1269
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "Tallennetaanko muutokset tiedostoon %s?"
 
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
 msgid "Untitled"
-msgstr "Nimet�n"
+msgstr "Nimetön"
 
-#: ../ex_cmds2.c:1421
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
-msgstr "E162: Muutoksia ei ole kirjoitettu puskurin %s viime muutoksen j�lkeen"
+msgstr "E162: Muutoksia ei ole kirjoitettu puskurin %s viime muutoksen jälkeen"
 
-#: ../ex_cmds2.c:1480
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "Varoitus: Puskuri vaihtui odottamatta (tarkista autocommands)"
 
-#: ../ex_cmds2.c:1826
 msgid "E163: There is only one file to edit"
 msgstr "E163: Vain yksi tiedosto muokattavana"
 
-#: ../ex_cmds2.c:1828
 msgid "E164: Cannot go before first file"
-msgstr "E164: Ensimm�isen tiedoston ohi ei voi menn�"
+msgstr "E164: Ensimmäisen tiedoston ohi ei voi mennä"
 
-#: ../ex_cmds2.c:1830
 msgid "E165: Cannot go beyond last file"
-msgstr "E165: Viimeisen tiedoston ohi ei voi menn�"
+msgstr "E165: Viimeisen tiedoston ohi ei voi mennä"
 
-#: ../ex_cmds2.c:2175
 #, c-format
 msgid "E666: compiler not supported: %s"
-msgstr "E666: k��nt�j�� ei tueta: %s"
+msgstr "E666: kääntäjää ei tueta: %s"
 
-#: ../ex_cmds2.c:2257
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
-msgstr "Etsit��n ilmausta %s kohteesta %s"
+msgstr "Etsitään ilmausta %s kohteesta %s"
 
-#: ../ex_cmds2.c:2284
 #, c-format
 msgid "Searching for \"%s\""
-msgstr "Etsit��n ilmausta %s"
+msgstr "Etsitään ilmausta %s"
 
-#: ../ex_cmds2.c:2307
 #, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "ei l�ydy runtimepathista: %s"
+msgid "not found in '%s': \"%s\""
+msgstr "'%s' ei löydy kohteesta: %s"
 
-#: ../ex_cmds2.c:2472
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "Hakemistoa ei voi ladata: %s"
 
-#: ../ex_cmds2.c:2518
 #, c-format
 msgid "could not source \"%s\""
 msgstr "ei voitu ladata %s"
 
-#: ../ex_cmds2.c:2520
-#, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "rivi %<PRId64>: ei voitu ladata %s"
+#, fuzzy, c-format
+#~ msgid "line %<PRId64>: could not source \"%s\""
+#~ msgstr "rivi %ld: ei voitu ladata %s"
 
-#: ../ex_cmds2.c:2535
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "ladataan %s"
 
-#: ../ex_cmds2.c:2537
-#, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "rivi %<PRId64>: ladataan %s"
+#, fuzzy, c-format
+#~ msgid "line %<PRId64>: sourcing \"%s\""
+#~ msgstr "rivi %ld: ladataan %s"
 
-#: ../ex_cmds2.c:2693
 #, c-format
 msgid "finished sourcing %s"
 msgstr "ladattu %s"
 
-#: ../ex_cmds2.c:2765
 msgid "modeline"
 msgstr "mode-rivi"
 
-#: ../ex_cmds2.c:2767
 msgid "--cmd argument"
 msgstr "--cmd-argumentti"
 
-#: ../ex_cmds2.c:2769
 msgid "-c argument"
 msgstr "-c-argumentti"
 
-#: ../ex_cmds2.c:2771
 msgid "environment variable"
-msgstr "ymp�rist�muuttuja"
+msgstr "ympäristömuuttuja"
 
-#: ../ex_cmds2.c:2773
 msgid "error handler"
-msgstr "virhek�sittelin"
+msgstr "virhekäsittelin"
 
-#: ../ex_cmds2.c:3020
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
-msgstr "W15: Varoitus: V��r� rivierotin, ^M saattaa puuttua"
+msgstr "W15: Varoitus: Väärä rivierotin, ^M saattaa puuttua"
 
-#: ../ex_cmds2.c:3139
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding ladatun tiedoston ulkopuolella"
 
-#: ../ex_cmds2.c:3166
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish ladatun tiedoston ulkopuolella"
 
-#: ../ex_cmds2.c:3389
 #, c-format
 msgid "Current %slanguage: \"%s\""
-msgstr "K�yt�ss� oleva %skieli: %s"
+msgstr "Käytössä oleva %skieli: %s"
 
-#: ../ex_cmds2.c:3404
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
-msgstr "E197: Kieleksi ei voitu asettaa kielt� %s"
+msgstr "E197: Kieleksi ei voitu asettaa kieltä %s"
 
 #. don't redisplay the window
 #. don't wait for return
-#: ../ex_docmd.c:387
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
-msgstr "Siirryt��n Ex-tilaan, kirjoita visual palataksesi normaaliin tilaan."
+msgstr "Siirrytään Ex-tilaan, kirjoita visual palataksesi normaaliin tilaan."
 
-#: ../ex_docmd.c:428
 msgid "E501: At end-of-file"
 msgstr "E501: Tiedoston lopussa"
 
-#: ../ex_docmd.c:513
 msgid "E169: Command too recursive"
 msgstr "E169: Liian rekursiivinen komento"
 
-#: ../ex_docmd.c:1006
+#, fuzzy
+#~ msgid "line %"
+#~ msgstr "rivi %ld"
+
 #, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: Kiinniottamaton poikkeus: %s"
 
-#: ../ex_docmd.c:1085
 msgid "End of sourced file"
 msgstr "Ladatun tiedoston loppu"
 
-#: ../ex_docmd.c:1086
 msgid "End of function"
 msgstr "Funktion loppu"
 
-#: ../ex_docmd.c:1628
 msgid "E464: Ambiguous use of user-defined command"
-msgstr "E464: K�ytt�j�n m��rittelem�n komennon monimerkityksinen k�ytt�"
+msgstr "E464: Käyttäjän määrittelemän komennon monimerkityksinen käyttö"
 
-#: ../ex_docmd.c:1638
 msgid "E492: Not an editor command"
 msgstr "E492: Ei ole editorikomento"
 
-#: ../ex_docmd.c:1729
 msgid "E493: Backwards range given"
 msgstr "E493: Takaperoinen arvoalue annettu"
 
-#: ../ex_docmd.c:1733
 msgid "Backwards range given, OK to swap"
-msgstr "Takaperoinen arvoalue annettu, OK k��nt��"
+msgstr "Takaperoinen arvoalue annettu, OK kääntää"
 
 #. append
 #. typed wrong
-#: ../ex_docmd.c:1787
 msgid "E494: Use w or w>>"
-msgstr "E494: K�yt� w:t� tai w>>:aa"
+msgstr "E494: Käytä w:tä tai w>>:aa"
 
-#: ../ex_docmd.c:3454
-msgid "E319: The command is not available in this version"
-msgstr "E319: Komento ei ole k�ytett�viss� t�ss� versiossa"
+#, fuzzy
+#~ msgid "E319: The command is not available in this version"
+#~ msgstr "E319: Komento ei ole käytettävissä tässä versiossa"
 
-#: ../ex_docmd.c:3752
-msgid "E172: Only one file name allowed"
-msgstr "E172: Vain yksi tiedostonimi sallitaan"
-
-#: ../ex_docmd.c:4238
 msgid "1 more file to edit.  Quit anyway?"
-msgstr "viel� 1 tiedosto muokattavana, lopetaanko silti?"
+msgstr "vielä 1 tiedosto muokattavana, lopetaanko silti?"
 
-#: ../ex_docmd.c:4242
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
-msgstr "viel� %d tiedostoa muokattavana, lopetetaanko silti?"
+msgstr "vielä %d tiedostoa muokattavana, lopetetaanko silti?"
 
-#: ../ex_docmd.c:4248
 msgid "E173: 1 more file to edit"
-msgstr "E173: viel� 1 tiedosto muokattavana"
+msgstr "E173: vielä 1 tiedosto muokattavana"
 
-#: ../ex_docmd.c:4250
-#, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: viel� %<PRId64> tiedostoa muokattavana"
+#, fuzzy, c-format
+#~ msgid "E173: %<PRId64> more files to edit"
+#~ msgstr "E173: vielä %ld tiedostoa muokattavana"
 
-#: ../ex_docmd.c:4320
 msgid "E174: Command already exists: add ! to replace it"
-msgstr "E174: Komento on jo olemassa, k�yt� !:� korvataksesi"
+msgstr "E174: Komento on jo olemassa, käytä !:ä korvataksesi"
 
-#: ../ex_docmd.c:4432
 msgid ""
 "\n"
-"    Name        Args Range Complete  Definition"
+"    Name        Args       Address   Complete  Definition"
 msgstr ""
 "\n"
-"    Nimi        Arg  Arvot Valmis    M��ritelm�"
+"    Nimi        Argumentit Osoite    Valmis    Määritelmä"
 
-#: ../ex_docmd.c:4516
 msgid "No user-defined commands found"
-msgstr "Ei k�ytt�j�n m��rittelemi� komentoja"
+msgstr "Ei käyttäjän määrittelemiä komentoja"
 
-#: ../ex_docmd.c:4538
 msgid "E175: No attribute specified"
-msgstr "E175: Ei attribuutteja m��riteltyn�"
+msgstr "E175: Ei attribuutteja määriteltynä"
 
-#: ../ex_docmd.c:4583
 msgid "E176: Invalid number of arguments"
-msgstr "E176: V��r� m��r� attribuutteja"
+msgstr "E176: Väärä määrä attribuutteja"
 
-#: ../ex_docmd.c:4594
 msgid "E177: Count cannot be specified twice"
-msgstr "E177: Lukum��r�� ei voi m��ritell� kahdesti"
+msgstr "E177: Lukumäärää ei voi määritellä kahdesti"
 
-#: ../ex_docmd.c:4603
 msgid "E178: Invalid default value for count"
-msgstr "E178: Lukum��r�n oletusarvo on v��r�"
+msgstr "E178: Lukumäärän oletusarvo on väärä"
 
-#: ../ex_docmd.c:4625
 msgid "E179: argument required for -complete"
 msgstr "E179: -complete vaatii argumentin"
 
-#: ../ex_docmd.c:4635
+msgid "E179: argument required for -addr"
+msgstr "E179: -addr vaatii argumentin"
+
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: Virheellinen attribuutti: %s"
 
-#: ../ex_docmd.c:4678
 msgid "E182: Invalid command name"
 msgstr "E182: Virheellinen komennon nimi"
 
-#: ../ex_docmd.c:4691
 msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: K�ytt�j�n m��rittelem�n komennon pit�� alkaa suuraakkosella"
+msgstr "E183: Käyttäjän määrittelemän komennon pitää alkaa suuraakkosella"
 
-#: ../ex_docmd.c:4696
-#, fuzzy
 msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E464: K�ytt�j�n m��rittelem�n komennon monimerkityksinen k�ytt�"
+msgstr "E841: Varattua nimeä ei voi käyttää käyttäjän määrittelemänä komentona"
 
-#: ../ex_docmd.c:4751
 #, c-format
 msgid "E184: No such user-defined command: %s"
-msgstr "E184: K�ytt�j�n komentoa ei ole olemassa: %s"
+msgstr "E184: Käyttäjän komentoa ei ole olemassa: %s"
+
+#, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: Virheellinen osoitetyyppiarvo: %s"
 
-#: ../ex_docmd.c:5219
 #, c-format
 msgid "E180: Invalid complete value: %s"
-msgstr "E180: Virheellinen t�ydennysarvo: %s"
+msgstr "E180: Virheellinen täydennysarvo: %s"
 
-#: ../ex_docmd.c:5225
 msgid "E468: Completion argument only allowed for custom completion"
-msgstr "E468: T�ydennysargumentti sopii vain itse m��riteltyyn t�ydennykseen"
+msgstr "E468: Täydennysargumentti sopii vain itse määriteltyyn täydennykseen"
 
-#: ../ex_docmd.c:5231
 msgid "E467: Custom completion requires a function argument"
-msgstr "E467: Itse m��ritelty t�ydennys vaatii funktioargumentin"
+msgstr "E467: Itse määritelty täydennys vaatii funktioargumentin"
 
-#: ../ex_docmd.c:5257
-#, fuzzy, c-format
+#, c-format
 msgid "E185: Cannot find color scheme '%s'"
-msgstr "E185: V�riteemaa %s ei l�ydy"
+msgstr "E185: Väriteemaa %s ei löydy"
 
-#: ../ex_docmd.c:5263
 msgid "Greetings, Vim user!"
-msgstr "Tervehdys, Vimin k�ytt�j�."
+msgstr "Tervehdys, Vimin käyttäjä."
 
-#: ../ex_docmd.c:5431
 msgid "E784: Cannot close last tab page"
-msgstr "E784: Viimeist� v�lilehte� ei voi sulkea"
+msgstr "E784: Viimeistä välilehteä ei voi sulkea"
 
-#: ../ex_docmd.c:5462
 msgid "Already only one tab page"
-msgstr "Vain yksi v�lilehti j�ljell� en��"
+msgstr "Vain yksi välilehti jäljellä enää"
 
-#: ../ex_docmd.c:6004
 #, c-format
 msgid "Tab page %d"
 msgstr "Tabisivu %d"
 
-#: ../ex_docmd.c:6295
 msgid "No swap file"
 msgstr "Ei swap-tiedostoa"
 
-#: ../ex_docmd.c:6478
-msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
-msgstr ""
-"E747: Hakemistoa ei voida muuttaa, puskuria on muokattu (lis�� komentoon ! "
-"ohittaaksesi"
-
-#: ../ex_docmd.c:6485
 msgid "E186: No previous directory"
-msgstr "E186: Ei edellist� hakemistoa"
+msgstr "E186: Ei edellistä hakemistoa"
 
-#: ../ex_docmd.c:6530
 msgid "E187: Unknown"
 msgstr "E187: Tuntematon"
 
-#: ../ex_docmd.c:6610
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: :winsize vaatii kaksi numeroargumenttia"
 
-#: ../ex_docmd.c:6655
-msgid "E188: Obtaining window position not implemented for this platform"
-msgstr "E188: Ikkunan sijainnin selvitys ei toimi t�ll� alustalla"
-
-#: ../ex_docmd.c:6662
-msgid "E466: :winpos requires two number arguments"
-msgstr "E466: :winpos vaatii kaksi lukuargumenttia"
-
-#: ../ex_docmd.c:7241
-#, c-format
-msgid "E739: Cannot create directory: %s"
-msgstr "E739: hakemistoa ei voi luoda: %s"
-
-#: ../ex_docmd.c:7268
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
-msgstr "E189: %s on jo olemassa (lis�� komentoon ! ohittaaksesi)"
+msgstr "E189: %s on jo olemassa (lisää komentoon ! ohittaaksesi)"
 
-#: ../ex_docmd.c:7273
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: Tiedostoa %s ei voitu avata kirjoittamista varten"
 
 #. set mark
-#: ../ex_docmd.c:7294
 msgid "E191: Argument must be a letter or forward/backward quote"
-msgstr "E191: Argumentin eteen- tai taaksep�in lainaukseen pit�� olla kirjain"
+msgstr "E191: Argumentin eteen- tai taaksepäin lainaukseen pitää olla kirjain"
 
-#: ../ex_docmd.c:7333
 msgid "E192: Recursive use of :normal too deep"
-msgstr "E192: :normalin liian syv� rekursio"
+msgstr "E192: :normalin liian syvä rekursio"
 
-#: ../ex_docmd.c:7807
 msgid "E194: No alternate file name to substitute for '#'"
-msgstr "E194: Ei vaihtoehtoista tiedostonime� #:lle"
+msgstr "E194: Ei vaihtoehtoista tiedostonimeä #:lle"
 
-#: ../ex_docmd.c:7841
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
 msgstr "E495: ei autocommand-tiedostoa kohteelle <afile>"
 
-#: ../ex_docmd.c:7850
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
 msgstr "E496: ei autocommand-puskurinumeroa kohteelle <abuf>"
 
-#: ../ex_docmd.c:7861
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
-msgstr "E497: ei autocommand-t�sm�ysnime� kohteella <amatch>"
+msgstr "E497: ei autocommand-täsmäysnimeä kohteella <amatch>"
 
-#: ../ex_docmd.c:7870
 msgid "E498: no :source file name to substitute for \"<sfile>\""
-msgstr "E498: ei :source-tiedostonime� kohteelle <sfile>"
+msgstr "E498: ei :source-tiedostonimeä kohteelle <sfile>"
 
-#: ../ex_docmd.c:7876
-#, fuzzy
 msgid "E842: no line number to use for \"<slnum>\""
-msgstr "E498: ei :source-tiedostonime� kohteelle <sfile>"
+msgstr "E842: ei rivinumeroa kohteelle <slnum>"
 
-#: ../ex_docmd.c:7903
 #, fuzzy, c-format
-msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
-msgstr "E499: Tyhj� tiedostonimi kohteissa % tai #  toimii vain :p:h"
+#~ msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
+#~ msgstr "E499: Tyhjä tiedostonimi kohteissa % tai #  toimii vain :p:h"
 
-#: ../ex_docmd.c:7905
 msgid "E500: Evaluates to an empty string"
-msgstr "E500: Loppuarvo on tyhj� merkkijono"
+msgstr "E500: Loppuarvo on tyhjä merkkijono"
 
-#: ../ex_docmd.c:8838
-msgid "E195: Cannot open viminfo file for reading"
-msgstr "E195: Viminfoa ei voi avata lukemista varten"
-
-#: ../ex_eval.c:464
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
-msgstr "E608: Vim-alkuisia poikkeuksia ei voi heitt�� :throw-komennolla"
+msgstr "E608: Vim-alkuisia poikkeuksia ei voi heittää :throw-komennolla"
 
 #. always scroll up, don't overwrite
-#: ../ex_eval.c:496
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "Poikkeus heitetty: %s"
 
-#: ../ex_eval.c:545
+#. always scroll up, don't overwrite
 #, c-format
 msgid "Exception finished: %s"
 msgstr "Poikkeus lopeteltu: %s"
 
-#: ../ex_eval.c:546
 #, c-format
 msgid "Exception discarded: %s"
 msgstr "Poikkeus poistettu: %s"
 
-#: ../ex_eval.c:588 ../ex_eval.c:634
-#, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s, rivi %<PRId64>"
+#, fuzzy, c-format
+#~ msgid "%s, line %<PRId64>"
+#~ msgstr "%s, rivi %ld"
 
 #. always scroll up, don't overwrite
-#: ../ex_eval.c:608
 #, c-format
 msgid "Exception caught: %s"
 msgstr "Poikkeus otettu kiinni: %s"
 
-#: ../ex_eval.c:676
 #, c-format
 msgid "%s made pending"
 msgstr "%s odotutettu"
 
-#: ../ex_eval.c:679
 #, c-format
 msgid "%s resumed"
 msgstr "%s palautettu"
 
-#: ../ex_eval.c:683
 #, c-format
 msgid "%s discarded"
 msgstr "%s poistettu"
 
-#: ../ex_eval.c:708
 msgid "Exception"
 msgstr "Poikkeus"
 
-#: ../ex_eval.c:713
 msgid "Error and interrupt"
 msgstr "Virhe ja keskeytys"
 
-#: ../ex_eval.c:715
 msgid "Error"
 msgstr "Virhe"
 
 #. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
 msgid "Interrupt"
 msgstr "Keskeytys"
 
-#: ../ex_eval.c:795
 msgid "E579: :if nesting too deep"
 msgstr "E579: liian monta kerrosta :if-komennossa"
 
-#: ../ex_eval.c:830
 msgid "E580: :endif without :if"
 msgstr "E580: :endif ilman komentoa :if"
 
-#: ../ex_eval.c:873
 msgid "E581: :else without :if"
 msgstr "E581: :else ilman komentoa :if"
 
-#: ../ex_eval.c:876
 msgid "E582: :elseif without :if"
 msgstr "E582: :elseif ilman komentoa :if"
 
-#: ../ex_eval.c:880
 msgid "E583: multiple :else"
 msgstr "E583: :else monta kertaa"
 
-#: ../ex_eval.c:883
 msgid "E584: :elseif after :else"
-msgstr "E584: :elseif komennon :else j�lkeen"
+msgstr "E584: :elseif komennon :else jälkeen"
 
-#: ../ex_eval.c:941
 msgid "E585: :while/:for nesting too deep"
 msgstr "E585: liian monta tasoa :while- tai :for-komennoissa"
 
-#: ../ex_eval.c:1028
 msgid "E586: :continue without :while or :for"
 msgstr "E586: :continue ilman komentoa :while tai :for"
 
-#: ../ex_eval.c:1061
 msgid "E587: :break without :while or :for"
 msgstr "E587: :break ilman komentoa :while tai :for"
 
-#: ../ex_eval.c:1102
 msgid "E732: Using :endfor with :while"
 msgstr "E732: :endfor ilman komentoa :while"
 
-#: ../ex_eval.c:1104
 msgid "E733: Using :endwhile with :for"
 msgstr "E733: :endwhile ilman komentoa :for"
 
-#: ../ex_eval.c:1247
 msgid "E601: :try nesting too deep"
 msgstr "E601: liian monta tasoa :try-komennossa"
 
-#: ../ex_eval.c:1317
 msgid "E603: :catch without :try"
 msgstr "E603: :catch ilman komentoa :try"
 
 #. Give up for a ":catch" after ":finally" and ignore it.
 #. * Just parse.
-#: ../ex_eval.c:1332
 msgid "E604: :catch after :finally"
 msgstr "E604: :catch ilman komentoa :finally"
 
-#: ../ex_eval.c:1451
 msgid "E606: :finally without :try"
 msgstr "E606: :finally ilman komentoa :try"
 
 #. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
 msgid "E607: multiple :finally"
 msgstr "E607: :finally monta kertaa"
 
-#: ../ex_eval.c:1571
 msgid "E602: :endtry without :try"
 msgstr "E602: :endtry ilman komentoa :try"
 
-#: ../ex_eval.c:2026
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: :endfunction funktion ulkopuolella"
 
-#: ../ex_getln.c:1643
 msgid "E788: Not allowed to edit another buffer now"
 msgstr "E788: Puskuria ei voi muokata nyt"
 
-#: ../ex_getln.c:1656
 msgid "E811: Not allowed to change buffer information now"
 msgstr "E811: Puskuria ei voi vaihtaa nyt"
 
-#: ../ex_getln.c:3178
 msgid "tagname"
-msgstr "t�ginimi"
+msgstr "täginimi"
 
-#: ../ex_getln.c:3181
 msgid " kind file\n"
 msgstr " -tiedostotyyppi\n"
 
-#: ../ex_getln.c:4799
 msgid "'history' option is zero"
 msgstr "history-asetus on nolla"
 
-#: ../ex_getln.c:5046
-#, c-format
-msgid ""
-"\n"
-"# %s History (newest to oldest):\n"
-msgstr ""
-"\n"
-"# %s Historia (uusimmasta alkaen):\n"
-
-#: ../ex_getln.c:5047
-msgid "Command Line"
-msgstr "Komentorivi"
-
-#: ../ex_getln.c:5048
-msgid "Search String"
-msgstr "Hakujono"
-
-#: ../ex_getln.c:5049
-msgid "Expression"
-msgstr "Ilmaus"
-
-#: ../ex_getln.c:5050
-msgid "Input Line"
-msgstr "Sy�terivi"
-
-#: ../ex_getln.c:5117
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar komennon pituuden ulkopuolella"
 
-#: ../ex_getln.c:5279
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: Aktiivinen ikkuna tai puskuri poistettu"
 
-#: ../file_search.c:203
 msgid "E854: path too long for completion"
-msgstr ""
+msgstr "E854: polku on liian pitkä täydennykseen"
 
-#: ../file_search.c:446
 #, c-format
 msgid ""
 "E343: Invalid path: '**[number]' must be at the end of the path or be "
@@ -2011,376 +2098,296 @@ msgstr ""
 "E343: Virheellinen polku: '**[numero]' kuuluu polun loppuun tai ennen kohtaa "
 "%s."
 
-#: ../file_search.c:1505
 #, c-format
 msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: Hakemistoa %s ei l�ydy cdpathista"
+msgstr "E344: Hakemistoa %s ei löydy cdpathista"
 
-#: ../file_search.c:1508
 #, c-format
 msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: Tiedostoa %s ei l�ydy polulta"
+msgstr "E345: Tiedostoa %s ei löydy polulta"
 
-#: ../file_search.c:1512
 #, c-format
 msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: Hakemisto %s ei ole en�� cdpathissa"
+msgstr "E346: Hakemisto %s ei ole enää cdpathissa"
 
-#: ../file_search.c:1515
 #, c-format
 msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: Tiedosto %s ei ole en�� polulla"
+msgstr "E347: Tiedosto %s ei ole enää polulla"
 
-#: ../fileio.c:137
 msgid "E812: Autocommands changed buffer or buffer name"
 msgstr "E812: Autocommands muutti puskurin tai sen nimen"
 
-#: ../fileio.c:368
 msgid "Illegal file name"
 msgstr "Virheellinen tiedostonimi"
 
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
 msgid "is a directory"
 msgstr "on hakemisto"
 
-#: ../fileio.c:397
 msgid "is not a file"
 msgstr "ei ole tiedosto"
 
-#: ../fileio.c:508 ../fileio.c:3522
 msgid "[New File]"
 msgstr "[Uusi tiedosto]"
 
-#: ../fileio.c:511
 msgid "[New DIRECTORY]"
 msgstr "[uusi HAKEMISTO]"
 
-#: ../fileio.c:529 ../fileio.c:532
+#. libuv only returns -errno in Unix and in Windows open() does not
+#. set EOVERFLOW
 msgid "[File too big]"
 msgstr "[Liian iso tiedosto]"
 
-#: ../fileio.c:534
 msgid "[Permission Denied]"
 msgstr "[Lupa kielletty]"
 
-#: ../fileio.c:653
 msgid "E200: *ReadPre autocommands made the file unreadable"
 msgstr ""
-"E200: *ReadPre-autocommand-komennot tekiv�t tiedostosta lukukelvottoman"
+"E200: *ReadPre-autocommand-komennot tekivät tiedostosta lukukelvottoman"
 
-#: ../fileio.c:655
 msgid "E201: *ReadPre autocommands must not change current buffer"
-msgstr "E201: *ReadPre-autocommand-komennot eiv�t saa muuttaa puskuria"
-
-#: ../fileio.c:672
-msgid "Nvim: Reading from stdin...\n"
-msgstr "Vim: Luetaan vakiosy�tteest�...\n"
+msgstr "E201: *ReadPre-autocommand-komennot eivät saa muuttaa puskuria"
 
 #. Re-opening the original file failed!
-#: ../fileio.c:909
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: Muunnos teki tiedostosta lukukelvottoman."
 
 #. fifo or socket
-#: ../fileio.c:1782
 msgid "[fifo/socket]"
 msgstr "[fifo t. soketti]"
 
 #. fifo
-#: ../fileio.c:1788
 msgid "[fifo]"
 msgstr "[fifo]"
 
 #. or socket
-#: ../fileio.c:1794
 msgid "[socket]"
 msgstr "[soketti]"
 
 #. or character special
-#: ../fileio.c:1801
 msgid "[character special]"
 msgstr "[merkki erikoinen]"
 
-# Carriage Return elikk� rivinvaihtomerkin er�s muoto/osa (vrt. LF)
-#: ../fileio.c:1815
+# Carriage Return elikkä rivinvaihtomerkin eräs muoto/osa (vrt. LF)
 msgid "[CR missing]"
 msgstr "[CR puuttuu]"
 
-#: ../fileio.c:1819
 msgid "[long lines split]"
-msgstr "[pitk�t rivit hajotettu]"
+msgstr "[pitkät rivit hajotettu]"
 
-#: ../fileio.c:1823 ../fileio.c:3512
 msgid "[NOT converted]"
 msgstr "[EI muunnettu]"
 
-#: ../fileio.c:1826 ../fileio.c:3515
 msgid "[converted]"
 msgstr "[muunnettu]"
 
-#: ../fileio.c:1831
-#, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[MUUNNOSVIRHE rivill� %<PRId64>]"
+#, fuzzy, c-format
+#~ msgid "[CONVERSION ERROR in line %<PRId64>]"
+#~ msgstr "[MUUNNOSVIRHE rivillä %ld]"
 
-#: ../fileio.c:1835
-#, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[VIRHEELLINEN OKTETTI rivill� %<PRId64>]"
+#, fuzzy, c-format
+#~ msgid "[ILLEGAL BYTE in line %<PRId64>]"
+#~ msgstr "[VIRHEELLINEN OKTETTI rivillä %ld]"
 
-#: ../fileio.c:1838
 msgid "[READ ERRORS]"
-msgstr "[LUKUVIRHEIT�]"
+msgstr "[LUKUVIRHEITÄ]"
 
-#: ../fileio.c:2104
 msgid "Can't find temp file for conversion"
-msgstr "Ei voi l�yt�� v�liaikaistiedstoa muuntamiseksi"
+msgstr "Ei voi löytää väliaikaistiedstoa muuntamiseksi"
 
-#: ../fileio.c:2110
 msgid "Conversion with 'charconvert' failed"
-msgstr "Muunnos charconvert ep�onnistui"
+msgstr "Muunnos charconvert epäonnistui"
 
-#: ../fileio.c:2113
 msgid "can't read output of 'charconvert'"
 msgstr "charconvertin tulostetta ei voida lukea"
 
-#: ../fileio.c:2437
 msgid "E676: No matching autocommands for acwrite buffer"
 msgstr "E676: Ei autocommand-komentoa acwrite-puskurille"
 
-#: ../fileio.c:2466
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr ""
 "E203: Autocommand-komennot poistivat tai vapauttivat puskurin, johon piti "
 "kirjoittaa"
 
-#: ../fileio.c:2486
 msgid "E204: Autocommand changed number of lines in unexpected way"
-msgstr "E204: Autocommand-komento muutti rivien m��r� odottamatta"
+msgstr "E204: Autocommand-komento muutti rivien määrä odottamatta"
 
-#: ../fileio.c:2548 ../fileio.c:2565
 msgid "is not a file or writable device"
 msgstr "ei ole tiedosto tai kirjoitettava laite"
 
-#: ../fileio.c:2601
 msgid "is read-only (add ! to override)"
-msgstr "on kirjoitussuojattu (lis�� komentoon ! ohittaaksesi)"
+msgstr "on kirjoitussuojattu (lisää komentoon ! ohittaaksesi)"
 
-#: ../fileio.c:2886
 msgid "E506: Can't write to backup file (add ! to override)"
 msgstr ""
-"E506: Ei voi kirjoittaa varmuuskopiotiedostoon (lis�� komentoon ! "
+"E506: Ei voi kirjoittaa varmuuskopiotiedostoon (lisää komentoon ! "
 "ohittaaksesi)"
 
-#: ../fileio.c:2898
-msgid "E507: Close error for backup file (add ! to override)"
-msgstr ""
-"E507: Varmuuskopiotiedoston sulkeminen ei onnistu (lis�� komentoon ! "
-"ohittaaksesi)"
+#, fuzzy, c-format
+#~ msgid "E507: Close error for backup file (add ! to override): %s"
+#~ msgstr ""
+#~ "E507: Varmuuskopiotiedoston sulkeminen ei onnistu (lisää komentoon ! "
+#~ "ohittaaksesi)"
 
-#: ../fileio.c:2901
 msgid "E508: Can't read file for backup (add ! to override)"
 msgstr ""
-"E508: Varmuuskopiotiedostoa ei voi lukea (lis�� komentoon ! ohittaaksesi)"
+"E508: Varmuuskopiotiedostoa ei voi lukea (lisää komentoon ! ohittaaksesi)"
 
-#: ../fileio.c:2923
 msgid "E509: Cannot create backup file (add ! to override)"
 msgstr ""
-"E509: Ei voi luoda varmuuskopiotiedostoa (lis�� komentoon ! ohittaaksesi)"
+"E509: Ei voi luoda varmuuskopiotiedostoa (lisää komentoon ! ohittaaksesi)"
 
-#: ../fileio.c:3008
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr ""
-"E510: Ei voi tehd� varmuuskopiotiedostoa (lis�� komentoon ! ohittaaksesi)"
+"E510: Ei voi tehdä varmuuskopiotiedostoa (lisää komentoon ! ohittaaksesi)"
 
 #. Can't write without a tempfile!
-#: ../fileio.c:3121
 msgid "E214: Can't find temp file for writing"
-msgstr "E214: Ei voi l�yt�� v�liaikaistiedostoa kirjoitettavaksi"
+msgstr "E214: Ei voi löytää väliaikaistiedostoa kirjoitettavaksi"
 
-#: ../fileio.c:3134
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr ""
-"E213: Muunnos ei onnistu (lis�� komentoon ! kirjoittaaksesi muuntamatta)"
+"E213: Muunnos ei onnistu (lisää komentoon ! kirjoittaaksesi muuntamatta)"
 
-#: ../fileio.c:3169
 msgid "E166: Can't open linked file for writing"
 msgstr "E166: Linkitetyn tiedoston avaus kirjoittamista varten ei onnistu"
 
-#: ../fileio.c:3173
-msgid "E212: Can't open file for writing"
-msgstr "E212: Tiedoston avaus kirjoittamista varten ei onnistu"
+#, fuzzy, c-format
+#~ msgid "E212: Can't open file for writing: %s"
+#~ msgstr "E212: Tiedoston avaus kirjoittamista varten ei onnistu"
 
-#: ../fileio.c:3363
-msgid "E667: Fsync failed"
-msgstr "E667: Fsync ei onnistunut"
+#, fuzzy, c-format
+#~ msgid "E667: Fsync failed: %s"
+#~ msgstr "E667: Fsync ei onnistunut"
 
-#: ../fileio.c:3398
-msgid "E512: Close failed"
-msgstr "E512: Sulkeminen ei onnistunut"
+#, fuzzy, c-format
+#~ msgid "E512: Close failed: %s"
+#~ msgstr "E512: Sulkeminen ei onnistunut"
 
-#: ../fileio.c:3436
 msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr "E513: kirjoitusvirhe, muunnos ep�onnistui (tyhj�� fenc ohittaaksesi)"
+msgstr "E513: kirjoitusvirhe, muunnos epäonnistui (tyhjää fenc ohittaaksesi)"
 
-#: ../fileio.c:3441
-#, c-format
-msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
-"override)"
-msgstr ""
-"E513: kirjoitusvirhe, muunnos ep�onnistui rivill� %<PRId64>(tyhj�� fenc "
-"ohittaaksesi)"
+#, fuzzy
+#~ msgid "E513: write error, conversion failed in line %"
+#~ msgstr ""
+#~ "E513: kirjoitusvirhe, muunnos epäonnistui rivillä %ld(tyhjää fenc "
+#~ "ohittaaksesi)"
 
-#: ../fileio.c:3448
 msgid "E514: write error (file system full?)"
-msgstr "E514: kirjoitusvirhe (tiedostoj�rjestelm� t�ysi)"
+msgstr "E514: kirjoitusvirhe (tiedostojärjestelmä täysi)"
 
-#: ../fileio.c:3506
 msgid " CONVERSION ERROR"
 msgstr " MUUNNOSVIRHE"
 
-#: ../fileio.c:3509
-#, c-format
-msgid " in line %<PRId64>;"
-msgstr " rivill� %<PRId64>"
+#, fuzzy, c-format
+#~ msgid " in line %<PRId64>;"
+#~ msgstr " rivillä %ld"
 
-#: ../fileio.c:3519
 msgid "[Device]"
 msgstr "[Laite]"
 
-#: ../fileio.c:3522
 msgid "[New]"
 msgstr "[Uusi]"
 
-#: ../fileio.c:3535
 msgid " [a]"
 msgstr " [a]"
 
-#: ../fileio.c:3535
 msgid " appended"
-msgstr " lis�tty"
+msgstr " lisätty"
 
-#: ../fileio.c:3537
 msgid " [w]"
 msgstr " [w]"
 
-#: ../fileio.c:3537
 msgid " written"
 msgstr " kirjoitettu"
 
-#: ../fileio.c:3579
 msgid "E205: Patchmode: can't save original file"
-msgstr "E205: Patch-tilassa ei voi tallentaa alkuper�istiedostoa"
+msgstr "E205: Patch-tilassa ei voi tallentaa alkuperäistiedostoa"
 
-#: ../fileio.c:3602
 msgid "E206: patchmode: can't touch empty original file"
-msgstr "E206: patch-tilassa ei voi muuttaa tyhj�� alkuper�istiedostoa"
+msgstr "E206: patch-tilassa ei voi muuttaa tyhjää alkuperäistiedostoa"
 
-#: ../fileio.c:3616
 msgid "E207: Can't delete backup file"
 msgstr "E207: Ei voi poistaa varmuuskopiota"
 
-#: ../fileio.c:3672
+#. Set highlight for error messages.
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
 msgstr ""
 "\n"
-"VAROITUS: Alkuper�istiedosto voi h�vit� tai vahingoittua\n"
+"VAROITUS: Alkuperäistiedosto voi hävitä tai vahingoittua\n"
 
-#: ../fileio.c:3675
 msgid "don't quit the editor until the file is successfully written!"
-msgstr "�l� lopeta editoria kesken tallentamisen."
+msgstr "älä lopeta editoria kesken tallentamisen."
 
-#: ../fileio.c:3795
-msgid "[dos]"
-msgstr "[dos]"
-
-#: ../fileio.c:3795
 msgid "[dos format]"
 msgstr "[dos-muoto]"
 
-#: ../fileio.c:3801
-msgid "[mac]"
-msgstr "[mac]"
+msgid "[dos]"
+msgstr "[dos]"
 
-#: ../fileio.c:3801
 msgid "[mac format]"
 msgstr "[mac-muoto]"
 
-#: ../fileio.c:3807
-msgid "[unix]"
-msgstr "[unix]"
+msgid "[mac]"
+msgstr "[mac]"
 
-#: ../fileio.c:3807
 msgid "[unix format]"
 msgstr "[unix-muoto]"
 
-#: ../fileio.c:3831
+msgid "[unix]"
+msgstr "[unix]"
+
 msgid "1 line, "
 msgstr "1 rivi, "
 
-#: ../fileio.c:3833
-#, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> rivi�, "
+#, fuzzy, c-format
+#~ msgid "%<PRId64> lines, "
+#~ msgstr "%ld riviä, "
 
-#: ../fileio.c:3836
 msgid "1 character"
 msgstr "1 merkki"
 
-#: ../fileio.c:3838
-#, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64> merkki�"
+#, fuzzy, c-format
+#~ msgid "%<PRId64> characters"
+#~ msgstr "%lld merkkiä"
 
-# ei rivinvaihtoja
-#: ../fileio.c:3849
-msgid "[noeol]"
-msgstr "[eiriviv.]"
-
-#: ../fileio.c:3849
 msgid "[Incomplete last line]"
 msgstr "[Vajaa viimeinen rivi]"
 
-# Jos aukiolevaa tiedostoa s�rkkii toisella ohjelmalla
-#. don't overwrite messages here
-#. must give this prompt
-#. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
-msgid "WARNING: The file has been changed since reading it!!!"
-msgstr "VAROITUS: tiedosto on muuttunut viime lukukerran j�lkeen!"
+# ei rivinvaihtoja
+msgid "[noeol]"
+msgstr "[eiriviv.]"
+
+# Jos aukiolevaa tiedostoa sörkkii toisella ohjelmalla
+#. Don't overwrite messages here.
+#. Must give this prompt.
+#. Don't use emsg() here, don't want to flush the buffers.
+msgid "WARNING: The file has been changed since reading it!!!"
+msgstr "VAROITUS: tiedosto on muuttunut viime lukukerran jälkeen!"
 
-#: ../fileio.c:3867
 msgid "Do you really want to write to it"
 msgstr "Kirjoitetaanko"
 
-#: ../fileio.c:4648
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: Virhe kirjoitettaessa tiedostoon %s"
 
-#: ../fileio.c:4655
 #, c-format
 msgid "E209: Error closing \"%s\""
 msgstr "E209: Virhe suljettaessa tiedostoa %s"
 
-#: ../fileio.c:4657
 #, c-format
 msgid "E210: Error reading \"%s\""
 msgstr "E210: Virhe luettaessa tiedostoa %s"
 
-#: ../fileio.c:4883
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: FileChangedShell-autocommand poisti puskurin"
 
-#: ../fileio.c:4894
 #, c-format
 msgid "E211: File \"%s\" no longer available"
-msgstr "E211: Tiedostoa %s ei ole en��"
+msgstr "E211: Tiedostoa %s ei ole enää"
 
-#: ../fileio.c:4906
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
@@ -2389,41 +2396,33 @@ msgstr ""
 "W12: Varoitus: Tiedostoa %s on muutettu ja Vimin puskurissa on muutoksia "
 "tiedostoon"
 
-#: ../fileio.c:4907
 msgid "See \":help W12\" for more info."
-msgstr ":help W12 kertoo lis�tietoja."
+msgstr ":help W12 kertoo lisätietoja."
 
-#: ../fileio.c:4910
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
-msgstr "W11: Varoitus: Tiedostoa %s on muutettu muokkauksen aloituksen j�lkeen"
+msgstr "W11: Varoitus: Tiedostoa %s on muutettu muokkauksen aloituksen jälkeen"
 
-#: ../fileio.c:4911
 msgid "See \":help W11\" for more info."
-msgstr ":help W11 kertoo lis�tietoja."
+msgstr ":help W11 kertoo lisätietoja."
 
-#: ../fileio.c:4914
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr ""
 "W16: Varoitus: Tiedoston %s oikeuksia on muutettu muokkauksen aloituksen "
-"j�lkeen"
+"jälkeen"
 
-#: ../fileio.c:4915
 msgid "See \":help W16\" for more info."
-msgstr ":help W16 kertoo lis�tietoja."
+msgstr ":help W16 kertoo lisätietoja."
 
-#: ../fileio.c:4927
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
-msgstr "W13: Varoitus: Tiedosto %s on luotu muokkauksen aloituksen j�lkeen"
+msgstr "W13: Varoitus: Tiedosto %s on luotu muokkauksen aloituksen jälkeen"
 
-#: ../fileio.c:4947
 msgid "Warning"
 msgstr "Varoitus"
 
-# yll� olevien varoitusten ratkaisut
-#: ../fileio.c:4948
+# yllä olevien varoitusten ratkaisut
 msgid ""
 "&OK\n"
 "&Load File"
@@ -2431,48 +2430,46 @@ msgstr ""
 "&OK\n"
 "&Avaa tiedosto uudelleen"
 
-#: ../fileio.c:5065
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
 msgstr "E462: Ei voitu valmistella uudelleen avausta %s"
 
-#: ../fileio.c:5078
 #, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: Ei voitu uudelleenavata %s"
 
-#: ../fileio.c:5601
 msgid "--Deleted--"
 msgstr "--Poistettu--"
 
-#: ../fileio.c:5732
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "poistetaan autocommand automaattisesti: %s <puskuri=%d>"
 
 #. the group doesn't exist
-#: ../fileio.c:5772
 #, c-format
 msgid "E367: No such group: \"%s\""
-msgstr "E367: Ryhm�� ei ole: %s"
+msgstr "E367: Ryhmää ei ole: %s"
+
+#, fuzzy
+#~ msgid "E936: Cannot delete the current group"
+#~ msgstr "E351: Taitosta ei voi poistaa tällä foldmethodilla"
+
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: käytössä oleva augroup poistetaan"
 
-#: ../fileio.c:5897
 #, c-format
 msgid "E215: Illegal character after *: %s"
-msgstr "E215: Virheellinen merkki *:n j�lkeen: %s"
+msgstr "E215: Virheellinen merkki *:n jälkeen: %s"
 
-#: ../fileio.c:5905
 #, c-format
 msgid "E216: No such event: %s"
-msgstr "E216: Eventti� ei ole: %s"
+msgstr "E216: Eventtiä ei ole: %s"
 
-#: ../fileio.c:5907
 #, c-format
 msgid "E216: No such group or event: %s"
-msgstr "E216: Ryhm�� tai eventti� ei ole: %s"
+msgstr "E216: Ryhmää tai eventtiä ei ole: %s"
 
 #. Highlight title
-#: ../fileio.c:6090
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@@ -2480,762 +2477,611 @@ msgstr ""
 "\n"
 "--- Autocommandit ---"
 
-#: ../fileio.c:6293
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
 msgstr "E680: <puskuri=%d>: virheellinen puskurinumero"
 
-#: ../fileio.c:6370
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: Ei voi suorittaa autocommandsia kaikille eventeille"
 
-#: ../fileio.c:6393
 msgid "No matching autocommands"
-msgstr "Ei t�sm��vi� autocommandsia"
+msgstr "Ei täsmääviä autocommandsia"
 
-#: ../fileio.c:6831
 msgid "E218: autocommand nesting too deep"
 msgstr "E218: liian monta tasoa autocommandissa"
 
-#: ../fileio.c:7143
 #, c-format
 msgid "%s Auto commands for \"%s\""
 msgstr "%s Autocommands kohteelle %s"
 
-#: ../fileio.c:7149
 #, c-format
 msgid "Executing %s"
 msgstr "Suoritetaan %s"
 
-#: ../fileio.c:7211
 #, c-format
 msgid "autocommand %s"
 msgstr "autocommand %s"
 
-#: ../fileio.c:7795
 msgid "E219: Missing {."
 msgstr "E219: { puuttuu."
 
-#: ../fileio.c:7797
 msgid "E220: Missing }."
 msgstr "E220: } puuttuu."
 
-#: ../fold.c:93
 msgid "E490: No fold found"
 msgstr "E490: taitos puuttuu"
 
-#: ../fold.c:544
 msgid "E350: Cannot create fold with current 'foldmethod'"
-msgstr "E350: Taitoksia ei voi tehd� t�ll� foldmethodilla"
+msgstr "E350: Taitoksia ei voi tehdä tällä foldmethodilla"
 
-#: ../fold.c:546
 msgid "E351: Cannot delete fold with current 'foldmethod'"
-msgstr "E351: Taitosta ei voi poistaa t�ll� foldmethodilla"
+msgstr "E351: Taitosta ei voi poistaa tällä foldmethodilla"
 
-#: ../fold.c:1784
-#, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld rivi� taitettu pois "
+#, fuzzy, c-format
+#~ msgid "+--%3ld lines folded "
+#~ msgstr "+--%3ld rivi taitettu pois "
 
 #. buffer has already been read
-#: ../getchar.c:273
 msgid "E222: Add to read buffer"
-msgstr "E222: Lis�� lukupuskuriin"
+msgstr "E222: Lisää lukupuskuriin"
 
-#: ../getchar.c:2040
 msgid "E223: recursive mapping"
 msgstr "E223: rekursiivinen kuvaus"
 
-#: ../getchar.c:2849
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
-msgstr "E224: globaali lyhenne merkinn�lle %s on jo olemassa"
+msgstr "E224: globaali lyhenne merkinnälle %s on jo olemassa"
 
-#: ../getchar.c:2852
 #, c-format
 msgid "E225: global mapping already exists for %s"
-msgstr "E225: globaali kuvaus merkinn�lle %s on jo olemassa"
+msgstr "E225: globaali kuvaus merkinnälle %s on jo olemassa"
 
-#: ../getchar.c:2952
 #, c-format
 msgid "E226: abbreviation already exists for %s"
 msgstr "E226: lyhenne on jo olemassa %s"
 
-#: ../getchar.c:2955
 #, c-format
 msgid "E227: mapping already exists for %s"
 msgstr "E227: kuvaus on jo olemassa %s"
 
-#: ../getchar.c:3008
 msgid "No abbreviation found"
-msgstr "Lyhennett� ei l�ydy"
+msgstr "Lyhennettä ei löydy"
 
-#: ../getchar.c:3010
 msgid "No mapping found"
-msgstr "Kuvausta ei l�ydy"
+msgstr "Kuvausta ei löydy"
 
-#: ../getchar.c:3974
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: Virheellinen tila"
 
 #. key value of 'cedit' option
 #. type of cmdline window or 0
 #. result of cmdline window or 0
-#: ../globals.h:924
 msgid "--No lines in buffer--"
-msgstr "--Ei rivej� puskurissa--"
+msgstr "--Ei rivejä puskurissa--"
 
 #.
 #. * The error messages that can be shared are included here.
 #. * Excluded are errors that are only used once and debugging messages.
 #.
-#: ../globals.h:996
 msgid "E470: Command aborted"
 msgstr "E470: Komento peruttu"
 
-#: ../globals.h:997
+#, fuzzy
+#~ msgid "E905: Cannot set this option after startup"
+#~ msgstr "E529: Termiä ei voi asettaa tyhjäksi merkkijonoksi"
+
+#, fuzzy
+#~ msgid "E903: Could not spawn API job"
+#~ msgstr "E623: Cscope-prosessin luonti epäonnistui"
+
 msgid "E471: Argument required"
 msgstr "E471: Argumentti puuttuu"
 
-#: ../globals.h:998
 msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\:n j�lkeen pit�� tulla /, ? tai &"
+msgstr "E10: \\:n jälkeen pitää tulla /, ? tai &"
 
-#: ../globals.h:1000
 msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
 msgstr "E11: Virheellinen komentorivi-ikkuna, <CR> suorittaa, Ctrl C lopettaa"
 
-#: ../globals.h:1002
 msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
 msgstr ""
-"E12: Komentoa ei tueta exrc:ss� tai vimrc:ss� t�ss� hakemistossa tai "
-"t�gihaussa"
+"E12: Komentoa ei tueta exrc:ssä tai vimrc:ssä tässä hakemistossa tai "
+"tägihaussa"
 
-#: ../globals.h:1003
 msgid "E171: Missing :endif"
 msgstr "E171: :endif puuttuu"
 
-#: ../globals.h:1004
 msgid "E600: Missing :endtry"
 msgstr "E600: :endtry puuttuu"
 
-#: ../globals.h:1005
 msgid "E170: Missing :endwhile"
 msgstr "E170: :endwhile puuttuu"
 
-#: ../globals.h:1006
 msgid "E170: Missing :endfor"
 msgstr "E170: :endfor puuttuu"
 
-#: ../globals.h:1007
 msgid "E588: :endwhile without :while"
 msgstr "E588: :endwhile ilman komentoa :while"
 
-#: ../globals.h:1008
 msgid "E588: :endfor without :for"
 msgstr "E588: :endfor ilman komentoa :for"
 
-#: ../globals.h:1009
 msgid "E13: File exists (add ! to override)"
-msgstr "E13: Tiedosto on jo olemassa (lis�� ! ohittaaksesi)"
+msgstr "E13: Tiedosto on jo olemassa (lisää ! ohittaaksesi)"
 
-#: ../globals.h:1010
 msgid "E472: Command failed"
-msgstr "E472: Komento ep�onnistui"
+msgstr "E472: Komento epäonnistui"
 
-#: ../globals.h:1011
 msgid "E473: Internal error"
-msgstr "E473: Sis�inen virhe"
+msgstr "E473: Sisäinen virhe"
 
-#: ../globals.h:1012
 msgid "Interrupted"
 msgstr "Keskeytetty"
 
-#: ../globals.h:1013
 msgid "E14: Invalid address"
 msgstr "E14: Virheellinen osoite"
 
-#: ../globals.h:1014
 msgid "E474: Invalid argument"
 msgstr "E474: Virheellinen argumentti"
 
-#: ../globals.h:1015
 #, c-format
 msgid "E475: Invalid argument: %s"
 msgstr "E475: Virheellinen argumentti: %s"
 
-#: ../globals.h:1016
 #, c-format
 msgid "E15: Invalid expression: %s"
 msgstr "E15: Virheellinen ilmaus: %s"
 
-#: ../globals.h:1017
 msgid "E16: Invalid range"
 msgstr "E16: Virheellinen arvoalue"
 
-#: ../globals.h:1018
 msgid "E476: Invalid command"
 msgstr "E476: Virheellinen komento"
 
-#: ../globals.h:1019
 #, c-format
 msgid "E17: \"%s\" is a directory"
 msgstr "E17: %s on hakemisto"
 
-#: ../globals.h:1020
 #, fuzzy
-msgid "E900: Invalid job id"
-msgstr "E49: Virheellinen vierityskoko"
+#~ msgid "E900: Invalid job id"
+#~ msgstr "E916: ei ole job"
 
-#: ../globals.h:1021
-msgid "E901: Job table is full"
-msgstr ""
+#~ msgid "E901: Job table is full"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "E903: Process failed to start: %s: \"%s\""
+#~ msgstr "E852: Lapsiprosesi ei voinut käynnistää käyttöliittymää"
+
+#, fuzzy
+#~ msgid "E904: Job is not connected to a pty"
+#~ msgstr "E902: Ei voi yhdistää porttiin"
 
-#: ../globals.h:1024
 #, c-format
 msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: Kirjastukutsu %s() ep�onnistui"
+msgstr "E364: Kirjastukutsu %s() epäonnistui"
+
+#, fuzzy, c-format
+#~ msgid "E739: Cannot create directory %s: %s"
+#~ msgstr "E739: hakemistoa ei voi luoda: %s"
 
-#: ../globals.h:1026
 msgid "E19: Mark has invalid line number"
-msgstr "E19: Merkill� on virheellinen rivinumero"
+msgstr "E19: Merkillä on virheellinen rivinumero"
 
-#: ../globals.h:1027
 msgid "E20: Mark not set"
-msgstr "E20: Merkki� ei asetettu"
+msgstr "E20: Merkkiä ei asetettu"
 
-#: ../globals.h:1029
 msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: Ei voi tehd� muutoksia, modifiable on pois p��lt�"
+msgstr "E21: Ei voi tehdä muutoksia, modifiable on pois päältä"
 
-#: ../globals.h:1030
 msgid "E22: Scripts nested too deep"
-msgstr "E22: Liian monta tasoa skripteiss�"
+msgstr "E22: Liian monta tasoa skripteissä"
 
-#: ../globals.h:1031
 msgid "E23: No alternate file"
 msgstr "E23: Eo vaihtoehtoista tiedostoa"
 
-#: ../globals.h:1032
 msgid "E24: No such abbreviation"
-msgstr "E24: Lyhennett� ei ole"
+msgstr "E24: Lyhennettä ei ole"
 
-#: ../globals.h:1033
 msgid "E477: No ! allowed"
 msgstr "E477: ! ei sallittu"
 
-#: ../globals.h:1035
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: GUIta ei voi k�ytt��, koska sit� ei k��nnetty mukaan"
+#~ msgid "E25: Nvim does not have a built-in GUI"
+#~ msgstr ""
 
-#: ../globals.h:1036
 #, c-format
 msgid "E28: No such highlight group name: %s"
-msgstr "E28: Korostusryhm�� ei ole nimell�: %s"
+msgstr "E28: Korostusryhmää ei ole nimellä: %s"
 
-#: ../globals.h:1037
 msgid "E29: No inserted text yet"
-msgstr "E29: Teksti� ei ole sy�tetty viel�"
+msgstr "E29: Tekstiä ei ole syötetty vielä"
 
-#: ../globals.h:1038
 msgid "E30: No previous command line"
-msgstr "E30: Ei edellist� komentorivi�"
+msgstr "E30: Ei edellistä komentoriviä"
 
-#: ../globals.h:1039
 msgid "E31: No such mapping"
 msgstr "E31: Kuvausta ei ole"
 
-#: ../globals.h:1040
 msgid "E479: No match"
-msgstr "E479: Ei t�sm��"
+msgstr "E479: Ei täsmää"
 
-#: ../globals.h:1041
 #, c-format
 msgid "E480: No match: %s"
-msgstr "E480: Ei ts�m��: %s"
+msgstr "E480: Ei tsämää: %s"
 
-#: ../globals.h:1042
 msgid "E32: No file name"
-msgstr "E32: Ei tiedostonime�"
+msgstr "E32: Ei tiedostonimeä"
 
-#: ../globals.h:1044
 msgid "E33: No previous substitute regular expression"
-msgstr "E33: Ei edellist� korvausta s��nn�lliselle ilmaukselle"
+msgstr "E33: Ei edellistä korvausta säännölliselle ilmaukselle"
 
-#: ../globals.h:1045
 msgid "E34: No previous command"
-msgstr "E34: Ei edellist� komentoa"
+msgstr "E34: Ei edellistä komentoa"
 
-#: ../globals.h:1046
 msgid "E35: No previous regular expression"
-msgstr "E35: Ei edellist� s��nn�llist� ilmausta"
+msgstr "E35: Ei edellistä säännöllistä ilmausta"
 
-#: ../globals.h:1047
 msgid "E481: No range allowed"
 msgstr "E481: Arvoalue ei sallittu"
 
-#: ../globals.h:1048
 msgid "E36: Not enough room"
-msgstr "E36: Tila ei riit�"
+msgstr "E36: Tila ei riitä"
 
-#: ../globals.h:1049
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: Tiedostoa %s ei voi luoda"
-
-#: ../globals.h:1050
 msgid "E483: Can't get temp file name"
-msgstr "E483: v�liaikaistiedoston nime� ei saada selville"
+msgstr "E483: väliaikaistiedoston nimeä ei saada selville"
 
-#: ../globals.h:1051
 #, c-format
 msgid "E484: Can't open file %s"
 msgstr "E484: Ei voi avata tiedostoa %s"
 
-#: ../globals.h:1052
 #, c-format
 msgid "E485: Can't read file %s"
 msgstr "E485: Ei voi lukea tiedostoa %s"
 
-#: ../globals.h:1054
 msgid "E37: No write since last change (add ! to override)"
 msgstr ""
-"E37: Viimeisen muutoksen j�lkeen ei ole kirjoitettu (lis�� ! ohittaaksesi)"
+"E37: Viimeisen muutoksen jälkeen ei ole kirjoitettu (lisää ! ohittaaksesi)"
 
-#: ../globals.h:1055
-#, fuzzy
 msgid "E37: No write since last change"
-msgstr "[Viimeisint� muutosta ei ole kirjoitettu]\n"
+msgstr "E37: Viimeisimmän muutoksen jälkeen ei ole kirjoitettu mitään"
 
-#: ../globals.h:1056
 msgid "E38: Null argument"
 msgstr "E38: Null-argumentti"
 
-#: ../globals.h:1057
 msgid "E39: Number expected"
-msgstr "E39: Pit�� olla numero"
+msgstr "E39: Pitää olla numero"
 
-#: ../globals.h:1058
 #, c-format
 msgid "E40: Can't open errorfile %s"
 msgstr "E40: virhetiedostoa %s ei voi avata"
 
-#: ../globals.h:1059
 msgid "E41: Out of memory!"
 msgstr "E41: Muisti loppui"
 
-#: ../globals.h:1060
 msgid "Pattern not found"
-msgstr "Kuviota ei l�ydy"
+msgstr "Kuviota ei löydy"
 
-#: ../globals.h:1061
 #, c-format
 msgid "E486: Pattern not found: %s"
-msgstr "E486: Kuviota ei l�ydy: %s"
+msgstr "E486: Kuviota ei löydy: %s"
 
-#: ../globals.h:1062
 msgid "E487: Argument must be positive"
-msgstr "E487: Argumentin pit�� olla positiivinen"
+msgstr "E487: Argumentin pitää olla positiivinen"
 
-#: ../globals.h:1064
 msgid "E459: Cannot go back to previous directory"
-msgstr "E459: Ei voi siirty� edelliseen hakemistoon"
+msgstr "E459: Ei voi siirtyä edelliseen hakemistoon"
 
 # ;-)
-#: ../globals.h:1066
 msgid "E42: No Errors"
-msgstr "E42: Ei virheit�"
+msgstr "E42: Ei virheitä"
 
-#: ../globals.h:1067
 msgid "E776: No location list"
 msgstr "E776: Ei sijaintilistaa"
 
-#: ../globals.h:1068
 msgid "E43: Damaged match string"
-msgstr "E43: Viallinen t�sm�ysmerkkijono"
+msgstr "E43: Viallinen täsmäysmerkkijono"
 
-#: ../globals.h:1069
 msgid "E44: Corrupted regexp program"
 msgstr "E44: Viallinen regexp-ohjelma"
 
-#: ../globals.h:1071
 msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: readonly asetettu (lis�� ! ohittaaksesi)"
+msgstr "E45: readonly asetettu (lisää ! ohittaaksesi)"
 
-#: ../globals.h:1073
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: Kirjoitussuojattua muuttujaa %s ei voi muuttaa"
-
-#: ../globals.h:1075
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: Muuttujaa ei voi asettaa hiekkalaatikossa: %s"
-
-#: ../globals.h:1076
 msgid "E47: Error while reading errorfile"
 msgstr "E47: Virhe virhetiedostoa luettaessa"
 
-#: ../globals.h:1078
 msgid "E48: Not allowed in sandbox"
 msgstr "E48: Ei sallittu hiekkalaatikossa"
 
-#: ../globals.h:1080
 msgid "E523: Not allowed here"
-msgstr "E523: Ei sallittu t��ll�"
+msgstr "E523: Ei sallittu täällä"
 
-#: ../globals.h:1082
 msgid "E359: Screen mode setting not supported"
-msgstr "E359: N�ytt�tila-asetus ei tuettu"
+msgstr "E359: Näyttötila-asetus ei tuettu"
 
-#: ../globals.h:1083
 msgid "E49: Invalid scroll size"
 msgstr "E49: Virheellinen vierityskoko"
 
-#: ../globals.h:1084
 msgid "E91: 'shell' option is empty"
-msgstr "E91: shell-asetus on tyhj�"
+msgstr "E91: shell-asetus on tyhjä"
 
-#: ../globals.h:1085
 msgid "E255: Couldn't read in sign data!"
 msgstr "E255: Merkkidatan luku ei onnistu"
 
-#: ../globals.h:1086
 msgid "E72: Close error on swap file"
 msgstr "E72: Swap-tiedoston sulkemisvirhe"
 
-#: ../globals.h:1087
 msgid "E73: tag stack empty"
-msgstr "E73: t�gipino tyhj�"
+msgstr "E73: tägipino tyhjä"
 
-#: ../globals.h:1088
 msgid "E74: Command too complex"
 msgstr "E74: Liian monimutkainen komento"
 
-#: ../globals.h:1089
 msgid "E75: Name too long"
-msgstr "E75: Liian pitk� nimi"
+msgstr "E75: Liian pitkä nimi"
 
-#: ../globals.h:1090
 msgid "E76: Too many ["
 msgstr "E76: Liian monta [:a"
 
-#: ../globals.h:1091
 msgid "E77: Too many file names"
-msgstr "E77: Liikaa tiedostonimi�"
+msgstr "E77: Liikaa tiedostonimiä"
 
-#: ../globals.h:1092
 msgid "E488: Trailing characters"
-msgstr "E488: Ylim��r�isi� merkkej� per�ss�"
+msgstr "E488: Ylimääräisiä merkkejä perässä"
 
-#: ../globals.h:1093
 msgid "E78: Unknown mark"
 msgstr "E78: Tuntematon merkki"
 
-#: ../globals.h:1094
 msgid "E79: Cannot expand wildcards"
 msgstr "E79: Jokerimerkkien avaus ei onnistu"
 
-#: ../globals.h:1096
 msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
 msgstr "E591: winheight ei voi olla pienempi kuin winminheight"
 
-#: ../globals.h:1098
 msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
 msgstr "E592: winwidth ei voi olla pienempi kuin winminwidth"
 
-#: ../globals.h:1099
 msgid "E80: Error while writing"
 msgstr "E80: Kirjoitusvirhe"
 
-#: ../globals.h:1100
 msgid "Zero count"
 msgstr "Nollalaskuri"
 
-#: ../globals.h:1101
 msgid "E81: Using <SID> not in a script context"
 msgstr "E81: <SID> skriptin ulkopuolella"
 
-#: ../globals.h:1102
 #, c-format
 msgid "E685: Internal error: %s"
-msgstr "E685: Sis�inen virhe: %s"
+msgstr "E685: Sisäinen virhe: %s"
 
-#: ../globals.h:1104
 msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: kuvio k�ytt�� enemm�n muistia kuin maxmempattern on"
+msgstr "E363: kuvio käyttää enemmän muistia kuin maxmempattern on"
 
-#: ../globals.h:1105
 msgid "E749: empty buffer"
-msgstr "E749: tyhj� puskuri"
+msgstr "E749: tyhjä puskuri"
+
+#, fuzzy, c-format
+#~ msgid "E86: Buffer %<PRId64> does not exist"
+#~ msgstr "E86: Puskuria %ld ei ole"
 
-#: ../globals.h:1108
 msgid "E682: Invalid search pattern or delimiter"
 msgstr "E682: Virheellinen hakulauseke tai erotin"
 
-#: ../globals.h:1109
 msgid "E139: File is loaded in another buffer"
 msgstr "E139: Tiedosto on ladattu toiseen puskuriin"
 
-#: ../globals.h:1110
 #, c-format
 msgid "E764: Option '%s' is not set"
 msgstr "E764: Asetus %s on asettamatta"
 
-#: ../globals.h:1111
-#, fuzzy
 msgid "E850: Invalid register name"
-msgstr "E354: Virheellinen rekisterin nimi: %s"
+msgstr "E850: Virheellinen rekisterin nimi"
+
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: Hakemisto puuttuu kohteesta %s: %s"
+
+msgid "E519: Option not supported"
+msgstr "E519: Asetusta ei tueta"
+
+#, fuzzy
+#~ msgid "E856: Filename too long"
+#~ msgstr "E75: Liian pitkä nimi"
+
+msgid "E806: using Float as a String"
+msgstr "E806: Float ei käy merkkijonosta"
 
-#: ../globals.h:1114
 msgid "search hit TOP, continuing at BOTTOM"
-msgstr "haku p��si ALKUUN, jatketaan LOPUSTA"
+msgstr "haku pääsi ALKUUN, jatketaan LOPUSTA"
 
-#: ../globals.h:1115
 msgid "search hit BOTTOM, continuing at TOP"
-msgstr "haku p��si LOPPUUN, jatketaan ALUSTA"
+msgstr "haku pääsi LOPPUUN, jatketaan ALUSTA"
 
-#: ../hardcopy.c:240
 msgid "E550: Missing colon"
 msgstr "E550: kaksoispiste puuttuu"
 
-#: ../hardcopy.c:252
 msgid "E551: Illegal component"
 msgstr "E551: Virheellinen komponentti"
 
-#: ../hardcopy.c:259
 msgid "E552: digit expected"
-msgstr "E552: pit�isi olla numero"
+msgstr "E552: pitäisi olla numero"
 
-#: ../hardcopy.c:473
 #, c-format
 msgid "Page %d"
 msgstr "Sivu %d"
 
-#: ../hardcopy.c:597
 msgid "No text to be printed"
-msgstr "Ei teksti� tulostettavaksi"
+msgstr "Ei tekstiä tulostettavaksi"
 
-#: ../hardcopy.c:668
-#, c-format
-msgid "Printing page %d (%d%%)"
-msgstr "Tulostetaan sivua %d (%d %%)"
+#, fuzzy, c-format
+#~ msgid "Printing page %d (%zu%%)"
+#~ msgstr "Tulostetaan sivua %d (%d %%)"
 
-#: ../hardcopy.c:680
 #, c-format
 msgid " Copy %d of %d"
 msgstr " Kopio %d/%d"
 
-#: ../hardcopy.c:733
 #, c-format
 msgid "Printed: %s"
 msgstr "Tulostettu: %s"
 
-#: ../hardcopy.c:740
 msgid "Printing aborted"
 msgstr "Tulostus peruttu"
 
-#: ../hardcopy.c:1365
 msgid "E455: Error writing to PostScript output file"
-msgstr "E455: Virhe kirjoitettaessa PostScripti� tiedostoon"
+msgstr "E455: Virhe kirjoitettaessa PostScriptiä tiedostoon"
 
-#: ../hardcopy.c:1747
 #, c-format
 msgid "E624: Can't open file \"%s\""
 msgstr "E624: Ei voi avata tiedostoa %s"
 
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
 msgstr "E457: Ei voi lukea PostScript-resurssitiedostoa %s"
 
-#: ../hardcopy.c:1772
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
 msgstr "E618: tiedosto %s ei ole PostScript-resurssitiedosto"
 
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
 msgstr "E619: tiedosto %s ei ole tuettu PostScript-resurssitiedosto"
 
-#: ../hardcopy.c:1856
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
-msgstr "E621: resurssitiedoston %s versio on v��r�"
+msgstr "E621: resurssitiedoston %s versio on väärä"
 
-#: ../hardcopy.c:2225
 msgid "E673: Incompatible multi-byte encoding and character set."
-msgstr "E673: Tukematon monitvauinen merkist�koodaus ja merkist�."
+msgstr "E673: Tukematon monitvauinen merkistökoodaus ja merkistö."
 
-#: ../hardcopy.c:2238
 msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
-msgstr "E674: printmbcharset ei voi olla tyhj� monitavuiselle koodaukselle."
+msgstr "E674: printmbcharset ei voi olla tyhjä monitavuiselle koodaukselle."
 
-#: ../hardcopy.c:2254
 msgid "E675: No default font specified for multi-byte printing."
 msgstr "E675: Ei oletusfonttia monitavuiseen tulostukseen"
 
-#: ../hardcopy.c:2426
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: PostScript-tulostetiedoston avaus ei onnistu"
 
-#: ../hardcopy.c:2458
 #, c-format
 msgid "E456: Can't open file \"%s\""
 msgstr "E456: Tiedoston %s avaus ei onnistu"
 
-#: ../hardcopy.c:2583
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
-msgstr "E456: PostScript-resurssitiedostoa prolog.ps ei l�ydy"
+msgstr "E456: PostScript-resurssitiedostoa prolog.ps ei löydy"
 
-#: ../hardcopy.c:2593
 msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
-msgstr "E456: PostScript-resurssitiedostoa cidfont.ps ei l�ydy"
+msgstr "E456: PostScript-resurssitiedostoa cidfont.ps ei löydy"
 
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
-msgstr "E456: Postscript-resurssitiedosta %s.ps ei l�ydy"
+msgstr "E456: Postscript-resurssitiedosta %s.ps ei löydy"
 
-#: ../hardcopy.c:2654
 #, c-format
 msgid "E620: Unable to convert to print encoding \"%s\""
 msgstr "E620: Tulostuskoodaukseen %s muunto ei onnistu"
 
-#: ../hardcopy.c:2877
 msgid "Sending to printer..."
-msgstr "L�hetet��n tulostimelle..."
+msgstr "Lähetetään tulostimelle..."
 
-#: ../hardcopy.c:2881
 msgid "E365: Failed to print PostScript file"
-msgstr "E365: PostScript-tiedoston tulostus ep�onnistui"
+msgstr "E365: PostScript-tiedoston tulostus epäonnistui"
 
-#: ../hardcopy.c:2883
 msgid "Print job sent."
-msgstr "Tulostusty� l�hetetty."
+msgstr "Tulostustyö lähetetty."
 
-#: ../if_cscope.c:85
 msgid "Add a new database"
-msgstr "Lis�� uusi tietokanta"
+msgstr "Lisää uusi tietokanta"
 
-#: ../if_cscope.c:87
 msgid "Query for a pattern"
 msgstr "Hae kuviota"
 
-#: ../if_cscope.c:89
 msgid "Show this message"
-msgstr "N�yt� t�m� viesti"
+msgstr "Näytä tämä viesti"
 
-#: ../if_cscope.c:91
 msgid "Kill a connection"
 msgstr "Tapa yhteys"
 
-#: ../if_cscope.c:93
 msgid "Reinit all connections"
 msgstr "Alusta uudelleen yhteydet"
 
-#: ../if_cscope.c:95
 msgid "Show connections"
-msgstr "N�yt� yhteydet"
+msgstr "Näytä yhteydet"
 
-#: ../if_cscope.c:101
 #, c-format
 msgid "E560: Usage: cs[cope] %s"
-msgstr "E560: K�ytt�: cs[cope] %s"
+msgstr "E560: Käyttö: cs[cope] %s"
 
-#: ../if_cscope.c:225
 msgid "This cscope command does not support splitting the window.\n"
-msgstr "T�m� cscope-komento ei tue ikkunan jakamista.\n"
+msgstr "Tämä cscope-komento ei tue ikkunan jakamista.\n"
 
-#: ../if_cscope.c:266
 msgid "E562: Usage: cstag <ident>"
-msgstr "E562: K�ytt�: cstag <ident>"
+msgstr "E562: Käyttö: cstag <ident>"
 
-#: ../if_cscope.c:313
 msgid "E257: cstag: tag not found"
-msgstr "E257: cstag: t�gia ei l�ydy"
+msgstr "E257: cstag: tägia ei löydy"
 
-#: ../if_cscope.c:461
 #, c-format
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: stat(%s)-virhe: %d"
 
-#: ../if_cscope.c:551
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
-msgstr "E564: %s ei ole hakemisto eik� cscope-tietokanta"
+msgstr "E564: %s ei ole hakemisto eikä cscope-tietokanta"
 
-#: ../if_cscope.c:566
 #, c-format
 msgid "Added cscope database %s"
-msgstr "Lis�tty cscope-tietokanta %s"
+msgstr "Lisätty cscope-tietokanta %s"
 
-#: ../if_cscope.c:616
-#, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: Virhe luettaessa cscope-yhteytt� %<PRId64>"
+#, fuzzy, c-format
+#~ msgid "E262: error reading cscope connection %<PRIu64>"
+#~ msgstr "E262: Virhe luettaessa cscope-yhteyttä %ld"
 
-#: ../if_cscope.c:711
 msgid "E561: unknown cscope search type"
 msgstr "E561: tuntematon cscope-hakutyyppi"
 
-#: ../if_cscope.c:752 ../if_cscope.c:789
 msgid "E566: Could not create cscope pipes"
 msgstr "E566: Ei voitu luoda cscope-putkia"
 
-#: ../if_cscope.c:767
 msgid "E622: Could not fork for cscope"
 msgstr "E622: Ei voitu haarauttaa cscopea"
 
-#: ../if_cscope.c:849
-#, fuzzy
 msgid "cs_create_connection setpgid failed"
-msgstr "cs_create_connection ep�onnistui"
+msgstr "cs_create_connection setpgid epäonnistui"
 
-#: ../if_cscope.c:853 ../if_cscope.c:889
 msgid "cs_create_connection exec failed"
-msgstr "cs_create_connection ep�onnistui"
+msgstr "cs_create_connection epäonnistui"
 
-#: ../if_cscope.c:863 ../if_cscope.c:902
 msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: fdopen to_fp ep�onnistui"
+msgstr "cs_create_connection: fdopen to_fp epäonnistui"
 
-#: ../if_cscope.c:865 ../if_cscope.c:906
 msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: fdopen fr_fp ep�onnistui"
+msgstr "cs_create_connection: fdopen fr_fp epäonnistui"
 
-#: ../if_cscope.c:890
 msgid "E623: Could not spawn cscope process"
-msgstr "E623: Cscope-prosessin luonti ep�onnistui"
+msgstr "E623: Cscope-prosessin luonti epäonnistui"
 
-#: ../if_cscope.c:932
 msgid "E567: no cscope connections"
-msgstr "E567: ei cscope-yhteyksi�"
+msgstr "E567: ei cscope-yhteyksiä"
 
-#: ../if_cscope.c:1009
 #, c-format
 msgid "E469: invalid cscopequickfix flag %c for %c"
 msgstr "E469: virheellinen cscopequickfix-asetus %c kohteelle %c"
 
-#: ../if_cscope.c:1058
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
-msgstr "E259: ei t�sm�yksi� cscope-hakuun %s/%s"
+msgstr "E259: ei täsmäyksiä cscope-hakuun %s/%s"
 
-#: ../if_cscope.c:1142
 msgid "cscope commands:\n"
 msgstr "cscope-komennot:\n"
 
-#: ../if_cscope.c:1150
 #, c-format
 msgid "%-5s: %s%*s (Usage: %s)"
-msgstr "%-5s: %s%*s (K�ytt�: %s)"
+msgstr "%-5s: %s%*s (Käyttö: %s)"
 
-#: ../if_cscope.c:1155
-#, fuzzy
 msgid ""
 "\n"
+"       a: Find assignments to this symbol\n"
 "       c: Find functions calling this function\n"
 "       d: Find functions called by this function\n"
 "       e: Find this egrep pattern\n"
@@ -3246,40 +3092,36 @@ msgid ""
 "       t: Find this text string\n"
 msgstr ""
 "\n"
-"       c: Etsi t�t� funktiota kutsuvat funktiot\n"
-"       d: Etsi t�m�n funktion kutsumat funktiot\n"
-"       e: Etsi t�m� egrep-lauseke\n"
-"       f: Find t�m� tiedosto\n"
-"       g: Etsi t�m� m��ritys\n"
-"       i: Etsi tiedostoja jotka #inkluudaavat t�m�n\n"
-"       s: Etsi t�m� C-symboli\n"
+"       a: Etsi sijotukset tähän symboliin\n"
+"       c: Etsi tätä funktiota kutsuvat funktiot\n"
+"       d: Etsi tämän funktion kutsumat funktiot\n"
+"       e: Etsi tämä egrep-lauseke\n"
+"       f: Etsi tämä tiedosto\n"
+"       g: Etsi tämä määritys\n"
+"       i: Etsi tiedostoja jotka #inkluudaavat tämän\n"
+"       s: Etsi tämä C-symboli\n"
 "       t: Etsi sijoitukset muuttujaan \n"
 
-#: ../if_cscope.c:1226
 msgid "E568: duplicate cscope database not added"
-msgstr "E568: kaksoiskappaletta cscope-tietokannasta ei lis�tty"
+msgstr "E568: kaksoiskappaletta cscope-tietokannasta ei lisätty"
 
-#: ../if_cscope.c:1335
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: cscope-yhteys %s puuttuu"
 
-#: ../if_cscope.c:1364
 #, c-format
 msgid "cscope connection %s closed"
 msgstr "cscope-yhteys %s on katkaistu"
 
 #. should not reach here
-#: ../if_cscope.c:1486
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: kriittinen virhe cs_manage_matches-funktiossa"
 
-#: ../if_cscope.c:1693
 #, c-format
 msgid "Cscope tag: %s"
-msgstr "Cscope-t�gi: %s"
+msgstr "Cscope-tägi: %s"
 
-#: ../if_cscope.c:1711
+#. Column headers for match number, line number and filename.
 msgid ""
 "\n"
 "   #   line"
@@ -3287,326 +3129,272 @@ msgstr ""
 "\n"
 "   #   rivi"
 
-#: ../if_cscope.c:1713
 msgid "filename / context / line\n"
 msgstr "tiedosto / konteksti / rivi\n"
 
-#: ../if_cscope.c:1809
 #, c-format
 msgid "E609: Cscope error: %s"
 msgstr "E609: Cscope-virhe: %s"
 
-#: ../if_cscope.c:2053
 msgid "All cscope databases reset"
 msgstr "Kaikki cscope-tietokannat nollattu"
 
-#: ../if_cscope.c:2123
 msgid "no cscope connections\n"
-msgstr "ei cscope-yhteyksi�\n"
+msgstr "ei cscope-yhteyksiä\n"
 
-#: ../if_cscope.c:2126
 msgid " # pid    database name                       prepend path\n"
-msgstr " # pid    tietokanta                          lis�yspolku\n"
+msgstr " # pid    tietokanta                          lisäyspolku\n"
 
-#: ../main.c:144
-msgid "Unknown option argument"
-msgstr "Tuntematon asetusargumentti"
-
-#: ../main.c:146
-msgid "Too many edit arguments"
-msgstr "Liikaa muokkausargumentteja"
-
-#: ../main.c:148
+#. Error messages
 msgid "Argument missing after"
 msgstr "Argumentti puuttuu kohdasta"
 
-#: ../main.c:150
 msgid "Garbage after option argument"
-msgstr "Roskaa argumentin per�ss�"
+msgstr "Roskaa argumentin perässä"
+
+msgid "Unknown option argument"
+msgstr "Tuntematon asetusargumentti"
+
+msgid "Too many edit arguments"
+msgstr "Liikaa muokkausargumentteja"
 
-#: ../main.c:152
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
 msgstr "Liikaa +komentoja, -c-komentoja tai --cmd-komentoja"
 
-#: ../main.c:154
-msgid "Invalid argument for"
-msgstr "V��r� argumentti valitsimelle"
-
-#: ../main.c:294
-#, c-format
-msgid "%d files to edit\n"
-msgstr "%d tiedostoa muokattavana\n"
-
-#: ../main.c:1342
 msgid "Attempt to open script file again: \""
 msgstr "Yritettiin avata skriptitiedostoa uudestaan:"
 
-#: ../main.c:1350
 msgid "Cannot open for reading: \""
 msgstr "Ei voi avata luettavaksi: "
 
-#: ../main.c:1393
 msgid "Cannot open for script output: \""
 msgstr "Ei voi avata skriptin tulostetta varten: "
 
-#: ../main.c:1622
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: Varoitus: Tuloste ei mene terminaalille\n"
 
-#: ../main.c:1624
 msgid "Vim: Warning: Input is not from a terminal\n"
-msgstr "Vim: Varoitus: Sy�te ei tule terminaalilta\n"
+msgstr "Vim: Varoitus: Syöte ei tule terminaalilta\n"
 
 #. just in case..
-#: ../main.c:1891
 msgid "pre-vimrc command line"
 msgstr "esi-vimrc-komentorivi"
 
-#: ../main.c:1964
 #, c-format
 msgid "E282: Cannot read from \"%s\""
 msgstr "E282: Ei voida lukea kohteesta %s"
 
-#: ../main.c:2149
+#, fuzzy
 msgid ""
 "\n"
-"More info with: \"vim -h\"\n"
+"More info with \""
 msgstr ""
 "\n"
-"Lis�tietoja: \"vim -h\"\n"
+"Lisätietoja: \"vim -h\"\n"
 
-#: ../main.c:2178
-msgid "[file ..]       edit specified file(s)"
-msgstr "[tiedosto ..]       muokkaa tiedostoja"
+#. kill us with CTRL-C here, if you like
+#, fuzzy
+#~ msgid "Usage:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "\n"
+#~ "käyttö:"
 
-#: ../main.c:2179
-msgid "-               read text from stdin"
-msgstr "-                   lue vakiosy�tteest�"
+#, fuzzy
+#~ msgid "  nvim [arguments] [file ...]      Edit specified file(s)\n"
+#~ msgstr "[tiedosto ..]       muokkaa tiedostoja"
 
-#: ../main.c:2180
-msgid "-t tag          edit file where tag is defined"
-msgstr "-t t�gi             muokkaa tiedostoa t�gist�"
+#, fuzzy
+#~ msgid "  nvim [arguments] -               Read text from stdin\n"
+#~ msgstr "-                   lue vakiosyötteestä"
 
-#: ../main.c:2181
-msgid "-q [errorfile]  edit file with first error"
-msgstr "-q [virhetiedosto]  muokkaa tiedostoa ensimm�isest� virheest�"
+#, fuzzy
+#~ msgid "  nvim [arguments] -t <tag>        Edit file where tag is defined\n"
+#~ msgstr "-t tägi             muokkaa tiedostoa tägistä"
 
-#: ../main.c:2187
+#, fuzzy
+#~ msgid "  nvim [arguments] -q [errorfile]  Edit file with first error\n"
+#~ msgstr "-q [virhetiedosto]  muokkaa tiedostoa ensimmäisestä virheestä"
+
+#, fuzzy
 msgid ""
 "\n"
-"\n"
-"usage:"
-msgstr ""
-"\n"
-"\n"
-"k�ytt�:"
-
-#: ../main.c:2189
-msgid " vim [arguments] "
-msgstr " vim [argumentit] "
-
-#: ../main.c:2193
-msgid ""
-"\n"
-"   or:"
-msgstr ""
-"\n"
-"   tai:"
-
-#: ../main.c:2196
-msgid ""
-"\n"
-"\n"
 "Arguments:\n"
 msgstr ""
 "\n"
 "\n"
 "Argumentit:\n"
 
-#: ../main.c:2197
-msgid "--\t\t\tOnly file names after this"
-msgstr "--\t\t\tvain tiedostonimi� t�m�n j�lkeen"
+#, fuzzy
+#~ msgid "  --                    Only file names after this\n"
+#~ msgstr "--\t\t\tvain tiedostonimiä tämän jälkeen"
 
-#: ../main.c:2199
-msgid "--literal\t\tDon't expand wildcards"
-msgstr "--literal\t\t�l� k�sittele jokerimerkkej� "
+#, fuzzy
+#~ msgid "  --literal             Don't expand wildcards\n"
+#~ msgstr "--literal\t\tÄlä käsittele jokerimerkkejä "
 
-#: ../main.c:2201
-msgid "-v\t\t\tVi mode (like \"vi\")"
-msgstr "-v\t\t\tVi-tila (kuten vill�)"
+#, fuzzy
+#~ msgid "  -e                    Ex mode\n"
+#~ msgstr "                              kahta tilaa varten "
 
-#: ../main.c:2202
-msgid "-e\t\t\tEx mode (like \"ex\")"
-msgstr "-e\t\t\tEx-tila (kute exill�)"
+#, fuzzy
+#~ msgid "  -E                    Improved Ex mode\n"
+#~ msgstr "                              kahta tilaa varten "
 
-#: ../main.c:2203
-msgid "-E\t\t\tImproved Ex mode"
-msgstr ""
+#, fuzzy
+#~ msgid "  -s                    Silent (batch) mode (only for ex mode)\n"
+#~ msgstr "-s\t\t\tHiljainen (eräajo)tila (vain exillä)"
 
-#: ../main.c:2204
-msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
-msgstr "-s\t\t\tHiljainen (er�ajo)tila (vain exill�)"
+#, fuzzy
+#~ msgid "  -d                    Diff mode\n"
+#~ msgstr "                              kahta tilaa varten "
 
-#: ../main.c:2205
-msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
-msgstr "-d\t\t\tDiff-tila (kuten vimdiffill�)"
+#, fuzzy
+#~ msgid "  -R                    Read-only mode\n"
+#~ msgstr "                              kahta tilaa varten "
 
-#: ../main.c:2206
-msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
-msgstr "-y\t\t\tHelppok�ytt�tila (kuten evimiss�, ilman tiloja)"
+#, fuzzy
+#~ msgid "  -Z                    Restricted mode\n"
+#~ msgstr "                              kahta tilaa varten "
 
-#: ../main.c:2207
-msgid "-R\t\t\tReadonly mode (like \"view\")"
-msgstr "-R\t\t\tKirjoitussuojattu tila (kuten view'lla)"
+#, fuzzy
+#~ msgid "  -m                    Modifications (writing files) not allowed\n"
+#~ msgstr "-m\t\t\tMuokkaukset (kirjoittaminen tiedostoon) pois käytöstä"
 
-#: ../main.c:2208
-msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
-msgstr "-Z\t\t\tRajoitettu tila (kuten rvimill�)"
+#, fuzzy
+#~ msgid "  -M                    Modifications in text not allowed\n"
+#~ msgstr "-M\t\t\tTekstin muokkaus pois käytöstä"
 
-#: ../main.c:2209
-msgid "-m\t\t\tModifications (writing files) not allowed"
-msgstr "-m\t\t\tMuokkaukset (kirjoittaminen tiedostoon) pois k�yt�st�"
+#, fuzzy
+#~ msgid "  -b                    Binary mode\n"
+#~ msgstr "                              kahta tilaa varten "
 
-#: ../main.c:2210
-msgid "-M\t\t\tModifications in text not allowed"
-msgstr "-M\t\t\tTekstin muokkaus pois k�yt�st�"
+#, fuzzy
+#~ msgid "  -l                    Lisp mode\n"
+#~ msgstr "                              kahta tilaa varten "
 
-#: ../main.c:2211
-msgid "-b\t\t\tBinary mode"
-msgstr "-b\t\t\tBin��ritila"
+#, fuzzy
+#~ msgid "  -A                    Arabic mode\n"
+#~ msgstr "                              kahta tilaa varten "
 
-#: ../main.c:2212
-msgid "-l\t\t\tLisp mode"
-msgstr "-l\t\t\tLisp-tila"
+#, fuzzy
+#~ msgid "  -F                    Farsi mode\n"
+#~ msgstr "                              kahta tilaa varten "
 
-#: ../main.c:2213
-msgid "-C\t\t\tCompatible with Vi: 'compatible'"
-msgstr "-C\t\t\tVi-yhteensopivuustila: compatible"
+#, fuzzy
+#~ msgid "  -H                    Hebrew mode\n"
+#~ msgstr "                              kahta tilaa varten "
 
-#: ../main.c:2214
-msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
-msgstr "-N\t\t\tEi Vi-yhteensopivuutta: nocompatible"
+#, fuzzy
+#~ msgid "  -V[N][file]           Be verbose [level N][log messages to file]\n"
+#~ msgstr ""
+#~ "-V[N][tnimi]\t\tMonisanainen tuloste [Taso N] [kirjoita tuloste tnimeen] "
 
-#: ../main.c:2215
-msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
-msgstr ""
-"-V[N][tnimi]\t\tMonisanainen tuloste [Taso N] [kirjoita tuloste tnimeen] "
+#, fuzzy
+#~ msgid "  -D                    Debugging mode\n"
+#~ msgstr "                              kahta tilaa varten "
 
-#: ../main.c:2216
-msgid "-D\t\t\tDebugging mode"
-msgstr "-D\t\t\tVianetsint�tila"
+#, fuzzy
+#~ msgid "  -n                    No swap file, use memory only\n"
+#~ msgstr "-n\t\t\tEi swap-tiedostoja, käytä muistia"
 
-#: ../main.c:2217
-msgid "-n\t\t\tNo swap file, use memory only"
-msgstr "-n\t\t\tEi swap-tiedostoja, k�yt� muistia"
+#, fuzzy
+#~ msgid "  -r, -L                List swap files and exit\n"
+#~ msgstr "-r\t\t\tLuetteloi swap-tiedostot ja poistu"
 
-#: ../main.c:2218
-msgid "-r\t\t\tList swap files and exit"
-msgstr "-r\t\t\tLuetteloi swap-tiedostot ja poistu"
+#, fuzzy
+#~ msgid "  -r <file>             Recover crashed session\n"
+#~ msgstr "-r (tiedostonimi)\tPalauta kaatunut sessio"
 
-#: ../main.c:2219
-msgid "-r (with file name)\tRecover crashed session"
-msgstr "-r (tiedostonimi)\tPalauta kaatunut sessio"
+#, fuzzy
+#~ msgid "  -u <vimrc>            Use <vimrc> instead of the default\n"
+#~ msgstr "-u <vimrc>\t\tKäytä <vimrc>-tiedostoa .vimrc:iden sijasta"
 
-#: ../main.c:2220
-msgid "-L\t\t\tSame as -r"
-msgstr "-L\t\t\tkuten -r"
+#~ msgid "  -i <shada>            Use <shada> instead of the default\n"
+#~ msgstr ""
 
-#: ../main.c:2221
-msgid "-A\t\t\tstart in Arabic mode"
-msgstr "-A\t\t\tk�ynnist� arabia-tilassa"
+#, fuzzy
+#~ msgid "  --noplugin            Don't load plugin scripts\n"
+#~ msgstr "--noplugin\t\tÄlä lataa liitännäisiä"
 
-#: ../main.c:2222
-msgid "-H\t\t\tStart in Hebrew mode"
-msgstr "-H\t\t\tk�ynnist� heprea-tilassa"
+#, fuzzy
+#~ msgid "  -o[N]                 Open N windows (default: one for each file)\n"
+#~ msgstr "-o[N]\t\tAvaa N ikkunaa (oletus: yksi per tiedosto)"
 
-#: ../main.c:2223
-msgid "-F\t\t\tStart in Farsi mode"
-msgstr "-F\t\t\tk�ynnist� farsi-tilassa"
+#, fuzzy
+#~ msgid "  -O[N]                 Like -o but split vertically\n"
+#~ msgstr "-O[N]\t\tKuten -o, mutta jaa pystysuunnassa"
 
-#: ../main.c:2224
-msgid "-T <terminal>\tSet terminal type to <terminal>"
-msgstr "-T <terminaali>\tAseta terminaalin tyypiksi <terminaali>"
+#, fuzzy
+#~ msgid "  -p[N]                 Open N tab pages (default: one for each file)\n"
+#~ msgstr "-p[N]\t\tAvaa N välilehteä (oletus: yksi per tiedosto)"
 
-#: ../main.c:2225
-msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
-msgstr "-u <vimrc>\t\tK�yt� <vimrc>-tiedostoa .vimrc:iden sijasta"
+#, fuzzy
+#~ msgid "  +                     Start at end of file\n"
+#~ msgstr "                              kahta tilaa varten "
 
-#: ../main.c:2226
-msgid "--noplugin\t\tDon't load plugin scripts"
-msgstr "--noplugin\t\t�l� lataa liit�nn�isi�"
+#, fuzzy
+#~ msgid "  +<linenum>            Start at line <linenum>\n"
+#~ msgstr "+<rivi>\t\t\tAloita riviltä <rivi>"
 
-#: ../main.c:2227
-msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
-msgstr "-p[N]\t\tAvaa N v�lilehte� (oletus: yksi per tiedosto)"
+#~ msgid "  +/<pattern>           Start at first occurrence of <pattern>\n"
+#~ msgstr ""
 
-#: ../main.c:2228
-msgid "-o[N]\t\tOpen N windows (default: one for each file)"
-msgstr "-o[N]\t\tAvaa N ikkunaa (oletus: yksi per tiedosto)"
+#, fuzzy
+#~ msgid "  --cmd <command>       Execute <command> before loading any vimrc\n"
+#~ msgstr "--cmd <komento>\tSuorita <komento> ennen vimrc:iden latausta"
 
-#: ../main.c:2229
-msgid "-O[N]\t\tLike -o but split vertically"
-msgstr "-O[N]\t\tKuten -o, mutta jaa pystysuunnassa"
+#, fuzzy
+msgid ""
+"  -c <command>          Execute <command> after loading the first file\n"
+msgstr "-c <komento>\t\tSuorita <komento> ensimmäisen tiedoston latauduttua"
 
-#: ../main.c:2230
-msgid "+\t\t\tStart at end of file"
-msgstr "+\t\t\tAloita tiedoston lopusta"
+#, fuzzy
+#~ msgid "  -S <session>          Source <session> after loading the first file\n"
+#~ msgstr "-S <sessio>\t\tLataa <sessio> ensimmäisen tiedoston latauduttua"
 
-#: ../main.c:2231
-msgid "+<lnum>\t\tStart at line <lnum>"
-msgstr "+<rivi>\t\t\tAloita rivilt� <rivi>"
+#, fuzzy
+#~ msgid "  -s <scriptin>         Read Normal mode commands from <scriptin>\n"
+#~ msgstr "-s <skripti>\tLue normaalitilan komentoja <skripti>-tiedostosta"
 
-#: ../main.c:2232
-msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
-msgstr "--cmd <komento>\tSuorita <komento> ennen vimrc:iden latausta"
+#, fuzzy
+#~ msgid "  -w <scriptout>        Append all typed characters to <scriptout>\n"
+#~ msgstr "-w <skripti>\tLisää kirjoitetut komennot <skripti>-tiedostoon"
 
-#: ../main.c:2233
-msgid "-c <command>\t\tExecute <command> after loading the first file"
-msgstr "-c <komento>\t\tSuorita <komento> ensimm�isen tiedoston latauduttua"
+#, fuzzy
+#~ msgid "  -W <scriptout>        Write all typed characters to <scriptout>\n"
+#~ msgstr "-W <skripti>\tKirjoita komennot <skripti>-tiedostoon"
 
-#: ../main.c:2235
-msgid "-S <session>\t\tSource file <session> after loading the first file"
-msgstr "-S <sessio>\t\tLataa <sessio> ensimm�isen tiedoston latauduttua"
+#, fuzzy
+#~ msgid "  --startuptime <file>  Write startup timing messages to <file>\n"
+#~ msgstr "--startuptime <file>\tKirjoita käynnistysaikaviestit tiedostoon <file>"
 
-#: ../main.c:2236
-msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
-msgstr "-s <skripti>\tLue normaalitilan komentoja <skripti>-tiedostosta"
+#~ msgid ""
+#~ "  --api-info            Dump API metadata serialized to msgpack and exit\n"
+#~ msgstr ""
 
-#: ../main.c:2237
-msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
-msgstr "-w <skripti>\tLis�� kirjoitetut komennot <skripti>-tiedostoon"
+#~ msgid "  --embed               Use stdin/stdout as a msgpack-rpc channel\n"
+#~ msgstr ""
 
-#: ../main.c:2238
-msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
-msgstr "-W <skripti>\tKirjoita komennot <skripti>-tiedostoon"
+#~ msgid "  --headless            Don't start a user interface\n"
+#~ msgstr ""
 
-#: ../main.c:2240
-msgid "--startuptime <file>\tWrite startup timing messages to <file>"
-msgstr "--startuptime <file>\tKirjoita k�ynnistysaikaviestit tiedostoon <file>"
+#, fuzzy
+#~ msgid "  -v, --version         Print version information and exit\n"
+#~ msgstr "--version\t\t\tTulosta versiotiedot ja lopeta"
 
-#: ../main.c:2242
-msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
-msgstr "-i <viminfo>\t\tK�yt� <viminfo>-tiedostoa .viminfon sijaan"
+#, fuzzy
+#~ msgid "  -h, --help            Print this help message and exit\n"
+#~ msgstr "-h tai --help\tTulosta ohje (tämä viesti) ja lopeta"
 
-#: ../main.c:2243
-msgid "-h  or  --help\tPrint Help (this message) and exit"
-msgstr "-h tai --help\tTulosta ohje (t�m� viesti) ja lopeta"
-
-#: ../main.c:2244
-msgid "--version\t\tPrint version information and exit"
-msgstr "--version\t\t\tTulosta versiotiedot ja lopeta"
-
-#: ../mark.c:676
 msgid "No marks set"
-msgstr "Ei asetettuja merkkej�"
+msgstr "Ei asetettuja merkkejä"
 
-#: ../mark.c:678
 #, c-format
 msgid "E283: No marks matching \"%s\""
-msgstr "E283: Mik��n merkki ei t�sm�� ilmaukseen \"%s\""
+msgstr "E283: Mikään merkki ei täsmää ilmaukseen \"%s\""
 
 #. Highlight title
-#: ../mark.c:687
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3615,7 +3403,6 @@ msgstr ""
 "merkki rivi sarake tiedosto/teksti"
 
 #. Highlight title
-#: ../mark.c:789
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3624,7 +3411,6 @@ msgstr ""
 "hyppy rivi sarake tiedosto/teksti"
 
 #. Highlight title
-#: ../mark.c:831
 msgid ""
 "\n"
 "change line  col text"
@@ -3632,138 +3418,85 @@ msgstr ""
 "\n"
 "muutos rivi sarake teksti"
 
-#: ../mark.c:1238
-msgid ""
-"\n"
-"# File marks:\n"
-msgstr ""
-"\n"
-"# Tiedoston merkit:\n"
-
-#. Write the jumplist with -'
-#: ../mark.c:1271
-msgid ""
-"\n"
-"# Jumplist (newest first):\n"
-msgstr ""
-"\n"
-"# Hyppylista (uusin ensiksi):\n"
-
-#: ../mark.c:1352
-msgid ""
-"\n"
-"# History of marks within files (newest to oldest):\n"
-msgstr ""
-"\n"
-"# Tiedostojen merkkien historia (uusimmasta vanhimpaan):\n"
-
-#: ../mark.c:1431
-msgid "Missing '>'"
-msgstr "> puuttuu"
-
-#: ../memfile.c:426
 msgid "E293: block was not locked"
 msgstr "E293: lohkoa ei ole lukittu"
 
-#: ../memfile.c:799
 msgid "E294: Seek error in swap file read"
 msgstr "E294: Hakuvirhe swap-tiedostoa luettaessa"
 
-#: ../memfile.c:803
 msgid "E295: Read error in swap file"
 msgstr "E295: Lukuvirhe swap-tiedostossa"
 
-#: ../memfile.c:849
 msgid "E296: Seek error in swap file write"
 msgstr "E296: Hakuvirhe swap-tiedostoa kirjoitettaessa"
 
-#: ../memfile.c:865
 msgid "E297: Write error in swap file"
 msgstr "E297: Kirjoitusvirhe swap-tiedostossa"
 
-#: ../memfile.c:1036
 msgid "E300: Swap file already exists (symlink attack?)"
-msgstr "E300: Swaptiedosto on jo olemassa (symlink-hy�kk�ys?)"
+msgstr "E300: Swaptiedosto on jo olemassa (symlink-hyökkäys?)"
 
-#: ../memline.c:318
 msgid "E298: Didn't get block nr 0?"
 msgstr "E298: Lohko 0:aa ei saatu?"
 
-#: ../memline.c:361
 msgid "E298: Didn't get block nr 1?"
-msgstr "E298: Lohko 1:t� ei saatu?"
+msgstr "E298: Lohko 1:tä ei saatu?"
 
-#: ../memline.c:377
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: Lohko 2:ta ei saatu?"
 
 #. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
 msgid "E301: Oops, lost the swap file!!!"
-msgstr "E301: Hups, swap-tiedosto h�visi!"
+msgstr "E301: Hups, swap-tiedosto hävisi!"
 
-#: ../memline.c:477
 msgid "E302: Could not rename swap file"
 msgstr "E302: Swap-tiedoston uudellennimeys ei onnistu"
 
-#: ../memline.c:554
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr "E303: Swap-tiedostoa %s ei voi avata, palautus ei onnistu"
 
-#: ../memline.c:666
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0(): Lohko 0:aa ei saatu?"
 
 #. no swap files found
-#: ../memline.c:830
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: Ei swap-tiedostoa tiedostolle %s"
 
-#: ../memline.c:839
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "Anna swap-tiedoston numero tai 0 lopettaaksesi: "
 
-#: ../memline.c:879
 #, c-format
 msgid "E306: Cannot open %s"
 msgstr "E306: Ei voi avata tiedostoa %s"
 
-#: ../memline.c:897
 msgid "Unable to read block 0 from "
 msgstr "Ei voi lukea lohkoa 0 kohteesta "
 
-#: ../memline.c:900
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
 msgstr ""
 "\n"
-"Muutoksia ei tehty, tai Vim ei p�ivitt�nyt swap-tiedostoa."
+"Muutoksia ei tehty, tai Vim ei päivittänyt swap-tiedostoa."
 
-#: ../memline.c:909
 msgid " cannot be used with this version of Vim.\n"
-msgstr " ei toimi t�m�n version Vimin kanssa.\n"
+msgstr " ei toimi tämän version Vimin kanssa.\n"
 
-#: ../memline.c:911
 msgid "Use Vim version 3.0.\n"
-msgstr "K�yt� Vimin versiota 3.0\n"
+msgstr "Käytä Vimin versiota 3.0\n"
 
-#: ../memline.c:916
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s ei ole Vimin swap-tiedosto"
 
-#: ../memline.c:922
 msgid " cannot be used on this computer.\n"
-msgstr " ei toimi t�ll� koneella.\n"
+msgstr " ei toimi tällä koneella.\n"
 
-#: ../memline.c:924
 msgid "The file was created on "
 msgstr "Tiedosto luotiin "
 
-#: ../memline.c:928
 msgid ""
 ",\n"
 "or the file has been damaged."
@@ -3771,100 +3504,78 @@ msgstr ""
 ",\n"
 "tai tiedosto on vahingoittunut."
 
-#: ../memline.c:945
 msgid " has been damaged (page size is smaller than minimum value).\n"
-msgstr " on vioittunut (sivun koko on v�himm�isarvoa pienempi).\n"
+msgstr " on vioittunut (sivun koko on vähimmäisarvoa pienempi).\n"
 
-#: ../memline.c:974
 #, c-format
 msgid "Using swap file \"%s\""
-msgstr "K�ytet��n swap-tiedostoa %s"
+msgstr "Käytetään swap-tiedostoa %s"
 
-#: ../memline.c:980
 #, c-format
 msgid "Original file \"%s\""
-msgstr "Alkuper�inen tiedosto %s"
+msgstr "Alkuperäinen tiedosto %s"
 
-#: ../memline.c:995
 msgid "E308: Warning: Original file may have been changed"
-msgstr "E308: Varoitus: Alkuper�ist� tiedostoa saattaa olla muutettu"
+msgstr "E308: Varoitus: Alkuperäistä tiedostoa saattaa olla muutettu"
 
-#: ../memline.c:1061
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: Ei voitu lukea lohkoa 1 tiedostosta %s"
 
-#: ../memline.c:1065
 msgid "???MANY LINES MISSING"
-msgstr "???PALJON RIVEJ� PUUTTUU"
+msgstr "???PALJON RIVEJÄ PUUTTUU"
 
-#: ../memline.c:1076
 msgid "???LINE COUNT WRONG"
-msgstr "???RIVIM��R� PIELESS�"
+msgstr "???RIVIMÄÄRÄ PIELESSÄ"
 
-#: ../memline.c:1082
 msgid "???EMPTY BLOCK"
-msgstr "???TYHJ� LOHKO"
+msgstr "???TYHJÄ LOHKO"
 
-#: ../memline.c:1103
 msgid "???LINES MISSING"
-msgstr "???RIVEJ� PUUTTUU"
+msgstr "???RIVEJÄ PUUTTUU"
 
-#: ../memline.c:1128
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
-msgstr "E310: Lohon 1 tunniste v��r� (%s ei ole .swp-tiedosto?)"
+msgstr "E310: Lohon 1 tunniste väärä (%s ei ole .swp-tiedosto?)"
 
-#: ../memline.c:1133
 msgid "???BLOCK MISSING"
 msgstr "???LOHKO PUUTTUU"
 
-#: ../memline.c:1147
 msgid "??? from here until ???END lines may be messed up"
-msgstr "??? t�st� kohtaan ???LOPPU rivej� sekaisin"
+msgstr "??? tästä kohtaan ???LOPPU rivejä sekaisin"
 
-#: ../memline.c:1164
 msgid "??? from here until ???END lines may have been inserted/deleted"
-msgstr "??? t�st� kohtaan ???LOPPU rivej� saattaa olla lis�tty tai poistettu"
+msgstr "??? tästä kohtaan ???LOPPU rivejä saattaa olla lisätty tai poistettu"
 
-#: ../memline.c:1181
 msgid "???END"
 msgstr "???LOPPU"
 
-#: ../memline.c:1238
 msgid "E311: Recovery Interrupted"
 msgstr "E311: Palautus keskeytetty"
 
-#: ../memline.c:1243
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
-msgstr "E312: Palautuksessa oli virheit�, etsi rivej�, jotka alkavat ???"
+msgstr "E312: Palautuksessa oli virheitä, etsi rivejä, jotka alkavat ???"
 
-#: ../memline.c:1245
 msgid "See \":help E312\" for more information."
-msgstr ":help E312 kertoo lis�tietoja"
+msgstr ":help E312 kertoo lisätietoja"
 
-#: ../memline.c:1249
 msgid "Recovery completed. You should check if everything is OK."
-msgstr "Palautus onnistui. Tarkista, ett� kaikki on kunnossa."
+msgstr "Palautus onnistui. Tarkista, että kaikki on kunnossa."
 
-#: ../memline.c:1251
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
 msgstr ""
 "\n"
-"(Saattaa kannattaa kirjoittaa t�m� tiedosto toisella nimell�\n"
+"(Saattaa kannattaa kirjoittaa tämä tiedosto toisella nimellä\n"
 
-#: ../memline.c:1252
 msgid "and run diff with the original file to check for changes)"
-msgstr "ja katso diffill� muutokset alkuper�iseen tiedostoon)"
+msgstr "ja katso diffillä muutokset alkuperäiseen tiedostoon)"
 
-#: ../memline.c:1254
 msgid "Recovery completed. Buffer contents equals file contents."
-msgstr "Palautus onnistui. Puskurin ja tiedoston sis�ll�t t�sm��v�t."
+msgstr "Palautus onnistui. Puskurin ja tiedoston sisällöt täsmäävät."
 
-#: ../memline.c:1255
 msgid ""
 "\n"
 "You may want to delete the .swp file now.\n"
@@ -3875,51 +3586,42 @@ msgstr ""
 "\n"
 
 #. use msg() to start the scrolling properly
-#: ../memline.c:1327
 msgid "Swap files found:"
-msgstr "Swap-tiedostoja l�ytyi:"
+msgstr "Swap-tiedostoja löytyi:"
 
-#: ../memline.c:1446
 msgid "   In current directory:\n"
-msgstr "   T�ss� hakemistossa:\n"
+msgstr "   Tässä hakemistossa:\n"
 
-#: ../memline.c:1448
 msgid "   Using specified name:\n"
-msgstr "   M��ritellyll� nimell�:\n"
+msgstr "   Määritellyllä nimellä:\n"
 
-#: ../memline.c:1450
 msgid "   In directory "
 msgstr "   Hakemistossa "
 
-#: ../memline.c:1465
 msgid "      -- none --\n"
-msgstr " -- ei mit��n --\n"
+msgstr " -- ei mitään --\n"
 
-#: ../memline.c:1527
 msgid "          owned by: "
 msgstr "          omistaja: "
 
-#: ../memline.c:1529
 msgid "   dated: "
 msgstr "  ajalta: "
 
-#: ../memline.c:1532 ../memline.c:3231
 msgid "             dated: "
 msgstr "            ajalta:"
 
-#: ../memline.c:1548
 msgid "         [from Vim version 3.0]"
 msgstr "         [Vimin 3.0-versiosta]"
 
-#: ../memline.c:1550
 msgid "         [does not look like a Vim swap file]"
-msgstr "         [ei n�yt� Vimin swap-tiedostolta]"
+msgstr "         [ei näytä Vimin swap-tiedostolta]"
+
+#~ msgid "         [garbled strings (not nul terminated)]"
+#~ msgstr ""
 
-#: ../memline.c:1552
 msgid "         file name: "
 msgstr "      tiedostonimi: "
 
-#: ../memline.c:1558
 msgid ""
 "\n"
 "          modified: "
@@ -3927,27 +3629,22 @@ msgstr ""
 "\n"
 "          muokattu: "
 
-#: ../memline.c:1559
 msgid "YES"
-msgstr "KYLL�"
+msgstr "KYLLÄ"
 
-#: ../memline.c:1559
 msgid "no"
 msgstr "ei"
 
-#: ../memline.c:1562
 msgid ""
 "\n"
 "         user name: "
 msgstr ""
 "\n"
-"         k�ytt�j�nimi: "
+"         käyttäjänimi: "
 
-#: ../memline.c:1568
 msgid "   host name: "
 msgstr "   laitenimi: "
 
-#: ../memline.c:1570
 msgid ""
 "\n"
 "         host name: "
@@ -3955,7 +3652,6 @@ msgstr ""
 "\n"
 "         laitenimi: "
 
-#: ../memline.c:1575
 msgid ""
 "\n"
 "        process ID: "
@@ -3963,190 +3659,143 @@ msgstr ""
 "\n"
 "        prosessin tunniste: "
 
-#: ../memline.c:1579
 msgid " (still running)"
-msgstr " (k�ynniss�)"
+msgstr " (käynnissä)"
 
-#: ../memline.c:1586
 msgid ""
 "\n"
 "         [not usable on this computer]"
 msgstr ""
 "\n"
-"         [ei toimi t�ll� koneella]"
+"         [ei toimi tällä koneella]"
 
-#: ../memline.c:1590
 msgid "         [cannot be read]"
 msgstr "         [ei voi lukea]"
 
-#: ../memline.c:1593
 msgid "         [cannot be opened]"
 msgstr "         [ei voi avata]"
 
-#: ../memline.c:1698
 msgid "E313: Cannot preserve, there is no swap file"
-msgstr "E313: Ei voi s�ilytt��, swap-tiedostoa ei ole"
+msgstr "E313: Ei voi säilyttää, swap-tiedostoa ei ole"
 
-#: ../memline.c:1747
 msgid "File preserved"
-msgstr "Tiedosto s�ilytetty"
+msgstr "Tiedosto säilytetty"
 
-#: ../memline.c:1749
 msgid "E314: Preserve failed"
-msgstr "E314: S�ilytt�minen ep�onnistui"
+msgstr "E314: Säilyttäminen epäonnistui"
 
-#: ../memline.c:1819
-#, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get: virheellinen lnum: %<PRId64>"
+#, fuzzy, c-format
+#~ msgid "E315: ml_get: invalid lnum: %<PRId64>"
+#~ msgstr "E315: ml_get: virheellinen lnum: %ld"
 
-#: ../memline.c:1851
-#, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get: rivi� %<PRId64> ei l�ydy"
+#, fuzzy, c-format
+#~ msgid "E316: ml_get: cannot find line %<PRId64>"
+#~ msgstr "E316: ml_get: riviä %ld ei löydy"
 
-#: ../memline.c:2236
 msgid "E317: pointer block id wrong 3"
-msgstr "E317: osoitinlohkon tunnus v��r� 3"
+msgstr "E317: osoitinlohkon tunnus väärä 3"
 
-#: ../memline.c:2311
 msgid "stack_idx should be 0"
-msgstr "stack_idx pit�� olla 0"
+msgstr "stack_idx pitää olla 0"
 
-#: ../memline.c:2369
 msgid "E318: Updated too many blocks?"
-msgstr "E318: P�ivitetty liikaa lohkoja"
+msgstr "E318: Päivitetty liikaa lohkoja"
 
-#: ../memline.c:2511
 msgid "E317: pointer block id wrong 4"
-msgstr "E317: osoitinlohkon tunnus v��r� 4"
+msgstr "E317: osoitinlohkon tunnus väärä 4"
 
-#: ../memline.c:2536
 msgid "deleted block 1?"
 msgstr "poistettu lohko 1?"
 
-#: ../memline.c:2707
-#, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: Rivi� %<PRId64> ei l�ydy"
+#, fuzzy, c-format
+#~ msgid "E320: Cannot find line %<PRId64>"
+#~ msgstr "E320: Riviä %ld ei löydy"
 
-#: ../memline.c:2916
 msgid "E317: pointer block id wrong"
-msgstr "E317: osoitinlohkon tunnus v��r�"
+msgstr "E317: osoitinlohkon tunnus väärä"
 
-#: ../memline.c:2930
 msgid "pe_line_count is zero"
 msgstr "pe_line_count on nolla"
 
-#: ../memline.c:2955
-#, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: rivinumero arvoalueen ulkopuoleta: %<PRId64> on loppua suurempi"
+#, fuzzy, c-format
+#~ msgid "E322: line number out of range: %<PRId64> past the end"
+#~ msgstr "E322: rivinumero arvoalueen ulkopuoleta: %ld on loppua suurempi"
 
-#: ../memline.c:2959
-#, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: rivim��r� v��rin lohkossa %<PRId64>"
+#, fuzzy, c-format
+#~ msgid "E323: line count wrong in block %<PRId64>"
+#~ msgstr "E323: rivimäärä väärin lohkossa %ld"
 
-#: ../memline.c:2999
 msgid "Stack size increases"
 msgstr "Pinon koko kasvaa"
 
-#: ../memline.c:3038
 msgid "E317: pointer block id wrong 2"
-msgstr "E317: osoitinlohon tunnus v��r� 2"
+msgstr "E317: osoitinlohon tunnus väärä 2"
 
-#: ../memline.c:3070
 #, c-format
 msgid "E773: Symlink loop for \"%s\""
 msgstr "E773: Symlinkkisilmukka kohteelle %s"
 
-#: ../memline.c:3221
 msgid "E325: ATTENTION"
 msgstr "E325: HUOMAA"
 
-#: ../memline.c:3222
 msgid ""
 "\n"
 "Found a swap file by the name \""
 msgstr ""
 "\n"
-"Swap-tiedosto l�ytyi: \""
+"Swap-tiedosto löytyi: \""
 
-#: ../memline.c:3226
 msgid "While opening file \""
 msgstr "Avattaessa tiedostoa "
 
-#: ../memline.c:3239
 msgid "      NEWER than swap file!\n"
 msgstr "   joka on UUDEMPI kuin swap-tiedosto!\n"
 
-#: ../memline.c:3244
-#, fuzzy
+#. Some of these messages are long to allow translation to
+#. * other languages.
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
 "    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
-"(1) Toinen ohjelma saattaa k�ytt�� samaa tiedostoa.\n"
-"    Jos n�in on, varo, ettet muokkaa saman tiedoston\n"
-"    kahta instanssia yht� aikaa.\n"
+"(1) Toinen ohjelma saattaa käyttää samaa tiedostoa.\n"
+"    Jos näin on, varo, ettet muokkaa saman tiedoston\n"
+"    kahta instanssia yhtä aikaa. Lopeta tai jatka varoen.\n"
 
-#: ../memline.c:3245
-#, fuzzy
-msgid "  Quit, or continue with caution.\n"
-msgstr "    Lopeta, tai jatka.\n"
-
-#: ../memline.c:3246
-#, fuzzy
 msgid "(2) An edit session for this file crashed.\n"
-msgstr ""
-"\n"
-"(2) Ohjelma on kaatunut muokatessa tiedostoa.\n"
+msgstr "(2) Tiedostonmuokkausistunto on kaatunut.\n"
 
-#: ../memline.c:3247
 msgid "    If this is the case, use \":recover\" or \"vim -r "
-msgstr "    Jos n�in on, k�yt� komentoa :recover tai vim -r "
+msgstr "    Jos näin on, käytä komentoa :recover tai vim -r "
 
-#: ../memline.c:3249
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
 msgstr ""
 "\"\n"
-"    palauttaaksesi muutokset (lis�tietoja: \":help recovery\").\n"
+"    palauttaaksesi muutokset (lisätietoja: \":help recovery\").\n"
 
-#: ../memline.c:3250
 msgid "    If you did this already, delete the swap file \""
-msgstr "    Jos teit jo n�in, poista swap-tiedosto "
+msgstr "    Jos teit jo näin, poista swap-tiedosto "
 
-#: ../memline.c:3252
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
 msgstr ""
 "\"\n"
-"    v�ltt��ksesi t�m�n viestin.\n"
+"    välttääksesi tämän viestin.\n"
 
-#: ../memline.c:3450 ../memline.c:3452
 msgid "Swap file \""
 msgstr "Swap-tiedosto "
 
-#: ../memline.c:3451 ../memline.c:3455
 msgid "\" already exists!"
 msgstr " on jo olemassa"
 
-#: ../memline.c:3457
 msgid "VIM - ATTENTION"
 msgstr "VIM - HUOMAUTUS"
 
-#: ../memline.c:3459
-msgid "Swap file already exists!"
-msgstr "Swap-tiedosto on jo olemassa"
-
-#: ../memline.c:3464
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4160,7 +3809,6 @@ msgstr ""
 "&Lopeta\n"
 "P&eru"
 
-#: ../memline.c:3467
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4184,48 +3832,48 @@ msgstr ""
 #.
 #. ".s?a"
 #. ".saa": tried enough, give up
-#: ../memline.c:3528
 msgid "E326: Too many swap files found"
 msgstr "E326: Liian monta swap-tiedostoa"
 
-#: ../memory.c:227
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: Muisti loppui! (varattaessa %<PRIu64> tavua)"
+#, fuzzy, c-format
+msgid ""
+"E303: Unable to create directory \"%s\" for swap file, recovery impossible: "
+"%s"
+msgstr "E303: Swap-tiedostoa %s ei voi avata, palautus ei onnistu"
+
+#, fuzzy
+#~ msgid "Vim: Data too large to fit into virtual memory space\n"
+#~ msgstr "arvo on liian suuri mahtumaan C:n int-tyyppiin"
+
+#, fuzzy, c-format
+#~ msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
+#~ msgstr "E342: Muisti loppui! (varattaessa %lu tavua)"
 
-#: ../menu.c:62
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: Valikkokohtapolun osa ei ole alivalikko"
 
-#: ../menu.c:63
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: Valikko on olemassa vain toisessa tilassa"
 
-#: ../menu.c:64
 #, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329: Ei valikkoa %s"
 
 #. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
 msgid "E792: Empty menu name"
-msgstr "E792: tyhj� valikkonimi"
+msgstr "E792: tyhjä valikkonimi"
 
-#: ../menu.c:340
 msgid "E330: Menu path must not lead to a sub-menu"
 msgstr "E330: Valikkopolku ei saa johtaa alivalikkoon"
 
-#: ../menu.c:365
 msgid "E331: Must not add menu items directly to menu bar"
-msgstr "E331: Valikkokohtia ei saa lis�t� suoraan valikkopalkkiin"
+msgstr "E331: Valikkokohtia ei saa lisätä suoraan valikkopalkkiin"
 
-#: ../menu.c:370
 msgid "E332: Separator cannot be part of a menu path"
 msgstr "E332: Erotin ei voi olla valikkopolun osa"
 
 #. Now we have found the matching menu, and we list the mappings
 #. Highlight title
-#: ../menu.c:762
 msgid ""
 "\n"
 "--- Menus ---"
@@ -4233,87 +3881,64 @@ msgstr ""
 "\n"
 "--- Valikot ---"
 
-#: ../menu.c:1313
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: Valikkopolun on johdettava valikkokohtaan"
 
-#: ../menu.c:1330
 #, c-format
 msgid "E334: Menu not found: %s"
-msgstr "E334: Valikkoa ei l�ydy: %s"
+msgstr "E334: Valikkoa ei löydy: %s"
 
-#: ../menu.c:1396
 #, c-format
 msgid "E335: Menu not defined for %s mode"
-msgstr "E335: Valikkoa ei ole m��ritelty %s-tilassa"
+msgstr "E335: Valikkoa ei ole määritelty %s-tilassa"
 
-#: ../menu.c:1426
-msgid "E336: Menu path must lead to a sub-menu"
-msgstr "E336: Valikkopolun pit�� johtaa alivalikkoon"
-
-#: ../menu.c:1447
-msgid "E337: Menu not found - check menu names"
-msgstr "E337: Valikkoa ei l�ytynyt - tarkista valikkojen nimet"
-
-#: ../message.c:423
 #, c-format
 msgid "Error detected while processing %s:"
 msgstr "Virhe suoritettaessa komentoja %s:"
 
-#: ../message.c:445
 #, c-format
 msgid "line %4ld:"
 msgstr "rivi %4ld:"
 
-#: ../message.c:617
 #, c-format
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Virheellinen rekisterin nimi: %s"
 
-#: ../message.c:986
 msgid "Interrupt: "
 msgstr "Keskeytys: "
 
-#: ../message.c:988
 msgid "Press ENTER or type command to continue"
-msgstr "Paina enteri� tai kirjoita komento aloittaaksesi "
+msgstr "Paina enteriä tai kirjoita komento aloittaaksesi "
 
-#: ../message.c:1843
-#, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s rivi %<PRId64>"
+#, fuzzy, c-format
+#~ msgid "%s line %<PRId64>"
+#~ msgstr "%s rivi %ld"
 
-#: ../message.c:2392
 msgid "-- More --"
-msgstr "-- Lis�� --"
+msgstr "-- Lisää --"
 
-#: ../message.c:2398
 msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
-msgstr " SPACE/d/j: ruutu/sivu/rivi alas, b/u/k: yl�s, q: lopeta "
+msgstr " SPACE/d/j: ruutu/sivu/rivi alas, b/u/k: ylös, q: lopeta "
 
-#: ../message.c:3021 ../message.c:3031
 msgid "Question"
 msgstr "Kysymys"
 
-#: ../message.c:3023
 msgid ""
 "&Yes\n"
 "&No"
 msgstr ""
-"&Kyll�\n"
+"&Kyllä\n"
 "&Ei"
 
-#: ../message.c:3033
 msgid ""
 "&Yes\n"
 "&No\n"
 "&Cancel"
 msgstr ""
-"&Kyll�\n"
+"&Kyllä\n"
 "&Ei\n"
 "&Peru"
 
-#: ../message.c:3045
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4321,180 +3946,165 @@ msgid ""
 "&Discard All\n"
 "&Cancel"
 msgstr ""
-"&Kyll�\n"
+"&Kyllä\n"
 "&Ei\n"
 "&Tallenna kaikki\n"
 "T&uhoa kaikki\n"
 "&Peru"
 
-#: ../message.c:3058
-msgid "E766: Insufficient arguments for printf()"
-msgstr "E766: printf():lle ei annettu tarpeeksi argumentteja"
-
-#: ../message.c:3119
-msgid "E807: Expected Float argument for printf()"
-msgstr "E807: Odotettiin Float-argumenttia printf():lle"
-
-#: ../message.c:3873
-msgid "E767: Too many arguments to printf()"
-msgstr "E767: printf():lle annettiin liikaa argumentteja"
-
-#: ../misc1.c:2256
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: Varoitus: Muutetaan kirjoitussuojattua tiedostoa"
 
-#: ../misc1.c:2537
 msgid "Type number and <Enter> or click with mouse (empty cancels): "
-msgstr "Kirjoita numero ja <Enter> tai valitse hiirell� (tyhj� peruu): "
+msgstr "Kirjoita numero ja <Enter> tai valitse hiirellä (tyhjä peruu): "
 
-#: ../misc1.c:2539
 msgid "Type number and <Enter> (empty cancels): "
-msgstr "Valitse numero ja <Enter> (tyhj� peruu): "
+msgstr "Valitse numero ja <Enter> (tyhjä peruu): "
 
-#: ../misc1.c:2585
 msgid "1 more line"
-msgstr "1 rivi lis��"
+msgstr "1 rivi lisää"
 
-#: ../misc1.c:2588
 msgid "1 line less"
-msgstr "1 rivi v�hemm�n"
+msgstr "1 rivi vähemmän"
 
-#: ../misc1.c:2593
-#, c-format
-msgid "%<PRId64> more lines"
-msgstr "%<PRId64> rivi� lis��"
+#, fuzzy, c-format
+#~ msgid "%<PRId64> more lines"
+#~ msgstr "%ld riviä lisää"
 
-#: ../misc1.c:2596
-#, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "%<PRId64> rivi� v�hemm�n"
+#, fuzzy, c-format
+#~ msgid "%<PRId64> fewer lines"
+#~ msgstr "%ld riviä vähemmän"
 
-#: ../misc1.c:2599
 msgid " (Interrupted)"
 msgstr " (Keskeytetty)"
 
-#: ../misc1.c:2635
 msgid "Beep!"
 msgstr "Piip!"
 
-#: ../misc2.c:738
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "Kutsutaan kuorta suorittamaan: %s"
 
-#: ../normal.c:183
+#, c-format
+#~ msgid "Invalid channel \"%<PRIu64>\""
+#~ msgstr ""
+
+#~ msgid "Message is not an array"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Message is empty"
+#~ msgstr "Viesti"
+
+#~ msgid "Message type must be an integer"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Unknown message type"
+#~ msgstr "E574: Tuntematon rekisterityyppi %d"
+
+#~ msgid "Request array size should be 4 (request) or 3 (notification)"
+#~ msgstr ""
+
+#~ msgid "ID must be a positive integer"
+#~ msgstr ""
+
+#~ msgid "Method must be a string"
+#~ msgstr ""
+
+#, fuzzy
+#~ msgid "Parameters must be an array"
+#~ msgstr "merkin nimen pitää olla yksi merkki"
+
+#.
+#. * nv_*(): functions called to handle Normal and Visual mode commands.
+#. * n_*(): functions called to handle Normal mode commands.
+#. * v_*(): functions called to handle Visual mode commands.
+#.
 msgid "E349: No identifier under cursor"
 msgstr "E349: Ei tunnistetta osoittimen alla"
 
-#: ../normal.c:1866
 msgid "E774: 'operatorfunc' is empty"
-msgstr "E774: operatorfunc on tyhj�"
+msgstr "E774: operatorfunc on tyhjä"
 
-#: ../normal.c:2637
 msgid "Warning: terminal cannot highlight"
 msgstr "Varoitus: terminaalista puuttuu korostus"
 
-#: ../normal.c:2807
 msgid "E348: No string under cursor"
 msgstr "E348: Ei merkkijonoa kursorin alla"
 
-#: ../normal.c:3937
 msgid "E352: Cannot erase folds with current 'foldmethod'"
-msgstr "E352: taitoksia ei voi poistaa t�ll� foldmethodilla"
+msgstr "E352: taitoksia ei voi poistaa tällä foldmethodilla"
 
-#: ../normal.c:5897
 msgid "E664: changelist is empty"
-msgstr "E664: muutoslista on tyhj�"
+msgstr "E664: muutoslista on tyhjä"
 
-#: ../normal.c:5899
 msgid "E662: At start of changelist"
 msgstr "E662: Muutoslistan alussa"
 
-#: ../normal.c:5901
 msgid "E663: At end of changelist"
 msgstr "E663: Muutoslistan lopussa"
 
-#: ../normal.c:7053
-msgid "Type  :quit<Enter>  to exit Nvim"
-msgstr "Komento :quit<Enter> lopettaa Vimin"
+#, fuzzy
+#~ msgid "Type  :quit<Enter>  to exit Nvim"
+#~ msgstr "Komento :quit<Enter> lopettaa Vimin"
 
-#: ../ops.c:248
 #, c-format
 msgid "1 line %sed 1 time"
-msgstr "1 rivi� %s kerran"
+msgstr "1 riviä %s kerran"
 
-#: ../ops.c:250
 #, c-format
 msgid "1 line %sed %d times"
-msgstr "1 rivi� %s %d kertaa"
+msgstr "1 riviä %s %d kertaa"
 
-#: ../ops.c:253
-#, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> rivi� %s kerran"
+#, fuzzy, c-format
+#~ msgid "%<PRId64> lines %sed 1 time"
+#~ msgstr "%ld riviä %s kerran"
 
-#: ../ops.c:256
-#, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> rivi� %s %d kertaa"
+#, fuzzy, c-format
+#~ msgid "%<PRId64> lines %sed %d times"
+#~ msgstr "%ld riviä %s %d kertaa"
 
-#: ../ops.c:592
-#, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "%<PRId64> rivi� sisennett�v�n�..."
+#, fuzzy, c-format
+#~ msgid "%<PRId64> lines to indent... "
+#~ msgstr "%ld riviä sisennettävänä..."
 
-#: ../ops.c:634
 msgid "1 line indented "
 msgstr "1 rivi sisennetty "
 
-#: ../ops.c:636
-#, c-format
-msgid "%<PRId64> lines indented "
-msgstr "%<PRId64> rivi� sisennetty "
+#, fuzzy, c-format
+#~ msgid "%<PRId64> lines indented "
+#~ msgstr "%ld riviä sisennetty "
 
-#: ../ops.c:938
 msgid "E748: No previously used register"
-msgstr "E748: Ei aiemmin k�ytettyj� rekisterej�"
+msgstr "E748: Ei aiemmin käytettyjä rekisterejä"
 
-#. must display the prompt
-#: ../ops.c:1433
-msgid "cannot yank; delete anyway"
-msgstr "Ei voi kopioida; poista joka tapauksessa"
-
-#: ../ops.c:1929
 msgid "1 line changed"
 msgstr "1 rivi muuttui"
 
-#: ../ops.c:1931
-#, c-format
-msgid "%<PRId64> lines changed"
-msgstr "%<PRId64> rivi� muuttui"
+#, fuzzy, c-format
+#~ msgid "%<PRId64> lines changed"
+#~ msgstr "%ld riviä muuttui"
 
-#: ../ops.c:2521
 msgid "block of 1 line yanked"
 msgstr "1 rivin lohko kopioitu"
 
-#: ../ops.c:2523
 msgid "1 line yanked"
 msgstr "1 rivi kopioitu"
 
-#: ../ops.c:2525
-#, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "lohko %<PRId64> rivilt� kopioitu"
+#, fuzzy, c-format
+#~ msgid "block of %<PRId64> lines yanked"
+#~ msgstr "lohko %ld riviltä kopioitu"
 
-#: ../ops.c:2528
-#, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "%<PRId64> rivi� kopioitu"
+#, fuzzy, c-format
+#~ msgid "%<PRId64> lines yanked"
+#~ msgstr "%ld riviä kopioitu"
 
-#: ../ops.c:2710
 #, c-format
 msgid "E353: Nothing in register %s"
-msgstr "E353: Rekisteriss� %s ei ole mit��n"
+msgstr "E353: Rekisterissä %s ei ole mitään"
 
 #. Highlight title
-#: ../ops.c:3185
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4502,207 +4112,142 @@ msgstr ""
 "\n"
 "--- Rekisterit ---"
 
-#: ../ops.c:4455
-msgid "Illegal register name"
-msgstr "Virheellinen rekisterin nimi"
-
-#: ../ops.c:4533
 msgid ""
-"\n"
-"# Registers:\n"
+"E883: search pattern and expression register may not contain two or more "
+"lines"
 msgstr ""
-"\n"
-"# Rekisterit:\n"
+"E883: hakulauseke- ja -ilmausrekisteri ei voi sisältää kahta tai useampaa "
+"riviä"
 
-#: ../ops.c:4575
-#, c-format
-msgid "E574: Unknown register type %d"
-msgstr "E574: Tuntematon rekisterityyppi %d"
+#, fuzzy, c-format
+#~ msgid "%<PRId64> Cols; "
+#~ msgstr "%ld saraketta, "
 
-#: ../ops.c:5089
-#, c-format
-msgid "%<PRId64> Cols; "
-msgstr "%<PRId64> saraketta, "
-
-#: ../ops.c:5097
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
 "%<PRId64> of %<PRId64> Bytes"
-msgstr ""
-"Valittu %s%<PRId64>/%<PRId64> rivi�, %<PRId64>/%<PRId64> sanaa, %<PRId64>/"
-"%<PRId64> tavua"
+msgstr "Valittu %s%ld/%ld riviä, %lld/%lld sanaa, %lld/%lld tavua"
 
-#: ../ops.c:5105
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
 "%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
 msgstr ""
-"Valittu %s%<PRId64>/%<PRId64> rivi�, %<PRId64>/%<PRId64> sanaa, %<PRId64>/"
-"%<PRId64> merkki�, %<PRId64>/%<PRId64> tavua"
+"Valittu %s%ld/%ld riviä, %lld/%lld sanaa, %lld/%lld merkkiä, %lld/%lld tavua"
 
-#: ../ops.c:5123
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
 "%<PRId64> of %<PRId64>"
-msgstr ""
-"Sarake %s/%s, Rivi %<PRId64>/%<PRId64>, sana %<PRId64>/%<PRId64>, tavu "
-"%<PRId64>/%<PRId64>"
+msgstr "Sarake %s/%s, Rivi %ld/%ld, sana %lld/%lld, tavu %lld/%lld"
 
-#: ../ops.c:5133
-#, c-format
+#, fuzzy, c-format
 msgid ""
 "Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
 "%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
 msgstr ""
-"Sarake %s/%s, rivi %<PRId64>/%<PRId64>, sana %<PRId64>/%<PRId64>, merkki "
-"%<PRId64>/%<PRId64>, tavu %<PRId64>/%<PRId64>"
+"Sarake %s/%s, rivi %ld/%ld, sana %lld/%lld, merkki %lld/%lld, tavu %lld/%lld"
 
 # Unicode Byte Order Mark
-#: ../ops.c:5146
-#, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr "(+%<PRId64> BOMista)"
-
-#: ../option.c:1238
-msgid "%<%f%h%m%=Page %N"
-msgstr "%<%f%h%m%=Sivu %N"
-
-#: ../option.c:1574
-msgid "Thanks for flying Vim"
-msgstr "Kiitos ett� ajoit Vimi�"
+#, fuzzy, c-format
+#~ msgid "(+%<PRId64> for BOM)"
+#~ msgstr "(+%ld BOMista)"
 
 #. found a mismatch: skip
-#: ../option.c:2698
 msgid "E518: Unknown option"
 msgstr "E518: Tuntematon asetus"
 
-#: ../option.c:2709
-msgid "E519: Option not supported"
-msgstr "E519: Asetusta ei tueta"
-
-#: ../option.c:2740
 msgid "E520: Not allowed in a modeline"
-msgstr "E520: Ei sallitu modeline-rivill�"
+msgstr "E520: Ei sallitu modeline-rivillä"
 
-#: ../option.c:2815
 msgid "E846: Key code not set"
-msgstr ""
+msgstr "E846: Avainkoodi puuttuu"
 
-#: ../option.c:2924
 msgid "E521: Number required after ="
-msgstr "E521: =:n j�lkeen tarvitaan luku"
+msgstr "E521: =:n jälkeen tarvitaan luku"
 
-#: ../option.c:3226 ../option.c:3864
-msgid "E522: Not found in termcap"
-msgstr "E522: Puuttuu termcapista"
-
-#: ../option.c:3335
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: Virheellinen merkki <%s>"
 
-#: ../option.c:3862
-msgid "E529: Cannot set 'term' to empty string"
-msgstr "E529: Termi� ei voi asettaa tyhj�ksi merkkijonoksi"
+#, c-format
+msgid "For option %s"
+msgstr "Asetukselle %s"
 
-#: ../option.c:3885
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: backupext ja patchmod ovat samat"
 
-#: ../option.c:3964
 msgid "E834: Conflicts with value of 'listchars'"
 msgstr "E834: listcharsin arvoissa on ristiriitoja"
 
-#: ../option.c:3966
 msgid "E835: Conflicts with value of 'fillchars'"
 msgstr "E835: fillcharsin arvossa on ristiriitoja"
 
-#: ../option.c:4163
 msgid "E524: Missing colon"
 msgstr "E524: Kaksoispiste puuttuu"
 
-#: ../option.c:4165
 msgid "E525: Zero length string"
 msgstr "E525: Nollan pituinen merkkijono"
 
-#: ../option.c:4220
 #, c-format
 msgid "E526: Missing number after <%s>"
-msgstr "E526: Lukuarvo puuttuu merkkijonon <%s> j�lkeen"
+msgstr "E526: Lukuarvo puuttuu merkkijonon <%s> jälkeen"
 
-#: ../option.c:4232
 msgid "E527: Missing comma"
 msgstr "E527: Pilkku puuttuu"
 
-#: ../option.c:4239
 msgid "E528: Must specify a ' value"
-msgstr "E528: '-arvo pit�� antaa"
+msgstr "E528: '-arvo pitää antaa"
 
-#: ../option.c:4271
 msgid "E595: contains unprintable or wide character"
-msgstr "E595: Sis�lt�� tulostumattomia tai leveit� merkkej�"
+msgstr "E595: Sisältää tulostumattomia tai leveitä merkkejä"
 
-#: ../option.c:4469
 #, c-format
 msgid "E535: Illegal character after <%c>"
-msgstr "E535: Virheellinen merkki merkin <%c> j�lkeen"
+msgstr "E535: Virheellinen merkki merkin <%c> jälkeen"
 
-#: ../option.c:4534
 msgid "E536: comma required"
 msgstr "E536: pilkku puuttuu"
 
-#: ../option.c:4543
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
-msgstr "E537: commentstringin pit�� olla tyhj� tai sis�lt�� %s"
+msgstr "E537: commentstringin pitää olla tyhjä tai sisältää %s"
 
-#: ../option.c:4928
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: Sulkematon lausekesarja"
 
-#: ../option.c:4932
 msgid "E541: too many items"
 msgstr "E541: liikaa kohteita"
 
-#: ../option.c:4934
 msgid "E542: unbalanced groups"
-msgstr "E542: ep�tasapainoisia ryhmi�"
+msgstr "E542: epätasapainoisia ryhmiä"
 
-#: ../option.c:5148
 msgid "E590: A preview window already exists"
 msgstr "E590: Esikatseluikkuna on jo olemassa"
 
-#: ../option.c:5311
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
-msgstr "W17: Arabialle pit�� olla UTF-8:aa, aseta :set encoding=utf-8"
+msgstr "W17: Arabialle pitää olla UTF-8:aa, aseta :set encoding=utf-8"
 
-#: ../option.c:5623
 #, c-format
 msgid "E593: Need at least %d lines"
-msgstr "E593: Tarvitaan ainakin %d rivi�"
+msgstr "E593: Tarvitaan ainakin %d riviä"
 
-#: ../option.c:5631
 #, c-format
 msgid "E594: Need at least %d columns"
 msgstr "E594: Tarvitaan ainakin %d saraketta"
 
-#: ../option.c:6011
 #, c-format
 msgid "E355: Unknown option: %s"
 msgstr "E355: Tuntematon asetus: %s"
 
 #. There's another character after zeros or the string
-#. * is empty.  In both cases, we are trying to set a
-#. * num option using a string.
-#: ../option.c:6037
+#. is empty.  In both cases, we are trying to set a
+#. num option using a string.
 #, c-format
 msgid "E521: Number required: &%s = '%s'"
 msgstr "E521: tarvitaan luku: &%s = '%s'"
 
-#: ../option.c:6149
 msgid ""
 "\n"
 "--- Terminal codes ---"
@@ -4710,7 +4255,6 @@ msgstr ""
 "\n"
 "--- Terminaalikoodit ---"
 
-#: ../option.c:6151
 msgid ""
 "\n"
 "--- Global option values ---"
@@ -4718,7 +4262,6 @@ msgstr ""
 "\n"
 "--- Globaalit asetukset ---"
 
-#: ../option.c:6153
 msgid ""
 "\n"
 "--- Local option values ---"
@@ -4726,7 +4269,6 @@ msgstr ""
 "\n"
 "--- Paikalliset asetukset ---"
 
-#: ../option.c:6155
 msgid ""
 "\n"
 "--- Options ---"
@@ -4734,29 +4276,24 @@ msgstr ""
 "\n"
 "--- Asetukset ---"
 
-#: ../option.c:6816
 msgid "E356: get_varp ERROR"
 msgstr "E356: get_varp-virhe"
 
-#: ../option.c:7696
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
-msgstr "E357: langmap: Merkkiin %s t�sm��v� merkki puuttuu"
+msgstr "E357: langmap: Merkkiin %s täsmäävä merkki puuttuu"
 
-#: ../option.c:7715
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
-msgstr "E358: langmap: ylim��r�isi� merkkej� puolipisteen j�lkeen: %s"
+msgstr "E358: langmap: ylimääräisiä merkkejä puolipisteen jälkeen: %s"
 
-#: ../os/shell.c:194
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"Kuoren suoritus ei onnistu "
+#, c-format
+msgid "dlerror = \"%s\""
+msgstr "dlerror = %s"
+
+msgid "Vim: Error reading input, exiting...\n"
+msgstr "Vim: Virhe luettaessa syötettä, poistutaan...\n"
 
-#: ../os/shell.c:439
 msgid ""
 "\n"
 "shell returned "
@@ -4764,8 +4301,18 @@ msgstr ""
 "\n"
 "kuoren palautusarvo "
 
-# mik� security context?
-#: ../os_unix.c:465 ../os_unix.c:471
+#~ msgid ""
+#~ "\n"
+#~ "shell failed to start: "
+#~ msgstr ""
+
+#. Can happen if system() tries to send input to a shell command that was
+#. backgrounded (:call system("cat - &", "foo")). #3529 #5241
+#, fuzzy, c-format
+#~ msgid "E5677: Error writing input to shell-command: %s"
+#~ msgstr "E677: Väliaikaistiedostoon kirjoittaminen ei onnistunut"
+
+# mikä security context?
 msgid ""
 "\n"
 "Could not get security context for "
@@ -4773,7 +4320,6 @@ msgstr ""
 "\n"
 "Ei saatu turvallisuuskontekstia kohteelle "
 
-#: ../os_unix.c:479
 msgid ""
 "\n"
 "Could not set security context for "
@@ -4781,947 +4327,897 @@ msgstr ""
 "\n"
 "Ei voitu asettaa turvallisuuskontekstia kohteelle "
 
-#: ../os_unix.c:1558 ../os_unix.c:1647
-#, c-format
-msgid "dlerror = \"%s\""
-msgstr "dlerror = %s"
-
-#: ../path.c:1449
 #, c-format
 msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: Tiedosto %s ei l�ydy polulta"
+msgstr "E447: Tiedosto %s ei löydy polulta"
 
-#: ../quickfix.c:359
 #, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: Liikaa %%%c-juttuja muotoilumerkkijonossa"
 
-#: ../quickfix.c:371
 #, c-format
 msgid "E373: Unexpected %%%c in format string"
 msgstr "E373: Odottamaton %%%c muotoilumerkkijonossa"
 
-#: ../quickfix.c:420
 msgid "E374: Missing ] in format string"
 msgstr "E374: ] puuttuu muotoilemerkkijonosta"
 
-#: ../quickfix.c:431
 #, c-format
 msgid "E375: Unsupported %%%c in format string"
 msgstr "E375: Tukematon %%%c muotoilumerkkijonossa"
 
-#: ../quickfix.c:448
 #, c-format
 msgid "E376: Invalid %%%c in format string prefix"
 msgstr "E376: Virheellinen %%%c muotoilumerkkijonon alussa"
 
-#: ../quickfix.c:454
 #, c-format
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: Virheellinen %%%c muotoilumerkkijonossa"
 
 #. nothing found
-#: ../quickfix.c:477
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: errorformatissa ei ole kuvioita"
 
-#: ../quickfix.c:695
 msgid "E379: Missing or empty directory name"
-msgstr "E379: Puuttuva tai tyhj� hakemiston nimi"
+msgstr "E379: Puuttuva tai tyhjä hakemiston nimi"
 
-#: ../quickfix.c:1305
 msgid "E553: No more items"
-msgstr "E553: Ei en�� kohteita"
+msgstr "E553: Ei enää kohteita"
+
+msgid "E924: Current window was closed"
+msgstr "E924: Nykyinen ikkuna on suljettu"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: Nykyinen quickfix on muuttunut"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: Nykyinen sijaintiluettelo on muuttunut"
 
-#: ../quickfix.c:1674
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d/%d)%s%s: "
 
-#: ../quickfix.c:1676
 msgid " (line deleted)"
 msgstr " (rivi poistettu)"
 
-#: ../quickfix.c:1863
+#, c-format
+msgid "%serror list %d of %d; %d errors "
+msgstr "%svirhelista %d/%d, %d virhettä"
+
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: quickfix-pinon pohjalla"
 
-#: ../quickfix.c:1869
 msgid "E381: At top of quickfix stack"
 msgstr "E381: quickfix-pinon huipulla"
 
-#: ../quickfix.c:1880
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "virhelista %d/%d, %d virhett�"
+msgid "No entries"
+msgstr "Ei kenttiä"
 
-#: ../quickfix.c:2427
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: Ei voi kirjoittaa, buftype asetettu"
 
-#: ../quickfix.c:2812
 msgid "E683: File name missing or invalid pattern"
 msgstr "E683: Tiedostonimi puuttuu tai kuvio on viallinen"
 
-#: ../quickfix.c:2911
 #, c-format
 msgid "Cannot open file \"%s\""
 msgstr "Tiedostoa %s ei voi avata"
 
-#: ../quickfix.c:3429
 msgid "E681: Buffer is not loaded"
 msgstr "E681: Puskuria ei ole ladattu"
 
-#: ../quickfix.c:3487
 msgid "E777: String or List expected"
-msgstr "E777: Pit�� olla merkkijono tai lista"
+msgstr "E777: Pitää olla merkkijono tai lista"
 
-#: ../regexp.c:359
 #, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: virheellinen olio kohdassa %s%%[]"
 
-#: ../regexp.c:374
 #, c-format
 msgid "E769: Missing ] after %s["
-msgstr "E769: ] puuttuu merkinn�n %s[ j�ljest�"
+msgstr "E769: ] puuttuu merkinnän %s[ jäljestä"
 
-#: ../regexp.c:375
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: Pariton %s%%("
 
-#: ../regexp.c:376
 #, c-format
 msgid "E54: Unmatched %s("
 msgstr "E54: Pariton %s("
 
-#: ../regexp.c:377
 #, c-format
 msgid "E55: Unmatched %s)"
 msgstr "E55: Pariton %s)"
 
-#: ../regexp.c:378
 msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( ei ole sallittu t�ss�"
+msgstr "E66: \\z( ei ole sallittu tässä"
 
-#: ../regexp.c:379
 msgid "E67: \\z1 et al. not allowed here"
-msgstr "E67: \\z1 jne. ei ole sallittu t�ss�"
+msgstr "E67: \\z1 jne. ei ole sallittu tässä"
 
-#: ../regexp.c:380
 #, c-format
 msgid "E69: Missing ] after %s%%["
-msgstr "E69: ] puuttuu merkinn�n %s%%[ j�ljest�"
+msgstr "E69: ] puuttuu merkinnän %s%%[ jäljestä"
 
-#: ../regexp.c:381
 #, c-format
 msgid "E70: Empty %s%%[]"
-msgstr "E70: Tyhj� %s%%[]"
+msgstr "E70: Tyhjä %s%%[]"
 
-#: ../regexp.c:1209 ../regexp.c:1224
 msgid "E339: Pattern too long"
-msgstr "E339: Liian pitk� kuvio"
+msgstr "E339: Liian pitkä kuvio"
 
-#: ../regexp.c:1371
 msgid "E50: Too many \\z("
-msgstr "E50: Liikaa merkkej� \\z("
+msgstr "E50: Liikaa merkkejä \\z("
 
-#: ../regexp.c:1378
 #, c-format
 msgid "E51: Too many %s("
-msgstr "E51: Liikaa merkkej� %s("
+msgstr "E51: Liikaa merkkejä %s("
 
-#: ../regexp.c:1427
 msgid "E52: Unmatched \\z("
 msgstr "E52: Pariton \\z("
 
-#: ../regexp.c:1637
 #, c-format
 msgid "E59: invalid character after %s@"
-msgstr "E59: virheellinen merkki kohdan %s@ j�lkeen"
+msgstr "E59: virheellinen merkki kohdan %s@ jälkeen"
 
-#: ../regexp.c:1672
 #, c-format
 msgid "E60: Too many complex %s{...}s"
 msgstr "E60: Liikaa monimutkaisia ilmauksia %s{...}s"
 
-#: ../regexp.c:1687
 #, c-format
 msgid "E61: Nested %s*"
-msgstr "E61: Sis�kk�istetty %s*"
+msgstr "E61: Sisäkkäistetty %s*"
 
-#: ../regexp.c:1690
 #, c-format
 msgid "E62: Nested %s%c"
-msgstr "E62: Sis�kk�istetty %s%c"
+msgstr "E62: Sisäkkäistetty %s%c"
 
-#: ../regexp.c:1800
 msgid "E63: invalid use of \\_"
-msgstr "E63: v��rink�ytetty \\_"
+msgstr "E63: väärinkäytetty \\_"
 
-#: ../regexp.c:1850
 #, c-format
 msgid "E64: %s%c follows nothing"
-msgstr "E64: %s%c j�lkeen ei mink��n"
+msgstr "E64: %s%c jälkeen ei minkään"
 
-#: ../regexp.c:1902
 msgid "E65: Illegal back reference"
-msgstr "E65: Virheellinen t�sm�ysviittaus"
+msgstr "E65: Virheellinen täsmäysviittaus"
 
-#: ../regexp.c:1943
 msgid "E68: Invalid character after \\z"
-msgstr "E68: Virheellinen merkki ilmauksen \\z j�lkeen"
+msgstr "E68: Virheellinen merkki ilmauksen \\z jälkeen"
 
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
 #, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
-msgstr "E678: Virheellinen merkki merkinn�n %s%%[dxouU] j�ljess�"
+msgstr "E678: Virheellinen merkki merkinnän %s%%[dxouU] jäljessä"
 
-#: ../regexp.c:2107
 #, c-format
 msgid "E71: Invalid character after %s%%"
-msgstr "E71: Virheellinen merkki merkinn�n %s%% j�ljess�"
+msgstr "E71: Virheellinen merkki merkinnän %s%% jäljessä"
+
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (NFA-säänn. ilmaus) ei voi toistaa kohdetta %s"
 
-#: ../regexp.c:3017
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: Syntaksivirhe ilmauksessa %s{...}"
 
-#: ../regexp.c:3805
 msgid "External submatches:\n"
-msgstr "Ulkoisia alit�sm�yksi�:\n"
+msgstr "Ulkoisia alitäsmäyksiä:\n"
 
-#: ../regexp.c:7022
 msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
 "used "
 msgstr ""
+"E864: \\%#=-merkkien perään voi tulla vain 0, 1 tai 2. Käytetään "
+"automaattista engineä "
 
-#: ../regexp_nfa.c:239
-msgid "E865: (NFA) Regexp end encountered prematurely"
-msgstr ""
+msgid "Switching to backtracking RE engine for pattern: "
+msgstr "Vaihdetaan käyttämään backtrackkaavaa RE-engineä ilmaukselle: "
 
-#: ../regexp_nfa.c:240
-#, c-format
-msgid "E866: (NFA regexp) Misplaced %c"
-msgstr ""
-
-#: ../regexp_nfa.c:242
-#, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr ""
-
-#: ../regexp_nfa.c:1261
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\z%c'"
-msgstr ""
-
-#: ../regexp_nfa.c:1387
-#, c-format
-msgid "E867: (NFA) Unknown operator '\\%%%c'"
-msgstr ""
-
-#: ../regexp_nfa.c:1802
-#, c-format
-msgid "E869: (NFA) Unknown operator '\\@%c'"
-msgstr ""
-
-#: ../regexp_nfa.c:1831
-msgid "E870: (NFA regexp) Error reading repetition limits"
-msgstr ""
-
-#. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
-msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr ""
-
-#. Too many `('
-#: ../regexp_nfa.c:2037
-msgid "E872: (NFA regexp) Too many '('"
-msgstr ""
-
-#: ../regexp_nfa.c:2042
-#, fuzzy
-msgid "E879: (NFA regexp) Too many \\z("
-msgstr "E50: Liikaa merkkej� \\z("
-
-#: ../regexp_nfa.c:2066
-msgid "E873: (NFA regexp) proper termination error"
-msgstr ""
-
-#: ../regexp_nfa.c:2599
-msgid "E874: (NFA) Could not pop the stack !"
-msgstr ""
-
-#: ../regexp_nfa.c:3298
-msgid ""
-"E875: (NFA regexp) (While converting from postfix to NFA), too many states "
-"left on stack"
-msgstr ""
-
-#: ../regexp_nfa.c:3302
-msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
-msgstr ""
-
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
-msgid ""
-"Could not open temporary log file for writing, displaying on stderr ... "
-msgstr ""
-
-#: ../regexp_nfa.c:4840
-#, c-format
-msgid "(NFA) COULD NOT OPEN %s !"
-msgstr ""
-
-#: ../regexp_nfa.c:6049
-#, fuzzy
-msgid "Could not open temporary log file for writing "
-msgstr "E828: Kumoustiedoston avaus kirjoittamista varten ei onnistu: %s"
+#~ msgid " TERMINAL"
+#~ msgstr ""
 
 # tiloja
-#: ../screen.c:7435
 msgid " VREPLACE"
 msgstr " VKORVAUS"
 
-#: ../screen.c:7437
 msgid " REPLACE"
 msgstr " KORVAUS"
 
-#: ../screen.c:7440
 msgid " REVERSE"
-msgstr " K��NTEIS"
+msgstr " KÄÄNTEIS"
 
-#: ../screen.c:7441
 msgid " INSERT"
-msgstr " SY�TT�"
+msgstr " SYÖTTÖ"
 
-#: ../screen.c:7443
 msgid " (insert)"
-msgstr " (sy�tt�)"
+msgstr " (syöttö)"
 
-#: ../screen.c:7445
 msgid " (replace)"
 msgstr " (korvaus)"
 
-#: ../screen.c:7447
 msgid " (vreplace)"
 msgstr " (vkorvaus)"
 
-#: ../screen.c:7449
 msgid " Hebrew"
 msgstr " Heprea"
 
-#: ../screen.c:7454
 msgid " Arabic"
 msgstr " Arabia"
 
-#: ../screen.c:7456
-msgid " (lang)"
-msgstr " (kieli)"
-
-#: ../screen.c:7459
 msgid " (paste)"
 msgstr " (liitos)"
 
-#: ../screen.c:7469
 msgid " VISUAL"
 msgstr " VALINTA"
 
-#: ../screen.c:7470
 msgid " VISUAL LINE"
 msgstr " VALINTARIVI"
 
-#: ../screen.c:7471
 msgid " VISUAL BLOCK"
 msgstr " VALINTALOHKO"
 
-#: ../screen.c:7472
 msgid " SELECT"
 msgstr " WALINTA"
 
-#: ../screen.c:7473
 msgid " SELECT LINE"
 msgstr " WALINTARIVI"
 
-#: ../screen.c:7474
 msgid " SELECT BLOCK"
 msgstr " WALINTALOHKO"
 
-#: ../screen.c:7486 ../screen.c:7541
 msgid "recording"
 msgstr "tallennetaan"
 
-#: ../search.c:487
 #, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: Viallinen hakujono: %s"
 
-#: ../search.c:832
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
-msgstr "E384: Haku p��si alkuun l�yt�m�tt� jonoa: %s"
+msgstr "E384: Haku pääsi alkuun löytämättä jonoa: %s"
 
-#: ../search.c:835
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
-msgstr "E385: Haku p��si loppuun l�yt�m�tt� jonoa: %s"
+msgstr "E385: Haku pääsi loppuun löytämättä jonoa: %s"
 
-#: ../search.c:1200
 msgid "E386: Expected '?' or '/'  after ';'"
-msgstr "E386: ;:n j�lkeen pit�� olla ? tai /"
+msgstr "E386: ;:n jälkeen pitää olla ? tai /"
 
-#: ../search.c:4085
 msgid " (includes previously listed match)"
-msgstr " (sis�lt�� viimeksi luetellun t�sm�yksen)"
+msgstr " (sisältää viimeksi luetellun täsmäyksen)"
 
 #. cursor at status line
-#: ../search.c:4104
 msgid "--- Included files "
-msgstr "--- Sis�llytetyt tiedostot "
+msgstr "--- Sisällytetyt tiedostot "
 
-#: ../search.c:4106
 msgid "not found "
-msgstr "ei l�ytynyt "
+msgstr "ei löytynyt "
 
-#: ../search.c:4107
 msgid "in path ---\n"
 msgstr "polusta ---\n"
 
-#: ../search.c:4168
 msgid "  (Already listed)"
 msgstr "  (Jo lueteltu)"
 
-#: ../search.c:4170
 msgid "  NOT FOUND"
-msgstr "  EI L�YTYNYT"
+msgstr "  EI LÖYTYNYT"
 
-#: ../search.c:4211
 #, c-format
 msgid "Scanning included file: %s"
-msgstr "Haku sis�lsi tiedoston: %s"
+msgstr "Haku sisälsi tiedoston: %s"
 
-#: ../search.c:4216
 #, c-format
 msgid "Searching included file %s"
-msgstr "Haku sis�lsi tiedoston %s"
+msgstr "Haku sisälsi tiedoston %s"
 
-#: ../search.c:4405
 msgid "E387: Match is on current line"
-msgstr "E387: T�sm�ys t�ll� rivill�"
+msgstr "E387: Täsmäys tällä rivillä"
 
-#: ../search.c:4517
 msgid "All included files were found"
-msgstr "Kaikki sis�llytetyt rivit l�ytyiv�t"
+msgstr "Kaikki sisällytetyt rivit löytyivät"
 
-#: ../search.c:4519
 msgid "No included files"
-msgstr "Ei sis�llytettyj� tiedostoja"
+msgstr "Ei sisällytettyjä tiedostoja"
 
-#: ../search.c:4527
 msgid "E388: Couldn't find definition"
-msgstr "E388: M��ritelm� ei l�ydy"
+msgstr "E388: Määritelmä ei löydy"
 
-#: ../search.c:4529
 msgid "E389: Couldn't find pattern"
-msgstr "E389: kuvio ei l�ydy"
+msgstr "E389: kuvio ei löydy"
 
-#: ../search.c:4668
-msgid "Substitute "
-msgstr "Korvaa "
+#~ msgid "too few bytes read"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "System error while skipping in ShaDa file: %s"
+#~ msgstr "E782: virhe luettaessa .sug-tiedostoa: %s"
 
-#: ../search.c:4681
 #, c-format
-msgid ""
-"\n"
-"# Last %sSearch Pattern:\n"
-"~"
-msgstr ""
-"\n"
-"# Edellinen %sHakulauseke:\n"
-"~"
+#~ msgid ""
+#~ "Error while reading ShaDa file: last entry specified that it occupies "
+#~ "%<PRIu64> bytes, but file ended earlier"
+#~ msgstr ""
 
-#: ../spell.c:951
-msgid "E759: Format error in spell file"
-msgstr "E759: Muotoiluvirhe oikolukutiedostossa"
+#, fuzzy, c-format
+#~ msgid "System error while closing ShaDa file: %s"
+#~ msgstr "E782: virhe luettaessa .sug-tiedostoa: %s"
 
-#: ../spell.c:952
-msgid "E758: Truncated spell file"
-msgstr "E758: Oikolukutiedosto katkaistu"
+#, fuzzy, c-format
+#~ msgid "System error while writing ShaDa file: %s"
+#~ msgstr "E782: virhe luettaessa .sug-tiedostoa: %s"
+
+#, fuzzy, c-format
+#~ msgid "Reading ShaDa file \"%s\"%s%s%s"
+#~ msgstr "Luetaan viminfo-tiedostoa \"%s\"%s%s%s"
+
+msgid " info"
+msgstr " info"
+
+msgid " marks"
+msgstr " merkit"
+
+msgid " oldfiles"
+msgstr " vanhaatiedostoa"
+
+msgid " FAILED"
+msgstr " EPÄONNISTUI"
 
-#: ../spell.c:953
 #, c-format
-msgid "Trailing text in %s line %d: %s"
-msgstr "Teksti� rivin per�ss� tiedostossa %s rivill� %d: %s"
+#~ msgid "System error while opening ShaDa file %s for reading: %s"
+#~ msgstr ""
+
+#~ msgid "additional elements of ShaDa "
+#~ msgstr ""
+
+#~ msgid "additional data of ShaDa "
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Failed to write variable %s"
+#~ msgstr "ei voitu vaihtaa puskuriin %d"
 
-#: ../spell.c:954
 #, c-format
-msgid "Affix name too long in %s line %d: %s"
-msgstr "Affiksin nimi on liian pitk� tiedostossa %s rivill� %d: %s"
+#~ msgid ""
+#~ "Failed to parse ShaDa file due to a msgpack parser error at position "
+#~ "%<PRIu64>"
+#~ msgstr ""
 
-#: ../spell.c:955
-msgid "E761: Format error in affix file FOL, LOW or UPP"
-msgstr "E761: Affiksitiedoston FOL-, LOW- tai UPP-muotovirhe "
+#, c-format
+#~ msgid ""
+#~ "Failed to parse ShaDa file: incomplete msgpack string at position %<PRIu64>"
+#~ msgstr ""
 
-#: ../spell.c:957
-msgid "E762: Character in FOL, LOW or UPP is out of range"
-msgstr "E762: Merkki FOL:ss�, LOW:ss� tai UPP:ss� ei kuulu arvoalueeseen"
+#, c-format
+#~ msgid ""
+#~ "Failed to parse ShaDa file: extra bytes in msgpack string at position "
+#~ "%<PRIu64>"
+#~ msgstr ""
 
-#: ../spell.c:958
-msgid "Compressing word tree..."
-msgstr "Tiivistet��n sanapuuta..."
+#, c-format
+#~ msgid ""
+#~ "System error while opening ShaDa file %s for reading to merge before writing "
+#~ "it: %s"
+#~ msgstr ""
+
+#. Tried names from .tmp.a to .tmp.z, all failed. Something must be
+#. wrong then.
+#, c-format
+#~ msgid "E138: All %s.tmp.X files exist, cannot write ShaDa file!"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "System error while opening temporary ShaDa file %s for writing: %s"
+#~ msgstr "Väliaikaislokitiedoston avaus kirjoittamista varten ei onnistu"
+
+#, c-format
+#~ msgid "Failed to create directory %s for writing ShaDa file: %s"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "System error while opening ShaDa file %s for writing: %s"
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "Writing ShaDa file \"%s\""
+#~ msgstr "Kirjoitetaan viminfo-tiedostoa %s"
+
+#, fuzzy, c-format
+#~ msgid "Failed setting uid and gid for file %s: %s"
+#~ msgstr "Ladattu kumoustiedoto %s"
+
+#, fuzzy, c-format
+#~ msgid "E137: ShaDa file is not writable: %s"
+#~ msgstr "E137: Viminfo-tiedostoon ei voitu kirjoittaa: %s"
+
+#, fuzzy, c-format
+#~ msgid "Can't rename ShaDa file from %s to %s!"
+#~ msgstr "E886: Viminfo-tiedostoa ei voit uudelleennimetä nimelle %s"
+
+#, fuzzy, c-format
+#~ msgid "Did not rename %s because %s does not looks like a ShaDa file"
+#~ msgstr "         [ei näytä Vimin swap-tiedostolta]"
+
+#, c-format
+#~ msgid "Did not rename %s to %s because there were errors during writing it"
+#~ msgstr ""
+
+#, c-format
+#~ msgid "Do not forget to remove %s or rename it manually to %s."
+#~ msgstr ""
+
+#, fuzzy, c-format
+#~ msgid "System error while reading ShaDa file: %s"
+#~ msgstr "E782: virhe luettaessa .sug-tiedostoa: %s"
+
+#, fuzzy, c-format
+#~ msgid "System error while reading integer from ShaDa file: %s"
+#~ msgstr "E782: virhe luettaessa .sug-tiedostoa: %s"
+
+#, c-format
+#~ msgid ""
+#~ "Error while reading ShaDa file: expected positive integer at position "
+#~ "%<PRIu64>, but got nothing"
+#~ msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ "Error while reading ShaDa file: expected positive integer at position "
+#~ "%<PRIu64>"
+#~ msgstr ""
+
+#. kSDItemUnknown cannot possibly pass that far because it is -1 and that
+#. will fail in msgpack_read_uint64. But kSDItemMissing may and it will
+#. otherwise be skipped because (1 << 0) will never appear in flags.
+#, c-format
+#~ msgid ""
+#~ "Error while reading ShaDa file: there is an item at position %<PRIu64> that "
+#~ "must not be there: Missing items are for internal uses only"
+#~ msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ "Error while reading ShaDa file: buffer list at position %<PRIu64> contains "
+#~ "entry that is not a dictionary"
+#~ msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ "Error while reading ShaDa file: buffer list at position %<PRIu64> contains "
+#~ "entry with invalid line number"
+#~ msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ "Error while reading ShaDa file: buffer list at position %<PRIu64> contains "
+#~ "entry with invalid column number"
+#~ msgstr ""
+
+#, c-format
+#~ msgid ""
+#~ "Error while reading ShaDa file: buffer list at position %<PRIu64> contains "
+#~ "entry that does not have a file name"
+#~ msgstr ""
+
+#. values for ts_isdiff
+#. no different byte (yet)
+#. different byte found
+#. inserting character
+#. values for ts_flags
+#. already checked that prefix is OK
+#. tried split at this point
+#. did a delete, "ts_delidx" has index
+#. special values ts_prefixdepth
+#. not using prefixes
+#. walking through the prefix tree
+#. highest value that's not special
+#. mode values for find_word
+#. find word case-folded
+#. find keep-case word
+#. find word after prefix
+#. find case-folded compound word
+#. find keep-case compound word
+#, fuzzy
+#~ msgid "E759: Format error in spell file"
+#~ msgstr "E297: Kirjoitusvirhe swap-tiedostossa"
 
-#: ../spell.c:1951
 msgid "E756: Spell checking is not enabled"
-msgstr "E756: Oikaisuluku ei ole p��ll�"
+msgstr "E756: Oikaisuluku ei ole päällä"
 
-#: ../spell.c:2249
 #, c-format
 msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr "Varoitus: Ei l�ydetty sanalistaa %s.%s.spl tai %s.ascii.spl"
+msgstr "Varoitus: Ei löydetty sanalistaa %s.%s.spl tai %s.ascii.spl"
 
-#: ../spell.c:2473
-#, c-format
-msgid "Reading spell file \"%s\""
-msgstr "Luetaan oikaisulukutiedosta %s"
-
-#: ../spell.c:2496
-msgid "E757: This does not look like a spell file"
-msgstr "E757: Ei vaikuta oikaisulukutiedostolta"
-
-#: ../spell.c:2501
-msgid "E771: Old spell file, needs to be updated"
-msgstr "E771: Vanha oikaisulukutiedosto vaatii p�ivitt�mist�"
-
-#: ../spell.c:2504
-msgid "E772: Spell file is for newer version of Vim"
-msgstr "E772: Oikaisulukutiedosto on uudemmalle Vimille"
-
-#: ../spell.c:2602
-msgid "E770: Unsupported section in spell file"
-msgstr "E770: Tukematon osio oikaisulukutiedostossa"
-
-#: ../spell.c:3762
+#. This is probably an error.  Give a warning and
+#. accept the words anyway.
 #, c-format
 msgid "Warning: region %s not supported"
 msgstr "Varoitus: osaa %s ei tueta"
 
-#: ../spell.c:4550
+msgid "Sorry, no suggestions"
+msgstr "ei ehdotuksia"
+
+#, fuzzy, c-format
+#~ msgid "Sorry, only %<PRId64> suggestions"
+#~ msgstr "vain %ld ehdotusta"
+
+#. for when 'cmdheight' > 1
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "Muuta %.*s:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < %.*s"
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: Ei edellistä oikaisulukukorjausta"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: Ei löytynyt: %s"
+
+msgid "E758: Truncated spell file"
+msgstr "E758: Oikolukutiedosto katkaistu"
+
+#, c-format
+msgid "Trailing text in %s line %d: %s"
+msgstr "Tekstiä rivin perässä tiedostossa %s rivillä %d: %s"
+
+#, c-format
+msgid "Affix name too long in %s line %d: %s"
+msgstr "Affiksin nimi on liian pitkä tiedostossa %s rivillä %d: %s"
+
+msgid "E761: Format error in affix file FOL, LOW or UPP"
+msgstr "E761: Affiksitiedoston FOL-, LOW- tai UPP-muotovirhe "
+
+msgid "E762: Character in FOL, LOW or UPP is out of range"
+msgstr "E762: Merkki FOL:ssä, LOW:ssä tai UPP:ssä ei kuulu arvoalueeseen"
+
+msgid "Compressing word tree..."
+msgstr "Tiivistetään sanapuuta..."
+
+#, c-format
+msgid "Reading spell file \"%s\""
+msgstr "Luetaan oikaisulukutiedosta %s"
+
+msgid "E757: This does not look like a spell file"
+msgstr "E757: Ei vaikuta oikaisulukutiedostolta"
+
+#, fuzzy, c-format
+#~ msgid "E5042: Failed to read spell file %s: %s"
+#~ msgstr "E482: Tiedostoa %s ei voi luoda"
+
+msgid "E771: Old spell file, needs to be updated"
+msgstr "E771: Vanha oikaisulukutiedosto vaatii päivittämistä"
+
+msgid "E772: Spell file is for newer version of Vim"
+msgstr "E772: Oikaisulukutiedosto on uudemmalle Vimille"
+
+msgid "E770: Unsupported section in spell file"
+msgstr "E770: Tukematon osio oikaisulukutiedostossa"
+
+#, c-format
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: Ei vaikuta .sug-tiedostolta: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: Vanha .sug-tiedosto pitää päivittää: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: .sug-tiedosto on uudemmalle Vimille: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: .sug-tiedosto ei täsmää .spl-tiedostoon: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: virhe luettaessa .sug-tiedostoa: %s"
+
 #, c-format
 msgid "Reading affix file %s ..."
 msgstr "Luetaan affiksitiedostoa %s..."
 
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
-msgstr "Muunnosvirhe sanalle %s rivill� %d: %s"
+msgstr "Muunnosvirhe sanalle %s rivillä %d: %s"
 
-#: ../spell.c:4630 ../spell.c:6170
 #, c-format
 msgid "Conversion in %s not supported: from %s to %s"
 msgstr "Muunnosta kohteessa %s ei tueta: kohteesta %s kohteeseen %s"
 
-#: ../spell.c:4642
 #, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
-msgstr "Tuntematon FLAG kohteessa %s rivill� %d: %s"
+msgstr "Tuntematon FLAG kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:4655
 #, c-format
 msgid "FLAG after using flags in %s line %d: %s"
-msgstr "FLAG kohteessa %s lippujen j�lkeen rivill� %d: %s"
+msgstr "FLAG kohteessa %s lippujen jälkeen rivillä %d: %s"
 
-#: ../spell.c:4723
 #, c-format
 msgid ""
 "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
 "%d"
 msgstr ""
-"COMPOUNDFORBIDFLAG PFX:n j�lkeen voi antaa v��ri� tuloksia kohteessa %s "
-"rivill� %d"
+"COMPOUNDFORBIDFLAG PFX:n jälkeen voi antaa vääriä tuloksia kohteessa %s "
+"rivillä %d"
 
-#: ../spell.c:4731
 #, c-format
 msgid ""
 "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
 "%d"
 msgstr ""
-"COMPOUNDPERMITFLAG PFX:n j�lkeen voi antaa v��ri� tuloksia kohteessa %s "
-"rivill� %d"
+"COMPOUNDPERMITFLAG PFX:n jälkeen voi antaa vääriä tuloksia kohteessa %s "
+"rivillä %d"
 
-#: ../spell.c:4747
 #, c-format
 msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
-msgstr "V��r� COMPOUNDRULES-arvo kohteessa %s rivill� %d: %s"
+msgstr "Väärä COMPOUNDRULES-arvo kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:4771
 #, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
-msgstr "V��r� COMPOUNDWORDMAX-arvo kohteessa %s rivill� %d: %s"
+msgstr "Väärä COMPOUNDWORDMAX-arvo kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:4777
 #, c-format
 msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
-msgstr "V��r� COMPOUNDMIN-arvo kohteessa %s rivill� %d: %s"
+msgstr "Väärä COMPOUNDMIN-arvo kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:4783
 #, c-format
 msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
-msgstr "V��r� COMPOUNDSYLMAX-arvo kohteessa %s rivill� %d: %s"
+msgstr "Väärä COMPOUNDSYLMAX-arvo kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:4795
 #, c-format
 msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
-msgstr "V��r� CHECKCOMPOUNDPATTERN-arvo kohteessa %s rivill� %d: %s"
+msgstr "Väärä CHECKCOMPOUNDPATTERN-arvo kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:4847
 #, c-format
 msgid "Different combining flag in continued affix block in %s line %d: %s"
 msgstr ""
-"Eri yhdistelm�lippu jatketussa affiksilohkossa kohteessa %s rivill� %d: %s"
+"Eri yhdistelmälippu jatketussa affiksilohkossa kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:4850
 #, c-format
 msgid "Duplicate affix in %s line %d: %s"
-msgstr "Kaksoiskappale affiksista kohteessa %s rivill� %d: %s"
+msgstr "Kaksoiskappale affiksista kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:4871
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
+"Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGESTin %s "
 "line %d: %s"
 msgstr ""
-"Affiksia k�ytetty my�s BAD-, RARE-, KEEPCASE-, NEEDAFFIX-, NEEDCOMPOUND- tai "
-"NOSUGGEST-arvossa kohteessa %s rivill� %d: %s"
+"Affiksia käytetty myös BAD-, RARE-, KEEPCASE-, NEEDAFFIX-, NEEDCOMPOUND- tai "
+"NOSUGGEST-arvossa kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:4893
 #, c-format
 msgid "Expected Y or N in %s line %d: %s"
-msgstr "Odotettiin Y:t� tai N:�� kohteessa %s rivill� %d: %s"
+msgstr "Odotettiin Y:tä tai N:ää kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:4968
 #, c-format
 msgid "Broken condition in %s line %d: %s"
-msgstr "Viallinen ehto kohteessa %s rivill� %d: %s"
+msgstr "Viallinen ehto kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:5091
 #, c-format
 msgid "Expected REP(SAL) count in %s line %d"
-msgstr "Odotettiin REP(SAL)-arvoa kohteessa %s rivill� %d"
+msgstr "Odotettiin REP(SAL)-arvoa kohteessa %s rivillä %d"
 
-#: ../spell.c:5120
 #, c-format
 msgid "Expected MAP count in %s line %d"
-msgstr "Odotettiin MAP-arvoa kohteessa %s rivill� %d"
+msgstr "Odotettiin MAP-arvoa kohteessa %s rivillä %d"
 
-#: ../spell.c:5132
 #, c-format
 msgid "Duplicate character in MAP in %s line %d"
-msgstr "Kaksoiskappale merkist� MAP:ss� kohteessa %s rivill� %d"
+msgstr "Kaksoiskappale merkistä MAP:ssä kohteessa %s rivillä %d"
 
-#: ../spell.c:5176
 #, c-format
 msgid "Unrecognized or duplicate item in %s line %d: %s"
-msgstr "Tunnistamaton tai kaksoiskappale arvosta kohteessa %s rivill� %d: %s"
+msgstr "Tunnistamaton tai kaksoiskappale arvosta kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:5197
 #, c-format
 msgid "Missing FOL/LOW/UPP line in %s"
 msgstr "Puuttuva FOL, LOW tai UPP rivi kohteessa %s"
 
-#: ../spell.c:5220
 msgid "COMPOUNDSYLMAX used without SYLLABLE"
 msgstr "COMPOUNDSYLMAX ilman SYLLABLEa"
 
-#: ../spell.c:5236
 msgid "Too many postponed prefixes"
-msgstr "Liikaa j�lkik�teistettyj� prefiksej�"
+msgstr "Liikaa jälkikäteistettyjä prefiksejä"
 
-#: ../spell.c:5238
 msgid "Too many compound flags"
 msgstr "Liikaa yhdyssanalippuja"
 
-#: ../spell.c:5240
 msgid "Too many postponed prefixes and/or compound flags"
-msgstr "Liikaa j�lkik�teistettyj� prefiksej� tai yhdyssanalippuja"
+msgstr "Liikaa jälkikäteistettyjä prefiksejä tai yhdyssanalippuja"
 
-#: ../spell.c:5250
 #, c-format
 msgid "Missing SOFO%s line in %s"
 msgstr "Puuttuva SOFO%s-rivi kohteessa %s"
 
-#: ../spell.c:5253
 #, c-format
 msgid "Both SAL and SOFO lines in %s"
 msgstr "SAL- ja SOFO-rivit kohteessa %s"
 
-#: ../spell.c:5331
 #, c-format
 msgid "Flag is not a number in %s line %d: %s"
-msgstr "Lippu ei ole lukuarvo kohteessa %s rivill� %d: %s"
+msgstr "Lippu ei ole lukuarvo kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:5334
 #, c-format
 msgid "Illegal flag in %s line %d: %s"
-msgstr "Tuntematon lippu kohteessa %s rivill� %d: %s"
+msgstr "Tuntematon lippu kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:5493 ../spell.c:5501
 #, c-format
 msgid "%s value differs from what is used in another .aff file"
 msgstr "%s-arvo eroaa toisessa .aff-tiedostossa olevasta"
 
-#: ../spell.c:5602
 #, c-format
 msgid "Reading dictionary file %s ..."
 msgstr "Luetaan sanakirjatiedostoa %s"
 
-#: ../spell.c:5611
 #, c-format
 msgid "E760: No word count in %s"
 msgstr "E760: Ei sanalaskuria kohteessa %s"
 
-#: ../spell.c:5669
 #, c-format
 msgid "line %6d, word %6d - %s"
 msgstr "rivi %6d, sana %6d - %s"
 
-#: ../spell.c:5691
 #, c-format
 msgid "Duplicate word in %s line %d: %s"
-msgstr "Toistettu sana kohteessa %s rivill� %d: %s"
+msgstr "Toistettu sana kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:5694
 #, c-format
 msgid "First duplicate word in %s line %d: %s"
-msgstr "Ensimm�inen kappale kohteessa %s rivill� %d: %s"
+msgstr "Ensimmäinen kappale kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:5746
 #, c-format
 msgid "%d duplicate word(s) in %s"
 msgstr "toistettuja sanoja %d kohteessa %s"
 
-#: ../spell.c:5748
 #, c-format
 msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Ei-ASCII-merkkien takia ohitettuja sanoja %d kohteessa %s"
 
-#: ../spell.c:6115
 #, c-format
 msgid "Reading word file %s ..."
 msgstr "Luetaan sanatiedostoa %s..."
 
-#: ../spell.c:6155
 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
-msgstr "Toistettu /encoding= ohitettu kohteessa %s rivill� %d: %s"
+msgstr "Toistettu /encoding= ohitettu kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:6159
 #, c-format
 msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr "/encoding= sanojen j�lkeen ohitettu kohteessa %s rivill� %d: %s"
+msgstr "/encoding= sanojen jälkeen ohitettu kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:6180
 #, c-format
 msgid "Duplicate /regions= line ignored in %s line %d: %s"
-msgstr "Toistettu /regions= ohitettu kohteessa %s rivill� %d: %s"
+msgstr "Toistettu /regions= ohitettu kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:6185
 #, c-format
 msgid "Too many regions in %s line %d: %s"
-msgstr "Liikaa regionseja kohteessa %s rivill� %d: %s"
+msgstr "Liikaa regionseja kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:6198
 #, c-format
 msgid "/ line ignored in %s line %d: %s"
-msgstr "/ ohitettu kohteessa %s rivill� %d: %s"
+msgstr "/ ohitettu kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:6224
 #, c-format
 msgid "Invalid region nr in %s line %d: %s"
-msgstr "Virheellinen region-luku kohteessa %s rivill� %d: %s"
+msgstr "Virheellinen region-luku kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:6230
 #, c-format
 msgid "Unrecognized flags in %s line %d: %s"
-msgstr "Tunnistamaton lippu kohteessa %s rivill� %d: %s"
+msgstr "Tunnistamaton lippu kohteessa %s rivillä %d: %s"
 
-#: ../spell.c:6257
 #, c-format
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "Ei-ASCIIn takia ohitettuja sanoja %d"
 
-#: ../spell.c:6656
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
-msgstr "Tiivistetty %d/%d noodia. %d (%d %%) j�ljell�"
+msgstr "Tiivistetty %d/%d noodia. %d (%d %%) jäljellä"
 
-#: ../spell.c:7340
 msgid "Reading back spell file..."
 msgstr "Luetaan taas oikaisulukutiedostoa..."
 
 #. Go through the trie of good words, soundfold each word and add it to
 #. the soundfold trie.
-#: ../spell.c:7357
 msgid "Performing soundfolding..."
-msgstr "��nt�myksen mukaan yhdistell��n..."
+msgstr "Ääntämyksen mukaan yhdistellään..."
 
-#: ../spell.c:7368
-#, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "Sanoja ��nt�mysyhdistelyn j�lkeen: %<PRId64>"
+#, fuzzy, c-format
+#~ msgid "Number of words after soundfolding: %<PRId64>"
+#~ msgstr "Sanoja ääntämysyhdistelyn jälkeen: %ld"
 
-#: ../spell.c:7476
 #, c-format
 msgid "Total number of words: %d"
-msgstr "Sanoja yhteens�: %d"
+msgstr "Sanoja yhteensä: %d"
 
-#: ../spell.c:7655
 #, c-format
 msgid "Writing suggestion file %s ..."
 msgstr "Kirjoitetaan ehdotustiedostoa %s..."
 
-#: ../spell.c:7707 ../spell.c:7927
 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
-msgstr "Arvioitu k�ytt�muisti: %d tavua"
+msgstr "Arvioitu käyttömuisti: %d tavua"
 
-#: ../spell.c:7820
 msgid "E751: Output file name must not have region name"
-msgstr "E751: Tulostetiedostonimess� ei saa olla alueen nime�"
+msgstr "E751: Tulostetiedostonimessä ei saa olla alueen nimeä"
 
-#: ../spell.c:7822
 msgid "E754: Only up to 8 regions supported"
-msgstr "E754: Enint��n 8 aluetta tuetaan"
+msgstr "E754: Enintään 8 aluetta tuetaan"
 
-#: ../spell.c:7846
 #, c-format
 msgid "E755: Invalid region in %s"
 msgstr "E755: Virheellinen alue kohteelle %s"
 
-#: ../spell.c:7907
 msgid "Warning: both compounding and NOBREAK specified"
-msgstr "Varoitus: sek� yhdyssanamuodostus ett� NOBREAK k�yt�ss�"
+msgstr "Varoitus: sekä yhdyssanamuodostus että NOBREAK käytössä"
 
-#: ../spell.c:7920
 #, c-format
 msgid "Writing spell file %s ..."
 msgstr "Kirjoitetaan oikaisulukutiedostoa %s..."
 
-#: ../spell.c:7925
 msgid "Done!"
 msgstr "Valmista."
 
-#: ../spell.c:8034
-#, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: spellfile ei sis�ll� %<PRId64> kohtaa"
-
-#: ../spell.c:8074
 #, fuzzy, c-format
+#~ msgid "E765: 'spellfile' does not have %<PRId64> entries"
+#~ msgstr "E765: spellfile ei sisällä %ld kohtaa"
+
+#, c-format
 msgid "Word '%.*s' removed from %s"
-msgstr "Sana poistettu kohteesta %s"
+msgstr "Sana %.*s poistettu kohteesta %s"
 
-#: ../spell.c:8117
-#, fuzzy, c-format
+#, c-format
 msgid "Word '%.*s' added to %s"
-msgstr "Sana lis�tty kohteeseen %s"
+msgstr "Sana %.*s lisätty kohteeseen %s"
 
-#: ../spell.c:8381
 msgid "E763: Word characters differ between spell files"
-msgstr "E763: Sanan merkit muuttuvat oikaisulukutiedostojen v�lill�"
-
-#: ../spell.c:8684
-msgid "Sorry, no suggestions"
-msgstr "Sori, ei ehdotuksia"
-
-#: ../spell.c:8687
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "Sori, vain %<PRId64> ehdotusta"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#: ../spell.c:8704
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "Muuta %.*s:"
-
-#: ../spell.c:8737
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < %.*s"
-
-#: ../spell.c:8882
-msgid "E752: No previous spell replacement"
-msgstr "E752: Ei edellist� oikaisulukukorjausta"
-
-#: ../spell.c:8925
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: Ei l�ytynyt: %s"
-
-#: ../spell.c:9276
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: Ei vaikuta .sug-tiedostolta: %s"
-
-#: ../spell.c:9282
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: Vanha .sug-tiedosto pit�� p�ivitt��: %s"
-
-#: ../spell.c:9286
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: .sug-tiedosto on uudemmalle Vimille: %s"
-
-#: ../spell.c:9295
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: .sug-tiedosto ei t�sm�� .spl-tiedostoon: %s"
-
-#: ../spell.c:9305
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: virhe luettaessa .sug-tiedostoa: %s"
+msgstr "E763: Sanan merkit muuttuvat oikaisulukutiedostojen välillä"
 
 #. This should have been checked when generating the .spl
 #. file.
-#: ../spell.c:11575
 msgid "E783: duplicate char in MAP entry"
-msgstr "E783: kaksoiskappale merkist� MAP-kohdassa"
+msgstr "E783: kaksoiskappale merkistä MAP-kohdassa"
+
+msgid "E766: Insufficient arguments for printf()"
+msgstr "E766: printf():lle ei annettu tarpeeksi argumentteja"
+
+msgid "E807: Expected Float argument for printf()"
+msgstr "E807: Odotettiin Float-argumenttia printf():lle"
+
+msgid "E767: Too many arguments to printf()"
+msgstr "E767: printf():lle annettiin liikaa argumentteja"
 
-#: ../syntax.c:266
 msgid "No Syntax items defined for this buffer"
-msgstr "Ei syntaksikohteita t�lle puskurille"
+msgstr "Ei syntaksikohteita tälle puskurille"
 
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Virheellinen argumentti: %s"
 
-#: ../syntax.c:3299
+msgid "syntax iskeyword "
+msgstr "syntax iskeyword "
+
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: Syntaksiklusteri puuttuu: %s"
 
-#: ../syntax.c:3433
 msgid "syncing on C-style comments"
 msgstr "synkkaa C-tyylin kommentteihin"
 
-#: ../syntax.c:3439
 msgid "no syncing"
 msgstr "ei synkkausta"
 
-#: ../syntax.c:3441
 msgid "syncing starts "
 msgstr "synkkaus aloitettu "
 
-#: ../syntax.c:3443 ../syntax.c:3506
 msgid " lines before top line"
-msgstr " rivi� ennen alkua"
+msgstr " riviä ennen alkua"
 
-#: ../syntax.c:3448
 msgid ""
 "\n"
 "--- Syntax sync items ---"
@@ -5729,7 +5225,6 @@ msgstr ""
 "\n"
 "--- Syntax sync -kohteet ---"
 
-#: ../syntax.c:3452
 msgid ""
 "\n"
 "syncing on items"
@@ -5737,7 +5232,6 @@ msgstr ""
 "\n"
 "synkataan kohteisiin"
 
-#: ../syntax.c:3457
 msgid ""
 "\n"
 "--- Syntax items ---"
@@ -5745,2079 +5239,886 @@ msgstr ""
 "\n"
 "--- Syntax-kohteet ---"
 
-#: ../syntax.c:3475
 #, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: syntaksiklusteria ei ole: %s"
 
-#: ../syntax.c:3497
 msgid "minimal "
-msgstr "v�hint��n "
+msgstr "vähintään "
 
-#: ../syntax.c:3503
 msgid "maximal "
-msgstr "enitnt��n "
+msgstr "enitntään "
 
-#: ../syntax.c:3513
 msgid "; match "
-msgstr "; t�sm�� "
+msgstr "; täsmää "
 
-#: ../syntax.c:3515
 msgid " line breaks"
 msgstr " rivinvaihdot"
 
-#: ../syntax.c:4076
 msgid "E395: contains argument not accepted here"
-msgstr "E395: contains ei sovi t�h�n"
+msgstr "E395: contains ei sovi tähän"
 
-#: ../syntax.c:4096
-#, fuzzy
 msgid "E844: invalid cchar value"
-msgstr "E474: Virheellinen argumentti"
+msgstr "E844: Virheellinen cchar-arvo"
 
-#: ../syntax.c:4107
 msgid "E393: group[t]here not accepted here"
-msgstr "E393: group[t]here ei sovi t�h�n"
+msgstr "E393: group[t]here ei sovi tähän"
 
-#: ../syntax.c:4126
 #, c-format
 msgid "E394: Didn't find region item for %s"
-msgstr "E394: Aluetta nimelle %s ei l�ydy"
+msgstr "E394: Aluetta nimelle %s ei löydy"
 
-#: ../syntax.c:4188
 msgid "E397: Filename required"
 msgstr "E397: Tiedostonimi puuttuu"
 
-#: ../syntax.c:4221
-#, fuzzy
 msgid "E847: Too many syntax includes"
-msgstr "E77: Liikaa tiedostonimi�"
+msgstr "E847: Liikaa syntax includeja"
 
-#: ../syntax.c:4303
 #, c-format
 msgid "E789: Missing ']': %s"
 msgstr "E789: ] puuttuu: %s"
 
-#: ../syntax.c:4531
+#, c-format
+msgid "E890: trailing char after ']': %s]%s"
+msgstr "E890: Ylimääräisiä merkkejä merkin ] perässä: %s]%s"
+
 #, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: = puuttuu: %s"
 
-#: ../syntax.c:4666
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: Argumentteja puuttuu: syntaksialue %s"
 
-#: ../syntax.c:4870
-#, fuzzy
 msgid "E848: Too many syntax clusters"
-msgstr "E391: Syntaksiklusteri puuttuu: %s"
+msgstr "E848: Liikaa syntaksiklustereita"
 
-#: ../syntax.c:4954
 msgid "E400: No cluster specified"
-msgstr "E400: klusteri m��rittelem�tt�"
+msgstr "E400: klusteri määrittelemättä"
 
 #. end delimiter not found
-#: ../syntax.c:4986
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: Kuvoin erotin puuttuu: %s"
 
-#: ../syntax.c:5049
 #, c-format
 msgid "E402: Garbage after pattern: %s"
-msgstr "E402: Roskia kuvion j�ljess�: %s"
+msgstr "E402: Roskia kuvion jäljessä: %s"
 
-#: ../syntax.c:5120
 msgid "E403: syntax sync: line continuations pattern specified twice"
-msgstr "E403: syntax sync: rivinjatkamiskuvio m��ritelty kahdesti"
+msgstr "E403: syntax sync: rivinjatkamiskuvio määritelty kahdesti"
 
-#: ../syntax.c:5169
 #, c-format
 msgid "E404: Illegal arguments: %s"
 msgstr "E404: Virheelliset argumentit: %s"
 
-#: ../syntax.c:5217
 #, c-format
 msgid "E405: Missing equal sign: %s"
 msgstr "E405: = puuttuu: %s"
 
-#: ../syntax.c:5222
 #, c-format
 msgid "E406: Empty argument: %s"
-msgstr "E406: Tyhj� argumentti: %s"
+msgstr "E406: Tyhjä argumentti: %s"
 
-#: ../syntax.c:5240
 #, c-format
 msgid "E407: %s not allowed here"
-msgstr "E407: %s ei sovi t�h�n"
+msgstr "E407: %s ei sovi tähän"
 
-#: ../syntax.c:5246
 #, c-format
 msgid "E408: %s must be first in contains list"
 msgstr "E408: %s kuuluu contains-listan alkuun"
 
-#: ../syntax.c:5304
 #, c-format
 msgid "E409: Unknown group name: %s"
-msgstr "E409: Tuntematon ryhm�n nimi: %s"
+msgstr "E409: Tuntematon ryhmän nimi: %s"
 
-#: ../syntax.c:5512
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: Virheelluinen :syntax-osakomento: %s"
 
-#: ../syntax.c:5854
 msgid ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
 msgstr ""
+"  KAIKKI     MÄÄRÄ  TÄSMÄYS HITAIN      KEKSIARVO NIMI               ILMAUS"
 
-#: ../syntax.c:6146
 msgid "E679: recursive loop loading syncolor.vim"
-msgstr "E679: rekursiivinen silmukka syncolor.vimiss�"
+msgstr "E679: rekursiivinen silmukka syncolor.vimissä"
 
-#: ../syntax.c:6256
 #, c-format
 msgid "E411: highlight group not found: %s"
-msgstr "E411: korostusryhm�� ei l�ytynyt: %s"
+msgstr "E411: korostusryhmää ei löytynyt: %s"
 
-#: ../syntax.c:6278
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
 msgstr "E412: Argumentteja puuttuu: :highlight link %s"
 
-#: ../syntax.c:6284
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
 msgstr "E413: Liikaa argumentteja: :highlight link %s"
 
-#: ../syntax.c:6302
 msgid "E414: group has settings, highlight link ignored"
-msgstr "E414: ryhm�ll� on asetuksia, highlight link -komento ohitetaan"
+msgstr "E414: ryhmällä on asetuksia, highlight link -komento ohitetaan"
 
-#: ../syntax.c:6367
 #, c-format
 msgid "E415: unexpected equal sign: %s"
 msgstr "E415: odotuksenvastainen =-merkki: %s"
 
-#: ../syntax.c:6395
 #, c-format
 msgid "E416: missing equal sign: %s"
 msgstr "E416: puuttuva =-merkki: %s"
 
-#: ../syntax.c:6418
 #, c-format
 msgid "E417: missing argument: %s"
 msgstr "E417: puuttuva argumentti: %s"
 
-#: ../syntax.c:6446
 #, c-format
 msgid "E418: Illegal value: %s"
 msgstr "E418: Viallinen arvo: %s"
 
-#: ../syntax.c:6496
 msgid "E419: FG color unknown"
-msgstr "E419: edustav�ri tuntematon"
+msgstr "E419: edustaväri tuntematon"
 
-#: ../syntax.c:6504
 msgid "E420: BG color unknown"
-msgstr "E420: taustav�ri tuntematon"
+msgstr "E420: taustaväri tuntematon"
 
-#: ../syntax.c:6564
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
-msgstr "E421: V�rin nimi tai numero tuntematon: %s"
+msgstr "E421: Värin nimi tai numero tuntematon: %s"
 
-#: ../syntax.c:6714
-#, c-format
-msgid "E422: terminal code too long: %s"
-msgstr "E422: terminaalikoodi liian pitk�: %s"
-
-#: ../syntax.c:6753
 #, c-format
 msgid "E423: Illegal argument: %s"
 msgstr "E423: Virheellinen argumentti: %s"
 
-#: ../syntax.c:6925
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: Liikaa eri korostusattribuutteja"
 
-#: ../syntax.c:7427
 msgid "E669: Unprintable character in group name"
-msgstr "E669: Tulostuskelvoton merkki ryhm�n nimess�"
+msgstr "E669: Tulostuskelvoton merkki ryhmän nimessä"
 
-#: ../syntax.c:7434
 msgid "W18: Invalid character in group name"
-msgstr "W18: Virheellinen merkki ryhm�n nimess�"
+msgstr "W18: Virheellinen merkki ryhmän nimessä"
 
-#: ../syntax.c:7448
 msgid "E849: Too many highlight and syntax groups"
-msgstr ""
+msgstr "E849: Liikaa korostuksia ja syntaksiryhmiä"
 
-#: ../tag.c:104
 msgid "E555: at bottom of tag stack"
-msgstr "E555: t�gipinon pohja"
+msgstr "E555: tägipinon pohja"
 
-#: ../tag.c:105
 msgid "E556: at top of tag stack"
-msgstr "E556: t�gipinon huippu"
+msgstr "E556: tägipinon huippu"
 
-#: ../tag.c:380
 msgid "E425: Cannot go before first matching tag"
-msgstr "E425: Ei voida menn� ensimm�ist� t�sm��v�� t�gi� alummaksi"
+msgstr "E425: Ei voida mennä ensimmäistä täsmäävää tägiä alummaksi"
 
-#: ../tag.c:504
 #, c-format
 msgid "E426: tag not found: %s"
-msgstr "E426: t�gi puuttuu: %s"
+msgstr "E426: tägi puuttuu: %s"
 
-#: ../tag.c:528
 msgid "  # pri kind tag"
-msgstr "  # arvo tyyppi t�gi"
+msgstr "  # arvo tyyppi tägi"
 
-#: ../tag.c:531
 msgid "file\n"
 msgstr "tiedosto\n"
 
-#: ../tag.c:829
 msgid "E427: There is only one matching tag"
-msgstr "E427: Vain yksi t�gi t�sm��"
+msgstr "E427: Vain yksi tägi täsmää"
 
-#: ../tag.c:831
 msgid "E428: Cannot go beyond last matching tag"
-msgstr "E428: Ei voida edet� viimeisen t�sm��v�n t�gin ohi"
+msgstr "E428: Ei voida edetä viimeisen täsmäävän tägin ohi"
 
-#: ../tag.c:850
 #, c-format
 msgid "File \"%s\" does not exist"
 msgstr "Tiedostoa %s ei ole"
 
 #. Give an indication of the number of matching tags
-#: ../tag.c:859
 #, c-format
 msgid "tag %d of %d%s"
-msgstr "t�gi %d/%d%s"
+msgstr "tägi %d/%d%s"
 
-#: ../tag.c:862
 msgid " or more"
 msgstr " tai useammasta"
 
-#: ../tag.c:864
 msgid "  Using tag with different case!"
-msgstr "  T�giss� eri kirjaintaso"
+msgstr "  Tägissä eri kirjaintaso"
 
-#: ../tag.c:909
 #, c-format
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: Tiedostoa %s ei ole"
 
 #. Highlight title
-#: ../tag.c:960
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
 msgstr ""
 "\n"
-"  # TILL tagg          FR�N LINJE  i fil/text"
+"  # TILL tagg          FRÅN LINJE  i fil/text"
 
-#: ../tag.c:1303
 #, c-format
 msgid "Searching tags file %s"
-msgstr "Etsit��n t�gitiedostoa %s"
+msgstr "Etsitään tägitiedostoa %s"
 
-#: ../tag.c:1545
 msgid "Ignoring long line in tags file"
-msgstr "Ohitetaan pitk� rivi t�gitiedostossa"
+msgstr "Ohitetaan pitkä rivi tägitiedostossa"
 
-#: ../tag.c:1915
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
-msgstr "E431: Muotovirh t�gitiedostossa %s"
+msgstr "E431: Muotovirh tägitiedostossa %s"
 
-#: ../tag.c:1917
-#, c-format
-msgid "Before byte %<PRId64>"
-msgstr "Ennen tavua %<PRId64>"
+#, fuzzy, c-format
+#~ msgid "Before byte %<PRId64>"
+#~ msgstr "Ennen tavua %ld"
 
-#: ../tag.c:1929
 #, c-format
 msgid "E432: Tags file not sorted: %s"
-msgstr "E432: T�gitiedosto ei ole j�rjestetty: %s"
+msgstr "E432: Tägitiedosto ei ole järjestetty: %s"
 
 #. never opened any tags file
-#: ../tag.c:1960
 msgid "E433: No tags file"
-msgstr "E433: Ei t�gitiedostoja"
+msgstr "E433: Ei tägitiedostoja"
 
-#: ../tag.c:2536
 msgid "E434: Can't find tag pattern"
-msgstr "E434: T�gikuviota ei l�ydy"
+msgstr "E434: Tägikuviota ei löydy"
 
-#: ../tag.c:2544
 msgid "E435: Couldn't find tag, just guessing!"
-msgstr "E435: T�gi� ei l�ydy, arvataan."
+msgstr "E435: Tägiä ei löydy, arvataan."
 
-#: ../tag.c:2797
 #, c-format
 msgid "Duplicate field name: %s"
-msgstr "Kaksoiskappale kent�n nimest�: %s"
-
-#: ../term.c:1442
-msgid "' not known. Available builtin terminals are:"
-msgstr " ei tunnettu. Tuetut terminaalit:"
-
-#: ../term.c:1463
-msgid "defaulting to '"
-msgstr "oletusarvona "
-
-#: ../term.c:1731
-msgid "E557: Cannot open termcap file"
-msgstr "E557: Ei voi avata termcap-tiedostoa"
-
-#: ../term.c:1735
-msgid "E558: Terminal entry not found in terminfo"
-msgstr "E558: Terminaalia ei l�ytynyt terminfosta"
-
-#: ../term.c:1737
-msgid "E559: Terminal entry not found in termcap"
-msgstr "E559: Terminaalia ei l�ytynyt termcapista"
-
-#: ../term.c:1878
-#, c-format
-msgid "E436: No \"%s\" entry in termcap"
-msgstr "E436: %s ei l�ytynyt termcapista"
-
-#: ../term.c:2249
-msgid "E437: terminal capability \"cm\" required"
-msgstr "E437: terminaalilla pit�� olla cm kyvyiss��n"
-
-#. Highlight title
-#: ../term.c:4376
-msgid ""
-"\n"
-"--- Terminal keys ---"
-msgstr ""
-"\n"
-"--- Terminaalin�pp�imet ---"
-
-#: ../ui.c:481
-msgid "Vim: Error reading input, exiting...\n"
-msgstr "Vim: Virhe luettaessa sy�tett�, poistutaan...\n"
+msgstr "Kaksoiskappale kentän nimestä: %s"
 
 #. This happens when the FileChangedRO autocommand changes the
 #. * file in a way it becomes shorter.
-#: ../undo.c:379
-#, fuzzy
 msgid "E881: Line count changed unexpectedly"
-msgstr "E834: Rivim��r� vaihtui odottamatta"
+msgstr "E881: Rivimäärä vaihtui odottamatta"
 
-#: ../undo.c:627
 #, c-format
 msgid "E828: Cannot open undo file for writing: %s"
 msgstr "E828: Kumoustiedoston avaus kirjoittamista varten ei onnistu: %s"
 
-#: ../undo.c:717
+#, fuzzy, c-format
+#~ msgid "E5003: Unable to create directory \"%s\" for undo file: %s"
+#~ msgstr "E346: Hakemisto %s ei ole enää cdpathissa"
+
 #, c-format
 msgid "E825: Corrupted undo file (%s): %s"
 msgstr "E825: Pilaanntunut kumoustiedosto (%s): %s"
 
-#: ../undo.c:1039
 msgid "Cannot write undo file in any directory in 'undodir'"
-msgstr "Ei voitu lukea kumoustiedostoa mist��n undodir-muuttujan hakemistosta"
+msgstr "Ei voitu lukea kumoustiedostoa mistään undodir-muuttujan hakemistosta"
 
-#: ../undo.c:1074
 #, c-format
 msgid "Will not overwrite with undo file, cannot read: %s"
 msgstr "Ei ylikirjoitetat kumoustiedostolla, koska ei voida lukea: %s"
 
-#: ../undo.c:1092
 #, c-format
 msgid "Will not overwrite, this is not an undo file: %s"
-msgstr "Ei ylikirjoiteta, koska t�m� ei ole kumoustiedosto: %s"
+msgstr "Ei ylikirjoiteta, koska tämä ei ole kumoustiedosto: %s"
 
-#: ../undo.c:1108
 msgid "Skipping undo file write, nothing to undo"
 msgstr "Ohitetaan kumoustiedoston kirjoitus, koska ei ole peruutettavia"
 
-#: ../undo.c:1121
 #, c-format
 msgid "Writing undo file: %s"
 msgstr "Kirjoitetaan kumoustiedostoa: %s"
 
-#: ../undo.c:1213
 #, c-format
 msgid "E829: write error in undo file: %s"
 msgstr "E829: Kirjoitusvirhe kumoustiedostossa: %s"
 
-#: ../undo.c:1280
 #, c-format
 msgid "Not reading undo file, owner differs: %s"
 msgstr "Ei lueta kumoustiedosto jonka omistaja on eri: %s"
 
-#: ../undo.c:1292
 #, c-format
 msgid "Reading undo file: %s"
 msgstr "Luetaan kumoustiedostoa: %s"
 
-#: ../undo.c:1299
 #, c-format
 msgid "E822: Cannot open undo file for reading: %s"
 msgstr "E822: Kumoustiedostoa ei voi avata lukemista varten: %s"
 
-#: ../undo.c:1308
 #, c-format
 msgid "E823: Not an undo file: %s"
 msgstr "E823: Ei ole kumoustiedosto: %s"
 
-#: ../undo.c:1313
 #, c-format
 msgid "E824: Incompatible undo file: %s"
-msgstr "E824: Ep�yhteensopiva kumoustiedosto: %s"
+msgstr "E824: Epäyhteensopiva kumoustiedosto: %s"
 
-#: ../undo.c:1328
 msgid "File contents changed, cannot use undo info"
 msgstr ""
-"Tiedoston sis�lt� on muuttunut, joen kumoustiedot ovat k�ytt�kelvottomia"
+"Tiedoston sisältö on muuttunut, joen kumoustiedot ovat käyttökelvottomia"
 
-#: ../undo.c:1497
 #, c-format
 msgid "Finished reading undo file %s"
 msgstr "Ladattu kumoustiedoto %s"
 
-#: ../undo.c:1586 ../undo.c:1812
 msgid "Already at oldest change"
 msgstr "Vanhimmassa muutoksessa"
 
-#: ../undo.c:1597 ../undo.c:1814
 msgid "Already at newest change"
 msgstr "Nuorimmassa muutoksessa"
 
-#: ../undo.c:1806
-#, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "E830: Kumouslukua %<PRId64> ei l�ydy"
+#, fuzzy, c-format
+#~ msgid "E830: Undo number %<PRId64> not found"
+#~ msgstr "E830: Kumouslukua %ld ei löydy"
 
-#: ../undo.c:1979
 msgid "E438: u_undo: line numbers wrong"
-msgstr "E438: u_undo: v��r�t rivinumerot"
+msgstr "E438: u_undo: väärät rivinumerot"
 
-#: ../undo.c:2183
 msgid "more line"
-msgstr "rivi lis��"
+msgstr "rivi lisää"
 
-#: ../undo.c:2185
 msgid "more lines"
-msgstr "rivi� lis��"
+msgstr "riviä lisää"
 
-#: ../undo.c:2187
 msgid "line less"
-msgstr "rivi v�hemm�n"
+msgstr "rivi vähemmän"
 
-#: ../undo.c:2189
 msgid "fewer lines"
-msgstr "rivi� v�hemm�n"
+msgstr "riviä vähemmän"
 
-#: ../undo.c:2193
 msgid "change"
 msgstr "muutos"
 
-#: ../undo.c:2195
 msgid "changes"
 msgstr "muutosta"
 
-# eka %s yl�puolelta, toka %s alapuolelta, kolmas %s aika
-#: ../undo.c:2225
-#, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s, %s #%<PRId64> %s"
+# eka %s yläpuolelta, toka %s alapuolelta, kolmas %s aika
+#, fuzzy, c-format
+#~ msgid "%<PRId64> %s; %s #%<PRId64>  %s"
+#~ msgstr "%ld %s, %s #%ld %s"
+
+msgid "after"
+msgstr "jälkeen muutoksen"
 
-#: ../undo.c:2228
 msgid "before"
 msgstr "ennen muutosta"
 
-#: ../undo.c:2228
-msgid "after"
-msgstr "j�lkeen muutoksen"
-
-#: ../undo.c:2325
 msgid "Nothing to undo"
 msgstr "Ei kumottavaa"
 
-#: ../undo.c:2330
-#, fuzzy
 msgid "number changes  when               saved"
-msgstr "muutoksia       aika            tallennettu"
+msgstr "numero muutoksia aika              tallennettu"
 
-#: ../undo.c:2360
-#, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "%<PRId64> sekuntia sitten"
+#, fuzzy, c-format
+#~ msgid "%<PRId64> seconds ago"
+#~ msgstr "%ld sekuntia sitten"
 
-#: ../undo.c:2372
 msgid "E790: undojoin is not allowed after undo"
-msgstr "E790: undojoin ei toimi undon j�lkeen"
+msgstr "E790: undojoin ei toimi undon jälkeen"
 
-#: ../undo.c:2466
 msgid "E439: undo list corrupt"
 msgstr "E439: kumouslista rikki"
 
-#: ../undo.c:2495
 msgid "E440: undo line missing"
 msgstr "E440: kumousrivi puuttuu"
 
-#: ../version.c:600
-msgid ""
-"\n"
-"Included patches: "
-msgstr ""
-"\n"
-"P�tsit: "
-
-#: ../version.c:627
 msgid ""
 "\n"
 "Extra patches: "
 msgstr ""
 "\n"
-"Muita p�tsej�: "
+"Muita pätsejä: "
 
-#: ../version.c:639 ../version.c:864
-msgid "Modified by "
-msgstr "Muokannut "
-
-#: ../version.c:646
 msgid ""
 "\n"
 "Compiled "
 msgstr ""
 "\n"
-"K��nt�nyt "
+"Kääntänyt "
 
-#: ../version.c:649
 msgid "by "
 msgstr ": "
 
-#: ../version.c:660
+#, fuzzy
 msgid ""
 "\n"
-"Huge version "
-msgstr ""
 "\n"
-"Huge-versio "
-
-#: ../version.c:661
-msgid "without GUI."
-msgstr "ilman GUIta."
-
-#: ../version.c:662
-msgid "  Features included (+) or not (-):\n"
+"Optional features included (+) or not (-): "
 msgstr " Ominaisuudet mukana (+) ja poissa (-):\n"
 
-#: ../version.c:667
 msgid "   system vimrc file: \""
-msgstr "   j�rjestelm�n vimrc: \""
+msgstr "   järjestelmän vimrc: \""
 
-#: ../version.c:672
-msgid "     user vimrc file: \""
-msgstr "     k�ytt�j�n vimrc: \""
-
-#: ../version.c:677
-msgid " 2nd user vimrc file: \""
-msgstr " 2. k�ytt�j�n vimrc: \""
-
-#: ../version.c:682
-msgid " 3rd user vimrc file: \""
-msgstr " 3. k�ytt�j�n vimrc: \""
-
-#: ../version.c:687
-msgid "      user exrc file: \""
-msgstr "      k�ytt�j�n exrc: \""
-
-#: ../version.c:692
-msgid "  2nd user exrc file: \""
-msgstr "  2. k�ytt�j�n exrc: \""
-
-#: ../version.c:699
 msgid "  fall-back for $VIM: \""
 msgstr "  $VIMin fallback: \""
 
-#: ../version.c:705
 msgid " f-b for $VIMRUNTIME: \""
 msgstr " $VIMRUNTIMEn f-b: \""
 
-#: ../version.c:709
-msgid "Compilation: "
-msgstr "K��nn�s: "
-
-#: ../version.c:712
-msgid "Linking: "
-msgstr "Linkitys: "
-
-#: ../version.c:717
-msgid "  DEBUG BUILD"
-msgstr "  DEBUG-versio"
-
-#: ../version.c:767
-msgid "VIM - Vi IMproved"
-msgstr "VIM - Vi IMproved"
-
-#: ../version.c:769
-msgid "version "
-msgstr "versio "
-
-#: ../version.c:770
 msgid "by Bram Moolenaar et al."
-msgstr "tekij�t Bram Moolenaar et al."
+msgstr "tekijät Bram Moolenaar et al."
 
-#: ../version.c:774
-msgid "Vim is open source and freely distributable"
-msgstr "Vim on avointa l�hdekoodia ja vapaasti jaossa"
+#, fuzzy
+#~ msgid "Nvim is open source and freely distributable"
+#~ msgstr "Vim on avointa lähdekoodia ja vapaasti jaossa"
 
-#: ../version.c:776
-msgid "Help poor children in Uganda!"
-msgstr "Auta Ugandan k�yhi� lapsia"
+#~ msgid "https://neovim.io/community"
+#~ msgstr ""
 
-#: ../version.c:777
-msgid "type  :help iccf<Enter>       for information "
-msgstr "kirjoita :help iccf<Enter>    lis�tietoa varten            "
+#, fuzzy
+#~ msgid "type  :help nvim<Enter>       if you are new! "
+#~ msgstr "kirjoita :help iccf<Enter>    lisätietoa varten            "
+
+#, fuzzy
+#~ msgid "type  :CheckHealth<Enter>     to optimize Nvim"
+#~ msgstr "kirjoita :help iccf<Enter>    lisätietoa varten            "
 
-#: ../version.c:779
 msgid "type  :q<Enter>               to exit         "
 msgstr "kirjoita :q<Enter>            lopettaaksesi                "
 
-#: ../version.c:780
-msgid "type  :help<Enter>  or  <F1>  for on-line help"
-msgstr "kirjoita :help<Enter> tai <F1> ohjetta varten              "
+#, fuzzy
+#~ msgid "type  :help<Enter>            for help        "
+#~ msgstr "kirjoita :q<Enter>            lopettaaksesi                "
 
-#: ../version.c:781
-msgid "type  :help version7<Enter>   for version info"
-msgstr "kirjoita :help version7<Enter> versiotietoja varten        "
+msgid "Help poor children in Uganda!"
+msgstr "Auta Ugandan köyhiä lapsia"
 
-#: ../version.c:784
-msgid "Running in Vi compatible mode"
-msgstr "Suoritetaan Vi-yhteensopivuustilaa"
+msgid "type  :help iccf<Enter>       for information "
+msgstr "kirjoita :help iccf<Enter>    lisätietoa varten            "
 
-#: ../version.c:785
-msgid "type  :set nocp<Enter>        for Vim defaults"
-msgstr "kirjoita :set nocp<Enter>      Vimin oletuksiin            "
-
-#: ../version.c:786
-msgid "type  :help cp-default<Enter> for info on this"
-msgstr "kirjoita :help cp-default<Enter> ohjetta oletuksista varten"
-
-#: ../version.c:827
 msgid "Sponsor Vim development!"
-msgstr "Tue Vimin kehityst�"
+msgstr "Tue Vimin kehitystä"
 
-#: ../version.c:828
 msgid "Become a registered Vim user!"
-msgstr "Rekister�idy Vim-k�ytt�j�ksi."
+msgstr "Rekisteröidy Vim-käyttäjäksi."
 
-#: ../version.c:831
 msgid "type  :help sponsor<Enter>    for information "
-msgstr "kirjoita :help sponsor<Enter>  lis�tietoja varten"
+msgstr "kirjoita :help sponsor<Enter>  lisätietoja varten"
 
-#: ../version.c:832
 msgid "type  :help register<Enter>   for information "
-msgstr "kirjoita :help register<Enter> lis�tietoja varten"
+msgstr "kirjoita :help register<Enter> lisätietoja varten"
 
-#: ../version.c:834
 msgid "menu  Help->Sponsor/Register  for information    "
-msgstr "valikko Ohje->Sponsoroi/Rekister�i lis�tietoja varten"
+msgstr "valikko Ohje->Sponsoroi/Rekisteröi lisätietoja varten"
 
-#: ../window.c:119
 msgid "Already only one window"
-msgstr "En�� yksi ikkuna j�ljell�"
+msgstr "Enää yksi ikkuna jäljellä"
 
-#: ../window.c:224
 msgid "E441: There is no preview window"
 msgstr "E441: Ei esikatseluikkunaa"
 
-#: ../window.c:559
 msgid "E442: Can't split topleft and botright at the same time"
-msgstr "E442: Ei voi jakaa vasenta yl�nurkkaa ja oikeaa alanurkkaa yht�aikaa"
+msgstr "E442: Ei voi jakaa vasenta ylänurkkaa ja oikeaa alanurkkaa yhtäaikaa"
 
-#: ../window.c:1228
 msgid "E443: Cannot rotate when another window is split"
-msgstr "E443: Ei voi kiert�� kun toinen ikkuna on jaettu"
+msgstr "E443: Ei voi kiertää kun toinen ikkuna on jaettu"
 
-#: ../window.c:1803
 msgid "E444: Cannot close last window"
-msgstr "E444: Ei voi sulkea viimeist� ikkunaa"
+msgstr "E444: Ei voi sulkea viimeistä ikkunaa"
 
-#: ../window.c:1810
 msgid "E813: Cannot close autocmd window"
 msgstr "E813: Ei voi sulkea autocmd-ikkunaa"
 
-#: ../window.c:1814
 msgid "E814: Cannot close window, only autocmd window would remain"
-msgstr "E814: Ei voi sulkea viimeist� ikkunaa, joka ei ole autocmd-ikkuna"
+msgstr "E814: Ei voi sulkea viimeistä ikkunaa, joka ei ole autocmd-ikkuna"
 
-#: ../window.c:2717
 msgid "E445: Other window contains changes"
-msgstr "E445: Toinen ikkuna sis�lt�� muutoksia"
+msgstr "E445: Toinen ikkuna sisältää muutoksia"
 
-#: ../window.c:4805
 msgid "E446: No file name under cursor"
-msgstr "E446: Ei tiedostonime� kursorin alla"
+msgstr "E446: Ei tiedostonimeä kursorin alla"
 
-#~ msgid "E831: bf_key_init() called with empty password"
-#~ msgstr "E831: bf_key_init() tyhj�ll� salasanalla"
-
-#~ msgid "E820: sizeof(uint32_t) != 4"
-#~ msgstr "E820: sizeof(uint32_t) != 4"
-
-#~ msgid "E817: Blowfish big/little endian use wrong"
-#~ msgstr "E817: Blowfishin tavuj�rjestys v��r�"
-
-#~ msgid "E818: sha256 test failed"
-#~ msgstr "E818: sha256-testi ep�onnistui failed"
-
-#~ msgid "E819: Blowfish test failed"
-#~ msgstr "E819: Blowfish-testi ep�onnistui"
-
-#~ msgid "Patch file"
-#~ msgstr "Patch-tiedosto"
+msgid "List or number required"
+msgstr "Lista tai luku tarvitaan"
 
 #~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
+#~ "Failed to set path: sys.path is not a list\n"
+#~ "You should now append vim.VIM_SPECIAL_PATH to sys.path"
 #~ msgstr ""
-#~ "&OK\n"
-#~ "&Peru"
-
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: Ei yhteytt� vim-palvelimeen"
-
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: Kohteeseen %s l�hett�minen ei onnistunut"
-
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: Palvelimen vastauksen lukeminen ei onnistunut"
-
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: Asiakkaalle l�hetys ei onnistunut"
-
-#~ msgid "Save As"
-#~ msgstr "Tallenna nimell�"
-
-#~ msgid "Source Vim script"
-#~ msgstr "Lataa vim-skripti"
-
-#~ msgid "Edit File"
-#~ msgstr "Muokkaa tiedostoa"
-
-#~ msgid " (NOT FOUND)"
-#~ msgstr " (EI L�YTYNYT)"
-
-#~ msgid "unknown"
-#~ msgstr "tuntematon"
-
-#~ msgid "Edit File in new window"
-#~ msgstr "Muokkaa uudessa ikkunassa"
-
-#~ msgid "Append File"
-#~ msgstr "Lis�� tiedostoon"
-
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "Ikkunan sijainti: X %d, Y %d"
-
-#~ msgid "Save Redirection"
-#~ msgstr "Tallenna uudelleenosoitus"
-
-#~ msgid "Save View"
-#~ msgstr "Tallenna n�kym�"
-
-#~ msgid "Save Session"
-#~ msgstr "Tallenna sessio"
-
-#~ msgid "Save Setup"
-#~ msgstr "Tallenna asetukset"
-
-#~ msgid "E809: #< is not available without the +eval feature"
-#~ msgstr "E809: #< ei ole k�yt�ss� jollei +eval ole p��ll�"
-
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: Digraafeja ei ole t�ss� versiossa"
-
-#~ msgid "is a device (disabled with 'opendevice' option)"
-#~ msgstr "on laite (ei k�yt�ss� opendevice-asetuksen takia)"
-
-#~ msgid "Reading from stdin..."
-#~ msgstr "Luetaan vakiosy�tteest�"
-
-#~ msgid "[crypted]"
-#~ msgstr "[salattu]"
-
-#~ msgid "E821: File is encrypted with unknown method"
-#~ msgstr "E821: Tiedoston salaus on tuntematon"
-
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeans ei salli kirjoittaa muokkaamattomiin puskureihin"
-
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "Osittaiset kirjoitukset kielletty NetBeans-puskureissa"
-
-#~ msgid "writing to device disabled with 'opendevice' option"
-#~ msgstr "laitteeseen kirjoittaminen pois k�yt�st� opendevice-asetuksella"
-
-# tiet��kseni resurssiforkki on applen tiedostoj�rjestelm�n tunnistejuttujuttu
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: resurssiosa h�vi�isi (lis�� komentoon ! ohittaaksesi)"
-
-#~ msgid "<cannot open> "
-#~ msgstr "<ei voi avata> "
-
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: ei saada fonttia %s"
-
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr "E614: vim_SelFile: nykyiseen hakemistoon ei voi palata"
-
-#~ msgid "Pathname:"
-#~ msgstr "Polku:"
-
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: nykyist� hakemistoa ei saada selville"
-
-#~ msgid "OK"
-#~ msgstr "OK"
-
-#~ msgid "Cancel"
-#~ msgstr "Peru"
-
-#~ msgid "Vim dialog"
-#~ msgstr "Vim-ikkuna"
-
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr "Vierityspalkki: Pixmapin geometria ei selvi�"
-
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr "E232: Ei voi luoda BalloonEvalia viestille ja callbackille"
-
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: GUIn k�ynnistys ei onnistu"
-
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: Ei voi lukea kohteesta %s"
-
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr "E665: Ei voi avata GUIta, sopivaa fonttia ei l�ydy"
-
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: guifontwide virheellinen"
-
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: imactivatekeyn arvo on virheellinen"
-
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: V�ri� %s ei voi m��ritell�"
-
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "Ei t�sm�yst� kursorin alla, etsit��n seuraava"
-
-#~ msgid "Input _Methods"
-#~ msgstr "Sy�te_menetelm�t"
-
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "VIM - Etsi ja korvaa..."
-
-#~ msgid "VIM - Search..."
-#~ msgstr "VIM - Etsi..."
-
-#~ msgid "Find what:"
-#~ msgstr "Etsi:"
-
-#~ msgid "Replace with:"
-#~ msgstr "Korvaa:"
-
-#~ msgid "Match whole word only"
-#~ msgstr "Korvaa kokonaisia sanoja"
-
-#~ msgid "Match case"
-#~ msgstr "Kirjaintaso"
-
-#~ msgid "Direction"
-#~ msgstr "Suunta"
-
-#~ msgid "Up"
-#~ msgstr "Yl�s"
-
-#~ msgid "Down"
-#~ msgstr "Alas"
-
-#~ msgid "Find Next"
-#~ msgstr "Etsi seuraava"
-
-#~ msgid "Replace"
-#~ msgstr "Korvaa"
-
-#~ msgid "Replace All"
-#~ msgstr "Korvaa kaikki"
-
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "Vim: sessiomanageri l�hetti die-pyynn�n\n"
-
-#~ msgid "Close"
-#~ msgstr "Sulje"
-
-#~ msgid "New tab"
-#~ msgstr "Uusi v�lilehti"
-
-#~ msgid "Open Tab..."
-#~ msgstr "Avaa v�lilehti..."
-
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim: P��ikkuna tuhoutui odottamatta\n"
-
-#~ msgid "&Filter"
-#~ msgstr "&Suodata"
-
-#~ msgid "&Cancel"
-#~ msgstr "&Peru"
-
-#~ msgid "Directories"
-#~ msgstr "Hakemistot"
-
-#~ msgid "Filter"
-#~ msgstr "Suodatus"
-
-#~ msgid "&Help"
-#~ msgstr "O&hje"
-
-#~ msgid "Files"
-#~ msgstr "Tiedostot"
-
-#~ msgid "&OK"
-#~ msgstr "&Ok"
-
-#~ msgid "Selection"
-#~ msgstr "Valinta"
-
-#~ msgid "Find &Next"
-#~ msgstr "Hae &seuraava"
-
-#~ msgid "&Replace"
-#~ msgstr "Ko&rvaa"
-
-#~ msgid "Replace &All"
-#~ msgstr "Korvaa k&aikki"
-
-#~ msgid "&Undo"
-#~ msgstr "&Kumoa"
-
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: Ikkunan otsikkoa ei l�ydy %s"
-
-# OLE on object linking and embedding p� windowska
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: Argumenttia ei tueta: -%s, k�yt� OLE-versiota"
-
-# MDI eli windowsin moni-ikkunasovellus
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: Ikkunaa ei voitu avata MDI-sovellukseen"
-
-#~ msgid "Close tab"
-#~ msgstr "Sulje v�lilehti"
-
-#~ msgid "Open tab..."
-#~ msgstr "Avaa v�lilehti..."
-
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "Etsi merkkijonoa (\\\\:ll� l�yt�� \\:t)"
-
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "Etsi ja korvaa (\\\\:ll� l�yt�� \\:t)"
-
-#~ msgid "Not Used"
-#~ msgstr "Ei k�yt�ss�"
-
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "Hakemisto\t*.nothing\n"
+#~ "Ei onnistuttu asettaman polkua: sys.path ei ole list\n"
+#~ "Lisää vim.VIM_SPECIAL_PATH muuttujaan sys.path"
 
 #~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
+#~ "Failed to set path hook: sys.path_hooks is not a list\n"
+#~ "You should now do the following:\n"
+#~ "- append vim.path_hook to sys.path_hooks\n"
+#~ "- append vim.VIM_SPECIAL_PATH to sys.path\n"
 #~ msgstr ""
-#~ "Vim E458: Ei voi varata v�rikartan alkiota, v�rit voivat menn� v��rin"
+#~ "Ei voitu asettaa polkukoukkua: sys.path_hooks ei ole lista\n"
+#~ "Koeta seuraavaa:\n"
+#~ "- lisää vim.path_hook muuttujaan sys.path_hooks\n"
+#~ "- lisää vim.VIM_SPECIAL_PATH muuttujaan sys.path\n"
 
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr "E250: Seuraavien merkist�joukkojen fontit puuttuvat fontsetist� %s:"
+#~ msgid "internal error: invalid value type"
+#~ msgstr "sisäinen virhe: huono arvotyyppi"
 
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: Fontsetin nimi: %s"
+#~ msgid "internal error: NULL reference passed"
+#~ msgstr "sisäinen virhe: NULL-viite annettu"
 
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "Fontti %s ei ole tasav�linen"
+#~ msgid "unable to convert %s to vim structure"
+#~ msgstr "ei voi konvertoida oliota %s vim-tietorakenteeksi"
 
-#~ msgid "E253: Fontset name: %s\n"
-#~ msgstr "E253: Fontsetin nimi: %s\n"
+#~ msgid "unable to convert %s to vim dictionary"
+#~ msgstr "ei voitu konvertoida oliota %s vim-sanakirjaksi"
 
-#~ msgid "Font0: %s\n"
-#~ msgstr "Fontti0: %s\n"
+#~ msgid "E859: Failed to convert returned python object to vim value"
+#~ msgstr "E859: Ei voitu konvertoida python-oliota vim-arvoksi"
 
-#~ msgid "Font1: %s\n"
-#~ msgstr "Fontti1: %s\n"
+#~ msgid "E858: Eval did not return a valid python object"
+#~ msgstr "E858: Eval ei palauttanut python-oliota"
 
-#~ msgid "Font%<PRId64> width is not twice that of font0\n"
-#~ msgstr "Fontti%<PRId64>:n leveys ei ole kaksi kertaa fontti0:n\n"
+#~ msgid "failed to run the code"
+#~ msgstr "ei voitu suorittaa koodia"
 
-#~ msgid "Font0 width: %<PRId64>\n"
-#~ msgstr "Fontti0:n leveys: %<PRId64>\n"
+#~ msgid "did not switch to the specified tab page"
+#~ msgstr "ei voitu vaihtaa annetulle välilehtisivulle"
+
+#~ msgid "expected vim.TabPage object, but got %s"
+#~ msgstr "odotettiin vim.TabPage-oliota, saatiin %s"
+
+#~ msgid "did not switch to the specified window"
+#~ msgstr "ei vaihdettu annettuun ikkunaan"
+
+#~ msgid "failed to find window in the current tab page"
+#~ msgstr "ei voitu löytää ikkunaa nykyiselle välilehtisivulle"
+
+#~ msgid "expected vim.Window object, but got %s"
+#~ msgstr "odotettiin vim.Window-oliota, saatiin %s"
+
+#~ msgid "expected vim.Buffer object, but got %s"
+#~ msgstr "odotettiin vim.Buffer-oliota, ei %s"
+
+#~ msgid "attempt to refer to deleted buffer"
+#~ msgstr "yritettiin viitata poistettuun puskuriin"
+
+#~ msgid "no such window"
+#~ msgstr "ikkunaa ei ole"
+
+#~ msgid "readonly attribute: buffer"
+#~ msgstr "kirjoitussuojausattribuutti: puskuri"
+
+#~ msgid "attempt to refer to deleted window"
+#~ msgstr "yritettiin viitata poistettuun ikkunaan"
+
+#~ msgid "no such tab page"
+#~ msgstr "välilehteä ei ole"
+
+#~ msgid "attempt to refer to deleted tab page"
+#~ msgstr "yritettiin viitata poistettuun välilehteen"
+
+#~ msgid "internal error: unknown option type"
+#~ msgstr "sisäinen virhe: tuntematon asetustyyppi"
+
+#~ msgid "unable to get option value"
+#~ msgstr "ei voitu hakea asetuksen arvoa"
+
+#~ msgid "failed to run function %s"
+#~ msgstr "ei voitu suorittaa funktiota %s"
+
+#~ msgid "function %s does not exist"
+#~ msgstr "funktiota %s ei ole"
+
+#~ msgid "unnamed function %s does not exist"
+#~ msgstr "nimetöntä funktiota %s ei ole"
+
+#~ msgid "cannot modify fixed list"
+#~ msgstr "ei voida muokata kiinitettyä listaa"
+
+#~ msgid "cannot delete vim.List attributes"
+#~ msgstr "ei voi poistaa vim.List-attribuutteja"
+
+#~ msgid "failed to add item to list"
+#~ msgstr "ei voitu lisätä kohtaa listaan"
+
+#~ msgid "attempt to assign sequence of size %d to extended slice of size %d"
+#~ msgstr ""
+#~ "yritettiin asettaa sekvenssiä jonka koko on %d sliceen jonka koko on %d"
+
+#~ msgid "internal error: failed to add item to list"
+#~ msgstr "sisäinen virhe: ei voitu lisätä kohtaa listaan"
+
+#~ msgid "internal error: not enough list items"
+#~ msgstr "sisäinen virhe: ei tarpeeksi listan kohtia"
+
+#~ msgid "internal error: no vim list item %d"
+#~ msgstr "sisäinen virhe: ei vim-listan indeksiä %d"
+
+#~ msgid "attempt to assign sequence of size greater than %d to extended slice"
+#~ msgstr ""
+#~ "yritettiin sijoittaa sekvenssiä jonka koko on enemmän kuin %d sliceen"
+
+#~ msgid "slice step cannot be zero"
+#~ msgstr "slicen askel ei voi olla nolla"
+
+#~ msgid "internal error: failed to get vim list item %d"
+#~ msgstr "sisäinen virhe: ei pystytty hakea vimin listan indeksiä %d"
+
+#~ msgid "list index out of range"
+#~ msgstr "listaindeksi arvoalueen ulkopuolelta"
+
+#~ msgid "list constructor does not accept keyword arguments"
+#~ msgstr "listakonstruktori ei tue avainsanaparametrejä"
+
+#~ msgid "expected sequence element of size 2, but got sequence of size %d"
+#~ msgstr "sekvenssin elementin koon pitäisi olla 2, ei %d"
+
+#~ msgid "hashtab changed during iteration"
+#~ msgstr "hashtab muuttui kesken iteraation"
+
+#~ msgid "cannot set attribute %s"
+#~ msgstr "ei voi asettaa attribuuttia %s"
+
+#~ msgid "cannot delete vim.Dictionary attributes"
+#~ msgstr "ei voi poistaa vim.Dictionary-attribuutteja"
+
+#~ msgid "internal error: imp.find_module returned tuple with NULL"
+#~ msgstr ""
+#~ "sisäinen virhe: imp.find_module palautti tuplen joka sisältää nullin"
 
 #~ msgid ""
-#~ "Font1 width: %<PRId64>\n"
-#~ "\n"
+#~ "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
 #~ msgstr ""
-#~ "Fontti1:n leveys: %<PRId64>\n"
-#~ "\n"
+#~ "odotettiin 3-tuple tuloksnea imp.find_module()-kutsulle, mutta tuplen "
+#~ "koko onkin %d"
 
-#~ msgid "Invalid font specification"
-#~ msgstr "Virheellinen fonttim��ritys"
+#~ msgid "expected 3-tuple as imp.find_module() result, but got %s"
+#~ msgstr "odotettiin 3-tuplea tuloksena imp.find_module()-kutsulle, ei %s"
 
-#~ msgid "&Dismiss"
-#~ msgstr "&Ohita"
+#~ msgid "E264: Python: Error initialising I/O objects"
+#~ msgstr "E264: Python: Virhe IO-olioiden alustuksessa"
 
-#~ msgid "no specific match"
-#~ msgstr "ei tarkkaa t�sm�yst�"
-
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Vim - fonttivalitsin"
-
-#~ msgid "Name:"
-#~ msgstr "Nimi:"
-
-#~ msgid "Show size in Points"
-#~ msgstr "N�yt� koko pistein�"
-
-#~ msgid "Encoding:"
-#~ msgstr "Koodaus:"
-
-#~ msgid "Font:"
-#~ msgstr "Fontti:"
-
-#~ msgid "Style:"
-#~ msgstr "Tyyli:"
-
-#~ msgid "Size:"
-#~ msgstr "Koko:"
-
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: Hangu-automaattivirhe"
-
-#~ msgid "E563: stat error"
-#~ msgstr "E563: stat-virhe"
-
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: ei voi avata cscope-tietokantaa: %s"
-
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: ei voi hakea cscope-tietokannan tietoja"
-
-#~ msgid "Lua library cannot be loaded."
-#~ msgstr "Luan kirjastoa ei voitu ladata."
-
-#~ msgid "cannot save undo information"
-#~ msgstr "ei voitu tallentaa kumoustietoja"
-
-#~ msgid ""
-#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
-#~ "be loaded."
-#~ msgstr "E815: Sori, komento ei toimi, MzScheme-kirjastoa ei voitu ladata."
-
-#~ msgid "invalid expression"
-#~ msgstr "virheellinen ilmaus"
-
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "ilmaukset poistettu k�yt�st� k��nn�saikana"
-
-#~ msgid "hidden option"
-#~ msgstr "piilotettu asetus"
-
-#~ msgid "unknown option"
-#~ msgstr "tuntematon asetus"
-
-#~ msgid "window index is out of range"
-#~ msgstr "ikkunan indeksi alueen ulkopuolella"
-
-#~ msgid "couldn't open buffer"
-#~ msgstr "ei voitu avata puskuria"
-
-#~ msgid "cannot delete line"
-#~ msgstr "ei voitu poistaa rivi�"
-
-#~ msgid "cannot replace line"
-#~ msgstr "ei voitu korvata rivi�"
-
-#~ msgid "cannot insert line"
-#~ msgstr "ei voitu lis�t� rivi�"
-
-#~ msgid "string cannot contain newlines"
-#~ msgstr "merkkijono ei saa sis�lt�� rivinvaihtoja"
-
-#~ msgid "Vim error: ~a"
-#~ msgstr "Vim-virhe: ~a"
-
-#~ msgid "Vim error"
-#~ msgstr "Vim-virhe"
-
-#~ msgid "buffer is invalid"
-#~ msgstr "puskuri on virheellinen"
-
-#~ msgid "window is invalid"
-#~ msgstr "ikkuna on virheellinen"
-
-#~ msgid "linenr out of range"
-#~ msgstr "rivinumero arvoalueen ulkopuolelta"
-
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "ei sallittu Vimin hiekkalaatikossa"
-
-#~ msgid "E836: This Vim cannot execute :python after using :py3"
-#~ msgstr ""
-#~ "E836: Python: Ei voi k�ytt�� komentoja :py ja :py3 samassa istunnossa"
-
-#~ msgid "E837: This Vim cannot execute :py3 after using :python"
-#~ msgstr ""
-#~ "E837: Python: Ei voi k�ytt�� komentoja :py ja :py3 samassa istunnossa"
-
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E263: Sori, komento ei toimi, Python-kirjaston lataaminen ei onnistunut."
+#~ msgid "invalid attribute: %s"
+#~ msgstr "virheellinen attribuutti: %s"
 
 #~ msgid "can't delete OutputObject attributes"
 #~ msgstr "ei voi poistaa OutputObject-attribuutteja"
 
-#~ msgid "softspace must be an integer"
-#~ msgstr "softspacen pit�� olla kokonaisluku"
+#~ msgid "number must be greater or equal to zero"
+#~ msgstr "luvun on oltava yhtä suuri tai suurempi kuin nolla"
 
-#~ msgid "invalid attribute"
-#~ msgstr "virheellinen attribuutti"
+#~ msgid "value is too small to fit into C int type"
+#~ msgstr "arvo on liian pieni mahtumaan C:n int-tyyppiin"
 
-#~ msgid "<buffer object (deleted) at %p>"
-#~ msgstr "<puskuriolio (poistettu) kohdassa %p>"
-
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: Pythonia ei voi kutsua rekursiivisesti"
-
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr "E265: muuttujan $_ pit�� olla Stringin instanssi"
-
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr "E266: Sori, komento ei toimi, Ruby-kirjastoa ei voitu ladata."
-
-#~ msgid "E267: unexpected return"
-#~ msgstr "E267: odotuksenvastainen return"
-
-#~ msgid "E268: unexpected next"
-#~ msgstr "E268: Odotuksenvastainen next"
-
-#~ msgid "E269: unexpected break"
-#~ msgstr "E269: Odotuksenvastainen break"
-
-#~ msgid "E270: unexpected redo"
-#~ msgstr "E270: odotuksenvastainen redo"
-
-#~ msgid "E271: retry outside of rescue clause"
-#~ msgstr "E271: retry rescuen ulkopuolella"
-
-#~ msgid "E272: unhandled exception"
-#~ msgstr "E272: k�sittelem�t�n poikkeus"
-
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: tuntematon longjmp-tila %d"
-
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "Vaihda toteutuksen ja m��ritelm�n v�lill�"
-
-#~ msgid "Show base class of"
-#~ msgstr "N�yt� kantaluokka kohteelle"
-
-#~ msgid "Show overridden member function"
-#~ msgstr "N�yt� korvattu j�senfunktio"
-
-#~ msgid "Retrieve from file"
-#~ msgstr "J�ljit� tiedostosta"
-
-#~ msgid "Retrieve from project"
-#~ msgstr "J�ljit� projektista"
-
-#~ msgid "Retrieve from all projects"
-#~ msgstr "J�ljit� kaikista projekteista"
-
-#~ msgid "Retrieve"
-#~ msgstr "J�ljit�"
-
-#~ msgid "Show source of"
-#~ msgstr "N�yt� l�hdekoodi kohteelle"
-
-#~ msgid "Find symbol"
-#~ msgstr "Etsi symboli"
-
-#~ msgid "Browse class"
-#~ msgstr "Selaa luokkaa"
-
-#~ msgid "Show class in hierarchy"
-#~ msgstr "N�yt� luokka hierarkiassa"
-
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "N�yt� luokka rajoitetussa hierarkiassa"
-
-#~ msgid "Xref refers to"
-#~ msgstr "Xref viittaa kohteeseen"
-
-#~ msgid "Xref referred by"
-#~ msgstr "Xref viitattu kohteesta"
-
-#~ msgid "Xref has a"
-#~ msgstr "Xref sis�lt�� kohteen"
-
-#~ msgid "Xref used by"
-#~ msgstr "Xrefi� k�ytt��"
-
-#~ msgid "Show docu of"
-#~ msgstr "N�yt� dokumentti kohteelle"
-
-#~ msgid "Generate docu for"
-#~ msgstr "Luo dokumentti kohteelle"
-
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
+#~ msgid "expected int() or something supporting coercing to int(), but got %s"
 #~ msgstr ""
-#~ "Ei voida yhdist�� SNiFF+:aan. Tarkista ymp�rist�muuttujat (sniffemacsin "
-#~ "l�yty� polkumuuttujasta $PATH).\n"
-
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff: Virhe luettaessa, yhteys katkaistu"
-
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "SNiFF+ "
-
-#~ msgid "not "
-#~ msgstr "ei ole "
-
-#~ msgid "connected"
-#~ msgstr "yhdistetty"
-
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: Tuntematon SNiFF+-pyynt�: %s"
-
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: Virhe yhdistett�ess� SNiFF+:aan"
-
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: SNiFF+ ei ole yhdistetty"
-
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: Ei ole SNiFF+-puskuri"
-
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff: Virhe kirjoituksessa, yhteys katkaistu"
-
-#~ msgid "invalid buffer number"
-#~ msgstr "virheellinen puskurinumero"
-
-#~ msgid "not implemented yet"
-#~ msgstr "ei toteutettu"
-
-#~ msgid "cannot set line(s)"
-#~ msgstr "ei voi asettaa rivej�"
-
-#~ msgid "invalid mark name"
-#~ msgstr "virheellinen merkin nimi"
-
-#~ msgid "mark not set"
-#~ msgstr "merkko ei ole asetettu"
-
-#~ msgid "row %d column %d"
-#~ msgstr "rivi %d sarake %d"
-
-#~ msgid "cannot insert/append line"
-#~ msgstr "rivin lis�ys ei onnistu"
-
-#~ msgid "line number out of range"
-#~ msgstr "rivinumero arvoalueen ulkopuolella"
-
-#~ msgid "unknown flag: "
-#~ msgstr "tuntematon asetus: "
-
-#~ msgid "unknown vimOption"
-#~ msgstr "tuntematon vimOption"
-
-#~ msgid "keyboard interrupt"
-#~ msgstr "n�pp�imist�keskeytys"
-
-#~ msgid "vim error"
-#~ msgstr "vim-virhe"
-
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr "ei voi luoda puskuri- tai ikkunakomentoa, olio on poistumassa"
+#~ "odotettiin tyyppiä int() tai jotain joka muuntuu tyyppiin int(), ei %s"
 
 #~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr "callbackia ei voi rekister�id�: puskuri tai ikkuna on poistettu"
-
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
+#~ "expected int(), long() or something supporting coercing to long(), but "
+#~ "got %s"
 #~ msgstr ""
-#~ "E280: kriittinen TCL-virhe: reflist hajalla? Ilmoita asiasta "
-#~ "postituslistalle vim-dev@vim.org"
+#~ "odotettiin instanssia tyypeistä int(), long() tai mitä tahansa joka "
+#~ "muuntuisi tyyppiin long(), ei %s"
 
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr ""
-#~ "callbackia ei voi rekister�id�: puskurin tai ikkunan viitett� ei l�ydy"
+#~ msgid "expected bytes() or str() instance, but got %s"
+#~ msgstr "odotettiin instanssia tyypeistä bytes() tai str(), ei %s"
+
+#~ msgid "expected str() or unicode() instance, but got %s"
+#~ msgstr "odottettiin insanssia tyypeistä str() tai unicode(), ei %s"
+
+#~ msgid "index must be int or slice, not %s"
+#~ msgstr "indeksin pitää olla int tai slice, ei %s"
+
+#~ msgid "failed to add key '%s' to dictionary"
+#~ msgstr "avaimen %s lisääminen sanakirjaan ei onnistu"
+
+#~ msgid "list is locked"
+#~ msgstr "luettelo on lukittu"
+
+#~ msgid "Need encryption key for \"%s\""
+#~ msgstr "Tarvitaan salausavain kohteelle %s "
+
+#~ msgid "E744: NetBeans does not allow changes in read-only files"
+#~ msgstr "E744: NetBeans ei tue muutoksia kirjoitussuojattuihin tiedostoihin"
+
+#~ msgid "E463: Region is guarded, cannot modify"
+#~ msgstr "E463: Alue on suojattu, muuttaminen ei onnistu"
+
+#~ msgid "E449: Invalid expression received"
+#~ msgstr "E449: Virheellinen ilmaus saatu"
+
+#~ msgid "E233: cannot open display"
+#~ msgstr "E233: näyttöä ei voi avata"
+
+#~ msgid "E247: no registered server named \"%s\""
+#~ msgstr "E247: palvelinta %s ei ole rekisteröitynä"
+
+#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+#~ msgstr "E800: Arabiaa ei voi käyttää, koska sitä ei käännetty mukaan\n"
+
+#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
+#~ msgstr "E27: Farsia ei voi käyttää, koska sitä ei käännetty mukaan\n"
+
+#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
+#~ msgstr "E26: Hepreaa ei voi käyttää, koska sitä ei käännetty mukaan\n"
+
+#~ msgid "E25: GUI cannot be used: Not enabled at compile time"
+#~ msgstr "E25: GUIta ei voi käyttää, koska sitä ei käännetty mukaan"
+
+#~ msgid "E448: Could not load library function %s"
+#~ msgstr "E448: Ei voitu ladta kirjastofunktiota %s"
+
+#~ msgid "E236: Font \"%s\" is not fixed-width"
+#~ msgstr "E236: Fontti %s ei ole tasavälinen"
+
+#~ msgid "E234: Unknown fontset: %s"
+#~ msgstr "E234: Tuntematon fontset: %s"
+
+#~ msgid "gvimext.dll error"
+#~ msgstr "gvimext.dll-virhe"
+
+#~ msgid "Error creating process: Check if gvim is in your path!"
+#~ msgstr "Virhe prosessin käynnistämisessä, varmista että gvim on polulla"
+
+#~ msgid "Edits the selected file(s) with Vim"
+#~ msgstr "Muokkaa valittuja tiedostoja Vimillä"
+
+#~ msgid "Edit with existing Vim - "
+#~ msgstr "Muokkaa olemassaolevalla Vimillä - "
+
+#~ msgid "Edit with &Vim"
+#~ msgstr "Muokkaa &Vimillä"
+
+#~ msgid "Diff with Vim"
+#~ msgstr "Diffi Vimillä"
+
+#~ msgid "Edit with single &Vim"
+#~ msgstr "Muokkaa yhdellä &Vimillä"
+
+#~ msgid "Edit with &multiple Vims"
+#~ msgstr "&Muokkaa usealla Vimillä"
+
+#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+#~ msgstr "E299: Perl-suoritus kielletty hiekkalaatikossa ilman Safe-moduulia"
 
 #~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr "E571: Sori, komento ei toimi, Tcl-kirjastoa ei voitu ladata."
+#~ "Sorry, this command is disabled: the Perl library could not be loaded."
+#~ msgstr "komento ei toimi, Perl kirjastoa ei voinut ladata."
 
-#~ msgid ""
-#~ "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim."
-#~ "org"
-#~ msgstr ""
-#~ "E281: TCL-virhe: lopetuskoodi ei ole kokonaisluku? Ilmoita asiasta "
-#~ "postituslistalle vim-dev@vim.org"
+#~ msgid "E370: Could not load library %s"
+#~ msgstr "E370: Kirjaston %s lataaminen ei onnistu"
 
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: palautusarvo %d"
+#~ msgid "type  :help windows95<Enter>  for info on this"
+#~ msgstr "kirjoita :help windows95<Enter> lisätietoja varten"
 
-#~ msgid "cannot get line"
-#~ msgstr "ei voida hakea rivi�"
+#~ msgid "WARNING: Windows 95/98/ME detected"
+#~ msgstr "VAROITUS: Window 95/98/ME havaittu"
 
-#~ msgid "Unable to register a command server name"
-#~ msgstr "Komentopalvelimen nimen rekister�inti ei onnistu"
+#~ msgid "                              for Vim defaults   "
+#~ msgstr "                              Vim-oletuksia varten"
 
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: Komennon l�hetys kohdeohjelmalle ei onnistu"
+#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
+#~ msgstr "valikko Muokkaa->Yleiset asetukset->Vaihda Vi-yhteensopivuutta"
 
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: Virheellinen palvelimen tunniste: %s"
+#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
+#~ msgstr "valikko Muokkaa->Yleiset asetukset->Vaihda syötetilaa"
 
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr "E251: VIMin instanssin rekisteriarvo on virheellinen, poistettiin."
+#~ msgid "Running modeless, typed text is inserted"
+#~ msgstr "Suoritetaan tilattomana, kirjoitettu teksti syötetään"
 
-#~ msgid "netbeans is not supported with this GUI\n"
-#~ msgstr "netbeans ei toimi t�ss� k�ytt�liittym�ss�\n"
+#~ msgid "menu  Help->Orphans           for information    "
+#~ msgstr "valikko Ohje->Orvot            lisätietoja varten          "
 
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "T�h�n Vimiin ei ole k��nnetty diff-toimintoja mukaan."
+#~ msgid "type  :help cp-default<Enter> for info on this"
+#~ msgstr "kirjoita :help cp-default<Enter> ohjetta oletuksista varten"
 
-#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
-#~ msgstr "-nb:t� ei voi k�ytt��, koska sit� ei k��nnetty mukaan\n"
+#~ msgid "type  :set nocp<Enter>        for Vim defaults"
+#~ msgstr "kirjoita :set nocp<Enter>      Vimin oletuksiin            "
 
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim: Virhe: Gvimin k�ynnistys NetBeansist� ei onnistu\n"
+#~ msgid "Running in Vi compatible mode"
+#~ msgstr "Suoritetaan Vi-yhteensopivuustilaa"
+
+#~ msgid "type  :help version8<Enter>   for version info"
+#~ msgstr "kirjoita :help version8<Enter> versiotietoja varten        "
+
+#~ msgid "type  :help<Enter>  or  <F1>  for on-line help"
+#~ msgstr "kirjoita :help<Enter> tai <F1> ohjetta varten              "
+
+#~ msgid "version "
+#~ msgstr "versio "
+
+#~ msgid "VIM - Vi IMproved"
+#~ msgstr "VIM - Vi IMproved"
+
+#~ msgid "  DEBUG BUILD"
+#~ msgstr "  DEBUG-versio"
+
+#~ msgid "Linking: "
+#~ msgstr "Linkitys: "
+
+#~ msgid "Compiler: "
+#~ msgstr "Käännin: "
+
+#~ msgid "Compilation: "
+#~ msgstr "Käännös: "
+
+#~ msgid "    system menu file: \""
+#~ msgstr "    järjestelmävalikko: \""
+
+#~ msgid "       defaults file: \""
+#~ msgstr "       defaults-tiedosto: \""
+
+#~ msgid "3rd user gvimrc file: \""
+#~ msgstr "3. käyttäjän gvimrc: \""
+
+#~ msgid "2nd user gvimrc file: \""
+#~ msgstr "2. käyttäjän gvimrc: \""
+
+#~ msgid "    user gvimrc file: \""
+#~ msgstr "    käyttäjän gvimrc: \""
+
+#~ msgid "  system gvimrc file: \""
+#~ msgstr "  järjestelmän gvimrc: \""
+
+#~ msgid "  2nd user exrc file: \""
+#~ msgstr "  2. käyttäjän exrc: \""
+
+#~ msgid "      user exrc file: \""
+#~ msgstr "      käyttäjän exrc: \""
+
+#~ msgid " 3rd user vimrc file: \""
+#~ msgstr " 3. käyttäjän vimrc: \""
+
+#~ msgid " 2nd user vimrc file: \""
+#~ msgstr " 2. käyttäjän vimrc: \""
+
+#~ msgid "     user vimrc file: \""
+#~ msgstr "     käyttäjän vimrc: \""
+
+#~ msgid "with (classic) GUI."
+#~ msgstr "perinteisellä GUIlla."
+
+#~ msgid "with Cocoa GUI."
+#~ msgstr "Cocoa-GUIlla."
+
+#~ msgid "with Carbon GUI."
+#~ msgstr "Carbon-GUIlla."
+
+#~ msgid "with GUI."
+#~ msgstr "GUIlla."
+
+#~ msgid "with Photon GUI."
+#~ msgstr "Photon-GUIlla."
+
+#~ msgid "with X11-Athena GUI."
+#~ msgstr "X11-Athena-GUIlla."
+
+#~ msgid "with X11-neXtaw GUI."
+#~ msgstr "X11-neXtaw-GUIlla."
+
+#~ msgid "with X11-Motif GUI."
+#~ msgstr "X11-Motif-GUIlla."
+
+#~ msgid "with GTK2 GUI."
+#~ msgstr "GTK2-GUIlla."
+
+#~ msgid "with GTK2-GNOME GUI."
+#~ msgstr "GTK2-Gnome-GUIlla."
+
+#~ msgid "with GTK3 GUI."
+#~ msgstr "GTK3-GUIlla."
+
+#~ msgid "without GUI."
+#~ msgstr "ilman GUIta."
 
 #~ msgid ""
 #~ "\n"
-#~ "Where case is ignored prepend / to make flag upper case"
+#~ "Tiny version "
 #~ msgstr ""
 #~ "\n"
-#~ "Jos aakkoslaji on ohitettu, lis�� alkuun / tehd�ksesi asetuksesta "
-#~ "suuraakkosia"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\trekister�i gvim OLEa varten"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\tPoista gvim OLE-rekisterist�"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\tAvaa GUI (kuten gvimill�)"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr "-f tai --nofork\tEdustalle: �l� haarauta GUIn k�ynnistyksess�"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\t�l� k�yt� newcli:t� ikkunan avaamiseen"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <laite>\t\tK�yt� <laitetta> IO:hon"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\t\tK�yt� <gvimrc>-tiedostoa .gvimrc:iden sijasta"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\tMuokkaa salattua tiedostoa"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <n�ytt�>\tYhdist� vim tiettyyn X-palvelimeen"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\t�l� yhdist� X-palvelimeen"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr ""
-#~ "--remote <tiedostoja>\tMuokkaa <tiedostoja> Vim-palvelimessa, jos "
-#~ "mahdollista"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-silent <tiedostoja>\tSama, mutta �l� ilmoita puuttuvasta "
-#~ "palvelimesta"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr ""
-#~ "--remote-wait <tiedostoja>  kuten --remote, mutta odota tiedostojen "
-#~ "muokkaamista"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-wait-silent <tiedostoja>  sama, mutta �l� ilmoita puuttuvasta "
-#~ "palvelimesta"
-
-#~ msgid ""
-#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
-#~ "file"
-#~ msgstr ""
-#~ "--remote-tab[-wait][-silent] <tiedostoja>  kuten --remote, mutta avaa "
-#~ "v�lilehti joka tiedostolle"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr ""
-#~ "--remote-send <n�pp�imi�>\tL�het� <n�pp�imi�> painalluksina Vimille ja "
-#~ "lopeta"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr ""
-#~ "--remote-expr <ilmaus>\tK�sittele <ilmaus> Vim-palvelimella ja tulosta "
-#~ "tulos"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr "--serverlist\t\tLuettele Vim-palvelinten nimet ja lopeta"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <nimi>\tL�het� Vim-palvelimelle <nimi> tai luo se"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Gvimin (Motif-version) tuntemat argumentit:\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Gvimin (neXtaw-version) tuntemat argumentit:\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Gvimin (Athena-version) tuntemat argumentit:\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <n�ytt�>\tSuorita vim <n�yt�ss�>"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\tK�ynnist� pienennettyn�"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr "-background <v�ri>\tK�yt� <v�ri�> taustav�rin� (my�s: -bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr "-foreground <v�ri>\tK�yt� <v�ri�> tekstin v�rin� (my�s: -fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr "-font <fontti>\t\tK�yt� <fonttia> tekstiss� (my�s: -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <fontti>\tK�yt� <fonttia> lihavoidussa tekstiss�"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <fontti>\tK�yt� <fonttia> kursivoidussa tekstiss�"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr ""
-#~ "-geometry <geom>\tK�yt� mittoja <geom> ikkunan asetteluun (my�s: -geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr "-borderwidt <leveys>\tK�yt� <leveytt�> reunuksissa (my�s: -bw) "
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr ""
-#~ "-scrollbarwidth <leveys>  K�yt� <leveytt�> vierityspalkissa (my�s: -sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr "-menuheight <korkeus>\tK�yt� <korkeutta> valikossa (my�s: -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\tK�yt� k��nteisv�rej� (my�s: -rv) "
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\t�l� k�yt� k��nteisv�rej� (my�s: +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <resurssi>\tAseta resurssi"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (RISC OS version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Gvimin (RISC OS -version) tuntemat argumentit:\n"
-
-#~ msgid "--columns <number>\tInitial width of window in columns"
-#~ msgstr "--columns <luku>\tIkkunan alkuleveys sarakkeina"
-
-#~ msgid "--rows <number>\tInitial height of window in rows"
-#~ msgstr "--rows <luku>\tIkkunan alkukorkeus rivein�"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Gvimin (GTK+-version) tuntemat argumentit:\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr "-display <n�ytt�>\tSuorita vim n�yt�ll� <n�ytt�> (my�s: --display)"
-
-# X-ikkunointij�rjestelm�ss� saman sovelluksen saman luokan ikkunat
-# tunnistetaan rooliresursseista
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr ""
-#~ "--role <rooli>\tAseta p��ikkunalle ainutlaatuinen rooli tunnisteeksi"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\tAvaa Vim annettuun GTK-olioon "
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <otsikko>\tAvaa Vim is�nt�ohjelman sis��n"
-
-#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-#~ msgstr "--windowid <HWND>\tAvaa Vim annettuun win32-olioon "
-
-#~ msgid "No display"
-#~ msgstr "Ei n�ytt��"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr ": L�hetys ep�onnistui.\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": L�hetys ep�onnistui. Yritet��n suorittaa paikallisena\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "%d/%d muokattu"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "Ei n�ytt��: Ilmauksen l�hetys ep�onnistui.\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": Ilmauksen l�hetys ep�onnistui.\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: Koodisivu ei ole k�yp�"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: Sy�tekontekstin luonti ei onnistu"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: Sy�temetodin avaus ei onnistu"
-
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr ""
-#~ "E287: Varoitus: Ei voitu asettaa destroy-kutsua sy�temetodipalvelimelle"
-
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: sy�temetodi ei tue tyylej�"
-
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr "E289: sy�temetodi ei tue t�t� preedit-tyyppi�"
-
-#~ msgid ""
-#~ "E833: %s is encrypted and this version of Vim does not support encryption"
-#~ msgstr "E833: %s on salattu eik� t�m� Vim tue salausta"
-
-#~ msgid "Swap file is encrypted: \"%s\""
-#~ msgstr "Swap-tiedosto on salattu: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "If you entered a new crypt key but did not write the text file,"
-#~ msgstr ""
-#~ "\n"
-#~ "Jos k�ytit uutta salausavainta muttet kirjoittanut tekstitiedostoa,"
-
-#~ msgid ""
-#~ "\n"
-#~ "enter the new crypt key."
-#~ msgstr ""
-#~ "\n"
-#~ "anna uusi salausavain."
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wrote the text file after changing the crypt key press enter"
-#~ msgstr ""
-#~ "\n"
-#~ "Jos kirjoitit tekstitiedoston salausavaimen vaihdon j�lkeen paina enteri�"
-
-#~ msgid ""
-#~ "\n"
-#~ "to use the same key for text file and swap file"
-#~ msgstr ""
-#~ "\n"
-#~ "k�ytt��ksesi samaa avainta teksti- ja sw�ppitiedostoille"
-
-#~ msgid "Using crypt key from swap file for the text file.\n"
-#~ msgstr "K�ytet��n sw�pin salausavainta tekstitiedostolle\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [ei toimi t�m�n Vim-version kanssa]"
-
-#~ msgid "Tear off this menu"
-#~ msgstr "Rep�ise valikko irti"
-
-#~ msgid "Select Directory dialog"
-#~ msgstr "Hakemiston valintaikkuna"
-
-#~ msgid "Save File dialog"
-#~ msgstr "Tallennusikkuna"
-
-#~ msgid "Open File dialog"
-#~ msgstr "Avausikkuna"
-
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr "E338: Sori, tiedostonselain puuttuu konsolitilasta"
-
-#~ msgid "Vim: preserving files...\n"
-#~ msgstr "Vim: s��stet��n tiedostoja...\n"
-
-#~ msgid "Vim: Finished.\n"
-#~ msgstr "Vim: Valmis.\n"
-
-#~ msgid "ERROR: "
-#~ msgstr "VIRHE: "
-
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[tavua] yht. alloc-free %<PRIu64>-%<PRIu64>, k�yt�ss� %<PRIu64>, "
-#~ "k�ytt�huippu %<PRIu64>\n"
-
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[kutsut] yht. re/malloc() %<PRIu64>, yht. free() %<PRIu64>\n"
-#~ "\n"
-
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: Rivist� tulee liian pitk�"
-
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: Sis�inen virhe: lalloc(%<PRId64>, )"
-
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: Virheellinen hiiren muoto"
-
-#~ msgid "Enter encryption key: "
-#~ msgstr "Anna salausavain: "
-
-#~ msgid "Enter same key again: "
-#~ msgstr "Anna sama avain uudestaan: "
-
-#~ msgid "Keys don't match!"
-#~ msgstr "Avaimet eiv�t t�sm��!"
-
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "Ei voi yhdist�� Netbeans #2:een"
-
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "Ei voi yhdist�� Netbeansiin"
-
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr "E668: V��r� avaustila NetBeans-yhteyden infotiedostolle: %s"
-
-#~ msgid "read from Netbeans socket"
-#~ msgstr "luettu Netbeans-soketista"
-
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: NetBeans-yhteys katkesi puskurille %<PRId64>"
-
-#~ msgid "E511: netbeans already connected"
-#~ msgstr "E511: netbeans on yhdistetty jo"
-
-#~ msgid "E505: "
-#~ msgstr "E505: "
-
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: Eval ei ole k�ytett�viss�"
-
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "vapautetaan %<PRId64> rivi�"
-
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: Ei voi vaihtaa termi� GUIssa"
-
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: K�yt� komentoa :gui GUIn k�ynnist�miseen"
-
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: Ei voi muuttaa GTK+2-GUIssa"
-
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: Viallisia fontteja"
-
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: Fontsetin valinta ei onnistu"
-
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: Viallinen fontset"
-
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: Leve�n fontin valinta ei onnistu"
-
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: Viallinen leve� fontti"
-
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: Hiirt� ei tueta"
-
-#~ msgid "cannot open "
-#~ msgstr "ei voi avata "
-
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM: Ei voi avata ikkunaa\n"
-
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "Amigados 2.04 tai uudempi tarvitaan\n"
-
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "Tarvitaan %s versio %<PRId64>\n"
-
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "Ei voi avata NILi�:\n"
-
-#~ msgid "Cannot create "
-#~ msgstr "Ei voi luoda "
-
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vim sulkeutuu koodilla %d\n"
-
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "ei voi vaihtaa konsolitilaa?\n"
-
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: ei ole konsoli?\n"
-
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: Kuorta ei voi avata asetuksella -f"
-
-#~ msgid "Cannot execute "
-#~ msgstr "Ei voi suorittaa "
-
-#~ msgid "shell "
-#~ msgstr "kuori "
-
-#~ msgid " returned\n"
-#~ msgstr " palautti\n"
-
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE liian pieni."
-
-#~ msgid "I/O ERROR"
-#~ msgstr "IO-virhe"
-
-#~ msgid "Message"
-#~ msgstr "Viesti"
-
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr "columns ei ole 80, ei voi suorittaa ulkoista komentoa"
-
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: Tulostimen valinta ep�onnistui"
-
-#~ msgid "to %s on %s"
-#~ msgstr "tulostimelle %s kohteessa %s"
-
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: Tuntematon tulostimen fontti: %s"
-
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: Tulostinvirhe: %s"
-
-#~ msgid "Printing '%s'"
-#~ msgstr "Tulostetaan %s"
-
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr "E244: Virheellinen merkist�n nimi %s fontin nimess� %s"
-
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: Virheellinen merkki %c fontin nimess� %s"
-
-#~ msgid "Vim: Double signal, exiting\n"
-#~ msgstr "Vim: Kaksoissignaali, lopetetaan\n"
-
-#~ msgid "Vim: Caught deadly signal %s\n"
-#~ msgstr "Vim: Tappava signaali %s\n"
-
-#~ msgid "Vim: Caught deadly signal\n"
-#~ msgstr "Vim: Tappava signaali\n"
-
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "X-n�yt�n avaus vei %<PRId64> millisekuntia"
-
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim: X-virhe\n"
-
-#~ msgid "Testing the X display failed"
-#~ msgstr "X-n�yt�n testaus ep�onnistui"
-
-#~ msgid "Opening the X display timed out"
-#~ msgstr "X-n�yt�n avaus aikakatkaistiin"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Kuoren sh suoritus ei onnistu\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Putkia ei voi tehd�\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ei voi haarauttaa\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Komento loppui\n"
-
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP kadotti ICE-yhteyden"
-
-#~ msgid "Opening the X display failed"
-#~ msgstr "X-n�yt�n avaus ep�onnistui"
-
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP k�sittelee save-yourself-pyynt��"
-
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP avaa yhteytt�"
-
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "XSMP:n ICE-yhteyden tarkkailu ep�onnistui"
-
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP SmcOpenConnection ep�onnistui: %s"
-
-#~ msgid "At line"
-#~ msgstr "Rivill�"
-
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "Vim32.dll:�� ei voitu ladata"
-
-#~ msgid "VIM Error"
-#~ msgstr "VIM-virhe"
-
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "Ei voitu korjata funktio-osoittimia DLL:ss�"
-
-#~ msgid "shell returned %d"
-#~ msgstr "kuori palautti arvon %d"
-
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim: Napattiin %s\n"
-
-#~ msgid "close"
-#~ msgstr "sulkeminen"
-
-#~ msgid "logoff"
-#~ msgstr "uloskirjautuminen"
-
-#~ msgid "shutdown"
-#~ msgstr "sammutus"
-
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: Komentoa ei l�ydy"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "VIMRUN.EXE� ei l�ydy muuttujasta $PATH.\n"
-#~ "Ulkoiset komennot eiv�t pys�hdy suorituksen lopussa.\n"
-#~ "Lis�tietoja komennolla  :help win32-vimrun"
-
-#~ msgid "Vim Warning"
-#~ msgstr "Vim-varoitus"
-
-#~ msgid "Error file"
-#~ msgstr "Virhetiedosto"
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "Muutosta kohteessa %s ei tueta"
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: T�gitiedoston polku katkaistu kohdassa %s\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "uusi kuori avattu\n"
-
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "K�ytettiin CUT_BUFFER0:aa tyhj�n valinnan sijaan"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "Ei voi kumota, jatketaan silti"
-
-#~ msgid "E832: Non-encrypted file has encrypted undo file: %s"
-#~ msgstr "E832: Salaamattomalla tiedostolla on salattu kumoustiedosto: %s"
-
-#~ msgid "E826: Undo file decryption failed: %s"
-#~ msgstr "E826: Kumoustiedoston purku ep�onnistui: %s"
-
-#~ msgid "E827: Undo file is encrypted: %s"
-#~ msgstr "E827: Kumoustiedosto on salattu: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16- t. 32-bittinen GUI-versio"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 64-bittinen GUI-versio"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32-bittinen GUI-version"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " Win32s-tilassa"
-
-#~ msgid " with OLE support"
-#~ msgstr " OLE-tuella"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32-bittinen konsoliversio"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32-bittinen konsoliversio"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16-bittinen versio"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "32-bittinen MS-DOS-versio"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "16-bittinen MS-DOS-versio"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X-version (unix)"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X-version"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS-version"
-
-#~ msgid ""
-#~ "\n"
-#~ "RISC OS version"
-#~ msgstr ""
-#~ "\n"
-#~ "RISC OS-version"
-
-#~ msgid ""
-#~ "\n"
-#~ "OpenVMS version"
-#~ msgstr ""
-#~ "\n"
-#~ "OpenVMS-version"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "Big-version "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "Normal-versio "
+#~ "Tiny-versio "
 
 #~ msgid ""
 #~ "\n"
@@ -7828,231 +6129,1609 @@ msgstr "E446: Ei tiedostonime
 
 #~ msgid ""
 #~ "\n"
-#~ "Tiny version "
+#~ "Normal version "
 #~ msgstr ""
 #~ "\n"
-#~ "Tiny-versio "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "GTK2-Gnome-GUIlla."
-
-#~ msgid "with GTK2 GUI."
-#~ msgstr "GTK2-GUIlla."
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "X11-Motif-GUIlla."
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "X11-neXtaw-GUIlla."
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "X11-Athena-GUIlla."
-
-#~ msgid "with Photon GUI."
-#~ msgstr "Photon-GUIlla."
-
-#~ msgid "with GUI."
-#~ msgstr "GUIlla."
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "Carbon-GUIlla."
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "Cocoa-GUIlla."
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "perinteisell� GUIlla."
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "  j�rjestelm�n gvimrc: \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "    k�ytt�j�n gvimrc: \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "2. k�ytt�j�n gvimrc: \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "3. k�ytt�j�n gvimrc: \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr "    j�rjestelm�valikko: \""
-
-#~ msgid "Compiler: "
-#~ msgstr "K��nnin: "
-
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "valikko Ohje->Orvot            lis�tietoja varten          "
-
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "Suoritetaan tilattomana, kirjoitettu teksti sy�tet��n"
-
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "valikko Muokkaa->Yleiset asetukset->Vaihda sy�tetilaa"
-
-#~ msgid "                              for two modes      "
-#~ msgstr "                              kahta tilaa varten "
-
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr "valikko Muokkaa->Yleiset asetukset->Vaihda Vi-yhteensopivuutta"
-
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "                              Vim-oletuksia varten"
-
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "VAROITUS: Window 95/98/ME havaittu"
-
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr "kirjoita :help windows95<Enter> lis�tietoja varten"
-
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: Kirjaston %s lataaminen ei onnistu"
+#~ "Normal-versio "
 
 #~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr "Sori, komento ei toimi, Perl kirjastoa ei voinut ladata."
+#~ "\n"
+#~ "Big version "
+#~ msgstr ""
+#~ "\n"
+#~ "Big-version "
 
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr "E299: Perl-suoritus kielletty hiekkalaatikossa ilman Safe-moduulia"
+#~ msgid ""
+#~ "\n"
+#~ "Huge version "
+#~ msgstr ""
+#~ "\n"
+#~ "Huge-versio "
 
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "&Muokkaa usealla Vimill�"
+#~ msgid "Modified by "
+#~ msgstr "Muokannut "
 
-#~ msgid "Edit with single &Vim"
-#~ msgstr "Muokkaa yhdell� &Vimill�"
+#~ msgid ""
+#~ "\n"
+#~ "Included patches: "
+#~ msgstr ""
+#~ "\n"
+#~ "Pätsit: "
 
-#~ msgid "Diff with Vim"
-#~ msgstr "Diffi Vimill�"
+#~ msgid ""
+#~ "\n"
+#~ "OpenVMS version"
+#~ msgstr ""
+#~ "\n"
+#~ "OpenVMS-version"
 
-#~ msgid "Edit with &Vim"
-#~ msgstr "Muokkaa &Vimill�"
+#~ msgid ""
+#~ "\n"
+#~ "MacOS version"
+#~ msgstr ""
+#~ "\n"
+#~ "MacOS-version"
 
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "Muokkaa olemassaolevalla Vimill� - "
+#~ msgid ""
+#~ "\n"
+#~ "MacOS X version"
+#~ msgstr ""
+#~ "\n"
+#~ "MacOS X-version"
 
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "Muokkaa valittuja tiedostoja Vimill�"
+#~ msgid ""
+#~ "\n"
+#~ "MacOS X (unix) version"
+#~ msgstr ""
+#~ "\n"
+#~ "MacOS X-version (unix)"
 
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr "Virhe prosessin k�ynnist�misess�, varmista ett� gvim on polulla"
+#~ msgid ""
+#~ "\n"
+#~ "MS-Windows 32-bit console version"
+#~ msgstr ""
+#~ "\n"
+#~ "MS-Windows 32-bittinen konsoliversio"
 
-#~ msgid "gvimext.dll error"
-#~ msgstr "gvimext.dll-virhe"
+#~ msgid ""
+#~ "\n"
+#~ "MS-Windows 64-bit console version"
+#~ msgstr ""
+#~ "\n"
+#~ "MS-Windows 32-bittinen konsoliversio"
 
-#~ msgid "Path length too long!"
-#~ msgstr "Liian pitk� polku"
+#~ msgid " with OLE support"
+#~ msgstr " OLE-tuella"
 
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: Tuntematon fontset: %s"
+#~ msgid " in Win32s mode"
+#~ msgstr " Win32s-tilassa"
 
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: Tuntematon fontti: %s"
+#~ msgid ""
+#~ "\n"
+#~ "MS-Windows 32-bit GUI version"
+#~ msgstr ""
+#~ "\n"
+#~ "MS-Windows 32-bittinen GUI-version"
 
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: Fontti %s ei ole tasav�linen"
+#~ msgid ""
+#~ "\n"
+#~ "MS-Windows 64-bit GUI version"
+#~ msgstr ""
+#~ "\n"
+#~ "MS-Windows 64-bittinen GUI-versio"
 
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: Ei voitu ladta kirjastofunktiota %s"
+#~ msgid ""
+#~ "\n"
+#~ "MS-Windows 16/32-bit GUI version"
+#~ msgstr ""
+#~ "\n"
+#~ "MS-Windows 16- t. 32-bittinen GUI-versio"
 
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr "E26: Hepreaa ei voi k�ytt��, koska sit� ei k��nnetty mukaan\n"
+#~ msgid "E827: Undo file is encrypted: %s"
+#~ msgstr "E827: Kumoustiedosto on salattu: %s"
 
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: Farsia ei voi k�ytt��, koska sit� ei k��nnetty mukaan\n"
+#~ msgid "E826: Undo file decryption failed: %s"
+#~ msgstr "E826: Kumoustiedoston purku epäonnistui: %s"
 
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr "E800: Arabiaa ei voi k�ytt��, koska sit� ei k��nnetty mukaan\n"
+#~ msgid "E832: Non-encrypted file has encrypted undo file: %s"
+#~ msgstr "E832: Salaamattomalla tiedostolla on salattu kumoustiedosto: %s"
 
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: palvelinta %s ei ole rekister�ityn�"
+#~ msgid "No undo possible; continue anyway"
+#~ msgstr "Ei voi kumota, jatketaan silti"
 
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: n�ytt�� ei voi avata"
+#~ msgid "Used CUT_BUFFER0 instead of empty selection"
+#~ msgstr "Käytettiin CUT_BUFFER0:aa tyhjän valinnan sijaan"
 
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: Virheellinen ilmaus saatu"
+#~ msgid "new shell started\n"
+#~ msgstr "uusi kuori avattu\n"
 
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: Alue on suojattu, muuttaminen ei onnistu"
+#~ msgid "Cannot open $VIMRUNTIME/rgb.txt"
+#~ msgstr "Ei voida avata tiedostoa $VIMRUNTIME/rgb.txt"
 
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr "E744: NetBeans ei tue muutoksia kirjoitussuojattuihin tiedostoihin"
+#~ msgid ""
+#~ "\n"
+#~ "--- Terminal keys ---"
+#~ msgstr ""
+#~ "\n"
+#~ "--- Terminaalinäppäimet ---"
 
-#~ msgid "Need encryption key for \"%s\""
-#~ msgstr "Tarvitaan salausavain kohteelle %s "
+#~ msgid "E437: terminal capability \"cm\" required"
+#~ msgstr "E437: terminaalilla pitää olla cm kyvyissään"
 
-#~ msgid "writelines() requires list of strings"
-#~ msgstr "writelines()-komennolle pit�� antaa merkkijonolista"
+#~ msgid "E436: No \"%s\" entry in termcap"
+#~ msgstr "E436: %s ei löytynyt termcapista"
 
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Python: Virhe IO-olioiden alustuksessa"
+#~ msgid "E559: Terminal entry not found in termcap"
+#~ msgstr "E559: Terminaalia ei löytynyt termcapista"
 
-#~ msgid "no such buffer"
-#~ msgstr "puskuria ei ole"
+#~ msgid "E558: Terminal entry not found in terminfo"
+#~ msgstr "E558: Terminaalia ei löytynyt terminfosta"
 
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "yritettiin viitata poistettuun ikkunaan"
+#~ msgid "E557: Cannot open termcap file"
+#~ msgstr "E557: Ei voi avata termcap-tiedostoa"
 
-#~ msgid "readonly attribute"
-#~ msgstr "kirjoitussuojattu attribuutti"
+#~ msgid "defaulting to '"
+#~ msgstr "oletusarvona "
 
-#~ msgid "cursor position outside buffer"
-#~ msgstr "kursorin sijainti puskurin ulkopuolella"
+#~ msgid "' not known. Available builtin terminals are:"
+#~ msgstr " ei tunnettu. Tuetut terminaalit:"
 
-#~ msgid "<window object (deleted) at %p>"
-#~ msgstr "<ikkunaolio (poistettu) kohdassa %p>"
+#~ msgid "E430: Tag file path truncated for %s\n"
+#~ msgstr "E430: Tägitiedoston polku katkaistu kohdassa %s\n"
 
-#~ msgid "<window object (unknown) at %p>"
-#~ msgstr "<ikkunaolio (tuntematon) kohdassa %p>"
+#~ msgid "E422: terminal code too long: %s"
+#~ msgstr "E422: terminaalikoodi liian pitkä: %s"
 
-#~ msgid "<window %d>"
-#~ msgstr "<ikkuna %d>"
+#~ msgid "E845: Insufficient memory, word list will be incomplete"
+#~ msgstr "E845: Muisti ei riitä, sanalista jää keskeneräiseksi"
 
-#~ msgid "no such window"
-#~ msgstr "ikkunaa ei ole"
+#~ msgid "Conversion in %s not supported"
+#~ msgstr "Muutosta kohteessa %s ei tueta"
 
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "yritettiin viitata poistettuun puskuriin"
+#~ msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+#~ msgstr "Varoitus: Ei löydetty sanalistaa %s_%s.spl tai %s_ascii.spl"
 
-# New Line eli uusi rivinvaihtomerkki (ei CR, LF tai CR LF)
-#~ msgid "[NL found]"
-#~ msgstr "[NL puuttuu]"
+#~ msgid ""
+#~ "\n"
+#~ "# Last %sSearch Pattern:\n"
+#~ "~"
+#~ msgstr ""
+#~ "\n"
+#~ "# Edellinen %sHakulauseke:\n"
+#~ "~"
 
-#~ msgid "Vim dialog..."
-#~ msgstr "Vim-ikkuna..."
+#~ msgid "Substitute "
+#~ msgstr "Korvaa "
 
-#~ msgid "Font Selection"
-#~ msgstr "Fontin valinta"
+#~ msgid "(NFA) COULD NOT OPEN %s !"
+#~ msgstr "(NFA) EI VOI AVATA KOHDETTA %s"
 
-#~ msgid "E569: maximum number of cscope connections reached"
-#~ msgstr "E569: enimm�ism��r� cscope-yhteyksi� otettu"
+#~ msgid ""
+#~ "Could not open temporary log file for writing, displaying on stderr ... "
+#~ msgstr ""
+#~ "Ei voitu avata väliaikaislokitiedosta kirjoittamista varten, joten "
+#~ "virheet näytetään vakiovirhevirrassa. "
 
-#~ msgid "-name <name>\t\tUse resource as if vim was <name>"
-#~ msgstr "-name <nimi>\t\tK�yt� resurssia vim <nimen�>"
+#~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+#~ msgstr "E878: (NFA) Ei voitu allokoida muistia polkujen läpikäyntiin"
 
-#~ msgid "\t\t\t  (Unimplemented)\n"
-#~ msgstr "\t\t\t  (toteuttamatta)\n"
+#~ msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
+#~ msgstr "E876: (NFA regexp) Tila ei riitä NFA:n tallentamiseen"
 
-#~ msgid "E290: over-the-spot style requires fontset"
-#~ msgstr "E290: over-the-spot-tyyliss� pit�� olla fontset"
+#~ msgid ""
+#~ "E875: (NFA regexp) (While converting from postfix to NFA), too many "
+#~ "states left on stack"
+#~ msgstr ""
+#~ "E875: (NFA regexp) (Muunnettaessa postfixistä NFA:ksi), liikaa tiloja "
+#~ "jäljellä pinossa"
 
-#~ msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
-#~ msgstr "E291: GTK+-versio vanhempi kuin 1.2.3: Tila-alue poistettu k�yt�st�"
+#~ msgid "E874: (NFA) Could not pop the stack !"
+#~ msgstr "E874: (NFA) Ei voida poistaa pinosta"
 
-#~ msgid "E292: Input Method Server is not running"
-#~ msgstr "E292: Sy�temetodipalvelin ei ole k�ynniss�"
+#~ msgid "E873: (NFA regexp) proper termination error"
+#~ msgstr "E873: (NFA regexp) oikea lopetusvirhe"
 
-#~ msgid "E396: containedin argument not accepted here"
-#~ msgstr "E396: containedin ei sovi t�h�n"
+#~ msgid "E879: (NFA regexp) Too many \\z("
+#~ msgstr "E879: (NFA regexp) Liikaa merkkejä \\z("
 
-#~ msgid "with GTK-GNOME GUI."
-#~ msgstr "GTK-Gnome-GUIlla."
+#~ msgid "E872: (NFA regexp) Too many '('"
+#~ msgstr "E872: (NFA regexp) Liian monta suljetta '('"
 
-#~ msgid "with GTK GUI."
-#~ msgstr "GTK-GUIlla."
+#~ msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
+#~ msgstr "E871: (NFA regexp) Multi ei voi seurata multia"
 
-#~ msgid "-V[N]\t\tVerbose level"
-#~ msgstr "-V[N]\t\tMonisanaisuustaso"
+#~ msgid "E870: (NFA regexp) Error reading repetition limits"
+#~ msgstr "E870: (NFA regexp) Virhe luettaessa toiston määriä"
 
-#~ msgid "...(truncated)"
-#~ msgstr "...(katkaistu)"
+#~ msgid "E869: (NFA) Unknown operator '\\@%c'"
+#~ msgstr "E869: (NFA) Tuntematon operaattori '\\@%c'"
+
+#~ msgid "E868: Error building NFA with equivalence class!"
+#~ msgstr "E868: Virhe NFA:n ekvivalenssiluokkia tekemisessä"
+
+#~ msgid "E867: (NFA) Unknown operator '\\%%%c'"
+#~ msgstr "E867: (NFA) Tuntematon operaattori '\\%%%c'"
+
+#~ msgid "E867: (NFA) Unknown operator '\\z%c'"
+#~ msgstr "E867: (NFA) Tuntematon operaattori '\\z%c'"
+
+#~ msgid "E877: (NFA regexp) Invalid character class: %ld"
+#~ msgstr "E877: (NFA regexp) Virheellinen merkkiluokka: %ld"
+
+#~ msgid "E866: (NFA regexp) Misplaced %c"
+#~ msgstr "E866: (NFA-regexp) %c väärässä paikassa"
+
+#~ msgid "E865: (NFA) Regexp end encountered prematurely"
+#~ msgstr "E865: (NFA) Säännöllisen ilmauksen ennenaikainen loppu"
+
+#~ msgid "Error file"
+#~ msgstr "Virhetiedosto"
+
+#~ msgid "shell returned %d"
+#~ msgstr "kuori palautti arvon %d"
+
+#~ msgid "Vim Warning"
+#~ msgstr "Vim-varoitus"
+
+#~ msgid ""
+#~ "VIMRUN.EXE not found in your $PATH.\n"
+#~ "External commands will not pause after completion.\n"
+#~ "See  :help win32-vimrun  for more information."
+#~ msgstr ""
+#~ "VIMRUN.EXEä ei löydy muuttujasta $PATH.\n"
+#~ "Ulkoiset komennot eivät pysähdy suorituksen lopussa.\n"
+#~ "Lisätietoja komennolla  :help win32-vimrun"
+
+#~ msgid "E371: Command not found"
+#~ msgstr "E371: Komentoa ei löydy"
+
+#~ msgid "shutdown"
+#~ msgstr "sammutus"
+
+#~ msgid "logoff"
+#~ msgstr "uloskirjautuminen"
+
+#~ msgid "close"
+#~ msgstr "sulkeminen"
+
+#~ msgid "Vim: Caught %s event\n"
+#~ msgstr "Vim: Napattiin %s\n"
+
+#~ msgid "Could not fix up function pointers to the DLL!"
+#~ msgstr "Ei voitu korjata funktio-osoittimia DLL:ssä"
+
+#~ msgid "VIM Error"
+#~ msgstr "VIM-virhe"
+
+#~ msgid "Could not load vim32.dll!"
+#~ msgstr "Vim32.dll:ää ei voitu ladata"
+
+#~ msgid "At line"
+#~ msgstr "Rivillä"
+
+#~ msgid "XSMP SmcOpenConnection failed: %s"
+#~ msgstr "XSMP SmcOpenConnection epäonnistui: %s"
+
+#~ msgid "XSMP ICE connection watch failed"
+#~ msgstr "XSMP:n ICE-yhteyden tarkkailu epäonnistui"
+
+#~ msgid "XSMP opening connection"
+#~ msgstr "XSMP avaa yhteyttä"
+
+#~ msgid "XSMP handling save-yourself request"
+#~ msgstr "XSMP käsittelee save-yourself-pyyntöä"
+
+#~ msgid "Opening the X display failed"
+#~ msgstr "X-näytön avaus epäonnistui"
+
+#~ msgid "XSMP lost ICE connection"
+#~ msgstr "XSMP kadotti ICE-yhteyden"
+
+#~ msgid ""
+#~ "\n"
+#~ "Command terminated\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Komento loppui\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Cannot execute shell "
+#~ msgstr ""
+#~ "\n"
+#~ "Kuoren suoritus ei onnistu "
+
+#~ msgid ""
+#~ "\n"
+#~ "Cannot fork\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Ei voi haarauttaa\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Cannot create pipes\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Putkia ei voi tehdä\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Cannot execute shell sh\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Kuoren sh suoritus ei onnistu\n"
+
+# mikä security context?
+#~ msgid "Could not get security context %s for %s. Removing it!"
+#~ msgstr "Ei saatu turvallisuuskontekstia %s kohteelle %s ja se poistetaan"
+
+#~ msgid "Could not set security context %s for %s"
+#~ msgstr "Ei voitu asettaa turvallisuuskontekstia %s kohteelle %s"
+
+#~ msgid "Opening the X display timed out"
+#~ msgstr "X-näytön avaus aikakatkaistiin"
+
+#~ msgid "Testing the X display failed"
+#~ msgstr "X-näytön testaus epäonnistui"
+
+#~ msgid ""
+#~ "\n"
+#~ "Vim: Got X error\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Vim: X-virhe\n"
+
+#~ msgid "Opening the X display took %ld msec"
+#~ msgstr "X-näytön avaus vei %ld millisekuntia"
+
+#~ msgid "E245: Illegal char '%c' in font name \"%s\""
+#~ msgstr "E245: Virheellinen merkki %c fontin nimessä %s"
+
+#~ msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+#~ msgstr "E244: Virheellinen laatunimi %s fontin nimessä %s"
+
+#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
+#~ msgstr "E244: Virheellinen merkistön nimi %s fontin nimessä %s"
+
+#~ msgid "Printing '%s'"
+#~ msgstr "Tulostetaan %s"
+
+#~ msgid "E238: Print error: %s"
+#~ msgstr "E238: Tulostinvirhe: %s"
+
+#~ msgid "E613: Unknown printer font: %s"
+#~ msgstr "E613: Tuntematon tulostimen fontti: %s"
+
+#~ msgid "to %s on %s"
+#~ msgstr "tulostimelle %s kohteessa %s"
+
+#~ msgid "E237: Printer selection failed"
+#~ msgstr "E237: Tulostimen valinta epäonnistui"
+
+#~ msgid "'columns' is not 80, cannot execute external commands"
+#~ msgstr "columns ei ole 80, ei voi suorittaa ulkoista komentoa"
+
+#~ msgid "I/O ERROR"
+#~ msgstr "IO-virhe"
+
+#~ msgid "ANCHOR_BUF_SIZE too small."
+#~ msgstr "ANCHOR_BUF_SIZE liian pieni."
+
+#~ msgid " returned\n"
+#~ msgstr " palautti\n"
+
+#~ msgid "shell "
+#~ msgstr "kuori "
+
+#~ msgid "Cannot execute "
+#~ msgstr "Ei voi suorittaa "
+
+#~ msgid "E360: Cannot execute shell with -f option"
+#~ msgstr "E360: Kuorta ei voi avata asetuksella -f"
+
+#~ msgid "mch_get_shellsize: not a console??\n"
+#~ msgstr "mch_get_shellsize: ei ole konsoli?\n"
+
+#~ msgid "cannot change console mode ?!\n"
+#~ msgstr "ei voi vaihtaa konsolitilaa?\n"
+
+#~ msgid "Vim exiting with %d\n"
+#~ msgstr "Vim sulkeutuu koodilla %d\n"
+
+#~ msgid "Cannot create "
+#~ msgstr "Ei voi luoda "
+
+#~ msgid "Cannot open NIL:\n"
+#~ msgstr "Ei voi avata NILiä:\n"
+
+#~ msgid "Need %s version %ld\n"
+#~ msgstr "Tarvitaan %s versio %ld\n"
+
+#~ msgid "Need Amigados version 2.04 or later\n"
+#~ msgstr "Amigados 2.04 tai uudempi tarvitaan\n"
+
+#~ msgid "VIM: Can't open window!\n"
+#~ msgstr "VIM: Ei voi avata ikkunaa\n"
+
+#~ msgid "cannot open "
+#~ msgstr "ei voi avata "
+
+#~ msgid "E538: No mouse support"
+#~ msgstr "E538: Hiirtä ei tueta"
+
+#~ msgid "E533: can't select wide font"
+#~ msgstr "E533: Leveän fontin valinta ei onnistu"
+
+#~ msgid "E598: Invalid fontset"
+#~ msgstr "E598: Viallinen fontset"
+
+#~ msgid "E597: can't select fontset"
+#~ msgstr "E597: Fontsetin valinta ei onnistu"
+
+#~ msgid "E596: Invalid font(s)"
+#~ msgstr "E596: Viallisia fontteja"
+
+#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+#~ msgstr "E617: Ei voi muuttaa GTK+2-GUIssa"
+
+#~ msgid "E531: Use \":gui\" to start the GUI"
+#~ msgstr "E531: Käytä komentoa :gui GUIn käynnistämiseen"
+
+#~ msgid "E530: Cannot change term in GUI"
+#~ msgstr "E530: Ei voi vaihtaa termiä GUIssa"
+
+#~ msgid "E522: Not found in termcap"
+#~ msgstr "E522: Puuttuu termcapista"
+
+#~ msgid "Thanks for flying Vim"
+#~ msgstr "Kiitos että ajoit Vimiä"
+
+#~ msgid "%<%f%h%m%=Page %N"
+#~ msgstr "%<%f%h%m%=Sivu %N"
+
+#~ msgid ""
+#~ "\n"
+#~ "# Registers:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "# Rekisterit:\n"
+
+#~ msgid "Illegal register name"
+#~ msgstr "Virheellinen rekisterin nimi"
+
+#~ msgid "freeing %ld lines"
+#~ msgstr "vapautetaan %ld riviä"
+
+#~ msgid "cannot yank; delete anyway"
+#~ msgstr "Ei voi kopioida; poista joka tapauksessa"
+
+#~ msgid "E775: Eval feature not available"
+#~ msgstr "E775: Eval ei ole käytettävissä"
+
+#~ msgid "E505: %s is read-only (add ! to override)"
+#~ msgstr "E505: %s on kirjoitussuojattu (lisää komentoon ! ohittaaksesi)"
+
+#~ msgid "E511: netbeans already connected"
+#~ msgstr "E511: netbeans on yhdistetty jo"
+
+#~ msgid "E838: netbeans is not supported with this GUI"
+#~ msgstr "E838: netbeans ei toimi tässä käyttöliittymässä"
+
+#~ msgid "E658: NetBeans connection lost for buffer %ld"
+#~ msgstr "E658: NetBeans-yhteys katkesi puskurille %ld"
+
+#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+#~ msgstr "E668: Väärä avaustila NetBeans-yhteyden infotiedostolle: %s"
+
+#~ msgid "E547: Illegal mouseshape"
+#~ msgstr "E547: Virheellinen hiiren muoto"
+
+#~ msgid "E341: Internal error: lalloc(%ld, )"
+#~ msgstr "E341: Sisäinen virhe: lalloc(%ld, )"
+
+#~ msgid "E340: Line is becoming too long"
+#~ msgstr "E340: Rivistä tulee liian pitkä"
+
+#~ msgid ""
+#~ "[calls] total re/malloc()'s %lu, total free()'s %lu\n"
+#~ "\n"
+#~ msgstr ""
+#~ "[kutsut] yht. re/malloc() %lu, yht. free() %lu\n"
+#~ "\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
+#~ msgstr ""
+#~ "\n"
+#~ "[tavua] yht. alloc-free %lu-%lu, käytössä %lu, käyttöhuippu %lu\n"
+
+#~ msgid "ERROR: "
+#~ msgstr "VIRHE: "
+
+#~ msgid "E338: Sorry, no file browser in console mode"
+#~ msgstr "E338: tiedostonselain puuttuu konsolitilasta"
+
+#~ msgid "Open File dialog"
+#~ msgstr "Avausikkuna"
+
+#~ msgid "Save File dialog"
+#~ msgstr "Tallennusikkuna"
+
+#~ msgid "Select Directory dialog"
+#~ msgstr "Hakemiston valintaikkuna"
+
+#~ msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
+#~ msgstr "Käännöksen ylläpitäjä: Flammie Pirinen <flammie@iki.fi>"
+
+#~ msgid "E337: Menu not found - check menu names"
+#~ msgstr "E337: Valikkoa ei löytynyt - tarkista valikkojen nimet"
+
+#~ msgid "E336: Menu path must lead to a sub-menu"
+#~ msgstr "E336: Valikkopolun pitää johtaa alivalikkoon"
+
+#~ msgid "Tear off this menu"
+#~ msgstr "Repäise valikko irti"
+
+#~ msgid "Swap file already exists!"
+#~ msgstr "Swap-tiedosto on jo olemassa"
+
+#~ msgid ""
+#~ "\n"
+#~ "         [not usable with this version of Vim]"
+#~ msgstr ""
+#~ "\n"
+#~ "         [ei toimi tämän Vim-version kanssa]"
+
+#~ msgid "Using crypt key from swap file for the text file.\n"
+#~ msgstr "Käytetään swäpin salausavainta tekstitiedostolle\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "to use the same key for text file and swap file"
+#~ msgstr ""
+#~ "\n"
+#~ "käyttääksesi samaa avainta teksti- ja swäppitiedostoille"
+
+#~ msgid ""
+#~ "\n"
+#~ "If you wrote the text file after changing the crypt key press enter"
+#~ msgstr ""
+#~ "\n"
+#~ "Jos kirjoitit tekstitiedoston salausavaimen vaihdon jälkeen paina enteriä"
+
+#~ msgid ""
+#~ "\n"
+#~ "enter the new crypt key."
+#~ msgstr ""
+#~ "\n"
+#~ "anna uusi salausavain."
+
+#~ msgid ""
+#~ "\n"
+#~ "If you entered a new crypt key but did not write the text file,"
+#~ msgstr ""
+#~ "\n"
+#~ "Jos käytit uutta salausavainta muttet kirjoittanut tekstitiedostoa,"
+
+#~ msgid "Swap file is encrypted: \"%s\""
+#~ msgstr "Swap-tiedosto on salattu: %s"
+
+#~ msgid ""
+#~ "E833: %s is encrypted and this version of Vim does not support encryption"
+#~ msgstr "E833: %s on salattu eikä tämä Vim tue salausta"
+
+#~ msgid "E843: Error while updating swap file crypt"
+#~ msgstr "E843: Virhe päivitettäessä swapin kryptausta"
+
+#~ msgid "E289: input method doesn't support my preedit type"
+#~ msgstr "E289: syötemetodi ei tue tätä preedit-tyyppiä"
+
+#~ msgid "E288: input method doesn't support any style"
+#~ msgstr "E288: syötemetodi ei tue tyylejä"
+
+#~ msgid "E287: Warning: Could not set destroy callback to IM"
+#~ msgstr ""
+#~ "E287: Varoitus: Ei voitu asettaa destroy-kutsua syötemetodipalvelimelle"
+
+#~ msgid "E286: Failed to open input method"
+#~ msgstr "E286: Syötemetodin avaus ei onnistu"
+
+#~ msgid "E285: Failed to create input context"
+#~ msgstr "E285: Syötekontekstin luonti ei onnistu"
+
+#~ msgid "E284: Cannot set IC values"
+#~ msgstr "E284: Ei voi asettaa IC-arvoja"
+
+#~ msgid "E543: Not a valid codepage"
+#~ msgstr "E543: Koodisivu ei ole käypä"
+
+#~ msgid "Missing '>'"
+#~ msgstr "> puuttuu"
+
+#~ msgid ""
+#~ "\n"
+#~ "# History of marks within files (newest to oldest):\n"
+#~ msgstr ""
+#~ "\n"
+#~ "# Tiedostojen merkkien historia (uusimmasta vanhimpaan):\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "# Jumplist (newest first):\n"
+#~ msgstr ""
+#~ "\n"
+#~ "# Hyppylista (uusin ensiksi):\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "# File marks:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "# Tiedoston merkit:\n"
+
+#~ msgid ": Send expression failed.\n"
+#~ msgstr ": Ilmauksen lähetys epäonnistui.\n"
+
+#~ msgid "No display: Send expression failed.\n"
+#~ msgstr "Ei näyttöä: Ilmauksen lähetys epäonnistui.\n"
+
+#~ msgid "%d of %d edited"
+#~ msgstr "%d/%d muokattu"
+
+#~ msgid ": Send failed. Trying to execute locally\n"
+#~ msgstr ": Lähetys epäonnistui. Yritetään suorittaa paikallisena\n"
+
+#~ msgid ": Send failed.\n"
+#~ msgstr ": Lähetys epäonnistui.\n"
+
+#~ msgid "No display"
+#~ msgstr "Ei näyttöä"
+
+#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
+#~ msgstr "--windowid <HWND>\tAvaa Vim annettuun win32-olioon "
+
+#~ msgid "-P <parent title>\tOpen Vim inside parent application"
+#~ msgstr "-P <otsikko>\tAvaa Vim isäntäohjelman sisään"
+
+#~ msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
+#~ msgstr "--echo-wid\t\tTulosta gvimin Window ID vakiotulosteeseen"
+
+#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+#~ msgstr "--socketid <xid>\tAvaa Vim annettuun GTK-olioon "
+
+# X-ikkunointijärjestelmässä saman sovelluksen saman luokan ikkunat
+# tunnistetaan rooliresursseista
+#~ msgid "--role <role>\tSet a unique role to identify the main window"
+#~ msgstr ""
+#~ "--role <rooli>\tAseta pääikkunalle ainutlaatuinen rooli tunnisteeksi"
+
+#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
+#~ msgstr "-display <näyttö>\tSuorita vim näytöllä <näyttö> (myös: --display)"
+
+#~ msgid ""
+#~ "\n"
+#~ "Arguments recognised by gvim (GTK+ version):\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Gvimin (GTK+-version) tuntemat argumentit:\n"
+
+#~ msgid "-xrm <resource>\tSet the specified resource"
+#~ msgstr "-xrm <resurssi>\tAseta resurssi"
+
+#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
+#~ msgstr "+reverse\t\tÄlä käytä käänteisvärejä (myös: +rv)"
+
+#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
+#~ msgstr "-reverse\t\tKäytä käänteisvärejä (myös: -rv) "
+
+#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
+#~ msgstr "-menuheight <korkeus>\tKäytä <korkeutta> valikossa (myös: -mh)"
+
+#~ msgid ""
+#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
+#~ msgstr ""
+#~ "-scrollbarwidth <leveys>  Käytä <leveyttä> vierityspalkissa (myös: -sw)"
+
+#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
+#~ msgstr "-borderwidt <leveys>\tKäytä <leveyttä> reunuksissa (myös: -bw) "
+
+#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
+#~ msgstr ""
+#~ "-geometry <geom>\tKäytä mittoja <geom> ikkunan asetteluun (myös: -geom)"
+
+#~ msgid "-italicfont <font>\tUse <font> for italic text"
+#~ msgstr "-italicfont <fontti>\tKäytä <fonttia> kursivoidussa tekstissä"
+
+#~ msgid "-boldfont <font>\tUse <font> for bold text"
+#~ msgstr "-boldfont <fontti>\tKäytä <fonttia> lihavoidussa tekstissä"
+
+#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
+#~ msgstr "-font <fontti>\t\tKäytä <fonttia> tekstissä (myös: -fn)"
+
+#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
+#~ msgstr "-foreground <väri>\tKäytä <väriä> tekstin värinä (myös: -fg)"
+
+#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
+#~ msgstr "-background <väri>\tKäytä <väriä> taustavärinä (myös: -bg)"
+
+#~ msgid "-iconic\t\tStart vim iconified"
+#~ msgstr "-iconic\t\tKäynnistä pienennettynä"
+
+#~ msgid "-display <display>\tRun vim on <display>"
+#~ msgstr "-display <näyttö>\tSuorita vim <näytössä>"
+
+#~ msgid ""
+#~ "\n"
+#~ "Arguments recognised by gvim (Athena version):\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Gvimin (Athena-version) tuntemat argumentit:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Arguments recognised by gvim (neXtaw version):\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Gvimin (neXtaw-version) tuntemat argumentit:\n"
+
+#~ msgid ""
+#~ "\n"
+#~ "Arguments recognised by gvim (Motif version):\n"
+#~ msgstr ""
+#~ "\n"
+#~ "Gvimin (Motif-version) tuntemat argumentit:\n"
+
+#~ msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
+#~ msgstr "-i <viminfo>\t\tKäytä <viminfo>-tiedostoa .viminfon sijaan"
+
+#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
+#~ msgstr "--servername <nimi>\tLähetä Vim-palvelimelle <nimi> tai luo se"
+
+#~ msgid "--serverlist\t\tList available Vim server names and exit"
+#~ msgstr "--serverlist\t\tLuettele Vim-palvelinten nimet ja lopeta"
+
+#~ msgid ""
+#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
+#~ msgstr ""
+#~ "--remote-expr <ilmaus>\tKäsittele <ilmaus> Vim-palvelimella ja tulosta "
+#~ "tulos"
+
+#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
+#~ msgstr ""
+#~ "--remote-send <näppäimiä>\tLähetä <näppäimiä> painalluksina Vimille ja "
+#~ "lopeta"
+
+#~ msgid ""
+#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
+#~ "file"
+#~ msgstr ""
+#~ "--remote-tab[-wait][-silent] <tiedostoja>  kuten --remote, mutta avaa "
+#~ "välilehti joka tiedostolle"
+
+#~ msgid ""
+#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
+#~ msgstr ""
+#~ "--remote-wait-silent <tiedostoja>  sama, mutta älä ilmoita puuttuvasta "
+#~ "palvelimesta"
+
+#~ msgid ""
+#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
+#~ msgstr ""
+#~ "--remote-wait <tiedostoja>  kuten --remote, mutta odota tiedostojen "
+#~ "muokkaamista"
+
+#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
+#~ msgstr ""
+#~ "--remote-silent <tiedostoja>\tSama, mutta älä ilmoita puuttuvasta "
+#~ "palvelimesta"
+
+#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+#~ msgstr ""
+#~ "--remote <tiedostoja>\tMuokkaa <tiedostoja> Vim-palvelimessa, jos "
+#~ "mahdollista"
+
+#~ msgid "-X\t\t\tDo not connect to X server"
+#~ msgstr "-X\t\t\tÄlä yhdistä X-palvelimeen"
+
+#~ msgid "-display <display>\tConnect vim to this particular X-server"
+#~ msgstr "-display <näyttö>\tYhdistä vim tiettyyn X-palvelimeen"
+
+#~ msgid "-x\t\t\tEdit encrypted files"
+#~ msgstr "-x\t\t\tMuokkaa salattua tiedostoa"
+
+#~ msgid "+\t\t\tStart at end of file"
+#~ msgstr "+\t\t\tAloita tiedoston lopusta"
+
+#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
+#~ msgstr "-U <gvimrc>\t\tKäytä <gvimrc>-tiedostoa .gvimrc:iden sijasta"
+
+#~ msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
+#~ msgstr "--not-a-term\t\tOhita varoitus siitä että i/o ei ole terminaali"
+
+#~ msgid "-T <terminal>\tSet terminal type to <terminal>"
+#~ msgstr "-T <terminaali>\tAseta terminaalin tyypiksi <terminaali>"
+
+#~ msgid "-F\t\t\tStart in Farsi mode"
+#~ msgstr "-F\t\t\tkäynnistä farsi-tilassa"
+
+#~ msgid "-H\t\t\tStart in Hebrew mode"
+#~ msgstr "-H\t\t\tkäynnistä heprea-tilassa"
+
+#~ msgid "-A\t\t\tstart in Arabic mode"
+#~ msgstr "-A\t\t\tkäynnistä arabia-tilassa"
+
+#~ msgid "-dev <device>\t\tUse <device> for I/O"
+#~ msgstr "-dev <laite>\t\tKäytä <laitetta> IO:hon"
+
+#~ msgid "-f\t\t\tDon't use newcli to open window"
+#~ msgstr "-f\t\t\tÄlä käytä newcli:tä ikkunan avaamiseen"
+
+#~ msgid "-L\t\t\tSame as -r"
+#~ msgstr "-L\t\t\tkuten -r"
+
+#~ msgid "-D\t\t\tDebugging mode"
+#~ msgstr "-D\t\t\tVianetsintätila"
+
+#~ msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
+#~ msgstr "-N\t\t\tEi Vi-yhteensopivuutta: nocompatible"
+
+#~ msgid "-C\t\t\tCompatible with Vi: 'compatible'"
+#~ msgstr "-C\t\t\tVi-yhteensopivuustila: compatible"
+
+#~ msgid "-l\t\t\tLisp mode"
+#~ msgstr "-l\t\t\tLisp-tila"
+
+#~ msgid "-b\t\t\tBinary mode"
+#~ msgstr "-b\t\t\tBinääritila"
+
+#~ msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
+#~ msgstr "-Z\t\t\tRajoitettu tila (kuten rvimillä)"
+
+#~ msgid "-R\t\t\tReadonly mode (like \"view\")"
+#~ msgstr "-R\t\t\tKirjoitussuojattu tila (kuten view'lla)"
+
+#~ msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
+#~ msgstr "-y\t\t\tHelppokäyttötila (kuten evimissä, ilman tiloja)"
+
+#~ msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
+#~ msgstr "-d\t\t\tDiff-tila (kuten vimdiffillä)"
+
+#~ msgid "-E\t\t\tImproved Ex mode"
+#~ msgstr "-E\t\t\tParanneltu Ex-tila"
+
+#~ msgid "-e\t\t\tEx mode (like \"ex\")"
+#~ msgstr "-e\t\t\tEx-tila (kute exillä)"
+
+#~ msgid "-v\t\t\tVi mode (like \"vi\")"
+#~ msgstr "-v\t\t\tVi-tila (kuten villä)"
+
+#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
+#~ msgstr "-f tai --nofork\tEdustalle: Älä haarauta GUIn käynnistyksessä"
+
+#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
+#~ msgstr "-g\t\t\tAvaa GUI (kuten gvimillä)"
+
+#~ msgid "-unregister\t\tUnregister gvim for OLE"
+#~ msgstr "-unregister\t\tPoista gvim OLE-rekisteristä"
+
+#~ msgid "-register\t\tRegister this gvim for OLE"
+#~ msgstr "-register\t\trekisteröi gvim OLEa varten"
+
+#~ msgid ""
+#~ "\n"
+#~ "Where case is ignored prepend / to make flag upper case"
+#~ msgstr ""
+#~ "\n"
+#~ "Jos aakkoslaji on ohitettu, lisää alkuun / tehdäksesi asetuksesta "
+#~ "suuraakkosia"
+
+#~ msgid ""
+#~ "\n"
+#~ "   or:"
+#~ msgstr ""
+#~ "\n"
+#~ "   tai:"
+
+#~ msgid " vim [arguments] "
+#~ msgstr " vim [argumentit] "
+
+#~ msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+#~ msgstr "Vim: Virhe: Tämä versio Vimistä ei toimi Cygwinin terminaalissa\n"
+
+#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+#~ msgstr "Vim: Virhe: Gvimin käynnistys NetBeansistä ei onnistu\n"
+
+#~ msgid "This Vim was not compiled with the diff feature."
+#~ msgstr "Tähän Vimiin ei ole käännetty diff-toimintoja mukaan."
+
+#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
+#~ msgstr "-nb:tä ei voi käyttää, koska sitä ei käännetty mukaan\n"
+
+#~ msgid "netbeans is not supported with this GUI\n"
+#~ msgstr "netbeans ei toimi tässä käyttöliittymässä\n"
+
+#~ msgid "%d files to edit\n"
+#~ msgstr "%d tiedostoa muokattavana\n"
+
+#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
+#~ msgstr "E251: VIMin instanssin rekisteriarvo on virheellinen, poistettiin."
+
+#~ msgid "E573: Invalid server id used: %s"
+#~ msgstr "E573: Virheellinen palvelimen tunniste: %s"
+
+#~ msgid "E248: Failed to send command to the destination program"
+#~ msgstr "E248: Komennon lähetys kohdeohjelmalle ei onnistu"
+
+#~ msgid "Unable to register a command server name"
+#~ msgstr "Komentopalvelimen nimen rekisteröinti ei onnistu"
+
+#~ msgid "cannot get line"
+#~ msgstr "ei voida hakea riviä"
+
+#~ msgid "E572: exit code %d"
+#~ msgstr "E572: palautusarvo %d"
+
+#~ msgid ""
+#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
+#~ "loaded."
+#~ msgstr "E571: komento ei toimi, Tcl-kirjastoa ei voitu ladata."
+
+#~ msgid "cannot register callback command: buffer/window reference not found"
+#~ msgstr ""
+#~ "callbackia ei voi rekisteröidä: puskurin tai ikkunan viitettä ei löydy"
+
+#~ msgid ""
+#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
+#~ "dev@vim.org"
+#~ msgstr ""
+#~ "E280: kriittinen TCL-virhe: reflist hajalla? Ilmoita asiasta "
+#~ "postituslistalle vim-dev@vim.org"
+
+#~ msgid ""
+#~ "cannot register callback command: buffer/window is already being deleted"
+#~ msgstr "callbackia ei voi rekisteröidä: puskuri tai ikkuna on poistettu"
+
+#~ msgid "cannot create buffer/window command: object is being deleted"
+#~ msgstr "ei voi luoda puskuri- tai ikkunakomentoa, olio on poistumassa"
+
+#~ msgid "vim error"
+#~ msgstr "vim-virhe"
+
+#~ msgid "unknown vimOption"
+#~ msgstr "tuntematon vimOption"
+
+#~ msgid "unknown flag: "
+#~ msgstr "tuntematon asetus: "
+
+#~ msgid "cannot insert/append line"
+#~ msgstr "rivin lisäys ei onnistu"
+
+#~ msgid "row %d column %d"
+#~ msgstr "rivi %d sarake %d"
+
+#~ msgid "mark not set"
+#~ msgstr "merkko ei ole asetettu"
+
+#~ msgid "cannot set line(s)"
+#~ msgstr "ei voi asettaa rivejä"
+
+#~ msgid "not implemented yet"
+#~ msgstr "ei toteutettu"
+
+#~ msgid "E273: unknown longjmp status %d"
+#~ msgstr "E273: tuntematon longjmp-tila %d"
+
+#~ msgid "E272: unhandled exception"
+#~ msgstr "E272: käsittelemätön poikkeus"
+
+#~ msgid "E271: retry outside of rescue clause"
+#~ msgstr "E271: retry rescuen ulkopuolella"
+
+#~ msgid "E269: unexpected break"
+#~ msgstr "E269: Odotuksenvastainen break"
+
+#~ msgid "E268: unexpected next"
+#~ msgstr "E268: Odotuksenvastainen next"
+
+#~ msgid "E267: unexpected return"
+#~ msgstr "E267: odotuksenvastainen return"
+
+#~ msgid ""
+#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
+#~ "loaded."
+#~ msgstr "E266: komento ei toimi, Ruby-kirjastoa ei voitu ladata."
+
+#~ msgid "E265: $_ must be an instance of String"
+#~ msgstr "E265: muuttujan $_ pitää olla Stringin instanssi"
+
+#~ msgid "E837: This Vim cannot execute :py3 after using :python"
+#~ msgstr ""
+#~ "E837: Python: Ei voi käyttää komentoja :py ja :py3 samassa istunnossa"
+
+#~ msgid "E659: Cannot invoke Python recursively"
+#~ msgstr "E659: Pythonia ei voi kutsua rekursiivisesti"
+
+#~ msgid ""
+#~ "E887: Sorry, this command is disabled, the Python's site module could not "
+#~ "be loaded."
+#~ msgstr ""
+#~ "E887: Komento ei toimi, Pythonin site-moduulien lataaminen ei onnistunut."
+
+#~ msgid ""
+#~ "E263: Sorry, this command is disabled, the Python library could not be "
+#~ "loaded."
+#~ msgstr "E263: komento ei toimi, Python-kirjaston lataaminen ei onnistunut."
+
+#~ msgid "E836: This Vim cannot execute :python after using :py3"
+#~ msgstr ""
+#~ "E836: Python: Ei voi käyttää komentoja :py ja :py3 samassa istunnossa"
+
+#~ msgid "not allowed in the Vim sandbox"
+#~ msgstr "ei sallittu Vimin hiekkalaatikossa"
+
+#~ msgid "linenr out of range"
+#~ msgstr "rivinumero arvoalueen ulkopuolelta"
+
+#~ msgid "window is invalid"
+#~ msgstr "ikkuna on virheellinen"
+
+#~ msgid "buffer is invalid"
+#~ msgstr "puskuri on virheellinen"
+
+#~ msgid "Vim error"
+#~ msgstr "Vim-virhe"
+
+#~ msgid "Vim error: ~a"
+#~ msgstr "Vim-virhe: ~a"
+
+#~ msgid "couldn't open buffer"
+#~ msgstr "ei voitu avata puskuria"
+
+#~ msgid "unknown option"
+#~ msgstr "tuntematon asetus"
+
+#~ msgid "hidden option"
+#~ msgstr "piilotettu asetus"
+
+#~ msgid "expressions disabled at compile time"
+#~ msgstr "ilmaukset poistettu käytöstä käännösaikana"
+
+#~ msgid "invalid expression"
+#~ msgstr "virheellinen ilmaus"
+
+#~ msgid ""
+#~ "E895: Sorry, this command is disabled, the MzScheme's racket/base module "
+#~ "could not be loaded."
+#~ msgstr ""
+#~ "E895: Komento ei toimi, MzScheme-moduulia racket/base ei voitu ladata."
+
+#~ msgid ""
+#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
+#~ "be loaded."
+#~ msgstr "E815: komento ei toimi, MzScheme-kirjastoa ei voitu ladata."
+
+#~ msgid "Lua library cannot be loaded."
+#~ msgstr "Luan kirjastoa ei voitu ladata."
+
+#~ msgid "E626: cannot get cscope database information"
+#~ msgstr "E626: ei voi hakea cscope-tietokannan tietoja"
+
+#~ msgid "E625: cannot open cscope database: %s"
+#~ msgstr "E625: ei voi avata cscope-tietokantaa: %s"
+
+#~ msgid "E563: stat error"
+#~ msgstr "E563: stat-virhe"
+
+#~ msgid "E256: Hangul automata ERROR"
+#~ msgstr "E256: Hangu-automaattivirhe"
+
+#~ msgid "Size:"
+#~ msgstr "Koko:"
+
+#~ msgid "Style:"
+#~ msgstr "Tyyli:"
+
+#~ msgid "Font:"
+#~ msgstr "Fontti:"
+
+#~ msgid "Encoding:"
+#~ msgstr "Koodaus:"
+
+#~ msgid "Show size in Points"
+#~ msgstr "Näytä koko pisteinä"
+
+#~ msgid "Name:"
+#~ msgstr "Nimi:"
+
+#~ msgid "Vim - Font Selector"
+#~ msgstr "Vim - fonttivalitsin"
+
+#~ msgid "no specific match"
+#~ msgstr "ei tarkkaa täsmäystä"
+
+#~ msgid "&Dismiss"
+#~ msgstr "&Ohita"
+
+#~ msgid "Invalid font specification"
+#~ msgstr "Virheellinen fonttimääritys"
+
+#~ msgid "Font1 width: %ld"
+#~ msgstr "Fontti1:n leveys: %ld"
+
+#~ msgid "Font0 width: %ld"
+#~ msgstr "Fontti0:n leveys: %ld"
+
+#~ msgid "Font%ld width is not twice that of font0"
+#~ msgstr "Fontti%ld:n leveys ei ole kaksi kertaa fontti0:n"
+
+#~ msgid "Font1: %s"
+#~ msgstr "Fontti1: %s"
+
+#~ msgid "Font0: %s"
+#~ msgstr "Fontti0: %s"
+
+#~ msgid "E253: Fontset name: %s"
+#~ msgstr "E253: Fontsetin nimi: %s"
+
+#~ msgid "Font '%s' is not fixed-width"
+#~ msgstr "Fontti %s ei ole tasavälinen"
+
+#~ msgid "E252: Fontset name: %s"
+#~ msgstr "E252: Fontsetin nimi: %s"
+
+#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
+#~ msgstr "E250: Seuraavien merkistöjoukkojen fontit puuttuvat fontsetistä %s:"
+
+#~ msgid ""
+#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
+#~ msgstr ""
+#~ "Vim E458: Ei voi varata värikartan alkiota, värit voivat mennä väärin"
+
+# MDI eli windowsin moni-ikkunasovellus
+#~ msgid "E672: Unable to open window inside MDI application"
+#~ msgstr "E672: Ikkunaa ei voitu avata MDI-sovellukseen"
+
+# OLE on object linking and embedding på windowska
+#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+#~ msgstr "E243: Argumenttia ei tueta: -%s, käytä OLE-versiota"
+
+#~ msgid "Directory\t*.nothing\n"
+#~ msgstr "Hakemisto\t*.nothing\n"
+
+#~ msgid "Not Used"
+#~ msgstr "Ei käytössä"
+
+#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
+#~ msgstr "Etsi ja korvaa (\\\\:llä löytää \\:t)"
+
+#~ msgid "Find string (use '\\\\' to find  a '\\')"
+#~ msgstr "Etsi merkkijonoa (\\\\:llä löytää \\:t)"
+
+#~ msgid "Open tab..."
+#~ msgstr "Avaa välilehti..."
+
+#~ msgid "&Undo"
+#~ msgstr "&Kumoa"
+
+#~ msgid "Replace &All"
+#~ msgstr "Korvaa k&aikki"
+
+#~ msgid "&Replace"
+#~ msgstr "Ko&rvaa"
+
+#~ msgid "Find &Next"
+#~ msgstr "Hae &seuraava"
+
+#~ msgid "Selection"
+#~ msgstr "Valinta"
+
+#~ msgid "&OK"
+#~ msgstr "&Ok"
+
+#~ msgid "Files"
+#~ msgstr "Tiedostot"
+
+#~ msgid "&Help"
+#~ msgstr "O&hje"
+
+#~ msgid "Filter"
+#~ msgstr "Suodatus"
+
+#~ msgid "Directories"
+#~ msgstr "Hakemistot"
+
+#~ msgid "&Cancel"
+#~ msgstr "&Peru"
+
+#~ msgid "&Filter"
+#~ msgstr "&Suodata"
+
+#~ msgid "Vim: Main window unexpectedly destroyed\n"
+#~ msgstr "Vim: Pääikkuna tuhoutui odottamatta\n"
+
+#~ msgid "Open Tab..."
+#~ msgstr "Avaa välilehti..."
+
+#~ msgid "New tab"
+#~ msgstr "Uusi välilehti"
+
+#~ msgid "Close tab"
+#~ msgstr "Sulje välilehti"
+
+#~ msgid "Vim: Received \"die\" request from session manager\n"
+#~ msgstr "Vim: sessiomanageri lähetti die-pyynnön\n"
+
+#~ msgid "_Close"
+#~ msgstr "_Sulje"
+
+#~ msgid "Replace All"
+#~ msgstr "Korvaa kaikki"
+
+#~ msgid "Replace"
+#~ msgstr "Korvaa"
+
+#~ msgid "Find Next"
+#~ msgstr "Etsi seuraava"
+
+#~ msgid "Down"
+#~ msgstr "Alas"
+
+#~ msgid "Up"
+#~ msgstr "Ylös"
+
+#~ msgid "Direction"
+#~ msgstr "Suunta"
+
+#~ msgid "Match case"
+#~ msgstr "Kirjaintaso"
+
+#~ msgid "Match whole word only"
+#~ msgstr "Korvaa kokonaisia sanoja"
+
+#~ msgid "Replace with:"
+#~ msgstr "Korvaa:"
+
+#~ msgid "Find what:"
+#~ msgstr "Etsi:"
+
+#~ msgid "VIM - Search..."
+#~ msgstr "VIM - Etsi..."
+
+#~ msgid "VIM - Search and Replace..."
+#~ msgstr "VIM - Etsi ja korvaa..."
+
+#~ msgid "Input _Methods"
+#~ msgstr "Syöte_menetelmät"
+
+#~ msgid "No"
+#~ msgstr "Ei"
+
+#~ msgid "Yes"
+#~ msgstr "Kyllä"
+
+#~ msgid "_OK"
+#~ msgstr "_OK"
+
+#~ msgid "_Open"
+#~ msgstr "_Avaa"
+
+#~ msgid "_Save"
+#~ msgstr "_Tallenna"
+
+#~ msgid "_Cancel"
+#~ msgstr "_Peru"
+
+#~ msgid "E232: Cannot create BalloonEval with both message and callback"
+#~ msgstr "E232: Ei voi luoda BalloonEvalia viestille ja callbackille"
+
+#~ msgid "Vim dialog"
+#~ msgstr "Vim-ikkuna"
+
+#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+#~ msgstr "Vierityspalkki: Pixmapin geometria ei selviä"
+
+#~ msgid "Cancel"
+#~ msgstr "Peru"
+
+#~ msgid "OK"
+#~ msgstr "OK"
+
+#~ msgid "E615: vim_SelFile: can't get current directory"
+#~ msgstr "E615: vim_SelFile: nykyistä hakemistoa ei saada selville"
+
+#~ msgid "Pathname:"
+#~ msgstr "Polku:"
+
+#~ msgid "E614: vim_SelFile: can't return to current directory"
+#~ msgstr "E614: vim_SelFile: nykyiseen hakemistoon ei voi palata"
+
+#~ msgid "E616: vim_SelFile: can't get font %s"
+#~ msgstr "E616: vim_SelFile: ei saada fonttia %s"
+
+#~ msgid "<cannot open> "
+#~ msgstr "<ei voi avata> "
+
+#~ msgid "No match at cursor, finding next"
+#~ msgstr "Ei täsmäystä kursorin alla, etsitään seuraava"
+
+#~ msgid "E599: Value of 'imactivatekey' is invalid"
+#~ msgstr "E599: imactivatekeyn arvo on virheellinen"
+
+#~ msgid "E231: 'guifontwide' invalid"
+#~ msgstr "E231: guifontwide virheellinen"
+
+#~ msgid "E665: Cannot start GUI, no valid font found"
+#~ msgstr "E665: Ei voi avata GUIta, sopivaa fonttia ei löydy"
+
+#~ msgid "E230: Cannot read from \"%s\""
+#~ msgstr "E230: Ei voi lukea kohteesta %s"
+
+#~ msgid "E229: Cannot start the GUI"
+#~ msgstr "E229: GUIn käynnistys ei onnistu"
+
+#~ msgid "E851: Failed to create a new process for the GUI"
+#~ msgstr "E851: Ei voitu luoda uutta prosessia käyttöliittymälle"
+
+# tietääkseni resurssiforkki on applen tiedostojärjestelmän tunnistejuttujuttu
+#~ msgid "E460: The resource fork would be lost (add ! to override)"
+#~ msgstr "E460: resurssiosa häviäisi (lisää komentoon ! ohittaaksesi)"
+
+#~ msgid "writing to device disabled with 'opendevice' option"
+#~ msgstr "laitteeseen kirjoittaminen pois käytöstä opendevice-asetuksella"
+
+#~ msgid "Partial writes disallowed for NetBeans buffers"
+#~ msgstr "Osittaiset kirjoitukset kielletty NetBeans-puskureissa"
+
+#~ msgid "NetBeans disallows writes of unmodified buffers"
+#~ msgstr "NetBeans ei salli kirjoittaa muokkaamattomiin puskureihin"
+
+#~ msgid "Reading from stdin..."
+#~ msgstr "Luetaan vakiosyötteestä"
+
+#~ msgid "Vim: Reading from stdin...\n"
+#~ msgstr "Vim: Luetaan vakiosyötteestä...\n"
+
+#~ msgid "is a device (disabled with 'opendevice' option)"
+#~ msgstr "on laite (ei käytössä opendevice-asetuksen takia)"
+
+#~ msgid "Debug Line"
+#~ msgstr "Vianetsintärivi"
+
+#~ msgid "Input Line"
+#~ msgstr "Syöterivi"
+
+#~ msgid "Expression"
+#~ msgstr "Ilmaus"
+
+#~ msgid "Search String"
+#~ msgstr "Hakujono"
+
+#~ msgid "Command Line"
+#~ msgstr "Komentorivi"
+
+#~ msgid ""
+#~ "\n"
+#~ "# %s History (newest to oldest):\n"
+#~ msgstr ""
+#~ "\n"
+#~ "# %s Historia (uusimmasta alkaen):\n"
+
+#~ msgid "E196: No digraphs in this version"
+#~ msgstr "E196: Digraafeja ei ole tässä versiossa"
+
+#~ msgid "E195: Cannot open viminfo file for reading"
+#~ msgstr "E195: Viminfoa ei voi avata lukemista varten"
+
+#~ msgid "E809: #< is not available without the +eval feature"
+#~ msgstr "E809: #< ei ole käytössä jollei +eval ole päällä"
+
+#~ msgid "Save Setup"
+#~ msgstr "Tallenna asetukset"
+
+#~ msgid "Save Session"
+#~ msgstr "Tallenna sessio"
+
+#~ msgid "Save View"
+#~ msgstr "Tallenna näkymä"
+
+#~ msgid "Save Redirection"
+#~ msgstr "Tallenna uudelleenosoitus"
+
+#~ msgid "E930: Cannot use :redir inside execute()"
+#~ msgstr "E930: Komentoa :redir ei voi käyttää funktion execute() sisällä"
+
+#~ msgid "E466: :winpos requires two number arguments"
+#~ msgstr "E466: :winpos vaatii kaksi lukuargumenttia"
+
+#~ msgid "E188: Obtaining window position not implemented for this platform"
+#~ msgstr "E188: Ikkunan sijainnin selvitys ei toimi tällä alustalla"
+
+#~ msgid "Window position: X %d, Y %d"
+#~ msgstr "Ikkunan sijainti: X %d, Y %d"
+
+#~ msgid ""
+#~ "E747: Cannot change directory, buffer is modified (add ! to override)"
+#~ msgstr ""
+#~ "E747: Hakemistoa ei voida muuttaa, puskuria on muokattu (lisää "
+#~ "komentoon ! ohittaaksesi"
+
+#~ msgid "Append File"
+#~ msgstr "Lisää tiedostoon"
+
+#~ msgid "Edit File in new window"
+#~ msgstr "Muokkaa uudessa ikkunassa"
+
+#~ msgid "unknown"
+#~ msgstr "tuntematon"
+
+#~ msgid "E172: Only one file name allowed"
+#~ msgstr "E172: Vain yksi tiedostonimi sallitaan"
+
+#~ msgid "Source Vim script"
+#~ msgstr "Lataa vim-skripti"
+
+#~ msgid " (NOT FOUND)"
+#~ msgstr " (EI LÖYTYNYT)"
+
+#~ msgid ""
+#~ "\n"
+#~ "# Last Substitute String:\n"
+#~ "$"
+#~ msgstr ""
+#~ "\n"
+#~ "# Viimeisin korvausmerkkijono:\n"
+#~ "$"
+
+#~ msgid "Edit File"
+#~ msgstr "Muokkaa tiedostoa"
+
+#~ msgid "Save As"
+#~ msgstr "Tallenna nimellä"
+
+#~ msgid ""
+#~ "\n"
+#~ "# Bar lines, copied verbatim:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "# Bar-rivit, kopiotu sellaisenaan:\n"
+
+#~ msgid "Illegal starting char"
+#~ msgstr "Virheellinen aloitusmerkki"
+
+#~ msgid "# Value of 'encoding' when this file was written\n"
+#~ msgstr "# encoding-muuttujan arvo tiedostoa kirjoitettaessa\n"
+
+#~ msgid ""
+#~ "# You may edit it if you're careful!\n"
+#~ "\n"
+#~ msgstr ""
+#~ "# Muokkaa varovasti!\n"
+#~ "\n"
+
+#~ msgid "# This viminfo file was generated by Vim %s.\n"
+#~ msgstr "# Vimin %s generoima viminfo-tiedosto.\n"
+
+#~ msgid "E138: Can't write viminfo file %s!"
+#~ msgstr "E138: Viminfo-tiedoston kirjoittaminen ei onnistu %s"
+
+#~ msgid "E929: Too many viminfo temp files, like %s!"
+#~ msgstr "E929: liikaa viminfo-väliaikaistiedostoja, kuten %s."
+
+#~ msgid "E136: viminfo: Too many errors, skipping rest of file"
+#~ msgstr "E136: viminfo: liikaa virheitä, ohitetaan lopputiedosto"
+
+#~ msgid "%sviminfo: %s in line: "
+#~ msgstr "%sviminfo: %s rivillä: "
+
+#~ msgid "E258: Unable to send to client"
+#~ msgstr "E258: Asiakkaalle lähetys ei onnistunut"
+
+#~ msgid "E277: Unable to read a server reply"
+#~ msgstr "E277: Palvelimen vastauksen lukeminen ei onnistunut"
+
+#~ msgid "E240: No connection to Vim server"
+#~ msgstr "E240: Ei yhteyttä vim-palvelimeen"
+
+#~ msgid ""
+#~ "&OK\n"
+#~ "&Cancel"
+#~ msgstr ""
+#~ "&OK\n"
+#~ "&Peru"
+
+#~ msgid ""
+#~ "\n"
+#~ "# global variables:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "# globaalit muuttujat:\n"
+
+#~ msgid "E729: using Funcref as a String"
+#~ msgstr "E729: Funcref ei käy merkkijonosta"
+
+#~ msgid "E914: Using a Channel as a Float"
+#~ msgstr "E914: Käytettiin Channelia Floattina"
+
+#~ msgid "E911: Using a Job as a Float"
+#~ msgstr "E911: Job ei käy Floatista"
+
+#~ msgid "E913: Using a Channel as a Number"
+#~ msgstr "E913: Channel ei käy Numberista"
+
+#~ msgid "E910: Using a Job as a Number"
+#~ msgstr "E910: Job ei käy Numberista"
+
+#~ msgid "E703: Using a Funcref as a Number"
+#~ msgstr "E703: Funcref ei käy Numberista"
+
+#~ msgid "E724: variable nested too deep for displaying"
+#~ msgstr "E724: muuttuja on upotettu liian syvälle näytettäväksi"
+
+#~ msgid "Patch file"
+#~ msgstr "Patch-tiedosto"
+
+#~ msgid "[crypted]"
+#~ msgstr "[salattu]"
+
+#~ msgid "Keys don't match!"
+#~ msgstr "Avaimet eivät täsmää!"
+
+#~ msgid "Enter same key again: "
+#~ msgstr "Anna sama avain uudestaan: "
+
+#~ msgid "Enter encryption key: "
+#~ msgstr "Anna salausavain: "
+
+#~ msgid "Warning: Using a weak encryption method; see :help 'cm'"
+#~ msgstr "Varoitus: Käytetään heikkoa salausmenetelmää, ks. :help 'cm'"
+
+#~ msgid "E821: File is encrypted with unknown method"
+#~ msgstr "E821: Tiedoston salaus on tuntematon"
+
+#~ msgid "E918: buffer must be loaded: %s"
+#~ msgstr "E918: puskuria ei voi ladata: %s"
+
+#~ msgid "E915: in_io buffer requires in_buf or in_name to be set"
+#~ msgstr "E915: in_io-puskurilla pitää olla in_buf tai in_name asetettu"
+
+#~ msgid "E920: _io file requires _name to be set"
+#~ msgstr "E920: _io-tiedostolla pitää olla _name asetettu"
+
+#~ msgid "E906: not an open channel"
+#~ msgstr "E906: ei ole avoin kanava"
+
+#~ msgid ""
+#~ "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+#~ msgstr ""
+#~ "E912: ei voida käyttää funktioita ch_evalexpr(), ch_sendexpr() raa'an tai "
+#~ "nl-kanavan kanssa"
+
+#~ msgid "E917: Cannot use a callback with %s()"
+#~ msgstr "E917: Ei voitu käyttää callbackia %s()"
+
+#~ msgid ""
+#~ "\n"
+#~ "# Buffer list:\n"
+#~ msgstr ""
+#~ "\n"
+#~ "# Puskuriluettelo:\n"
+
+#~ msgid "E931: Buffer cannot be registered"
+#~ msgstr "E931: Puskuria ei voi rekisteröidä"
+
+#~ msgid "E819: Blowfish test failed"
+#~ msgstr "E819: Blowfish-testi epäonnistui"
+
+#~ msgid "E818: sha256 test failed"
+#~ msgstr "E818: sha256-testi epäonnistui failed"
+
+#~ msgid "E817: Blowfish big/little endian use wrong"
+#~ msgstr "E817: Blowfishin tavujärjestys väärä"
+
+#~ msgid "E820: sizeof(uint32_t) != 4"
+#~ msgstr "E820: sizeof(uint32_t) != 4"
+
+#~ msgid "E831: bf_key_init() called with empty password"
+#~ msgstr "E831: bf_key_init() tyhjällä salasanalla"

From b25fa94eb5234e3c5ae1f7b3c0888aac644ae923 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 19 Apr 2017 21:26:01 +0200
Subject: [PATCH 124/257] scripts/vim-patch.sh: word-boundaries in preprocess
 regex

---
 scripts/vim-patch.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index c8ae36cc3b..3ade90a65b 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -137,18 +137,18 @@ preprocess_patch() {
 
   # Remove channel.txt, netbeans.txt, os_*.txt, todo.txt, version*.txt, tags
   local na_doc='channel\.txt\|netbeans\.txt\|os_\w\+\.txt\|todo\.txt\|version\d\.txt\|tags'
-  2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/runtime/doc/\%('${na_doc}'\)@norm! d/\v(^diff)|%$
' +w +q "$file"
+  2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/runtime/doc/\<\%('${na_doc}'\)\>@norm! d/\v(^diff)|%$
' +w +q "$file"
 
   # Remove "Last change ..." changes in doc files.
   2>/dev/null $nvim --cmd 'set dir=/tmp' +'%s/^@@.*\n.*For Vim version.*Last change.*\n.*For Vim version.*Last change.*//' +w +q "$file"
 
   # Remove some testdir/Make_*.mak files
   local na_src_testdir='Make_amiga.mak\|Make_dos.mak\|Make_ming.mak\|Make_vms.mms'
-  2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/testdir/\%('${na_src_testdir}'\)@norm! d/\v(^diff)|%$
' +w +q "$file"
+  2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/testdir/\<\%('${na_src_testdir}'\)\>@norm! d/\v(^diff)|%$
' +w +q "$file"
 
   # Remove some *.po files. #5622
   local na_po='sjiscorr.c\|ja.sjis.po\|ko.po\|pl.cp1250.po\|pl.po\|ru.cp1251.po\|uk.cp1251.po\|zh_CN.cp936.po\|zh_CN.po\|zh_TW.po'
-  2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/po/\%('${na_po}'\)@norm! d/\v(^diff)|%$
' +w +q "$file"
+  2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/po/\<\%('${na_po}'\)\>@norm! d/\v(^diff)|%$
' +w +q "$file"
 
   # Rename src/ paths to src/nvim/
   LC_ALL=C sed -e 's/\( [ab]\/src\)/\1\/nvim/g' \

From c5d7eaf66468d5f71049a602e820c19d8ad8c772 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 15 Apr 2017 13:21:38 -0400
Subject: [PATCH 125/257] vim-patch:7.4.2152

Problem:    No proper translation of messages with a count.
Solution:   Use ngettext(). (Sergey Alyoshin)

https://github.com/vim/vim/commit/ee695f787ade7fd88fc5f5497553d95c0c3645b5
---
 src/nvim/eval.c    |  7 +++----
 src/nvim/fold.c    | 18 ++++++++++--------
 src/nvim/screen.c  |  2 +-
 src/nvim/version.c |  2 +-
 src/nvim/vim.h     |  2 ++
 5 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index dcbd7ab152..60c4e725b7 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -8663,7 +8663,6 @@ static void f_foldtext(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   char_u      *r;
   int         len;
   char        *txt;
-  long        count;
 
   rettv->v_type = VAR_STRING;
   rettv->vval.v_string = NULL;
@@ -8691,8 +8690,8 @@ static void f_foldtext(typval_T *argvars, typval_T *rettv, FunPtr fptr)
           s = skipwhite(s + 1);
       }
     }
-    count = (long)(foldend - foldstart + 1);
-    txt = _("+-%s%3ld lines: ");
+    unsigned long count = (unsigned long)(foldend - foldstart + 1);
+    txt = ngettext("+-%s%3ld line: ", "+-%s%3ld lines: ", count);
     r = xmalloc(STRLEN(txt)
                 + STRLEN(dashes) // for %s
                 + 20             // for %3ld
@@ -8712,7 +8711,7 @@ static void f_foldtext(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 static void f_foldtextresult(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
   char_u      *text;
-  char_u buf[51];
+  char_u buf[FOLD_TEXT_LEN];
   foldinfo_T foldinfo;
   int fold_count;
 
diff --git a/src/nvim/fold.c b/src/nvim/fold.c
index 34db4d2171..ff3f46cb78 100644
--- a/src/nvim/fold.c
+++ b/src/nvim/fold.c
@@ -1689,12 +1689,10 @@ static void foldDelMarker(linenr_T lnum, char_u *marker, size_t markerlen)
   }
 }
 
-/* get_foldtext() {{{2 */
-/*
- * Return the text for a closed fold at line "lnum", with last line "lnume".
- * When 'foldtext' isn't set puts the result in "buf[51]".  Otherwise the
- * result is in allocated memory.
- */
+// get_foldtext() {{{2
+/// Return the text for a closed fold at line "lnum", with last line "lnume".
+/// When 'foldtext' isn't set puts the result in "buf[FOLD_TEXT_LEN]".
+/// Otherwise the result is in allocated memory.
 char_u *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume,
                      foldinfo_T *foldinfo, char_u *buf)
   FUNC_ATTR_NONNULL_ARG(1)
@@ -1781,8 +1779,12 @@ char_u *get_foldtext(win_T *wp, linenr_T lnum, linenr_T lnume,
     }
   }
   if (text == NULL) {
-    sprintf((char *)buf, _("+--%3ld lines folded "),
-        (long)(lnume - lnum + 1));
+    unsigned long count = (unsigned long)(lnume - lnum + 1);
+
+    vim_snprintf((char *)buf, FOLD_TEXT_LEN,
+                 ngettext("+--%3ld line folded",
+                          "+--%3ld lines folded ", count),
+                 count);
     text = buf;
   }
   return text;
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index a8993be4e5..f34dbf5d64 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -1684,7 +1684,7 @@ static int compute_foldcolumn(win_T *wp, int col)
  */
 static void fold_line(win_T *wp, long fold_count, foldinfo_T *foldinfo, linenr_T lnum, int row)
 {
-  char_u buf[51];
+  char_u buf[FOLD_TEXT_LEN];
   pos_T       *top, *bot;
   linenr_T lnume = lnum + fold_count - 1;
   int len;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 9a5d7ce169..cd904da573 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -289,7 +289,7 @@ static const int included_patches[] = {
   // 2155 NA
   // 2154 NA
   // 2153 NA
-  // 2152,
+  2152,
   2151,
   // 2150 NA
   2149,
diff --git a/src/nvim/vim.h b/src/nvim/vim.h
index 172e62b039..f29ccdd296 100644
--- a/src/nvim/vim.h
+++ b/src/nvim/vim.h
@@ -204,6 +204,8 @@ enum {
 
 #define DIALOG_MSG_SIZE 1000    /* buffer size for dialog_msg() */
 
+enum { FOLD_TEXT_LEN = 51 };  //!< buffer size for get_foldtext()
+
 /*
  * Maximum length of key sequence to be mapped.
  * Must be able to hold an Amiga resize report.

From cb02137dfac7357650a2e9cc32acb66326e59058 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 15 Apr 2017 13:54:40 -0400
Subject: [PATCH 127/257] vim-patch:7.4.2209

Problem:    Cannot map <M-">. (Stephen Riehm)
Solution:   Solve the memory access problem in another way. (Dominique Pelle)
            Allow for using <M-\"> in a string.

https://github.com/vim/vim/commit/35a4cfa200917dd171b1fff3cd5b6cee9add673d
---
 src/nvim/eval.c                   |  2 +-
 src/nvim/keymap.c                 | 40 ++++++++++++++++++-------------
 src/nvim/option.c                 |  2 +-
 src/nvim/os/input.c               |  3 ++-
 src/nvim/testdir/test_mapping.vim |  8 +++++++
 src/nvim/version.c                |  2 +-
 6 files changed, 37 insertions(+), 20 deletions(-)

diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 60c4e725b7..9f56d8db0c 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -4764,7 +4764,7 @@ static int get_string_tv(char_u **arg, typval_T *rettv, int evaluate)
 
       // Special key, e.g.: "\<C-W>"
       case '<':
-        extra = trans_special((const char_u **) &p, STRLEN(p), name, true);
+        extra = trans_special((const char_u **)&p, STRLEN(p), name, true, true);
         if (extra != 0) {
           name += extra;
           break;
diff --git a/src/nvim/keymap.c b/src/nvim/keymap.c
index 72b0d0aa40..9838b63a6b 100644
--- a/src/nvim/keymap.c
+++ b/src/nvim/keymap.c
@@ -490,17 +490,19 @@ char_u *get_special_key_name(int c, int modifiers)
 /// @param[out]  dst  Location where translation result will be kept. Must have
 ///                   at least six bytes.
 /// @param[in]  keycode  Prefer key code, e.g. K_DEL in place of DEL.
+/// @param[in]  in_string  Inside a double quoted string
 ///
 /// @return Number of characters added to dst, zero for no match.
 unsigned int trans_special(const char_u **srcp, const size_t src_len,
-                           char_u *const dst, const bool keycode)
+                           char_u *const dst, const bool keycode,
+                           const bool in_string)
   FUNC_ATTR_NONNULL_ALL FUNC_ATTR_WARN_UNUSED_RESULT
 {
   int modifiers = 0;
   int key;
   unsigned int dlen = 0;
 
-  key = find_special_key(srcp, src_len, &modifiers, keycode, false);
+  key = find_special_key(srcp, src_len, &modifiers, keycode, false, in_string);
   if (key == 0) {
     return 0;
   }
@@ -536,10 +538,12 @@ unsigned int trans_special(const char_u **srcp, const size_t src_len,
 /// @param[out]  modp  Location where information about modifiers is saved.
 /// @param[in]  keycode  Prefer key code, e.g. K_DEL in place of DEL.
 /// @param[in]  keep_x_key  Don’t translate xHome to Home key.
+/// @param[in]  in_string  In string, double quote is escaped
 ///
 /// @return Key and modifiers or 0 if there is no match.
 int find_special_key(const char_u **srcp, const size_t src_len, int *const modp,
-                     const bool keycode, const bool keep_x_key)
+                     const bool keycode, const bool keep_x_key,
+                     const bool in_string)
   FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_NONNULL_ALL
 {
   const char_u *last_dash;
@@ -573,10 +577,14 @@ int find_special_key(const char_u **srcp, const size_t src_len, int *const modp,
         } else {
           l = 1;
         }
-        if (end - bp > l && bp[l] != '"' && bp[l + 1] == '>') {
-          // Anything accepted, like <C-?>, except <C-">, because the "
-          // ends the string.
+        // Anything accepted, like <C-?>.
+        // <C-"> or <M-"> are not special in strings as " is
+        // the string delimiter. With a backslash it works: <M-\">
+        if (end - bp > l && !(in_string && bp[1] == '"') && bp[2] == '>') {
           bp += l;
+        } else if (end - bp > 2 && in_string && bp[1] == '\\'
+                   && bp[2] == '"' && bp[3] == '>') {
+          bp += 2;
         }
       }
     }
@@ -612,18 +620,17 @@ int find_special_key(const char_u **srcp, const size_t src_len, int *const modp,
         vim_str2nr(last_dash + 6, NULL, NULL, STR2NR_ALL, NULL, &n, 0);
         key = (int)n;
       } else {
-        /*
-         * Modifier with single letter, or special key name.
-         */
-        if (has_mbyte) {
-          l = mb_ptr2len(last_dash + 1);
-        } else {
-          l = 1;
+        int off = 1;
+
+        // Modifier with single letter, or special key name.
+        if (in_string && last_dash[1] == '\\' && last_dash[2] == '"') {
+          off = 2;
         }
+        l = mb_ptr2len(last_dash + 1);
         if (modifiers != 0 && last_dash[l + 1] == '>') {
-          key = PTR2CHAR(last_dash + 1);
+          key = PTR2CHAR(last_dash + off);
         } else {
-          key = get_special_key_code(last_dash + 1);
+          key = get_special_key_code(last_dash + off);
           if (!keep_x_key) {
             key = handle_x_keys(key);
           }
@@ -828,7 +835,8 @@ char_u *replace_termcodes(const char_u *from, const size_t from_len,
         }
       }
 
-      slen = trans_special(&src, (size_t) (end - src) + 1, result + dlen, true);
+      slen = trans_special(&src, (size_t)(end - src) + 1, result + dlen, true,
+                           true);
       if (slen) {
         dlen += slen;
         continue;
diff --git a/src/nvim/option.c b/src/nvim/option.c
index 0070a0056d..8748406ba4 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -4818,7 +4818,7 @@ int find_key_option_len(const char_u *arg, size_t len)
   } else {
     arg--;  // put arg at the '<'
     modifiers = 0;
-    key = find_special_key(&arg, len + 1, &modifiers, true, true);
+    key = find_special_key(&arg, len + 1, &modifiers, true, true, false);
     if (modifiers) {  // can't handle modifiers here
       key = 0;
     }
diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c
index 5f0f2ec677..1fa1f52806 100644
--- a/src/nvim/os/input.c
+++ b/src/nvim/os/input.c
@@ -182,7 +182,8 @@ size_t input_enqueue(String keys)
   while (rbuffer_space(input_buffer) >= 6 && ptr < end) {
     uint8_t buf[6] = { 0 };
     unsigned int new_size
-        = trans_special((const uint8_t **)&ptr, (size_t)(end - ptr), buf, true);
+        = trans_special((const uint8_t **)&ptr, (size_t)(end - ptr), buf, true,
+                        true);
 
     if (new_size) {
       new_size = handle_mouse_event(&ptr, buf, new_size);
diff --git a/src/nvim/testdir/test_mapping.vim b/src/nvim/testdir/test_mapping.vim
index 6b313ff54f..7f93ddd56e 100644
--- a/src/nvim/testdir/test_mapping.vim
+++ b/src/nvim/testdir/test_mapping.vim
@@ -150,3 +150,11 @@ func Test_break_undo()
   call assert_equal('new line here', getline(line('$') - 1))
   set nomodified
 endfunc
+
+func Test_map_meta_quotes()
+  imap <M-"> foo
+  call feedkeys("Go-\<M-\">-\<Esc>", "xt")
+  call assert_equal("-foo-", getline('$'))
+  set nomodified
+  iunmap <M-">
+endfunc
diff --git a/src/nvim/version.c b/src/nvim/version.c
index cd904da573..f7a78a15f9 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -232,7 +232,7 @@ static const int included_patches[] = {
   2212,
   // 2211 NA
   // 2210 NA
-  // 2209,
+  2209,
   2208,
   // 2207 NA
   // 2206 NA

From a6f50c1120f4427d1b4f531ac564d83b770fd62f Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 19 Apr 2017 23:22:27 -0400
Subject: [PATCH 128/257] version.c: Mark 7.4.{2165,2173,2179} applied

---
 src/nvim/version.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/nvim/version.c b/src/nvim/version.c
index f7a78a15f9..4edfe88e18 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -262,13 +262,13 @@ static const int included_patches[] = {
   // 2182 NA
   // 2181 NA
   2180,
-  // 2179,
+  2179,
   2178,
   2177,
   // 2176 NA
   2175,
   2174,
-  // 2173,
+  2173,
   2172,
   // 2171 NA
   2170,
@@ -276,7 +276,7 @@ static const int included_patches[] = {
   // 2168 NA
   // 2167 NA
   // 2166 NA
-  // 2165,
+  2165,
   2164,
   2163,
   2162,

From 17052946c744abd53d8f3349f453964ffa818bea Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 20 Apr 2017 12:32:14 +0200
Subject: [PATCH 129/257] 'scrollback': Allow :setlocal -1 on normal buffers

Avoids a spurious :loadview error.
---
 src/nvim/option.c                            | 2 +-
 test/functional/terminal/scrollback_spec.lua | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/nvim/option.c b/src/nvim/option.c
index 8748406ba4..ae038389b4 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -4223,7 +4223,7 @@ static char *set_num_option(int opt_idx, char_u *varp, long value,
   } else if (pp == &curbuf->b_p_scbk || pp == &p_scbk) {
     // 'scrollback'
     if (*pp < -1 || *pp > SB_MAX
-        || (opt_flags == OPT_LOCAL && !curbuf->terminal)) {
+        || (*pp != -1 && opt_flags == OPT_LOCAL && !curbuf->terminal)) {
       errmsg = e_invarg;
       *pp = old_value;
     } else if (curbuf->terminal) {
diff --git a/test/functional/terminal/scrollback_spec.lua b/test/functional/terminal/scrollback_spec.lua
index 32f25d4086..05f81295c2 100644
--- a/test/functional/terminal/scrollback_spec.lua
+++ b/test/functional/terminal/scrollback_spec.lua
@@ -451,6 +451,13 @@ describe("'scrollback' option", function()
 
   it(':setlocal in a normal buffer is an error', function()
     command('new')
+
+    -- :setlocal to -1 is NOT an error.
+    feed_command('setlocal scrollback=-1')
+    eq(nil, string.match(eval("v:errmsg"), "E%d*:"))
+    feed('<CR>')
+
+    -- :setlocal to anything except -1 is an error.
     feed_command('setlocal scrollback=42')
     feed('<CR>')
     eq('E474:', string.match(eval("v:errmsg"), "E%d*:"))

From d55fd9588f621719e3e8c66f69290a00e1fadc1b Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 20 Apr 2017 13:01:11 +0200
Subject: [PATCH 130/257] doc: Recommend `:silent!` for :loadview.

ex_loadview() was changed in 9b1c9393709a to check the file open result.

If user doesn't care about failure to open, using :silent! instead of
:silent is a reasonable, conventional approach.

Closes #3196
---
 runtime/doc/starting.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 2d1dd22222..14e8c5d76f 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -922,7 +922,7 @@ You might want to clean up your 'viewdir' directory now and then.
 
 To automatically save and restore views for *.c files: >
 	au BufWinLeave *.c mkview
-	au BufWinEnter *.c silent loadview
+	au BufWinEnter *.c silent! loadview
 
 ==============================================================================
 8. The ShaDa file				*shada* *shada-file*

From 19646a2985e54dfc561a90a70054522afc052a45 Mon Sep 17 00:00:00 2001
From: TJ DeVries <timothydvrs1234@gmail.com>
Date: Wed, 12 Apr 2017 07:37:19 -0700
Subject: [PATCH 131/257] health.vim: 'guicursor' advice #6506

Also:
- Mark provider sections as "(optional)".
- Fix help-link substitution to support single-quoted tags.
---
 runtime/autoload/health.vim          |  2 +-
 runtime/autoload/health/nvim.vim     | 20 ++++++++++++++++----
 runtime/autoload/health/provider.vim |  6 +++---
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/runtime/autoload/health.vim b/runtime/autoload/health.vim
index 05c024f585..8f45adcff1 100644
--- a/runtime/autoload/health.vim
+++ b/runtime/autoload/health.vim
@@ -88,7 +88,7 @@ endfunction
 
 " Changes ':h clipboard' to ':help |clipboard|'.
 function! s:help_to_link(s) abort
-  return substitute(a:s, '\v:h%[elp] ([^|][^''"\r\n]+)', ':help |\1|', 'g')
+  return substitute(a:s, '\v:h%[elp] ([^|][^"\r\n]+)', ':help |\1|', 'g')
 endfunction
 
 " Format a message for a specific report item
diff --git a/runtime/autoload/health/nvim.vim b/runtime/autoload/health/nvim.vim
index ca62de84d8..4c6aa0eb04 100644
--- a/runtime/autoload/health/nvim.vim
+++ b/runtime/autoload/health/nvim.vim
@@ -1,16 +1,28 @@
-let s:suggest_faq = 'See https://github.com/neovim/neovim/wiki/FAQ'
+let s:suggest_faq = 'https://github.com/neovim/neovim/wiki/FAQ'
 
 function! s:check_config() abort
+  let ok = v:true
   call health#report_start('Configuration')
-  if !get(g:, 'loaded_sensible', 0)
-    call health#report_ok('no issues found')
-  else
+
+  if get(g:, 'loaded_sensible', 0)
+    let ok = v:false
     let sensible_pi = globpath(&runtimepath, '**/sensible.vim', 1, 1)
     call health#report_info("found sensible.vim plugin:\n".join(sensible_pi, "\n"))
     call health#report_error("sensible.vim plugin is not needed; Nvim has the same defaults built-in."
       \ ." Also, sensible.vim sets 'ttimeoutlen' to a sub-optimal value.",
       \ ["Remove sensible.vim plugin, or wrap it in a `if !has('nvim')` check."])
   endif
+
+  if exists('$NVIM_TUI_ENABLE_CURSOR_SHAPE')
+    let ok = v:false
+    call health#report_warn("$NVIM_TUI_ENABLE_CURSOR_SHAPE is ignored in Nvim 0.2+",
+          \ [ "Use the 'guicursor' option to configure cursor shape. :help 'guicursor'",
+          \   'https://github.com/neovim/neovim/wiki/Following-HEAD#20170402' ])
+  endif
+
+  if ok
+    call health#report_ok('no issues found')
+  endif
 endfunction
 
 " Load the remote plugin manifest file and check for unregistered plugins
diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim
index 9db209849b..2506c8216b 100644
--- a/runtime/autoload/health/provider.vim
+++ b/runtime/autoload/health/provider.vim
@@ -111,7 +111,7 @@ endfunction
 
 " Check for clipboard tools.
 function! s:check_clipboard() abort
-  call health#report_start('Clipboard')
+  call health#report_start('Clipboard (optional)')
 
   let clipboard_tool = provider#clipboard#Executable()
   if empty(clipboard_tool)
@@ -224,7 +224,7 @@ function! s:check_bin(bin) abort
 endfunction
 
 function! s:check_python(version) abort
-  call health#report_start('Python ' . a:version . ' provider')
+  call health#report_start('Python ' . a:version . ' provider (optional)')
 
   let pyname = 'python'.(a:version == 2 ? '' : '3')
   let pyenv = resolve(exepath('pyenv'))
@@ -419,7 +419,7 @@ function! s:check_python(version) abort
 endfunction
 
 function! s:check_ruby() abort
-  call health#report_start('Ruby provider')
+  call health#report_start('Ruby provider (optional)')
 
   let loaded_var = 'g:loaded_ruby_provider'
   if exists(loaded_var) && !exists('*provider#ruby#Call')

From 9cdbbd49825561d642705990a2704b2241cf0584 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Linse?= <bjorn.linse@gmail.com>
Date: Mon, 17 Apr 2017 11:32:14 +0200
Subject: [PATCH 132/257] ui: support more cursor shape modes

throttle unneccessary cursor shape events
---
 src/nvim/api/ui.c       | 23 +++++++---------
 src/nvim/cursor_shape.c | 35 +++++++++++++++++++++++-
 src/nvim/cursor_shape.h |  3 ++-
 src/nvim/ex_getln.c     | 16 +++++++++++
 src/nvim/mouse.c        |  1 +
 src/nvim/tui/tui.c      | 60 +++++++++++------------------------------
 src/nvim/ui.c           | 31 ++++++++-------------
 src/nvim/ui.h           |  2 +-
 src/nvim/ui_bridge.c    |  4 +--
 9 files changed, 93 insertions(+), 82 deletions(-)

diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c
index de60339e5f..0053050717 100644
--- a/src/nvim/api/ui.c
+++ b/src/nvim/api/ui.c
@@ -266,19 +266,14 @@ static void remote_ui_mouse_off(UI *ui)
   push_call(ui, "mouse_off", args);
 }
 
-static void remote_ui_mode_change(UI *ui, int mode)
+static void remote_ui_mode_change(UI *ui, int mode_idx)
 {
   Array args = ARRAY_DICT_INIT;
-  if (mode == INSERT) {
-    ADD(args, STRING_OBJ(cstr_to_string("insert")));
-  } else if (mode == REPLACE) {
-    ADD(args, STRING_OBJ(cstr_to_string("replace")));
-  } else if (mode == CMDLINE) {
-    ADD(args, STRING_OBJ(cstr_to_string("cmdline")));
-  } else {
-    assert(mode == NORMAL);
-    ADD(args, STRING_OBJ(cstr_to_string("normal")));
-  }
+
+  char *full_name = shape_table[mode_idx].full_name;
+  ADD(args, STRING_OBJ(cstr_to_string(full_name)));
+
+  ADD(args, INTEGER_OBJ(mode_idx));
   push_call(ui, "mode_change", args);
 }
 
@@ -393,8 +388,10 @@ static void remote_ui_update_sp(UI *ui, int sp)
 static void remote_ui_flush(UI *ui)
 {
   UIData *data = ui->data;
-  channel_send_event(data->channel_id, "redraw", data->buffer);
-  data->buffer = (Array)ARRAY_DICT_INIT;
+  if (data->buffer.size > 0) {
+    channel_send_event(data->channel_id, "redraw", data->buffer);
+    data->buffer = (Array)ARRAY_DICT_INIT;
+  }
 }
 
 static void remote_ui_suspend(UI *ui)
diff --git a/src/nvim/cursor_shape.c b/src/nvim/cursor_shape.c
index 34ee53bf75..57dc241c54 100644
--- a/src/nvim/cursor_shape.c
+++ b/src/nvim/cursor_shape.c
@@ -11,7 +11,7 @@
 #include "nvim/ui.h"
 
 /// Handling of cursor and mouse pointer shapes in various modes.
-static cursorentry_T shape_table[SHAPE_IDX_COUNT] =
+cursorentry_T shape_table[SHAPE_IDX_COUNT] =
 {
   // Values are set by 'guicursor' and 'mouseshape'.
   // Adjust the SHAPE_IDX_ defines when changing this!
@@ -63,6 +63,7 @@ Dictionary cursor_shape_dict(void)
       PUT(dic, "id_lm", INTEGER_OBJ(cur->id_lm));
     }
     PUT(dic, "short_name", STRING_OBJ(cstr_to_string(cur->name)));
+    PUT(dic, "mode_idx", INTEGER_OBJ(i));
 
     PUT(all, cur->full_name, DICTIONARY_OBJ(dic));
   }
@@ -260,3 +261,35 @@ int cursor_mode_str2int(const char *mode)
   return -1;
 }
 
+
+/// Return the index into shape_table[] for the current mode.
+int cursor_get_mode_idx(void)
+{
+  if (State == SHOWMATCH) {
+    return SHAPE_IDX_SM;
+  } else if (State & VREPLACE_FLAG) {
+    return SHAPE_IDX_R;
+  } else if (State & REPLACE_FLAG) {
+    return SHAPE_IDX_R;
+  } else if (State & INSERT) {
+    return SHAPE_IDX_I;
+  } else if (State & CMDLINE) {
+    if (cmdline_at_end()) {
+      return SHAPE_IDX_C;
+    } else if (cmdline_overstrike()) {
+      return SHAPE_IDX_CR;
+    } else {
+      return SHAPE_IDX_CI;
+    }
+  } else if (finish_op) {
+    return SHAPE_IDX_O;
+  } else if (VIsual_active) {
+    if (*p_sel == 'e') {
+      return SHAPE_IDX_VE;
+    } else {
+      return SHAPE_IDX_V;
+    }
+  } else {
+    return SHAPE_IDX_N;
+  }
+}
diff --git a/src/nvim/cursor_shape.h b/src/nvim/cursor_shape.h
index 7cf65cba3c..2c466603f0 100644
--- a/src/nvim/cursor_shape.h
+++ b/src/nvim/cursor_shape.h
@@ -25,7 +25,7 @@ SHAPE_IDX_MORE   = 14,      ///< Hit-return or More
 SHAPE_IDX_MOREL  = 15,      ///< Hit-return or More in last line
 SHAPE_IDX_SM     = 16,      ///< showing matching paren
 SHAPE_IDX_COUNT  = 17
-} MouseMode;
+} ModeShape;
 
 typedef enum {
 SHAPE_BLOCK     = 0,       ///< block cursor
@@ -53,6 +53,7 @@ typedef struct cursor_entry {
   char used_for;          ///< SHAPE_MOUSE and/or SHAPE_CURSOR
 } cursorentry_T;
 
+extern cursorentry_T shape_table[SHAPE_IDX_COUNT];
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "cursor_shape.h.generated.h"
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index 0b6036ace9..5d228e7492 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -351,6 +351,7 @@ static int command_line_check(VimState *state)
   quit_more = false;       // reset after CTRL-D which had a more-prompt
 
   cursorcmd();             // set the cursor on the right spot
+  ui_cursor_shape();
   return 1;
 }
 
@@ -2092,6 +2093,18 @@ redraw:
   return (char_u *)line_ga.ga_data;
 }
 
+bool cmdline_overstrike(void)
+{
+  return ccline.overstrike;
+}
+
+
+/// Return true if the cursor is at the end of the cmdline.
+bool cmdline_at_end(void)
+{
+  return (ccline.cmdpos >= ccline.cmdlen);
+}
+
 /*
  * Allocate a new command line buffer.
  * Assigns the new buffer to ccline.cmdbuff and ccline.cmdbufflen.
@@ -2262,6 +2275,7 @@ void putcmdline(int c, int shift)
     draw_cmdline(ccline.cmdpos, ccline.cmdlen - ccline.cmdpos);
   msg_no_more = FALSE;
   cursorcmd();
+  ui_cursor_shape();
 }
 
 /*
@@ -2281,6 +2295,7 @@ void unputcmdline(void)
     draw_cmdline(ccline.cmdpos, 1);
   msg_no_more = FALSE;
   cursorcmd();
+  ui_cursor_shape();
 }
 
 /*
@@ -2598,6 +2613,7 @@ void redrawcmdline(void)
   compute_cmdrow();
   redrawcmd();
   cursorcmd();
+  ui_cursor_shape();
 }
 
 static void redrawcmdprompt(void)
diff --git a/src/nvim/mouse.c b/src/nvim/mouse.c
index 2ebe199f47..0029f364da 100644
--- a/src/nvim/mouse.c
+++ b/src/nvim/mouse.c
@@ -456,6 +456,7 @@ void setmouse(void)
 {
   int checkfor;
 
+  ui_cursor_shape();
 
   /* be quick when mouse is off */
   if (*p_mouse == NUL)
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index f34f5f1bc4..3498e8f4e7 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -73,7 +73,7 @@ typedef struct {
   bool busy;
   cursorentry_T cursor_shapes[SHAPE_IDX_COUNT];
   HlAttrs print_attrs;
-  int showing_mode;
+  ModeShape showing_mode;
   struct {
     int enable_mouse, disable_mouse;
     int enable_bracketed_paste, disable_bracketed_paste;
@@ -131,7 +131,7 @@ static void terminfo_start(UI *ui)
   data->can_use_terminal_scroll = true;
   data->bufpos = 0;
   data->bufsize = sizeof(data->buf) - CNORM_COMMAND_MAX_SIZE;
-  data->showing_mode = 0;
+  data->showing_mode = SHAPE_IDX_N;
   data->unibi_ext.enable_mouse = -1;
   data->unibi_ext.disable_mouse = -1;
   data->unibi_ext.set_cursor_color = -1;
@@ -173,7 +173,7 @@ static void terminfo_stop(UI *ui)
 {
   TUIData *data = ui->data;
   // Destroy output stuff
-  tui_mode_change(ui, NORMAL);
+  tui_mode_change(ui, SHAPE_IDX_N);
   tui_mouse_off(ui);
   unibi_out(ui, unibi_exit_attribute_mode);
   // cursor should be set to normal before exiting alternate screen
@@ -451,7 +451,7 @@ CursorShape tui_cursor_decode_shape(const char *shape_str)
   return shape;
 }
 
-static cursorentry_T decode_cursor_entry(Dictionary args)
+static cursorentry_T decode_cursor_entry(Dictionary args, int *mode_idx)
 {
   cursorentry_T r;
 
@@ -467,6 +467,8 @@ static cursorentry_T decode_cursor_entry(Dictionary args)
       r.blinkoff = (int)value.data.integer;
     } else if (strequal(key, "hl_id")) {
       r.id = (int)value.data.integer;
+    } else if (strequal(key, "mode_idx")) {
+      *mode_idx = (int)value.data.integer;
     }
   }
   return r;
@@ -484,15 +486,15 @@ static void tui_cursor_style_set(UI *ui, bool enabled, Dictionary args)
   // Keys: as defined by `shape_table`.
   for (size_t i = 0; i < args.size; i++) {
     char *mode_name = args.items[i].key.data;
-    const int mode_id = cursor_mode_str2int(mode_name);
-    assert(mode_id >= 0);
-    cursorentry_T r = decode_cursor_entry(args.items[i].value.data.dictionary);
+    int mode_idx;
+    cursorentry_T r = decode_cursor_entry(args.items[i].value.data.dictionary,
+                                          &mode_idx);
+    assert(mode_idx >= 0);
     r.full_name = mode_name;
-    data->cursor_shapes[mode_id] = r;
+    data->cursor_shapes[mode_idx] = r;
   }
 
-  MouseMode cursor_mode = tui_mode2cursor(data->showing_mode);
-  tui_set_cursor(ui, cursor_mode);
+  tui_set_mode(ui, data->showing_mode);
 }
 
 static void tui_update_menu(UI *ui)
@@ -529,7 +531,7 @@ static void tui_mouse_off(UI *ui)
 }
 
 /// @param mode one of SHAPE_XXX
-static void tui_set_cursor(UI *ui, MouseMode mode)
+static void tui_set_mode(UI *ui, ModeShape mode)
 {
   if (!cursor_style_enabled) {
     return;
@@ -584,42 +586,12 @@ static void tui_set_cursor(UI *ui, MouseMode mode)
   }
 }
 
-/// Returns cursor mode from edit mode
-static MouseMode tui_mode2cursor(int mode)
-{
-  switch (mode) {
-    case INSERT:  return SHAPE_IDX_I;
-    case CMDLINE: return SHAPE_IDX_C;
-    case REPLACE: return SHAPE_IDX_R;
-    case NORMAL:
-    default:      return SHAPE_IDX_N;
-  }
-}
-
 /// @param mode editor mode
-static void tui_mode_change(UI *ui, int mode)
+static void tui_mode_change(UI *ui, int mode_idx)
 {
   TUIData *data = ui->data;
-
-  if (mode == INSERT) {
-    if (data->showing_mode != INSERT) {
-      tui_set_cursor(ui, SHAPE_IDX_I);
-    }
-  } else if (mode == CMDLINE) {
-    if (data->showing_mode != CMDLINE) {
-      tui_set_cursor(ui, SHAPE_IDX_C);
-    }
-  } else if (mode == REPLACE) {
-    if (data->showing_mode != REPLACE) {
-      tui_set_cursor(ui, SHAPE_IDX_R);
-    }
-  } else {
-    assert(mode == NORMAL);
-    if (data->showing_mode != NORMAL) {
-      tui_set_cursor(ui, SHAPE_IDX_N);
-    }
-  }
-  data->showing_mode = mode;
+  tui_set_mode(ui, (ModeShape)mode_idx);
+  data->showing_mode = (ModeShape)mode_idx;
 }
 
 static void tui_set_scroll_region(UI *ui, int top, int bot, int left,
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 28f71b7ef2..8c5e579301 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -53,6 +53,7 @@ static int current_attr_code = 0;
 static bool pending_cursor_update = false;
 static int busy = 0;
 static int height, width;
+static int old_mode_idx = -1;
 
 // UI_CALL invokes a function on all registered UI instances. The functions can
 // have 0-5 arguments (configurable by SELECT_NTH).
@@ -150,12 +151,6 @@ void ui_event(char *name, Array args)
   }
 }
 
-// May update the shape of the cursor.
-void ui_cursor_shape(void)
-{
-  ui_mode_change();
-}
-
 void ui_refresh(void)
 {
   if (!ui_active()) {
@@ -181,6 +176,8 @@ void ui_refresh(void)
   screen_resize(width, height);
   pum_set_external(pum_external);
   ui_cursor_style_set();
+  old_mode_idx = -1;
+  ui_cursor_shape();
 }
 
 static void ui_refresh_event(void **argv)
@@ -541,25 +538,19 @@ static void flush_cursor_update(void)
   }
 }
 
-// Notify that the current mode has changed. Can be used to change cursor
-// shape, for example.
-static void ui_mode_change(void)
+/// Check if current mode has changed.
+/// May update the shape of the cursor.
+void ui_cursor_shape(void)
 {
-  int mode;
   if (!full_screen) {
     return;
   }
-  // Get a simple UI mode out of State.
-  if ((State & REPLACE) == REPLACE) {
-    mode = REPLACE;
-  } else if (State & INSERT) {
-    mode = INSERT;
-  } else if (State & CMDLINE) {
-    mode = CMDLINE;
-  } else {
-    mode = NORMAL;
+  int mode_idx = cursor_get_mode_idx();
+
+  if (old_mode_idx != mode_idx) {
+    old_mode_idx = mode_idx;
+    UI_CALL(mode_change, mode_idx);
   }
-  UI_CALL(mode_change, mode);
   conceal_check_cursur_line();
 }
 
diff --git a/src/nvim/ui.h b/src/nvim/ui.h
index 8ffc5a45a6..d63ceb106c 100644
--- a/src/nvim/ui.h
+++ b/src/nvim/ui.h
@@ -28,7 +28,7 @@ struct ui_t {
   void (*busy_stop)(UI *ui);
   void (*mouse_on)(UI *ui);
   void (*mouse_off)(UI *ui);
-  void (*mode_change)(UI *ui, int mode);
+  void (*mode_change)(UI *ui, int mode_idx);
   void (*set_scroll_region)(UI *ui, int top, int bot, int left, int right);
   void (*scroll)(UI *ui, int count);
   void (*highlight_set)(UI *ui, HlAttrs attrs);
diff --git a/src/nvim/ui_bridge.c b/src/nvim/ui_bridge.c
index 9f780663ac..59942fb2cb 100644
--- a/src/nvim/ui_bridge.c
+++ b/src/nvim/ui_bridge.c
@@ -249,9 +249,9 @@ static void ui_bridge_mouse_off_event(void **argv)
   ui->mouse_off(ui);
 }
 
-static void ui_bridge_mode_change(UI *b, int mode)
+static void ui_bridge_mode_change(UI *b, int mode_idx)
 {
-  UI_CALL(b, mode_change, 2, b, INT2PTR(mode));
+  UI_CALL(b, mode_change, 2, b, INT2PTR(mode_idx));
 }
 static void ui_bridge_mode_change_event(void **argv)
 {

From 2c5751b9b2b22b8519aeda82088fe4525f2bd713 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Linse?= <bjorn.linse@gmail.com>
Date: Mon, 17 Apr 2017 13:32:22 +0200
Subject: [PATCH 133/257] ui: add tests for new cursor shape modes

---
 test/functional/terminal/ex_terminal_spec.lua |   2 +-
 test/functional/ui/cursor_spec.lua            |  17 ++
 test/functional/ui/mode_spec.lua              | 227 ++++++++++++++++++
 test/functional/ui/screen.lua                 |   5 +-
 test/functional/ui/screen_basic_spec.lua      | 113 ---------
 5 files changed, 247 insertions(+), 117 deletions(-)
 create mode 100644 test/functional/ui/mode_spec.lua

diff --git a/test/functional/terminal/ex_terminal_spec.lua b/test/functional/terminal/ex_terminal_spec.lua
index 154374cda9..1ed63adcfb 100644
--- a/test/functional/terminal/ex_terminal_spec.lua
+++ b/test/functional/terminal/ex_terminal_spec.lua
@@ -26,7 +26,7 @@ describe(':terminal', function()
     feed_command([[terminal while true; do echo X; done]])
     helpers.feed([[<C-\><C-N>]])
     wait()
-    helpers.sleep(10)  -- Let some terminal activity happen.
+    screen.sleep(10)  -- Let some terminal activity happen.
     feed_command("messages")
     screen:expect([[
       msg1                                              |
diff --git a/test/functional/ui/cursor_spec.lua b/test/functional/ui/cursor_spec.lua
index 02e9422781..e4c1b17ef3 100644
--- a/test/functional/ui/cursor_spec.lua
+++ b/test/functional/ui/cursor_spec.lua
@@ -20,9 +20,11 @@ describe('ui/cursor', function()
   it("'guicursor' is published as a UI event", function()
     local expected_cursor_style = {
       cmdline_hover = {
+        mode_idx = 9,
         mouse_shape = 0,
         short_name = 'e' },
       cmdline_insert = {
+        mode_idx = 5,
         blinkoff = 250,
         blinkon = 400,
         blinkwait = 700,
@@ -33,6 +35,7 @@ describe('ui/cursor', function()
         mouse_shape = 0,
         short_name = 'ci' },
       cmdline_normal = {
+        mode_idx = 4,
         blinkoff = 250,
         blinkon = 400,
         blinkwait = 700,
@@ -43,6 +46,7 @@ describe('ui/cursor', function()
         mouse_shape = 0,
         short_name = 'c' },
       cmdline_replace = {
+        mode_idx = 6,
         blinkoff = 250,
         blinkon = 400,
         blinkwait = 700,
@@ -53,6 +57,7 @@ describe('ui/cursor', function()
         mouse_shape = 0,
         short_name = 'cr' },
       insert = {
+        mode_idx = 2,
         blinkoff = 250,
         blinkon = 400,
         blinkwait = 700,
@@ -63,12 +68,15 @@ describe('ui/cursor', function()
         mouse_shape = 0,
         short_name = 'i' },
       more = {
+        mode_idx = 14,
         mouse_shape = 0,
         short_name = 'm' },
       more_lastline = {
+        mode_idx = 15,
         mouse_shape = 0,
         short_name = 'ml' },
       normal = {
+        mode_idx = 0,
         blinkoff = 250,
         blinkon = 400,
         blinkwait = 700,
@@ -79,6 +87,7 @@ describe('ui/cursor', function()
         mouse_shape = 0,
         short_name = 'n' },
       operator = {
+        mode_idx = 7,
         blinkoff = 250,
         blinkon = 400,
         blinkwait = 700,
@@ -89,6 +98,7 @@ describe('ui/cursor', function()
         mouse_shape = 0,
         short_name = 'o' },
       replace = {
+        mode_idx = 3,
         blinkoff = 250,
         blinkon = 400,
         blinkwait = 700,
@@ -99,6 +109,7 @@ describe('ui/cursor', function()
         mouse_shape = 0,
         short_name = 'r' },
       showmatch = {
+        mode_idx = 16,
         blinkoff = 150,
         blinkon = 175,
         blinkwait = 175,
@@ -108,12 +119,15 @@ describe('ui/cursor', function()
         id_lm = 46,
         short_name = 'sm' },
       statusline_drag = {
+        mode_idx = 11,
         mouse_shape = 0,
         short_name = 'sd' },
       statusline_hover = {
+        mode_idx = 10,
         mouse_shape = 0,
         short_name = 's' },
       visual = {
+        mode_idx = 1,
         blinkoff = 250,
         blinkon = 400,
         blinkwait = 700,
@@ -124,6 +138,7 @@ describe('ui/cursor', function()
         mouse_shape = 0,
         short_name = 'v' },
       visual_select = {
+        mode_idx = 8,
         blinkoff = 250,
         blinkon = 400,
         blinkwait = 700,
@@ -134,9 +149,11 @@ describe('ui/cursor', function()
         mouse_shape = 0,
         short_name = 've' },
       vsep_drag = {
+        mode_idx = 13,
         mouse_shape = 0,
         short_name = 'vd' },
       vsep_hover = {
+        mode_idx = 12,
         mouse_shape = 0,
         short_name = 'vs' }
     }
diff --git a/test/functional/ui/mode_spec.lua b/test/functional/ui/mode_spec.lua
new file mode 100644
index 0000000000..f0cedfeeb5
--- /dev/null
+++ b/test/functional/ui/mode_spec.lua
@@ -0,0 +1,227 @@
+local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
+
+local clear, feed, insert = helpers.clear, helpers.feed, helpers.insert
+local command, eval = helpers.command, helpers.eval
+local eq = helpers.eq
+
+describe('ui mode_change event', function()
+  local screen
+
+  before_each(function()
+    clear()
+    screen = Screen.new(25, 4)
+    screen:attach({rgb= true})
+    screen:set_default_attr_ids( {
+      [0] = {bold=true, foreground=255},
+      [1] = {bold=true, reverse=true},
+      [2] = {bold=true},
+      [3] = {reverse=true},
+    })
+  end)
+
+  it('works in normal mode', function()
+    screen:expect([[
+      ^                         |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]],nil,nil,function ()
+      eq("normal", screen.mode)
+    end)
+
+    feed('d')
+    screen:expect([[
+      ^                         |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]],nil,nil,function ()
+      eq("operator", screen.mode)
+    end)
+
+    feed('<esc>')
+    screen:expect([[
+      ^                         |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]],nil,nil,function ()
+      eq("normal", screen.mode)
+    end)
+  end)
+
+  it('works in insert mode', function()
+    feed('i')
+    screen:expect([[
+      ^                         |
+      {0:~                        }|
+      {0:~                        }|
+      {2:-- INSERT --}             |
+    ]],nil,nil,function ()
+      eq("insert", screen.mode)
+    end)
+
+    feed('word<esc>')
+    screen:expect([[
+      wor^d                     |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]], nil, nil, function ()
+      eq("normal", screen.mode)
+    end)
+
+    command("set showmatch")
+    eq(eval('&matchtime'), 5) -- tenths of seconds
+    feed('a(stuff')
+    screen:expect([[
+      word(stuff^               |
+      {0:~                        }|
+      {0:~                        }|
+      {2:-- INSERT --}             |
+    ]], nil, nil, function ()
+      eq("insert", screen.mode)
+    end)
+
+    feed(')')
+    screen:expect([[
+      word^(stuff)              |
+      {0:~                        }|
+      {0:~                        }|
+      {2:-- INSERT --}             |
+    ]], nil, nil, function ()
+      eq("showmatch", screen.mode)
+    end)
+
+    screen:sleep(400)
+    screen:expect([[
+      word(stuff)^              |
+      {0:~                        }|
+      {0:~                        }|
+      {2:-- INSERT --}             |
+    ]], nil, nil, function ()
+      eq("insert", screen.mode)
+    end)
+  end)
+
+  it('works in replace mode', function()
+    feed('R')
+    screen:expect([[
+      ^                         |
+      {0:~                        }|
+      {0:~                        }|
+      {2:-- REPLACE --}            |
+    ]], nil, nil, function ()
+      eq("replace", screen.mode)
+    end)
+
+    feed('word<esc>')
+    screen:expect([[
+      wor^d                     |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]], nil, nil, function ()
+      eq("normal", screen.mode)
+    end)
+  end)
+
+  it('works in cmdline mode', function()
+    feed(':')
+    screen:expect([[
+                               |
+      {0:~                        }|
+      {0:~                        }|
+      :^                        |
+    ]],nil,nil,function ()
+      eq("cmdline_normal", screen.mode)
+    end)
+
+    feed('x<left>')
+    screen:expect([[
+                               |
+      {0:~                        }|
+      {0:~                        }|
+      :^x                       |
+    ]],nil,nil,function ()
+      eq("cmdline_insert", screen.mode)
+    end)
+
+    feed('<insert>')
+    screen:expect([[
+                               |
+      {0:~                        }|
+      {0:~                        }|
+      :^x                       |
+    ]],nil,nil,function ()
+      eq("cmdline_replace", screen.mode)
+    end)
+
+
+    feed('<right>')
+    screen:expect([[
+                               |
+      {0:~                        }|
+      {0:~                        }|
+      :x^                       |
+    ]],nil,nil,function ()
+      eq("cmdline_normal", screen.mode)
+    end)
+
+    feed('<esc>')
+    screen:expect([[
+      ^                         |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]],nil,nil,function ()
+      eq("normal", screen.mode)
+    end)
+  end)
+
+  it('works in visal mode', function()
+    insert("text")
+    feed('v')
+    screen:expect([[
+      tex^t                     |
+      {0:~                        }|
+      {0:~                        }|
+      {2:-- VISUAL --}             |
+    ]],nil,nil,function ()
+      eq("visual", screen.mode)
+    end)
+
+    feed('<esc>')
+    screen:expect([[
+      tex^t                     |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]],nil,nil,function ()
+      eq("normal", screen.mode)
+    end)
+
+    command('set selection=exclusive')
+    feed('v')
+    screen:expect([[
+      tex^t                     |
+      {0:~                        }|
+      {0:~                        }|
+      {2:-- VISUAL --}             |
+    ]],nil,nil,function ()
+      eq("visual_select", screen.mode)
+    end)
+
+    feed('<esc>')
+    screen:expect([[
+      tex^t                     |
+      {0:~                        }|
+      {0:~                        }|
+                               |
+    ]],nil,nil,function ()
+      eq("normal", screen.mode)
+    end)
+  end)
+end)
+
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index afbcd222c7..ceb82db98f 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -384,9 +384,8 @@ function Screen:_handle_mouse_off()
   self._mouse_enabled = false
 end
 
-function Screen:_handle_mode_change(mode)
-  assert(mode == 'insert' or mode == 'replace'
-        or mode == 'normal' or mode == 'cmdline')
+function Screen:_handle_mode_change(mode, idx)
+  assert(idx == self._cursor_style[mode].mode_idx)
   self.mode = mode
 end
 
diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua
index 8182190b5f..d9cb3d7b6f 100644
--- a/test/functional/ui/screen_basic_spec.lua
+++ b/test/functional/ui/screen_basic_spec.lua
@@ -566,119 +566,6 @@ describe('Screen', function()
     end)
   end)
 
-  describe('mode change', function()
-    before_each(function()
-      screen:try_resize(25, 5)
-    end)
-
-    it('works in normal mode', function()
-      screen:expect([[
-        ^                         |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-                                 |
-      ]],nil,nil,function ()
-        eq("normal", screen.mode)
-      end)
-    end)
-
-    it('works in insert mode', function()
-      feed('i')
-      screen:expect([[
-        ^                         |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-        {2:-- INSERT --}             |
-      ]],nil,nil,function ()
-        eq("insert", screen.mode)
-      end)
-
-      feed('word<esc>')
-      screen:expect([[
-        wor^d                     |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-                                 |
-      ]], nil, nil, function ()
-        eq("normal", screen.mode)
-      end)
-    end)
-
-    it('works in replace mode', function()
-      feed('R')
-      screen:expect([[
-        ^                         |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-        {2:-- REPLACE --}            |
-      ]], nil, nil, function ()
-        eq("replace", screen.mode)
-      end)
-
-      feed('word<esc>')
-      screen:expect([[
-        wor^d                     |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-                                 |
-      ]], nil, nil, function ()
-        eq("normal", screen.mode)
-      end)
-    end)
-
-    it('works in cmdline mode', function()
-      feed(':')
-      screen:expect([[
-                                 |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-        :^                        |
-      ]],nil,nil,function ()
-        eq("cmdline", screen.mode)
-      end)
-
-      feed('<esc>/')
-      screen:expect([[
-                                 |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-        /^                        |
-      ]],nil,nil,function ()
-        eq("cmdline", screen.mode)
-      end)
-
-
-      feed('<esc>?')
-      screen:expect([[
-                                 |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-        ?^                        |
-      ]],nil,nil,function ()
-        eq("cmdline", screen.mode)
-      end)
-
-      feed('<esc>')
-      screen:expect([[
-        ^                         |
-        {0:~                        }|
-        {0:~                        }|
-        {0:~                        }|
-                                 |
-      ]],nil,nil,function ()
-        eq("normal", screen.mode)
-      end)
-    end)
-  end)
-
   it('nvim_ui_attach() handles very large width/height #2180', function()
     screen:detach()
     screen = Screen.new(999, 999)

From 7ea5c78687168c07bfc4582c84145e86a5252f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Linse?= <bjorn.linse@gmail.com>
Date: Tue, 18 Apr 2017 13:42:04 +0200
Subject: [PATCH 134/257] ui: use an array for mode styles

---
 src/nvim/api/ui.c                  |  10 +-
 src/nvim/cursor_shape.c            |  14 +-
 src/nvim/tui/tui.c                 |  25 ++--
 src/nvim/ui.c                      |  10 +-
 src/nvim/ui.ch                     |   0
 src/nvim/ui.h                      |   2 +-
 src/nvim/ui_bridge.c               |  20 +--
 test/functional/ui/cursor_spec.lua | 224 +++++++++++++++--------------
 test/functional/ui/screen.lua      |   8 +-
 9 files changed, 156 insertions(+), 157 deletions(-)
 create mode 100644 src/nvim/ui.ch

diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c
index 0053050717..3e7e2718bb 100644
--- a/src/nvim/api/ui.c
+++ b/src/nvim/api/ui.c
@@ -70,7 +70,7 @@ void nvim_ui_attach(uint64_t channel_id, Integer width, Integer height,
   ui->clear = remote_ui_clear;
   ui->eol_clear = remote_ui_eol_clear;
   ui->cursor_goto = remote_ui_cursor_goto;
-  ui->cursor_style_set = remote_ui_cursor_style_set;
+  ui->mode_info_set = remote_ui_mode_info_set;
   ui->update_menu = remote_ui_update_menu;
   ui->busy_start = remote_ui_busy_start;
   ui->busy_stop = remote_ui_busy_stop;
@@ -295,12 +295,12 @@ static void remote_ui_scroll(UI *ui, int count)
   push_call(ui, "scroll", args);
 }
 
-static void remote_ui_cursor_style_set(UI *ui, bool enabled, Dictionary data)
+static void remote_ui_mode_info_set(UI *ui, bool guicursor_enabled, Array data)
 {
   Array args = ARRAY_DICT_INIT;
-  ADD(args, BOOLEAN_OBJ(enabled));
-  ADD(args, copy_object(DICTIONARY_OBJ(data)));
-  push_call(ui, "cursor_style_set", args);
+  ADD(args, BOOLEAN_OBJ(guicursor_enabled));
+  ADD(args, copy_object(ARRAY_OBJ(data)));
+  push_call(ui, "mode_info_set", args);
 }
 
 static void remote_ui_highlight_set(UI *ui, HlAttrs attrs)
diff --git a/src/nvim/cursor_shape.c b/src/nvim/cursor_shape.c
index 57dc241c54..3099a5189b 100644
--- a/src/nvim/cursor_shape.c
+++ b/src/nvim/cursor_shape.c
@@ -34,11 +34,11 @@ cursorentry_T shape_table[SHAPE_IDX_COUNT] =
   { "showmatch", 0, 0, 0, 100L, 100L, 100L, 0, 0, "sm", SHAPE_CURSOR },
 };
 
-/// Converts cursor_shapes into a Dictionary of dictionaries
-/// @return dictionary of the form {"normal" : { "cursor_shape": ... }, ...}
-Dictionary cursor_shape_dict(void)
+/// Converts cursor_shapes into an Array of Dictionaries
+/// @return Array of the form {[ "cursor_shape": ... ], ...}
+Array mode_style_array(void)
 {
-  Dictionary all = ARRAY_DICT_INIT;
+  Array all = ARRAY_DICT_INIT;
 
   for (int i = 0; i < SHAPE_IDX_COUNT; i++) {
     Dictionary dic = ARRAY_DICT_INIT;
@@ -62,10 +62,10 @@ Dictionary cursor_shape_dict(void)
       PUT(dic, "hl_id", INTEGER_OBJ(cur->id));
       PUT(dic, "id_lm", INTEGER_OBJ(cur->id_lm));
     }
+    PUT(dic, "name", STRING_OBJ(cstr_to_string(cur->full_name)));
     PUT(dic, "short_name", STRING_OBJ(cstr_to_string(cur->name)));
-    PUT(dic, "mode_idx", INTEGER_OBJ(i));
 
-    PUT(all, cur->full_name, DICTIONARY_OBJ(dic));
+    ADD(all, DICTIONARY_OBJ(dic));
   }
 
   return all;
@@ -241,7 +241,7 @@ char_u *parse_shape_opt(int what)
       shape_table[SHAPE_IDX_VE].id_lm = shape_table[SHAPE_IDX_V].id_lm;
     }
   }
-  ui_cursor_style_set();
+  ui_mode_info_set();
   return NULL;
 }
 
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index 3498e8f4e7..172160fddb 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -101,7 +101,7 @@ UI *tui_start(void)
   ui->clear = tui_clear;
   ui->eol_clear = tui_eol_clear;
   ui->cursor_goto = tui_cursor_goto;
-  ui->cursor_style_set = tui_cursor_style_set;
+  ui->mode_info_set = tui_mode_info_set;
   ui->update_menu = tui_update_menu;
   ui->busy_start = tui_busy_start;
   ui->busy_stop = tui_busy_stop;
@@ -451,7 +451,7 @@ CursorShape tui_cursor_decode_shape(const char *shape_str)
   return shape;
 }
 
-static cursorentry_T decode_cursor_entry(Dictionary args, int *mode_idx)
+static cursorentry_T decode_cursor_entry(Dictionary args)
 {
   cursorentry_T r;
 
@@ -467,31 +467,26 @@ static cursorentry_T decode_cursor_entry(Dictionary args, int *mode_idx)
       r.blinkoff = (int)value.data.integer;
     } else if (strequal(key, "hl_id")) {
       r.id = (int)value.data.integer;
-    } else if (strequal(key, "mode_idx")) {
-      *mode_idx = (int)value.data.integer;
     }
   }
   return r;
 }
 
-static void tui_cursor_style_set(UI *ui, bool enabled, Dictionary args)
+static void tui_mode_info_set(UI *ui, bool guicursor_enabled, Array args)
 {
-  cursor_style_enabled = enabled;
-  if (!enabled) {
+  cursor_style_enabled = guicursor_enabled;
+  if (!guicursor_enabled) {
     return;  // Do not send cursor style control codes.
   }
   TUIData *data = ui->data;
 
   assert(args.size);
-  // Keys: as defined by `shape_table`.
+
+  // cursor style entries as defined by `shape_table`.
   for (size_t i = 0; i < args.size; i++) {
-    char *mode_name = args.items[i].key.data;
-    int mode_idx;
-    cursorentry_T r = decode_cursor_entry(args.items[i].value.data.dictionary,
-                                          &mode_idx);
-    assert(mode_idx >= 0);
-    r.full_name = mode_name;
-    data->cursor_shapes[mode_idx] = r;
+    assert(args.items[i].type == kObjectTypeDictionary);
+    cursorentry_T r = decode_cursor_entry(args.items[i].data.dictionary);
+    data->cursor_shapes[i] = r;
   }
 
   tui_set_mode(ui, data->showing_mode);
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 8c5e579301..5fb57dd257 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -175,7 +175,7 @@ void ui_refresh(void)
   row = col = 0;
   screen_resize(width, height);
   pum_set_external(pum_external);
-  ui_cursor_style_set();
+  ui_mode_info_set();
   old_mode_idx = -1;
   ui_cursor_shape();
 }
@@ -375,12 +375,12 @@ void ui_cursor_goto(int new_row, int new_col)
   pending_cursor_update = true;
 }
 
-void ui_cursor_style_set(void)
+void ui_mode_info_set(void)
 {
-  Dictionary style = cursor_shape_dict();
+  Array style = mode_style_array();
   bool enabled = (*p_guicursor != NUL);
-  UI_CALL(cursor_style_set, enabled, style);
-  api_free_dictionary(style);
+  UI_CALL(mode_info_set, enabled, style);
+  api_free_array(style);
 }
 
 void ui_update_menu(void)
diff --git a/src/nvim/ui.ch b/src/nvim/ui.ch
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/nvim/ui.h b/src/nvim/ui.h
index d63ceb106c..f5cbf748ee 100644
--- a/src/nvim/ui.h
+++ b/src/nvim/ui.h
@@ -22,7 +22,7 @@ struct ui_t {
   void (*clear)(UI *ui);
   void (*eol_clear)(UI *ui);
   void (*cursor_goto)(UI *ui, int row, int col);
-  void (*cursor_style_set)(UI *ui, bool enabled, Dictionary cursor_styles);
+  void (*mode_info_set)(UI *ui, bool enabled, Array cursor_styles);
   void (*update_menu)(UI *ui);
   void (*busy_start)(UI *ui);
   void (*busy_stop)(UI *ui);
diff --git a/src/nvim/ui_bridge.c b/src/nvim/ui_bridge.c
index 59942fb2cb..e899cbf397 100644
--- a/src/nvim/ui_bridge.c
+++ b/src/nvim/ui_bridge.c
@@ -60,7 +60,7 @@ UI *ui_bridge_attach(UI *ui, ui_main_fn ui_main, event_scheduler scheduler)
   rv->bridge.clear = ui_bridge_clear;
   rv->bridge.eol_clear = ui_bridge_eol_clear;
   rv->bridge.cursor_goto = ui_bridge_cursor_goto;
-  rv->bridge.cursor_style_set = ui_bridge_cursor_style_set;
+  rv->bridge.mode_info_set = ui_bridge_mode_info_set;
   rv->bridge.update_menu = ui_bridge_update_menu;
   rv->bridge.busy_start = ui_bridge_busy_start;
   rv->bridge.busy_stop = ui_bridge_busy_stop;
@@ -180,23 +180,23 @@ static void ui_bridge_cursor_goto_event(void **argv)
   ui->cursor_goto(ui, PTR2INT(argv[1]), PTR2INT(argv[2]));
 }
 
-static void ui_bridge_cursor_style_set(UI *b, bool enabled, Dictionary styles)
+static void ui_bridge_mode_info_set(UI *b, bool enabled, Array modes)
 {
   bool *enabledp = xmalloc(sizeof(*enabledp));
-  Object *stylesp = xmalloc(sizeof(*stylesp));
+  Object *modesp = xmalloc(sizeof(*modesp));
   *enabledp = enabled;
-  *stylesp = copy_object(DICTIONARY_OBJ(styles));
-  UI_CALL(b, cursor_style_set, 3, b, enabledp, stylesp);
+  *modesp = copy_object(ARRAY_OBJ(modes));
+  UI_CALL(b, mode_info_set, 3, b, enabledp, modesp);
 }
-static void ui_bridge_cursor_style_set_event(void **argv)
+static void ui_bridge_mode_info_set_event(void **argv)
 {
   UI *ui = UI(argv[0]);
   bool *enabled = argv[1];
-  Object *styles = argv[2];
-  ui->cursor_style_set(ui, *enabled, styles->data.dictionary);
+  Object *modes = argv[2];
+  ui->mode_info_set(ui, *enabled, modes->data.array);
   xfree(enabled);
-  api_free_object(*styles);
-  xfree(styles);
+  api_free_object(*modes);
+  xfree(modes);
 }
 
 static void ui_bridge_update_menu(UI *b)
diff --git a/test/functional/ui/cursor_spec.lua b/test/functional/ui/cursor_spec.lua
index e4c1b17ef3..abe0e0b1fd 100644
--- a/test/functional/ui/cursor_spec.lua
+++ b/test/functional/ui/cursor_spec.lua
@@ -18,155 +18,155 @@ describe('ui/cursor', function()
   end)
 
   it("'guicursor' is published as a UI event", function()
-    local expected_cursor_style = {
-      cmdline_hover = {
-        mode_idx = 9,
-        mouse_shape = 0,
-        short_name = 'e' },
-      cmdline_insert = {
-        mode_idx = 5,
-        blinkoff = 250,
-        blinkon = 400,
-        blinkwait = 700,
-        cell_percentage = 25,
-        cursor_shape = 'vertical',
-        hl_id = 46,
-        id_lm = 47,
-        mouse_shape = 0,
-        short_name = 'ci' },
-      cmdline_normal = {
-        mode_idx = 4,
+    local expected_mode_info = {
+      [1] = {
         blinkoff = 250,
         blinkon = 400,
         blinkwait = 700,
         cell_percentage = 0,
         cursor_shape = 'block',
+        name = 'normal',
         hl_id = 46,
         id_lm = 47,
         mouse_shape = 0,
-        short_name = 'c' },
-      cmdline_replace = {
-        mode_idx = 6,
+        short_name = 'n' },
+      [2] = {
+        blinkoff = 250,
+        blinkon = 400,
+        blinkwait = 700,
+        cell_percentage = 0,
+        cursor_shape = 'block',
+        name = 'visual',
+        hl_id = 46,
+        id_lm = 47,
+        mouse_shape = 0,
+        short_name = 'v' },
+      [3] = {
+        blinkoff = 250,
+        blinkon = 400,
+        blinkwait = 700,
+        cell_percentage = 25,
+        cursor_shape = 'vertical',
+        name = 'insert',
+        hl_id = 46,
+        id_lm = 47,
+        mouse_shape = 0,
+        short_name = 'i' },
+      [4] = {
         blinkoff = 250,
         blinkon = 400,
         blinkwait = 700,
         cell_percentage = 20,
         cursor_shape = 'horizontal',
+        name = 'replace',
         hl_id = 46,
         id_lm = 47,
         mouse_shape = 0,
-        short_name = 'cr' },
-      insert = {
-        mode_idx = 2,
-        blinkoff = 250,
-        blinkon = 400,
-        blinkwait = 700,
-        cell_percentage = 25,
-        cursor_shape = 'vertical',
-        hl_id = 46,
-        id_lm = 47,
-        mouse_shape = 0,
-        short_name = 'i' },
-      more = {
-        mode_idx = 14,
-        mouse_shape = 0,
-        short_name = 'm' },
-      more_lastline = {
-        mode_idx = 15,
-        mouse_shape = 0,
-        short_name = 'ml' },
-      normal = {
-        mode_idx = 0,
+        short_name = 'r' },
+      [5] = {
         blinkoff = 250,
         blinkon = 400,
         blinkwait = 700,
         cell_percentage = 0,
         cursor_shape = 'block',
+        name = 'cmdline_normal',
         hl_id = 46,
         id_lm = 47,
         mouse_shape = 0,
-        short_name = 'n' },
-      operator = {
-        mode_idx = 7,
+        short_name = 'c' },
+      [6] = {
+        blinkoff = 250,
+        blinkon = 400,
+        blinkwait = 700,
+        cell_percentage = 25,
+        cursor_shape = 'vertical',
+        name = 'cmdline_insert',
+        hl_id = 46,
+        id_lm = 47,
+        mouse_shape = 0,
+        short_name = 'ci' },
+      [7] = {
+        blinkoff = 250,
+        blinkon = 400,
+        blinkwait = 700,
+        cell_percentage = 20,
+        cursor_shape = 'horizontal',
+        name = 'cmdline_replace',
+        hl_id = 46,
+        id_lm = 47,
+        mouse_shape = 0,
+        short_name = 'cr' },
+      [8] = {
         blinkoff = 250,
         blinkon = 400,
         blinkwait = 700,
         cell_percentage = 50,
         cursor_shape = 'horizontal',
+        name = 'operator',
         hl_id = 46,
         id_lm = 46,
         mouse_shape = 0,
         short_name = 'o' },
-      replace = {
-        mode_idx = 3,
-        blinkoff = 250,
-        blinkon = 400,
-        blinkwait = 700,
-        cell_percentage = 20,
-        cursor_shape = 'horizontal',
-        hl_id = 46,
-        id_lm = 47,
-        mouse_shape = 0,
-        short_name = 'r' },
-      showmatch = {
-        mode_idx = 16,
-        blinkoff = 150,
-        blinkon = 175,
-        blinkwait = 175,
-        cell_percentage = 0,
-        cursor_shape = 'block',
-        hl_id = 46,
-        id_lm = 46,
-        short_name = 'sm' },
-      statusline_drag = {
-        mode_idx = 11,
-        mouse_shape = 0,
-        short_name = 'sd' },
-      statusline_hover = {
-        mode_idx = 10,
-        mouse_shape = 0,
-        short_name = 's' },
-      visual = {
-        mode_idx = 1,
-        blinkoff = 250,
-        blinkon = 400,
-        blinkwait = 700,
-        cell_percentage = 0,
-        cursor_shape = 'block',
-        hl_id = 46,
-        id_lm = 47,
-        mouse_shape = 0,
-        short_name = 'v' },
-      visual_select = {
-        mode_idx = 8,
+      [9] = {
         blinkoff = 250,
         blinkon = 400,
         blinkwait = 700,
         cell_percentage = 35,
         cursor_shape = 'vertical',
+        name = 'visual_select',
         hl_id = 46,
         id_lm = 46,
         mouse_shape = 0,
         short_name = 've' },
-      vsep_drag = {
-        mode_idx = 13,
+      [10] = {
+        name = 'cmdline_hover',
+        mouse_shape = 0,
+        short_name = 'e' },
+      [11] = {
+        name = 'statusline_hover',
+        mouse_shape = 0,
+        short_name = 's' },
+      [12] = {
+        name = 'statusline_drag',
+        mouse_shape = 0,
+        short_name = 'sd' },
+      [13] = {
+        name = 'vsep_hover',
+        mouse_shape = 0,
+        short_name = 'vs' },
+      [14] = {
+        name = 'vsep_drag',
         mouse_shape = 0,
         short_name = 'vd' },
-      vsep_hover = {
-        mode_idx = 12,
+      [15] = {
+        name = 'more',
         mouse_shape = 0,
-        short_name = 'vs' }
-    }
+        short_name = 'm' },
+      [16] = {
+        name = 'more_lastline',
+        mouse_shape = 0,
+        short_name = 'ml' },
+      [17] = {
+        blinkoff = 150,
+        blinkon = 175,
+        blinkwait = 175,
+        cell_percentage = 0,
+        cursor_shape = 'block',
+        name = 'showmatch',
+        hl_id = 46,
+        id_lm = 46,
+        short_name = 'sm' },
+      }
 
     screen:expect(function()
       -- Default 'guicursor' published on startup.
-      eq(expected_cursor_style, screen._cursor_style)
+      eq(expected_mode_info, screen._mode_info)
       eq(true, screen._cursor_style_enabled)
       eq('normal', screen.mode)
     end)
 
     -- Event is published ONLY if the cursor style changed.
-    screen._cursor_style = nil
+    screen._mode_info = nil
     command("echo 'test'")
     screen:expect([[
       ^                         |
@@ -175,20 +175,24 @@ describe('ui/cursor', function()
       ~                        |
       test                     |
     ]], nil, nil, function()
-      eq(nil, screen._cursor_style)
+      eq(nil, screen._mode_info)
     end)
 
     -- Change the cursor style.
     meths.set_option('guicursor', 'n-v-c:ver35-blinkwait171-blinkoff172-blinkon173,ve:hor35,o:ver50,i-ci:block,r-cr:hor90,sm:ver42')
     screen:expect(function()
-      eq('vertical', screen._cursor_style.normal.cursor_shape)
-      eq('horizontal', screen._cursor_style.visual_select.cursor_shape)
-      eq('vertical', screen._cursor_style.operator.cursor_shape)
-      eq('block', screen._cursor_style.insert.cursor_shape)
-      eq('vertical', screen._cursor_style.showmatch.cursor_shape)
-      eq(171, screen._cursor_style.normal.blinkwait)
-      eq(172, screen._cursor_style.normal.blinkoff)
-      eq(173, screen._cursor_style.normal.blinkon)
+      local named = {}
+      for _, m in ipairs(screen._mode_info) do
+        named[m.name] = m
+      end
+      eq('vertical', named.normal.cursor_shape)
+      eq('horizontal', named.visual_select.cursor_shape)
+      eq('vertical', named.operator.cursor_shape)
+      eq('block', named.insert.cursor_shape)
+      eq('vertical', named.showmatch.cursor_shape)
+      eq(171, named.normal.blinkwait)
+      eq(172, named.normal.blinkoff)
+      eq(173, named.normal.blinkon)
     end)
   end)
 
@@ -197,11 +201,11 @@ describe('ui/cursor', function()
     screen:expect(function()
       -- Empty 'guicursor' sets enabled=false.
       eq(false, screen._cursor_style_enabled)
-      for _, m in ipairs({ 'cmdline_insert', 'cmdline_normal', 'cmdline_replace', 'insert',
-                           'showmatch', 'normal', 'replace', 'visual',
-                           'visual_select', }) do
-        eq('block', screen._cursor_style[m].cursor_shape)
-        eq(0, screen._cursor_style[m].blinkon)
+      for _, m in ipairs(screen._mode_info) do
+        if m['cursor_shape'] ~= nil then
+          eq('block', m.cursor_shape)
+          eq(0, m.blinkon)
+        end
       end
     end)
   end)
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index ceb82db98f..bcf2a2e3d6 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -348,9 +348,9 @@ function Screen:_handle_resize(width, height)
   }
 end
 
-function Screen:_handle_cursor_style_set(enabled, style)
-  self._cursor_style_enabled = enabled
-  self._cursor_style = style
+function Screen:_handle_mode_info_set(cursor_style_enabled, mode_info)
+  self._cursor_style_enabled = cursor_style_enabled
+  self._mode_info = mode_info
 end
 
 function Screen:_handle_clear()
@@ -385,7 +385,7 @@ function Screen:_handle_mouse_off()
 end
 
 function Screen:_handle_mode_change(mode, idx)
-  assert(idx == self._cursor_style[mode].mode_idx)
+  assert(mode == self._mode_info[idx+1].name)
   self.mode = mode
 end
 

From 9cc97896813fa4f40a4e37b6f72284cdb10c4195 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Linse?= <bjorn.linse@gmail.com>
Date: Mon, 17 Apr 2017 16:29:15 +0200
Subject: [PATCH 135/257] ui: document new mode index and add note about
 forward-compatibility

---
 runtime/doc/msgpack_rpc.txt | 41 +++++++++++++++++++++++++++++--------
 1 file changed, 33 insertions(+), 8 deletions(-)

diff --git a/runtime/doc/msgpack_rpc.txt b/runtime/doc/msgpack_rpc.txt
index 3f3c41f566..d05e88d483 100644
--- a/runtime/doc/msgpack_rpc.txt
+++ b/runtime/doc/msgpack_rpc.txt
@@ -270,10 +270,14 @@ a dictionary with these (optional) keys:
 				Defaults to false.
 
 Nvim will then send msgpack-rpc notifications, with the method name "redraw"
-and a single argument, an array of screen updates (described below).
-These should be processed in order. Preferably the user should only be able to
-see the screen state after all updates are processed (not any intermediate
-state after processing only a part of the array).
+and a single argument, an array of screen updates (described below).  These
+should be processed in order. Preferably the user should only be able to see
+the screen state after all updates in the same "redraw" event are processed
+(not any intermediate state after processing only a part of the array).
+
+Future versions of Nvim may add new update kinds and may append new parameters
+to existing update kinds. Clients must be prepared to ignore such extensions
+to be forward-compatible. |api-contract|
 
 Screen updates are arrays. The first element a string describing the kind
 of update.
@@ -387,10 +391,31 @@ of update.
 ["update_menu"]
 	The menu mappings changed.
 
-["mode_change", mode]
-	The mode changed. Currently sent when "insert", "replace", "cmdline" and
-	"normal" modes are entered. A client could for instance change the cursor
-	shape.
+["mode_info_set", cursor_style_enabled, mode_info]
+`mode_info` is an array containing information about various modes, as later
+will be indicated with the `mode_change` update. Currently this primarily
+concerns cursor styles to be set in the different modes. The keys are
+
+	`cursor_shape`:	One of "block", "horizontal" or "vertical"
+	`cell_percentage`:Percentage of the cell taken by the cursor.
+	`blinkwait`, `blinkon`, `blinkoff`: see |cursor-blinking|.
+	`hl_id`:	Highlight group for the cursor.
+	`hl_lm`:	Highlight group for the cursor when langmap is active.
+	`short_name`:	Short name for the mode, as used in 'guicursor'
+			option.
+	`name`:		Full name for the mode.
+	`mouse_shape`:	(To be implemented.)
+
+Not all keys need to be present for all modes. `cursor_style_enabled` is a
+boolean indicating if the ui should change the cursor style.
+
+["mode_change", mode, mode_idx]
+The mode changed.  The first parameter `mode` is a string representing the
+current mode. `mode_idx` is an index into the array received in the
+`mode_info_set` event. UIs should change the cursor style according to the
+properties specified in the corresponding item. The set of modes reported will
+change in new versions of Nvim, for instance more submodes and temporary
+states might be represented as separate modes.
 
 ["popupmenu_show", items, selected, row, col]
 	When `popupmenu_external` is set to true, nvim will not draw the

From 48f0542ad6f923443ab4bba858aae2d9558f8d76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Linse?= <bjorn.linse@gmail.com>
Date: Fri, 21 Apr 2017 10:59:06 +0200
Subject: [PATCH 136/257] tests: detect invalid helpers.sleep

---
 test/functional/ex_cmds/ctrl_c_spec.lua       |  2 +-
 test/functional/helpers.lua                   | 11 ++++++++++-
 test/functional/terminal/ex_terminal_spec.lua |  2 +-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/test/functional/ex_cmds/ctrl_c_spec.lua b/test/functional/ex_cmds/ctrl_c_spec.lua
index 993bfa0dba..091a008814 100644
--- a/test/functional/ex_cmds/ctrl_c_spec.lua
+++ b/test/functional/ex_cmds/ctrl_c_spec.lua
@@ -41,7 +41,7 @@ describe("CTRL-C (mapped)", function()
 
     local function test_ctrl_c(ms)
       feed(":global/^/p<CR>")
-      helpers.sleep(ms)
+      screen:sleep(ms)
       feed("<C-C>")
       screen:expect([[Interrupt]], nil, nil, nil, true)
     end
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 5882758b5a..84e81c5af4 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -392,7 +392,16 @@ end
 
 -- sleeps the test runner (_not_ the nvim instance)
 local function sleep(ms)
-  run(nil, nil, nil, ms)
+  local function notification_cb(method, args)
+    local _ = args
+    if method == "redraw" then
+      error("helpers.sleep() called while screen is attached. "..
+            "Use screen:sleep(...) instead")
+    end
+    return true
+  end
+
+  run(nil, notification_cb, nil, ms)
 end
 
 local function curbuf_contents()
diff --git a/test/functional/terminal/ex_terminal_spec.lua b/test/functional/terminal/ex_terminal_spec.lua
index 1ed63adcfb..be0fd9f8ff 100644
--- a/test/functional/terminal/ex_terminal_spec.lua
+++ b/test/functional/terminal/ex_terminal_spec.lua
@@ -26,7 +26,7 @@ describe(':terminal', function()
     feed_command([[terminal while true; do echo X; done]])
     helpers.feed([[<C-\><C-N>]])
     wait()
-    screen.sleep(10)  -- Let some terminal activity happen.
+    screen:sleep(10)  -- Let some terminal activity happen.
     feed_command("messages")
     screen:expect([[
       msg1                                              |

From a396874da0efaeb7def5e26afab9ae1c980510a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Othon=20Brigan=C3=B3?= <othonalberto@gmail.com>
Date: Fri, 21 Apr 2017 10:21:02 -0300
Subject: [PATCH 137/257] refactor/single-include: getchar.h (#6560)

---
 src/nvim/CMakeLists.txt | 1 -
 src/nvim/getchar.h      | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index a91657f1bd..e4b3b4de13 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -429,7 +429,6 @@ function(get_test_target prefix sfile relative_path_var target_var)
 endfunction()
 
 set(NO_SINGLE_CHECK_HEADERS
-  getchar.h
   if_cscope_defs.h
   misc2.h
   msgpack_rpc/server.h
diff --git a/src/nvim/getchar.h b/src/nvim/getchar.h
index bdf65909b6..28584e0534 100644
--- a/src/nvim/getchar.h
+++ b/src/nvim/getchar.h
@@ -1,6 +1,10 @@
 #ifndef NVIM_GETCHAR_H
 #define NVIM_GETCHAR_H
 
+#include "nvim/types.h"
+#include "nvim/buffer_defs.h"
+#include "nvim/ex_cmds_defs.h"
+
 /* Values for "noremap" argument of ins_typebuf().  Also used for
  * map->m_noremap and menu->noremap[]. */
 #define REMAP_YES       0       /* allow remapping */
@@ -12,6 +16,7 @@
 #define KEYLEN_PART_MAP -2      /* keylen value for incomplete mapping */
 #define KEYLEN_REMOVED  9999    /* keylen value for removed sequence */
 
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "getchar.h.generated.h"
 #endif

From f50e03f2e35cf4bee8cedb2c95bf9619f3b57bc2 Mon Sep 17 00:00:00 2001
From: sander2 <sanderbosma@gmail.com>
Date: Fri, 21 Apr 2017 15:45:51 +0200
Subject: [PATCH 138/257] ex_cmds.c: Fix bug in ex_z (#6557)

vim-patch:8.0.0571
---
 src/nvim/ex_cmds.c                              | 12 +++++++++---
 test/functional/ex_cmds/print_commands_spec.lua | 12 ++++++++++++
 2 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 test/functional/ex_cmds/print_commands_spec.lua

diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 117ef6a507..7726e0fc6d 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -2877,8 +2877,11 @@ void ex_z(exarg_T *eap)
   if (end > curbuf->b_ml.ml_line_count)
     end = curbuf->b_ml.ml_line_count;
 
-  if (curs > curbuf->b_ml.ml_line_count)
+  if (curs > curbuf->b_ml.ml_line_count) {
     curs = curbuf->b_ml.ml_line_count;
+  } else if (curs < 1) {
+    curs = 1;
+  }
 
   for (i = start; i <= end; i++) {
     if (minus && i == lnum) {
@@ -2898,8 +2901,11 @@ void ex_z(exarg_T *eap)
     }
   }
 
-  curwin->w_cursor.lnum = curs;
-  ex_no_reprint = TRUE;
+  if (curwin->w_cursor.lnum != curs) {
+    curwin->w_cursor.lnum = curs;
+    curwin->w_cursor.col = 0;
+  }
+  ex_no_reprint = true;
 }
 
 /*
diff --git a/test/functional/ex_cmds/print_commands_spec.lua b/test/functional/ex_cmds/print_commands_spec.lua
new file mode 100644
index 0000000000..98c0f74635
--- /dev/null
+++ b/test/functional/ex_cmds/print_commands_spec.lua
@@ -0,0 +1,12 @@
+local helpers = require('test.functional.helpers')(after_each)
+local clear, eq, command, funcs =
+  helpers.clear, helpers.eq, helpers.command, helpers.funcs
+
+describe(':z^', function()
+  before_each(clear)
+
+  it('correctly sets the cursor after :z^', function()
+    command('z^')
+    eq(1, funcs.line('.'))
+  end)
+end)

From 654c50b227b7616300763da75ad4a79151883694 Mon Sep 17 00:00:00 2001
From: relnod <relnod@users.noreply.github.com>
Date: Sat, 22 Apr 2017 15:43:35 +0200
Subject: [PATCH 139/257] refactor/single-include: window.h, version.h (#6570)

---
 src/nvim/CMakeLists.txt | 2 --
 src/nvim/version.h      | 2 ++
 src/nvim/window.h       | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index e4b3b4de13..04fe56952f 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -456,8 +456,6 @@ set(NO_SINGLE_CHECK_HEADERS
   ui_bridge.h
   undo.h
   undo_defs.h
-  version.h
-  window.h
 )
 foreach(hfile ${NVIM_HEADERS})
   get_test_target(test-includes "${hfile}" relative_path texe)
diff --git a/src/nvim/version.h b/src/nvim/version.h
index 1de809e539..a0babfb156 100644
--- a/src/nvim/version.h
+++ b/src/nvim/version.h
@@ -1,6 +1,8 @@
 #ifndef NVIM_VERSION_H
 #define NVIM_VERSION_H
 
+#include "nvim/ex_cmds_defs.h"
+
 // defined in version.c
 extern char* Version;
 extern char* longVersion;
diff --git a/src/nvim/window.h b/src/nvim/window.h
index 2ac4c00c28..82b3fe5e88 100644
--- a/src/nvim/window.h
+++ b/src/nvim/window.h
@@ -3,6 +3,8 @@
 
 #include <stdbool.h>
 
+#include "nvim/buffer_defs.h"
+
 /* Values for file_name_in_line() */
 #define FNAME_MESS      1       /* give error message */
 #define FNAME_EXP       2       /* expand to path */

From e41c044b530d2cc3f548fcef07862640eb249c58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Othon=20Brigan=C3=B3?= <othonalberto@gmail.com>
Date: Sat, 22 Apr 2017 10:44:58 -0300
Subject: [PATCH 140/257] refactor/single-include (#6563)

---
 src/nvim/CMakeLists.txt | 3 ---
 src/nvim/screen.h       | 4 ++++
 src/nvim/search.h       | 6 ++++++
 src/nvim/syntax.h       | 2 +-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 04fe56952f..597864845e 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -440,13 +440,10 @@ set(NO_SINGLE_CHECK_HEADERS
   quickfix.h
   regexp.h
   regexp_defs.h
-  screen.h
-  search.h
   sha256.h
   sign_defs.h
   spell.h
   spellfile.h
-  syntax.h
   syntax_defs.h
   tag.h
   terminal.h
diff --git a/src/nvim/screen.h b/src/nvim/screen.h
index 81a8b9ed4c..17515d4253 100644
--- a/src/nvim/screen.h
+++ b/src/nvim/screen.h
@@ -3,6 +3,10 @@
 
 #include <stdbool.h>
 
+#include "nvim/types.h"
+#include "nvim/buffer_defs.h"
+#include "nvim/pos.h"
+
 /*
  * flags for update_screen()
  * The higher the value, the higher the priority
diff --git a/src/nvim/search.h b/src/nvim/search.h
index d4e40cb287..cb50742990 100644
--- a/src/nvim/search.h
+++ b/src/nvim/search.h
@@ -4,6 +4,12 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "nvim/types.h"
+#include "nvim/buffer_defs.h"
+#include "nvim/eval/typval.h"
+#include "nvim/normal.h"
+#include "nvim/os/time.h"
+
 /* Values for the find_pattern_in_path() function args 'type' and 'action': */
 #define FIND_ANY        1
 #define FIND_DEFINE     2
diff --git a/src/nvim/syntax.h b/src/nvim/syntax.h
index 574e3372e2..bb733ead30 100644
--- a/src/nvim/syntax.h
+++ b/src/nvim/syntax.h
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 
 #include "nvim/buffer_defs.h"
-
+#include "nvim/ex_cmds_defs.h"
 
 /// Terminal highlighting attribute bits.
 /// Attributes above HL_ALL are used for syntax highlighting.

From 1e83add288b4f9183d39387356fc7e8f294d5d4b Mon Sep 17 00:00:00 2001
From: relnod <mail@paul-schiffers.de>
Date: Sat, 22 Apr 2017 16:55:28 +0200
Subject: [PATCH 141/257] refactor/single-include: ui.h, ui_bridge.h, ugrid.h
 (#6571)

---
 src/nvim/CMakeLists.txt | 3 ---
 src/nvim/ui.h           | 1 +
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 597864845e..db5e62fd67 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -448,9 +448,6 @@ set(NO_SINGLE_CHECK_HEADERS
   tag.h
   terminal.h
   tui/tui.h
-  ugrid.h
-  ui.h
-  ui_bridge.h
   undo.h
   undo_defs.h
 )
diff --git a/src/nvim/ui.h b/src/nvim/ui.h
index f5cbf748ee..fcf52ac9e1 100644
--- a/src/nvim/ui.h
+++ b/src/nvim/ui.h
@@ -6,6 +6,7 @@
 #include <stdint.h>
 
 #include "api/private/defs.h"
+#include "nvim/buffer_defs.h"
 
 typedef struct {
   bool bold, underline, undercurl, italic, reverse;

From c703d0529b3c4f6485d6ce6f37033d4658356b05 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 22 Apr 2017 18:19:37 +0200
Subject: [PATCH 142/257] 'guicursor': iTerm: Set cursor color.

iTerm uses proprietary escape codes to set cursor color.
https://www.iterm2.com/documentation-escape-codes.html
---
 src/nvim/tui/tui.c | 53 ++++++++++++++++++++++++++++++++++++----------
 1 file changed, 42 insertions(+), 11 deletions(-)

diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index 6ea6376202..ae7551098d 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -43,6 +43,15 @@
 #define OUTBUF_SIZE 0xffff
 
 #define TOO_MANY_EVENTS 1000000
+#define STARTS_WITH(str, prefix) (!memcmp(str, prefix, sizeof(prefix) - 1))
+
+typedef enum TermType {
+  kTermUnknown,
+  kTermGnome,
+  kTermiTerm,
+  kTermKonsole,
+  kTermRxvt,
+} TermType;
 
 typedef struct {
   int top, bot, left, right;
@@ -77,6 +86,7 @@ typedef struct {
   cursorentry_T cursor_shapes[SHAPE_IDX_COUNT];
   HlAttrs print_attrs;
   ModeShape showing_mode;
+  TermType term;
   struct {
     int enable_mouse, disable_mouse;
     int enable_bracketed_paste, disable_bracketed_paste;
@@ -528,7 +538,6 @@ static void tui_mouse_off(UI *ui)
   }
 }
 
-/// @param mode one of SHAPE_XXX
 static void tui_set_mode(UI *ui, ModeShape mode)
 {
   if (!cursor_style_enabled) {
@@ -537,14 +546,14 @@ static void tui_set_mode(UI *ui, ModeShape mode)
   TUIData *data = ui->data;
   cursorentry_T c = data->cursor_shapes[mode];
   int shape = c.shape;
-  bool inside_tmux = os_getenv("TMUX") != NULL;
+  bool is_tmux = os_getenv("TMUX") != NULL;
   unibi_var_t vars[26 + 26] = { { 0 } };
 
-# define TMUX_WRAP(seq) (inside_tmux ? "\x1bPtmux;\x1b" seq "\x1b\\" : seq)
+# define TMUX_WRAP(seq) (is_tmux ? "\x1bPtmux;\x1b" seq "\x1b\\" : seq)
   // Support changing cursor shape on some popular terminals.
   const char *vte_version = os_getenv("VTE_VERSION");
 
-  if (os_getenv("KONSOLE_PROFILE_NAME") || os_getenv("KONSOLE_DBUS_SESSION")) {
+  if (data->term == kTermKonsole) {
     // Konsole uses a proprietary escape code to set the cursor shape
     // and does not support DECSCUSR.
     switch (shape) {
@@ -921,6 +930,24 @@ static void unibi_set_if_empty(unibi_term *ut, enum unibi_string str,
   }
 }
 
+static TermType detect_term(const char *term, const char *colorterm)
+{
+  if (STARTS_WITH(term, "rxvt")) {
+    return kTermRxvt;
+  }
+  if (os_getenv("KONSOLE_PROFILE_NAME") || os_getenv("KONSOLE_DBUS_SESSION")) {
+    return kTermKonsole;
+  }
+  const char *termprg = os_getenv("TERM_PROGRAM");
+  if (termprg && strstr(termprg, "iTerm.app")) {
+    return kTermiTerm;
+  }
+  if (colorterm && strstr(colorterm, "gnome-terminal")) {
+    return kTermGnome;
+  }
+  return kTermUnknown;
+}
+
 static void fix_terminfo(TUIData *data)
 {
   unibi_term *ut = data->ut;
@@ -930,10 +957,9 @@ static void fix_terminfo(TUIData *data)
   if (!term) {
     goto end;
   }
+  data->term = detect_term(term, colorterm);
 
-#define STARTS_WITH(str, prefix) (!memcmp(str, prefix, sizeof(prefix) - 1))
-
-  if (STARTS_WITH(term, "rxvt")) {
+  if (data->term == kTermRxvt) {
     unibi_set_if_empty(ut, unibi_exit_attribute_mode, "\x1b[m\x1b(B");
     unibi_set_if_empty(ut, unibi_flash_screen, "\x1b[?5h$<20/>\x1b[?5l");
     unibi_set_if_empty(ut, unibi_enter_italics_mode, "\x1b[3m");
@@ -945,7 +971,7 @@ static void fix_terminfo(TUIData *data)
     unibi_set_if_empty(ut, unibi_from_status_line, "\x1b\\");
   }
 
-  if (STARTS_WITH(term, "xterm") || STARTS_WITH(term, "rxvt")) {
+  if (STARTS_WITH(term, "xterm") || data->term == kTermRxvt) {
     const char *normal = unibi_get_str(ut, unibi_cursor_normal);
     if (!normal) {
       unibi_set_str(ut, unibi_cursor_normal, "\x1b[?25h");
@@ -982,7 +1008,7 @@ static void fix_terminfo(TUIData *data)
   if ((colorterm && strstr(colorterm, "256"))
       || strstr(term, "256")
       || strstr(term, "xterm")) {
-    // Assume TERM~=xterm or COLORTERM~=256 supports 256 colors.
+    // Assume TERM=~xterm or COLORTERM=~256 supports 256 colors.
     unibi_set_num(ut, unibi_max_colors, 256);
     unibi_set_str(ut, unibi_set_a_foreground, XTERM_SETAF);
     unibi_set_str(ut, unibi_set_a_background, XTERM_SETAB);
@@ -990,8 +1016,13 @@ static void fix_terminfo(TUIData *data)
 
 end:
   // Fill some empty slots with common terminal strings
-  data->unibi_ext.set_cursor_color = (int)unibi_add_ext_str(
-      ut, NULL, "\033]12;#%p1%06x\007");
+  if (data->term == kTermiTerm) {
+    data->unibi_ext.set_cursor_color = (int)unibi_add_ext_str(
+        ut, NULL, "\033]Pl%p1%06x\033\\");
+  } else {
+    data->unibi_ext.set_cursor_color = (int)unibi_add_ext_str(
+        ut, NULL, "\033]12;#%p1%06x\007");
+  }
   data->unibi_ext.enable_mouse = (int)unibi_add_ext_str(ut, NULL,
       "\x1b[?1002h\x1b[?1006h");
   data->unibi_ext.disable_mouse = (int)unibi_add_ext_str(ut, NULL,

From 719095d7d33a05679f47f5adc1309b5432529385 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 22 Apr 2017 18:53:01 +0200
Subject: [PATCH 143/257] os_term_is_nice: Return true for rxvt and iTerm.

---
 src/nvim/os/env.c | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/src/nvim/os/env.c b/src/nvim/os/env.c
index 72bd0bf788..8f7a6e72b5 100644
--- a/src/nvim/os/env.c
+++ b/src/nvim/os/env.c
@@ -915,9 +915,20 @@ bool os_term_is_nice(void)
   return true;
 #else
   const char *vte_version = os_getenv("VTE_VERSION");
-  return (vte_version && atoi(vte_version) >= 3900)
-    || NULL != os_getenv("KONSOLE_PROFILE_NAME")
-    || NULL != os_getenv("KONSOLE_DBUS_SESSION");
+  if ((vte_version && atoi(vte_version) >= 3900)
+      || os_getenv("KONSOLE_PROFILE_NAME")
+      || os_getenv("KONSOLE_DBUS_SESSION")) {
+    return true;
+  }
+  const char *termprg = os_getenv("TERM_PROGRAM");
+  if (termprg && striequal(termprg, "iTerm.app")) {
+    return true;
+  }
+  const char *term = os_getenv("TERM");
+  if (term && strncmp(term, "rxvt", 4) == 0) {
+    return true;
+  }
+  return false;
 #endif
 }
 

From 1fe8945748620713402cab77a46501ec5311778b Mon Sep 17 00:00:00 2001
From: Patrick Jackson <PatrickSJackson@gmail.com>
Date: Sat, 22 Apr 2017 17:32:56 -0700
Subject: [PATCH 144/257] refactor: Remove unused MAP_IMPL. (#6573)

---
 src/nvim/map.c | 1 -
 src/nvim/map.h | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/nvim/map.c b/src/nvim/map.c
index 54a9e559af..366b286d14 100644
--- a/src/nvim/map.c
+++ b/src/nvim/map.c
@@ -142,7 +142,6 @@ static inline bool String_eq(String a, String b)
 
 
 MAP_IMPL(int, int, DEFAULT_INITIALIZER)
-MAP_IMPL(cstr_t, uint64_t, DEFAULT_INITIALIZER)
 MAP_IMPL(cstr_t, ptr_t, DEFAULT_INITIALIZER)
 MAP_IMPL(ptr_t, ptr_t, DEFAULT_INITIALIZER)
 MAP_IMPL(uint64_t, ptr_t, DEFAULT_INITIALIZER)
diff --git a/src/nvim/map.h b/src/nvim/map.h
index ba3e84cb31..a4fccf47f9 100644
--- a/src/nvim/map.h
+++ b/src/nvim/map.h
@@ -25,7 +25,6 @@
   void map_##T##_##U##_clear(Map(T, U) *map);
 
 MAP_DECLS(int, int)
-MAP_DECLS(cstr_t, uint64_t)
 MAP_DECLS(cstr_t, ptr_t)
 MAP_DECLS(ptr_t, ptr_t)
 MAP_DECLS(uint64_t, ptr_t)

From 45240538742d6276ab25abe0d8b02550e1c68179 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 21 Apr 2017 14:58:52 +0200
Subject: [PATCH 145/257] test: api: Do not truncate errors <1 MB.

---
 test/functional/api/vim_spec.lua | 9 ++++++++-
 test/functional/ui/screen.lua    | 5 +++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 8f9f155110..60f30dcfe6 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -412,7 +412,7 @@ describe('api', function()
       eq(5, meths.get_var('avar'))
     end)
 
-    it('throws error on malformated arguments', function()
+    it('throws error on malformed arguments', function()
       local req = {
         {'nvim_set_var', {'avar', 1}},
         {'nvim_set_var'},
@@ -452,6 +452,13 @@ describe('api', function()
     ok(err:match('Invalid option name') ~= nil)
   end)
 
+  it('does not truncate error message <1 MB #5984', function()
+    local very_long_name = 'A'..('x'):rep(10000)..'Z'
+    local status, err = pcall(nvim, 'get_option', very_long_name)
+    eq(false, status)
+    eq(very_long_name, err:match('Ax+Z?'))
+  end)
+
   it("doesn't leak memory on incorrect argument types", function()
     local status, err = pcall(nvim, 'set_current_dir',{'not', 'a', 'dir'})
     eq(false, status)
diff --git a/test/functional/ui/screen.lua b/test/functional/ui/screen.lua
index bcf2a2e3d6..7d9cd6c026 100644
--- a/test/functional/ui/screen.lua
+++ b/test/functional/ui/screen.lua
@@ -312,12 +312,13 @@ function Screen:_redraw(updates)
     -- print(require('inspect')(update))
     local method = update[1]
     for i = 2, #update do
-      local handler = self['_handle_'..method]
+      local handler_name = '_handle_'..method
+      local handler = self[handler_name]
       if handler ~= nil then
         handler(self, unpack(update[i]))
       else
         assert(self._on_event,
-          "Add Screen:_handle_XXX method or call Screen:set_on_event_handler")
+          "Add Screen:"..handler_name.." or call Screen:set_on_event_handler")
         self._on_event(method, update[i])
       end
     end

From 5c9860a0a2bf27d409c986673f0a74542561c4c3 Mon Sep 17 00:00:00 2001
From: Sander Bosma <sanderbosma@gmail.com>
Date: Wed, 1 Mar 2017 10:43:47 +0100
Subject: [PATCH 146/257] api: Do not truncate errors <1 MB. #6237

Closes #5984
---
 scripts/gendispatch.lua                   |   6 +-
 src/nvim/api/buffer.c                     |  44 +++++----
 src/nvim/api/private/defs.h               |   4 +-
 src/nvim/api/private/helpers.c            | 113 +++++++++++++---------
 src/nvim/api/private/helpers.h            |  10 --
 src/nvim/api/tabpage.c                    |   4 +-
 src/nvim/api/ui.c                         |  18 ++--
 src/nvim/api/vim.c                        |  44 +++++----
 src/nvim/api/window.c                     |  16 +--
 src/nvim/eval.c                           |   5 +-
 src/nvim/msgpack_rpc/channel.c            |  73 +++++++-------
 src/nvim/msgpack_rpc/helpers.c            |  22 ++---
 src/nvim/terminal.c                       |  10 +-
 src/nvim/tui/input.c                      |   2 +-
 test/functional/provider/python3_spec.lua |  10 ++
 15 files changed, 209 insertions(+), 172 deletions(-)

diff --git a/scripts/gendispatch.lua b/scripts/gendispatch.lua
index 45a4f4a4de..683962aa60 100644
--- a/scripts/gendispatch.lua
+++ b/scripts/gendispatch.lua
@@ -225,8 +225,7 @@ for i = 1, #functions do
     end
     output:write('\n')
     output:write('\n  if (args.size != '..#fn.parameters..') {')
-    output:write('\n    snprintf(error->msg, sizeof(error->msg), "Wrong number of arguments: expecting '..#fn.parameters..' but got %zu", args.size);')
-    output:write('\n    error->set = true;')
+    output:write('\n    _api_set_error(error, error->type, "Wrong number of arguments: expecting '..#fn.parameters..' but got %zu", args.size);')
     output:write('\n    goto cleanup;')
     output:write('\n  }\n')
 
@@ -251,8 +250,7 @@ for i = 1, #functions do
           output:write('\n    '..converted..' = (handle_T)args.items['..(j - 1)..'].data.integer;')
         end
         output:write('\n  } else {')
-        output:write('\n    snprintf(error->msg, sizeof(error->msg), "Wrong type for argument '..j..', expecting '..param[1]..'");')
-        output:write('\n    error->set = true;')
+        output:write('\n    _api_set_error(error, error->type, "Wrong type for argument '..j..', expecting '..param[1]..'");')
         output:write('\n    goto cleanup;')
         output:write('\n  }\n')
       else
diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index 1b3592679b..2f306ebfc8 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -171,7 +171,7 @@ ArrayOf(String) nvim_buf_get_lines(uint64_t channel_id,
   end = normalize_index(buf, end, &oob);
 
   if (strict_indexing && oob) {
-    api_set_error(err, Validation, _("Index out of bounds"));
+    _api_set_error(err, kErrorTypeValidation, _("Index out of bounds"));
     return rv;
   }
 
@@ -187,7 +187,7 @@ ArrayOf(String) nvim_buf_get_lines(uint64_t channel_id,
     int64_t lnum = start + (int64_t)i;
 
     if (lnum > LONG_MAX) {
-      api_set_error(err, Validation, _("Line index is too high"));
+      _api_set_error(err, kErrorTypeValidation, _("Line index is too high"));
       goto end;
     }
 
@@ -283,14 +283,14 @@ void nvim_buf_set_lines(uint64_t channel_id,
   end = normalize_index(buf, end, &oob);
 
   if (strict_indexing && oob) {
-    api_set_error(err, Validation, _("Index out of bounds"));
+    _api_set_error(err, kErrorTypeValidation, _("Index out of bounds"));
     return;
   }
 
 
   if (start > end) {
-    api_set_error(err,
-                  Validation,
+    _api_set_error(err,
+                  kErrorTypeValidation,
                   _("Argument \"start\" is higher than \"end\""));
     return;
   }
@@ -304,8 +304,8 @@ void nvim_buf_set_lines(uint64_t channel_id,
 
   for (size_t i = 0; i < new_len; i++) {
     if (replacement.items[i].type != kObjectTypeString) {
-      api_set_error(err,
-                    Validation,
+      _api_set_error(err,
+                    kErrorTypeValidation,
                     _("All items in the replacement array must be strings"));
       goto end;
     }
@@ -317,7 +317,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
     lines[i] = xmallocz(l.size);
     for (size_t j = 0; j < l.size; j++) {
       if (l.data[j] == '\n' && channel_id != INTERNAL_CALL) {
-        api_set_error(err, Exception, _("string cannot contain newlines"));
+        _api_set_error(err, kErrorTypeException, _("string cannot contain newlines"));
         new_len = i + 1;
         goto end;
       }
@@ -330,7 +330,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
   switch_to_win_for_buf(buf, &save_curwin, &save_curtab, &save_curbuf);
 
   if (u_save((linenr_T)(start - 1), (linenr_T)end) == FAIL) {
-    api_set_error(err, Exception, _("Failed to save undo information"));
+    _api_set_error(err, kErrorTypeException, _("Failed to save undo information"));
     goto end;
   }
 
@@ -340,7 +340,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
   size_t to_delete = (new_len < old_len) ? (size_t)(old_len - new_len) : 0;
   for (size_t i = 0; i < to_delete; i++) {
     if (ml_delete((linenr_T)start, false) == FAIL) {
-      api_set_error(err, Exception, _("Failed to delete line"));
+      _api_set_error(err, kErrorTypeException, _("Failed to delete line"));
       goto end;
     }
   }
@@ -357,12 +357,12 @@ void nvim_buf_set_lines(uint64_t channel_id,
     int64_t lnum = start + (int64_t)i;
 
     if (lnum > LONG_MAX) {
-      api_set_error(err, Validation, _("Index value is too high"));
+      _api_set_error(err, kErrorTypeValidation, _("Index value is too high"));
       goto end;
     }
 
     if (ml_replace((linenr_T)lnum, (char_u *)lines[i], false) == FAIL) {
-      api_set_error(err, Exception, _("Failed to replace line"));
+      _api_set_error(err, kErrorTypeException, _("Failed to replace line"));
       goto end;
     }
     // Mark lines that haven't been passed to the buffer as they need
@@ -375,12 +375,12 @@ void nvim_buf_set_lines(uint64_t channel_id,
     int64_t lnum = start + (int64_t)i - 1;
 
     if (lnum > LONG_MAX) {
-      api_set_error(err, Validation, _("Index value is too high"));
+      _api_set_error(err, kErrorTypeValidation, _("Index value is too high"));
       goto end;
     }
 
     if (ml_append((linenr_T)lnum, (char_u *)lines[i], 0, false) == FAIL) {
-      api_set_error(err, Exception, _("Failed to insert line"));
+      _api_set_error(err, kErrorTypeException, _("Failed to insert line"));
       goto end;
     }
 
@@ -627,7 +627,7 @@ void nvim_buf_set_name(Buffer buffer, String name, Error *err)
   }
 
   if (ren_ret == FAIL) {
-    api_set_error(err, Exception, _("Failed to rename buffer"));
+    _api_set_error(err, kErrorTypeException, _("Failed to rename buffer"));
   }
 }
 
@@ -639,7 +639,9 @@ Boolean nvim_buf_is_valid(Buffer buffer)
     FUNC_API_SINCE(1)
 {
   Error stub = ERROR_INIT;
-  return find_buffer_by_handle(buffer, &stub) != NULL;
+  Boolean ret = find_buffer_by_handle(buffer, &stub) != NULL;
+  xfree(stub.msg);
+  return ret;
 }
 
 /// Inserts a sequence of lines to a buffer at a certain index
@@ -678,7 +680,7 @@ ArrayOf(Integer, 2) nvim_buf_get_mark(Buffer buffer, String name, Error *err)
   }
 
   if (name.size != 1) {
-    api_set_error(err, Validation, _("Mark name must be a single character"));
+    _api_set_error(err, kErrorTypeValidation, _("Mark name must be a single character"));
     return rv;
   }
 
@@ -696,7 +698,7 @@ ArrayOf(Integer, 2) nvim_buf_get_mark(Buffer buffer, String name, Error *err)
   }
 
   if (posp == NULL) {
-    api_set_error(err, Validation, _("Invalid mark name"));
+    _api_set_error(err, kErrorTypeValidation, _("Invalid mark name"));
     return rv;
   }
 
@@ -751,11 +753,11 @@ Integer nvim_buf_add_highlight(Buffer buffer,
   }
 
   if (line < 0 || line >= MAXLNUM) {
-    api_set_error(err, Validation, _("Line number outside range"));
+    _api_set_error(err, kErrorTypeValidation, _("Line number outside range"));
     return 0;
   }
   if (col_start < 0 || col_start > MAXCOL) {
-    api_set_error(err, Validation, _("Column value outside range"));
+    _api_set_error(err, kErrorTypeValidation, _("Column value outside range"));
     return 0;
   }
   if (col_end < 0 || col_end > MAXCOL) {
@@ -792,7 +794,7 @@ void nvim_buf_clear_highlight(Buffer buffer,
   }
 
   if (line_start < 0 || line_start >= MAXLNUM) {
-    api_set_error(err, Validation, _("Line number outside range"));
+    _api_set_error(err, kErrorTypeValidation, _("Line number outside range"));
     return;
   }
   if (line_end < 0 || line_end > MAXLNUM) {
diff --git a/src/nvim/api/private/defs.h b/src/nvim/api/private/defs.h
index 223aab09dc..a07422bd12 100644
--- a/src/nvim/api/private/defs.h
+++ b/src/nvim/api/private/defs.h
@@ -8,7 +8,7 @@
 #define ARRAY_DICT_INIT {.size = 0, .capacity = 0, .items = NULL}
 #define STRING_INIT {.data = NULL, .size = 0}
 #define OBJECT_INIT { .type = kObjectTypeNil }
-#define ERROR_INIT { .set = false }
+#define ERROR_INIT { .set = false, .msg = NULL }
 #define REMOTE_TYPE(type) typedef handle_T type
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
@@ -38,7 +38,7 @@ typedef enum {
 
 typedef struct {
   ErrorType type;
-  char msg[1024];
+  char *msg;
   bool set;
 } Error;
 
diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index 5877b848fc..e6632525e1 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -61,7 +61,7 @@ bool try_end(Error *err)
       discard_current_exception();
     }
 
-    api_set_error(err, Exception, _("Keyboard interrupt"));
+    _api_set_error(err, kErrorTypeException, _("Keyboard interrupt"));
     got_int = false;
   } else if (msg_list != NULL && *msg_list != NULL) {
     int should_free;
@@ -69,15 +69,14 @@ bool try_end(Error *err)
                                              ET_ERROR,
                                              NULL,
                                              &should_free);
-    xstrlcpy(err->msg, msg, sizeof(err->msg));
-    err->set = true;
+    _api_set_error(err, err->type, "%s", msg);
     free_global_msglist();
 
     if (should_free) {
       xfree(msg);
     }
   } else if (did_throw) {
-    api_set_error(err, Exception, "%s", current_exception->value);
+    _api_set_error(err, kErrorTypeException, "%s", current_exception->value);
     discard_current_exception();
   }
 
@@ -94,7 +93,7 @@ Object dict_get_value(dict_T *dict, String key, Error *err)
   dictitem_T *const di = tv_dict_find(dict, key.data, (ptrdiff_t)key.size);
 
   if (di == NULL) {
-    api_set_error(err, Validation, _("Key not found"));
+    _api_set_error(err, kErrorTypeValidation, _("Key not found"));
     return (Object) OBJECT_INIT;
   }
 
@@ -118,17 +117,17 @@ Object dict_set_var(dict_T *dict, String key, Object value, bool del,
   Object rv = OBJECT_INIT;
 
   if (dict->dv_lock) {
-    api_set_error(err, Exception, _("Dictionary is locked"));
+    _api_set_error(err, kErrorTypeException, _("Dictionary is locked"));
     return rv;
   }
 
   if (key.size == 0) {
-    api_set_error(err, Validation, _("Empty variable names aren't allowed"));
+    _api_set_error(err, kErrorTypeValidation, _("Empty variable names aren't allowed"));
     return rv;
   }
 
   if (key.size > INT_MAX) {
-    api_set_error(err, Validation, _("Key length is too high"));
+    _api_set_error(err, kErrorTypeValidation, _("Key length is too high"));
     return rv;
   }
 
@@ -136,13 +135,13 @@ Object dict_set_var(dict_T *dict, String key, Object value, bool del,
 
   if (di != NULL) {
     if (di->di_flags & DI_FLAGS_RO) {
-      api_set_error(err, Exception, _("Key is read-only: %s"), key.data);
+      _api_set_error(err, kErrorTypeException, _("Key is read-only: %s"), key.data);
       return rv;
     } else if (di->di_flags & DI_FLAGS_FIX) {
-      api_set_error(err, Exception, _("Key is fixed: %s"), key.data);
+      _api_set_error(err, kErrorTypeException, _("Key is fixed: %s"), key.data);
       return rv;
     } else if (di->di_flags & DI_FLAGS_LOCK) {
-      api_set_error(err, Exception, _("Key is locked: %s"), key.data);
+      _api_set_error(err, kErrorTypeException, _("Key is locked: %s"), key.data);
       return rv;
     }
   }
@@ -151,7 +150,7 @@ Object dict_set_var(dict_T *dict, String key, Object value, bool del,
     // Delete the key
     if (di == NULL) {
       // Doesn't exist, fail
-      api_set_error(err, Validation, _("Key \"%s\" doesn't exist"), key.data);
+      _api_set_error(err, kErrorTypeValidation, _("Key \"%s\" doesn't exist"), key.data);
     } else {
       // Return the old value
       if (retval) {
@@ -203,7 +202,7 @@ Object get_option_from(void *from, int type, String name, Error *err)
   Object rv = OBJECT_INIT;
 
   if (name.size == 0) {
-    api_set_error(err, Validation, _("Empty option name"));
+    _api_set_error(err, kErrorTypeValidation, _("Empty option name"));
     return rv;
   }
 
@@ -214,8 +213,8 @@ Object get_option_from(void *from, int type, String name, Error *err)
                                       type, from);
 
   if (!flags) {
-    api_set_error(err,
-                  Validation,
+    _api_set_error(err,
+                  kErrorTypeValidation,
                   _("Invalid option name \"%s\""),
                   name.data);
     return rv;
@@ -233,14 +232,14 @@ Object get_option_from(void *from, int type, String name, Error *err)
       rv.data.string.data = stringval;
       rv.data.string.size = strlen(stringval);
     } else {
-      api_set_error(err,
-                    Exception,
+      _api_set_error(err,
+                    kErrorTypeException,
                     _("Unable to get value for option \"%s\""),
                     name.data);
     }
   } else {
-    api_set_error(err,
-                  Exception,
+    _api_set_error(err,
+                  kErrorTypeException,
                   _("Unknown type for option \"%s\""),
                   name.data);
   }
@@ -258,15 +257,15 @@ Object get_option_from(void *from, int type, String name, Error *err)
 void set_option_to(void *to, int type, String name, Object value, Error *err)
 {
   if (name.size == 0) {
-    api_set_error(err, Validation, _("Empty option name"));
+    _api_set_error(err, kErrorTypeValidation, _("Empty option name"));
     return;
   }
 
   int flags = get_option_value_strict(name.data, NULL, NULL, type, to);
 
   if (flags == 0) {
-    api_set_error(err,
-                  Validation,
+    _api_set_error(err,
+                  kErrorTypeValidation,
                   _("Invalid option name \"%s\""),
                   name.data);
     return;
@@ -274,14 +273,14 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
 
   if (value.type == kObjectTypeNil) {
     if (type == SREQ_GLOBAL) {
-      api_set_error(err,
-                    Exception,
+      _api_set_error(err,
+                    kErrorTypeException,
                     _("Unable to unset option \"%s\""),
                     name.data);
       return;
     } else if (!(flags & SOPT_GLOBAL)) {
-      api_set_error(err,
-                    Exception,
+      _api_set_error(err,
+                    kErrorTypeException,
                     _("Cannot unset option \"%s\" "
                       "because it doesn't have a global value"),
                     name.data);
@@ -296,8 +295,8 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
 
   if (flags & SOPT_BOOL) {
     if (value.type != kObjectTypeBoolean) {
-      api_set_error(err,
-                    Validation,
+      _api_set_error(err,
+                    kErrorTypeValidation,
                     _("Option \"%s\" requires a boolean value"),
                     name.data);
       return;
@@ -307,16 +306,16 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
     set_option_value_for(name.data, val, NULL, opt_flags, type, to, err);
   } else if (flags & SOPT_NUM) {
     if (value.type != kObjectTypeInteger) {
-      api_set_error(err,
-                    Validation,
+      _api_set_error(err,
+                    kErrorTypeValidation,
                     _("Option \"%s\" requires an integer value"),
                     name.data);
       return;
     }
 
     if (value.data.integer > INT_MAX || value.data.integer < INT_MIN) {
-      api_set_error(err,
-                    Validation,
+      _api_set_error(err,
+                    kErrorTypeValidation,
                     _("Value for option \"%s\" is outside range"),
                     name.data);
       return;
@@ -326,8 +325,8 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
     set_option_value_for(name.data, val, NULL, opt_flags, type, to, err);
   } else {
     if (value.type != kObjectTypeString) {
-      api_set_error(err,
-                    Validation,
+      _api_set_error(err,
+                    kErrorTypeValidation,
                     _("Option \"%s\" requires a string value"),
                     name.data);
       return;
@@ -561,13 +560,13 @@ buf_T *find_buffer_by_handle(Buffer buffer, Error *err)
   buf_T *rv = handle_get_buffer(buffer);
 
   if (!rv) {
-    api_set_error(err, Validation, _("Invalid buffer id"));
+    _api_set_error(err, kErrorTypeValidation, _("Invalid buffer id"));
   }
 
   return rv;
 }
 
-win_T * find_window_by_handle(Window window, Error *err)
+win_T *find_window_by_handle(Window window, Error *err)
 {
   if (window == 0) {
     return curwin;
@@ -576,13 +575,13 @@ win_T * find_window_by_handle(Window window, Error *err)
   win_T *rv = handle_get_window(window);
 
   if (!rv) {
-    api_set_error(err, Validation, _("Invalid window id"));
+    _api_set_error(err, kErrorTypeValidation, _("Invalid window id"));
   }
 
   return rv;
 }
 
-tabpage_T * find_tab_by_handle(Tabpage tabpage, Error *err)
+tabpage_T *find_tab_by_handle(Tabpage tabpage, Error *err)
 {
   if (tabpage == 0) {
     return curtab;
@@ -591,7 +590,7 @@ tabpage_T * find_tab_by_handle(Tabpage tabpage, Error *err)
   tabpage_T *rv = handle_get_tabpage(tabpage);
 
   if (!rv) {
-    api_set_error(err, Validation, _("Invalid tabpage id"));
+    _api_set_error(err, kErrorTypeValidation, _("Invalid tabpage id"));
   }
 
   return rv;
@@ -659,7 +658,7 @@ bool object_to_vim(Object obj, typval_T *tv, Error *err)
     case kObjectTypeInteger:
       if (obj.data.integer > VARNUMBER_MAX
           || obj.data.integer < VARNUMBER_MIN) {
-        api_set_error(err, Validation, _("Integer value outside range"));
+        _api_set_error(err, kErrorTypeValidation, _("Integer value outside range"));
         return false;
       }
 
@@ -713,7 +712,7 @@ bool object_to_vim(Object obj, typval_T *tv, Error *err)
         String key = item.key;
 
         if (key.size == 0) {
-          api_set_error(err, Validation,
+          _api_set_error(err, kErrorTypeValidation,
                         _("Empty dictionary keys aren't allowed"));
           // cleanup
           tv_dict_free(dict);
@@ -801,6 +800,12 @@ void api_free_dictionary(Dictionary value)
   xfree(value.items);
 }
 
+void api_free_error(Error *value)
+{
+  xfree(value->msg);
+  value->msg = NULL;
+}
+
 Dictionary api_metadata(void)
 {
   static Dictionary metadata = ARRAY_DICT_INIT;
@@ -926,8 +931,8 @@ static void set_option_value_for(char *key,
         if (try_end(err)) {
           return;
         }
-        api_set_error(err,
-                      Exception,
+        _api_set_error(err,
+                      kErrorTypeException,
                       _("Problem while switching windows"));
         return;
       }
@@ -965,6 +970,26 @@ static void set_option_value_err(char *key,
       return;
     }
 
-    api_set_error(err, Exception, "%s", errmsg);
+    _api_set_error(err, kErrorTypeException, "%s", errmsg);
   }
 }
+
+void _api_set_error(Error *err, ErrorType errType, const char *format, ...)
+  FUNC_ATTR_NONNULL_ALL
+{
+  va_list args1;
+  va_list args2;
+  va_start(args1, format);
+  va_copy(args2, args1);
+  int len = vsnprintf(NULL, 0, format, args1);
+  va_end(args1);
+  assert(len >= 0);
+  // Limit error message to 1 MB.
+  size_t bufsize = MIN((size_t)len + 1, 1024 * 1024);
+  err->msg = xmalloc(bufsize);
+  vsnprintf(err->msg, bufsize, format, args2);
+  va_end(args2);
+
+  err->set = true;
+  err->type = errType;
+}
diff --git a/src/nvim/api/private/helpers.h b/src/nvim/api/private/helpers.h
index 20b4015fb5..681945ac9c 100644
--- a/src/nvim/api/private/helpers.h
+++ b/src/nvim/api/private/helpers.h
@@ -8,16 +8,6 @@
 #include "nvim/memory.h"
 #include "nvim/lib/kvec.h"
 
-// -V:api_set_error:618
-#define api_set_error(err, errtype, ...) \
-  do { \
-    snprintf((err)->msg, \
-             sizeof((err)->msg), \
-             __VA_ARGS__); \
-    (err)->set = true; \
-    (err)->type = kErrorType##errtype; \
-  } while (0)
-
 #define OBJECT_OBJ(o) o
 
 #define BOOLEAN_OBJ(b) ((Object) { \
diff --git a/src/nvim/api/tabpage.c b/src/nvim/api/tabpage.c
index 29592408fc..e6d5f7edad 100644
--- a/src/nvim/api/tabpage.c
+++ b/src/nvim/api/tabpage.c
@@ -193,6 +193,8 @@ Boolean nvim_tabpage_is_valid(Tabpage tabpage)
     FUNC_API_SINCE(1)
 {
   Error stub = ERROR_INIT;
-  return find_tab_by_handle(tabpage, &stub) != NULL;
+  Boolean ret = find_tab_by_handle(tabpage, &stub) != NULL;
+  xfree(stub.msg);
+  return ret;
 }
 
diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c
index 2a33d2ad72..534274db0f 100644
--- a/src/nvim/api/ui.c
+++ b/src/nvim/api/ui.c
@@ -55,12 +55,12 @@ void nvim_ui_attach(uint64_t channel_id, Integer width, Integer height,
     FUNC_API_SINCE(1) FUNC_API_NOEVAL
 {
   if (pmap_has(uint64_t)(connected_uis, channel_id)) {
-    api_set_error(err, Exception, _("UI already attached for channel"));
+    _api_set_error(err, kErrorTypeException, _("UI already attached for channel"));
     return;
   }
 
   if (width <= 0 || height <= 0) {
-    api_set_error(err, Validation,
+    _api_set_error(err, kErrorTypeValidation,
                   _("Expected width > 0 and height > 0"));
     return;
   }
@@ -126,7 +126,7 @@ void nvim_ui_detach(uint64_t channel_id, Error *err)
     FUNC_API_SINCE(1) FUNC_API_NOEVAL
 {
   if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
-    api_set_error(err, Exception, _("UI is not attached for channel"));
+    _api_set_error(err, kErrorTypeException, _("UI is not attached for channel"));
     return;
   }
   remote_ui_disconnect(channel_id);
@@ -138,12 +138,12 @@ void nvim_ui_try_resize(uint64_t channel_id, Integer width,
     FUNC_API_SINCE(1) FUNC_API_NOEVAL
 {
   if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
-    api_set_error(err, Exception, _("UI is not attached for channel"));
+    _api_set_error(err, kErrorTypeException, _("UI is not attached for channel"));
     return;
   }
 
   if (width <= 0 || height <= 0) {
-    api_set_error(err, Validation,
+    _api_set_error(err, kErrorTypeValidation,
                   _("Expected width > 0 and height > 0"));
     return;
   }
@@ -159,7 +159,7 @@ void nvim_ui_set_option(uint64_t channel_id, String name,
     FUNC_API_SINCE(1) FUNC_API_NOEVAL
 {
   if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
-    api_set_error(error, Exception, _("UI is not attached for channel"));
+    _api_set_error(error, kErrorTypeException, _("UI is not attached for channel"));
     return;
   }
   UI *ui = pmap_get(uint64_t)(connected_uis, channel_id);
@@ -173,19 +173,19 @@ void nvim_ui_set_option(uint64_t channel_id, String name,
 static void ui_set_option(UI *ui, String name, Object value, Error *error) {
   if (strcmp(name.data, "rgb") == 0) {
     if (value.type != kObjectTypeBoolean) {
-      api_set_error(error, Validation, _("rgb must be a Boolean"));
+      _api_set_error(error, kErrorTypeValidation, _("rgb must be a Boolean"));
       return;
     }
     ui->rgb = value.data.boolean;
   } else if (strcmp(name.data, "popupmenu_external") == 0) {
     if (value.type != kObjectTypeBoolean) {
-      api_set_error(error, Validation,
+      _api_set_error(error, kErrorTypeValidation,
                     _("popupmenu_external must be a Boolean"));
       return;
     }
     ui->pum_external = value.data.boolean;
   } else {
-    api_set_error(error, Validation, _("No such ui option"));
+    _api_set_error(error, kErrorTypeValidation, _("No such ui option"));
   }
 }
 
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index e5ef4a35c1..bd4a196367 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -188,7 +188,7 @@ Object nvim_eval(String expr, Error *err)
 
   typval_T rettv;
   if (eval0((char_u *)expr.data, &rettv, NULL, true) == FAIL) {
-    api_set_error(err, Exception, "Failed to evaluate expression");
+    _api_set_error(err, kErrorTypeException, "Failed to evaluate expression");
   }
 
   if (!try_end(err)) {
@@ -214,7 +214,7 @@ Object nvim_call_function(String fname, Array args, Error *err)
 {
   Object rv = OBJECT_INIT;
   if (args.size > MAX_FUNC_ARGS) {
-    api_set_error(err, Validation,
+    _api_set_error(err, kErrorTypeValidation,
       _("Function called with too many arguments."));
     return rv;
   }
@@ -237,7 +237,7 @@ Object nvim_call_function(String fname, Array args, Error *err)
                     curwin->w_cursor.lnum, curwin->w_cursor.lnum, &dummy,
                     true, NULL, NULL);
   if (r == FAIL) {
-    api_set_error(err, Exception, _("Error calling function."));
+    _api_set_error(err, kErrorTypeException, _("Error calling function."));
   }
   if (!try_end(err)) {
     rv = vim_to_object(&rettv);
@@ -262,7 +262,7 @@ Integer nvim_strwidth(String str, Error *err)
     FUNC_API_SINCE(1)
 {
   if (str.size > INT_MAX) {
-    api_set_error(err, Validation, _("String length is too high"));
+    _api_set_error(err, kErrorTypeValidation, _("String length is too high"));
     return 0;
   }
 
@@ -318,7 +318,7 @@ void nvim_set_current_dir(String dir, Error *err)
     FUNC_API_SINCE(1)
 {
   if (dir.size >= MAXPATHL) {
-    api_set_error(err, Validation, _("Directory string is too long"));
+    _api_set_error(err, kErrorTypeValidation, _("Directory string is too long"));
     return;
   }
 
@@ -330,7 +330,7 @@ void nvim_set_current_dir(String dir, Error *err)
 
   if (vim_chdir((char_u *)string, kCdScopeGlobal)) {
     if (!try_end(err)) {
-      api_set_error(err, Exception, _("Failed to change directory"));
+      _api_set_error(err, kErrorTypeException, _("Failed to change directory"));
     }
     return;
   }
@@ -538,8 +538,8 @@ void nvim_set_current_buf(Buffer buffer, Error *err)
   try_start();
   int result = do_buffer(DOBUF_GOTO, DOBUF_FIRST, FORWARD, buf->b_fnum, 0);
   if (!try_end(err) && result == FAIL) {
-    api_set_error(err,
-                  Exception,
+    _api_set_error(err,
+                  kErrorTypeException,
                   _("Failed to switch to buffer %d"),
                   buffer);
   }
@@ -591,8 +591,8 @@ void nvim_set_current_win(Window window, Error *err)
   try_start();
   goto_tabpage_win(win_find_tabpage(win), win);
   if (!try_end(err) && win != curwin) {
-    api_set_error(err,
-                  Exception,
+    _api_set_error(err,
+                  kErrorTypeException,
                   _("Failed to switch to window %d"),
                   window);
   }
@@ -645,8 +645,8 @@ void nvim_set_current_tabpage(Tabpage tabpage, Error *err)
   try_start();
   goto_tabpage_tp(tp, true, true);
   if (!try_end(err) && tp != curtab) {
-    api_set_error(err,
-                  Exception,
+    _api_set_error(err,
+                  kErrorTypeException,
                   _("Failed to switch to tabpage %d"),
                   tabpage);
   }
@@ -744,30 +744,30 @@ Array nvim_call_atomic(uint64_t channel_id, Array calls, Error *err)
   size_t i;  // also used for freeing the variables
   for (i = 0; i < calls.size; i++) {
     if (calls.items[i].type != kObjectTypeArray) {
-      api_set_error(err,
-                    Validation,
+      _api_set_error(err,
+                    kErrorTypeValidation,
                     _("All items in calls array must be arrays"));
       goto validation_error;
     }
     Array call = calls.items[i].data.array;
     if (call.size != 2) {
-      api_set_error(err,
-                    Validation,
+      _api_set_error(err,
+                    kErrorTypeValidation,
                     _("All items in calls array must be arrays of size 2"));
       goto validation_error;
     }
 
     if (call.items[0].type != kObjectTypeString) {
-      api_set_error(err,
-                    Validation,
+      _api_set_error(err,
+                    kErrorTypeValidation,
                     _("name must be String"));
       goto validation_error;
     }
     String name = call.items[0].data.string;
 
     if (call.items[1].type != kObjectTypeArray) {
-      api_set_error(err,
-                    Validation,
+      _api_set_error(err,
+                    kErrorTypeValidation,
                     _("args must be Array"));
       goto validation_error;
     }
@@ -794,10 +794,12 @@ Array nvim_call_atomic(uint64_t channel_id, Array calls, Error *err)
   } else {
     ADD(rv, NIL);
   }
-  return rv;
+  goto theend;
 
 validation_error:
   api_free_array(results);
+theend:
+  api_free_error(&nested_error);
   return rv;
 }
 
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index e1bb70ee0d..254ab1c09f 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -64,8 +64,8 @@ void nvim_win_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err)
 
   if (pos.size != 2 || pos.items[0].type != kObjectTypeInteger
       || pos.items[1].type != kObjectTypeInteger) {
-    api_set_error(err,
-                  Validation,
+    _api_set_error(err,
+                  kErrorTypeValidation,
                   _("Argument \"pos\" must be a [row, col] array"));
     return;
   }
@@ -78,12 +78,12 @@ void nvim_win_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err)
   int64_t col = pos.items[1].data.integer;
 
   if (row <= 0 || row > win->w_buffer->b_ml.ml_line_count) {
-    api_set_error(err, Validation, _("Cursor position outside buffer"));
+    _api_set_error(err, kErrorTypeValidation, _("Cursor position outside buffer"));
     return;
   }
 
   if (col > MAXCOL || col < 0) {
-    api_set_error(err, Validation, _("Column value outside range"));
+    _api_set_error(err, kErrorTypeValidation, _("Column value outside range"));
     return;
   }
 
@@ -132,7 +132,7 @@ void nvim_win_set_height(Window window, Integer height, Error *err)
   }
 
   if (height > INT_MAX || height < INT_MIN) {
-    api_set_error(err, Validation, _("Height value outside range"));
+    _api_set_error(err, kErrorTypeValidation, _("Height value outside range"));
     return;
   }
 
@@ -177,7 +177,7 @@ void nvim_win_set_width(Window window, Integer width, Error *err)
   }
 
   if (width > INT_MAX || width < INT_MIN) {
-    api_set_error(err, Validation, _("Width value outside range"));
+    _api_set_error(err, kErrorTypeValidation, _("Width value outside range"));
     return;
   }
 
@@ -387,6 +387,8 @@ Boolean nvim_win_is_valid(Window window)
     FUNC_API_SINCE(1)
 {
   Error stub = ERROR_INIT;
-  return find_window_by_handle(window, &stub) != NULL;
+  Boolean ret = find_window_by_handle(window, &stub) != NULL;
+  xfree(stub.msg);
+  return ret;
 }
 
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 7cef0d81ed..56dc35c31d 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -6524,6 +6524,7 @@ static void api_wrapper(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 end:
   api_free_array(args);
   api_free_object(result);
+  xfree(err.msg);
 }
 
 /*
@@ -13794,6 +13795,7 @@ static void f_rpcrequest(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 
 end:
   api_free_object(result);
+  xfree(err.msg);
 }
 
 // "rpcstart()" function (DEPRECATED)
@@ -16523,7 +16525,7 @@ static void f_termopen(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   curbuf->b_p_swf = false;
   (void)setfname(curbuf, (char_u *)buf, NULL, true);
   // Save the job id and pid in b:terminal_job_{id,pid}
-  Error err;
+  Error err = ERROR_INIT;
   dict_set_var(curbuf->b_vars, cstr_as_string("terminal_job_id"),
                INTEGER_OBJ(rettv->vval.v_number), false, false, &err);
   dict_set_var(curbuf->b_vars, cstr_as_string("terminal_job_pid"),
@@ -16532,6 +16534,7 @@ static void f_termopen(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   Terminal *term = terminal_open(topts);
   data->term = term;
   data->refcount++;
+  xfree(err.msg);
 
   return;
 }
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
index b2c6ef852c..06cdf7d1f1 100644
--- a/src/nvim/msgpack_rpc/channel.c
+++ b/src/nvim/msgpack_rpc/channel.c
@@ -192,7 +192,7 @@ Object channel_send_call(uint64_t id,
   Channel *channel = NULL;
 
   if (!(channel = pmap_get(uint64_t)(channels, id)) || channel->closed) {
-    api_set_error(err, Exception, _("Invalid channel \"%" PRIu64 "\""), id);
+    _api_set_error(err, kErrorTypeException, _("Invalid channel \"%" PRIu64 "\""), id);
     api_free_array(args);
     return NIL;
   }
@@ -212,7 +212,7 @@ Object channel_send_call(uint64_t id,
 
   if (frame.errored) {
     if (frame.result.type == kObjectTypeString) {
-      api_set_error(err, Exception, "%s", frame.result.data.string.data);
+      _api_set_error(err, kErrorTypeException, "%s", frame.result.data.string.data);
     } else if (frame.result.type == kObjectTypeArray) {
       // Should be an error in the form [type, message]
       Array array = frame.result.data.array;
@@ -220,14 +220,13 @@ Object channel_send_call(uint64_t id,
           && (array.items[0].data.integer == kErrorTypeException
               || array.items[0].data.integer == kErrorTypeValidation)
           && array.items[1].type == kObjectTypeString) {
-        err->type = (ErrorType) array.items[0].data.integer;
-        xstrlcpy(err->msg, array.items[1].data.string.data, sizeof(err->msg));
-        err->set = true;
+        _api_set_error(err, (ErrorType)array.items[0].data.integer, "%s",
+                       array.items[1].data.string.data);
       } else {
-        api_set_error(err, Exception, "%s", "unknown error");
+        _api_set_error(err, kErrorTypeException, "%s", "unknown error");
       }
     } else {
-      api_set_error(err, Exception, "%s", "unknown error");
+      _api_set_error(err, kErrorTypeException, "%s", "unknown error");
     }
 
     api_free_object(frame.result);
@@ -412,38 +411,38 @@ static void handle_request(Channel *channel, msgpack_object *request)
                channel->id);
       call_set_error(channel, buf);
     }
-    return;
-  }
-
-  // Retrieve the request handler
-  MsgpackRpcRequestHandler handler;
-  msgpack_object *method = msgpack_rpc_method(request);
-
-  if (method) {
-    handler = msgpack_rpc_get_handler_for(method->via.bin.ptr,
-                                          method->via.bin.size);
   } else {
-    handler.fn = msgpack_rpc_handle_missing_method;
-    handler.async = true;
-  }
+    // Retrieve the request handler
+    MsgpackRpcRequestHandler handler;
+    msgpack_object *method = msgpack_rpc_method(request);
 
-  Array args = ARRAY_DICT_INIT;
-  if (!msgpack_rpc_to_array(msgpack_rpc_args(request), &args)) {
-    handler.fn = msgpack_rpc_handle_invalid_arguments;
-    handler.async = true;
-  }
+    if (method) {
+      handler = msgpack_rpc_get_handler_for(method->via.bin.ptr,
+                                            method->via.bin.size);
+    } else {
+      handler.fn = msgpack_rpc_handle_missing_method;
+      handler.async = true;
+    }
 
-  RequestEvent *event_data = xmalloc(sizeof(RequestEvent));
-  event_data->channel = channel;
-  event_data->handler = handler;
-  event_data->args = args;
-  event_data->request_id = request_id;
-  incref(channel);
-  if (handler.async) {
-    on_request_event((void **)&event_data);
-  } else {
-    multiqueue_put(channel->events, on_request_event, 1, event_data);
+    Array args = ARRAY_DICT_INIT;
+    if (!msgpack_rpc_to_array(msgpack_rpc_args(request), &args)) {
+      handler.fn = msgpack_rpc_handle_invalid_arguments;
+      handler.async = true;
+    }
+
+    RequestEvent *event_data = xmalloc(sizeof(RequestEvent));
+    event_data->channel = channel;
+    event_data->handler = handler;
+    event_data->args = args;
+    event_data->request_id = request_id;
+    incref(channel);
+    if (handler.async) {
+      on_request_event((void **)&event_data);
+    } else {
+      multiqueue_put(channel->events, on_request_event, 1, event_data);
+    }
   }
+  xfree(error.msg);
 }
 
 static void on_request_event(void **argv)
@@ -470,6 +469,7 @@ static void on_request_event(void **argv)
   api_free_array(args);
   decref(channel);
   xfree(e);
+  xfree(error.msg);
 }
 
 static bool channel_write(Channel *channel, WBuffer *buffer)
@@ -512,12 +512,13 @@ static bool channel_write(Channel *channel, WBuffer *buffer)
 static void send_error(Channel *channel, uint64_t id, char *err)
 {
   Error e = ERROR_INIT;
-  api_set_error(&e, Exception, "%s", err);
+  _api_set_error(&e, kErrorTypeException, "%s", err);
   channel_write(channel, serialize_response(channel->id,
                                             id,
                                             &e,
                                             NIL,
                                             &out_buffer));
+  xfree(e.msg);
 }
 
 static void send_request(Channel *channel,
diff --git a/src/nvim/msgpack_rpc/helpers.c b/src/nvim/msgpack_rpc/helpers.c
index 967ce31c1b..c273343b41 100644
--- a/src/nvim/msgpack_rpc/helpers.c
+++ b/src/nvim/msgpack_rpc/helpers.c
@@ -475,8 +475,7 @@ Object msgpack_rpc_handle_missing_method(uint64_t channel_id,
                                          Array args,
                                          Error *error)
 {
-  snprintf(error->msg, sizeof(error->msg), "Invalid method name");
-  error->set = true;
+  _api_set_error(error, error->type, "Invalid method name");
   return NIL;
 }
 
@@ -485,8 +484,7 @@ Object msgpack_rpc_handle_invalid_arguments(uint64_t channel_id,
                                             Array args,
                                             Error *error)
 {
-  snprintf(error->msg, sizeof(error->msg), "Invalid method arguments");
-  error->set = true;
+  _api_set_error(error, error->type, "Invalid method arguments");
   return NIL;
 }
 
@@ -572,29 +570,29 @@ void msgpack_rpc_validate(uint64_t *response_id,
   *response_id = NO_RESPONSE;
   // Validate the basic structure of the msgpack-rpc payload
   if (req->type != MSGPACK_OBJECT_ARRAY) {
-    api_set_error(err, Validation, _("Message is not an array"));
+    _api_set_error(err, kErrorTypeValidation, _("Message is not an array"));
     return;
   }
 
   if (req->via.array.size == 0) {
-    api_set_error(err, Validation, _("Message is empty"));
+    _api_set_error(err, kErrorTypeValidation, _("Message is empty"));
     return;
   }
 
   if (req->via.array.ptr[0].type != MSGPACK_OBJECT_POSITIVE_INTEGER) {
-    api_set_error(err, Validation, _("Message type must be an integer"));
+    _api_set_error(err, kErrorTypeValidation, _("Message type must be an integer"));
     return;
   }
 
   uint64_t type = req->via.array.ptr[0].via.u64;
   if (type != kMessageTypeRequest && type != kMessageTypeNotification) {
-    api_set_error(err, Validation, _("Unknown message type"));
+    _api_set_error(err, kErrorTypeValidation, _("Unknown message type"));
     return;
   }
 
   if ((type == kMessageTypeRequest && req->via.array.size != 4)
       || (type == kMessageTypeNotification && req->via.array.size != 3)) {
-    api_set_error(err, Validation, _("Request array size should be 4 (request) "
+    _api_set_error(err, kErrorTypeValidation, _("Request array size should be 4 (request) "
                                      "or 3 (notification)"));
     return;
   }
@@ -602,19 +600,19 @@ void msgpack_rpc_validate(uint64_t *response_id,
   if (type == kMessageTypeRequest) {
     msgpack_object *id_obj = msgpack_rpc_msg_id(req);
     if (!id_obj) {
-      api_set_error(err, Validation, _("ID must be a positive integer"));
+      _api_set_error(err, kErrorTypeValidation, _("ID must be a positive integer"));
       return;
     }
     *response_id = id_obj->via.u64;
   }
 
   if (!msgpack_rpc_method(req)) {
-    api_set_error(err, Validation, _("Method must be a string"));
+    _api_set_error(err, kErrorTypeValidation, _("Method must be a string"));
     return;
   }
 
   if (!msgpack_rpc_args(req)) {
-    api_set_error(err, Validation, _("Parameters must be an array"));
+    _api_set_error(err, kErrorTypeValidation, _("Parameters must be an array"));
     return;
   }
 }
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
index 19b9bdc19f..43e4ea87e3 100644
--- a/src/nvim/terminal.c
+++ b/src/nvim/terminal.c
@@ -633,13 +633,14 @@ static int term_movecursor(VTermPos new, VTermPos old, int visible,
 static void buf_set_term_title(buf_T *buf, char *title)
     FUNC_ATTR_NONNULL_ALL
 {
-  Error err;
+  Error err = ERROR_INIT;
   dict_set_var(buf->b_vars,
                STATIC_CSTR_AS_STRING("term_title"),
                STRING_OBJ(cstr_as_string(title)),
                false,
                false,
                &err);
+  xfree(err.msg);
 }
 
 static int term_settermprop(VTermProp prop, VTermValue *val, void *data)
@@ -1220,12 +1221,15 @@ static bool is_focused(Terminal *term)
 
 #define GET_CONFIG_VALUE(k, o) \
   do { \
-    Error err; \
+    Error err = ERROR_INIT; \
     /* Only called from terminal_open where curbuf->terminal is the */ \
     /* context  */ \
     o = dict_get_value(curbuf->b_vars, cstr_as_string(k), &err); \
+    xfree(err.msg); \
     if (o.type == kObjectTypeNil) { \
-      o = dict_get_value(&globvardict, cstr_as_string(k), &err); \
+      Error err2 = ERROR_INIT; \
+      o = dict_get_value(&globvardict, cstr_as_string(k), &err2); \
+      xfree(err2.msg); \
     } \
   } while (0)
 
diff --git a/src/nvim/tui/input.c b/src/nvim/tui/input.c
index 3f2ccd4746..921f67fb7d 100644
--- a/src/nvim/tui/input.c
+++ b/src/nvim/tui/input.c
@@ -228,7 +228,7 @@ static int get_key_code_timeout(void)
   if (nvim_get_option(cstr_as_string("ttimeout"), &err).data.boolean) {
     ms = nvim_get_option(cstr_as_string("ttimeoutlen"), &err).data.integer;
   }
-
+  xfree(err.msg);
   return (int)ms;
 }
 
diff --git a/test/functional/provider/python3_spec.lua b/test/functional/provider/python3_spec.lua
index a4e9a49c8a..89a546675f 100644
--- a/test/functional/provider/python3_spec.lua
+++ b/test/functional/provider/python3_spec.lua
@@ -2,6 +2,7 @@ local helpers = require('test.functional.helpers')(after_each)
 local eval, command, feed = helpers.eval, helpers.command, helpers.feed
 local eq, clear, insert = helpers.eq, helpers.clear, helpers.insert
 local expect, write_file = helpers.expect, helpers.write_file
+local feed_command = helpers.feed_command
 
 do
   clear()
@@ -30,6 +31,15 @@ describe('python3 commands and functions', function()
     eq({100, 0}, eval('g:set_by_python3'))
   end)
 
+  it('does not truncate error message <1 MB', function()
+    -- XXX: Python limits the error name to 200 chars, so this test is
+    -- mostly bogus.
+    local very_long_symbol = string.rep('a', 1200)
+    feed_command(':silent! py3 print('..very_long_symbol..' b)')
+    -- Truncated error message would not contain this (last) line.
+    eq('SyntaxError: invalid syntax', eval('v:errmsg'))
+  end)
+
   it('python3_execute with nested commands', function()
     command([[python3 vim.command('python3 vim.command("python3 vim.command(\'let set_by_nested_python3 = 555\')")')]])
     eq(555, eval('g:set_by_nested_python3'))

From 2a49163103827465f25810f5f4e3d4305159f209 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 23 Apr 2017 15:59:59 +0200
Subject: [PATCH 147/257] api_clear_error()

---
 src/nvim/api/buffer.c          |  2 +-
 src/nvim/api/private/helpers.c |  3 +-
 src/nvim/api/tabpage.c         |  2 +-
 src/nvim/api/vim.c             |  2 +-
 src/nvim/api/window.c          |  2 +-
 src/nvim/eval.c                |  7 ++--
 src/nvim/msgpack_rpc/channel.c | 66 +++++++++++++++++-----------------
 src/nvim/terminal.c            |  9 +++--
 src/nvim/tui/input.c           |  2 +-
 9 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index 2f306ebfc8..81d25d7c95 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -640,7 +640,7 @@ Boolean nvim_buf_is_valid(Buffer buffer)
 {
   Error stub = ERROR_INIT;
   Boolean ret = find_buffer_by_handle(buffer, &stub) != NULL;
-  xfree(stub.msg);
+  api_clear_error(&stub);
   return ret;
 }
 
diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index e6632525e1..547ac29bed 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -800,7 +800,8 @@ void api_free_dictionary(Dictionary value)
   xfree(value.items);
 }
 
-void api_free_error(Error *value)
+void api_clear_error(Error *value)
+  FUNC_ATTR_NONNULL_ALL
 {
   xfree(value->msg);
   value->msg = NULL;
diff --git a/src/nvim/api/tabpage.c b/src/nvim/api/tabpage.c
index e6d5f7edad..6f2f9e1d2a 100644
--- a/src/nvim/api/tabpage.c
+++ b/src/nvim/api/tabpage.c
@@ -194,7 +194,7 @@ Boolean nvim_tabpage_is_valid(Tabpage tabpage)
 {
   Error stub = ERROR_INIT;
   Boolean ret = find_tab_by_handle(tabpage, &stub) != NULL;
-  xfree(stub.msg);
+  api_clear_error(&stub);
   return ret;
 }
 
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index bd4a196367..2c78ffdec1 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -799,7 +799,7 @@ Array nvim_call_atomic(uint64_t channel_id, Array calls, Error *err)
 validation_error:
   api_free_array(results);
 theend:
-  api_free_error(&nested_error);
+  api_clear_error(&nested_error);
   return rv;
 }
 
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index 254ab1c09f..b8326c1198 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -388,7 +388,7 @@ Boolean nvim_win_is_valid(Window window)
 {
   Error stub = ERROR_INIT;
   Boolean ret = find_window_by_handle(window, &stub) != NULL;
-  xfree(stub.msg);
+  api_clear_error(&stub);
   return ret;
 }
 
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 56dc35c31d..1e174712a3 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -6524,7 +6524,7 @@ static void api_wrapper(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 end:
   api_free_array(args);
   api_free_object(result);
-  xfree(err.msg);
+  api_clear_error(&err);
 }
 
 /*
@@ -13795,7 +13795,7 @@ static void f_rpcrequest(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 
 end:
   api_free_object(result);
-  xfree(err.msg);
+  api_clear_error(&err);
 }
 
 // "rpcstart()" function (DEPRECATED)
@@ -16528,13 +16528,14 @@ static void f_termopen(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   Error err = ERROR_INIT;
   dict_set_var(curbuf->b_vars, cstr_as_string("terminal_job_id"),
                INTEGER_OBJ(rettv->vval.v_number), false, false, &err);
+  api_clear_error(&err);
   dict_set_var(curbuf->b_vars, cstr_as_string("terminal_job_pid"),
                INTEGER_OBJ(pid), false, false, &err);
+  api_clear_error(&err);
 
   Terminal *term = terminal_open(topts);
   data->term = term;
   data->refcount++;
-  xfree(err.msg);
 
   return;
 }
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
index 06cdf7d1f1..bd7f84fed9 100644
--- a/src/nvim/msgpack_rpc/channel.c
+++ b/src/nvim/msgpack_rpc/channel.c
@@ -411,38 +411,38 @@ static void handle_request(Channel *channel, msgpack_object *request)
                channel->id);
       call_set_error(channel, buf);
     }
-  } else {
-    // Retrieve the request handler
-    MsgpackRpcRequestHandler handler;
-    msgpack_object *method = msgpack_rpc_method(request);
-
-    if (method) {
-      handler = msgpack_rpc_get_handler_for(method->via.bin.ptr,
-                                            method->via.bin.size);
-    } else {
-      handler.fn = msgpack_rpc_handle_missing_method;
-      handler.async = true;
-    }
-
-    Array args = ARRAY_DICT_INIT;
-    if (!msgpack_rpc_to_array(msgpack_rpc_args(request), &args)) {
-      handler.fn = msgpack_rpc_handle_invalid_arguments;
-      handler.async = true;
-    }
-
-    RequestEvent *event_data = xmalloc(sizeof(RequestEvent));
-    event_data->channel = channel;
-    event_data->handler = handler;
-    event_data->args = args;
-    event_data->request_id = request_id;
-    incref(channel);
-    if (handler.async) {
-      on_request_event((void **)&event_data);
-    } else {
-      multiqueue_put(channel->events, on_request_event, 1, event_data);
-    }
+    api_clear_error(&error);
+    return;
+  }
+  // Retrieve the request handler
+  MsgpackRpcRequestHandler handler;
+  msgpack_object *method = msgpack_rpc_method(request);
+
+  if (method) {
+    handler = msgpack_rpc_get_handler_for(method->via.bin.ptr,
+                                          method->via.bin.size);
+  } else {
+    handler.fn = msgpack_rpc_handle_missing_method;
+    handler.async = true;
+  }
+
+  Array args = ARRAY_DICT_INIT;
+  if (!msgpack_rpc_to_array(msgpack_rpc_args(request), &args)) {
+    handler.fn = msgpack_rpc_handle_invalid_arguments;
+    handler.async = true;
+  }
+
+  RequestEvent *event_data = xmalloc(sizeof(RequestEvent));
+  event_data->channel = channel;
+  event_data->handler = handler;
+  event_data->args = args;
+  event_data->request_id = request_id;
+  incref(channel);
+  if (handler.async) {
+    on_request_event((void **)&event_data);
+  } else {
+    multiqueue_put(channel->events, on_request_event, 1, event_data);
   }
-  xfree(error.msg);
 }
 
 static void on_request_event(void **argv)
@@ -469,7 +469,7 @@ static void on_request_event(void **argv)
   api_free_array(args);
   decref(channel);
   xfree(e);
-  xfree(error.msg);
+  api_clear_error(&error);
 }
 
 static bool channel_write(Channel *channel, WBuffer *buffer)
@@ -518,7 +518,7 @@ static void send_error(Channel *channel, uint64_t id, char *err)
                                             &e,
                                             NIL,
                                             &out_buffer));
-  xfree(e.msg);
+  api_clear_error(&e);
 }
 
 static void send_request(Channel *channel,
diff --git a/src/nvim/terminal.c b/src/nvim/terminal.c
index 43e4ea87e3..c44fe15be5 100644
--- a/src/nvim/terminal.c
+++ b/src/nvim/terminal.c
@@ -640,7 +640,7 @@ static void buf_set_term_title(buf_T *buf, char *title)
                false,
                false,
                &err);
-  xfree(err.msg);
+  api_clear_error(&err);
 }
 
 static int term_settermprop(VTermProp prop, VTermValue *val, void *data)
@@ -1225,11 +1225,10 @@ static bool is_focused(Terminal *term)
     /* Only called from terminal_open where curbuf->terminal is the */ \
     /* context  */ \
     o = dict_get_value(curbuf->b_vars, cstr_as_string(k), &err); \
-    xfree(err.msg); \
+    api_clear_error(&err); \
     if (o.type == kObjectTypeNil) { \
-      Error err2 = ERROR_INIT; \
-      o = dict_get_value(&globvardict, cstr_as_string(k), &err2); \
-      xfree(err2.msg); \
+      o = dict_get_value(&globvardict, cstr_as_string(k), &err); \
+      api_clear_error(&err); \
     } \
   } while (0)
 
diff --git a/src/nvim/tui/input.c b/src/nvim/tui/input.c
index 921f67fb7d..be016668fc 100644
--- a/src/nvim/tui/input.c
+++ b/src/nvim/tui/input.c
@@ -228,7 +228,7 @@ static int get_key_code_timeout(void)
   if (nvim_get_option(cstr_as_string("ttimeout"), &err).data.boolean) {
     ms = nvim_get_option(cstr_as_string("ttimeoutlen"), &err).data.integer;
   }
-  xfree(err.msg);
+  api_clear_error(&err);
   return (int)ms;
 }
 

From 62c3f436a96e2102ec5c1e3af974c8e57fe4e76c Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 23 Apr 2017 16:43:07 +0200
Subject: [PATCH 148/257] api_clear_error: Skip if error was not set.

---
 src/nvim/api/private/helpers.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index 547ac29bed..3bf584ff2f 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -803,6 +803,9 @@ void api_free_dictionary(Dictionary value)
 void api_clear_error(Error *value)
   FUNC_ATTR_NONNULL_ALL
 {
+  if (!value->set) {
+    return;
+  }
   xfree(value->msg);
   value->msg = NULL;
 }

From 2ed91f222f1dddda10fbdc9cb80df2be7d4c2da3 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 23 Apr 2017 19:58:13 +0200
Subject: [PATCH 149/257] api/internal: Remove `set` field from Error type.

---
 scripts/gendispatch.lua        |  6 +++---
 src/nvim/api/buffer.c          |  4 ++--
 src/nvim/api/private/defs.h    |  6 ++++--
 src/nvim/api/private/helpers.c | 11 ++++++-----
 src/nvim/api/ui.c              |  4 ++--
 src/nvim/api/vim.c             |  6 +++---
 src/nvim/eval.c                |  4 ++--
 src/nvim/msgpack_rpc/channel.c |  2 +-
 src/nvim/msgpack_rpc/helpers.c |  6 +++---
 9 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/scripts/gendispatch.lua b/scripts/gendispatch.lua
index 683962aa60..53af67cce4 100644
--- a/scripts/gendispatch.lua
+++ b/scripts/gendispatch.lua
@@ -225,7 +225,7 @@ for i = 1, #functions do
     end
     output:write('\n')
     output:write('\n  if (args.size != '..#fn.parameters..') {')
-    output:write('\n    _api_set_error(error, error->type, "Wrong number of arguments: expecting '..#fn.parameters..' but got %zu", args.size);')
+    output:write('\n    _api_set_error(error, kErrorTypeException, "Wrong number of arguments: expecting '..#fn.parameters..' but got %zu", args.size);')
     output:write('\n    goto cleanup;')
     output:write('\n  }\n')
 
@@ -250,7 +250,7 @@ for i = 1, #functions do
           output:write('\n    '..converted..' = (handle_T)args.items['..(j - 1)..'].data.integer;')
         end
         output:write('\n  } else {')
-        output:write('\n    _api_set_error(error, error->type, "Wrong type for argument '..j..', expecting '..param[1]..'");')
+        output:write('\n    _api_set_error(error, kErrorTypeException, "Wrong type for argument '..j..', expecting '..param[1]..'");')
         output:write('\n    goto cleanup;')
         output:write('\n  }\n')
       else
@@ -290,7 +290,7 @@ for i = 1, #functions do
         output:write('error);\n')
       end
       -- and check for the error
-      output:write('\n  if (error->set) {')
+      output:write('\n  if (ERROR_SET(error)) {')
       output:write('\n    goto cleanup;')
       output:write('\n  }\n')
     else
diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index 81d25d7c95..cffc7a2e38 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -65,7 +65,7 @@ String buffer_get_line(Buffer buffer, Integer index, Error *err)
   index = convert_index(index);
   Array slice = nvim_buf_get_lines(0, buffer, index, index+1, true, err);
 
-  if (!err->set && slice.size) {
+  if (!ERROR_SET(err) && slice.size) {
     rv = slice.items[0].data.string;
   }
 
@@ -203,7 +203,7 @@ ArrayOf(String) nvim_buf_get_lines(uint64_t channel_id,
   }
 
 end:
-  if (err->set) {
+  if (ERROR_SET(err)) {
     for (size_t i = 0; i < rv.size; i++) {
       xfree(rv.items[i].data.string.data);
     }
diff --git a/src/nvim/api/private/defs.h b/src/nvim/api/private/defs.h
index a07422bd12..60bf38265f 100644
--- a/src/nvim/api/private/defs.h
+++ b/src/nvim/api/private/defs.h
@@ -8,9 +8,11 @@
 #define ARRAY_DICT_INIT {.size = 0, .capacity = 0, .items = NULL}
 #define STRING_INIT {.data = NULL, .size = 0}
 #define OBJECT_INIT { .type = kObjectTypeNil }
-#define ERROR_INIT { .set = false, .msg = NULL }
+#define ERROR_INIT { .type = kErrorTypeNone, .msg = NULL }
 #define REMOTE_TYPE(type) typedef handle_T type
 
+#define ERROR_SET(e) ((e)->type != kErrorTypeNone)
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # define ArrayOf(...) Array
 # define DictionaryOf(...) Dictionary
@@ -20,6 +22,7 @@ typedef int handle_T;
 
 // Basic types
 typedef enum {
+  kErrorTypeNone = -1,
   kErrorTypeException,
   kErrorTypeValidation
 } ErrorType;
@@ -39,7 +42,6 @@ typedef enum {
 typedef struct {
   ErrorType type;
   char *msg;
-  bool set;
 } Error;
 
 typedef bool Boolean;
diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index 3bf584ff2f..58534d78a0 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -69,7 +69,7 @@ bool try_end(Error *err)
                                              ET_ERROR,
                                              NULL,
                                              &should_free);
-    _api_set_error(err, err->type, "%s", msg);
+    _api_set_error(err, kErrorTypeException, "%s", msg);
     free_global_msglist();
 
     if (should_free) {
@@ -80,7 +80,7 @@ bool try_end(Error *err)
     discard_current_exception();
   }
 
-  return err->set;
+  return ERROR_SET(err);
 }
 
 /// Recursively expands a vimscript value in a dict
@@ -803,11 +803,12 @@ void api_free_dictionary(Dictionary value)
 void api_clear_error(Error *value)
   FUNC_ATTR_NONNULL_ALL
 {
-  if (!value->set) {
+  if (!ERROR_SET(value)) {
     return;
   }
   xfree(value->msg);
   value->msg = NULL;
+  value->type = kErrorTypeNone;
 }
 
 Dictionary api_metadata(void)
@@ -953,7 +954,7 @@ static void set_option_value_for(char *key,
       break;
   }
 
-  if (err->set) {
+  if (ERROR_SET(err)) {
     return;
   }
 
@@ -981,6 +982,7 @@ static void set_option_value_err(char *key,
 void _api_set_error(Error *err, ErrorType errType, const char *format, ...)
   FUNC_ATTR_NONNULL_ALL
 {
+  assert(kErrorTypeNone != errType);
   va_list args1;
   va_list args2;
   va_start(args1, format);
@@ -994,6 +996,5 @@ void _api_set_error(Error *err, ErrorType errType, const char *format, ...)
   vsnprintf(err->msg, bufsize, format, args2);
   va_end(args2);
 
-  err->set = true;
   err->type = errType;
 }
diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c
index 534274db0f..4c39bc57eb 100644
--- a/src/nvim/api/ui.c
+++ b/src/nvim/api/ui.c
@@ -97,7 +97,7 @@ void nvim_ui_attach(uint64_t channel_id, Integer width, Integer height,
 
   for (size_t i = 0; i < options.size; i++) {
     ui_set_option(ui, options.items[i].key, options.items[i].value, err);
-    if (err->set) {
+    if (ERROR_SET(err)) {
       xfree(ui);
       return;
     }
@@ -165,7 +165,7 @@ void nvim_ui_set_option(uint64_t channel_id, String name,
   UI *ui = pmap_get(uint64_t)(connected_uis, channel_id);
 
   ui_set_option(ui, name, value, error);
-  if (!error->set) {
+  if (!ERROR_SET(error)) {
     ui_refresh();
   }
 }
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 2c78ffdec1..924ea419a1 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -165,7 +165,7 @@ String nvim_command_output(String str, Error *err)
   nvim_command(str, err);
   do_cmdline_cmd("redir END");
 
-  if (err->set) {
+  if (ERROR_SET(err)) {
     return (String) STRING_INIT;
   }
 
@@ -776,7 +776,7 @@ Array nvim_call_atomic(uint64_t channel_id, Array calls, Error *err)
     MsgpackRpcRequestHandler handler = msgpack_rpc_get_handler_for(name.data,
                                                                    name.size);
     Object result = handler.fn(channel_id, args, &nested_error);
-    if (nested_error.set) {
+    if (ERROR_SET(&nested_error)) {
       // error handled after loop
       break;
     }
@@ -785,7 +785,7 @@ Array nvim_call_atomic(uint64_t channel_id, Array calls, Error *err)
   }
 
   ADD(rv, ARRAY_OBJ(results));
-  if (nested_error.set) {
+  if (ERROR_SET(&nested_error)) {
     Array errval = ARRAY_DICT_INIT;
     ADD(errval, INTEGER_OBJ((Integer)i));
     ADD(errval, INTEGER_OBJ(nested_error.type));
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index 1e174712a3..d7feed8bfd 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -6512,7 +6512,7 @@ static void api_wrapper(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   Error err = ERROR_INIT;
   Object result = fn(INTERNAL_CALL, args, &err);
 
-  if (err.set) {
+  if (ERROR_SET(&err)) {
     nvim_err_writeln(cstr_as_string(err.msg));
     goto end;
   }
@@ -13784,7 +13784,7 @@ static void f_rpcrequest(typval_T *argvars, typval_T *rettv, FunPtr fptr)
     restore_funccal(save_funccalp);
   }
 
-  if (err.set) {
+  if (ERROR_SET(&err)) {
     nvim_err_writeln(cstr_as_string(err.msg));
     goto end;
   }
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
index bd7f84fed9..36a3210c70 100644
--- a/src/nvim/msgpack_rpc/channel.c
+++ b/src/nvim/msgpack_rpc/channel.c
@@ -397,7 +397,7 @@ static void handle_request(Channel *channel, msgpack_object *request)
   Error error = ERROR_INIT;
   msgpack_rpc_validate(&request_id, request, &error);
 
-  if (error.set) {
+  if (ERROR_SET(&error)) {
     // Validation failed, send response with error
     if (channel_write(channel,
                       serialize_response(channel->id,
diff --git a/src/nvim/msgpack_rpc/helpers.c b/src/nvim/msgpack_rpc/helpers.c
index c273343b41..800f5edb85 100644
--- a/src/nvim/msgpack_rpc/helpers.c
+++ b/src/nvim/msgpack_rpc/helpers.c
@@ -475,7 +475,7 @@ Object msgpack_rpc_handle_missing_method(uint64_t channel_id,
                                          Array args,
                                          Error *error)
 {
-  _api_set_error(error, error->type, "Invalid method name");
+  _api_set_error(error, kErrorTypeException, "Invalid method name");
   return NIL;
 }
 
@@ -484,7 +484,7 @@ Object msgpack_rpc_handle_invalid_arguments(uint64_t channel_id,
                                             Array args,
                                             Error *error)
 {
-  _api_set_error(error, error->type, "Invalid method arguments");
+  _api_set_error(error, kErrorTypeException, "Invalid method arguments");
   return NIL;
 }
 
@@ -517,7 +517,7 @@ void msgpack_rpc_serialize_response(uint64_t response_id,
   msgpack_pack_int(pac, 1);
   msgpack_pack_uint64(pac, response_id);
 
-  if (err->set) {
+  if (ERROR_SET(err)) {
     // error represented by a [type, message] array
     msgpack_pack_array(pac, 2);
     msgpack_rpc_from_integer(err->type, pac);

From 3fbc660d57f4726044662bde1bf52c527e45fb98 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 23 Apr 2017 21:54:44 +0200
Subject: [PATCH 150/257] api_set_error(): rename

---
 scripts/gendispatch.lua        |  4 +--
 src/nvim/api/buffer.c          | 36 ++++++++++----------
 src/nvim/api/private/helpers.c | 62 +++++++++++++++++-----------------
 src/nvim/api/ui.c              | 18 +++++-----
 src/nvim/api/vim.c             | 26 +++++++-------
 src/nvim/api/window.c          | 10 +++---
 src/nvim/msgpack_rpc/channel.c | 12 +++----
 src/nvim/msgpack_rpc/helpers.c | 20 +++++------
 8 files changed, 94 insertions(+), 94 deletions(-)

diff --git a/scripts/gendispatch.lua b/scripts/gendispatch.lua
index 53af67cce4..0ee3ae6475 100644
--- a/scripts/gendispatch.lua
+++ b/scripts/gendispatch.lua
@@ -225,7 +225,7 @@ for i = 1, #functions do
     end
     output:write('\n')
     output:write('\n  if (args.size != '..#fn.parameters..') {')
-    output:write('\n    _api_set_error(error, kErrorTypeException, "Wrong number of arguments: expecting '..#fn.parameters..' but got %zu", args.size);')
+    output:write('\n    api_set_error(error, kErrorTypeException, "Wrong number of arguments: expecting '..#fn.parameters..' but got %zu", args.size);')
     output:write('\n    goto cleanup;')
     output:write('\n  }\n')
 
@@ -250,7 +250,7 @@ for i = 1, #functions do
           output:write('\n    '..converted..' = (handle_T)args.items['..(j - 1)..'].data.integer;')
         end
         output:write('\n  } else {')
-        output:write('\n    _api_set_error(error, kErrorTypeException, "Wrong type for argument '..j..', expecting '..param[1]..'");')
+        output:write('\n    api_set_error(error, kErrorTypeException, "Wrong type for argument '..j..', expecting '..param[1]..'");')
         output:write('\n    goto cleanup;')
         output:write('\n  }\n')
       else
diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index cffc7a2e38..4d6081bb5e 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -171,7 +171,7 @@ ArrayOf(String) nvim_buf_get_lines(uint64_t channel_id,
   end = normalize_index(buf, end, &oob);
 
   if (strict_indexing && oob) {
-    _api_set_error(err, kErrorTypeValidation, _("Index out of bounds"));
+    api_set_error(err, kErrorTypeValidation, _("Index out of bounds"));
     return rv;
   }
 
@@ -187,7 +187,7 @@ ArrayOf(String) nvim_buf_get_lines(uint64_t channel_id,
     int64_t lnum = start + (int64_t)i;
 
     if (lnum > LONG_MAX) {
-      _api_set_error(err, kErrorTypeValidation, _("Line index is too high"));
+      api_set_error(err, kErrorTypeValidation, _("Line index is too high"));
       goto end;
     }
 
@@ -283,13 +283,13 @@ void nvim_buf_set_lines(uint64_t channel_id,
   end = normalize_index(buf, end, &oob);
 
   if (strict_indexing && oob) {
-    _api_set_error(err, kErrorTypeValidation, _("Index out of bounds"));
+    api_set_error(err, kErrorTypeValidation, _("Index out of bounds"));
     return;
   }
 
 
   if (start > end) {
-    _api_set_error(err,
+    api_set_error(err,
                   kErrorTypeValidation,
                   _("Argument \"start\" is higher than \"end\""));
     return;
@@ -304,7 +304,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
 
   for (size_t i = 0; i < new_len; i++) {
     if (replacement.items[i].type != kObjectTypeString) {
-      _api_set_error(err,
+      api_set_error(err,
                     kErrorTypeValidation,
                     _("All items in the replacement array must be strings"));
       goto end;
@@ -317,7 +317,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
     lines[i] = xmallocz(l.size);
     for (size_t j = 0; j < l.size; j++) {
       if (l.data[j] == '\n' && channel_id != INTERNAL_CALL) {
-        _api_set_error(err, kErrorTypeException, _("string cannot contain newlines"));
+        api_set_error(err, kErrorTypeException, _("string cannot contain newlines"));
         new_len = i + 1;
         goto end;
       }
@@ -330,7 +330,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
   switch_to_win_for_buf(buf, &save_curwin, &save_curtab, &save_curbuf);
 
   if (u_save((linenr_T)(start - 1), (linenr_T)end) == FAIL) {
-    _api_set_error(err, kErrorTypeException, _("Failed to save undo information"));
+    api_set_error(err, kErrorTypeException, _("Failed to save undo information"));
     goto end;
   }
 
@@ -340,7 +340,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
   size_t to_delete = (new_len < old_len) ? (size_t)(old_len - new_len) : 0;
   for (size_t i = 0; i < to_delete; i++) {
     if (ml_delete((linenr_T)start, false) == FAIL) {
-      _api_set_error(err, kErrorTypeException, _("Failed to delete line"));
+      api_set_error(err, kErrorTypeException, _("Failed to delete line"));
       goto end;
     }
   }
@@ -357,12 +357,12 @@ void nvim_buf_set_lines(uint64_t channel_id,
     int64_t lnum = start + (int64_t)i;
 
     if (lnum > LONG_MAX) {
-      _api_set_error(err, kErrorTypeValidation, _("Index value is too high"));
+      api_set_error(err, kErrorTypeValidation, _("Index value is too high"));
       goto end;
     }
 
     if (ml_replace((linenr_T)lnum, (char_u *)lines[i], false) == FAIL) {
-      _api_set_error(err, kErrorTypeException, _("Failed to replace line"));
+      api_set_error(err, kErrorTypeException, _("Failed to replace line"));
       goto end;
     }
     // Mark lines that haven't been passed to the buffer as they need
@@ -375,12 +375,12 @@ void nvim_buf_set_lines(uint64_t channel_id,
     int64_t lnum = start + (int64_t)i - 1;
 
     if (lnum > LONG_MAX) {
-      _api_set_error(err, kErrorTypeValidation, _("Index value is too high"));
+      api_set_error(err, kErrorTypeValidation, _("Index value is too high"));
       goto end;
     }
 
     if (ml_append((linenr_T)lnum, (char_u *)lines[i], 0, false) == FAIL) {
-      _api_set_error(err, kErrorTypeException, _("Failed to insert line"));
+      api_set_error(err, kErrorTypeException, _("Failed to insert line"));
       goto end;
     }
 
@@ -627,7 +627,7 @@ void nvim_buf_set_name(Buffer buffer, String name, Error *err)
   }
 
   if (ren_ret == FAIL) {
-    _api_set_error(err, kErrorTypeException, _("Failed to rename buffer"));
+    api_set_error(err, kErrorTypeException, _("Failed to rename buffer"));
   }
 }
 
@@ -680,7 +680,7 @@ ArrayOf(Integer, 2) nvim_buf_get_mark(Buffer buffer, String name, Error *err)
   }
 
   if (name.size != 1) {
-    _api_set_error(err, kErrorTypeValidation, _("Mark name must be a single character"));
+    api_set_error(err, kErrorTypeValidation, _("Mark name must be a single character"));
     return rv;
   }
 
@@ -698,7 +698,7 @@ ArrayOf(Integer, 2) nvim_buf_get_mark(Buffer buffer, String name, Error *err)
   }
 
   if (posp == NULL) {
-    _api_set_error(err, kErrorTypeValidation, _("Invalid mark name"));
+    api_set_error(err, kErrorTypeValidation, _("Invalid mark name"));
     return rv;
   }
 
@@ -753,11 +753,11 @@ Integer nvim_buf_add_highlight(Buffer buffer,
   }
 
   if (line < 0 || line >= MAXLNUM) {
-    _api_set_error(err, kErrorTypeValidation, _("Line number outside range"));
+    api_set_error(err, kErrorTypeValidation, _("Line number outside range"));
     return 0;
   }
   if (col_start < 0 || col_start > MAXCOL) {
-    _api_set_error(err, kErrorTypeValidation, _("Column value outside range"));
+    api_set_error(err, kErrorTypeValidation, _("Column value outside range"));
     return 0;
   }
   if (col_end < 0 || col_end > MAXCOL) {
@@ -794,7 +794,7 @@ void nvim_buf_clear_highlight(Buffer buffer,
   }
 
   if (line_start < 0 || line_start >= MAXLNUM) {
-    _api_set_error(err, kErrorTypeValidation, _("Line number outside range"));
+    api_set_error(err, kErrorTypeValidation, _("Line number outside range"));
     return;
   }
   if (line_end < 0 || line_end > MAXLNUM) {
diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index 58534d78a0..d7274920b6 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -61,7 +61,7 @@ bool try_end(Error *err)
       discard_current_exception();
     }
 
-    _api_set_error(err, kErrorTypeException, _("Keyboard interrupt"));
+    api_set_error(err, kErrorTypeException, _("Keyboard interrupt"));
     got_int = false;
   } else if (msg_list != NULL && *msg_list != NULL) {
     int should_free;
@@ -69,14 +69,14 @@ bool try_end(Error *err)
                                              ET_ERROR,
                                              NULL,
                                              &should_free);
-    _api_set_error(err, kErrorTypeException, "%s", msg);
+    api_set_error(err, kErrorTypeException, "%s", msg);
     free_global_msglist();
 
     if (should_free) {
       xfree(msg);
     }
   } else if (did_throw) {
-    _api_set_error(err, kErrorTypeException, "%s", current_exception->value);
+    api_set_error(err, kErrorTypeException, "%s", current_exception->value);
     discard_current_exception();
   }
 
@@ -93,7 +93,7 @@ Object dict_get_value(dict_T *dict, String key, Error *err)
   dictitem_T *const di = tv_dict_find(dict, key.data, (ptrdiff_t)key.size);
 
   if (di == NULL) {
-    _api_set_error(err, kErrorTypeValidation, _("Key not found"));
+    api_set_error(err, kErrorTypeValidation, _("Key not found"));
     return (Object) OBJECT_INIT;
   }
 
@@ -117,17 +117,17 @@ Object dict_set_var(dict_T *dict, String key, Object value, bool del,
   Object rv = OBJECT_INIT;
 
   if (dict->dv_lock) {
-    _api_set_error(err, kErrorTypeException, _("Dictionary is locked"));
+    api_set_error(err, kErrorTypeException, _("Dictionary is locked"));
     return rv;
   }
 
   if (key.size == 0) {
-    _api_set_error(err, kErrorTypeValidation, _("Empty variable names aren't allowed"));
+    api_set_error(err, kErrorTypeValidation, _("Empty variable names aren't allowed"));
     return rv;
   }
 
   if (key.size > INT_MAX) {
-    _api_set_error(err, kErrorTypeValidation, _("Key length is too high"));
+    api_set_error(err, kErrorTypeValidation, _("Key length is too high"));
     return rv;
   }
 
@@ -135,13 +135,13 @@ Object dict_set_var(dict_T *dict, String key, Object value, bool del,
 
   if (di != NULL) {
     if (di->di_flags & DI_FLAGS_RO) {
-      _api_set_error(err, kErrorTypeException, _("Key is read-only: %s"), key.data);
+      api_set_error(err, kErrorTypeException, _("Key is read-only: %s"), key.data);
       return rv;
     } else if (di->di_flags & DI_FLAGS_FIX) {
-      _api_set_error(err, kErrorTypeException, _("Key is fixed: %s"), key.data);
+      api_set_error(err, kErrorTypeException, _("Key is fixed: %s"), key.data);
       return rv;
     } else if (di->di_flags & DI_FLAGS_LOCK) {
-      _api_set_error(err, kErrorTypeException, _("Key is locked: %s"), key.data);
+      api_set_error(err, kErrorTypeException, _("Key is locked: %s"), key.data);
       return rv;
     }
   }
@@ -150,7 +150,7 @@ Object dict_set_var(dict_T *dict, String key, Object value, bool del,
     // Delete the key
     if (di == NULL) {
       // Doesn't exist, fail
-      _api_set_error(err, kErrorTypeValidation, _("Key \"%s\" doesn't exist"), key.data);
+      api_set_error(err, kErrorTypeValidation, _("Key \"%s\" doesn't exist"), key.data);
     } else {
       // Return the old value
       if (retval) {
@@ -202,7 +202,7 @@ Object get_option_from(void *from, int type, String name, Error *err)
   Object rv = OBJECT_INIT;
 
   if (name.size == 0) {
-    _api_set_error(err, kErrorTypeValidation, _("Empty option name"));
+    api_set_error(err, kErrorTypeValidation, _("Empty option name"));
     return rv;
   }
 
@@ -213,7 +213,7 @@ Object get_option_from(void *from, int type, String name, Error *err)
                                       type, from);
 
   if (!flags) {
-    _api_set_error(err,
+    api_set_error(err,
                   kErrorTypeValidation,
                   _("Invalid option name \"%s\""),
                   name.data);
@@ -232,13 +232,13 @@ Object get_option_from(void *from, int type, String name, Error *err)
       rv.data.string.data = stringval;
       rv.data.string.size = strlen(stringval);
     } else {
-      _api_set_error(err,
+      api_set_error(err,
                     kErrorTypeException,
                     _("Unable to get value for option \"%s\""),
                     name.data);
     }
   } else {
-    _api_set_error(err,
+    api_set_error(err,
                   kErrorTypeException,
                   _("Unknown type for option \"%s\""),
                   name.data);
@@ -257,14 +257,14 @@ Object get_option_from(void *from, int type, String name, Error *err)
 void set_option_to(void *to, int type, String name, Object value, Error *err)
 {
   if (name.size == 0) {
-    _api_set_error(err, kErrorTypeValidation, _("Empty option name"));
+    api_set_error(err, kErrorTypeValidation, _("Empty option name"));
     return;
   }
 
   int flags = get_option_value_strict(name.data, NULL, NULL, type, to);
 
   if (flags == 0) {
-    _api_set_error(err,
+    api_set_error(err,
                   kErrorTypeValidation,
                   _("Invalid option name \"%s\""),
                   name.data);
@@ -273,13 +273,13 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
 
   if (value.type == kObjectTypeNil) {
     if (type == SREQ_GLOBAL) {
-      _api_set_error(err,
+      api_set_error(err,
                     kErrorTypeException,
                     _("Unable to unset option \"%s\""),
                     name.data);
       return;
     } else if (!(flags & SOPT_GLOBAL)) {
-      _api_set_error(err,
+      api_set_error(err,
                     kErrorTypeException,
                     _("Cannot unset option \"%s\" "
                       "because it doesn't have a global value"),
@@ -295,7 +295,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
 
   if (flags & SOPT_BOOL) {
     if (value.type != kObjectTypeBoolean) {
-      _api_set_error(err,
+      api_set_error(err,
                     kErrorTypeValidation,
                     _("Option \"%s\" requires a boolean value"),
                     name.data);
@@ -306,7 +306,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
     set_option_value_for(name.data, val, NULL, opt_flags, type, to, err);
   } else if (flags & SOPT_NUM) {
     if (value.type != kObjectTypeInteger) {
-      _api_set_error(err,
+      api_set_error(err,
                     kErrorTypeValidation,
                     _("Option \"%s\" requires an integer value"),
                     name.data);
@@ -314,7 +314,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
     }
 
     if (value.data.integer > INT_MAX || value.data.integer < INT_MIN) {
-      _api_set_error(err,
+      api_set_error(err,
                     kErrorTypeValidation,
                     _("Value for option \"%s\" is outside range"),
                     name.data);
@@ -325,7 +325,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
     set_option_value_for(name.data, val, NULL, opt_flags, type, to, err);
   } else {
     if (value.type != kObjectTypeString) {
-      _api_set_error(err,
+      api_set_error(err,
                     kErrorTypeValidation,
                     _("Option \"%s\" requires a string value"),
                     name.data);
@@ -560,7 +560,7 @@ buf_T *find_buffer_by_handle(Buffer buffer, Error *err)
   buf_T *rv = handle_get_buffer(buffer);
 
   if (!rv) {
-    _api_set_error(err, kErrorTypeValidation, _("Invalid buffer id"));
+    api_set_error(err, kErrorTypeValidation, _("Invalid buffer id"));
   }
 
   return rv;
@@ -575,7 +575,7 @@ win_T *find_window_by_handle(Window window, Error *err)
   win_T *rv = handle_get_window(window);
 
   if (!rv) {
-    _api_set_error(err, kErrorTypeValidation, _("Invalid window id"));
+    api_set_error(err, kErrorTypeValidation, _("Invalid window id"));
   }
 
   return rv;
@@ -590,7 +590,7 @@ tabpage_T *find_tab_by_handle(Tabpage tabpage, Error *err)
   tabpage_T *rv = handle_get_tabpage(tabpage);
 
   if (!rv) {
-    _api_set_error(err, kErrorTypeValidation, _("Invalid tabpage id"));
+    api_set_error(err, kErrorTypeValidation, _("Invalid tabpage id"));
   }
 
   return rv;
@@ -658,7 +658,7 @@ bool object_to_vim(Object obj, typval_T *tv, Error *err)
     case kObjectTypeInteger:
       if (obj.data.integer > VARNUMBER_MAX
           || obj.data.integer < VARNUMBER_MIN) {
-        _api_set_error(err, kErrorTypeValidation, _("Integer value outside range"));
+        api_set_error(err, kErrorTypeValidation, _("Integer value outside range"));
         return false;
       }
 
@@ -712,7 +712,7 @@ bool object_to_vim(Object obj, typval_T *tv, Error *err)
         String key = item.key;
 
         if (key.size == 0) {
-          _api_set_error(err, kErrorTypeValidation,
+          api_set_error(err, kErrorTypeValidation,
                         _("Empty dictionary keys aren't allowed"));
           // cleanup
           tv_dict_free(dict);
@@ -936,7 +936,7 @@ static void set_option_value_for(char *key,
         if (try_end(err)) {
           return;
         }
-        _api_set_error(err,
+        api_set_error(err,
                       kErrorTypeException,
                       _("Problem while switching windows"));
         return;
@@ -975,11 +975,11 @@ static void set_option_value_err(char *key,
       return;
     }
 
-    _api_set_error(err, kErrorTypeException, "%s", errmsg);
+    api_set_error(err, kErrorTypeException, "%s", errmsg);
   }
 }
 
-void _api_set_error(Error *err, ErrorType errType, const char *format, ...)
+void api_set_error(Error *err, ErrorType errType, const char *format, ...)
   FUNC_ATTR_NONNULL_ALL
 {
   assert(kErrorTypeNone != errType);
diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c
index 4c39bc57eb..26c0a8119b 100644
--- a/src/nvim/api/ui.c
+++ b/src/nvim/api/ui.c
@@ -55,12 +55,12 @@ void nvim_ui_attach(uint64_t channel_id, Integer width, Integer height,
     FUNC_API_SINCE(1) FUNC_API_NOEVAL
 {
   if (pmap_has(uint64_t)(connected_uis, channel_id)) {
-    _api_set_error(err, kErrorTypeException, _("UI already attached for channel"));
+    api_set_error(err, kErrorTypeException, _("UI already attached for channel"));
     return;
   }
 
   if (width <= 0 || height <= 0) {
-    _api_set_error(err, kErrorTypeValidation,
+    api_set_error(err, kErrorTypeValidation,
                   _("Expected width > 0 and height > 0"));
     return;
   }
@@ -126,7 +126,7 @@ void nvim_ui_detach(uint64_t channel_id, Error *err)
     FUNC_API_SINCE(1) FUNC_API_NOEVAL
 {
   if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
-    _api_set_error(err, kErrorTypeException, _("UI is not attached for channel"));
+    api_set_error(err, kErrorTypeException, _("UI is not attached for channel"));
     return;
   }
   remote_ui_disconnect(channel_id);
@@ -138,12 +138,12 @@ void nvim_ui_try_resize(uint64_t channel_id, Integer width,
     FUNC_API_SINCE(1) FUNC_API_NOEVAL
 {
   if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
-    _api_set_error(err, kErrorTypeException, _("UI is not attached for channel"));
+    api_set_error(err, kErrorTypeException, _("UI is not attached for channel"));
     return;
   }
 
   if (width <= 0 || height <= 0) {
-    _api_set_error(err, kErrorTypeValidation,
+    api_set_error(err, kErrorTypeValidation,
                   _("Expected width > 0 and height > 0"));
     return;
   }
@@ -159,7 +159,7 @@ void nvim_ui_set_option(uint64_t channel_id, String name,
     FUNC_API_SINCE(1) FUNC_API_NOEVAL
 {
   if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
-    _api_set_error(error, kErrorTypeException, _("UI is not attached for channel"));
+    api_set_error(error, kErrorTypeException, _("UI is not attached for channel"));
     return;
   }
   UI *ui = pmap_get(uint64_t)(connected_uis, channel_id);
@@ -173,19 +173,19 @@ void nvim_ui_set_option(uint64_t channel_id, String name,
 static void ui_set_option(UI *ui, String name, Object value, Error *error) {
   if (strcmp(name.data, "rgb") == 0) {
     if (value.type != kObjectTypeBoolean) {
-      _api_set_error(error, kErrorTypeValidation, _("rgb must be a Boolean"));
+      api_set_error(error, kErrorTypeValidation, _("rgb must be a Boolean"));
       return;
     }
     ui->rgb = value.data.boolean;
   } else if (strcmp(name.data, "popupmenu_external") == 0) {
     if (value.type != kObjectTypeBoolean) {
-      _api_set_error(error, kErrorTypeValidation,
+      api_set_error(error, kErrorTypeValidation,
                     _("popupmenu_external must be a Boolean"));
       return;
     }
     ui->pum_external = value.data.boolean;
   } else {
-    _api_set_error(error, kErrorTypeValidation, _("No such ui option"));
+    api_set_error(error, kErrorTypeValidation, _("No such ui option"));
   }
 }
 
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 924ea419a1..16c630b0e6 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -188,7 +188,7 @@ Object nvim_eval(String expr, Error *err)
 
   typval_T rettv;
   if (eval0((char_u *)expr.data, &rettv, NULL, true) == FAIL) {
-    _api_set_error(err, kErrorTypeException, "Failed to evaluate expression");
+    api_set_error(err, kErrorTypeException, "Failed to evaluate expression");
   }
 
   if (!try_end(err)) {
@@ -214,7 +214,7 @@ Object nvim_call_function(String fname, Array args, Error *err)
 {
   Object rv = OBJECT_INIT;
   if (args.size > MAX_FUNC_ARGS) {
-    _api_set_error(err, kErrorTypeValidation,
+    api_set_error(err, kErrorTypeValidation,
       _("Function called with too many arguments."));
     return rv;
   }
@@ -237,7 +237,7 @@ Object nvim_call_function(String fname, Array args, Error *err)
                     curwin->w_cursor.lnum, curwin->w_cursor.lnum, &dummy,
                     true, NULL, NULL);
   if (r == FAIL) {
-    _api_set_error(err, kErrorTypeException, _("Error calling function."));
+    api_set_error(err, kErrorTypeException, _("Error calling function."));
   }
   if (!try_end(err)) {
     rv = vim_to_object(&rettv);
@@ -262,7 +262,7 @@ Integer nvim_strwidth(String str, Error *err)
     FUNC_API_SINCE(1)
 {
   if (str.size > INT_MAX) {
-    _api_set_error(err, kErrorTypeValidation, _("String length is too high"));
+    api_set_error(err, kErrorTypeValidation, _("String length is too high"));
     return 0;
   }
 
@@ -318,7 +318,7 @@ void nvim_set_current_dir(String dir, Error *err)
     FUNC_API_SINCE(1)
 {
   if (dir.size >= MAXPATHL) {
-    _api_set_error(err, kErrorTypeValidation, _("Directory string is too long"));
+    api_set_error(err, kErrorTypeValidation, _("Directory string is too long"));
     return;
   }
 
@@ -330,7 +330,7 @@ void nvim_set_current_dir(String dir, Error *err)
 
   if (vim_chdir((char_u *)string, kCdScopeGlobal)) {
     if (!try_end(err)) {
-      _api_set_error(err, kErrorTypeException, _("Failed to change directory"));
+      api_set_error(err, kErrorTypeException, _("Failed to change directory"));
     }
     return;
   }
@@ -538,7 +538,7 @@ void nvim_set_current_buf(Buffer buffer, Error *err)
   try_start();
   int result = do_buffer(DOBUF_GOTO, DOBUF_FIRST, FORWARD, buf->b_fnum, 0);
   if (!try_end(err) && result == FAIL) {
-    _api_set_error(err,
+    api_set_error(err,
                   kErrorTypeException,
                   _("Failed to switch to buffer %d"),
                   buffer);
@@ -591,7 +591,7 @@ void nvim_set_current_win(Window window, Error *err)
   try_start();
   goto_tabpage_win(win_find_tabpage(win), win);
   if (!try_end(err) && win != curwin) {
-    _api_set_error(err,
+    api_set_error(err,
                   kErrorTypeException,
                   _("Failed to switch to window %d"),
                   window);
@@ -645,7 +645,7 @@ void nvim_set_current_tabpage(Tabpage tabpage, Error *err)
   try_start();
   goto_tabpage_tp(tp, true, true);
   if (!try_end(err) && tp != curtab) {
-    _api_set_error(err,
+    api_set_error(err,
                   kErrorTypeException,
                   _("Failed to switch to tabpage %d"),
                   tabpage);
@@ -744,21 +744,21 @@ Array nvim_call_atomic(uint64_t channel_id, Array calls, Error *err)
   size_t i;  // also used for freeing the variables
   for (i = 0; i < calls.size; i++) {
     if (calls.items[i].type != kObjectTypeArray) {
-      _api_set_error(err,
+      api_set_error(err,
                     kErrorTypeValidation,
                     _("All items in calls array must be arrays"));
       goto validation_error;
     }
     Array call = calls.items[i].data.array;
     if (call.size != 2) {
-      _api_set_error(err,
+      api_set_error(err,
                     kErrorTypeValidation,
                     _("All items in calls array must be arrays of size 2"));
       goto validation_error;
     }
 
     if (call.items[0].type != kObjectTypeString) {
-      _api_set_error(err,
+      api_set_error(err,
                     kErrorTypeValidation,
                     _("name must be String"));
       goto validation_error;
@@ -766,7 +766,7 @@ Array nvim_call_atomic(uint64_t channel_id, Array calls, Error *err)
     String name = call.items[0].data.string;
 
     if (call.items[1].type != kObjectTypeArray) {
-      _api_set_error(err,
+      api_set_error(err,
                     kErrorTypeValidation,
                     _("args must be Array"));
       goto validation_error;
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index b8326c1198..dd52b2d690 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -64,7 +64,7 @@ void nvim_win_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err)
 
   if (pos.size != 2 || pos.items[0].type != kObjectTypeInteger
       || pos.items[1].type != kObjectTypeInteger) {
-    _api_set_error(err,
+    api_set_error(err,
                   kErrorTypeValidation,
                   _("Argument \"pos\" must be a [row, col] array"));
     return;
@@ -78,12 +78,12 @@ void nvim_win_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err)
   int64_t col = pos.items[1].data.integer;
 
   if (row <= 0 || row > win->w_buffer->b_ml.ml_line_count) {
-    _api_set_error(err, kErrorTypeValidation, _("Cursor position outside buffer"));
+    api_set_error(err, kErrorTypeValidation, _("Cursor position outside buffer"));
     return;
   }
 
   if (col > MAXCOL || col < 0) {
-    _api_set_error(err, kErrorTypeValidation, _("Column value outside range"));
+    api_set_error(err, kErrorTypeValidation, _("Column value outside range"));
     return;
   }
 
@@ -132,7 +132,7 @@ void nvim_win_set_height(Window window, Integer height, Error *err)
   }
 
   if (height > INT_MAX || height < INT_MIN) {
-    _api_set_error(err, kErrorTypeValidation, _("Height value outside range"));
+    api_set_error(err, kErrorTypeValidation, _("Height value outside range"));
     return;
   }
 
@@ -177,7 +177,7 @@ void nvim_win_set_width(Window window, Integer width, Error *err)
   }
 
   if (width > INT_MAX || width < INT_MIN) {
-    _api_set_error(err, kErrorTypeValidation, _("Width value outside range"));
+    api_set_error(err, kErrorTypeValidation, _("Width value outside range"));
     return;
   }
 
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
index 36a3210c70..3cf85316d9 100644
--- a/src/nvim/msgpack_rpc/channel.c
+++ b/src/nvim/msgpack_rpc/channel.c
@@ -192,7 +192,7 @@ Object channel_send_call(uint64_t id,
   Channel *channel = NULL;
 
   if (!(channel = pmap_get(uint64_t)(channels, id)) || channel->closed) {
-    _api_set_error(err, kErrorTypeException, _("Invalid channel \"%" PRIu64 "\""), id);
+    api_set_error(err, kErrorTypeException, _("Invalid channel \"%" PRIu64 "\""), id);
     api_free_array(args);
     return NIL;
   }
@@ -212,7 +212,7 @@ Object channel_send_call(uint64_t id,
 
   if (frame.errored) {
     if (frame.result.type == kObjectTypeString) {
-      _api_set_error(err, kErrorTypeException, "%s", frame.result.data.string.data);
+      api_set_error(err, kErrorTypeException, "%s", frame.result.data.string.data);
     } else if (frame.result.type == kObjectTypeArray) {
       // Should be an error in the form [type, message]
       Array array = frame.result.data.array;
@@ -220,13 +220,13 @@ Object channel_send_call(uint64_t id,
           && (array.items[0].data.integer == kErrorTypeException
               || array.items[0].data.integer == kErrorTypeValidation)
           && array.items[1].type == kObjectTypeString) {
-        _api_set_error(err, (ErrorType)array.items[0].data.integer, "%s",
+        api_set_error(err, (ErrorType)array.items[0].data.integer, "%s",
                        array.items[1].data.string.data);
       } else {
-        _api_set_error(err, kErrorTypeException, "%s", "unknown error");
+        api_set_error(err, kErrorTypeException, "%s", "unknown error");
       }
     } else {
-      _api_set_error(err, kErrorTypeException, "%s", "unknown error");
+      api_set_error(err, kErrorTypeException, "%s", "unknown error");
     }
 
     api_free_object(frame.result);
@@ -512,7 +512,7 @@ static bool channel_write(Channel *channel, WBuffer *buffer)
 static void send_error(Channel *channel, uint64_t id, char *err)
 {
   Error e = ERROR_INIT;
-  _api_set_error(&e, kErrorTypeException, "%s", err);
+  api_set_error(&e, kErrorTypeException, "%s", err);
   channel_write(channel, serialize_response(channel->id,
                                             id,
                                             &e,
diff --git a/src/nvim/msgpack_rpc/helpers.c b/src/nvim/msgpack_rpc/helpers.c
index 800f5edb85..0ad1d9ae4b 100644
--- a/src/nvim/msgpack_rpc/helpers.c
+++ b/src/nvim/msgpack_rpc/helpers.c
@@ -475,7 +475,7 @@ Object msgpack_rpc_handle_missing_method(uint64_t channel_id,
                                          Array args,
                                          Error *error)
 {
-  _api_set_error(error, kErrorTypeException, "Invalid method name");
+  api_set_error(error, kErrorTypeException, "Invalid method name");
   return NIL;
 }
 
@@ -484,7 +484,7 @@ Object msgpack_rpc_handle_invalid_arguments(uint64_t channel_id,
                                             Array args,
                                             Error *error)
 {
-  _api_set_error(error, kErrorTypeException, "Invalid method arguments");
+  api_set_error(error, kErrorTypeException, "Invalid method arguments");
   return NIL;
 }
 
@@ -570,29 +570,29 @@ void msgpack_rpc_validate(uint64_t *response_id,
   *response_id = NO_RESPONSE;
   // Validate the basic structure of the msgpack-rpc payload
   if (req->type != MSGPACK_OBJECT_ARRAY) {
-    _api_set_error(err, kErrorTypeValidation, _("Message is not an array"));
+    api_set_error(err, kErrorTypeValidation, _("Message is not an array"));
     return;
   }
 
   if (req->via.array.size == 0) {
-    _api_set_error(err, kErrorTypeValidation, _("Message is empty"));
+    api_set_error(err, kErrorTypeValidation, _("Message is empty"));
     return;
   }
 
   if (req->via.array.ptr[0].type != MSGPACK_OBJECT_POSITIVE_INTEGER) {
-    _api_set_error(err, kErrorTypeValidation, _("Message type must be an integer"));
+    api_set_error(err, kErrorTypeValidation, _("Message type must be an integer"));
     return;
   }
 
   uint64_t type = req->via.array.ptr[0].via.u64;
   if (type != kMessageTypeRequest && type != kMessageTypeNotification) {
-    _api_set_error(err, kErrorTypeValidation, _("Unknown message type"));
+    api_set_error(err, kErrorTypeValidation, _("Unknown message type"));
     return;
   }
 
   if ((type == kMessageTypeRequest && req->via.array.size != 4)
       || (type == kMessageTypeNotification && req->via.array.size != 3)) {
-    _api_set_error(err, kErrorTypeValidation, _("Request array size should be 4 (request) "
+    api_set_error(err, kErrorTypeValidation, _("Request array size should be 4 (request) "
                                      "or 3 (notification)"));
     return;
   }
@@ -600,19 +600,19 @@ void msgpack_rpc_validate(uint64_t *response_id,
   if (type == kMessageTypeRequest) {
     msgpack_object *id_obj = msgpack_rpc_msg_id(req);
     if (!id_obj) {
-      _api_set_error(err, kErrorTypeValidation, _("ID must be a positive integer"));
+      api_set_error(err, kErrorTypeValidation, _("ID must be a positive integer"));
       return;
     }
     *response_id = id_obj->via.u64;
   }
 
   if (!msgpack_rpc_method(req)) {
-    _api_set_error(err, kErrorTypeValidation, _("Method must be a string"));
+    api_set_error(err, kErrorTypeValidation, _("Method must be a string"));
     return;
   }
 
   if (!msgpack_rpc_args(req)) {
-    _api_set_error(err, kErrorTypeValidation, _("Parameters must be an array"));
+    api_set_error(err, kErrorTypeValidation, _("Parameters must be an array"));
     return;
   }
 }

From e2936ed39768c07e810cd3c3e6255cf48fba494f Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 23 Apr 2017 22:06:02 +0200
Subject: [PATCH 151/257] tui/input.c: Use default 'ttimeoutlen' if option get
 fails.

Should never happen, but better to be explicit.

Helped-by: oni-link <knil.ino@gmail.com>
---
 src/nvim/tui/input.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/nvim/tui/input.c b/src/nvim/tui/input.c
index be016668fc..b86ab8cf2f 100644
--- a/src/nvim/tui/input.c
+++ b/src/nvim/tui/input.c
@@ -223,10 +223,12 @@ static int get_key_code_timeout(void)
 {
   Integer ms = -1;
   // Check 'ttimeout' to determine if we should send ESC after 'ttimeoutlen'.
-  // See :help 'ttimeout' for more information
   Error err = ERROR_INIT;
   if (nvim_get_option(cstr_as_string("ttimeout"), &err).data.boolean) {
-    ms = nvim_get_option(cstr_as_string("ttimeoutlen"), &err).data.integer;
+    Object rv = nvim_get_option(cstr_as_string("ttimeoutlen"), &err);
+    if (!ERROR_SET(&err)) {
+      ms = rv.data.integer;
+    }
   }
   api_clear_error(&err);
   return (int)ms;

From 086c354a0aad2769042dc91bf5bad021109f56e4 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 23 Apr 2017 22:30:08 +0200
Subject: [PATCH 152/257] api: Do not translate error messages.

Also re-word some error messages:
- "Key does not exist: %s"
- "Invalid channel: %<PRIu64>"
- "Request array size must be 4 (request) or 3 (notification)"
- "String cannot contain newlines"

References #6150
---
 src/nvim/api/buffer.c                | 38 +++++++++---------
 src/nvim/api/private/helpers.c       | 60 ++++++++++++++--------------
 src/nvim/api/ui.c                    | 18 ++++-----
 src/nvim/api/vim.c                   | 26 ++++++------
 src/nvim/api/window.c                | 10 ++---
 src/nvim/msgpack_rpc/channel.c       |  7 ++--
 src/nvim/msgpack_rpc/helpers.c       | 18 ++++-----
 src/nvim/po/fi.po                    |  6 +--
 src/nvim/po/uk.po                    |  6 +--
 test/functional/api/buffer_spec.lua  |  2 +-
 test/functional/api/tabpage_spec.lua |  2 +-
 test/functional/api/vim_spec.lua     |  4 +-
 test/functional/api/window_spec.lua  |  2 +-
 13 files changed, 102 insertions(+), 97 deletions(-)

diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index 4d6081bb5e..ae5728ee21 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -171,7 +171,7 @@ ArrayOf(String) nvim_buf_get_lines(uint64_t channel_id,
   end = normalize_index(buf, end, &oob);
 
   if (strict_indexing && oob) {
-    api_set_error(err, kErrorTypeValidation, _("Index out of bounds"));
+    api_set_error(err, kErrorTypeValidation, "Index out of bounds");
     return rv;
   }
 
@@ -187,7 +187,7 @@ ArrayOf(String) nvim_buf_get_lines(uint64_t channel_id,
     int64_t lnum = start + (int64_t)i;
 
     if (lnum > LONG_MAX) {
-      api_set_error(err, kErrorTypeValidation, _("Line index is too high"));
+      api_set_error(err, kErrorTypeValidation, "Line index is too high");
       goto end;
     }
 
@@ -283,7 +283,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
   end = normalize_index(buf, end, &oob);
 
   if (strict_indexing && oob) {
-    api_set_error(err, kErrorTypeValidation, _("Index out of bounds"));
+    api_set_error(err, kErrorTypeValidation, "Index out of bounds");
     return;
   }
 
@@ -291,7 +291,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
   if (start > end) {
     api_set_error(err,
                   kErrorTypeValidation,
-                  _("Argument \"start\" is higher than \"end\""));
+                  "Argument \"start\" is higher than \"end\"");
     return;
   }
 
@@ -306,7 +306,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
     if (replacement.items[i].type != kObjectTypeString) {
       api_set_error(err,
                     kErrorTypeValidation,
-                    _("All items in the replacement array must be strings"));
+                    "All items in the replacement array must be strings");
       goto end;
     }
 
@@ -317,7 +317,8 @@ void nvim_buf_set_lines(uint64_t channel_id,
     lines[i] = xmallocz(l.size);
     for (size_t j = 0; j < l.size; j++) {
       if (l.data[j] == '\n' && channel_id != INTERNAL_CALL) {
-        api_set_error(err, kErrorTypeException, _("string cannot contain newlines"));
+        api_set_error(err, kErrorTypeException,
+                      "String cannot contain newlines");
         new_len = i + 1;
         goto end;
       }
@@ -330,7 +331,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
   switch_to_win_for_buf(buf, &save_curwin, &save_curtab, &save_curbuf);
 
   if (u_save((linenr_T)(start - 1), (linenr_T)end) == FAIL) {
-    api_set_error(err, kErrorTypeException, _("Failed to save undo information"));
+    api_set_error(err, kErrorTypeException, "Failed to save undo information");
     goto end;
   }
 
@@ -340,7 +341,7 @@ void nvim_buf_set_lines(uint64_t channel_id,
   size_t to_delete = (new_len < old_len) ? (size_t)(old_len - new_len) : 0;
   for (size_t i = 0; i < to_delete; i++) {
     if (ml_delete((linenr_T)start, false) == FAIL) {
-      api_set_error(err, kErrorTypeException, _("Failed to delete line"));
+      api_set_error(err, kErrorTypeException, "Failed to delete line");
       goto end;
     }
   }
@@ -357,12 +358,12 @@ void nvim_buf_set_lines(uint64_t channel_id,
     int64_t lnum = start + (int64_t)i;
 
     if (lnum > LONG_MAX) {
-      api_set_error(err, kErrorTypeValidation, _("Index value is too high"));
+      api_set_error(err, kErrorTypeValidation, "Index value is too high");
       goto end;
     }
 
     if (ml_replace((linenr_T)lnum, (char_u *)lines[i], false) == FAIL) {
-      api_set_error(err, kErrorTypeException, _("Failed to replace line"));
+      api_set_error(err, kErrorTypeException, "Failed to replace line");
       goto end;
     }
     // Mark lines that haven't been passed to the buffer as they need
@@ -375,12 +376,12 @@ void nvim_buf_set_lines(uint64_t channel_id,
     int64_t lnum = start + (int64_t)i - 1;
 
     if (lnum > LONG_MAX) {
-      api_set_error(err, kErrorTypeValidation, _("Index value is too high"));
+      api_set_error(err, kErrorTypeValidation, "Index value is too high");
       goto end;
     }
 
     if (ml_append((linenr_T)lnum, (char_u *)lines[i], 0, false) == FAIL) {
-      api_set_error(err, kErrorTypeException, _("Failed to insert line"));
+      api_set_error(err, kErrorTypeException, "Failed to insert line");
       goto end;
     }
 
@@ -627,7 +628,7 @@ void nvim_buf_set_name(Buffer buffer, String name, Error *err)
   }
 
   if (ren_ret == FAIL) {
-    api_set_error(err, kErrorTypeException, _("Failed to rename buffer"));
+    api_set_error(err, kErrorTypeException, "Failed to rename buffer");
   }
 }
 
@@ -680,7 +681,8 @@ ArrayOf(Integer, 2) nvim_buf_get_mark(Buffer buffer, String name, Error *err)
   }
 
   if (name.size != 1) {
-    api_set_error(err, kErrorTypeValidation, _("Mark name must be a single character"));
+    api_set_error(err, kErrorTypeValidation,
+                  "Mark name must be a single character");
     return rv;
   }
 
@@ -698,7 +700,7 @@ ArrayOf(Integer, 2) nvim_buf_get_mark(Buffer buffer, String name, Error *err)
   }
 
   if (posp == NULL) {
-    api_set_error(err, kErrorTypeValidation, _("Invalid mark name"));
+    api_set_error(err, kErrorTypeValidation, "Invalid mark name");
     return rv;
   }
 
@@ -753,11 +755,11 @@ Integer nvim_buf_add_highlight(Buffer buffer,
   }
 
   if (line < 0 || line >= MAXLNUM) {
-    api_set_error(err, kErrorTypeValidation, _("Line number outside range"));
+    api_set_error(err, kErrorTypeValidation, "Line number outside range");
     return 0;
   }
   if (col_start < 0 || col_start > MAXCOL) {
-    api_set_error(err, kErrorTypeValidation, _("Column value outside range"));
+    api_set_error(err, kErrorTypeValidation, "Column value outside range");
     return 0;
   }
   if (col_end < 0 || col_end > MAXCOL) {
@@ -794,7 +796,7 @@ void nvim_buf_clear_highlight(Buffer buffer,
   }
 
   if (line_start < 0 || line_start >= MAXLNUM) {
-    api_set_error(err, kErrorTypeValidation, _("Line number outside range"));
+    api_set_error(err, kErrorTypeValidation, "Line number outside range");
     return;
   }
   if (line_end < 0 || line_end > MAXLNUM) {
diff --git a/src/nvim/api/private/helpers.c b/src/nvim/api/private/helpers.c
index d7274920b6..69cb19c14f 100644
--- a/src/nvim/api/private/helpers.c
+++ b/src/nvim/api/private/helpers.c
@@ -61,7 +61,7 @@ bool try_end(Error *err)
       discard_current_exception();
     }
 
-    api_set_error(err, kErrorTypeException, _("Keyboard interrupt"));
+    api_set_error(err, kErrorTypeException, "Keyboard interrupt");
     got_int = false;
   } else if (msg_list != NULL && *msg_list != NULL) {
     int should_free;
@@ -93,8 +93,8 @@ Object dict_get_value(dict_T *dict, String key, Error *err)
   dictitem_T *const di = tv_dict_find(dict, key.data, (ptrdiff_t)key.size);
 
   if (di == NULL) {
-    api_set_error(err, kErrorTypeValidation, _("Key not found"));
-    return (Object) OBJECT_INIT;
+    api_set_error(err, kErrorTypeValidation, "Key not found");
+    return (Object)OBJECT_INIT;
   }
 
   return vim_to_object(&di->di_tv);
@@ -117,17 +117,18 @@ Object dict_set_var(dict_T *dict, String key, Object value, bool del,
   Object rv = OBJECT_INIT;
 
   if (dict->dv_lock) {
-    api_set_error(err, kErrorTypeException, _("Dictionary is locked"));
+    api_set_error(err, kErrorTypeException, "Dictionary is locked");
     return rv;
   }
 
   if (key.size == 0) {
-    api_set_error(err, kErrorTypeValidation, _("Empty variable names aren't allowed"));
+    api_set_error(err, kErrorTypeValidation,
+                  "Empty variable names aren't allowed");
     return rv;
   }
 
   if (key.size > INT_MAX) {
-    api_set_error(err, kErrorTypeValidation, _("Key length is too high"));
+    api_set_error(err, kErrorTypeValidation, "Key length is too high");
     return rv;
   }
 
@@ -135,13 +136,13 @@ Object dict_set_var(dict_T *dict, String key, Object value, bool del,
 
   if (di != NULL) {
     if (di->di_flags & DI_FLAGS_RO) {
-      api_set_error(err, kErrorTypeException, _("Key is read-only: %s"), key.data);
+      api_set_error(err, kErrorTypeException, "Key is read-only: %s", key.data);
       return rv;
     } else if (di->di_flags & DI_FLAGS_FIX) {
-      api_set_error(err, kErrorTypeException, _("Key is fixed: %s"), key.data);
+      api_set_error(err, kErrorTypeException, "Key is fixed: %s", key.data);
       return rv;
     } else if (di->di_flags & DI_FLAGS_LOCK) {
-      api_set_error(err, kErrorTypeException, _("Key is locked: %s"), key.data);
+      api_set_error(err, kErrorTypeException, "Key is locked: %s", key.data);
       return rv;
     }
   }
@@ -150,7 +151,8 @@ Object dict_set_var(dict_T *dict, String key, Object value, bool del,
     // Delete the key
     if (di == NULL) {
       // Doesn't exist, fail
-      api_set_error(err, kErrorTypeValidation, _("Key \"%s\" doesn't exist"), key.data);
+      api_set_error(err, kErrorTypeValidation, "Key does not exist: %s",
+                    key.data);
     } else {
       // Return the old value
       if (retval) {
@@ -202,7 +204,7 @@ Object get_option_from(void *from, int type, String name, Error *err)
   Object rv = OBJECT_INIT;
 
   if (name.size == 0) {
-    api_set_error(err, kErrorTypeValidation, _("Empty option name"));
+    api_set_error(err, kErrorTypeValidation, "Empty option name");
     return rv;
   }
 
@@ -215,7 +217,7 @@ Object get_option_from(void *from, int type, String name, Error *err)
   if (!flags) {
     api_set_error(err,
                   kErrorTypeValidation,
-                  _("Invalid option name \"%s\""),
+                  "Invalid option name \"%s\"",
                   name.data);
     return rv;
   }
@@ -234,13 +236,13 @@ Object get_option_from(void *from, int type, String name, Error *err)
     } else {
       api_set_error(err,
                     kErrorTypeException,
-                    _("Unable to get value for option \"%s\""),
+                    "Unable to get value for option \"%s\"",
                     name.data);
     }
   } else {
     api_set_error(err,
                   kErrorTypeException,
-                  _("Unknown type for option \"%s\""),
+                  "Unknown type for option \"%s\"",
                   name.data);
   }
 
@@ -257,7 +259,7 @@ Object get_option_from(void *from, int type, String name, Error *err)
 void set_option_to(void *to, int type, String name, Object value, Error *err)
 {
   if (name.size == 0) {
-    api_set_error(err, kErrorTypeValidation, _("Empty option name"));
+    api_set_error(err, kErrorTypeValidation, "Empty option name");
     return;
   }
 
@@ -266,7 +268,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
   if (flags == 0) {
     api_set_error(err,
                   kErrorTypeValidation,
-                  _("Invalid option name \"%s\""),
+                  "Invalid option name \"%s\"",
                   name.data);
     return;
   }
@@ -275,14 +277,14 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
     if (type == SREQ_GLOBAL) {
       api_set_error(err,
                     kErrorTypeException,
-                    _("Unable to unset option \"%s\""),
+                    "Unable to unset option \"%s\"",
                     name.data);
       return;
     } else if (!(flags & SOPT_GLOBAL)) {
       api_set_error(err,
                     kErrorTypeException,
-                    _("Cannot unset option \"%s\" "
-                      "because it doesn't have a global value"),
+                    "Cannot unset option \"%s\" "
+                    "because it doesn't have a global value",
                     name.data);
       return;
     } else {
@@ -297,7 +299,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
     if (value.type != kObjectTypeBoolean) {
       api_set_error(err,
                     kErrorTypeValidation,
-                    _("Option \"%s\" requires a boolean value"),
+                    "Option \"%s\" requires a boolean value",
                     name.data);
       return;
     }
@@ -308,7 +310,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
     if (value.type != kObjectTypeInteger) {
       api_set_error(err,
                     kErrorTypeValidation,
-                    _("Option \"%s\" requires an integer value"),
+                    "Option \"%s\" requires an integer value",
                     name.data);
       return;
     }
@@ -316,7 +318,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
     if (value.data.integer > INT_MAX || value.data.integer < INT_MIN) {
       api_set_error(err,
                     kErrorTypeValidation,
-                    _("Value for option \"%s\" is outside range"),
+                    "Value for option \"%s\" is outside range",
                     name.data);
       return;
     }
@@ -327,7 +329,7 @@ void set_option_to(void *to, int type, String name, Object value, Error *err)
     if (value.type != kObjectTypeString) {
       api_set_error(err,
                     kErrorTypeValidation,
-                    _("Option \"%s\" requires a string value"),
+                    "Option \"%s\" requires a string value",
                     name.data);
       return;
     }
@@ -560,7 +562,7 @@ buf_T *find_buffer_by_handle(Buffer buffer, Error *err)
   buf_T *rv = handle_get_buffer(buffer);
 
   if (!rv) {
-    api_set_error(err, kErrorTypeValidation, _("Invalid buffer id"));
+    api_set_error(err, kErrorTypeValidation, "Invalid buffer id");
   }
 
   return rv;
@@ -575,7 +577,7 @@ win_T *find_window_by_handle(Window window, Error *err)
   win_T *rv = handle_get_window(window);
 
   if (!rv) {
-    api_set_error(err, kErrorTypeValidation, _("Invalid window id"));
+    api_set_error(err, kErrorTypeValidation, "Invalid window id");
   }
 
   return rv;
@@ -590,7 +592,7 @@ tabpage_T *find_tab_by_handle(Tabpage tabpage, Error *err)
   tabpage_T *rv = handle_get_tabpage(tabpage);
 
   if (!rv) {
-    api_set_error(err, kErrorTypeValidation, _("Invalid tabpage id"));
+    api_set_error(err, kErrorTypeValidation, "Invalid tabpage id");
   }
 
   return rv;
@@ -658,7 +660,7 @@ bool object_to_vim(Object obj, typval_T *tv, Error *err)
     case kObjectTypeInteger:
       if (obj.data.integer > VARNUMBER_MAX
           || obj.data.integer < VARNUMBER_MIN) {
-        api_set_error(err, kErrorTypeValidation, _("Integer value outside range"));
+        api_set_error(err, kErrorTypeValidation, "Integer value outside range");
         return false;
       }
 
@@ -713,7 +715,7 @@ bool object_to_vim(Object obj, typval_T *tv, Error *err)
 
         if (key.size == 0) {
           api_set_error(err, kErrorTypeValidation,
-                        _("Empty dictionary keys aren't allowed"));
+                        "Empty dictionary keys aren't allowed");
           // cleanup
           tv_dict_free(dict);
           return false;
@@ -938,7 +940,7 @@ static void set_option_value_for(char *key,
         }
         api_set_error(err,
                       kErrorTypeException,
-                      _("Problem while switching windows"));
+                      "Problem while switching windows");
         return;
       }
       set_option_value_err(key, numval, stringval, opt_flags, err);
diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c
index 26c0a8119b..f0da0d1812 100644
--- a/src/nvim/api/ui.c
+++ b/src/nvim/api/ui.c
@@ -55,13 +55,13 @@ void nvim_ui_attach(uint64_t channel_id, Integer width, Integer height,
     FUNC_API_SINCE(1) FUNC_API_NOEVAL
 {
   if (pmap_has(uint64_t)(connected_uis, channel_id)) {
-    api_set_error(err, kErrorTypeException, _("UI already attached for channel"));
+    api_set_error(err, kErrorTypeException, "UI already attached for channel");
     return;
   }
 
   if (width <= 0 || height <= 0) {
     api_set_error(err, kErrorTypeValidation,
-                  _("Expected width > 0 and height > 0"));
+                  "Expected width > 0 and height > 0");
     return;
   }
   UI *ui = xcalloc(1, sizeof(UI));
@@ -126,7 +126,7 @@ void nvim_ui_detach(uint64_t channel_id, Error *err)
     FUNC_API_SINCE(1) FUNC_API_NOEVAL
 {
   if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
-    api_set_error(err, kErrorTypeException, _("UI is not attached for channel"));
+    api_set_error(err, kErrorTypeException, "UI is not attached for channel");
     return;
   }
   remote_ui_disconnect(channel_id);
@@ -138,13 +138,13 @@ void nvim_ui_try_resize(uint64_t channel_id, Integer width,
     FUNC_API_SINCE(1) FUNC_API_NOEVAL
 {
   if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
-    api_set_error(err, kErrorTypeException, _("UI is not attached for channel"));
+    api_set_error(err, kErrorTypeException, "UI is not attached for channel");
     return;
   }
 
   if (width <= 0 || height <= 0) {
     api_set_error(err, kErrorTypeValidation,
-                  _("Expected width > 0 and height > 0"));
+                  "Expected width > 0 and height > 0");
     return;
   }
 
@@ -159,7 +159,7 @@ void nvim_ui_set_option(uint64_t channel_id, String name,
     FUNC_API_SINCE(1) FUNC_API_NOEVAL
 {
   if (!pmap_has(uint64_t)(connected_uis, channel_id)) {
-    api_set_error(error, kErrorTypeException, _("UI is not attached for channel"));
+    api_set_error(error, kErrorTypeException, "UI is not attached for channel");
     return;
   }
   UI *ui = pmap_get(uint64_t)(connected_uis, channel_id);
@@ -173,19 +173,19 @@ void nvim_ui_set_option(uint64_t channel_id, String name,
 static void ui_set_option(UI *ui, String name, Object value, Error *error) {
   if (strcmp(name.data, "rgb") == 0) {
     if (value.type != kObjectTypeBoolean) {
-      api_set_error(error, kErrorTypeValidation, _("rgb must be a Boolean"));
+      api_set_error(error, kErrorTypeValidation, "rgb must be a Boolean");
       return;
     }
     ui->rgb = value.data.boolean;
   } else if (strcmp(name.data, "popupmenu_external") == 0) {
     if (value.type != kObjectTypeBoolean) {
       api_set_error(error, kErrorTypeValidation,
-                    _("popupmenu_external must be a Boolean"));
+                    "popupmenu_external must be a Boolean");
       return;
     }
     ui->pum_external = value.data.boolean;
   } else {
-    api_set_error(error, kErrorTypeValidation, _("No such ui option"));
+    api_set_error(error, kErrorTypeValidation, "No such ui option");
   }
 }
 
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 16c630b0e6..da00fbc6e3 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -166,7 +166,7 @@ String nvim_command_output(String str, Error *err)
   do_cmdline_cmd("redir END");
 
   if (ERROR_SET(err)) {
-    return (String) STRING_INIT;
+    return (String)STRING_INIT;
   }
 
   return cstr_to_string((char *)get_vim_var_str(VV_COMMAND_OUTPUT));
@@ -215,7 +215,7 @@ Object nvim_call_function(String fname, Array args, Error *err)
   Object rv = OBJECT_INIT;
   if (args.size > MAX_FUNC_ARGS) {
     api_set_error(err, kErrorTypeValidation,
-      _("Function called with too many arguments."));
+                  "Function called with too many arguments.");
     return rv;
   }
 
@@ -237,7 +237,7 @@ Object nvim_call_function(String fname, Array args, Error *err)
                     curwin->w_cursor.lnum, curwin->w_cursor.lnum, &dummy,
                     true, NULL, NULL);
   if (r == FAIL) {
-    api_set_error(err, kErrorTypeException, _("Error calling function."));
+    api_set_error(err, kErrorTypeException, "Error calling function.");
   }
   if (!try_end(err)) {
     rv = vim_to_object(&rettv);
@@ -262,7 +262,7 @@ Integer nvim_strwidth(String str, Error *err)
     FUNC_API_SINCE(1)
 {
   if (str.size > INT_MAX) {
-    api_set_error(err, kErrorTypeValidation, _("String length is too high"));
+    api_set_error(err, kErrorTypeValidation, "String length is too high");
     return 0;
   }
 
@@ -318,7 +318,7 @@ void nvim_set_current_dir(String dir, Error *err)
     FUNC_API_SINCE(1)
 {
   if (dir.size >= MAXPATHL) {
-    api_set_error(err, kErrorTypeValidation, _("Directory string is too long"));
+    api_set_error(err, kErrorTypeValidation, "Directory string is too long");
     return;
   }
 
@@ -330,7 +330,7 @@ void nvim_set_current_dir(String dir, Error *err)
 
   if (vim_chdir((char_u *)string, kCdScopeGlobal)) {
     if (!try_end(err)) {
-      api_set_error(err, kErrorTypeException, _("Failed to change directory"));
+      api_set_error(err, kErrorTypeException, "Failed to change directory");
     }
     return;
   }
@@ -540,7 +540,7 @@ void nvim_set_current_buf(Buffer buffer, Error *err)
   if (!try_end(err) && result == FAIL) {
     api_set_error(err,
                   kErrorTypeException,
-                  _("Failed to switch to buffer %d"),
+                  "Failed to switch to buffer %d",
                   buffer);
   }
 }
@@ -593,7 +593,7 @@ void nvim_set_current_win(Window window, Error *err)
   if (!try_end(err) && win != curwin) {
     api_set_error(err,
                   kErrorTypeException,
-                  _("Failed to switch to window %d"),
+                  "Failed to switch to window %d",
                   window);
   }
 }
@@ -647,7 +647,7 @@ void nvim_set_current_tabpage(Tabpage tabpage, Error *err)
   if (!try_end(err) && tp != curtab) {
     api_set_error(err,
                   kErrorTypeException,
-                  _("Failed to switch to tabpage %d"),
+                  "Failed to switch to tabpage %d",
                   tabpage);
   }
 }
@@ -746,21 +746,21 @@ Array nvim_call_atomic(uint64_t channel_id, Array calls, Error *err)
     if (calls.items[i].type != kObjectTypeArray) {
       api_set_error(err,
                     kErrorTypeValidation,
-                    _("All items in calls array must be arrays"));
+                    "All items in calls array must be arrays");
       goto validation_error;
     }
     Array call = calls.items[i].data.array;
     if (call.size != 2) {
       api_set_error(err,
                     kErrorTypeValidation,
-                    _("All items in calls array must be arrays of size 2"));
+                    "All items in calls array must be arrays of size 2");
       goto validation_error;
     }
 
     if (call.items[0].type != kObjectTypeString) {
       api_set_error(err,
                     kErrorTypeValidation,
-                    _("name must be String"));
+                    "Name must be String");
       goto validation_error;
     }
     String name = call.items[0].data.string;
@@ -768,7 +768,7 @@ Array nvim_call_atomic(uint64_t channel_id, Array calls, Error *err)
     if (call.items[1].type != kObjectTypeArray) {
       api_set_error(err,
                     kErrorTypeValidation,
-                    _("args must be Array"));
+                    "Args must be Array");
       goto validation_error;
     }
     Array args = call.items[1].data.array;
diff --git a/src/nvim/api/window.c b/src/nvim/api/window.c
index dd52b2d690..859bf88398 100644
--- a/src/nvim/api/window.c
+++ b/src/nvim/api/window.c
@@ -66,7 +66,7 @@ void nvim_win_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err)
       || pos.items[1].type != kObjectTypeInteger) {
     api_set_error(err,
                   kErrorTypeValidation,
-                  _("Argument \"pos\" must be a [row, col] array"));
+                  "Argument \"pos\" must be a [row, col] array");
     return;
   }
 
@@ -78,12 +78,12 @@ void nvim_win_set_cursor(Window window, ArrayOf(Integer, 2) pos, Error *err)
   int64_t col = pos.items[1].data.integer;
 
   if (row <= 0 || row > win->w_buffer->b_ml.ml_line_count) {
-    api_set_error(err, kErrorTypeValidation, _("Cursor position outside buffer"));
+    api_set_error(err, kErrorTypeValidation, "Cursor position outside buffer");
     return;
   }
 
   if (col > MAXCOL || col < 0) {
-    api_set_error(err, kErrorTypeValidation, _("Column value outside range"));
+    api_set_error(err, kErrorTypeValidation, "Column value outside range");
     return;
   }
 
@@ -132,7 +132,7 @@ void nvim_win_set_height(Window window, Integer height, Error *err)
   }
 
   if (height > INT_MAX || height < INT_MIN) {
-    api_set_error(err, kErrorTypeValidation, _("Height value outside range"));
+    api_set_error(err, kErrorTypeValidation, "Height value outside range");
     return;
   }
 
@@ -177,7 +177,7 @@ void nvim_win_set_width(Window window, Integer width, Error *err)
   }
 
   if (width > INT_MAX || width < INT_MIN) {
-    api_set_error(err, kErrorTypeValidation, _("Width value outside range"));
+    api_set_error(err, kErrorTypeValidation, "Width value outside range");
     return;
   }
 
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
index 3cf85316d9..59594357de 100644
--- a/src/nvim/msgpack_rpc/channel.c
+++ b/src/nvim/msgpack_rpc/channel.c
@@ -192,7 +192,7 @@ Object channel_send_call(uint64_t id,
   Channel *channel = NULL;
 
   if (!(channel = pmap_get(uint64_t)(channels, id)) || channel->closed) {
-    api_set_error(err, kErrorTypeException, _("Invalid channel \"%" PRIu64 "\""), id);
+    api_set_error(err, kErrorTypeException, "Invalid channel: %" PRIu64, id);
     api_free_array(args);
     return NIL;
   }
@@ -212,7 +212,8 @@ Object channel_send_call(uint64_t id,
 
   if (frame.errored) {
     if (frame.result.type == kObjectTypeString) {
-      api_set_error(err, kErrorTypeException, "%s", frame.result.data.string.data);
+      api_set_error(err, kErrorTypeException, "%s",
+                    frame.result.data.string.data);
     } else if (frame.result.type == kObjectTypeArray) {
       // Should be an error in the form [type, message]
       Array array = frame.result.data.array;
@@ -221,7 +222,7 @@ Object channel_send_call(uint64_t id,
               || array.items[0].data.integer == kErrorTypeValidation)
           && array.items[1].type == kObjectTypeString) {
         api_set_error(err, (ErrorType)array.items[0].data.integer, "%s",
-                       array.items[1].data.string.data);
+                      array.items[1].data.string.data);
       } else {
         api_set_error(err, kErrorTypeException, "%s", "unknown error");
       }
diff --git a/src/nvim/msgpack_rpc/helpers.c b/src/nvim/msgpack_rpc/helpers.c
index 0ad1d9ae4b..0228582d37 100644
--- a/src/nvim/msgpack_rpc/helpers.c
+++ b/src/nvim/msgpack_rpc/helpers.c
@@ -570,49 +570,49 @@ void msgpack_rpc_validate(uint64_t *response_id,
   *response_id = NO_RESPONSE;
   // Validate the basic structure of the msgpack-rpc payload
   if (req->type != MSGPACK_OBJECT_ARRAY) {
-    api_set_error(err, kErrorTypeValidation, _("Message is not an array"));
+    api_set_error(err, kErrorTypeValidation, "Message is not an array");
     return;
   }
 
   if (req->via.array.size == 0) {
-    api_set_error(err, kErrorTypeValidation, _("Message is empty"));
+    api_set_error(err, kErrorTypeValidation, "Message is empty");
     return;
   }
 
   if (req->via.array.ptr[0].type != MSGPACK_OBJECT_POSITIVE_INTEGER) {
-    api_set_error(err, kErrorTypeValidation, _("Message type must be an integer"));
+    api_set_error(err, kErrorTypeValidation, "Message type must be an integer");
     return;
   }
 
   uint64_t type = req->via.array.ptr[0].via.u64;
   if (type != kMessageTypeRequest && type != kMessageTypeNotification) {
-    api_set_error(err, kErrorTypeValidation, _("Unknown message type"));
+    api_set_error(err, kErrorTypeValidation, "Unknown message type");
     return;
   }
 
   if ((type == kMessageTypeRequest && req->via.array.size != 4)
       || (type == kMessageTypeNotification && req->via.array.size != 3)) {
-    api_set_error(err, kErrorTypeValidation, _("Request array size should be 4 (request) "
-                                     "or 3 (notification)"));
+    api_set_error(err, kErrorTypeValidation,
+                  "Request array size must be 4 (request) or 3 (notification)");
     return;
   }
 
   if (type == kMessageTypeRequest) {
     msgpack_object *id_obj = msgpack_rpc_msg_id(req);
     if (!id_obj) {
-      api_set_error(err, kErrorTypeValidation, _("ID must be a positive integer"));
+      api_set_error(err, kErrorTypeValidation, "ID must be a positive integer");
       return;
     }
     *response_id = id_obj->via.u64;
   }
 
   if (!msgpack_rpc_method(req)) {
-    api_set_error(err, kErrorTypeValidation, _("Method must be a string"));
+    api_set_error(err, kErrorTypeValidation, "Method must be a string");
     return;
   }
 
   if (!msgpack_rpc_args(req)) {
-    api_set_error(err, kErrorTypeValidation, _("Parameters must be an array"));
+    api_set_error(err, kErrorTypeValidation, "Parameters must be an array");
     return;
   }
 }
diff --git a/src/nvim/po/fi.po b/src/nvim/po/fi.po
index d817144151..3551c07ff2 100644
--- a/src/nvim/po/fi.po
+++ b/src/nvim/po/fi.po
@@ -116,7 +116,7 @@ msgstr "merkkijono ei saa sisältää rivinvaihtoja"
 
 #. Doesn't exist, fail
 #, fuzzy, c-format
-#~ msgid "Key \"%s\" doesn't exist"
+#~ msgid "Key does not exist: %s"
 #~ msgstr "Tiedostoa %s ei ole"
 
 #, fuzzy
@@ -3986,7 +3986,7 @@ msgid "Calling shell to execute: \"%s\""
 msgstr "Kutsutaan kuorta suorittamaan: %s"
 
 #, c-format
-#~ msgid "Invalid channel \"%<PRIu64>\""
+#~ msgid "Invalid channel: %<PRIu64>"
 #~ msgstr ""
 
 #~ msgid "Message is not an array"
@@ -4003,7 +4003,7 @@ msgstr "Kutsutaan kuorta suorittamaan: %s"
 #~ msgid "Unknown message type"
 #~ msgstr "E574: Tuntematon rekisterityyppi %d"
 
-#~ msgid "Request array size should be 4 (request) or 3 (notification)"
+#~ msgid "Request array size must be 4 (request) or 3 (notification)"
 #~ msgstr ""
 
 #~ msgid "ID must be a positive integer"
diff --git a/src/nvim/po/uk.po b/src/nvim/po/uk.po
index cff140508b..2c203f808f 100644
--- a/src/nvim/po/uk.po
+++ b/src/nvim/po/uk.po
@@ -82,7 +82,7 @@ msgid "Key length is too high"
 msgstr "Довжина ключа завелика"
 
 #, c-format
-msgid "Key \"%s\" doesn't exist"
+msgid "Key does not exist: %s"
 msgstr "Ключ «%s» не існує"
 
 msgid "Empty option name"
@@ -3719,7 +3719,7 @@ msgid "Calling shell to execute: \"%s\""
 msgstr "Викликається оболонка щоб виконати: «%s»"
 
 #, c-format
-msgid "Invalid channel \"%<PRIu64>\""
+msgid "Invalid channel: %<PRIu64>"
 msgstr "Некоректний канал «%<PRIu64>»"
 
 msgid "Message is not an array"
@@ -3734,7 +3734,7 @@ msgstr "Повідомлення має бути цілим числом"
 msgid "Unknown message type"
 msgstr "Невідомий тип повідомлення"
 
-msgid "Request array size should be 4 (request) or 3 (notification)"
+msgid "Request array size must be 4 (request) or 3 (notification)"
 msgstr "Розмір масиву запиту має бути 4 (запит) чи 3 (повідомлення)"
 
 msgid "ID must be a positive integer"
diff --git a/test/functional/api/buffer_spec.lua b/test/functional/api/buffer_spec.lua
index c3002618b0..9699ea8f85 100644
--- a/test/functional/api/buffer_spec.lua
+++ b/test/functional/api/buffer_spec.lua
@@ -271,7 +271,7 @@ describe('api/buf', function()
       eq(1, funcs.exists('b:lua'))
       curbufmeths.del_var('lua')
       eq(0, funcs.exists('b:lua'))
-      eq({false, 'Key "lua" doesn\'t exist'}, meth_pcall(curbufmeths.del_var, 'lua'))
+      eq({false, 'Key does not exist: lua'}, meth_pcall(curbufmeths.del_var, 'lua'))
       curbufmeths.set_var('lua', 1)
       command('lockvar b:lua')
       eq({false, 'Key is locked: lua'}, meth_pcall(curbufmeths.del_var, 'lua'))
diff --git a/test/functional/api/tabpage_spec.lua b/test/functional/api/tabpage_spec.lua
index d7ef53a88f..260a91a80c 100644
--- a/test/functional/api/tabpage_spec.lua
+++ b/test/functional/api/tabpage_spec.lua
@@ -34,7 +34,7 @@ describe('api/tabpage', function()
       eq(1, funcs.exists('t:lua'))
       curtabmeths.del_var('lua')
       eq(0, funcs.exists('t:lua'))
-      eq({false, 'Key "lua" doesn\'t exist'}, meth_pcall(curtabmeths.del_var, 'lua'))
+      eq({false, 'Key does not exist: lua'}, meth_pcall(curtabmeths.del_var, 'lua'))
       curtabmeths.set_var('lua', 1)
       command('lockvar t:lua')
       eq({false, 'Key is locked: lua'}, meth_pcall(curtabmeths.del_var, 'lua'))
diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 60f30dcfe6..5b173f3196 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -119,7 +119,7 @@ describe('api', function()
       eq(1, funcs.exists('g:lua'))
       meths.del_var('lua')
       eq(0, funcs.exists('g:lua'))
-      eq({false, 'Key "lua" doesn\'t exist'}, meth_pcall(meths.del_var, 'lua'))
+      eq({false, 'Key does not exist: lua'}, meth_pcall(meths.del_var, 'lua'))
       meths.set_var('lua', 1)
       command('lockvar lua')
       eq({false, 'Key is locked: lua'}, meth_pcall(meths.del_var, 'lua'))
@@ -439,7 +439,7 @@ describe('api', function()
       }
       status, err = pcall(meths.call_atomic, req)
       eq(false, status)
-      ok(err:match('args must be Array') ~= nil)
+      ok(err:match('Args must be Array') ~= nil)
       -- call before was done, but not after
       eq(1, meths.get_var('avar'))
       eq({''}, meths.buf_get_lines(0, 0, -1, true))
diff --git a/test/functional/api/window_spec.lua b/test/functional/api/window_spec.lua
index deffc68994..6882f50a3e 100644
--- a/test/functional/api/window_spec.lua
+++ b/test/functional/api/window_spec.lua
@@ -139,7 +139,7 @@ describe('api/win', function()
       eq(1, funcs.exists('w:lua'))
       curwinmeths.del_var('lua')
       eq(0, funcs.exists('w:lua'))
-      eq({false, 'Key "lua" doesn\'t exist'}, meth_pcall(curwinmeths.del_var, 'lua'))
+      eq({false, 'Key does not exist: lua'}, meth_pcall(curwinmeths.del_var, 'lua'))
       curwinmeths.set_var('lua', 1)
       command('lockvar w:lua')
       eq({false, 'Key is locked: lua'}, meth_pcall(curwinmeths.del_var, 'lua'))

From 8dc3eca49ba4203fb28ae4d70f3bfac35442199a Mon Sep 17 00:00:00 2001
From: Patrick Jackson <PatrickSJackson@gmail.com>
Date: Mon, 24 Apr 2017 03:39:48 -0700
Subject: [PATCH 153/257] api/dispatch: Mark generated functions table readonly
 (#6576)

---
 scripts/geneval.lua | 1 +
 src/nvim/eval.c     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/scripts/geneval.lua b/scripts/geneval.lua
index b1ba76296c..b17ecb1a0c 100644
--- a/scripts/geneval.lua
+++ b/scripts/geneval.lua
@@ -41,6 +41,7 @@ funcsdata:close()
 gperfpipe:write([[
 %language=ANSI-C
 %global-table
+%readonly-tables
 %define initializer-suffix ,0,0,NULL,NULL
 %define word-array-name functions
 %define hash-function-name hash_internal_func_gperf
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index d7feed8bfd..c02d172458 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -6009,7 +6009,7 @@ char_u *get_expr_name(expand_T *xp, int idx)
 /// @param[in]  name  Name of the function.
 ///
 /// Returns pointer to the function definition or NULL if not found.
-static VimLFuncDef *find_internal_func(const char *const name)
+static const VimLFuncDef *find_internal_func(const char *const name)
   FUNC_ATTR_WARN_UNUSED_RESULT FUNC_ATTR_PURE FUNC_ATTR_NONNULL_ALL
 {
   size_t len = strlen(name);
@@ -6378,7 +6378,7 @@ call_func(
       }
     } else {
       // Find the function name in the table, call its implementation.
-      VimLFuncDef *const fdef = find_internal_func((const char *)fname);
+      const VimLFuncDef *const fdef = find_internal_func((const char *)fname);
       if (fdef != NULL) {
         if (argcount < fdef->min_argc) {
           error = ERROR_TOOFEW;

From 26fad863bad65ab66ca34b0879b13868d8aa0d97 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 24 Apr 2017 18:27:33 +0300
Subject: [PATCH 154/257] ci: When using restarting tests kill make with the
 shell

---
 ci/common/suite.sh | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index 568d5d5bee..75bdb5abfb 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -82,21 +82,27 @@ run_test_wd() {
 
   local output_file="$(mktemp)"
   local status_file="$(mktemp)"
+  local sid_file="$(mktemp)"
 
   local restarts=5
   local prev_tmpsize=-1
   while test $restarts -gt 0 ; do
     : > "${status_file}"
-    (
-      set -o pipefail
-      ret=0
-      if ! eval "$cmd" 2>&1 | tee -a "$output_file" ; then
-        ret=1
-      fi
-      echo "$ret" > "$status_file"
-      exit $ret
-    ) &
-    local pid=$!
+    setsid \
+      env \
+        output_file="$output_file" \
+        status_file="$status_file" \
+        sid_file="$sid_file" \
+        cmd="$cmd" \
+        sh -c '
+          set -o pipefail
+          ps -o sid= > "$sid_file"
+          ret=0
+          if ! eval "$cmd" 2>&1 | tee -a "$output_file" ; then
+            ret=1
+          fi
+          echo "$ret" > "$status_file"
+        '
     while test "$(stat -c "%s" "$status_file")" -eq 0 ; do
       prev_tmpsize=$tmpsize
       sleep $timeout
@@ -106,13 +112,13 @@ run_test_wd() {
         break
       fi
     done
-    restarts=$[ restarts - 1 ]
+    restarts=$(( restarts - 1 ))
     if test "$(stat -c "%s" "$status_file")" -eq 0 ; then
       # status file not updated, assuming hang
-      kill -KILL $pid
+      pkill -KILL -s$(cat "$sid_file")
       if test $restarts -eq 0 ; then
         if test "x$hang_ok" = "x" ; then
-          fail "${test_name}" E "Test hang up"
+          fail "$test_name" E "Test hang up"
         fi
       else
         echo "Test ${test_name} hang up, restarting"
@@ -121,11 +127,15 @@ run_test_wd() {
     else
       local new_failed="$(cat "$status_file")"
       if test "x$new_failed" != "x0" ; then
-        fail "${test_name}" F "Test failed in run_test_wd"
+        fail "$test_name" F "Test failed in run_test_wd"
       fi
-      return 0
+      break
     fi
   done
+
+  rm -f "$output_file"
+  rm -f "$status_file"
+  rm -f "$sid_file"
 }
 
 ended_successfully() {

From 3a0117c850a69b70bf2a39e9f2e61220a1e7f228 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 24 Apr 2017 18:34:47 +0300
Subject: [PATCH 155/257] ci: Do not accidentally kill something unneeded

---
 ci/common/suite.sh | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index 75bdb5abfb..986c145736 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -87,7 +87,8 @@ run_test_wd() {
   local restarts=5
   local prev_tmpsize=-1
   while test $restarts -gt 0 ; do
-    : > "${status_file}"
+    : > "$status_file"
+    : > "$sid_file"
     setsid \
       env \
         output_file="$output_file" \
@@ -114,8 +115,18 @@ run_test_wd() {
     done
     restarts=$(( restarts - 1 ))
     if test "$(stat -c "%s" "$status_file")" -eq 0 ; then
-      # status file not updated, assuming hang
+      # Status file not updated, assuming hang
+
+      # SID not known, this should not ever happen
+      if test "$(stat -c "%s" "$sid_file")" -eq 0 ; then
+        fail "$test_name" E "Shell did not run"
+        break
+      fi
+
+      # Kill all processes which belong to one session: should get rid of test
+      # processes as well as sh itself.
       pkill -KILL -s$(cat "$sid_file")
+
       if test $restarts -eq 0 ; then
         if test "x$hang_ok" = "x" ; then
           fail "$test_name" E "Test hang up"

From fc16d02c3dc8482fb41501f834083146680f41f8 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 24 Apr 2017 19:30:28 +0300
Subject: [PATCH 156/257] ci: Do not use pipefail

---
 ci/common/suite.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index 986c145736..4fa8256ee8 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -96,7 +96,6 @@ run_test_wd() {
         sid_file="$sid_file" \
         cmd="$cmd" \
         sh -c '
-          set -o pipefail
           ps -o sid= > "$sid_file"
           ret=0
           if ! eval "$cmd" 2>&1 | tee -a "$output_file" ; then

From 4ccef05829bc9956207299215672c2e8c3e51c43 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 24 Apr 2017 21:43:27 +0300
Subject: [PATCH 157/257] ci: Make $cmd failure fail the build without -o
 pipefail

---
 ci/common/suite.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index 4fa8256ee8..c4120c8584 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -97,11 +97,13 @@ run_test_wd() {
         cmd="$cmd" \
         sh -c '
           ps -o sid= > "$sid_file"
-          ret=0
-          if ! eval "$cmd" 2>&1 | tee -a "$output_file" ; then
-            ret=1
-          fi
-          echo "$ret" > "$status_file"
+          (
+            ret=0
+            if ! eval "$cmd" 2>&1 ; then
+              ret=1
+            fi
+            echo "$ret" > "$status_file"
+          ) | tee -a "$output_file"
         '
     while test "$(stat -c "%s" "$status_file")" -eq 0 ; do
       prev_tmpsize=$tmpsize

From 85903cb0e6a2428c5a071ed78b12a9f95e56792b Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 24 Apr 2017 22:14:32 +0300
Subject: [PATCH 158/257] ci: Make scripts in common be dash-compatible

`ulimit` may still be not present: dash and busybox support it, but posh does
not.
---
 ci/common/build.sh | 31 ++++++++++----------
 ci/common/suite.sh |  4 +--
 ci/common/test.sh  | 72 +++++++++++++++++++++++++++++-----------------
 3 files changed, 62 insertions(+), 45 deletions(-)

diff --git a/ci/common/build.sh b/ci/common/build.sh
index 129622b522..56c24bb3fb 100644
--- a/ci/common/build.sh
+++ b/ci/common/build.sh
@@ -7,10 +7,10 @@ build_make() {
 }
 
 build_deps() {
-  if [[ "${BUILD_32BIT}" == ON ]]; then
+  if test "x${BUILD_32BIT}" = xON ; then
     DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
   fi
-  if [[ "${FUNCTIONALTEST}" == "functionaltest-lua" ]]; then
+  if test "x${FUNCTIONALTEST}" = "xfunctionaltest-lua" ; then
     DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} -DUSE_BUNDLED_LUA=ON"
   fi
 
@@ -18,16 +18,15 @@ build_deps() {
 
   # If there is a valid cache and we're not forced to recompile,
   # use cached third-party dependencies.
-  if [[ -f "${CACHE_MARKER}" ]] && [[ "${BUILD_NVIM_DEPS}" != true ]]; then
-    if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
-      local statcmd="stat -f '%Sm'"
-    else
-      local statcmd="stat -c '%y'"
+  if test -f "${CACHE_MARKER}" && test "x${BUILD_NVIM_DEPS}" != xtrue ; then
+    local statcmd="stat -c '%y'"
+    if test "x${TRAVIS_OS_NAME}" = xosx ; then
+      statcmd="stat -f '%Sm'"
     fi
     echo "Using third-party dependencies from Travis's cache (last updated: $(${statcmd} "${CACHE_MARKER}"))."
 
-     mkdir -p "$(dirname "${DEPS_BUILD_DIR}")"
-     mv "${HOME}/.cache/nvim-deps" "${DEPS_BUILD_DIR}"
+    mkdir -p "$(dirname "${DEPS_BUILD_DIR}")"
+    mv "${HOME}/.cache/nvim-deps" "${DEPS_BUILD_DIR}"
   else
     mkdir -p "${DEPS_BUILD_DIR}"
   fi
@@ -46,10 +45,10 @@ build_deps() {
 }
 
 prepare_build() {
-  if [[ -n "${CLANG_SANITIZER}" ]]; then
+  if test -n "${CLANG_SANITIZER}" ; then
     CMAKE_FLAGS="${CMAKE_FLAGS} -DCLANG_${CLANG_SANITIZER}=ON"
   fi
-  if [[ "${BUILD_32BIT}" == ON ]]; then
+  if test "x${BUILD_32BIT}" = xON ; then
     CMAKE_FLAGS="${CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
   fi
 
@@ -61,24 +60,24 @@ prepare_build() {
 
 build_nvim() {
   echo "Building nvim."
-  if ! top_make nvim; then
+  if ! top_make nvim ; then
     exit 1
   fi
 
-  if [ "$CLANG_SANITIZER" != "TSAN" ]; then
+  if test "x$CLANG_SANITIZER" != xTSAN ; then
     echo "Building libnvim."
-    if ! top_make libnvim; then
+    if ! top_make libnvim ; then
       exit 1
     fi
 
     echo "Building nvim-test."
-    if ! top_make nvim-test; then
+    if ! top_make nvim-test ; then
       exit 1
     fi
   fi
 
   # Invoke nvim to trigger *San early.
-  if ! (bin/nvim --version && bin/nvim -u NONE -e -c ':qall'); then
+  if ! (bin/nvim --version && bin/nvim -u NONE -e -c ':qall') ; then
     asan_check "${LOG_DIR}"
     exit 1
   fi
diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index c4120c8584..9eba5ca664 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -151,12 +151,12 @@ run_test_wd() {
 }
 
 ended_successfully() {
-  if [[ -f "${FAIL_SUMMARY_FILE}" ]]; then
+  if test -f "${FAIL_SUMMARY_FILE}" ; then
     echo 'Test failed, complete summary:'
     cat "${FAIL_SUMMARY_FILE}"
     return 1
   fi
-  if ! [[ -f "${END_MARKER}" ]] ; then
+  if ! test -f "${END_MARKER}" ; then
     echo 'ended_successfully called before end marker was touched'
     return 1
   fi
diff --git a/ci/common/test.sh b/ci/common/test.sh
index d911d9bc18..0958e0505d 100644
--- a/ci/common/test.sh
+++ b/ci/common/test.sh
@@ -1,5 +1,5 @@
-source "${CI_DIR}/common/build.sh"
-source "${CI_DIR}/common/suite.sh"
+. "${CI_DIR}/common/build.sh"
+. "${CI_DIR}/common/suite.sh"
 
 print_core() {
   local app="$1"
@@ -9,7 +9,7 @@ print_core() {
     return 0
   fi
   echo "======= Core file $core ======="
-  if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+  if test "x${TRAVIS_OS_NAME}" = xosx ; then
     lldb -Q -o "bt all" -f "${app}" -c "${core}"
   else
     gdb -n -batch -ex 'thread apply all bt full' "${app}" -c "${core}"
@@ -23,13 +23,13 @@ check_core_dumps() {
     shift
   fi
   local app="${1:-${BUILD_DIR}/bin/nvim}"
-  if [[ "${TRAVIS_OS_NAME}" == osx ]]; then
+  if test "x${TRAVIS_OS_NAME}" = xosx ; then
     local cores="$(find /cores/ -type f -print)"
   else
     local cores="$(find ./ -type f -name 'core.*' -print)"
   fi
 
-  if [ -z "${cores}" ]; then
+  if test -z "${cores}" ; then
     return
   fi
   local core
@@ -61,7 +61,7 @@ check_logs() {
     cat "${log}"
     err=1
   done
-  if [[ -n "${err}" ]]; then
+  if test -n "${err}" ; then
     fail 'logs' E 'Runtime errors detected.'
   fi
 }
@@ -76,7 +76,7 @@ asan_check() {
 
 run_unittests() {(
   enter_suite unittests
-  ulimit -c unlimited
+  ulimit -c unlimited || true
   if ! build_make unittest ; then
     fail 'unittests' F 'Unit tests failed'
   fi
@@ -86,7 +86,7 @@ run_unittests() {(
 
 run_functionaltests() {(
   enter_suite functionaltests
-  ulimit -c unlimited
+  ulimit -c unlimited || true
   if ! build_make ${FUNCTIONALTEST}; then
     fail 'functionaltests' F 'Functional tests failed'
   fi
@@ -98,7 +98,7 @@ run_functionaltests() {(
 
 run_oldtests() {(
   enter_suite oldtests
-  ulimit -c unlimited
+  ulimit -c unlimited || true
   if ! make -C "${TRAVIS_BUILD_DIR}/src/nvim/testdir"; then
     reset
     fail 'oldtests' F 'Legacy tests failed'
@@ -109,6 +109,26 @@ run_oldtests() {(
   exit_suite
 )}
 
+check_runtime_files() {(
+  local test_name="$1" ; shift
+  local message="$1" ; shift
+  local tst="$1" ; shift
+
+  cd runtime
+  for file in $(git ls-files "$@") ; do
+    # Check that test is not trying to work with files with spaces/etc
+    # Prefer failing the build over using more robust construct because files
+    # with IFS are not welcome.
+    if ! test -e "$file" ; then
+      fail "$test_name" E \
+        "It appears that $file is only a part of the file name"
+    fi
+    if ! test "$tst" "$INSTALL_PREFIX/share/nvim/runtime/$file" ; then
+      fail "$test_name" F "$(printf "$message" "$file")"
+    fi
+  done
+)}
+
 install_nvim() {(
   enter_suite 'install_nvim'
   if ! build_make install ; then
@@ -117,34 +137,32 @@ install_nvim() {(
   fi
 
   "${INSTALL_PREFIX}/bin/nvim" --version
-  "${INSTALL_PREFIX}/bin/nvim" -u NONE -e -c ':help' -c ':qall' || {
+  if ! "${INSTALL_PREFIX}/bin/nvim" -u NONE -e -c ':help' -c ':qall' ; then
     echo "Running ':help' in the installed nvim failed."
     echo "Maybe the helptags have not been generated properly."
     fail 'help' F 'Failed running :help'
-  }
+  fi
 
-  local genvimsynf=syntax/vim/generated.vim
   # Check that all runtime files were installed
-  for file in doc/tags $genvimsynf $(
-    cd runtime ; git ls-files | grep -e '.vim$' -e '.ps$' -e '.dict$' -e '.py$' -e '.tutor$'
-  ) ; do
-    if ! test -e "${INSTALL_PREFIX}/share/nvim/runtime/$file" ; then
-      fail 'runtime-install' F "It appears that $file is not installed."
-    fi
-  done
+  check_runtime_files \
+    'runtime-install' \
+    'It appears that %s is not installed.' \
+    -e \
+    '*.vim' '*.ps' '*.dict' '*.py' '*.tutor'
+
+  # Check that some runtime files are installed and are executables
+  check_runtime_files \
+    'not-exe' \
+    'It appears that %s is not installed or is not executable.' \
+    -x \
+    '*.awk' '*.sh' '*.bat'
 
   # Check that generated syntax file has function names, #5060.
+  local genvimsynf=syntax/vim/generated.vim
   local gpat='syn keyword vimFuncName .*eval'
-  if ! grep -q "$gpat" "${INSTALL_PREFIX}/share/nvim/runtime/$genvimsynf"; then
+  if ! grep -q "$gpat" "${INSTALL_PREFIX}/share/nvim/runtime/$genvimsynf" ; then
     fail 'funcnames' F "It appears that $genvimsynf does not contain $gpat."
   fi
 
-  for file in $(
-    cd runtime ; git ls-files | grep -e '.awk$' -e '.sh$' -e '.bat$'
-  ) ; do
-    if ! test -x "${INSTALL_PREFIX}/share/nvim/runtime/$file" ; then
-      fail 'not-exe' F "It appears that $file is not installed or is not executable."
-    fi
-  done
   exit_suite
 )}

From 74d5705ca9de7ce0a1edef65590594a55c1a4ea3 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 24 Apr 2017 22:17:34 +0300
Subject: [PATCH 159/257] ci: Source ci/common/test.sh in run_test_wd subshell

---
 ci/common/suite.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index 9eba5ca664..860e7f79ea 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -95,7 +95,9 @@ run_test_wd() {
         status_file="$status_file" \
         sid_file="$sid_file" \
         cmd="$cmd" \
+        CI_DIR="$CI_DIR" \
         sh -c '
+          . "${CI_DIR}/common/test.sh"
           ps -o sid= > "$sid_file"
           (
             ret=0

From ee4daa65723df100ce58d132243747aad48d4f12 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 24 Apr 2017 23:11:13 +0300
Subject: [PATCH 160/257] ci: Remove `x` from `test x`

---
 ci/common/build.sh | 12 ++++++------
 ci/common/suite.sh |  8 ++++----
 ci/common/test.sh  |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/ci/common/build.sh b/ci/common/build.sh
index 56c24bb3fb..8c2406698a 100644
--- a/ci/common/build.sh
+++ b/ci/common/build.sh
@@ -7,10 +7,10 @@ build_make() {
 }
 
 build_deps() {
-  if test "x${BUILD_32BIT}" = xON ; then
+  if test "${BUILD_32BIT}" = ON ; then
     DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
   fi
-  if test "x${FUNCTIONALTEST}" = "xfunctionaltest-lua" ; then
+  if test "${FUNCTIONALTEST}" = "functionaltest-lua" ; then
     DEPS_CMAKE_FLAGS="${DEPS_CMAKE_FLAGS} -DUSE_BUNDLED_LUA=ON"
   fi
 
@@ -18,9 +18,9 @@ build_deps() {
 
   # If there is a valid cache and we're not forced to recompile,
   # use cached third-party dependencies.
-  if test -f "${CACHE_MARKER}" && test "x${BUILD_NVIM_DEPS}" != xtrue ; then
+  if test -f "${CACHE_MARKER}" && test "${BUILD_NVIM_DEPS}" != "true" ; then
     local statcmd="stat -c '%y'"
-    if test "x${TRAVIS_OS_NAME}" = xosx ; then
+    if test "${TRAVIS_OS_NAME}" = osx ; then
       statcmd="stat -f '%Sm'"
     fi
     echo "Using third-party dependencies from Travis's cache (last updated: $(${statcmd} "${CACHE_MARKER}"))."
@@ -48,7 +48,7 @@ prepare_build() {
   if test -n "${CLANG_SANITIZER}" ; then
     CMAKE_FLAGS="${CMAKE_FLAGS} -DCLANG_${CLANG_SANITIZER}=ON"
   fi
-  if test "x${BUILD_32BIT}" = xON ; then
+  if test "${BUILD_32BIT}" = ON ; then
     CMAKE_FLAGS="${CMAKE_FLAGS} ${CMAKE_FLAGS_32BIT}"
   fi
 
@@ -64,7 +64,7 @@ build_nvim() {
     exit 1
   fi
 
-  if test "x$CLANG_SANITIZER" != xTSAN ; then
+  if test "$CLANG_SANITIZER" != "TSAN" ; then
     echo "Building libnvim."
     if ! top_make libnvim ; then
       exit 1
diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index 860e7f79ea..a6fe7dd650 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -24,7 +24,7 @@ exit_suite() {
     echo "${FAIL_SUMMARY}"
   fi
   export NVIM_TEST_CURRENT_SUITE="${NVIM_TEST_CURRENT_SUITE%/*}"
-  if test "x$1" != "x--continue" ; then
+  if test "$1" != "--continue" ; then
     exit $FAILED
   else
     local saved_failed=$FAILED
@@ -61,7 +61,7 @@ run_test() {
 
 run_test_wd() {
   local hang_ok=
-  if test "x$1" = "x--allow-hang" ; then
+  if test "$1" = "--allow-hang" ; then
     hang_ok=1
     shift
   fi
@@ -131,7 +131,7 @@ run_test_wd() {
       pkill -KILL -s$(cat "$sid_file")
 
       if test $restarts -eq 0 ; then
-        if test "x$hang_ok" = "x" ; then
+        if test -z "$hang_ok" ; then
           fail "$test_name" E "Test hang up"
         fi
       else
@@ -140,7 +140,7 @@ run_test_wd() {
       fi
     else
       local new_failed="$(cat "$status_file")"
-      if test "x$new_failed" != "x0" ; then
+      if test "$new_failed" != "0" ; then
         fail "$test_name" F "Test failed in run_test_wd"
       fi
       break
diff --git a/ci/common/test.sh b/ci/common/test.sh
index 0958e0505d..a4b7680830 100644
--- a/ci/common/test.sh
+++ b/ci/common/test.sh
@@ -9,7 +9,7 @@ print_core() {
     return 0
   fi
   echo "======= Core file $core ======="
-  if test "x${TRAVIS_OS_NAME}" = xosx ; then
+  if test "${TRAVIS_OS_NAME}" = osx ; then
     lldb -Q -o "bt all" -f "${app}" -c "${core}"
   else
     gdb -n -batch -ex 'thread apply all bt full' "${app}" -c "${core}"
@@ -23,7 +23,7 @@ check_core_dumps() {
     shift
   fi
   local app="${1:-${BUILD_DIR}/bin/nvim}"
-  if test "x${TRAVIS_OS_NAME}" = xosx ; then
+  if test "${TRAVIS_OS_NAME}" = osx ; then
     local cores="$(find /cores/ -type f -print)"
   else
     local cores="$(find ./ -type f -name 'core.*' -print)"

From 8f346a322bc18949ae256203ffa801d7ba1dd1c0 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 24 Apr 2017 22:45:03 +0200
Subject: [PATCH 161/257] test/fs: sanity check for literal "~" directory
 (#6579)

If the CWD contains a directory with the literal name "~" then the tests
will have bogus failures.
---
 src/nvim/os/fs.c         |  4 +-
 test/unit/os/fs_spec.lua | 52 +++++++++++++++-----------
 test/unit/path_spec.lua  | 81 ++++++++++++++++++++--------------------
 3 files changed, 73 insertions(+), 64 deletions(-)

diff --git a/src/nvim/os/fs.c b/src/nvim/os/fs.c
index c39ff5d358..aaa750db50 100644
--- a/src/nvim/os/fs.c
+++ b/src/nvim/os/fs.c
@@ -61,9 +61,9 @@ void fs_init(void)
 }
 
 
-/// Change to the given directory.
+/// Changes the current directory to `path`.
 ///
-/// @return `0` on success, a libuv error code on failure.
+/// @return 0 on success, or negative error code.
 int os_chdir(const char *path)
   FUNC_ATTR_NONNULL_ALL
 {
diff --git a/test/unit/os/fs_spec.lua b/test/unit/os/fs_spec.lua
index 860ebfdbcb..23eb05b4b8 100644
--- a/test/unit/os/fs_spec.lua
+++ b/test/unit/os/fs_spec.lua
@@ -35,7 +35,6 @@ for i = 0, 255 do
 end
 local fcontents = s:rep(16)
 
-local buffer = ""
 local directory = nil
 local absolute_executable = nil
 local executable_name = nil
@@ -65,7 +64,11 @@ local function os_getperm(filename)
   return tonumber(perm)
 end
 
-describe('fs function', function()
+describe('fs.c', function()
+  local function os_isdir(name)
+    return fs.os_isdir(to_cstr(name))
+  end
+
   before_each(function()
     lfs.mkdir('unit-test-directory');
 
@@ -91,32 +94,37 @@ describe('fs function', function()
   end)
 
   describe('os_dirname', function()
-    local length
-
-    local function os_dirname(buf, len)
-      return fs.os_dirname(buf, len)
-    end
-
-    before_each(function()
-      length = (string.len(lfs.currentdir())) + 1
-      buffer = cstr(length, '')
+    itp('returns OK and writes current directory to the buffer', function()
+      local length = string.len(lfs.currentdir()) + 1
+      local buf = cstr(length, '')
+      eq(OK, fs.os_dirname(buf, length))
+      eq(lfs.currentdir(), ffi.string(buf))
     end)
 
-    itp('returns OK and writes current directory into the buffer if it is large\n    enough', function()
-      eq(OK, (os_dirname(buffer, length)))
-      eq(lfs.currentdir(), (ffi.string(buffer)))
-    end)
-
-    -- What kind of other failing cases are possible?
     itp('returns FAIL if the buffer is too small', function()
-      local buf = cstr((length - 1), '')
-      eq(FAIL, (os_dirname(buf, (length - 1))))
+      local length = string.len(lfs.currentdir()) + 1
+      local buf = cstr(length - 1, '')
+      eq(FAIL, fs.os_dirname(buf, length - 1))
     end)
   end)
 
-  local function os_isdir(name)
-    return fs.os_isdir((to_cstr(name)))
-  end
+  describe('os_chdir', function()
+    itp('fails with path="~"', function()
+      eq(false, os_isdir('~')) -- sanity check: no literal "~" directory.
+      local length = 4096
+      local expected_cwd = cstr(length, '')
+      local cwd = cstr(length, '')
+      eq(OK, fs.os_dirname(expected_cwd, length))
+
+      -- os_chdir returns 0 for success, not OK (1).
+      neq(0, fs.os_chdir('~'))    -- fail
+      neq(0, fs.os_chdir('~/'))   -- fail
+
+      eq(OK, fs.os_dirname(cwd, length))
+      -- CWD did not change.
+      eq(ffi.string(expected_cwd), ffi.string(cwd))
+    end)
+  end)
 
   describe('os_isdir', function()
     itp('returns false if an empty string is given', function()
diff --git a/test/unit/path_spec.lua b/test/unit/path_spec.lua
index 470f971e68..6b9e2c8695 100644
--- a/test/unit/path_spec.lua
+++ b/test/unit/path_spec.lua
@@ -13,7 +13,7 @@ local OK = helpers.OK
 local FAIL = helpers.FAIL
 
 cimport('string.h')
-local path = cimport('./src/nvim/path.h')
+local cimp = cimport('./src/nvim/os/os.h', './src/nvim/path.h')
 
 local length = 0
 local buffer = nil
@@ -30,7 +30,7 @@ describe('path function', function()
 
     local function path_full_dir_name(directory, buf, len)
       directory = to_cstr(directory)
-      return path.path_full_dir_name(directory, buf, len)
+      return cimp.path_full_dir_name(directory, buf, len)
     end
 
     before_each(function()
@@ -69,7 +69,7 @@ describe('path function', function()
     local function path_full_compare(s1, s2, cn)
       s1 = to_cstr(s1)
       s2 = to_cstr(s2)
-      return path.path_full_compare(s1, s2, cn or 0)
+      return cimp.path_full_compare(s1, s2, cn or 0)
     end
 
     local f1 = 'f1.o'
@@ -86,31 +86,31 @@ describe('path function', function()
     end)
 
     itp('returns kEqualFiles when passed the same file', function()
-      eq(path.kEqualFiles, (path_full_compare(f1, f1)))
+      eq(cimp.kEqualFiles, (path_full_compare(f1, f1)))
     end)
 
     itp('returns kEqualFileNames when files that dont exist and have same name', function()
-      eq(path.kEqualFileNames, (path_full_compare('null.txt', 'null.txt', true)))
+      eq(cimp.kEqualFileNames, (path_full_compare('null.txt', 'null.txt', true)))
     end)
 
     itp('returns kBothFilesMissing when files that dont exist', function()
-      eq(path.kBothFilesMissing, (path_full_compare('null.txt', 'null.txt')))
+      eq(cimp.kBothFilesMissing, (path_full_compare('null.txt', 'null.txt')))
     end)
 
     itp('returns kDifferentFiles when passed different files', function()
-      eq(path.kDifferentFiles, (path_full_compare(f1, f2)))
-      eq(path.kDifferentFiles, (path_full_compare(f2, f1)))
+      eq(cimp.kDifferentFiles, (path_full_compare(f1, f2)))
+      eq(cimp.kDifferentFiles, (path_full_compare(f2, f1)))
     end)
 
     itp('returns kOneFileMissing if only one does not exist', function()
-      eq(path.kOneFileMissing, (path_full_compare(f1, 'null.txt')))
-      eq(path.kOneFileMissing, (path_full_compare('null.txt', f1)))
+      eq(cimp.kOneFileMissing, (path_full_compare(f1, 'null.txt')))
+      eq(cimp.kOneFileMissing, (path_full_compare('null.txt', f1)))
     end)
   end)
 
   describe('path_tail', function()
     local function path_tail(file)
-      local res = path.path_tail((to_cstr(file)))
+      local res = cimp.path_tail((to_cstr(file)))
       neq(NULL, res)
       return ffi.string(res)
     end
@@ -126,7 +126,7 @@ describe('path function', function()
 
   describe('path_tail_with_sep', function()
     local function path_tail_with_sep(file)
-      local res = path.path_tail_with_sep((to_cstr(file)))
+      local res = cimp.path_tail_with_sep((to_cstr(file)))
       neq(NULL, res)
       return ffi.string(res)
     end
@@ -159,11 +159,11 @@ describe('path function', function()
     -- strcmp.
     local function invocation_path_tail(invk)
       local plen = ffi.new('size_t[?]', 1)
-      local ptail = path.invocation_path_tail((to_cstr(invk)), plen)
+      local ptail = cimp.invocation_path_tail((to_cstr(invk)), plen)
       neq(NULL, ptail)
 
       -- it does not change the output if len==NULL
-      local tail2 = path.invocation_path_tail((to_cstr(invk)), NULL)
+      local tail2 = cimp.invocation_path_tail((to_cstr(invk)), NULL)
       neq(NULL, tail2)
       eq((ffi.string(ptail)), (ffi.string(tail2)))
       return ptail, plen[0]
@@ -204,7 +204,7 @@ describe('path function', function()
     end)
 
     itp('is equivalent to path_tail when args do not contain a path separator', function()
-      local ptail = path.path_tail(to_cstr("a/b/c x y z"))
+      local ptail = cimp.path_tail(to_cstr("a/b/c x y z"))
       neq(NULL, ptail)
       local tail = ffi.string(ptail)
       local invk, _ = invocation_path_tail("a/b/c x y z")
@@ -212,7 +212,7 @@ describe('path function', function()
     end)
 
     itp('is not equivalent to path_tail when args contain a path separator', function()
-      local ptail = path.path_tail(to_cstr("a/b/c x y/z"))
+      local ptail = cimp.path_tail(to_cstr("a/b/c x y/z"))
       neq(NULL, ptail)
       local invk, _ = invocation_path_tail("a/b/c x y/z")
       neq((ffi.string(ptail)), (ffi.string(invk)))
@@ -221,7 +221,7 @@ describe('path function', function()
 
   describe('path_next_component', function()
     local function path_next_component(file)
-      local res = path.path_next_component((to_cstr(file)))
+      local res = cimp.path_next_component((to_cstr(file)))
       neq(NULL, res)
       return ffi.string(res)
     end
@@ -238,25 +238,25 @@ describe('path function', function()
   describe('path_shorten_fname', function()
     itp('returns NULL if `full_path` is NULL', function()
       local dir = to_cstr('some/directory/file.txt')
-      eq(NULL, (path.path_shorten_fname(NULL, dir)))
+      eq(NULL, (cimp.path_shorten_fname(NULL, dir)))
     end)
 
     itp('returns NULL if the path and dir does not match', function()
       local dir = to_cstr('not/the/same')
       local full = to_cstr('as/this.txt')
-      eq(NULL, (path.path_shorten_fname(full, dir)))
+      eq(NULL, (cimp.path_shorten_fname(full, dir)))
     end)
 
     itp('returns NULL if the path is not separated properly', function()
       local dir = to_cstr('some/very/long/')
       local full = to_cstr('some/very/long/directory/file.txt')
-      eq(NULL, (path.path_shorten_fname(full, dir)))
+      eq(NULL, (cimp.path_shorten_fname(full, dir)))
     end)
 
     itp('shortens the filename if `dir_name` is the start of `full_path`', function()
       local full = to_cstr('some/very/long/directory/file.txt')
       local dir = to_cstr('some/very/long')
-      eq('directory/file.txt', (ffi.string(path.path_shorten_fname(full, dir))))
+      eq('directory/file.txt', (ffi.string(cimp.path_shorten_fname(full, dir))))
     end)
   end)
 end)
@@ -277,23 +277,23 @@ describe('path_shorten_fname_if_possible', function()
     itp('returns shortened path if possible', function()
       lfs.chdir('ut_directory')
       local full = to_cstr(lfs.currentdir() .. '/subdir/file.txt')
-      eq('subdir/file.txt', (ffi.string(path.path_shorten_fname_if_possible(full))))
+      eq('subdir/file.txt', (ffi.string(cimp.path_shorten_fname_if_possible(full))))
     end)
 
     itp('returns `full_path` if a shorter version is not possible', function()
       local old = lfs.currentdir()
       lfs.chdir('ut_directory')
       local full = old .. '/subdir/file.txt'
-      eq(full, (ffi.string(path.path_shorten_fname_if_possible(to_cstr(full)))))
+      eq(full, (ffi.string(cimp.path_shorten_fname_if_possible(to_cstr(full)))))
     end)
 
     itp('returns NULL if `full_path` is NULL', function()
-      eq(NULL, (path.path_shorten_fname_if_possible(NULL)))
+      eq(NULL, (cimp.path_shorten_fname_if_possible(NULL)))
     end)
   end)
 end)
 
-describe('more path function', function()
+describe('path.c', function()
   setup(function()
     lfs.mkdir('unit-test-directory');
     io.open('unit-test-directory/test.file', 'w').close()
@@ -315,7 +315,7 @@ describe('more path function', function()
   describe('vim_FullName', function()
     local function vim_FullName(filename, buf, len, force)
       filename = to_cstr(filename)
-      return path.vim_FullName(filename, buf, len, force)
+      return cimp.vim_FullName(filename, buf, len, force)
     end
 
     before_each(function()
@@ -326,7 +326,7 @@ describe('more path function', function()
 
     itp('fails if given filename is NULL', function()
       local force_expansion = 1
-      local result = path.vim_FullName(NULL, buffer, length, force_expansion)
+      local result = cimp.vim_FullName(NULL, buffer, length, force_expansion)
       eq(FAIL, result)
     end)
 
@@ -335,7 +335,7 @@ describe('more path function', function()
       local filename = 'foo/bar/bazzzzzzz/buz/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/a'
       local too_short_len = 8
       local buf = cstr(too_short_len, '')
-      local result = path.vim_FullName(filename, buf, too_short_len, force_expansion)
+      local result = cimp.vim_FullName(filename, buf, too_short_len, force_expansion)
       local expected = string.sub(filename, 1, (too_short_len - 1))
       eq(expected, (ffi.string(buf)))
       eq(FAIL, result)
@@ -357,7 +357,7 @@ describe('more path function', function()
       eq(FAIL, result)
     end)
 
-    itp('concatenates given filename if it does not contain a slash', function()
+    itp('concatenates filename if it does not contain a slash', function()
       local force_expansion = 1
       local result = vim_FullName('test.file', buffer, length, force_expansion)
       local expected = lfs.currentdir() .. '/test.file'
@@ -365,7 +365,7 @@ describe('more path function', function()
       eq(OK, result)
     end)
 
-    itp('concatenates given filename if it is a directory but does not contain a\n    slash', function()
+    itp('concatenates directory name if it does not contain a slash', function()
       local force_expansion = 1
       local result = vim_FullName('..', buffer, length, force_expansion)
       local expected = lfs.currentdir() .. '/..'
@@ -395,6 +395,7 @@ describe('more path function', function()
     end)
 
     itp('fails and uses filename when the path is relative to HOME', function()
+      eq(false, cimp.os_isdir('~')) -- sanity check: no literal "~" directory.
       local force_expansion = 1
       local absolute_path = '~/home.file'
       local result = vim_FullName(absolute_path, buffer, length, force_expansion)
@@ -414,7 +415,7 @@ describe('more path function', function()
       local filename = to_cstr('unit-test-directory/test.file')
       -- Don't use the wrapper here but pass a cstring directly to the c
       -- function.
-      local result = path.vim_FullName(filename, buffer, length, force_expansion)
+      local result = cimp.vim_FullName(filename, buffer, length, force_expansion)
       eq(lfs.currentdir() .. '/unit-test-directory/test.file', (ffi.string(buffer)))
       eq('unit-test-directory/test.file', (ffi.string(filename)))
       eq(OK, result)
@@ -423,7 +424,7 @@ describe('more path function', function()
     itp('works with directories that have one path component', function()
       local force_expansion = 1
       local filename = to_cstr('/tmp')
-      local result = path.vim_FullName(filename, buffer, length, force_expansion)
+      local result = cimp.vim_FullName(filename, buffer, length, force_expansion)
       eq('/tmp', ffi.string(buffer))
       eq(OK, result)
     end)
@@ -432,7 +433,7 @@ describe('more path function', function()
   describe('path_fix_case', function()
     local function fix_case(file)
       local c_file = to_cstr(file)
-      path.path_fix_case(c_file)
+      cimp.path_fix_case(c_file)
       return ffi.string(c_file)
     end
 
@@ -456,41 +457,41 @@ describe('more path function', function()
     itp('joins given paths with a slash', function()
       local path1 = cstr(100, 'path1')
       local to_append = to_cstr('path2')
-      eq(OK, (path.append_path(path1, to_append, 100)))
+      eq(OK, (cimp.append_path(path1, to_append, 100)))
       eq("path1/path2", (ffi.string(path1)))
     end)
 
     itp('joins given paths without adding an unnecessary slash', function()
       local path1 = cstr(100, 'path1/')
       local to_append = to_cstr('path2')
-      eq(OK, path.append_path(path1, to_append, 100))
+      eq(OK, cimp.append_path(path1, to_append, 100))
       eq("path1/path2", (ffi.string(path1)))
     end)
 
     itp('fails and uses filename if there is not enough space left for to_append', function()
       local path1 = cstr(11, 'path1/')
       local to_append = to_cstr('path2')
-      eq(FAIL, (path.append_path(path1, to_append, 11)))
+      eq(FAIL, (cimp.append_path(path1, to_append, 11)))
     end)
 
     itp('does not append a slash if to_append is empty', function()
       local path1 = cstr(6, 'path1')
       local to_append = to_cstr('')
-      eq(OK, (path.append_path(path1, to_append, 6)))
+      eq(OK, (cimp.append_path(path1, to_append, 6)))
       eq('path1', (ffi.string(path1)))
     end)
 
     itp('does not append unnecessary dots', function()
       local path1 = cstr(6, 'path1')
       local to_append = to_cstr('.')
-      eq(OK, (path.append_path(path1, to_append, 6)))
+      eq(OK, (cimp.append_path(path1, to_append, 6)))
       eq('path1', (ffi.string(path1)))
     end)
 
     itp('copies to_append to path, if path is empty', function()
       local path1 = cstr(7, '')
       local to_append = to_cstr('/path2')
-      eq(OK, (path.append_path(path1, to_append, 7)))
+      eq(OK, (cimp.append_path(path1, to_append, 7)))
       eq('/path2', (ffi.string(path1)))
     end)
   end)
@@ -498,7 +499,7 @@ describe('more path function', function()
   describe('path_is_absolute_path', function()
     local function path_is_absolute_path(filename)
       filename = to_cstr(filename)
-      return path.path_is_absolute_path(filename)
+      return cimp.path_is_absolute_path(filename)
     end
 
     itp('returns true if filename starts with a slash', function()

From a0acb2e19521298b3d80aa1cfaaef5f476218e01 Mon Sep 17 00:00:00 2001
From: Drew Neil <andrew.jr.neil@gmail.com>
Date: Tue, 25 Apr 2017 10:04:32 +0100
Subject: [PATCH 162/257] doc: Revise nvim-from-vim advice (#6505)

---
 runtime/doc/nvim.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/runtime/doc/nvim.txt b/runtime/doc/nvim.txt
index bd483e9949..8dd329cee6 100644
--- a/runtime/doc/nvim.txt
+++ b/runtime/doc/nvim.txt
@@ -16,11 +16,11 @@ differences from Vim.
 ==============================================================================
 Transitioning from Vim				*nvim-from-vim*
 
-To start the transition, link your previous configuration so Nvim can use it:
+To start the transition, create `~/.config/nvim/init.vim` with these contents:
 >
-    mkdir ~/.config
-    ln -s ~/.vim ~/.config/nvim
-    ln -s ~/.vimrc ~/.config/nvim/init.vim
+    set runtimepath+=~/.vim,~/.vim/after
+    set packpath+=~/.vim
+    source ~/.vimrc
 <
 Note: If your system sets `$XDG_CONFIG_HOME`, use that instead of `~/.config`
 in the code above. Nvim follows the XDG |base-directories| convention.

From 22932d8ac22f6dba3b3df068c6932bf3ad478d92 Mon Sep 17 00:00:00 2001
From: relnod <mail@paul-schiffers.de>
Date: Tue, 25 Apr 2017 20:45:59 +0200
Subject: [PATCH 163/257] refactor/single-include (#6586)

---
 src/nvim/CMakeLists.txt | 4 ----
 src/nvim/popupmnu.h     | 2 ++
 src/nvim/quickfix.h     | 3 +++
 src/nvim/regexp.h       | 4 ++++
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index db5e62fd67..9e9e9b6026 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -432,13 +432,9 @@ set(NO_SINGLE_CHECK_HEADERS
   if_cscope_defs.h
   misc2.h
   msgpack_rpc/server.h
-  option.h
   os/shell.h
   os_unix.h
   os/win_defs.h
-  popupmnu.h
-  quickfix.h
-  regexp.h
   regexp_defs.h
   sha256.h
   sign_defs.h
diff --git a/src/nvim/popupmnu.h b/src/nvim/popupmnu.h
index 2b181f2c4a..7e1588dbdd 100644
--- a/src/nvim/popupmnu.h
+++ b/src/nvim/popupmnu.h
@@ -1,6 +1,8 @@
 #ifndef NVIM_POPUPMNU_H
 #define NVIM_POPUPMNU_H
 
+#include "nvim/types.h"
+
 /// Used for popup menu items.
 typedef struct {
   char_u *pum_text;        // main menu text
diff --git a/src/nvim/quickfix.h b/src/nvim/quickfix.h
index bb9c2c3193..fdeb8d1a2f 100644
--- a/src/nvim/quickfix.h
+++ b/src/nvim/quickfix.h
@@ -1,6 +1,9 @@
 #ifndef NVIM_QUICKFIX_H
 #define NVIM_QUICKFIX_H
 
+#include "nvim/types.h"
+#include "nvim/ex_cmds_defs.h"
+
 /* flags for skip_vimgrep_pat() */
 #define VGR_GLOBAL      1
 #define VGR_NOJUMP      2
diff --git a/src/nvim/regexp.h b/src/nvim/regexp.h
index 37513d8c27..97595c4d29 100644
--- a/src/nvim/regexp.h
+++ b/src/nvim/regexp.h
@@ -1,6 +1,10 @@
 #ifndef NVIM_REGEXP_H
 #define NVIM_REGEXP_H
 
+#include "nvim/types.h"
+#include "nvim/buffer_defs.h"
+#include "nvim/regexp_defs.h"
+
 /* Second argument for vim_regcomp(). */
 #define RE_MAGIC        1       /* 'magic' option */
 #define RE_STRING       2       /* match in string instead of buffer text */

From 7e571bca5d5e00e9e33e266b983a48bb4014183f Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Tue, 25 Apr 2017 15:05:33 -0400
Subject: [PATCH 164/257] tui: Only set cursor color if the highlight group is
 valid (#6585)

Closes #6584
---
 src/nvim/tui/tui.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index ae7551098d..e1b97f5306 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -587,9 +587,11 @@ static void tui_set_mode(UI *ui, ModeShape mode)
 
   if (c.id != 0 && ui->rgb) {
     int attr = syn_id2attr(c.id);
-    attrentry_T *aep = syn_cterm_attr2entry(attr);
-    data->params[0].i = aep->rgb_bg_color;
-    unibi_out(ui, data->unibi_ext.set_cursor_color);
+    if (attr > 0) {
+      attrentry_T *aep = syn_cterm_attr2entry(attr);
+      data->params[0].i = aep->rgb_bg_color;
+      unibi_out(ui, data->unibi_ext.set_cursor_color);
+    }
   }
 }
 

From 88023d51238698dd625c26300142d3dbe5770b73 Mon Sep 17 00:00:00 2001
From: Dongdong Zhou <dzhou121@gmail.com>
Date: Fri, 24 Feb 2017 09:35:27 +0000
Subject: [PATCH 165/257] api/ui: externalize tabline

---
 runtime/doc/msgpack_rpc.txt         | 11 +++++-
 src/nvim/api/ui.c                   | 12 +++++-
 src/nvim/screen.c                   | 36 +++++++++++++++++-
 src/nvim/tui/tui.c                  |  1 +
 src/nvim/ui.c                       | 34 +++++++++++++++++
 src/nvim/ui.h                       |  9 ++++-
 src/nvim/ui_bridge.c                |  1 +
 src/nvim/window.c                   |  4 ++
 test/functional/ui/tabline_spec.lua | 58 +++++++++++++++++++++++++++++
 9 files changed, 161 insertions(+), 5 deletions(-)
 create mode 100644 test/functional/ui/tabline_spec.lua

diff --git a/runtime/doc/msgpack_rpc.txt b/runtime/doc/msgpack_rpc.txt
index 77cbc2f3d8..c550631a32 100644
--- a/runtime/doc/msgpack_rpc.txt
+++ b/runtime/doc/msgpack_rpc.txt
@@ -266,7 +266,11 @@ a dictionary with these (optional) keys:
 				most 256 different colors).
 	`popupmenu_external`	Instead of drawing the completion popupmenu on
 				the grid, Nvim will send higher-level events to
-				the ui and let it draw the popupmenu.
+				the UI and let it draw the popupmenu.
+				Defaults to false.
+	`tabline_external`	Instead of drawing the tabline on the grid,
+			        Nvim will send higher-level events to
+				the UI and let it draw the tabline.
 				Defaults to false.
 
 Nvim will then send msgpack-rpc notifications, with the method name "redraw"
@@ -436,5 +440,10 @@ states might be represented as separate modes.
 ["popupmenu_hide"]
 	The popupmenu is hidden.
 
+["tabline_update", curtab, tabs]
+	Nvim will send this event when drawing tabline. curtab is the tab id
+	of the current tab. tabs is an arrays of the form:
+	[tabid, { "name": name }]
+
 ==============================================================================
  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c
index f0da0d1812..28fc641dec 100644
--- a/src/nvim/api/ui.c
+++ b/src/nvim/api/ui.c
@@ -69,6 +69,7 @@ void nvim_ui_attach(uint64_t channel_id, Integer width, Integer height,
   ui->height = (int)height;
   ui->rgb = true;
   ui->pum_external = false;
+  ui->tabline_external = false;
   ui->resize = remote_ui_resize;
   ui->clear = remote_ui_clear;
   ui->eol_clear = remote_ui_eol_clear;
@@ -171,19 +172,26 @@ void nvim_ui_set_option(uint64_t channel_id, String name,
 }
 
 static void ui_set_option(UI *ui, String name, Object value, Error *error) {
-  if (strcmp(name.data, "rgb") == 0) {
+  if (strequal(name.data, "rgb")) {
     if (value.type != kObjectTypeBoolean) {
       api_set_error(error, kErrorTypeValidation, "rgb must be a Boolean");
       return;
     }
     ui->rgb = value.data.boolean;
-  } else if (strcmp(name.data, "popupmenu_external") == 0) {
+  } else if (strequal(name.data, "popupmenu_external")) {
     if (value.type != kObjectTypeBoolean) {
       api_set_error(error, kErrorTypeValidation,
                     "popupmenu_external must be a Boolean");
       return;
     }
     ui->pum_external = value.data.boolean;
+  } else if (strequal(name.data, "tabline_external")) {
+    if (value.type != kObjectTypeBoolean) {
+      api_set_error(error, kErrorTypeValidation,
+                    "tabline_external must be a Boolean");
+      return;
+    }
+    ui->tabline_external = value.data.boolean;
   } else {
     api_set_error(error, kErrorTypeValidation, "No such ui option");
   }
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 10dc86d5fa..ed85b6e8b8 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -132,6 +132,7 @@
 #include "nvim/version.h"
 #include "nvim/window.h"
 #include "nvim/os/time.h"
+#include "nvim/api/private/helpers.h"
 
 #define MB_FILLER_CHAR '<'  /* character used when a double-width character
                              * doesn't fit. */
@@ -6885,8 +6886,13 @@ static void draw_tabline(void)
   if (ScreenLines == NULL) {
     return;
   }
-  redraw_tabline = false;
 
+  if (ui_is_widget_external(kUITabline)) {
+    draw_tabline_ext();
+    return;
+  }
+
+  redraw_tabline = false;
 
   if (tabline_height() < 1)
     return;
@@ -7027,6 +7033,34 @@ static void draw_tabline(void)
   redraw_tabline = FALSE;
 }
 
+// send tabline update to external ui
+void draw_tabline_ext(void)
+{
+  win_T       *cwp;
+
+  Array args = ARRAY_DICT_INIT;
+  ADD(args, INTEGER_OBJ(curtab->handle));
+  Array tabs = ARRAY_DICT_INIT;
+  FOR_ALL_TABS(tp) {
+    if (tp == curtab) {
+      cwp = curwin;
+    } else {
+      cwp = tp->tp_curwin;
+    }
+    get_trans_bufname(cwp->w_buffer);
+    Array tab = ARRAY_DICT_INIT;
+    ADD(tab, INTEGER_OBJ(tp->handle));
+
+    Dictionary tab_info = ARRAY_DICT_INIT;
+    PUT(tab_info, "name", STRING_OBJ(cstr_to_string((char *)NameBuff)));
+    ADD(tab, DICTIONARY_OBJ(tab_info));
+    ADD(tabs, ARRAY_OBJ(tab));
+  }
+  ADD(args, ARRAY_OBJ(tabs));
+
+  ui_event("tabline_update", args);
+}
+
 /*
  * Get buffer name for "buf" into NameBuff[].
  * Takes care of special buffer names and translates special characters.
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index e1b97f5306..cd94fe9d49 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -110,6 +110,7 @@ UI *tui_start(void)
   ui->stop = tui_stop;
   ui->rgb = p_tgc;
   ui->pum_external = false;
+  ui->tabline_external = false;
   ui->resize = tui_resize;
   ui->clear = tui_clear;
   ui->eol_clear = tui_eol_clear;
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 69916fa4cd..6dcc3de1b0 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -58,6 +58,10 @@ static int busy = 0;
 static int height, width;
 static int old_mode_idx = -1;
 
+static bool tabline_external = false;
+static bool cmdline_external = false;
+static bool wildmenu_external = false;
+
 // UI_CALL invokes a function on all registered UI instances. The functions can
 // have 0-5 arguments (configurable by SELECT_NTH).
 //
@@ -167,17 +171,20 @@ void ui_refresh(void)
 
   int width = INT_MAX, height = INT_MAX;
   bool pum_external = true;
+  bool tabline_external = true;
 
   for (size_t i = 0; i < ui_count; i++) {
     UI *ui = uis[i];
     width = MIN(ui->width, width);
     height = MIN(ui->height, height);
     pum_external &= ui->pum_external;
+    tabline_external &= ui->tabline_external;
   }
 
   row = col = 0;
   screen_resize(width, height);
   pum_set_external(pum_external);
+  ui_set_widget_external(kUITabline, tabline_external);
   ui_mode_info_set();
   old_mode_idx = -1;
   ui_cursor_shape();
@@ -557,3 +564,30 @@ void ui_cursor_shape(void)
   conceal_check_cursur_line();
 }
 
+bool ui_is_widget_external(UIWidget widget)
+{
+  switch (widget) {
+    case kUITabline:
+      return tabline_external;
+    case kUICmdline:
+      return cmdline_external;
+    case kUIWildmenu:
+      return wildmenu_external;
+  }
+  return false;
+}
+
+void ui_set_widget_external(UIWidget widget, bool external)
+{
+  switch (widget) {
+    case kUITabline:
+      tabline_external = external;
+      break;
+    case kUICmdline:
+      cmdline_external = external;
+      break;
+    case kUIWildmenu:
+      wildmenu_external = external;
+      break;
+  }
+}
diff --git a/src/nvim/ui.h b/src/nvim/ui.h
index fcf52ac9e1..a1ff449eaf 100644
--- a/src/nvim/ui.h
+++ b/src/nvim/ui.h
@@ -8,6 +8,13 @@
 #include "api/private/defs.h"
 #include "nvim/buffer_defs.h"
 
+// values for externalized widgets
+typedef enum {
+  kUITabline,
+  kUICmdline,
+  kUIWildmenu
+} UIWidget;
+
 typedef struct {
   bool bold, underline, undercurl, italic, reverse;
   int foreground, background, special;
@@ -16,7 +23,7 @@ typedef struct {
 typedef struct ui_t UI;
 
 struct ui_t {
-  bool rgb, pum_external;
+  bool rgb, pum_external, tabline_external;
   int width, height;
   void *data;
   void (*resize)(UI *ui, int rows, int columns);
diff --git a/src/nvim/ui_bridge.c b/src/nvim/ui_bridge.c
index 5697c765ba..9a3fcab13c 100644
--- a/src/nvim/ui_bridge.c
+++ b/src/nvim/ui_bridge.c
@@ -58,6 +58,7 @@ UI *ui_bridge_attach(UI *ui, ui_main_fn ui_main, event_scheduler scheduler)
   rv->ui = ui;
   rv->bridge.rgb = ui->rgb;
   rv->bridge.pum_external = ui->pum_external;
+  rv->bridge.tabline_external = ui->tabline_external;
   rv->bridge.stop = ui_bridge_stop;
   rv->bridge.resize = ui_bridge_resize;
   rv->bridge.clear = ui_bridge_clear;
diff --git a/src/nvim/window.c b/src/nvim/window.c
index 60bba19b07..effce8b413 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -48,6 +48,7 @@
 #include "nvim/syntax.h"
 #include "nvim/terminal.h"
 #include "nvim/undo.h"
+#include "nvim/ui.h"
 #include "nvim/os/os.h"
 
 
@@ -5223,6 +5224,9 @@ static void last_status_rec(frame_T *fr, int statusline)
  */
 int tabline_height(void)
 {
+  if (ui_is_widget_external(kUITabline)) {
+      return 0;
+  }
   assert(first_tabpage);
   switch (p_stal) {
   case 0: return 0;
diff --git a/test/functional/ui/tabline_spec.lua b/test/functional/ui/tabline_spec.lua
new file mode 100644
index 0000000000..018e008e4a
--- /dev/null
+++ b/test/functional/ui/tabline_spec.lua
@@ -0,0 +1,58 @@
+local helpers = require('test.functional.helpers')(after_each)
+local Screen = require('test.functional.ui.screen')
+local clear, feed, eq = helpers.clear, helpers.feed, helpers.eq
+
+if helpers.pending_win32(pending) then return end
+
+describe('External tab line', function()
+  local screen
+  local tabs, curtab
+
+  before_each(function()
+    clear()
+    screen = Screen.new(25, 5)
+    screen:attach({rgb=true, tabline_external=true})
+    screen:set_on_event_handler(function(name, data)
+      if name == "tabline_update" then
+        curtab, tabs = unpack(data)
+      end
+    end)
+  end)
+
+  after_each(function()
+    screen:detach()
+  end)
+
+  describe("'tabline'", function()
+    it('tabline', function()
+      local expected = {
+        {1, {['name'] = '[No Name]'}},
+        {2, {['name'] = '[No Name]'}},
+      }
+      feed(":tabnew<CR>")
+      screen:expect([[
+        ^                         |
+        ~                        |
+        ~                        |
+        ~                        |
+                                 |
+      ]], nil, nil, function()
+        eq(2, curtab)
+        eq(expected, tabs)
+      end)
+
+      feed(":tabNext<CR>")
+      screen:expect([[
+        ^                         |
+        ~                        |
+        ~                        |
+        ~                        |
+                                 |
+      ]], nil, nil, function()
+        eq(1, curtab)
+        eq(expected, tabs)
+      end)
+
+    end)
+  end)
+end)

From 00843902d3472ac4e74106fc06fa60e599914496 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 25 Apr 2017 02:17:15 +0200
Subject: [PATCH 166/257] api/ui: externalize tabline

- Work with a bool[] array parallel to the UIWidget enum.
- Rename some functions.
- Documentation.
---
 runtime/doc/msgpack_rpc.txt              | 25 ++++++------
 src/nvim/api/ui.c                        | 40 +++++++++++++++----
 src/nvim/popupmnu.c                      |  9 +----
 src/nvim/screen.c                        | 18 +++------
 src/nvim/tui/tui.c                       |  5 ++-
 src/nvim/ui.c                            | 51 +++++++++---------------
 src/nvim/ui.h                            | 10 +++--
 src/nvim/ui_bridge.c                     |  6 ++-
 src/nvim/window.c                        |  4 +-
 test/functional/ui/screen_basic_spec.lua | 38 +++++++++++++++---
 test/functional/ui/tabline_spec.lua      | 10 ++---
 test/functional/viml/completion_spec.lua |  4 +-
 12 files changed, 124 insertions(+), 96 deletions(-)

diff --git a/runtime/doc/msgpack_rpc.txt b/runtime/doc/msgpack_rpc.txt
index c550631a32..7adc4ca2e9 100644
--- a/runtime/doc/msgpack_rpc.txt
+++ b/runtime/doc/msgpack_rpc.txt
@@ -251,9 +251,9 @@ connect to another with different type codes.
 6. Remote UIs					           *rpc-remote-ui*
 
 GUIs can be implemented as external processes communicating with Nvim over the
-RPC API. Currently the UI model consists of a terminal-like grid with one
-single, monospace font size. Some elements (UI "widgets") can be drawn
-separately from the grid.
+RPC API. The UI model consists of a terminal-like grid with a single,
+monospace font size. Some elements (UI "widgets") can be drawn separately from
+the grid ("externalized").
 
 After connecting to Nvim (usually a spawned, embedded instance) use the
 |nvim_ui_attach| API method to tell Nvim that your program wants to draw the
@@ -264,14 +264,13 @@ a dictionary with these (optional) keys:
 				colors.
 				Set to false to use terminal color codes (at
 				most 256 different colors).
-	`popupmenu_external`	Instead of drawing the completion popupmenu on
-				the grid, Nvim will send higher-level events to
-				the UI and let it draw the popupmenu.
-				Defaults to false.
-	`tabline_external`	Instead of drawing the tabline on the grid,
-			        Nvim will send higher-level events to
-				the UI and let it draw the tabline.
-				Defaults to false.
+	`ui_ext`		String array of "externalized" widgets.
+				Widgets in this list will not be drawn by
+				Nvim; only high-level data will be published
+				in new UI event kinds. Valid names:
+					popupmenu	|ui-ext-popupmenu|
+					tabline         |ui-ext-tabline|
+				Defaults to empty.
 
 Nvim will then send msgpack-rpc notifications, with the method name "redraw"
 and a single argument, an array of screen updates (described below).  These
@@ -421,6 +420,7 @@ properties specified in the corresponding item. The set of modes reported will
 change in new versions of Nvim, for instance more submodes and temporary
 states might be represented as separate modes.
 
+							*ui-ext-popupmenu*
 ["popupmenu_show", items, selected, row, col]
 	When `popupmenu_external` is set to true, nvim will not draw the
 	popupmenu on the grid, instead when the popupmenu is to be displayed
@@ -440,9 +440,10 @@ states might be represented as separate modes.
 ["popupmenu_hide"]
 	The popupmenu is hidden.
 
+							*ui-ext-tabline*
 ["tabline_update", curtab, tabs]
 	Nvim will send this event when drawing tabline. curtab is the tab id
-	of the current tab. tabs is an arrays of the form:
+	of the current tab. tabs is an array of the form:
 	[tabid, { "name": name }]
 
 ==============================================================================
diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c
index 28fc641dec..08d285eedc 100644
--- a/src/nvim/api/ui.c
+++ b/src/nvim/api/ui.c
@@ -68,8 +68,6 @@ void nvim_ui_attach(uint64_t channel_id, Integer width, Integer height,
   ui->width = (int)width;
   ui->height = (int)height;
   ui->rgb = true;
-  ui->pum_external = false;
-  ui->tabline_external = false;
   ui->resize = remote_ui_resize;
   ui->clear = remote_ui_clear;
   ui->eol_clear = remote_ui_eol_clear;
@@ -96,6 +94,8 @@ void nvim_ui_attach(uint64_t channel_id, Integer width, Integer height,
   ui->set_icon = remote_ui_set_icon;
   ui->event = remote_ui_event;
 
+  memset(ui->ui_ext, 0, sizeof(ui->ui_ext));
+
   for (size_t i = 0; i < options.size; i++) {
     ui_set_option(ui, options.items[i].key, options.items[i].value, err);
     if (ERROR_SET(err)) {
@@ -171,7 +171,8 @@ void nvim_ui_set_option(uint64_t channel_id, String name,
   }
 }
 
-static void ui_set_option(UI *ui, String name, Object value, Error *error) {
+static void ui_set_option(UI *ui, String name, Object value, Error *error)
+{
   if (strequal(name.data, "rgb")) {
     if (value.type != kObjectTypeBoolean) {
       api_set_error(error, kErrorTypeValidation, "rgb must be a Boolean");
@@ -179,19 +180,42 @@ static void ui_set_option(UI *ui, String name, Object value, Error *error) {
     }
     ui->rgb = value.data.boolean;
   } else if (strequal(name.data, "popupmenu_external")) {
+    // LEGACY: Deprecated option, use `ui_ext` instead.
     if (value.type != kObjectTypeBoolean) {
       api_set_error(error, kErrorTypeValidation,
                     "popupmenu_external must be a Boolean");
       return;
     }
-    ui->pum_external = value.data.boolean;
-  } else if (strequal(name.data, "tabline_external")) {
-    if (value.type != kObjectTypeBoolean) {
+    ui->ui_ext[kUIPopupmenu] = value.data.boolean;
+  } else if (strequal(name.data, "ui_ext")) {
+    if (value.type != kObjectTypeArray) {
       api_set_error(error, kErrorTypeValidation,
-                    "tabline_external must be a Boolean");
+                    "ui_ext must be an Array");
       return;
     }
-    ui->tabline_external = value.data.boolean;
+
+    for (size_t i = 0; i < value.data.array.size; i++) {
+      Object item = value.data.array.items[i];
+      if (item.type != kObjectTypeString) {
+        api_set_error(error, kErrorTypeValidation,
+                      "ui_ext: item must be a String");
+        return;
+      }
+      char *name = item.data.string.data;
+      if (strequal(name, "cmdline")) {
+        ui->ui_ext[kUICmdline] = true;
+      } else if (strequal(name, "popupmenu")) {
+        ui->ui_ext[kUIPopupmenu] = true;
+      } else if (strequal(name, "tabline")) {
+        ui->ui_ext[kUITabline] = true;
+      } else if (strequal(name, "wildmenu")) {
+        ui->ui_ext[kUIWildmenu] = true;
+      } else {
+        api_set_error(error, kErrorTypeValidation,
+                      "ui_ext: unknown widget: %s", name);
+        return;
+      }
+    }
   } else {
     api_set_error(error, kErrorTypeValidation, "No such ui option");
   }
diff --git a/src/nvim/popupmnu.c b/src/nvim/popupmnu.c
index 6e81c5a171..b8650d8c62 100644
--- a/src/nvim/popupmnu.c
+++ b/src/nvim/popupmnu.c
@@ -41,9 +41,7 @@ static int pum_row;                 // top row of pum
 static int pum_col;                 // left column of pum
 
 static bool pum_is_visible = false;
-
 static bool pum_external = false;
-static bool pum_wants_external = false;
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "popupmnu.c.generated.h"
@@ -80,7 +78,7 @@ void pum_display(pumitem_T *array, int size, int selected, bool array_changed)
   if (!pum_is_visible) {
     // To keep the code simple, we only allow changing the
     // draw mode when the popup menu is not being displayed
-    pum_external = pum_wants_external;
+    pum_external = ui_is_external(kUIPopupmenu);
   }
 
 redo:
@@ -751,8 +749,3 @@ int pum_get_height(void)
 {
   return pum_height;
 }
-
-void pum_set_external(bool external)
-{
-  pum_wants_external = external;
-}
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index ed85b6e8b8..a6563534aa 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -6886,14 +6886,13 @@ static void draw_tabline(void)
   if (ScreenLines == NULL) {
     return;
   }
+  redraw_tabline = false;
 
-  if (ui_is_widget_external(kUITabline)) {
-    draw_tabline_ext();
+  if (ui_is_external(kUITabline)) {
+    ui_ext_tabline_update();
     return;
   }
 
-  redraw_tabline = false;
-
   if (tabline_height() < 1)
     return;
 
@@ -7033,20 +7032,13 @@ static void draw_tabline(void)
   redraw_tabline = FALSE;
 }
 
-// send tabline update to external ui
-void draw_tabline_ext(void)
+void ui_ext_tabline_update(void)
 {
-  win_T       *cwp;
-
   Array args = ARRAY_DICT_INIT;
   ADD(args, INTEGER_OBJ(curtab->handle));
   Array tabs = ARRAY_DICT_INIT;
   FOR_ALL_TABS(tp) {
-    if (tp == curtab) {
-      cwp = curwin;
-    } else {
-      cwp = tp->tp_curwin;
-    }
+    win_T *cwp = (tp == curtab) ? curwin : tp->tp_curwin;
     get_trans_bufname(cwp->w_buffer);
     Array tab = ARRAY_DICT_INIT;
     ADD(tab, INTEGER_OBJ(tp->handle));
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index cd94fe9d49..21abc19c47 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -109,8 +109,6 @@ UI *tui_start(void)
   UI *ui = xcalloc(1, sizeof(UI));
   ui->stop = tui_stop;
   ui->rgb = p_tgc;
-  ui->pum_external = false;
-  ui->tabline_external = false;
   ui->resize = tui_resize;
   ui->clear = tui_clear;
   ui->eol_clear = tui_eol_clear;
@@ -136,6 +134,9 @@ UI *tui_start(void)
   ui->set_title = tui_set_title;
   ui->set_icon = tui_set_icon;
   ui->event = tui_event;
+
+  memset(ui->ui_ext, 0, sizeof(ui->ui_ext));
+
   return ui_bridge_attach(ui, tui_main, tui_scheduler);
 }
 
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 6dcc3de1b0..713dffb46c 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -47,6 +47,7 @@
 #define MAX_UI_COUNT 16
 
 static UI *uis[MAX_UI_COUNT];
+static bool ui_ext[UI_WIDGETS] = { 0 };
 static size_t ui_count = 0;
 static int row = 0, col = 0;
 static struct {
@@ -58,10 +59,6 @@ static int busy = 0;
 static int height, width;
 static int old_mode_idx = -1;
 
-static bool tabline_external = false;
-static bool cmdline_external = false;
-static bool wildmenu_external = false;
-
 // UI_CALL invokes a function on all registered UI instances. The functions can
 // have 0-5 arguments (configurable by SELECT_NTH).
 //
@@ -170,21 +167,25 @@ void ui_refresh(void)
   }
 
   int width = INT_MAX, height = INT_MAX;
-  bool pum_external = true;
-  bool tabline_external = true;
+  bool ext_widgets[UI_WIDGETS];
+  for (UIWidget i = 0; (int)i < UI_WIDGETS; i++) {
+    ext_widgets[i] = true;
+  }
 
   for (size_t i = 0; i < ui_count; i++) {
     UI *ui = uis[i];
     width = MIN(ui->width, width);
     height = MIN(ui->height, height);
-    pum_external &= ui->pum_external;
-    tabline_external &= ui->tabline_external;
+    for (UIWidget i = 0; (int)i < UI_WIDGETS; i++) {
+      ext_widgets[i] &= ui->ui_ext[i];
+    }
   }
 
   row = col = 0;
   screen_resize(width, height);
-  pum_set_external(pum_external);
-  ui_set_widget_external(kUITabline, tabline_external);
+  for (UIWidget i = 0; (int)i < UI_WIDGETS; i++) {
+    ui_set_external(i, ext_widgets[i]);
+  }
   ui_mode_info_set();
   old_mode_idx = -1;
   ui_cursor_shape();
@@ -564,30 +565,16 @@ void ui_cursor_shape(void)
   conceal_check_cursur_line();
 }
 
-bool ui_is_widget_external(UIWidget widget)
+/// Returns true if `widget` is externalized.
+bool ui_is_external(UIWidget widget)
 {
-  switch (widget) {
-    case kUITabline:
-      return tabline_external;
-    case kUICmdline:
-      return cmdline_external;
-    case kUIWildmenu:
-      return wildmenu_external;
-  }
-  return false;
+  return ui_ext[widget];
 }
 
-void ui_set_widget_external(UIWidget widget, bool external)
+/// Sets `widget` as "external".
+/// Such widgets are not drawn by Nvim; external UIs are expected to handle
+/// higher-level UI events and present the data.
+void ui_set_external(UIWidget widget, bool external)
 {
-  switch (widget) {
-    case kUITabline:
-      tabline_external = external;
-      break;
-    case kUICmdline:
-      cmdline_external = external;
-      break;
-    case kUIWildmenu:
-      wildmenu_external = external;
-      break;
-  }
+  ui_ext[widget] = external;
 }
diff --git a/src/nvim/ui.h b/src/nvim/ui.h
index a1ff449eaf..9338ab3ea3 100644
--- a/src/nvim/ui.h
+++ b/src/nvim/ui.h
@@ -8,12 +8,13 @@
 #include "api/private/defs.h"
 #include "nvim/buffer_defs.h"
 
-// values for externalized widgets
 typedef enum {
+  kUICmdline = 0,
+  kUIPopupmenu,
   kUITabline,
-  kUICmdline,
-  kUIWildmenu
+  kUIWildmenu,
 } UIWidget;
+#define UI_WIDGETS (kUIWildmenu + 1)
 
 typedef struct {
   bool bold, underline, undercurl, italic, reverse;
@@ -23,7 +24,8 @@ typedef struct {
 typedef struct ui_t UI;
 
 struct ui_t {
-  bool rgb, pum_external, tabline_external;
+  bool rgb;
+  bool ui_ext[UI_WIDGETS];  ///< Externalized widgets
   int width, height;
   void *data;
   void (*resize)(UI *ui, int rows, int columns);
diff --git a/src/nvim/ui_bridge.c b/src/nvim/ui_bridge.c
index 9a3fcab13c..b7b12ae39e 100644
--- a/src/nvim/ui_bridge.c
+++ b/src/nvim/ui_bridge.c
@@ -57,8 +57,6 @@ UI *ui_bridge_attach(UI *ui, ui_main_fn ui_main, event_scheduler scheduler)
   UIBridgeData *rv = xcalloc(1, sizeof(UIBridgeData));
   rv->ui = ui;
   rv->bridge.rgb = ui->rgb;
-  rv->bridge.pum_external = ui->pum_external;
-  rv->bridge.tabline_external = ui->tabline_external;
   rv->bridge.stop = ui_bridge_stop;
   rv->bridge.resize = ui_bridge_resize;
   rv->bridge.clear = ui_bridge_clear;
@@ -86,6 +84,10 @@ UI *ui_bridge_attach(UI *ui, ui_main_fn ui_main, event_scheduler scheduler)
   rv->bridge.set_icon = ui_bridge_set_icon;
   rv->scheduler = scheduler;
 
+  for (UIWidget i = 0; (int)i < UI_WIDGETS; i++) {
+    rv->bridge.ui_ext[i] = ui->ui_ext[i];
+  }
+
   rv->ui_main = ui_main;
   uv_mutex_init(&rv->mutex);
   uv_cond_init(&rv->cond);
diff --git a/src/nvim/window.c b/src/nvim/window.c
index effce8b413..69c0a838ea 100644
--- a/src/nvim/window.c
+++ b/src/nvim/window.c
@@ -5224,8 +5224,8 @@ static void last_status_rec(frame_T *fr, int statusline)
  */
 int tabline_height(void)
 {
-  if (ui_is_widget_external(kUITabline)) {
-      return 0;
+  if (ui_is_external(kUITabline)) {
+    return 0;
   }
   assert(first_tabpage);
   switch (p_stal) {
diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua
index d9cb3d7b6f..d6aa1aa993 100644
--- a/test/functional/ui/screen_basic_spec.lua
+++ b/test/functional/ui/screen_basic_spec.lua
@@ -6,7 +6,7 @@ local insert = helpers.insert
 local eq = helpers.eq
 local eval = helpers.eval
 
-describe('Initial screen', function()
+describe('screen', function()
   local screen
   local nvim_argv = {helpers.nvim_prog, '-u', 'NONE', '-i', 'NONE', '-N',
                      '--cmd', 'set shortmess+=I background=light noswapfile belloff= noshowcmd noruler',
@@ -27,7 +27,7 @@ describe('Initial screen', function()
     screen:detach()
   end)
 
-  it('is the default initial screen', function()
+  it('default initial screen', function()
       screen:expect([[
       ^                                                     |
       {0:~                                                    }|
@@ -565,12 +565,40 @@ describe('Screen', function()
       ]])
     end)
   end)
+end)
 
-  it('nvim_ui_attach() handles very large width/height #2180', function()
-    screen:detach()
-    screen = Screen.new(999, 999)
+describe('nvim_ui_attach()', function()
+  before_each(function()
+    clear()
+  end)
+  it('handles very large width/height #2180', function()
+    local screen = Screen.new(999, 999)
     screen:attach()
     eq(999, eval('&lines'))
     eq(999, eval('&columns'))
   end)
+  it('"ui_ext" widgets', function()
+    local screen = Screen.new()
+    screen:attach({ui_ext={
+      'cmdline',
+      'popupmenu',
+      'tabline',
+      'wildmenu',
+    }})
+  end)
+  it('invalid "ui_ext" returns error', function()
+    local screen = Screen.new()
+
+    local status, rv = pcall(function() screen:attach({ui_ext={'foo'}}) end)
+    eq(false, status)
+    eq('ui_ext: unknown widget: foo', rv:match("ui_ext:.*"))
+
+    status, rv = pcall(function() screen:attach({ui_ext={'cmdline','foo'}}) end)
+    eq(false, status)
+    eq('ui_ext: unknown widget: foo', rv:match("ui_ext:.*"))
+
+    status, rv = pcall(function() screen:attach({ui_ext={'cmdline',1}}) end)
+    eq(false, status)
+    eq('ui_ext: item must be a String', rv:match("ui_ext:.*"))
+  end)
 end)
diff --git a/test/functional/ui/tabline_spec.lua b/test/functional/ui/tabline_spec.lua
index 018e008e4a..c62dd0c94b 100644
--- a/test/functional/ui/tabline_spec.lua
+++ b/test/functional/ui/tabline_spec.lua
@@ -2,16 +2,14 @@ local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
 local clear, feed, eq = helpers.clear, helpers.feed, helpers.eq
 
-if helpers.pending_win32(pending) then return end
-
-describe('External tab line', function()
+describe('ui/tabline', function()
   local screen
   local tabs, curtab
 
   before_each(function()
     clear()
     screen = Screen.new(25, 5)
-    screen:attach({rgb=true, tabline_external=true})
+    screen:attach({rgb=true, ui_ext={'tabline'}})
     screen:set_on_event_handler(function(name, data)
       if name == "tabline_update" then
         curtab, tabs = unpack(data)
@@ -23,8 +21,8 @@ describe('External tab line', function()
     screen:detach()
   end)
 
-  describe("'tabline'", function()
-    it('tabline', function()
+  describe('externalized', function()
+    it('publishes UI events', function()
       local expected = {
         {1, {['name'] = '[No Name]'}},
         {2, {['name'] = '[No Name]'}},
diff --git a/test/functional/viml/completion_spec.lua b/test/functional/viml/completion_spec.lua
index b35e8d4f94..5f5e9437dc 100644
--- a/test/functional/viml/completion_spec.lua
+++ b/test/functional/viml/completion_spec.lua
@@ -868,13 +868,13 @@ describe('completion', function()
   end)
 end)
 
-describe('External completion popupmenu', function()
+describe('ui/externalized/popupmenu', function()
   local screen
   local items, selected, anchor
   before_each(function()
     clear()
     screen = Screen.new(60, 8)
-    screen:attach({rgb=true, popupmenu_external=true})
+    screen:attach({rgb=true, ui_ext={'popupmenu'}})
     screen:set_default_attr_ids({
       [1] = {bold=true, foreground=Screen.colors.Blue},
       [2] = {bold = true},

From c8e1af93de90b2e23579f726fd4aa6a65f9387b6 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 25 Apr 2017 10:14:29 +0200
Subject: [PATCH 167/257] api: nvim_ui_attach(): Flatten ext_* options.

---
 runtime/doc/msgpack_rpc.txt              | 10 ++---
 src/nvim/api/ui.c                        | 57 +++++++++++-------------
 test/functional/ui/screen_basic_spec.lua | 24 ++--------
 test/functional/ui/tabline_spec.lua      |  2 +-
 test/functional/viml/completion_spec.lua |  2 +-
 5 files changed, 34 insertions(+), 61 deletions(-)

diff --git a/runtime/doc/msgpack_rpc.txt b/runtime/doc/msgpack_rpc.txt
index 7adc4ca2e9..da9b2360e3 100644
--- a/runtime/doc/msgpack_rpc.txt
+++ b/runtime/doc/msgpack_rpc.txt
@@ -264,13 +264,11 @@ a dictionary with these (optional) keys:
 				colors.
 				Set to false to use terminal color codes (at
 				most 256 different colors).
-	`ui_ext`		String array of "externalized" widgets.
-				Widgets in this list will not be drawn by
+	`ext_popupmenu`		Externalize the popupmenu. |ui-ext-popupmenu|
+	`ext_tabline`		Externalize the tabline. |ui-ext-tabline|
+				Externalized widgets will not be drawn by
 				Nvim; only high-level data will be published
-				in new UI event kinds. Valid names:
-					popupmenu	|ui-ext-popupmenu|
-					tabline         |ui-ext-tabline|
-				Defaults to empty.
+				in new UI event kinds.
 
 Nvim will then send msgpack-rpc notifications, with the method name "redraw"
 and a single argument, an array of screen updates (described below).  These
diff --git a/src/nvim/api/ui.c b/src/nvim/api/ui.c
index 08d285eedc..3c0e8bc049 100644
--- a/src/nvim/api/ui.c
+++ b/src/nvim/api/ui.c
@@ -173,13 +173,33 @@ void nvim_ui_set_option(uint64_t channel_id, String name,
 
 static void ui_set_option(UI *ui, String name, Object value, Error *error)
 {
+#define UI_EXT_OPTION(o, e) \
+  do { \
+    if (strequal(name.data, #o)) { \
+      if (value.type != kObjectTypeBoolean) { \
+        api_set_error(error, kErrorTypeValidation, #o " must be a Boolean"); \
+        return; \
+      } \
+      ui->ui_ext[(e)] = value.data.boolean; \
+      return; \
+    } \
+  } while (0)
+
   if (strequal(name.data, "rgb")) {
     if (value.type != kObjectTypeBoolean) {
       api_set_error(error, kErrorTypeValidation, "rgb must be a Boolean");
       return;
     }
     ui->rgb = value.data.boolean;
-  } else if (strequal(name.data, "popupmenu_external")) {
+    return;
+  }
+
+  UI_EXT_OPTION(ext_cmdline, kUICmdline);
+  UI_EXT_OPTION(ext_popupmenu, kUIPopupmenu);
+  UI_EXT_OPTION(ext_tabline, kUITabline);
+  UI_EXT_OPTION(ext_wildmenu, kUIWildmenu);
+
+  if (strequal(name.data, "popupmenu_external")) {
     // LEGACY: Deprecated option, use `ui_ext` instead.
     if (value.type != kObjectTypeBoolean) {
       api_set_error(error, kErrorTypeValidation,
@@ -187,38 +207,11 @@ static void ui_set_option(UI *ui, String name, Object value, Error *error)
       return;
     }
     ui->ui_ext[kUIPopupmenu] = value.data.boolean;
-  } else if (strequal(name.data, "ui_ext")) {
-    if (value.type != kObjectTypeArray) {
-      api_set_error(error, kErrorTypeValidation,
-                    "ui_ext must be an Array");
-      return;
-    }
-
-    for (size_t i = 0; i < value.data.array.size; i++) {
-      Object item = value.data.array.items[i];
-      if (item.type != kObjectTypeString) {
-        api_set_error(error, kErrorTypeValidation,
-                      "ui_ext: item must be a String");
-        return;
-      }
-      char *name = item.data.string.data;
-      if (strequal(name, "cmdline")) {
-        ui->ui_ext[kUICmdline] = true;
-      } else if (strequal(name, "popupmenu")) {
-        ui->ui_ext[kUIPopupmenu] = true;
-      } else if (strequal(name, "tabline")) {
-        ui->ui_ext[kUITabline] = true;
-      } else if (strequal(name, "wildmenu")) {
-        ui->ui_ext[kUIWildmenu] = true;
-      } else {
-        api_set_error(error, kErrorTypeValidation,
-                      "ui_ext: unknown widget: %s", name);
-        return;
-      }
-    }
-  } else {
-    api_set_error(error, kErrorTypeValidation, "No such ui option");
+    return;
   }
+
+  api_set_error(error, kErrorTypeValidation, "No such ui option");
+#undef UI_EXT_OPTION
 }
 
 static void push_call(UI *ui, char *name, Array args)
diff --git a/test/functional/ui/screen_basic_spec.lua b/test/functional/ui/screen_basic_spec.lua
index d6aa1aa993..5d89416e4a 100644
--- a/test/functional/ui/screen_basic_spec.lua
+++ b/test/functional/ui/screen_basic_spec.lua
@@ -577,28 +577,10 @@ describe('nvim_ui_attach()', function()
     eq(999, eval('&lines'))
     eq(999, eval('&columns'))
   end)
-  it('"ui_ext" widgets', function()
+  it('invalid option returns error', function()
     local screen = Screen.new()
-    screen:attach({ui_ext={
-      'cmdline',
-      'popupmenu',
-      'tabline',
-      'wildmenu',
-    }})
-  end)
-  it('invalid "ui_ext" returns error', function()
-    local screen = Screen.new()
-
-    local status, rv = pcall(function() screen:attach({ui_ext={'foo'}}) end)
+    local status, rv = pcall(function() screen:attach({foo={'foo'}}) end)
     eq(false, status)
-    eq('ui_ext: unknown widget: foo', rv:match("ui_ext:.*"))
-
-    status, rv = pcall(function() screen:attach({ui_ext={'cmdline','foo'}}) end)
-    eq(false, status)
-    eq('ui_ext: unknown widget: foo', rv:match("ui_ext:.*"))
-
-    status, rv = pcall(function() screen:attach({ui_ext={'cmdline',1}}) end)
-    eq(false, status)
-    eq('ui_ext: item must be a String', rv:match("ui_ext:.*"))
+    eq('No such ui option', rv:match("No such .*"))
   end)
 end)
diff --git a/test/functional/ui/tabline_spec.lua b/test/functional/ui/tabline_spec.lua
index c62dd0c94b..aa7b432c09 100644
--- a/test/functional/ui/tabline_spec.lua
+++ b/test/functional/ui/tabline_spec.lua
@@ -9,7 +9,7 @@ describe('ui/tabline', function()
   before_each(function()
     clear()
     screen = Screen.new(25, 5)
-    screen:attach({rgb=true, ui_ext={'tabline'}})
+    screen:attach({rgb=true, ext_tabline=true})
     screen:set_on_event_handler(function(name, data)
       if name == "tabline_update" then
         curtab, tabs = unpack(data)
diff --git a/test/functional/viml/completion_spec.lua b/test/functional/viml/completion_spec.lua
index 5f5e9437dc..0e5278345c 100644
--- a/test/functional/viml/completion_spec.lua
+++ b/test/functional/viml/completion_spec.lua
@@ -874,7 +874,7 @@ describe('ui/externalized/popupmenu', function()
   before_each(function()
     clear()
     screen = Screen.new(60, 8)
-    screen:attach({rgb=true, ui_ext={'popupmenu'}})
+    screen:attach({rgb=true, ext_popupmenu=true})
     screen:set_default_attr_ids({
       [1] = {bold=true, foreground=Screen.colors.Blue},
       [2] = {bold = true},

From 6944abad2f3f443027af1966a2a310034d2179b2 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 25 Apr 2017 11:13:29 +0200
Subject: [PATCH 168/257] api/ext_tabline: List of Dicts.

---
 runtime/doc/msgpack_rpc.txt           |  7 ++++---
 src/nvim/screen.c                     | 11 +++++------
 test/functional/ui/tabline_spec.lua   | 25 +++++++++++++------------
 third-party/cmake/BuildLuarocks.cmake |  2 +-
 4 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/runtime/doc/msgpack_rpc.txt b/runtime/doc/msgpack_rpc.txt
index da9b2360e3..261e68cfb1 100644
--- a/runtime/doc/msgpack_rpc.txt
+++ b/runtime/doc/msgpack_rpc.txt
@@ -440,9 +440,10 @@ states might be represented as separate modes.
 
 							*ui-ext-tabline*
 ["tabline_update", curtab, tabs]
-	Nvim will send this event when drawing tabline. curtab is the tab id
-	of the current tab. tabs is an array of the form:
-	[tabid, { "name": name }]
+	Tabline was updated. UIs should present this data in a custom tabline
+	widget.
+	curtab:	  Current Tabpage
+	tabs:	  List of Dicts [{ "tab": Tabpage, "name": String }, ...]
 
 ==============================================================================
  vim:tw=78:ts=8:noet:ft=help:norl:
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index a6563534aa..de24156579 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -7038,15 +7038,14 @@ void ui_ext_tabline_update(void)
   ADD(args, INTEGER_OBJ(curtab->handle));
   Array tabs = ARRAY_DICT_INIT;
   FOR_ALL_TABS(tp) {
+    Dictionary tab_info = ARRAY_DICT_INIT;
+    PUT(tab_info, "tab", TABPAGE_OBJ(tp->handle));
+
     win_T *cwp = (tp == curtab) ? curwin : tp->tp_curwin;
     get_trans_bufname(cwp->w_buffer);
-    Array tab = ARRAY_DICT_INIT;
-    ADD(tab, INTEGER_OBJ(tp->handle));
-
-    Dictionary tab_info = ARRAY_DICT_INIT;
     PUT(tab_info, "name", STRING_OBJ(cstr_to_string((char *)NameBuff)));
-    ADD(tab, DICTIONARY_OBJ(tab_info));
-    ADD(tabs, ARRAY_OBJ(tab));
+
+    ADD(tabs, DICTIONARY_OBJ(tab_info));
   }
   ADD(args, ARRAY_OBJ(tabs));
 
diff --git a/test/functional/ui/tabline_spec.lua b/test/functional/ui/tabline_spec.lua
index aa7b432c09..2d5faf394b 100644
--- a/test/functional/ui/tabline_spec.lua
+++ b/test/functional/ui/tabline_spec.lua
@@ -1,10 +1,10 @@
 local helpers = require('test.functional.helpers')(after_each)
 local Screen = require('test.functional.ui.screen')
-local clear, feed, eq = helpers.clear, helpers.feed, helpers.eq
+local clear, command, eq = helpers.clear, helpers.command, helpers.eq
 
 describe('ui/tabline', function()
   local screen
-  local tabs, curtab
+  local event_tabs, event_curtab
 
   before_each(function()
     clear()
@@ -12,7 +12,7 @@ describe('ui/tabline', function()
     screen:attach({rgb=true, ext_tabline=true})
     screen:set_on_event_handler(function(name, data)
       if name == "tabline_update" then
-        curtab, tabs = unpack(data)
+        event_curtab, event_tabs = unpack(data)
       end
     end)
   end)
@@ -23,11 +23,12 @@ describe('ui/tabline', function()
 
   describe('externalized', function()
     it('publishes UI events', function()
-      local expected = {
-        {1, {['name'] = '[No Name]'}},
-        {2, {['name'] = '[No Name]'}},
+      command("tabedit another-tab")
+
+      local expected_tabs = {
+        {tab = { id = 1 }, name = '[No Name]'},
+        {tab = { id = 2 }, name = 'another-tab'},
       }
-      feed(":tabnew<CR>")
       screen:expect([[
         ^                         |
         ~                        |
@@ -35,11 +36,11 @@ describe('ui/tabline', function()
         ~                        |
                                  |
       ]], nil, nil, function()
-        eq(2, curtab)
-        eq(expected, tabs)
+        eq(2, event_curtab)
+        eq(expected_tabs, event_tabs)
       end)
 
-      feed(":tabNext<CR>")
+      command("tabNext")
       screen:expect([[
         ^                         |
         ~                        |
@@ -47,8 +48,8 @@ describe('ui/tabline', function()
         ~                        |
                                  |
       ]], nil, nil, function()
-        eq(1, curtab)
-        eq(expected, tabs)
+        eq(1, event_curtab)
+        eq(expected_tabs, event_tabs)
       end)
 
     end)
diff --git a/third-party/cmake/BuildLuarocks.cmake b/third-party/cmake/BuildLuarocks.cmake
index 7312b6f91b..88ddaf44ce 100644
--- a/third-party/cmake/BuildLuarocks.cmake
+++ b/third-party/cmake/BuildLuarocks.cmake
@@ -167,7 +167,7 @@ if(USE_BUNDLED_BUSTED)
 
   add_custom_command(OUTPUT ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client
     COMMAND ${LUAROCKS_BINARY}
-    ARGS build https://raw.githubusercontent.com/neovim/lua-client/0.0.1-25/nvim-client-0.0.1-25.rockspec ${LUAROCKS_BUILDARGS}
+    ARGS build https://raw.githubusercontent.com/neovim/lua-client/0.0.1-26/nvim-client-0.0.1-26.rockspec ${LUAROCKS_BUILDARGS}
     DEPENDS luv)
   add_custom_target(nvim-client
     DEPENDS ${HOSTDEPS_LIB_DIR}/luarocks/rocks/nvim-client)

From 67552621943a18cb38db8dc38bfb7639807ebdf5 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 26 Apr 2017 14:51:21 +0200
Subject: [PATCH 169/257] test: inccommand_spec: Avoid indeterminism. (#6592)

---
 test/functional/ui/inccommand_spec.lua | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/functional/ui/inccommand_spec.lua b/test/functional/ui/inccommand_spec.lua
index a7be1a9dc8..8bdc4601c0 100644
--- a/test/functional/ui/inccommand_spec.lua
+++ b/test/functional/ui/inccommand_spec.lua
@@ -805,6 +805,7 @@ describe(":substitute, inccommand=split", function()
   it('does not show split window for :s/', function()
     feed("2gg")
     feed(":s/tw")
+    screen:sleep(1)
     screen:expect([[
       Inc substitution on           |
       two lines                     |

From e20691ccb47731b378e029e1223d3e87744f25c6 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 26 Apr 2017 16:50:36 -0400
Subject: [PATCH 170/257] defaults_spec: Test changing :filetype/:syntax in -c,
 after defaults

---
 test/functional/options/defaults_spec.lua | 41 ++++++++++++++++++-----
 1 file changed, 32 insertions(+), 9 deletions(-)

diff --git a/test/functional/options/defaults_spec.lua b/test/functional/options/defaults_spec.lua
index f43d8eeafa..dc73679bb4 100644
--- a/test/functional/options/defaults_spec.lua
+++ b/test/functional/options/defaults_spec.lua
@@ -23,13 +23,13 @@ describe('startup defaults', function()
     if helpers.pending_win32(pending) then return end
 
     local function expect_filetype(expected)
-      local screen = Screen.new(48, 4)
+      local screen = Screen.new(50, 4)
       screen:attach()
       command('filetype')
       screen:expect([[
-        ^                                                |
-        ~                                               |
-        ~                                               |
+        ^                                                  |
+        ~                                                 |
+        ~                                                 |
         ]]..expected
       )
     end
@@ -37,31 +37,49 @@ describe('startup defaults', function()
     it('enabled by `-u NORC`', function()
       init_session('-u', 'NORC')
       expect_filetype(
-        'filetype detection:ON  plugin:ON  indent:ON     |')
+        'filetype detection:ON  plugin:ON  indent:ON       |')
     end)
 
     it('disabled by `-u NONE`', function()
       init_session('-u', 'NONE')
       expect_filetype(
-        'filetype detection:OFF  plugin:OFF  indent:OFF  |')
+        'filetype detection:OFF  plugin:OFF  indent:OFF    |')
     end)
 
     it('overridden by early `filetype on`', function()
       init_session('-u', 'NORC', '--cmd', 'filetype on')
       expect_filetype(
-        'filetype detection:ON  plugin:OFF  indent:OFF   |')
+        'filetype detection:ON  plugin:OFF  indent:OFF     |')
     end)
 
     it('overridden by early `filetype plugin on`', function()
       init_session('-u', 'NORC', '--cmd', 'filetype plugin on')
       expect_filetype(
-        'filetype detection:ON  plugin:ON  indent:OFF    |')
+        'filetype detection:ON  plugin:ON  indent:OFF      |')
     end)
 
     it('overridden by early `filetype indent on`', function()
       init_session('-u', 'NORC', '--cmd', 'filetype indent on')
       expect_filetype(
-        'filetype detection:ON  plugin:OFF  indent:ON    |')
+        'filetype detection:ON  plugin:OFF  indent:ON      |')
+    end)
+
+    it('adjusted by late `filetype off`', function()
+      init_session('-u', 'NORC', '-c', 'filetype off')
+      expect_filetype(
+        'filetype detection:OFF  plugin:(on)  indent:(on)  |')
+    end)
+
+    it('adjusted by late `filetype plugin off`', function()
+      init_session('-u', 'NORC', '-c', 'filetype plugin off')
+      expect_filetype(
+        'filetype detection:ON  plugin:OFF  indent:ON      |')
+    end)
+
+    it('adjusted by late `filetype indent off`', function()
+      init_session('-u', 'NORC', '-c', 'filetype indent off')
+      expect_filetype(
+        'filetype detection:ON  plugin:ON  indent:OFF      |')
     end)
   end)
 
@@ -80,6 +98,11 @@ describe('startup defaults', function()
       init_session('-u', 'NORC', '--cmd', 'syntax off')
       eq(0, eval('exists("g:syntax_on")'))
     end)
+
+    it('adjusted by late `syntax off`', function()
+      init_session('-u', 'NORC', '-c', 'syntax off')
+      eq(0, eval('exists("g:syntax_on")'))
+    end)
   end)
 
   describe('packpath', function()

From 56911050e0e8b1917ef6d750cf8dac6fdcb9ef06 Mon Sep 17 00:00:00 2001
From: relnod <mail@paul-schiffers.de>
Date: Thu, 27 Apr 2017 21:43:27 +0200
Subject: [PATCH 171/257] refactor/single-include (#6604)

---
 src/nvim/CMakeLists.txt | 5 -----
 src/nvim/sha256.h       | 1 +
 src/nvim/sign_defs.h    | 2 ++
 src/nvim/spell.h        | 2 ++
 src/nvim/spellfile.h    | 1 +
 src/nvim/tag.h          | 3 +++
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 9e9e9b6026..691f230b6e 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -436,12 +436,7 @@ set(NO_SINGLE_CHECK_HEADERS
   os_unix.h
   os/win_defs.h
   regexp_defs.h
-  sha256.h
-  sign_defs.h
-  spell.h
-  spellfile.h
   syntax_defs.h
-  tag.h
   terminal.h
   tui/tui.h
   undo.h
diff --git a/src/nvim/sha256.h b/src/nvim/sha256.h
index a118826542..deb881a288 100644
--- a/src/nvim/sha256.h
+++ b/src/nvim/sha256.h
@@ -2,6 +2,7 @@
 #define NVIM_SHA256_H
 
 #include <stdint.h>      // for uint32_t
+#include <stddef.h>
 
 #include "nvim/types.h"  // for char_u
 
diff --git a/src/nvim/sign_defs.h b/src/nvim/sign_defs.h
index 7288a48e21..3778f4287e 100644
--- a/src/nvim/sign_defs.h
+++ b/src/nvim/sign_defs.h
@@ -1,6 +1,8 @@
 #ifndef NVIM_SIGN_DEFS_H
 #define NVIM_SIGN_DEFS_H
 
+#include "nvim/pos.h"
+
 // signs: line annotations
 
 typedef struct signlist signlist_T;
diff --git a/src/nvim/spell.h b/src/nvim/spell.h
index e950644a6d..ad66df4c5d 100644
--- a/src/nvim/spell.h
+++ b/src/nvim/spell.h
@@ -4,6 +4,8 @@
 #include <stdbool.h>
 
 #include "nvim/spell_defs.h"
+#include "nvim/ex_cmds_defs.h"
+#include "nvim/globals.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "spell.h.generated.h"
diff --git a/src/nvim/spellfile.h b/src/nvim/spellfile.h
index 89acddda0d..633ee014a7 100644
--- a/src/nvim/spellfile.h
+++ b/src/nvim/spellfile.h
@@ -5,6 +5,7 @@
 
 #include "nvim/spell_defs.h"
 #include "nvim/types.h"
+#include "nvim/ex_cmds_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "spellfile.h.generated.h"
diff --git a/src/nvim/tag.h b/src/nvim/tag.h
index 5d4bcddf94..a8fddd05da 100644
--- a/src/nvim/tag.h
+++ b/src/nvim/tag.h
@@ -1,6 +1,9 @@
 #ifndef NVIM_TAG_H
 #define NVIM_TAG_H
 
+#include "nvim/types.h"
+#include "nvim/ex_cmds_defs.h"
+
 /*
  * Values for do_tag().
  */

From 2b6a3819e5d0135102e0a771be9272e73ea88389 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 02:20:40 +0200
Subject: [PATCH 172/257] build_stl_str_hl: Array name should be plural.

---
 src/nvim/buffer.c | 149 +++++++++++++++++++++++-----------------------
 1 file changed, 74 insertions(+), 75 deletions(-)

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 46f2cdac79..e0812b4aed 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -3060,7 +3060,7 @@ int build_stl_str_hl(
     StlClickRecord *tabtab
 )
 {
-  int groupitem[STL_MAX_ITEM];
+  int groupitems[STL_MAX_ITEM];
   struct stl_item {
     // Where the item starts in the status line output buffer
     char_u *start;
@@ -3080,7 +3080,7 @@ int build_stl_str_hl(
       ClickFunc,
       Trunc
     } type;
-  } item[STL_MAX_ITEM];
+  } items[STL_MAX_ITEM];
 #define TMPLEN 70
   char_u tmp[TMPLEN];
   char_u      *usefmt = fmt;
@@ -3182,16 +3182,16 @@ int build_stl_str_hl(
       if (groupdepth > 0) {
         continue;
       }
-      item[curitem].type = Separate;
-      item[curitem++].start = out_p;
+      items[curitem].type = Separate;
+      items[curitem++].start = out_p;
       continue;
     }
 
     // STL_TRUNCMARK: Where to begin truncating if the statusline is too long.
     if (*fmt_p == STL_TRUNCMARK) {
       fmt_p++;
-      item[curitem].type = Trunc;
-      item[curitem++].start = out_p;
+      items[curitem].type = Trunc;
+      items[curitem++].start = out_p;
       continue;
     }
 
@@ -3207,7 +3207,7 @@ int build_stl_str_hl(
       // Determine how long the group is.
       // Note: We set the current output position to null
       //       so `vim_strsize` will work.
-      char_u *t = item[groupitem[groupdepth]].start;
+      char_u *t = items[groupitems[groupdepth]].start;
       *out_p = NUL;
       long group_len = vim_strsize(t);
 
@@ -3217,11 +3217,11 @@ int build_stl_str_hl(
       // move the output pointer back to where the group started.
       // Note: This erases any non-item characters that were in the group.
       //       Otherwise there would be no reason to do this step.
-      if (curitem > groupitem[groupdepth] + 1
-          && item[groupitem[groupdepth]].minwid == 0) {
+      if (curitem > groupitems[groupdepth] + 1
+          && items[groupitems[groupdepth]].minwid == 0) {
         bool has_normal_items = false;
-        for (long n = groupitem[groupdepth] + 1; n < curitem; n++) {
-          if (item[n].type == Normal || item[n].type == Highlight) {
+        for (long n = groupitems[groupdepth] + 1; n < curitem; n++) {
+          if (items[n].type == Normal || items[n].type == Highlight) {
             has_normal_items = true;
             break;
           }
@@ -3235,18 +3235,18 @@ int build_stl_str_hl(
 
       // If the group is longer than it is allowed to be
       // truncate by removing bytes from the start of the group text.
-      if (group_len > item[groupitem[groupdepth]].maxwid) {
+      if (group_len > items[groupitems[groupdepth]].maxwid) {
         // { Determine the number of bytes to remove
         long n;
         if (has_mbyte) {
           /* Find the first character that should be included. */
           n = 0;
-          while (group_len >= item[groupitem[groupdepth]].maxwid) {
+          while (group_len >= items[groupitems[groupdepth]].maxwid) {
             group_len -= ptr2cells(t + n);
             n += (*mb_ptr2len)(t + n);
           }
         } else {
-          n = (long)(out_p - t) - item[groupitem[groupdepth]].maxwid + 1;
+          n = (long)(out_p - t) - items[groupitems[groupdepth]].maxwid + 1;
         }
         // }
 
@@ -3257,24 +3257,24 @@ int build_stl_str_hl(
         memmove(t + 1, t + n, (size_t)(out_p - (t + n)));
         out_p = out_p - n + 1;
         /* Fill up space left over by half a double-wide char. */
-        while (++group_len < item[groupitem[groupdepth]].minwid)
+        while (++group_len < items[groupitems[groupdepth]].minwid)
           *out_p++ = fillchar;
         // }
 
         /* correct the start of the items for the truncation */
-        for (int idx = groupitem[groupdepth] + 1; idx < curitem; idx++) {
+        for (int idx = groupitems[groupdepth] + 1; idx < curitem; idx++) {
           // Shift everything back by the number of removed bytes
-          item[idx].start -= n;
+          items[idx].start -= n;
 
           // If the item was partially or completely truncated, set its
           // start to the start of the group
-          if (item[idx].start < t) {
-            item[idx].start = t;
+          if (items[idx].start < t) {
+            items[idx].start = t;
           }
         }
       // If the group is shorter than the minimum width, add padding characters.
-      } else if (abs(item[groupitem[groupdepth]].minwid) > group_len) {
-        long min_group_width = item[groupitem[groupdepth]].minwid;
+      } else if (abs(items[groupitems[groupdepth]].minwid) > group_len) {
+        long min_group_width = items[groupitems[groupdepth]].minwid;
         // If the group is left-aligned, add characters to the right.
         if (min_group_width < 0) {
           min_group_width = 0 - min_group_width;
@@ -3293,8 +3293,8 @@ int build_stl_str_hl(
           // }
 
           // Adjust item start positions
-          for (int n = groupitem[groupdepth] + 1; n < curitem; n++) {
-            item[n].start += group_len;
+          for (int n = groupitems[groupdepth] + 1; n < curitem; n++) {
+            items[n].start += group_len;
           }
 
           // Prepend the fill characters
@@ -3332,9 +3332,9 @@ int build_stl_str_hl(
     // User highlight groups override the min width field
     // to denote the styling to use.
     if (*fmt_p == STL_USER_HL) {
-      item[curitem].type = Highlight;
-      item[curitem].start = out_p;
-      item[curitem].minwid = minwid > 9 ? 1 : minwid;
+      items[curitem].type = Highlight;
+      items[curitem].start = out_p;
+      items[curitem].minwid = minwid > 9 ? 1 : minwid;
       fmt_p++;
       curitem++;
       continue;
@@ -3369,17 +3369,17 @@ int build_stl_str_hl(
           /* %X ends the close label, go back to the previously
            * define tab label nr. */
           for (long n = curitem - 1; n >= 0; --n)
-            if (item[n].type == TabPage && item[n].minwid >= 0) {
-              minwid = item[n].minwid;
+            if (items[n].type == TabPage && items[n].minwid >= 0) {
+              minwid = items[n].minwid;
               break;
             }
         } else
           /* close nrs are stored as negative values */
           minwid = -minwid;
       }
-      item[curitem].type = TabPage;
-      item[curitem].start = out_p;
-      item[curitem].minwid = minwid;
+      items[curitem].type = TabPage;
+      items[curitem].start = out_p;
+      items[curitem].minwid = minwid;
       fmt_p++;
       curitem++;
       continue;
@@ -3394,10 +3394,10 @@ int build_stl_str_hl(
       if (*fmt_p != STL_CLICK_FUNC) {
         break;
       }
-      item[curitem].type = ClickFunc;
-      item[curitem].start = out_p;
-      item[curitem].cmd = xmemdupz(t, (size_t) (((char *) fmt_p - t)));
-      item[curitem].minwid = minwid;
+      items[curitem].type = ClickFunc;
+      items[curitem].start = out_p;
+      items[curitem].cmd = xmemdupz(t, (size_t) (((char *) fmt_p - t)));
+      items[curitem].minwid = minwid;
       fmt_p++;
       curitem++;
       continue;
@@ -3420,11 +3420,11 @@ int build_stl_str_hl(
 
     // Denotes the start of a new group
     if (*fmt_p == '(') {
-      groupitem[groupdepth++] = curitem;
-      item[curitem].type = Group;
-      item[curitem].start = out_p;
-      item[curitem].minwid = minwid;
-      item[curitem].maxwid = maxwid;
+      groupitems[groupdepth++] = curitem;
+      items[curitem].type = Group;
+      items[curitem].start = out_p;
+      items[curitem].minwid = minwid;
+      items[curitem].maxwid = maxwid;
       fmt_p++;
       curitem++;
       continue;
@@ -3451,7 +3451,7 @@ int build_stl_str_hl(
     case STL_FULLPATH:
     case STL_FILENAME:
     {
-      // Set fillable to false to that ' ' in the filename will not
+      // Set fillable to false so that ' ' in the filename will not
       // get replaced with the fillchar
       fillable = false;
       if (buf_spname(wp->w_buffer) != NULL) {
@@ -3703,9 +3703,9 @@ int build_stl_str_hl(
 
       // Create a highlight item based on the name
       if (*fmt_p == '#') {
-        item[curitem].type = Highlight;
-        item[curitem].start = out_p;
-        item[curitem].minwid = -syn_namen2id(t, (int)(fmt_p - t));
+        items[curitem].type = Highlight;
+        items[curitem].start = out_p;
+        items[curitem].minwid = -syn_namen2id(t, (int)(fmt_p - t));
         curitem++;
         fmt_p++;
       }
@@ -3716,8 +3716,8 @@ int build_stl_str_hl(
     // If we made it this far, the item is normal and starts at
     // our current position in the output buffer.
     // Non-normal items would have `continued`.
-    item[curitem].start = out_p;
-    item[curitem].type = Normal;
+    items[curitem].start = out_p;
+    items[curitem].type = Normal;
 
     // Copy the item string into the output buffer
     if (str != NULL && *str) {
@@ -3874,7 +3874,7 @@ int build_stl_str_hl(
 
     // Otherwise, there was nothing to print so mark the item as empty
     } else {
-      item[curitem].type = Empty;
+      items[curitem].type = Empty;
     }
 
     // Only free the string buffer if we allocated it.
@@ -3899,8 +3899,7 @@ int build_stl_str_hl(
   }
 
   // We have now processed the entire statusline format string.
-  // What follows is post-processing to handle alignment and
-  // highlighting factors.
+  // What follows is post-processing to handle alignment and highlighting.
 
   int width = vim_strsize(out);
   if (maxwidth > 0 && width > maxwidth) {
@@ -3915,13 +3914,13 @@ int build_stl_str_hl(
     // Otherwise, look for the truncation item
     } else {
       // Default to truncating at the first item
-      trunc_p = item[0].start;
+      trunc_p = items[0].start;
       item_idx = 0;
 
       for (int i = 0; i < itemcnt; i++)
-        if (item[i].type == Trunc) {
-          // Truncate at %< item.
-          trunc_p = item[i].start;
+        if (items[i].type == Trunc) {
+          // Truncate at %< items.
+          trunc_p = items[i].start;
           item_idx = i;
           break;
         }
@@ -3954,7 +3953,7 @@ int build_stl_str_hl(
       // Ignore any items in the statusline that occur after
       // the truncation point
       for (int i = 0; i < itemcnt; i++) {
-        if (item[i].start > trunc_p) {
+        if (items[i].start > trunc_p) {
           itemcnt = i;
           break;
         }
@@ -4009,12 +4008,12 @@ int build_stl_str_hl(
       for (int i = item_idx; i < itemcnt; i++) {
         // Items starting at or after the end of the truncated section need
         // to be moved backwards.
-        if (item[i].start >= trunc_end_p) {
-          item[i].start -= item_offset;
+        if (items[i].start >= trunc_end_p) {
+          items[i].start -= item_offset;
         // Anything inside the truncated area is set to start
         // at the `<` truncation character.
         } else {
-          item[i].start = trunc_p;
+          items[i].start = trunc_p;
         }
       }
       // }
@@ -4030,7 +4029,7 @@ int build_stl_str_hl(
     // figuring out how many groups there are.
     int num_separators = 0;
     for (int i = 0; i < itemcnt; i++) {
-      if (item[i].type == Separate) {
+      if (items[i].type == Separate) {
         num_separators++;
       }
     }
@@ -4042,7 +4041,7 @@ int build_stl_str_hl(
       int separator_locations[STL_MAX_ITEM];
       int index = 0;
       for (int i = 0; i < itemcnt; i++) {
-        if (item[i].type == Separate) {
+        if (items[i].type == Separate) {
           separator_locations[index] = i;
           index++;
         }
@@ -4055,16 +4054,16 @@ int build_stl_str_hl(
       for (int i = 0; i < num_separators; i++) {
         int dislocation = (i == (num_separators - 1)) ?
           final_spaces : standard_spaces;
-        char_u *sep_loc = item[separator_locations[i]].start + dislocation;
-        STRMOVE(sep_loc, item[separator_locations[i]].start);
-        for (char_u *s = item[separator_locations[i]].start; s < sep_loc; s++) {
+        char_u *sep_loc = items[separator_locations[i]].start + dislocation;
+        STRMOVE(sep_loc, items[separator_locations[i]].start);
+        for (char_u *s = items[separator_locations[i]].start; s < sep_loc; s++) {
           *s = fillchar;
         }
 
         for (int item_idx = separator_locations[i] + 1;
              item_idx < itemcnt;
              item_idx++) {
-          item[item_idx].start += dislocation;
+          items[item_idx].start += dislocation;
         }
       }
 
@@ -4076,9 +4075,9 @@ int build_stl_str_hl(
   if (hltab != NULL) {
     struct stl_hlrec *sp = hltab;
     for (long l = 0; l < itemcnt; l++) {
-      if (item[l].type == Highlight) {
-        sp->start = item[l].start;
-        sp->userhl = item[l].minwid;
+      if (items[l].type == Highlight) {
+        sp->start = items[l].start;
+        sp->userhl = items[l].minwid;
         sp++;
       }
     }
@@ -4090,14 +4089,14 @@ int build_stl_str_hl(
   if (tabtab != NULL) {
     StlClickRecord *cur_tab_rec = tabtab;
     for (long l = 0; l < itemcnt; l++) {
-      if (item[l].type == TabPage) {
-        cur_tab_rec->start = (char *) item[l].start;
-        if (item[l].minwid == 0) {
+      if (items[l].type == TabPage) {
+        cur_tab_rec->start = (char *) items[l].start;
+        if (items[l].minwid == 0) {
           cur_tab_rec->def.type = kStlClickDisabled;
           cur_tab_rec->def.tabnr = 0;
         } else {
-          int tabnr = item[l].minwid;
-          if (item[l].minwid > 0) {
+          int tabnr = items[l].minwid;
+          if (items[l].minwid > 0) {
             cur_tab_rec->def.type = kStlClickTabSwitch;
           } else {
             cur_tab_rec->def.type = kStlClickTabClose;
@@ -4107,11 +4106,11 @@ int build_stl_str_hl(
         }
         cur_tab_rec->def.func = NULL;
         cur_tab_rec++;
-      } else if (item[l].type == ClickFunc) {
-        cur_tab_rec->start = (char *) item[l].start;
+      } else if (items[l].type == ClickFunc) {
+        cur_tab_rec->start = (char *) items[l].start;
         cur_tab_rec->def.type = kStlClickFuncRun;
-        cur_tab_rec->def.tabnr = item[l].minwid;
-        cur_tab_rec->def.func = item[l].cmd;
+        cur_tab_rec->def.tabnr = items[l].minwid;
+        cur_tab_rec->def.func = items[l].cmd;
         cur_tab_rec++;
       }
     }

From 0ddebbc354273ada61734e5d35517ac49362c2d9 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 05:27:47 +0200
Subject: [PATCH 173/257] lint

---
 src/nvim/buffer.c | 37 ++++++++++++++++++++-----------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index e0812b4aed..7477118d6f 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -3256,12 +3256,13 @@ int build_stl_str_hl(
         // { Move the truncated output
         memmove(t + 1, t + n, (size_t)(out_p - (t + n)));
         out_p = out_p - n + 1;
-        /* Fill up space left over by half a double-wide char. */
-        while (++group_len < items[groupitems[groupdepth]].minwid)
+        // Fill up space left over by half a double-wide char.
+        while (++group_len < items[groupitems[groupdepth]].minwid) {
           *out_p++ = fillchar;
+        }
         // }
 
-        /* correct the start of the items for the truncation */
+        // correct the start of the items for the truncation
         for (int idx = groupitems[groupdepth] + 1; idx < curitem; idx++) {
           // Shift everything back by the number of removed bytes
           items[idx].start -= n;
@@ -3366,16 +3367,17 @@ int build_stl_str_hl(
     if (*fmt_p == STL_TABPAGENR || *fmt_p == STL_TABCLOSENR) {
       if (*fmt_p == STL_TABCLOSENR) {
         if (minwid == 0) {
-          /* %X ends the close label, go back to the previously
-           * define tab label nr. */
-          for (long n = curitem - 1; n >= 0; --n)
+          // %X ends the close label, go back to the previous tab label nr.
+          for (long n = curitem - 1; n >= 0; n--) {
             if (items[n].type == TabPage && items[n].minwid >= 0) {
               minwid = items[n].minwid;
               break;
             }
-        } else
-          /* close nrs are stored as negative values */
+          }
+        } else {
+          // close nrs are stored as negative values
           minwid = -minwid;
+        }
       }
       items[curitem].type = TabPage;
       items[curitem].start = out_p;
@@ -3396,7 +3398,7 @@ int build_stl_str_hl(
       }
       items[curitem].type = ClickFunc;
       items[curitem].start = out_p;
-      items[curitem].cmd = xmemdupz(t, (size_t) (((char *) fmt_p - t)));
+      items[curitem].cmd = xmemdupz(t, (size_t)(((char *)fmt_p - t)));
       items[curitem].minwid = minwid;
       fmt_p++;
       curitem++;
@@ -3917,13 +3919,14 @@ int build_stl_str_hl(
       trunc_p = items[0].start;
       item_idx = 0;
 
-      for (int i = 0; i < itemcnt; i++)
+      for (int i = 0; i < itemcnt; i++) {
         if (items[i].type == Trunc) {
           // Truncate at %< items.
           trunc_p = items[i].start;
           item_idx = i;
           break;
         }
+      }
     }
 
     // If the truncation point we found is beyond the maximum
@@ -4052,11 +4055,11 @@ int build_stl_str_hl(
         standard_spaces * (num_separators - 1);
 
       for (int i = 0; i < num_separators; i++) {
-        int dislocation = (i == (num_separators - 1)) ?
-          final_spaces : standard_spaces;
-        char_u *sep_loc = items[separator_locations[i]].start + dislocation;
-        STRMOVE(sep_loc, items[separator_locations[i]].start);
-        for (char_u *s = items[separator_locations[i]].start; s < sep_loc; s++) {
+        int dislocation = (i == (num_separators - 1))
+                          ? final_spaces : standard_spaces;
+        char_u *seploc = items[separator_locations[i]].start + dislocation;
+        STRMOVE(seploc, items[separator_locations[i]].start);
+        for (char_u *s = items[separator_locations[i]].start; s < seploc; s++) {
           *s = fillchar;
         }
 
@@ -4090,7 +4093,7 @@ int build_stl_str_hl(
     StlClickRecord *cur_tab_rec = tabtab;
     for (long l = 0; l < itemcnt; l++) {
       if (items[l].type == TabPage) {
-        cur_tab_rec->start = (char *) items[l].start;
+        cur_tab_rec->start = (char *)items[l].start;
         if (items[l].minwid == 0) {
           cur_tab_rec->def.type = kStlClickDisabled;
           cur_tab_rec->def.tabnr = 0;
@@ -4107,7 +4110,7 @@ int build_stl_str_hl(
         cur_tab_rec->def.func = NULL;
         cur_tab_rec++;
       } else if (items[l].type == ClickFunc) {
-        cur_tab_rec->start = (char *) items[l].start;
+        cur_tab_rec->start = (char *)items[l].start;
         cur_tab_rec->def.type = kStlClickFuncRun;
         cur_tab_rec->def.tabnr = items[l].minwid;
         cur_tab_rec->def.func = items[l].cmd;

From 7044aa6e8256844bc1bd23eb61d4a41ca6d418d0 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 07:01:46 +0200
Subject: [PATCH 174/257] api/ext_tabline: `curtab` should be a Tabpage handle.

---
 src/nvim/screen.c                   | 2 +-
 test/functional/ui/tabline_spec.lua | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index de24156579..f2709c48fd 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -7035,7 +7035,7 @@ static void draw_tabline(void)
 void ui_ext_tabline_update(void)
 {
   Array args = ARRAY_DICT_INIT;
-  ADD(args, INTEGER_OBJ(curtab->handle));
+  ADD(args, TABPAGE_OBJ(curtab->handle));
   Array tabs = ARRAY_DICT_INIT;
   FOR_ALL_TABS(tp) {
     Dictionary tab_info = ARRAY_DICT_INIT;
diff --git a/test/functional/ui/tabline_spec.lua b/test/functional/ui/tabline_spec.lua
index 2d5faf394b..56331a33b5 100644
--- a/test/functional/ui/tabline_spec.lua
+++ b/test/functional/ui/tabline_spec.lua
@@ -36,7 +36,7 @@ describe('ui/tabline', function()
         ~                        |
                                  |
       ]], nil, nil, function()
-        eq(2, event_curtab)
+        eq({ id = 2 }, event_curtab)
         eq(expected_tabs, event_tabs)
       end)
 
@@ -48,7 +48,7 @@ describe('ui/tabline', function()
         ~                        |
                                  |
       ]], nil, nil, function()
-        eq(1, event_curtab)
+        eq({ id = 1 }, event_curtab)
         eq(expected_tabs, event_tabs)
       end)
 

From 3ea10077534cb1dcb1597ffcf85e601fa0c0e27b Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 13 Mar 2017 15:02:37 +0100
Subject: [PATCH 175/257] api: nvim_get_mode()
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Asynchronous API functions are served immediately, which means pending
input could change the state of Nvim shortly after an async API function
result is returned.

nvim_get_mode() is different:
  - If RPCs are known to be blocked, it responds immediately (without
    flushing the input/event queue)
  - else it is handled just-in-time before waiting for input, after
    pending input was processed. This makes the result more reliable
    (but not perfect).

Internally this is handled as a special case, but _semantically_ nothing
has changed: API users never know when input flushes, so this internal
special-case doesn't violate that. As far as API users are concerned,
nvim_get_mode() is just another asynchronous API function.

In all cases nvim_get_mode() never blocks for more than the time it
takes to flush the input/event queue (~µs).

Note: This doesn't address #6166; nvim_get_mode() will provoke #6166 if
e.g. `d` is operator-pending.

Closes #6159
---
 runtime/doc/help.txt             |   5 --
 runtime/doc/intro.txt            |   5 --
 runtime/doc/message.txt          |   4 --
 src/nvim/api/vim.c               |  21 ++++++
 src/nvim/eval.c                  |  55 ++--------------
 src/nvim/event/loop.c            |   3 +-
 src/nvim/event/multiqueue.c      |  35 ++++++++++
 src/nvim/memory.c                |   4 --
 src/nvim/msgpack_rpc/channel.c   |  10 +++
 src/nvim/msgpack_rpc/helpers.c   |   2 +-
 src/nvim/normal.c                |   5 +-
 src/nvim/os/input.c              |  16 +++++
 src/nvim/state.c                 |  49 ++++++++++++++
 src/nvim/tui/tui.c               |   3 -
 test/functional/api/vim_spec.lua | 106 ++++++++++++++++++++++++++++++-
 test/functional/helpers.lua      |   4 +-
 16 files changed, 250 insertions(+), 77 deletions(-)

diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index f71f46bad3..3837cf3e26 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -154,22 +154,17 @@ Interfaces ~
 |if_cscop.txt|	using Cscope with Vim
 |if_pyth.txt|	Python interface
 |if_ruby.txt|	Ruby interface
-|debugger.txt|	Interface with a debugger
 |sign.txt|	debugging signs
 
 Versions ~
 |vim_diff.txt|	Main differences between Nvim and Vim
 |vi_diff.txt|	Main differences between Vim and Vi
-						*sys-file-list*
-Remarks about specific systems ~
-|os_win32.txt|	MS-Windows
 						*standard-plugin-list*
 Standard plugins ~
 |pi_gzip.txt|      Reading and writing compressed files
 |pi_netrw.txt|     Reading and writing files over a network
 |pi_paren.txt|     Highlight matching parens
 |pi_tar.txt|       Tar file explorer
-|pi_vimball.txt|   Create a self-installing Vim script
 |pi_zip.txt|       Zip archive explorer
 
 LOCAL ADDITIONS:				*local-additions*
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index a5f9106bb0..bc34b69508 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -34,11 +34,6 @@ It can be accessed from within Vim with the <Help> or <F1> key and with the
 is not located in the default place.  You can jump to subjects like with tags:
 Use CTRL-] to jump to a subject under the cursor, use CTRL-T to jump back.
 
-This manual refers to Vim on various machines.  There may be small differences
-between different computers and terminals.  Besides the remarks given in this
-document, there is a separate document for each supported system, see
-|sys-file-list|.
-
 							*pronounce*
 Vim is pronounced as one word, like Jim, not vi-ai-em.  It's written with a
 capital, since it's a name, again like Jim.
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index d0bdba41ab..5c2dddc8b3 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -40,10 +40,6 @@ Note: If the output has been stopped with "q" at the more prompt, it will only
 be displayed up to this point.
 The previous command output is cleared when another command produces output.
 
-If you are using translated messages, the first printed line tells who
-maintains the messages or the translations.  You can use this to contact the
-maintainer when you spot a mistake.
-
 If you want to find help on a specific (error) message, use the ID at the
 start of the message.  For example, to get help on the message: >
 
diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index da00fbc6e3..7c57a5b456 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -11,6 +11,7 @@
 
 #include "nvim/api/vim.h"
 #include "nvim/ascii.h"
+#include "nvim/log.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/api/private/defs.h"
 #include "nvim/api/buffer.h"
@@ -27,6 +28,7 @@
 #include "nvim/eval.h"
 #include "nvim/eval/typval.h"
 #include "nvim/option.h"
+#include "nvim/state.h"
 #include "nvim/syntax.h"
 #include "nvim/getchar.h"
 #include "nvim/os/input.h"
@@ -701,6 +703,25 @@ Dictionary nvim_get_color_map(void)
 }
 
 
+/// Gets the current mode.
+/// mode:     Mode string. |mode()|
+/// blocking: true if Nvim is waiting for input.
+///
+/// @returns Dictionary { "mode": String, "blocking": Boolean }
+Dictionary nvim_get_mode(void)
+  FUNC_API_SINCE(2) FUNC_API_ASYNC
+{
+  Dictionary rv = ARRAY_DICT_INIT;
+  char *modestr = get_mode();
+  bool blocked = input_blocking();
+  ILOG("blocked=%d", blocked);
+
+  PUT(rv, "mode", STRING_OBJ(cstr_as_string(modestr)));
+  PUT(rv, "blocking", BOOLEAN_OBJ(blocked));
+
+  return rv;
+}
+
 Array nvim_get_api_info(uint64_t channel_id)
     FUNC_API_SINCE(1) FUNC_API_ASYNC FUNC_API_NOEVAL
 {
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index c02d172458..b0f47d8e45 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -12575,59 +12575,18 @@ static void f_mkdir(typval_T *argvars, typval_T *rettv, FunPtr fptr)
   }
 }
 
-/*
- * "mode()" function
- */
+/// "mode()" function
 static void f_mode(typval_T *argvars, typval_T *rettv, FunPtr fptr)
 {
-  char_u buf[3];
+  char *mode = get_mode();
 
-  buf[1] = NUL;
-  buf[2] = NUL;
-
-  if (VIsual_active) {
-    if (VIsual_select)
-      buf[0] = VIsual_mode + 's' - 'v';
-    else
-      buf[0] = VIsual_mode;
-  } else if (State == HITRETURN || State == ASKMORE || State == SETWSIZE
-             || State == CONFIRM) {
-    buf[0] = 'r';
-    if (State == ASKMORE)
-      buf[1] = 'm';
-    else if (State == CONFIRM)
-      buf[1] = '?';
-  } else if (State == EXTERNCMD)
-    buf[0] = '!';
-  else if (State & INSERT) {
-    if (State & VREPLACE_FLAG) {
-      buf[0] = 'R';
-      buf[1] = 'v';
-    } else if (State & REPLACE_FLAG)
-      buf[0] = 'R';
-    else
-      buf[0] = 'i';
-  } else if (State & CMDLINE) {
-    buf[0] = 'c';
-    if (exmode_active)
-      buf[1] = 'v';
-  } else if (exmode_active) {
-    buf[0] = 'c';
-    buf[1] = 'e';
-  } else if (State & TERM_FOCUS) {
-    buf[0] = 't';
-  } else {
-    buf[0] = 'n';
-    if (finish_op)
-      buf[1] = 'o';
+  // Clear out the minor mode when the argument is not a non-zero number or
+  // non-empty string.
+  if (!non_zero_arg(&argvars[0])) {
+    mode[1] = NUL;
   }
 
-  /* Clear out the minor mode when the argument is not a non-zero number or
-   * non-empty string.  */
-  if (!non_zero_arg(&argvars[0]))
-    buf[1] = NUL;
-
-  rettv->vval.v_string = vim_strsave(buf);
+  rettv->vval.v_string = (char_u *)mode;
   rettv->v_type = VAR_STRING;
 }
 
diff --git a/src/nvim/event/loop.c b/src/nvim/event/loop.c
index 6963978581..c709ce9a1c 100644
--- a/src/nvim/event/loop.c
+++ b/src/nvim/event/loop.c
@@ -44,8 +44,7 @@ void loop_poll_events(Loop *loop, int ms)
     // we do not block indefinitely for I/O.
     uv_timer_start(&loop->poll_timer, timer_cb, (uint64_t)ms, (uint64_t)ms);
   } else if (ms == 0) {
-    // For ms == 0, we need to do a non-blocking event poll by
-    // setting the run mode to UV_RUN_NOWAIT.
+    // For ms == 0, do a non-blocking event poll.
     mode = UV_RUN_NOWAIT;
   }
 
diff --git a/src/nvim/event/multiqueue.c b/src/nvim/event/multiqueue.c
index a17bae31e3..b144347fdb 100644
--- a/src/nvim/event/multiqueue.c
+++ b/src/nvim/event/multiqueue.c
@@ -55,6 +55,7 @@
 
 #include "nvim/event/multiqueue.h"
 #include "nvim/memory.h"
+#include "nvim/log.h"
 #include "nvim/os/time.h"
 
 typedef struct multiqueue_item MultiQueueItem;
@@ -151,6 +152,40 @@ void multiqueue_process_events(MultiQueue *this)
   }
 }
 
+void multiqueue_process_debug(MultiQueue *this)
+{
+  assert(this);
+  QUEUE *start = QUEUE_HEAD(&this->headtail);
+  QUEUE *cur   = start;
+  // MultiQueue *start = this;
+  // MultiQueue *cur   = start;
+  do {
+    MultiQueueItem *item = multiqueue_node_data(cur);
+    Event ev;
+    if (item->link) {
+      assert(!this->parent);
+      // get the next node in the linked queue
+      MultiQueue *linked = item->data.queue;
+      assert(!multiqueue_empty(linked));
+      MultiQueueItem *child =
+        multiqueue_node_data(QUEUE_HEAD(&linked->headtail));
+      ev = child->data.item.event;
+    } else {
+      ev = item->data.item.event;
+    }
+
+    // Event event = multiqueue_get(this);
+    // if (event.handler) {
+    //   event.handler(event.argv);
+    // }
+
+    ILOG("ev: priority=%d, handler=%p arg1=%s", ev.priority, ev.handler,
+         ev.argv ? ev.argv[0] : "(null)");
+
+    cur = cur->next;
+  } while (cur && cur != start);
+}
+
 /// Removes all events without processing them.
 void multiqueue_purge_events(MultiQueue *this)
 {
diff --git a/src/nvim/memory.c b/src/nvim/memory.c
index 0ee4776581..74c58fb203 100644
--- a/src/nvim/memory.c
+++ b/src/nvim/memory.c
@@ -345,10 +345,6 @@ char *xstpcpy(char *restrict dst, const char *restrict src)
 /// WARNING: xstpncpy will ALWAYS write maxlen bytes. If src is shorter than
 /// maxlen, zeroes will be written to the remaining bytes.
 ///
-/// TODO(aktau): I don't see a good reason to have this last behaviour, and
-/// it is potentially wasteful. Could we perhaps deviate from the standard
-/// and not zero the rest of the buffer?
-///
 /// @param dst
 /// @param src
 /// @param maxlen
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
index 59594357de..799e6eadef 100644
--- a/src/nvim/msgpack_rpc/channel.c
+++ b/src/nvim/msgpack_rpc/channel.c
@@ -28,7 +28,9 @@
 #include "nvim/map.h"
 #include "nvim/log.h"
 #include "nvim/misc1.h"
+#include "nvim/state.h"
 #include "nvim/lib/kvec.h"
+#include "nvim/os/input.h"
 
 #define CHANNEL_BUFFER_SIZE 0xffff
 
@@ -433,6 +435,14 @@ static void handle_request(Channel *channel, msgpack_object *request)
     handler.async = true;
   }
 
+  if (handler.async) {
+    char buf[256] = { 0 };
+    memcpy(buf, method->via.bin.ptr, MIN(255, method->via.bin.size));
+    if (strcmp("nvim_get_mode", buf) == 0) {
+      handler.async = input_blocking();
+    }
+  }
+
   RequestEvent *event_data = xmalloc(sizeof(RequestEvent));
   event_data->channel = channel;
   event_data->handler = handler;
diff --git a/src/nvim/msgpack_rpc/helpers.c b/src/nvim/msgpack_rpc/helpers.c
index 0228582d37..91ef5524ea 100644
--- a/src/nvim/msgpack_rpc/helpers.c
+++ b/src/nvim/msgpack_rpc/helpers.c
@@ -76,7 +76,7 @@ typedef struct {
   size_t idx;
 } MPToAPIObjectStackItem;
 
-/// Convert type used by msgpack parser to Neovim own API type
+/// Convert type used by msgpack parser to Nvim API type.
 ///
 /// @param[in]  obj  Msgpack value to convert.
 /// @param[out]  arg  Location where result of conversion will be saved.
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 51da9429b6..09ad7beb4b 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -14,6 +14,7 @@
 #include <stdlib.h>
 
 #include "nvim/vim.h"
+#include "nvim/log.h"
 #include "nvim/ascii.h"
 #include "nvim/normal.h"
 #include "nvim/buffer.h"
@@ -541,7 +542,7 @@ static bool normal_handle_special_visual_command(NormalState *s)
   return false;
 }
 
-static bool normal_need_aditional_char(NormalState *s)
+static bool normal_need_additional_char(NormalState *s)
 {
   int flags = nv_cmds[s->idx].cmd_flags;
   bool pending_op = s->oa.op_type != OP_NOP;
@@ -1083,7 +1084,7 @@ static int normal_execute(VimState *state, int key)
   }
 
   // Get an additional character if we need one.
-  if (normal_need_aditional_char(s)) {
+  if (normal_need_additional_char(s)) {
     normal_get_additional_char(s);
   }
 
diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c
index 7b5e14dd19..26f2be6c02 100644
--- a/src/nvim/os/input.c
+++ b/src/nvim/os/input.c
@@ -23,6 +23,7 @@
 #include "nvim/main.h"
 #include "nvim/misc1.h"
 #include "nvim/state.h"
+#include "nvim/log.h"
 
 #define READ_BUFFER_SIZE 0xfff
 #define INPUT_BUFFER_SIZE (READ_BUFFER_SIZE * 4)
@@ -38,6 +39,7 @@ static RBuffer *input_buffer = NULL;
 static bool input_eof = false;
 static int global_fd = 0;
 static int events_enabled = 0;
+static bool blocking = false;
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "os/input.c.generated.h"
@@ -327,13 +329,27 @@ static unsigned int handle_mouse_event(char **ptr, uint8_t *buf,
   return bufsize;
 }
 
+/// @return true if the main loop is blocked and waiting for input.
+bool input_blocking(void)
+{
+  return blocking;
+}
+
 static bool input_poll(int ms)
 {
   if (do_profiling == PROF_YES && ms) {
     prof_inchar_enter();
   }
 
+  if ((ms == - 1 || ms > 0)
+      && !(events_enabled || input_ready() || input_eof)
+      ) {
+    blocking = true;
+    multiqueue_process_debug(main_loop.events);
+    multiqueue_process_events(main_loop.events);
+  }
   LOOP_PROCESS_EVENTS_UNTIL(&main_loop, NULL, ms, input_ready() || input_eof);
+  blocking = false;
 
   if (do_profiling == PROF_YES && ms) {
     prof_inchar_exit();
diff --git a/src/nvim/state.c b/src/nvim/state.c
index 210708c3f4..be6aa21664 100644
--- a/src/nvim/state.c
+++ b/src/nvim/state.c
@@ -98,3 +98,52 @@ int get_real_state(void)
   return State;
 }
 
+/// @returns[allocated] mode string
+char *get_mode(void)
+{
+  char *buf = xcalloc(3, sizeof(char));
+
+  if (VIsual_active) {
+    if (VIsual_select) {
+      buf[0] = (char)(VIsual_mode + 's' - 'v');
+    } else {
+      buf[0] = (char)VIsual_mode;
+    }
+  } else if (State == HITRETURN || State == ASKMORE || State == SETWSIZE
+             || State == CONFIRM) {
+    buf[0] = 'r';
+    if (State == ASKMORE) {
+      buf[1] = 'm';
+    } else if (State == CONFIRM) {
+      buf[1] = '?';
+    }
+  } else if (State == EXTERNCMD) {
+    buf[0] = '!';
+  } else if (State & INSERT) {
+    if (State & VREPLACE_FLAG) {
+      buf[0] = 'R';
+      buf[1] = 'v';
+    } else if (State & REPLACE_FLAG) {
+      buf[0] = 'R';
+    } else {
+      buf[0] = 'i';
+    }
+  } else if (State & CMDLINE) {
+    buf[0] = 'c';
+    if (exmode_active) {
+      buf[1] = 'v';
+    }
+  } else if (exmode_active) {
+    buf[0] = 'c';
+    buf[1] = 'e';
+  } else if (State & TERM_FOCUS) {
+    buf[0] = 't';
+  } else {
+    buf[0] = 'n';
+    if (finish_op) {
+      buf[1] = 'o';
+    }
+  }
+
+  return buf;
+}
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index 21abc19c47..356221f7ce 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -74,9 +74,6 @@ typedef struct {
   bool out_isatty;
   SignalWatcher winch_handle, cont_handle;
   bool cont_received;
-  // Event scheduled by the ui bridge. Since the main thread suspends until
-  // the event is handled, it is fine to use a single field instead of a queue
-  Event scheduled_event;
   UGrid grid;
   kvec_t(Rect) invalid_regions;
   int out_fd;
diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index 5b173f3196..d06dd4c487 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -9,6 +9,7 @@ local funcs = helpers.funcs
 local request = helpers.request
 local meth_pcall = helpers.meth_pcall
 local command = helpers.command
+local wait = helpers.wait
 
 describe('api', function()
   before_each(clear)
@@ -221,6 +222,109 @@ describe('api', function()
     end)
   end)
 
+  local function appendfile(fname, text)
+    local file = io.open(fname, 'a')
+    file:write(text)
+    file:flush()
+    file:close()
+  end
+
+  describe('nvim_get_mode', function()
+    it("during normal-mode `g` returns blocking=true", function()
+      nvim("input", "o")                -- add a line
+      eq({mode='i', blocking=false}, nvim("get_mode"))
+      nvim("input", [[<C-\><C-N>]])
+      eq(2, nvim("eval", "line('.')"))
+      eq({mode='n', blocking=false}, nvim("get_mode"))
+
+      nvim("input", "g")
+      eq({mode='n', blocking=true}, nvim("get_mode"))
+
+      nvim("input", "k")                -- complete the operator
+      eq(1, nvim("eval", "line('.')"))  -- verify the completed operator
+      eq({mode='n', blocking=false}, nvim("get_mode"))
+    end)
+
+    it("returns the correct result multiple consecutive times", function()
+      for _ = 1,5 do
+        eq({mode='n', blocking=false}, nvim("get_mode"))
+      end
+      nvim("input", "g")
+      for _ = 1,4 do
+        eq({mode='n', blocking=true}, nvim("get_mode"))
+      end
+      nvim("input", "g")
+      for _ = 1,7 do
+        eq({mode='n', blocking=false}, nvim("get_mode"))
+      end
+    end)
+
+    it("during normal-mode CTRL-W, returns blocking=true", function()
+      nvim("input", "<C-W>")
+      eq({mode='n', blocking=true}, nvim("get_mode"))
+
+      nvim("input", "s")                  -- complete the operator
+      eq(2, nvim("eval", "winnr('$')"))   -- verify the completed operator
+      eq({mode='n', blocking=false}, nvim("get_mode"))
+    end)
+
+    it("during press-enter prompt returns blocking=true", function()
+      eq({mode='n', blocking=false}, nvim("get_mode"))
+      command("echom 'msg1'")
+      command("echom 'msg2'")
+      command("echom 'msg3'")
+      command("echom 'msg4'")
+      command("echom 'msg5'")
+      eq({mode='n', blocking=false}, nvim("get_mode"))
+      nvim("input", ":messages<CR>")
+      eq({mode='r', blocking=true}, nvim("get_mode"))
+    end)
+
+    it("during getchar() returns blocking=false", function()
+      nvim("input", ":let g:test_input = nr2char(getchar())<CR>")
+      -- Events are enabled during getchar(), RPC calls are *not* blocked. #5384
+      eq({mode='n', blocking=false}, nvim("get_mode"))
+      eq(0, nvim("eval", "exists('g:test_input')"))
+      nvim("input", "J")
+      eq("J", nvim("eval", "g:test_input"))
+      eq({mode='n', blocking=false}, nvim("get_mode"))
+    end)
+
+    -- TODO: bug #6247#issuecomment-286403810
+    it("batched with input", function()
+      eq({mode='n', blocking=false}, nvim("get_mode"))
+      command("echom 'msg1'")
+      command("echom 'msg2'")
+      command("echom 'msg3'")
+      command("echom 'msg4'")
+      command("echom 'msg5'")
+
+      local req = {
+        {'nvim_get_mode', {}},
+        {'nvim_input',    {':messages<CR>'}},
+        {'nvim_get_mode', {}},
+        {'nvim_eval',     {'1'}},
+      }
+      eq({{{mode='n', blocking=false},
+          13,
+          {mode='n', blocking=false},  -- TODO: should be blocked=true
+          1},
+        NIL}, meths.call_atomic(req))
+      eq({mode='r', blocking=true}, nvim("get_mode"))
+    end)
+    -- TODO: bug #6166
+    it("during insert-mode map-pending, returns blocking=true #6166", function()
+      command("inoremap xx foo")
+      nvim("input", "ix")
+      eq({mode='i', blocking=true}, nvim("get_mode"))
+    end)
+    -- TODO: bug #6166
+    it("during normal-mode gU, returns blocking=false #6166", function()
+      nvim("input", "gu")
+      eq({mode='no', blocking=false}, nvim("get_mode"))
+    end)
+  end)
+
   describe('nvim_replace_termcodes', function()
     it('escapes K_SPECIAL as K_SPECIAL KS_SPECIAL KE_FILLER', function()
       eq('\128\254X', helpers.nvim('replace_termcodes', '\128', true, true, true))
@@ -459,7 +563,7 @@ describe('api', function()
     eq(very_long_name, err:match('Ax+Z?'))
   end)
 
-  it("doesn't leak memory on incorrect argument types", function()
+  it("does not leak memory on incorrect argument types", function()
     local status, err = pcall(nvim, 'set_current_dir',{'not', 'a', 'dir'})
     eq(false, status)
     ok(err:match(': Wrong type for argument 1, expecting String') ~= nil)
diff --git a/test/functional/helpers.lua b/test/functional/helpers.lua
index 0f30910450..2919165280 100644
--- a/test/functional/helpers.lua
+++ b/test/functional/helpers.lua
@@ -385,9 +385,9 @@ local function curbuf(method, ...)
 end
 
 local function wait()
-  -- Execute 'vim_eval' (a deferred function) to block
+  -- Execute 'nvim_eval' (a deferred function) to block
   -- until all pending input is processed.
-  session:request('vim_eval', '1')
+  session:request('nvim_eval', '1')
 end
 
 -- sleeps the test runner (_not_ the nvim instance)

From acfd2a2a29ae852ecc965ca888eb5049400bf39d Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 14 Mar 2017 00:44:03 +0100
Subject: [PATCH 176/257] input.c: Process only safe events before blocking.

Introduce multiqueue_process_priority() to process only events at or
above a certain priority.
---
 src/nvim/api/vim.c               |   1 -
 src/nvim/event/defs.h            |   5 ++
 src/nvim/event/multiqueue.c      | 105 ++++++++++++++++---------------
 src/nvim/event/multiqueue.h      |   2 +-
 src/nvim/msgpack_rpc/channel.c   |  32 +++++-----
 src/nvim/os/input.c              |  10 +--
 test/functional/api/vim_spec.lua |   8 ---
 7 files changed, 84 insertions(+), 79 deletions(-)

diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index 7c57a5b456..a00afc24fa 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -714,7 +714,6 @@ Dictionary nvim_get_mode(void)
   Dictionary rv = ARRAY_DICT_INIT;
   char *modestr = get_mode();
   bool blocked = input_blocking();
-  ILOG("blocked=%d", blocked);
 
   PUT(rv, "mode", STRING_OBJ(cstr_as_string(modestr)));
   PUT(rv, "blocking", BOOLEAN_OBJ(blocked));
diff --git a/src/nvim/event/defs.h b/src/nvim/event/defs.h
index e5335d9f25..509a3f8e7f 100644
--- a/src/nvim/event/defs.h
+++ b/src/nvim/event/defs.h
@@ -6,6 +6,11 @@
 
 #define EVENT_HANDLER_MAX_ARGC 6
 
+typedef enum {
+  kEvPriorityNormal = 1,
+  kEvPriorityAsync  = 2,   // safe to run in any state
+} EventPriority;
+
 typedef void (*argv_callback)(void **argv);
 typedef struct message {
   int priority;
diff --git a/src/nvim/event/multiqueue.c b/src/nvim/event/multiqueue.c
index b144347fdb..a479a032f4 100644
--- a/src/nvim/event/multiqueue.c
+++ b/src/nvim/event/multiqueue.c
@@ -127,6 +127,7 @@ void multiqueue_free(MultiQueue *this)
   xfree(this);
 }
 
+/// Removes the next item and returns its Event.
 Event multiqueue_get(MultiQueue *this)
 {
   return multiqueue_empty(this) ? NILEVENT : multiqueue_remove(this);
@@ -145,45 +146,38 @@ void multiqueue_process_events(MultiQueue *this)
 {
   assert(this);
   while (!multiqueue_empty(this)) {
-    Event event = multiqueue_get(this);
+    Event event = multiqueue_remove(this);
     if (event.handler) {
       event.handler(event.argv);
     }
   }
 }
 
-void multiqueue_process_debug(MultiQueue *this)
+void multiqueue_process_priority(MultiQueue *this, int priority)
 {
   assert(this);
   QUEUE *start = QUEUE_HEAD(&this->headtail);
-  QUEUE *cur   = start;
-  // MultiQueue *start = this;
-  // MultiQueue *cur   = start;
-  do {
+  QUEUE *cur = start;
+  while (!multiqueue_empty(this)) {
     MultiQueueItem *item = multiqueue_node_data(cur);
-    Event ev;
-    if (item->link) {
-      assert(!this->parent);
-      // get the next node in the linked queue
-      MultiQueue *linked = item->data.queue;
-      assert(!multiqueue_empty(linked));
-      MultiQueueItem *child =
-        multiqueue_node_data(QUEUE_HEAD(&linked->headtail));
-      ev = child->data.item.event;
+    assert(!item->link || !this->parent);  // Only a parent queue has link-nodes
+    Event ev = multiqueueitem_get_event(item, false);
+
+    if (ev.priority >= priority) {
+      if (ev.handler) {
+        ev.handler(ev.argv);
+      }
+      // Processed. Remove this item and get the new head.
+      (void)multiqueue_remove(this);
+      cur = QUEUE_HEAD(&this->headtail);
     } else {
-      ev = item->data.item.event;
+      // Not processed. Skip this item and get the next one.
+      cur = cur->next->next;
+      if (!cur || cur == start) {
+        break;
+      }
     }
-
-    // Event event = multiqueue_get(this);
-    // if (event.handler) {
-    //   event.handler(event.argv);
-    // }
-
-    ILOG("ev: priority=%d, handler=%p arg1=%s", ev.priority, ev.handler,
-         ev.argv ? ev.argv[0] : "(null)");
-
-    cur = cur->next;
-  } while (cur && cur != start);
+  }
 }
 
 /// Removes all events without processing them.
@@ -213,36 +207,48 @@ size_t multiqueue_size(MultiQueue *this)
   return this->size;
 }
 
+/// Gets an Event from an item.
+///
+/// @param remove   Remove the node from its queue, and free it.
+static Event multiqueueitem_get_event(MultiQueueItem *item, bool remove)
+{
+  assert(item != NULL);
+  Event ev;
+  if (item->link) {
+    // get the next node in the linked queue
+    MultiQueue *linked = item->data.queue;
+    assert(!multiqueue_empty(linked));
+    MultiQueueItem *child =
+      multiqueue_node_data(QUEUE_HEAD(&linked->headtail));
+    ev = child->data.item.event;
+    // remove the child node
+    if (remove) {
+      QUEUE_REMOVE(&child->node);
+      xfree(child);
+    }
+  } else {
+    // remove the corresponding link node in the parent queue
+    if (remove && item->data.item.parent_item) {
+      QUEUE_REMOVE(&item->data.item.parent_item->node);
+      xfree(item->data.item.parent_item);
+      item->data.item.parent_item = NULL;
+    }
+    ev = item->data.item.event;
+  }
+  return ev;
+}
+
 static Event multiqueue_remove(MultiQueue *this)
 {
   assert(!multiqueue_empty(this));
   QUEUE *h = QUEUE_HEAD(&this->headtail);
   QUEUE_REMOVE(h);
   MultiQueueItem *item = multiqueue_node_data(h);
-  Event rv;
-
-  if (item->link) {
-    assert(!this->parent);
-    // remove the next node in the linked queue
-    MultiQueue *linked = item->data.queue;
-    assert(!multiqueue_empty(linked));
-    MultiQueueItem *child =
-      multiqueue_node_data(QUEUE_HEAD(&linked->headtail));
-    QUEUE_REMOVE(&child->node);
-    rv = child->data.item.event;
-    xfree(child);
-  } else {
-    if (this->parent) {
-      // remove the corresponding link node in the parent queue
-      QUEUE_REMOVE(&item->data.item.parent_item->node);
-      xfree(item->data.item.parent_item);
-    }
-    rv = item->data.item.event;
-  }
-
+  assert(!item->link || !this->parent);  // Only a parent queue has link-nodes
+  Event ev = multiqueueitem_get_event(item, true);
   this->size--;
   xfree(item);
-  return rv;
+  return ev;
 }
 
 static void multiqueue_push(MultiQueue *this, Event event)
@@ -250,6 +256,7 @@ static void multiqueue_push(MultiQueue *this, Event event)
   MultiQueueItem *item = xmalloc(sizeof(MultiQueueItem));
   item->link = false;
   item->data.item.event = event;
+  item->data.item.parent_item = NULL;
   QUEUE_INSERT_TAIL(&this->headtail, &item->node);
   if (this->parent) {
     // push link node to the parent queue
diff --git a/src/nvim/event/multiqueue.h b/src/nvim/event/multiqueue.h
index def6b95a10..72145482aa 100644
--- a/src/nvim/event/multiqueue.h
+++ b/src/nvim/event/multiqueue.h
@@ -10,7 +10,7 @@ typedef struct multiqueue MultiQueue;
 typedef void (*put_callback)(MultiQueue *multiq, void *data);
 
 #define multiqueue_put(q, h, ...) \
-  multiqueue_put_event(q, event_create(1, h, __VA_ARGS__));
+  multiqueue_put_event(q, event_create(kEvPriorityNormal, h, __VA_ARGS__));
 
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
index 799e6eadef..9e43924db1 100644
--- a/src/nvim/msgpack_rpc/channel.c
+++ b/src/nvim/msgpack_rpc/channel.c
@@ -435,24 +435,26 @@ static void handle_request(Channel *channel, msgpack_object *request)
     handler.async = true;
   }
 
-  if (handler.async) {
-    char buf[256] = { 0 };
-    memcpy(buf, method->via.bin.ptr, MIN(255, method->via.bin.size));
-    if (strcmp("nvim_get_mode", buf) == 0) {
-      handler.async = input_blocking();
-    }
-  }
-
-  RequestEvent *event_data = xmalloc(sizeof(RequestEvent));
-  event_data->channel = channel;
-  event_data->handler = handler;
-  event_data->args = args;
-  event_data->request_id = request_id;
+  RequestEvent *evdata = xmalloc(sizeof(RequestEvent));
+  evdata->channel = channel;
+  evdata->handler = handler;
+  evdata->args = args;
+  evdata->request_id = request_id;
   incref(channel);
   if (handler.async) {
-    on_request_event((void **)&event_data);
+    bool is_get_mode = sizeof("nvim_get_mode") - 1 == method->via.bin.size
+      && !strncmp("nvim_get_mode", method->via.bin.ptr, method->via.bin.size);
+
+    if (is_get_mode && !input_blocking()) {
+      // Schedule on the main loop with special priority. #6247
+      Event ev = event_create(kEvPriorityAsync, on_request_event, 1, evdata);
+      multiqueue_put_event(channel->events, ev);
+    } else {
+      // Invoke immediately.
+      on_request_event((void **)&evdata);
+    }
   } else {
-    multiqueue_put(channel->events, on_request_event, 1, event_data);
+    multiqueue_put(channel->events, on_request_event, 1, evdata);
   }
 }
 
diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c
index 26f2be6c02..de6d4a9010 100644
--- a/src/nvim/os/input.c
+++ b/src/nvim/os/input.c
@@ -341,12 +341,12 @@ static bool input_poll(int ms)
     prof_inchar_enter();
   }
 
-  if ((ms == - 1 || ms > 0)
-      && !(events_enabled || input_ready() || input_eof)
-      ) {
+  if ((ms == - 1 || ms > 0) && !events_enabled && !input_eof) {
+    // We have discovered that the pending input will provoke a blocking wait.
+    // Process any events marked with priority `kEvPriorityAsync`: these events
+    // must be handled after flushing input. See channel.c:handle_request #6247
     blocking = true;
-    multiqueue_process_debug(main_loop.events);
-    multiqueue_process_events(main_loop.events);
+    multiqueue_process_priority(main_loop.events, kEvPriorityAsync);
   }
   LOOP_PROCESS_EVENTS_UNTIL(&main_loop, NULL, ms, input_ready() || input_eof);
   blocking = false;
diff --git a/test/functional/api/vim_spec.lua b/test/functional/api/vim_spec.lua
index d06dd4c487..7c79d8832f 100644
--- a/test/functional/api/vim_spec.lua
+++ b/test/functional/api/vim_spec.lua
@@ -9,7 +9,6 @@ local funcs = helpers.funcs
 local request = helpers.request
 local meth_pcall = helpers.meth_pcall
 local command = helpers.command
-local wait = helpers.wait
 
 describe('api', function()
   before_each(clear)
@@ -222,13 +221,6 @@ describe('api', function()
     end)
   end)
 
-  local function appendfile(fname, text)
-    local file = io.open(fname, 'a')
-    file:write(text)
-    file:flush()
-    file:close()
-  end
-
   describe('nvim_get_mode', function()
     it("during normal-mode `g` returns blocking=true", function()
       nvim("input", "o")                -- add a line

From f17a8185191b778960953508a5bf9b5f95b0560c Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 27 Apr 2017 13:54:54 +0200
Subject: [PATCH 177/257] api/nvim_get_mode: Use child-queue instead of
 "priority".

---
 src/nvim/api/vim.c             | 1 -
 src/nvim/event/multiqueue.c    | 1 -
 src/nvim/msgpack_rpc/channel.c | 7 +++----
 src/nvim/msgpack_rpc/channel.h | 5 +++++
 src/nvim/normal.c              | 1 -
 src/nvim/os/input.c            | 8 +++-----
 6 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/nvim/api/vim.c b/src/nvim/api/vim.c
index a00afc24fa..11f15b5ad1 100644
--- a/src/nvim/api/vim.c
+++ b/src/nvim/api/vim.c
@@ -11,7 +11,6 @@
 
 #include "nvim/api/vim.h"
 #include "nvim/ascii.h"
-#include "nvim/log.h"
 #include "nvim/api/private/helpers.h"
 #include "nvim/api/private/defs.h"
 #include "nvim/api/buffer.h"
diff --git a/src/nvim/event/multiqueue.c b/src/nvim/event/multiqueue.c
index a479a032f4..66a261b554 100644
--- a/src/nvim/event/multiqueue.c
+++ b/src/nvim/event/multiqueue.c
@@ -55,7 +55,6 @@
 
 #include "nvim/event/multiqueue.h"
 #include "nvim/memory.h"
-#include "nvim/log.h"
 #include "nvim/os/time.h"
 
 typedef struct multiqueue_item MultiQueueItem;
diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
index 9e43924db1..911f2a6fa4 100644
--- a/src/nvim/msgpack_rpc/channel.c
+++ b/src/nvim/msgpack_rpc/channel.c
@@ -28,7 +28,6 @@
 #include "nvim/map.h"
 #include "nvim/log.h"
 #include "nvim/misc1.h"
-#include "nvim/state.h"
 #include "nvim/lib/kvec.h"
 #include "nvim/os/input.h"
 
@@ -91,6 +90,7 @@ static msgpack_sbuffer out_buffer;
 /// Initializes the module
 void channel_init(void)
 {
+  ch_before_blocking_events = multiqueue_new_child(main_loop.events);
   channels = pmap_new(uint64_t)();
   event_strings = pmap_new(cstr_t)();
   msgpack_sbuffer_init(&out_buffer);
@@ -446,9 +446,8 @@ static void handle_request(Channel *channel, msgpack_object *request)
       && !strncmp("nvim_get_mode", method->via.bin.ptr, method->via.bin.size);
 
     if (is_get_mode && !input_blocking()) {
-      // Schedule on the main loop with special priority. #6247
-      Event ev = event_create(kEvPriorityAsync, on_request_event, 1, evdata);
-      multiqueue_put_event(channel->events, ev);
+      // Defer the event to a special queue used by os/input.c. #6247
+      multiqueue_put(ch_before_blocking_events, on_request_event, 1, evdata);
     } else {
       // Invoke immediately.
       on_request_event((void **)&evdata);
diff --git a/src/nvim/msgpack_rpc/channel.h b/src/nvim/msgpack_rpc/channel.h
index 0d92976d02..f8fe6f129b 100644
--- a/src/nvim/msgpack_rpc/channel.h
+++ b/src/nvim/msgpack_rpc/channel.h
@@ -11,6 +11,11 @@
 
 #define METHOD_MAXLEN 512
 
+/// HACK: os/input.c drains this queue immediately before blocking for input.
+///       Events on this queue are async-safe, but they need the resolved state
+///       of os_inchar(), so they are processed "just-in-time".
+MultiQueue *ch_before_blocking_events;
+
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "msgpack_rpc/channel.h.generated.h"
 #endif
diff --git a/src/nvim/normal.c b/src/nvim/normal.c
index 09ad7beb4b..f73e3079b9 100644
--- a/src/nvim/normal.c
+++ b/src/nvim/normal.c
@@ -14,7 +14,6 @@
 #include <stdlib.h>
 
 #include "nvim/vim.h"
-#include "nvim/log.h"
 #include "nvim/ascii.h"
 #include "nvim/normal.h"
 #include "nvim/buffer.h"
diff --git a/src/nvim/os/input.c b/src/nvim/os/input.c
index de6d4a9010..31e06ce404 100644
--- a/src/nvim/os/input.c
+++ b/src/nvim/os/input.c
@@ -23,7 +23,7 @@
 #include "nvim/main.h"
 #include "nvim/misc1.h"
 #include "nvim/state.h"
-#include "nvim/log.h"
+#include "nvim/msgpack_rpc/channel.h"
 
 #define READ_BUFFER_SIZE 0xfff
 #define INPUT_BUFFER_SIZE (READ_BUFFER_SIZE * 4)
@@ -342,11 +342,9 @@ static bool input_poll(int ms)
   }
 
   if ((ms == - 1 || ms > 0) && !events_enabled && !input_eof) {
-    // We have discovered that the pending input will provoke a blocking wait.
-    // Process any events marked with priority `kEvPriorityAsync`: these events
-    // must be handled after flushing input. See channel.c:handle_request #6247
+    // The pending input provoked a blocking wait. Do special events now. #6247
     blocking = true;
-    multiqueue_process_priority(main_loop.events, kEvPriorityAsync);
+    multiqueue_process_events(ch_before_blocking_events);
   }
   LOOP_PROCESS_EVENTS_UNTIL(&main_loop, NULL, ms, input_ready() || input_eof);
   blocking = false;

From 8f59d1483934f91011b755406251136c406e77f6 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Thu, 27 Apr 2017 14:38:41 +0200
Subject: [PATCH 178/257] event: Remove "priority" concept.

It was replaced by the "child queue" concept (MultiQueue).
---
 src/nvim/event/defs.h       | 13 +++----------
 src/nvim/event/multiqueue.c | 27 ---------------------------
 src/nvim/event/multiqueue.h |  2 +-
 src/nvim/message.c          |  2 +-
 src/nvim/tui/input.c        |  4 ++--
 src/nvim/tui/tui.c          |  2 +-
 src/nvim/ui.c               |  2 +-
 src/nvim/ui_bridge.c        |  4 ++--
 8 files changed, 11 insertions(+), 45 deletions(-)

diff --git a/src/nvim/event/defs.h b/src/nvim/event/defs.h
index 509a3f8e7f..cc875d74b9 100644
--- a/src/nvim/event/defs.h
+++ b/src/nvim/event/defs.h
@@ -6,23 +6,16 @@
 
 #define EVENT_HANDLER_MAX_ARGC 6
 
-typedef enum {
-  kEvPriorityNormal = 1,
-  kEvPriorityAsync  = 2,   // safe to run in any state
-} EventPriority;
-
 typedef void (*argv_callback)(void **argv);
 typedef struct message {
-  int priority;
   argv_callback handler;
   void *argv[EVENT_HANDLER_MAX_ARGC];
 } Event;
 typedef void(*event_scheduler)(Event event, void *data);
 
-#define VA_EVENT_INIT(event, p, h, a) \
+#define VA_EVENT_INIT(event, h, a) \
   do { \
     assert(a <= EVENT_HANDLER_MAX_ARGC); \
-    (event)->priority = p; \
     (event)->handler = h; \
     if (a) { \
       va_list args; \
@@ -34,11 +27,11 @@ typedef void(*event_scheduler)(Event event, void *data);
     } \
   } while (0)
 
-static inline Event event_create(int priority, argv_callback cb, int argc, ...)
+static inline Event event_create(argv_callback cb, int argc, ...)
 {
   assert(argc <= EVENT_HANDLER_MAX_ARGC);
   Event event;
-  VA_EVENT_INIT(&event, priority, cb, argc);
+  VA_EVENT_INIT(&event, cb, argc);
   return event;
 }
 
diff --git a/src/nvim/event/multiqueue.c b/src/nvim/event/multiqueue.c
index 66a261b554..ef9f3f1870 100644
--- a/src/nvim/event/multiqueue.c
+++ b/src/nvim/event/multiqueue.c
@@ -152,33 +152,6 @@ void multiqueue_process_events(MultiQueue *this)
   }
 }
 
-void multiqueue_process_priority(MultiQueue *this, int priority)
-{
-  assert(this);
-  QUEUE *start = QUEUE_HEAD(&this->headtail);
-  QUEUE *cur = start;
-  while (!multiqueue_empty(this)) {
-    MultiQueueItem *item = multiqueue_node_data(cur);
-    assert(!item->link || !this->parent);  // Only a parent queue has link-nodes
-    Event ev = multiqueueitem_get_event(item, false);
-
-    if (ev.priority >= priority) {
-      if (ev.handler) {
-        ev.handler(ev.argv);
-      }
-      // Processed. Remove this item and get the new head.
-      (void)multiqueue_remove(this);
-      cur = QUEUE_HEAD(&this->headtail);
-    } else {
-      // Not processed. Skip this item and get the next one.
-      cur = cur->next->next;
-      if (!cur || cur == start) {
-        break;
-      }
-    }
-  }
-}
-
 /// Removes all events without processing them.
 void multiqueue_purge_events(MultiQueue *this)
 {
diff --git a/src/nvim/event/multiqueue.h b/src/nvim/event/multiqueue.h
index 72145482aa..a688107665 100644
--- a/src/nvim/event/multiqueue.h
+++ b/src/nvim/event/multiqueue.h
@@ -10,7 +10,7 @@ typedef struct multiqueue MultiQueue;
 typedef void (*put_callback)(MultiQueue *multiq, void *data);
 
 #define multiqueue_put(q, h, ...) \
-  multiqueue_put_event(q, event_create(kEvPriorityNormal, h, __VA_ARGS__));
+  multiqueue_put_event(q, event_create(h, __VA_ARGS__));
 
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
diff --git a/src/nvim/message.c b/src/nvim/message.c
index 146937c25a..696855e3aa 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -604,7 +604,7 @@ void msg_schedule_emsgf(const char *const fmt, ...)
   va_end(ap);
 
   char *s = xstrdup((char *)IObuff);
-  loop_schedule(&main_loop, event_create(1, msg_emsgf_event, 1, s));
+  loop_schedule(&main_loop, event_create(msg_emsgf_event, 1, s));
 }
 
 /*
diff --git a/src/nvim/tui/input.c b/src/nvim/tui/input.c
index b86ab8cf2f..3d37fabeee 100644
--- a/src/nvim/tui/input.c
+++ b/src/nvim/tui/input.c
@@ -102,7 +102,7 @@ static void flush_input(TermInput *input, bool wait_until_empty)
   size_t drain_boundary = wait_until_empty ? 0 : 0xff;
   do {
     uv_mutex_lock(&input->key_buffer_mutex);
-    loop_schedule(&main_loop, event_create(1, wait_input_enqueue, 1, input));
+    loop_schedule(&main_loop, event_create(wait_input_enqueue, 1, input));
     input->waiting = true;
     while (input->waiting) {
       uv_cond_wait(&input->key_buffer_cond, &input->key_buffer_mutex);
@@ -352,7 +352,7 @@ static void read_cb(Stream *stream, RBuffer *buf, size_t c, void *data,
       stream_close(&input->read_stream, NULL, NULL);
       multiqueue_put(input->loop->fast_events, restart_reading, 1, input);
     } else {
-      loop_schedule(&main_loop, event_create(1, input_done_event, 0));
+      loop_schedule(&main_loop, event_create(input_done_event, 0));
     }
     return;
   }
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index 356221f7ce..5653924154 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -773,7 +773,7 @@ static void tui_suspend(UI *ui)
   // before continuing. This is done in another callback to avoid
   // loop_poll_events recursion
   multiqueue_put_event(data->loop->fast_events,
-                       event_create(1, suspend_event, 1, ui));
+                       event_create(suspend_event, 1, ui));
 }
 
 static void tui_set_title(UI *ui, char *title)
diff --git a/src/nvim/ui.c b/src/nvim/ui.c
index 713dffb46c..924a4192bc 100644
--- a/src/nvim/ui.c
+++ b/src/nvim/ui.c
@@ -198,7 +198,7 @@ static void ui_refresh_event(void **argv)
 
 void ui_schedule_refresh(void)
 {
-  loop_schedule(&main_loop, event_create(1, ui_refresh_event, 0));
+  loop_schedule(&main_loop, event_create(ui_refresh_event, 0));
 }
 
 void ui_resize(int new_width, int new_height)
diff --git a/src/nvim/ui_bridge.c b/src/nvim/ui_bridge.c
index b7b12ae39e..d790770892 100644
--- a/src/nvim/ui_bridge.c
+++ b/src/nvim/ui_bridge.c
@@ -40,13 +40,13 @@ static argv_callback uilog_event = NULL;
       uilog_event = ui_bridge_##name##_event; \
     } \
     ((UIBridgeData *)ui)->scheduler( \
-        event_create(1, ui_bridge_##name##_event, argc, __VA_ARGS__), UI(ui)); \
+        event_create(ui_bridge_##name##_event, argc, __VA_ARGS__), UI(ui)); \
   } while (0)
 #else
 // Schedule a function call on the UI bridge thread.
 #define UI_CALL(ui, name, argc, ...) \
   ((UIBridgeData *)ui)->scheduler( \
-      event_create(1, ui_bridge_##name##_event, argc, __VA_ARGS__), UI(ui))
+      event_create(ui_bridge_##name##_event, argc, __VA_ARGS__), UI(ui))
 #endif
 
 #define INT2PTR(i) ((void *)(uintptr_t)i)

From 409e56b1392c431a36c0a48cac58d6df3cf424d7 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 20:42:06 +0200
Subject: [PATCH 179/257] vim-patch:818078ddfbb8

Updated runtime files and translations.

https://github.com/vim/vim/commit/818078ddfbb8cc2546f697c5675a251d095722ec
---
 runtime/doc/index.txt    |   4 +-
 runtime/doc/map.txt      |   7 +
 runtime/doc/starting.txt |   3 +
 runtime/doc/various.txt  |  25 ++++
 runtime/syntax/sh.vim    |   6 +-
 src/nvim/po/eo.po        | 295 ++++++++++++++++++++++++++++---------
 src/nvim/po/fr.po        | 309 ++++++++++++++++++++++++++++++---------
 7 files changed, 505 insertions(+), 144 deletions(-)

diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 0dc8fff975..7267a45d41 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -982,7 +982,7 @@ tag		command	      action in Command-line editing mode	~
 |c_CTRL-E|	CTRL-E		cursor to end of command-line
 |'cedit'|	CTRL-F		default value for 'cedit': opens the
 				command-line window; otherwise not used
-		CTRL-G		not used
+|c_CTRL-G|	CTRL-G		next match when 'incsearch' is active
 |c_<BS>|	<BS>		delete the character in front of the cursor
 |c_digraph|	{char1} <BS> {char2}
 				enter digraph when 'digraph' is on
@@ -1015,7 +1015,7 @@ tag		command	      action in Command-line editing mode	~
 				insert the contents of a register or object
 				under the cursor literally
 		CTRL-S		(used for terminal control flow)
-		CTRL-T		not used
+|c_CTRL-T|	CTRL-T		previous match when 'incsearch' is active
 |c_CTRL-U|	CTRL-U		remove all characters
 |c_CTRL-V|	CTRL-V		insert next non-digit literally, insert three
 				digit decimal number as a single byte.
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 3ba1ce1f17..25bd2d18ee 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -437,6 +437,9 @@ with a space.
 Note: When using mappings for Visual mode, you can use the "'<" mark, which
 is the start of the last selected Visual area in the current buffer |'<|.
 
+The |:filter| command can be used to select what mappings to list.  The
+pattern is matched against the {lhs} and {rhs} in the raw form.
+
 							*:map-verbose*
 When 'verbose' is non-zero, listing a key map will also display where it was
 last defined.  Example: >
@@ -1136,6 +1139,10 @@ scripts.
 			    "	Command has the -register attribute
 			    b	Command is local to current buffer
 			(see below for details on attributes)
+			The list can be filtered on command name with
+			|:filter|, e.g., to list all commands with "Pyth" in
+			the name: >
+				filter Pyth command
 
 :com[mand] {cmd}	List the user-defined commands that start with {cmd}
 
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 14e8c5d76f..c93c3d0741 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1184,6 +1184,9 @@ running) you have additional options:
 			file.  This list is read on startup and only changes
 			afterwards with ":rshada!".  Also see |v:oldfiles|.
 			The number can be used with |c_#<|.
+			The output can be filtered with |:filter|, e.g.: >
+				filter /\.vim/ oldfiles
+<			The filtering happens on the file name.
 
 :bro[wse] o[ldfiles][!]
 			List file names as with |:oldfiles|, and then prompt
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index fd81064d5b..cee13c9ee8 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -85,6 +85,8 @@ g8			Print the hex values of the bytes used in the
 			on paper see |:hardcopy|.  In the GUI you can use the
 			File.Print menu entry.
 			See |ex-flags| for [flags].
+			The |:filter| command can be used to only show lines
+			matching a pattern.
 
 :[range]p[rint] {count} [flags]
 			Print {count} lines, starting with [range] (default
@@ -461,6 +463,29 @@ m  *+xpm_w32*		Win32 GUI only: pixmap support |w32-xpm-support|
 
 :redi[r] END		End redirecting messages.
 
+							*:filt* *:filter*
+:filt[er][!] {pat} {command}
+:filt[er][!] /{pat}/ {command}
+			Restrict the output of {command} to lines matching
+			with {pat}.  For example, to list only xml files: >
+				:filter /\.xml$/ oldfiles
+<			If the [!] is given, restrict the output of {command}
+			to lines that do NOT match {pat}.
+
+			{pat} is a Vim search pattern.  Instead of enclosing
+			it in / any non-ID character (see |'isident'|) can be
+			used, so long as it does not appear in {pat}.  Without
+			the enclosing character the pattern cannot include the
+			bar character.
+
+			The pattern is matched against the relevant part of
+			the output, not necessarily the whole line. Only some
+			commands support filtering, try it out to check if it
+			works.
+
+			Only normal messages are filtered, error messages are
+			not.
+
 						*:sil* *:silent* *:silent!*
 :sil[ent][!] {command}	Execute {command} silently.  Normal messages will not
 			be given or added to the message history.
diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index 2fe13fbde6..ef90ebea22 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -2,8 +2,8 @@
 " Language:		shell (sh) Korn shell (ksh) bash (sh)
 " Maintainer:		Charles E. Campbell  <NdrOchipS@PcampbellAfamily.Mbiz>
 " Previous Maintainer:	Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change:		Aug 23, 2016
-" Version:		161
+" Last Change:		Aug 26, 2016
+" Version:		162
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
 " For options and settings, please use:      :help ft-sh-syntax
 " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr)
@@ -500,7 +500,7 @@ syn match  shDerefString	contained	"\\["']"	nextgroup=shDerefPattern
 if exists("b:is_bash")
  " bash : ${parameter:offset}
  " bash : ${parameter:offset:length}
- syn region shDerefOff	contained	start=':'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple,shDerefEscape	nextgroup=shDerefLen,shDeref,shDerefSimple
+ syn region shDerefOff	contained	start=':\ze[^-=?+]'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple,shDerefEscape	nextgroup=shDerefLen,shDeref,shDerefSimple
  syn region shDerefOff	contained	start=':\s-'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple,shDerefEscape	nextgroup=shDerefLen,shDeref,shDerefSimple
  syn match  shDerefLen	contained	":[^}]\+"	contains=shDeref,shDerefSimple
 
diff --git a/src/nvim/po/eo.po b/src/nvim/po/eo.po
index b7bc6397ef..10cab0342e 100644
--- a/src/nvim/po/eo.po
+++ b/src/nvim/po/eo.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Esperanto)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-02 16:21+0200\n"
-"PO-Revision-Date: 2016-07-02 17:05+0200\n"
+"POT-Creation-Date: 2016-08-26 20:54+0200\n"
+"PO-Revision-Date: 2016-08-26 20:30+0200\n"
 "Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: eo\n"
@@ -56,6 +56,9 @@ msgstr "E82: Ne eblas disponigi iun ajn bufron, nun eliras..."
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: Ne eblas disponigi bufron, nun uzas alian..."
 
+msgid "E931: Buffer cannot be registered"
+msgstr "E931: Bufro ne povas esti registrita"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: Neniu bufro estis malŝargita"
 
@@ -206,6 +209,33 @@ msgstr ""
 msgid "Signs for %s:"
 msgstr "Emfazaj simbolaĵoj de %s:"
 
+msgid "E901: gethostbyname() in channel_open()"
+msgstr "E901: gethostbyname() en channel_open()"
+
+msgid "E898: socket() in channel_open()"
+msgstr "E898: gethostbyname() en channel_open()"
+
+msgid "E903: received command with non-string argument"
+msgstr "E903: ricevis komandon kun argumento, kiu ne estas ĉeno"
+
+msgid "E904: last argument for expr/call must be a number"
+msgstr "E904: lasta argumento de \"expr/call\" devas esti nombro"
+
+msgid "E904: third argument for call must be a list"
+msgstr "E904: tria argumento de \"call\" devas esti listo"
+
+#, c-format
+msgid "E905: received unknown command: %s"
+msgstr "E905: nekonata komando ricevita: %s"
+
+#, c-format
+msgid "E630: %s(): write while not connected"
+msgstr "E630: %s(): konservo dum nekonektita"
+
+#, c-format
+msgid "E631: %s(): write failed"
+msgstr "E631: %s(): Konservo malsukcesis"
+
 #, c-format
 msgid "    line=%<PRId64>  id=%d  name=%s"
 msgstr "    linio=%<PRId64>  id=%d  nomo=%s"
@@ -432,10 +462,6 @@ msgstr "E719: Uzo de [:] ne eblas kun Vortaro"
 msgid "E734: Wrong variable type for %s="
 msgstr "E734: Nevalida datumtipo de variablo de %s="
 
-#, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: Nekonata funkcio: %s"
-
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: Nevalida nomo de variablo: %s"
@@ -474,10 +500,6 @@ msgstr "E711: Lista valoro ne havas sufiĉe da eroj"
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: \"in\" mankas post \":for\""
 
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: Mankas krampoj: %s"
-
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: Ne estas tia variablo: \"%s\""
@@ -534,59 +556,115 @@ msgstr "E114: Mankas citilo: %s"
 msgid "E115: Missing quote: %s"
 msgstr "E115: Mankas citilo: %s"
 
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: Mankas komo en Listo: %s"
-
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: Mankas fino de Listo ']': %s"
-
 msgid "Not enough memory to set references, garbage collection aborted!"
 msgstr "Ne sufiĉa memoro por valorigi referencojn, senrubigado ĉesigita!"
 
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: Mankas dupunkto en la vortaro: %s"
-
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Ripetita ŝlosilo en la vortaro: \"%s\""
-
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: Mankas komo en la vortaro: %s"
-
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: Mankas fino de vortaro '}': %s"
-
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: variablo ingita tro profunde por vidigi"
 
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: Tro da argumentoj por funkcio: %s"
+msgid "E805: Using a Float as a Number"
+msgstr "E805: Uzo de Glitpunktnombro kiel Nombro"
+
+msgid "E703: Using a Funcref as a Number"
+msgstr "E703: Uzo de Funcref kiel Nombro"
+
+msgid "E745: Using a List as a Number"
+msgstr "E745: Uzo de Listo kiel Nombro"
+
+msgid "E728: Using a Dictionary as a Number"
+msgstr "E728: Uzo de Vortaro kiel Nombro"
+
+msgid "E910: Using a Job as a Number"
+msgstr "E910: Uzo de Tasko kiel Nombro"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: Uzo de Kanalo kiel Nombro"
+
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: Uzo de Funcref kiel Glitpunktnombro"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: Uzo de Ĉeno kiel Glitpunktnombro"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: Uzo de Listo kiel Glitpunktnombro"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: Uzo de Vortaro kiel Glitpunktnombro"
+
+msgid "E907: Using a special value as a Float"
+msgstr "E907: Uzo de speciala valoro kiel Glitpunktnombro"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: Uzo de Tasko kiel Glitpunktnombro"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: Uzo de Kanalo kiel Glitpunktnombro"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: uzo de Funcref kiel Ĉeno"
+
+msgid "E730: using List as a String"
+msgstr "E730: uzo de Listo kiel Ĉeno"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: uzo de Vortaro kiel Ĉeno"
+
+msgid "E908: using an invalid value as a String"
+msgstr "E908: uzo de nevalida valoro kiel Ĉeno"
 
 #, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: Nevalidaj argumentoj por funkcio: %s"
+msgid "E795: Cannot delete variable %s"
+msgstr "E795: Ne eblas forviŝi variablon %s"
 
 #, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: Nekonata funkcio: %s"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: Nomo de variablo Funcref devas finiĝi per majusklo: %s"
 
 #, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: Ne sufiĉe da argumentoj por funkcio: %s"
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: Nomo de variablo konfliktas kun ekzistanta funkcio: %s"
 
 #, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: <SID> estas uzata ekster kunteksto de skripto: %s"
+msgid "E741: Value is locked: %s"
+msgstr "E741: Valoro estas ŝlosita: %s"
+
+msgid "Unknown"
+msgstr "Nekonata"
 
 #, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: Alvoko de funkcio dict sen Vortaro: %s"
+msgid "E742: Cannot change value of %s"
+msgstr "E742: Ne eblas ŝanĝi valoron de %s"
+
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: variablo ingita tro profunde por fari kopion"
+
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"# mallokaj variabloj:\n"
+
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\tLaste ŝaltita de "
+
+msgid "map() argument"
+msgstr "argumento de map()"
+
+msgid "filter() argument"
+msgstr "argumento de filter()"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: Argumento de %s devas esti Listo"
+
+msgid "E928: String required"
+msgstr "E928: Ĉeno bezonata"
 
 msgid "E808: Number or Float required"
 msgstr "E808: Nombro aŭ Glitpunktnombro bezonata"
@@ -594,9 +672,6 @@ msgstr "E808: Nombro aŭ Glitpunktnombro bezonata"
 msgid "add() argument"
 msgstr "argumento de add()"
 
-msgid "E699: Too many arguments"
-msgstr "E699: Tro da argumentoj"
-
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() uzeblas nur en Enmeta reĝimo"
 
@@ -636,6 +711,10 @@ msgstr "E786: Amplekso nepermesebla"
 msgid "E701: Invalid type for len()"
 msgstr "E701: Nevalida datumtipo de len()"
 
+#, c-format
+msgid "E798: ID is reserved for \":match\": %ld"
+msgstr "E798: ID estas rezervita por \":match\": %ld"
+
 msgid "E726: Stride is zero"
 msgstr "E726: Paŝo estas nul"
 
@@ -1054,6 +1133,10 @@ msgstr "Bedaŭrinde, la helpdosiero \"%s\" ne troveblas"
 msgid "E150: Not a directory: %s"
 msgstr "E150: Ne estas dosierujo: %s"
 
+#, c-format
+msgid "E151: No match: %s"
+msgstr "E151: Neniu kongruo: %s"
+
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: Ne eblas malfermi %s en skribreĝimo"
@@ -1095,6 +1178,9 @@ msgstr "E159: Mankas numero de simbolo"
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Nevalida nomo de bufro: %s"
 
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: Ne eblas salti al sennoma bufro"
+
 #, c-format
 msgid "E157: Invalid sign ID: %<PRId64>"
 msgstr "E157: Nevalida identigilo de simbolo: %<PRId64>"
@@ -1105,6 +1191,9 @@ msgstr " (nesubtenata)"
 msgid "[Deleted]"
 msgstr "[Forviŝita]"
 
+msgid "No old files"
+msgstr "Neniu malnova dosiero"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Eniras sencimigan reĝimon.  Tajpu \"cont\" por daŭrigi."
 
@@ -1204,6 +1293,10 @@ msgstr "linio %<PRId64>: rulas \"%s\""
 msgid "finished sourcing %s"
 msgstr "finis ruli %s"
 
+#, c-format
+msgid "continuing in %s"
+msgstr "daŭrigas en %s"
+
 msgid "modeline"
 msgstr "reĝimlinio"
 
@@ -1932,9 +2025,6 @@ msgstr "E462: Ne eblis prepari por reŝargi \"%s\""
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: Ne eblis reŝargi \"%s\""
 
-msgid "--Deleted--"
-msgstr "--Forviŝita--"
-
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "aŭto-forviŝas aŭtokomandon: %s <bufro=%d>"
@@ -1944,6 +2034,12 @@ msgstr "aŭto-forviŝas aŭtokomandon: %s <bufro=%d>"
 msgid "E367: No such group: \"%s\""
 msgstr "E367: Ne ekzistas tia grupo: \"%s\""
 
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: Forviŝo de augroup kiu estas ankoraŭ uzata"
+
+msgid "--Deleted--"
+msgstr "--Forviŝita--"
+
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: Nevalida signo post *: %s"
@@ -2005,8 +2101,10 @@ msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: Ne eblas forviŝi faldon per la aktuala 'foldmethod'"
 
 #, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld linioj falditaj "
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld linio faldita "
+msgstr[1] "+--%3ld linioj falditaj "
 
 #. buffer has already been read
 msgid "E222: Add to read buffer"
@@ -2550,6 +2648,7 @@ msgstr "%-5s: %s%*s (Uzo: %s)"
 
 msgid ""
 "\n"
+"       a: Find assignments to this symbol\n"
 "       c: Find functions calling this function\n"
 "       d: Find functions called by this function\n"
 "       e: Find this egrep pattern\n"
@@ -2558,9 +2657,9 @@ msgid ""
 "       i: Find files #including this file\n"
 "       s: Find this C symbol\n"
 "       t: Find this text string\n"
-"       a: Find assignments to this symbol\n"
 msgstr ""
 "\n"
+"       a: Trovi valirizojn al tiu simbolo\n"
 "       c: Trovi funkciojn, kiuj alvokas tiun funkcion\n"
 "       d: Trovi funkciojn alvokataj de tiu funkcio\n"
 "       e: Trovi tiun egrep-ŝablonon\n"
@@ -2569,7 +2668,6 @@ msgstr ""
 "       i: Trovi dosierojn, kiuj inkluzivas (#include) tiun dosieron\n"
 "       s: Trovi tiun C-simbolon\n"
 "       t: Trovi tiun ĉenon\n"
-"       a: Trovi valirizojn al tiu simbolo\n"
 
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: ripetita datumbazo de cscope ne aldonita"
@@ -2613,6 +2711,14 @@ msgstr "neniu konekto de cscope\n"
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    nomo de datumbazo                   prefiksa vojo\n"
 
+#, c-format
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: Mankas komo en Listo: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: Mankas fino de Listo ']': %s"
+
 msgid "Unknown option argument"
 msgstr "Nekonata argumento de opcio"
 
@@ -3861,15 +3967,18 @@ msgstr "(%d de %d)%s%s: "
 msgid " (line deleted)"
 msgstr " (forviŝita linio)"
 
+#, c-format
+msgid "%serror list %d of %d; %d errors "
+msgstr "%slisto de eraroj %d de %d; %d eraroj"
+
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: Ĉe la subo de stako de rapidriparo"
 
 msgid "E381: At top of quickfix stack"
 msgstr "E381: Ĉe la supro de stako de rapidriparo"
 
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "listo de eraroj %d de %d; %d eraroj"
+msgid "No entries"
+msgstr "Neniu ano"
 
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: Ne eblas skribi, opcio 'buftype' estas ŝaltita"
@@ -4082,9 +4191,6 @@ msgstr " hebrea"
 msgid " Arabic"
 msgstr " araba"
 
-msgid " (lang)"
-msgstr " (lingvo)"
-
 msgid " (paste)"
 msgstr " (algluo)"
 
@@ -4179,8 +4285,47 @@ msgstr ""
 "# Lasta serĉa ŝablono %s:\n"
 "~"
 
-msgid "E759: Format error in spell file"
-msgstr "E759: Eraro de formato en literuma dosiero"
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: Literumilo ne estas ŝaltita"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr "Averto: Ne eblas trovi vortliston \"%s_%s.spl\" aŭ \"%s_ascii.spl\""
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr "Averto: Ne eblas trovi vortliston \"%s.%s.spl\" aŭ \"%s.ascii.spl\""
+
+msgid "E797: SpellFileMissing autocommand deleted buffer"
+msgstr "E797: Aŭtokomando SpellFileMissing forviŝis bufron"
+
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr "Averto: regiono %s ne subtenata"
+
+msgid "Sorry, no suggestions"
+msgstr "Bedaŭrinde ne estas sugestoj"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "Bedaŭrinde estas nur %ld sugestoj"
+
+#. for when 'cmdheight' > 1
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "Anstataŭigi \"%.*s\" per:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: Neniu antaŭa literuma anstataŭigo"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: Netrovita: %s"
 
 msgid "E758: Truncated spell file"
 msgstr "E758: Trunkita literuma dosiero"
@@ -4226,8 +4371,24 @@ msgid "E770: Unsupported section in spell file"
 msgstr "E770: Nesubtenata sekcio en literuma dosiero"
 
 #, c-format
-msgid "Warning: region %s not supported"
-msgstr "Averto: regiono %s ne subtenata"
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: Tio ne ŝajnas esti dosiero .sug: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: Malnova dosiero .sug, bezonas ĝisdatigon: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: Dosiero .sug estas por pli nova versio de Vim: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: Dosiero .sug ne kongruas kun dosiero .spl: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: eraro dum legado de dosiero .sug: %s"
 
 #, c-format
 msgid "Reading affix file %s ..."
diff --git a/src/nvim/po/fr.po b/src/nvim/po/fr.po
index 2d99d67099..4b1b0476ca 100644
--- a/src/nvim/po/fr.po
+++ b/src/nvim/po/fr.po
@@ -15,8 +15,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Fran�ais)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-02 16:21+0200\n"
-"PO-Revision-Date: 2016-07-02 17:06+0200\n"
+"POT-Creation-Date: 2016-08-26 20:54+0200\n"
+"PO-Revision-Date: 2016-08-26 20:34+0200\n"
 "Last-Translator: Dominique Pell� <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -53,6 +53,9 @@ msgid "E83: Cannot allocate buffer, using other one..."
 msgstr ""
 "E83: L'allocation du tampon a �chou� : arr�tez Vim, lib�rez de la m�moire"
 
+msgid "E931: Buffer cannot be registered"
+msgstr "E931: Le tampon ne peut pas �tre enregistr�"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: Aucun tampon n'a �t� d�charg�"
 
@@ -220,6 +223,33 @@ msgstr ""
 msgid "Signs for %s:"
 msgstr "Symboles dans %s :"
 
+msgid "E901: gethostbyname() in channel_open()"
+msgstr "E901: gethostbyname() dans channel_open()"
+
+msgid "E898: socket() in channel_open()"
+msgstr "E898: socket() dans channel_open()"
+
+msgid "E903: received command with non-string argument"
+msgstr "E903: commande re�ue avec une argument qui n'est pas une cha�ne"
+
+msgid "E904: last argument for expr/call must be a number"
+msgstr "E904: le dernier argument de expr/call doit �tre un nombre"
+
+msgid "E904: third argument for call must be a list"
+msgstr "E904: le troisi�me argument de \"call\" doit �tre une liste"
+
+#, c-format
+msgid "E905: received unknown command: %s"
+msgstr "E905: commande inconnue re�ue : %s"
+
+#, c-format
+msgid "E630: %s(): write while not connected"
+msgstr "E630: %s() : �criture sans �tre connect�"
+
+#, c-format
+msgid "E631: %s(): write failed"
+msgstr "E631: %s() : erreur d'�criture"
+
 #, c-format
 msgid "    line=%<PRId64>  id=%d  name=%s"
 msgstr "    ligne=%<PRId64>  id=%d  nom=%s"
@@ -489,10 +519,6 @@ msgstr "E719: Utilisation de [:] impossible avec un Dictionnaire"
 msgid "E734: Wrong variable type for %s="
 msgstr "E734: Type de variable erron� avec %s="
 
-#, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: Fonction inconnue : %s"
-
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: Nom de variable invalide : %s"
@@ -533,10 +559,6 @@ msgstr "E711: La Liste n'a pas assez d'
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: \"in\" manquant apr�s :for"
 
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: Parenth�ses manquantes : %s"
-
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: Variable inexistante : %s"
@@ -598,60 +620,119 @@ msgstr "E114: Il manque \" 
 msgid "E115: Missing quote: %s"
 msgstr "E115: Il manque ' � la fin de %s"
 
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: Il manque une virgule dans la Liste %s"
-
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: Il manque ']' � la fin de la Liste %s"
-
 msgid "Not enough memory to set references, garbage collection aborted!"
 msgstr ""
 "Pas assez de m�moire pour les r�f�rences, arr�t du ramassage de mi�tes !"
 
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: Il manque ':' dans le Dictionnaire %s"
-
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Cl� \"%s\" dupliqu�e dans le Dictionnaire"
-
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: Il manque une virgule dans le Dictionnaire %s"
-
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: Il manque '}' � la fin du Dictionnaire %s"
-
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: variable trop imbriqu�e pour �tre affich�e"
 
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: Trop d'arguments pour la fonction %s"
+msgid "E805: Using a Float as a Number"
+msgstr "E805: Utilisation d'un Flottant comme un Nombre"
+
+msgid "E703: Using a Funcref as a Number"
+msgstr "E703: Utilisation d'une Funcref comme un Nombre"
+
+msgid "E745: Using a List as a Number"
+msgstr "E745: Utilisation d'une Liste comme un Nombre"
+
+msgid "E728: Using a Dictionary as a Number"
+msgstr "E728: Utilisation d'un Dictionnaire comme un Nombre"
+
+msgid "E910: Using a Job as a Number"
+msgstr "E910: Utilisation d'une T�che comme un Nombre"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: Utilisation d'un Canal comme un Nombre"
+
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: Utilisation d'une Funcref comme un Flottant"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: Utilisation d'une Cha�ne comme un Flottant"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: Utilisation d'une Liste comme un Flottant"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: Utilisation d'un Dictionnaire comme un Flottant"
+
+msgid "E907: Using a special value as a Float"
+msgstr "E907: Utilisation d'une valeur sp�ciale comme un Flottant"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: Utilisation d'une T�che comme un Flottant"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: Utilisation d'un Canal comme un Flottant"
+
+msgid "E729: using Funcref as a String"
+msgstr "E729: Utilisation d'une Funcref comme une Cha�ne"
+
+msgid "E730: using List as a String"
+msgstr "E730: Utilisation d'une Liste comme une Cha�ne"
+
+msgid "E731: using Dictionary as a String"
+msgstr "E731: Utilisation d'un Dictionnaire comme une Cha�ne"
+
+msgid "E908: using an invalid value as a String"
+msgstr "E908: Utilisation d'une valeur invalide comme une Cha�ne"
 
 #, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: Arguments invalides pour la fonction %s"
+msgid "E795: Cannot delete variable %s"
+msgstr "E795: Impossible de supprimer la variable %s"
 
 #, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: Fonction inconnue : %s"
+msgid "E704: Funcref variable name must start with a capital: %s"
+msgstr "E704: Le nom d'une Funcref doit commencer par une majuscule : %s"
 
 #, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: La fonction %s n'a pas re�u assez d'arguments"
+msgid "E705: Variable name conflicts with existing function: %s"
+msgstr "E705: Le nom d'une variable entre en conflit avec la fonction %s"
 
 #, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: <SID> utilis� en dehors d'un script : %s"
+msgid "E741: Value is locked: %s"
+msgstr "E741: La valeur de %s est verrouill�e"
+
+msgid "Unknown"
+msgstr "Inconnu"
 
 #, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: Appel d'une fonction � dict � sans Dictionnaire : %s"
+msgid "E742: Cannot change value of %s"
+msgstr "E742: Impossible de modifier la valeur de %s"
+
+msgid "E698: variable nested too deep for making a copy"
+msgstr "E698: variable trop imbriqu�e pour en faire une copie"
+
+# AB - La version fran�aise est capitalis�e pour �tre en accord avec les autres
+#      commentaires enregistr�s dans le fichier viminfo.
+msgid ""
+"\n"
+"# global variables:\n"
+msgstr ""
+"\n"
+"# Variables globales:\n"
+
+# DB - Plus pr�cis ("la derni�re fois") ?
+msgid ""
+"\n"
+"\tLast set from "
+msgstr ""
+"\n"
+"\tModifi� la derni�re fois dans "
+
+msgid "map() argument"
+msgstr "argument de map()"
+
+msgid "filter() argument"
+msgstr "argument de filter()"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: L'argument de %s doit �tre une Liste"
+
+msgid "E928: String required"
+msgstr "E928: Cha�ne requis"
 
 msgid "E808: Number or Float required"
 msgstr "E808: Nombre ou Flottant requis"
@@ -659,9 +740,6 @@ msgstr "E808: Nombre ou Flottant requis"
 msgid "add() argument"
 msgstr "argument de add()"
 
-msgid "E699: Too many arguments"
-msgstr "E699: Trop d'arguments"
-
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() n'est utilisable que dans le mode Insertion"
 
@@ -704,6 +782,10 @@ msgstr "E786: Les plages ne sont pas autoris
 msgid "E701: Invalid type for len()"
 msgstr "E701: Type invalide avec len()"
 
+#, c-format
+msgid "E798: ID is reserved for \":match\": %ld"
+msgstr "E798: ID est r�serv� pour \":match\": %ld"
+
 msgid "E726: Stride is zero"
 msgstr "E726: Le pas est nul"
 
@@ -1192,15 +1274,17 @@ msgstr "D
 msgid "E150: Not a directory: %s"
 msgstr "E150: %s n'est pas un r�pertoire"
 
-# AB - La version anglaise est plus pr�cise, mais trop technique.
+#, c-format
+msgid "E151: No match: %s"
+msgstr "E151: Aucune correspondance : %s"
+
 #, c-format
 msgid "E152: Cannot open %s for writing"
-msgstr "E152: Impossible d'�crire %s"
+msgstr "E152: Impossible d'ouvrir %s en �criture"
 
-# AB - La version anglaise est plus pr�cise, mais trop technique.
 #, c-format
 msgid "E153: Unable to open %s for reading"
-msgstr "E153: Impossible de lire %s"
+msgstr "E153: Impossible d'ouvrir %s en lecture"
 
 #, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
@@ -1247,6 +1331,9 @@ msgstr "E159: Il manque l'ID du symbole"
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Le tampon %s est introuvable"
 
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: Impossible de sauter � un tampon sans nom"
+
 # AB - Vu le code source, la version fran�aise est meilleure que la
 #      version anglaise.
 #, c-format
@@ -1259,6 +1346,9 @@ msgstr " (non support
 msgid "[Deleted]"
 msgstr "[Effac�]"
 
+msgid "No old files"
+msgstr "Aucun vieux fichier"
+
 # AB - La version fran�aise de la premi�re phrase ne me satisfait pas.
 # DB - Suggestion.
 msgid "Entering Debug mode.  Type \"cont\" to continue."
@@ -1309,7 +1399,8 @@ msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: Le tampon %s n'a pas �t� enregistr�"
 
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
-msgstr "Alerte : Entr�e inattendue dans un autre tampon (v�rifier autocommandes)"
+msgstr ""
+"Alerte : Entr�e inattendue dans un autre tampon (v�rifier autocommandes)"
 
 msgid "E163: There is only one file to edit"
 msgstr "E163: Il n'y a qu'un seul fichier � �diter"
@@ -1360,6 +1451,11 @@ msgstr "ligne %<PRId64> : sourcement de \"%s\""
 msgid "finished sourcing %s"
 msgstr "fin du sourcement de %s"
 
+# AB - Ce texte fait partie d'un message de d�bogage.
+#, c-format
+msgid "continuing in %s"
+msgstr "de retour dans %s"
+
 msgid "modeline"
 msgstr "ligne de mode"
 
@@ -2108,9 +2204,6 @@ msgstr "E462: Impossible de pr
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: Impossible de recharger \"%s\""
 
-msgid "--Deleted--"
-msgstr "--Effac�--"
-
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "Autocommandes marqu�es pour auto-suppression : %s <tampon=%d>"
@@ -2120,6 +2213,12 @@ msgstr "Autocommandes marqu
 msgid "E367: No such group: \"%s\""
 msgstr "E367: Aucun groupe \"%s\""
 
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: Effacement d'augroup toujours en usage"
+
+msgid "--Deleted--"
+msgstr "--Effac�--"
+
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: Caract�re non valide apr�s * : %s"
@@ -2182,8 +2281,10 @@ msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: Impossible de supprimer un repli avec la 'foldmethod'e actuelle"
 
 #, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld lignes repli�es "
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld ligne repli�e "
+msgstr[1] "+--%3ld lignes repli�es "
 
 #. buffer has already been read
 msgid "E222: Add to read buffer"
@@ -2735,6 +2836,7 @@ msgstr "%-5s: %s%*s (Utilisation : %s)"
 
 msgid ""
 "\n"
+"       a: Find assignments to this symbol\n"
 "       c: Find functions calling this function\n"
 "       d: Find functions called by this function\n"
 "       e: Find this egrep pattern\n"
@@ -2743,9 +2845,9 @@ msgid ""
 "       i: Find files #including this file\n"
 "       s: Find this C symbol\n"
 "       t: Find this text string\n"
-"       a: Find assignments to this symbol\n"
 msgstr ""
 "\n"
+"       a: Trouver les affectations � ce symbole\n"
 "       c: Trouver les fonctions appelant cette fonction\n"
 "       d: Trouver les fonctions appel�es par cette fonction\n"
 "       e: Trouver ce motif egrep\n"
@@ -2754,7 +2856,6 @@ msgstr ""
 "       i: Trouver les fichiers qui #incluent ce fichier\n"
 "       s: Trouver ce symbole C\n"
 "       t: Trouver cette cha�ne\n"
-"       a: Trouver les assignements � ce symbole\n"
 
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: base de donn�es cscope redondante non ajout�e"
@@ -2799,6 +2900,14 @@ msgstr "aucune connexion cscope\n"
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    nom de la base de donn�es           chemin\n"
 
+#, c-format
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: Il manque une virgule dans la Liste %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: Il manque ']' � la fin de la Liste %s"
+
 msgid "Unknown option argument"
 msgstr "Option inconnue"
 
@@ -4038,15 +4147,18 @@ msgstr "(%d sur %d)%s%s : "
 msgid " (line deleted)"
 msgstr " (ligne effac�e)"
 
+#, c-format
+msgid "%serror list %d of %d; %d errors "
+msgstr "%sliste d'erreurs %d sur %d ; %d erreurs"
+
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: En bas de la pile quickfix"
 
 msgid "E381: At top of quickfix stack"
 msgstr "E381: Au sommet de la pile quickfix"
 
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "liste d'erreurs %d sur %d ; %d erreurs"
+msgid "No entries"
+msgstr "Aucune entr�e"
 
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: �criture impossible, l'option 'buftype' est activ�e"
@@ -4257,9 +4369,6 @@ msgstr " h
 msgid " Arabic"
 msgstr " arabe"
 
-msgid " (lang)"
-msgstr " (langue)"
-
 msgid " (paste)"
 msgstr " (collage)"
 
@@ -4354,8 +4463,48 @@ msgstr ""
 "# Dernier motif de recherche %s :\n"
 "~"
 
-msgid "E759: Format error in spell file"
-msgstr "E759: Erreur de format du fichier orthographique"
+msgid "E756: Spell checking is not enabled"
+msgstr "E756: La v�rification orthographique n'est pas activ�e"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr "Alerte : Liste de mots \"%s_%s.spl\" ou \"%s_ascii.spl\" introuvable"
+
+#, c-format
+msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
+msgstr "Alerte : Liste de mots \"%s.%s.spl\" ou \"%s.ascii.spl\" introuvable"
+
+msgid "E797: SpellFileMissing autocommand deleted buffer"
+msgstr "E797: L'autocommande SpellFileMissing a effac� le tampon"
+
+#, c-format
+msgid "Warning: region %s not supported"
+msgstr "Alerte : r�gion %s non support�e"
+
+msgid "Sorry, no suggestions"
+msgstr "D�sol�, aucune suggestion"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "D�sol�, seulement %ld suggestions"
+
+#. for when 'cmdheight' > 1
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "Remplacer \"%.*s\" par :"
+
+# DB - todo : l'int�r�t de traduire ce message m'�chappe.
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: Pas de suggestion orthographique pr�c�dente"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: Introuvable : %s"
 
 msgid "E758: Truncated spell file"
 msgstr "E758: Fichier orthographique tronqu�"
@@ -4401,8 +4550,24 @@ msgid "E770: Unsupported section in spell file"
 msgstr "E770: Section non support�e dans le fichier orthographique"
 
 #, c-format
-msgid "Warning: region %s not supported"
-msgstr "Alerte : r�gion %s non support�e"
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: %s ne semble pas �tre un fichier .sug"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: Fichier de suggestions obsol�te, mise � jour n�cessaire : %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: Fichier .sug pr�vu pour une version de Vim plus r�cente : %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: Le fichier .sug ne correspond pas au fichier .spl : %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: Erreur lors de la lecture de fichier de suggestions : %s"
 
 #, c-format
 msgid "Reading affix file %s ..."

From f09651ea78b833d6d05db89c41df603b741ab000 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 21:01:49 +0200
Subject: [PATCH 180/257] vim-patch:36f44c21da2e

Updated runtime files.

https://github.com/vim/vim/commit/36f44c21da2e912c008683a0c4447fca2a071e9a
---
 runtime/doc/eval.txt     |  4 +++-
 runtime/doc/options.txt  | 13 ++++++----
 runtime/doc/starting.txt |  2 +-
 runtime/synmenu.vim      | 52 +++++++++++++++++++---------------------
 4 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 107dd28ecd..90575e3438 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -3044,6 +3044,8 @@ delete({fname} [, {flags}])					*delete()*
 
 		When {flags} is "rf": Deletes the directory by the name
 		{fname} and everything in it, recursively.  BE CAREFUL!
+		Note: on MS-Windows it is not possible to delete a directory
+		that is being used.
 
 		The result is a Number, which is 0 if the delete operation was
 		successful and -1 when the deletion failed or partly failed.
@@ -6167,7 +6169,7 @@ rpcstop({channel})					    {Nvim} *rpcstop()*
 		connecting to |v:servername|.
 
 screenattr(row, col)						*screenattr()*
-		Like screenchar(), but return the attribute.  This is a rather
+		Like |screenchar()|, but return the attribute.  This is a rather
 		arbitrary number that can only be used to compare to the
 		attribute at other positions.
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 6b96271c4a..cef01eb27b 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2219,10 +2219,15 @@ A jump table for the options with a short description can be found at |Q_op|.
 					*'exrc'* *'ex'* *'noexrc'* *'noex'*
 'exrc' 'ex'		boolean (default off)
 			global
-	Enables the reading of .nvimrc and .exrc in the current directory.
-	If you switch this option on you should also consider setting the
-	'secure' option (see |initialization|).  Using this option comes
-	with a potential security risk, use with care!
+	Enables the reading of .vimrc and .exrc in the current directory.
+	Setting this option is a potential security leak.  E.g., consider
+	unpacking a package or fetching files from github, a .vimrc in there
+	might be a trojan horse.  BETTER NOT SET THIS OPTION!
+	Instead, define an autocommand in your .vimrc to set options for a
+	matching directory.
+
+	If you do switch this option on you should also consider setting the
+	'secure' option (see |initialization|).
 	This option cannot be set from a |modeline| or in the |sandbox|, for
 	security reasons.
 	Also see |init.vim| and |gui-init|.
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index c93c3d0741..f7c47125f1 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -425,7 +425,7 @@ accordingly.  Vim proceeds in this order:
 	-  The environment variable EXINIT.
 	   The value of $EXINIT is used as an Ex command line.
 
-     c. If the 'exrc' option is on (which is not the default), the current
+     c. If the 'exrc' option is on (which is NOT the default), the current
 	directory is searched for three files.  The first that exists is used,
 	the others are ignored.
 	-  The file ".nvimrc" (for Unix)
diff --git a/runtime/synmenu.vim b/runtime/synmenu.vim
index 01dad3c7f2..81e3667298 100644
--- a/runtime/synmenu.vim
+++ b/runtime/synmenu.vim
@@ -61,7 +61,6 @@ an 50.10.320 &Syntax.AB.Ascii\ Doc :cal SetSyn("asciidoc")<CR>
 an 50.10.330 &Syntax.AB.ASP\ with\ VBScript :cal SetSyn("aspvbs")<CR>
 an 50.10.340 &Syntax.AB.ASP\ with\ Perl :cal SetSyn("aspperl")<CR>
 an 50.10.350 &Syntax.AB.Assembly.680x0 :cal SetSyn("asm68k")<CR>
-an 50.10.355 &Syntax.AB.Assembly.AVR :cal SetSyn("avra")<CR>
 an 50.10.360 &Syntax.AB.Assembly.Flat :cal SetSyn("fasm")<CR>
 an 50.10.370 &Syntax.AB.Assembly.GNU :cal SetSyn("asm")<CR>
 an 50.10.380 &Syntax.AB.Assembly.GNU\ H-8300 :cal SetSyn("asmh8300")<CR>
@@ -162,31 +161,31 @@ an 50.30.290 &Syntax.DE.Doxygen.C\ with\ doxygen :cal SetSyn("c.doxygen")<CR>
 an 50.30.300 &Syntax.DE.Doxygen.C++\ with\ doxygen :cal SetSyn("cpp.doxygen")<CR>
 an 50.30.310 &Syntax.DE.Doxygen.IDL\ with\ doxygen :cal SetSyn("idl.doxygen")<CR>
 an 50.30.320 &Syntax.DE.Doxygen.Java\ with\ doxygen :cal SetSyn("java.doxygen")<CR>
-an 50.30.320 &Syntax.DE.Doxygen.DataScript\ with\ doxygen :cal SetSyn("datascript.doxygen")<CR>
-an 50.30.330 &Syntax.DE.Dracula :cal SetSyn("dracula")<CR>
-an 50.30.340 &Syntax.DE.DSSSL :cal SetSyn("dsl")<CR>
-an 50.30.350 &Syntax.DE.DTD :cal SetSyn("dtd")<CR>
-an 50.30.360 &Syntax.DE.DTML\ (Zope) :cal SetSyn("dtml")<CR>
-an 50.30.370 &Syntax.DE.DTrace :cal SetSyn("dtrace")<CR>
-an 50.30.380 &Syntax.DE.Dts/dtsi :cal SetSyn("dts")<CR>
-an 50.30.390 &Syntax.DE.Dylan.Dylan :cal SetSyn("dylan")<CR>
-an 50.30.400 &Syntax.DE.Dylan.Dylan\ interface :cal SetSyn("dylanintr")<CR>
-an 50.30.410 &Syntax.DE.Dylan.Dylan\ lid :cal SetSyn("dylanlid")<CR>
-an 50.30.430 &Syntax.DE.EDIF :cal SetSyn("edif")<CR>
-an 50.30.440 &Syntax.DE.Eiffel :cal SetSyn("eiffel")<CR>
-an 50.30.450 &Syntax.DE.Elinks\ config :cal SetSyn("elinks")<CR>
-an 50.30.460 &Syntax.DE.Elm\ filter\ rules :cal SetSyn("elmfilt")<CR>
-an 50.30.470 &Syntax.DE.Embedix\ Component\ Description :cal SetSyn("ecd")<CR>
-an 50.30.480 &Syntax.DE.ERicsson\ LANGuage :cal SetSyn("erlang")<CR>
-an 50.30.490 &Syntax.DE.ESMTP\ rc :cal SetSyn("esmtprc")<CR>
-an 50.30.500 &Syntax.DE.ESQL-C :cal SetSyn("esqlc")<CR>
-an 50.30.510 &Syntax.DE.Essbase\ script :cal SetSyn("csc")<CR>
-an 50.30.520 &Syntax.DE.Esterel :cal SetSyn("esterel")<CR>
-an 50.30.530 &Syntax.DE.Eterm\ config :cal SetSyn("eterm")<CR>
-an 50.30.540 &Syntax.DE.Eviews :cal SetSyn("eviews")<CR>
-an 50.30.550 &Syntax.DE.Exim\ conf :cal SetSyn("exim")<CR>
-an 50.30.560 &Syntax.DE.Expect :cal SetSyn("expect")<CR>
-an 50.30.570 &Syntax.DE.Exports :cal SetSyn("exports")<CR>
+an 50.30.330 &Syntax.DE.Doxygen.DataScript\ with\ doxygen :cal SetSyn("datascript.doxygen")<CR>
+an 50.30.340 &Syntax.DE.Dracula :cal SetSyn("dracula")<CR>
+an 50.30.350 &Syntax.DE.DSSSL :cal SetSyn("dsl")<CR>
+an 50.30.360 &Syntax.DE.DTD :cal SetSyn("dtd")<CR>
+an 50.30.370 &Syntax.DE.DTML\ (Zope) :cal SetSyn("dtml")<CR>
+an 50.30.380 &Syntax.DE.DTrace :cal SetSyn("dtrace")<CR>
+an 50.30.390 &Syntax.DE.Dts/dtsi :cal SetSyn("dts")<CR>
+an 50.30.400 &Syntax.DE.Dylan.Dylan :cal SetSyn("dylan")<CR>
+an 50.30.410 &Syntax.DE.Dylan.Dylan\ interface :cal SetSyn("dylanintr")<CR>
+an 50.30.420 &Syntax.DE.Dylan.Dylan\ lid :cal SetSyn("dylanlid")<CR>
+an 50.30.440 &Syntax.DE.EDIF :cal SetSyn("edif")<CR>
+an 50.30.450 &Syntax.DE.Eiffel :cal SetSyn("eiffel")<CR>
+an 50.30.460 &Syntax.DE.Elinks\ config :cal SetSyn("elinks")<CR>
+an 50.30.470 &Syntax.DE.Elm\ filter\ rules :cal SetSyn("elmfilt")<CR>
+an 50.30.480 &Syntax.DE.Embedix\ Component\ Description :cal SetSyn("ecd")<CR>
+an 50.30.490 &Syntax.DE.ERicsson\ LANGuage :cal SetSyn("erlang")<CR>
+an 50.30.500 &Syntax.DE.ESMTP\ rc :cal SetSyn("esmtprc")<CR>
+an 50.30.510 &Syntax.DE.ESQL-C :cal SetSyn("esqlc")<CR>
+an 50.30.520 &Syntax.DE.Essbase\ script :cal SetSyn("csc")<CR>
+an 50.30.530 &Syntax.DE.Esterel :cal SetSyn("esterel")<CR>
+an 50.30.540 &Syntax.DE.Eterm\ config :cal SetSyn("eterm")<CR>
+an 50.30.550 &Syntax.DE.Eviews :cal SetSyn("eviews")<CR>
+an 50.30.560 &Syntax.DE.Exim\ conf :cal SetSyn("exim")<CR>
+an 50.30.570 &Syntax.DE.Expect :cal SetSyn("expect")<CR>
+an 50.30.580 &Syntax.DE.Exports :cal SetSyn("exports")<CR>
 an 50.40.100 &Syntax.FG.Falcon :cal SetSyn("falcon")<CR>
 an 50.40.110 &Syntax.FG.Fantom :cal SetSyn("fan")<CR>
 an 50.40.120 &Syntax.FG.Fetchmail :cal SetSyn("fetchmail")<CR>
@@ -328,7 +327,6 @@ an 50.70.270 &Syntax.M.Messages\ (/var/log) :cal SetSyn("messages")<CR>
 an 50.70.280 &Syntax.M.Metafont :cal SetSyn("mf")<CR>
 an 50.70.290 &Syntax.M.MetaPost :cal SetSyn("mp")<CR>
 an 50.70.300 &Syntax.M.MGL :cal SetSyn("mgl")<CR>
-an 50.70.305 &Syntax.M.MIX :cal SetSyn("mix")<CR>
 an 50.70.310 &Syntax.M.MMIX :cal SetSyn("mmix")<CR>
 an 50.70.320 &Syntax.M.Modconf :cal SetSyn("modconf")<CR>
 an 50.70.330 &Syntax.M.Model :cal SetSyn("model")<CR>

From a53409b564458f7a94c8fcd0725d1953dee58dce Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 21:06:44 +0200
Subject: [PATCH 181/257] vim-patch:89bcfda6834a

Updated runtime files.  Remove version checks for Vim older than 6.0.

https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
---
 runtime/autoload/rubycomplete.vim |  36 ++-
 runtime/compiler/cucumber.vim     |   4 +-
 runtime/compiler/haml.vim         |   4 +-
 runtime/compiler/rake.vim         |   6 +-
 runtime/compiler/rspec.vim        |   3 +-
 runtime/compiler/rubyunit.vim     |   2 +
 runtime/compiler/sass.vim         |   4 +-
 runtime/doc/eval.txt              |  26 +-
 runtime/ftplugin/cucumber.vim     |  28 +-
 runtime/ftplugin/eruby.vim        |   2 +-
 runtime/ftplugin/git.vim          |   4 +-
 runtime/ftplugin/gitcommit.vim    |  17 +-
 runtime/ftplugin/gitrebase.vim    |   5 +-
 runtime/ftplugin/haml.vim         |   2 +-
 runtime/ftplugin/markdown.vim     |  32 ++-
 runtime/ftplugin/ruby.vim         | 151 ++++++-----
 runtime/ftplugin/sass.vim         |   5 +-
 runtime/ftplugin/scss.vim         |   3 +-
 runtime/indent/cucumber.vim       |  21 +-
 runtime/indent/eruby.vim          |  43 ++-
 runtime/indent/fortran.vim        |   5 +-
 runtime/indent/gitconfig.vim      |   9 +-
 runtime/indent/haml.vim           |   7 +-
 runtime/indent/liquid.vim         |  11 +-
 runtime/indent/ruby.vim           | 229 +++++++++++++---
 runtime/indent/sass.vim           |   6 +-
 runtime/syntax/a65.vim            |  43 ++-
 runtime/syntax/abap.vim           |  65 ++---
 runtime/syntax/abaqus.vim         |  33 +--
 runtime/syntax/abc.vim            |  39 +--
 runtime/syntax/abel.vim           |  79 +++---
 runtime/syntax/acedb.vim          |  53 ++--
 runtime/syntax/aflex.vim          |  54 ++--
 runtime/syntax/ahdl.vim           |  41 ++-
 runtime/syntax/amiga.vim          |  41 ++-
 runtime/syntax/aml.vim            |  55 ++--
 runtime/syntax/ampl.vim           |  48 ++--
 runtime/syntax/antlr.vim          |  30 +--
 runtime/syntax/apache.vim         |  63 ++---
 runtime/syntax/apachestyle.vim    |  33 +--
 runtime/syntax/aptconf.vim        |   7 +-
 runtime/syntax/arduino.vim        |  13 +-
 runtime/syntax/asm.vim            |  51 ++--
 runtime/syntax/asm68k.vim         |  91 +++----
 runtime/syntax/asmh8300.vim       |  37 +--
 runtime/syntax/asn.vim            |  55 ++--
 runtime/syntax/aspperl.vim        |  18 +-
 runtime/syntax/aspvbs.vim         |  50 ++--
 runtime/syntax/asterisk.vim       |  70 +++--
 runtime/syntax/asteriskvm.vim     |  39 ++-
 runtime/syntax/atlas.vim          |  57 ++--
 runtime/syntax/automake.vim       |  54 ++--
 runtime/syntax/ave.vim            |  43 ++-
 runtime/syntax/ayacc.vim          |  60 ++---
 runtime/syntax/b.vim              |  97 +++----
 runtime/syntax/baan.vim           |  67 ++---
 runtime/syntax/basic.vim          |  51 ++--
 runtime/syntax/bc.vim             |  37 +--
 runtime/syntax/bib.vim            |  44 ++--
 runtime/syntax/bindzone.vim       |  63 ++---
 runtime/syntax/blank.vim          |  27 +-
 runtime/syntax/bst.vim            |  47 ++--
 runtime/syntax/btm.vim            |  71 +++--
 runtime/syntax/bzr.vim            |  33 +--
 runtime/syntax/cabal.vim          |  39 +--
 runtime/syntax/cfg.vim            |  38 +--
 runtime/syntax/ch.vim             |  37 +--
 runtime/syntax/change.vim         |  25 +-
 runtime/syntax/changelog.vim      |  62 ++---
 runtime/syntax/chaskell.vim       |   6 +-
 runtime/syntax/cheetah.vim        |  33 +--
 runtime/syntax/chill.vim          | 115 ++++----
 runtime/syntax/cl.vim             |  69 ++---
 runtime/syntax/clean.vim          |  81 +++---
 runtime/syntax/clipper.vim        |  47 ++--
 runtime/syntax/cmake.vim          |  47 ++--
 runtime/syntax/cobol.vim          |  93 +++----
 runtime/syntax/coco.vim           |   5 +-
 runtime/syntax/config.vim         |  39 +--
 runtime/syntax/cpp.vim            |  54 ++--
 runtime/syntax/crontab.vim        |  53 ++--
 runtime/syntax/csc.vim            |  67 ++---
 runtime/syntax/csh.vim            |  92 +++----
 runtime/syntax/csp.vim            |  75 +++---
 runtime/syntax/css.vim            | 257 +++++++++---------
 runtime/syntax/cterm.vim          |  71 +++--
 runtime/syntax/cuda.vim           |  13 +-
 runtime/syntax/cupl.vim           |  61 ++---
 runtime/syntax/cuplsim.vim        |  47 ++--
 runtime/syntax/cvs.vim            |  33 +--
 runtime/syntax/cweb.vim           |  31 +--
 runtime/syntax/cynlib.vim         |  37 +--
 runtime/syntax/cynpp.vim          |  32 +--
 runtime/syntax/datascript.vim     |   5 +-
 runtime/syntax/dcd.vim            |  35 +--
 runtime/syntax/dcl.vim            |  81 +++---
 runtime/syntax/debchangelog.vim   |  37 +--
 runtime/syntax/debcontrol.vim     |  55 ++--
 runtime/syntax/debsources.vim     |   4 +-
 runtime/syntax/def.vim            |  33 +--
 runtime/syntax/desc.vim           |  56 ++--
 runtime/syntax/desktop.vim        |  55 ++--
 runtime/syntax/diva.vim           |  40 +--
 runtime/syntax/django.vim         |  43 ++-
 runtime/syntax/dnsmasq.vim        |   6 +-
 runtime/syntax/docbk.vim          |  34 +--
 runtime/syntax/dosbatch.vim       |  67 ++---
 runtime/syntax/dosini.vim         |  29 +--
 runtime/syntax/dot.vim            |  47 ++--
 runtime/syntax/dracula.vim        |  31 +--
 runtime/syntax/dtd.vim            |  54 ++--
 runtime/syntax/dtml.vim           |  39 +--
 runtime/syntax/dtrace.vim         |  13 +-
 runtime/syntax/dylan.vim          |  73 +++---
 runtime/syntax/dylanintr.vim      |  35 +--
 runtime/syntax/dylanlid.vim       |  25 +-
 runtime/syntax/ecd.vim            |  34 +--
 runtime/syntax/edif.vim           |  41 +--
 runtime/syntax/eiffel.vim         |  97 +++----
 runtime/syntax/elf.vim            |  47 ++--
 runtime/syntax/elmfilt.vim        |  49 ++--
 runtime/syntax/erlang.vim         | 211 +++++++--------
 runtime/syntax/eruby.vim          |   2 +-
 runtime/syntax/esmtprc.vim        |   7 +-
 runtime/syntax/esqlc.vim          |  37 +--
 runtime/syntax/esterel.vim        |  38 +--
 runtime/syntax/euphoria3.vim      |   6 +-
 runtime/syntax/euphoria4.vim      |   6 +-
 runtime/syntax/eviews.vim         |  63 ++---
 runtime/syntax/exim.vim           |  42 ++-
 runtime/syntax/expect.vim         |  49 ++--
 runtime/syntax/exports.vim        |  43 ++-
 runtime/syntax/fasm.vim           |   5 +-
 runtime/syntax/fdcc.vim           |  87 +++----
 runtime/syntax/fgl.vim            |  39 +--
 runtime/syntax/flexwiki.vim       |   6 +-
 runtime/syntax/focexec.vim        |  47 ++--
 runtime/syntax/form.vim           |  79 +++---
 runtime/syntax/forth.vim          | 101 +++----
 runtime/syntax/fortran.vim        |   6 +-
 runtime/syntax/foxpro.vim         |  57 ++--
 runtime/syntax/fstab.vim          | 108 ++++----
 runtime/syntax/fvwm2m4.vim        |  21 +-
 runtime/syntax/gdb.vim            |  41 ++-
 runtime/syntax/gdmo.vim           |  47 ++--
 runtime/syntax/gedcom.vim         |  37 +--
 runtime/syntax/gitcommit.vim      |   9 +-
 runtime/syntax/gitrebase.vim      |   4 +-
 runtime/syntax/gitsendemail.vim   |   8 +-
 runtime/syntax/gkrellmrc.vim      |  60 ++---
 runtime/syntax/gnash.vim          |   7 +-
 runtime/syntax/gnuplot.vim        |  73 +++---
 runtime/syntax/gp.vim             |  50 ++--
 runtime/syntax/grads.vim          |  43 ++-
 runtime/syntax/gretl.vim          |  61 ++---
 runtime/syntax/groovy.vim         | 137 +++++-----
 runtime/syntax/gsp.vim            |  19 +-
 runtime/syntax/gtkrc.vim          |  94 +++----
 runtime/syntax/haml.vim           |   4 +-
 runtime/syntax/hamster.vim        |  30 +--
 runtime/syntax/haskell.vim        | 116 ++++-----
 runtime/syntax/haste.vim          |   7 +-
 runtime/syntax/hastepreproc.vim   |  19 +-
 runtime/syntax/hb.vim             |  43 ++-
 runtime/syntax/hercules.vim       |  46 ++--
 runtime/syntax/hex.vim            |  51 ++--
 runtime/syntax/hog.vim            |   5 +-
 runtime/syntax/hostsaccess.vim    |   8 +-
 runtime/syntax/html.vim           | 134 +++++-----
 runtime/syntax/htmlcheetah.vim    |  18 +-
 runtime/syntax/htmldjango.vim     |  18 +-
 runtime/syntax/htmlm4.vim         |  20 +-
 runtime/syntax/htmlos.vim         |  75 +++---
 runtime/syntax/ia64.vim           |  73 +++---
 runtime/syntax/icemenu.vim        |   6 +-
 runtime/syntax/icon.vim           |  87 +++----
 runtime/syntax/idlang.vim         |  53 ++--
 runtime/syntax/inform.vim         | 114 ++++----
 runtime/syntax/inittab.vim        |  46 ++--
 runtime/syntax/ipfilter.vim       |   7 +-
 runtime/syntax/ishd.vim           |  53 ++--
 runtime/syntax/iss.vim            |  69 +++--
 runtime/syntax/ist.vim            |  45 ++--
 runtime/syntax/jal.vim            | 127 +++++----
 runtime/syntax/jam.vim            | 165 ++++++------
 runtime/syntax/jargon.vim         |  29 +--
 runtime/syntax/java.vim           | 137 +++++-----
 runtime/syntax/javacc.vim         |  37 +--
 runtime/syntax/javascript.vim     |  90 +++----
 runtime/syntax/jess.vim           |  59 ++---
 runtime/syntax/jgraph.vim         |  29 +--
 runtime/syntax/jproperties.vim    |  39 +--
 runtime/syntax/json.vim           |  59 ++---
 runtime/syntax/jsp.vim            |  51 ++--
 runtime/syntax/kix.vim            |  82 +++---
 runtime/syntax/kscript.vim        |  49 ++--
 runtime/syntax/kwt.vim            |  45 ++--
 runtime/syntax/lace.vim           |  71 +++--
 runtime/syntax/latte.vim          |  43 +--
 runtime/syntax/ldif.vim           |  30 +--
 runtime/syntax/lex.vim            |   7 +-
 runtime/syntax/lhaskell.vim       |  46 +---
 runtime/syntax/lifelines.vim      |  71 +++--
 runtime/syntax/lilo.vim           | 116 ++++-----
 runtime/syntax/lisp.vim           |  97 ++++---
 runtime/syntax/lite.vim           |  61 ++---
 runtime/syntax/logtalk.vim        |  73 +++---
 runtime/syntax/lotos.vim          |  35 +--
 runtime/syntax/lout.vim           |  75 +++---
 runtime/syntax/lpc.vim            | 167 ++++++------
 runtime/syntax/lprolog.vim        |  55 ++--
 runtime/syntax/lscript.vim        |  49 ++--
 runtime/syntax/lss.vim            | 108 ++++----
 runtime/syntax/lua.vim            |  63 ++---
 runtime/syntax/m4.vim             |  53 ++--
 runtime/syntax/make.vim           |  63 ++---
 runtime/syntax/maple.vim          | 145 +++++------
 runtime/syntax/markdown.vim       |  31 ++-
 runtime/syntax/mason.vim          |  36 +--
 runtime/syntax/master.vim         |  27 +-
 runtime/syntax/matlab.vim         |  75 +++---
 runtime/syntax/maxima.vim         |  65 ++---
 runtime/syntax/mel.vim            |  75 +++---
 runtime/syntax/mf.vim             |  63 ++---
 runtime/syntax/mgl.vim            |  67 +++--
 runtime/syntax/mgp.vim            |  46 ++--
 runtime/syntax/mma.vim            |  70 +++--
 runtime/syntax/mmix.vim           |  59 ++---
 runtime/syntax/mmp.vim            |  10 +-
 runtime/syntax/modsim3.vim        |  44 ++--
 runtime/syntax/modula2.vim        |  47 ++--
 runtime/syntax/modula3.vim        |  31 +--
 runtime/syntax/monk.vim           |  47 ++--
 runtime/syntax/moo.vim            |   4 +-
 runtime/syntax/mp.vim             |  37 +--
 runtime/syntax/msidl.vim          |  57 ++--
 runtime/syntax/msmessages.vim     |   7 +-
 runtime/syntax/msql.vim           |  69 ++---
 runtime/syntax/mupad.vim          |  42 ++-
 runtime/syntax/mush.vim           |  58 ++---
 runtime/syntax/muttrc.vim         | 307 +++++++++++-----------
 runtime/syntax/mysql.vim          |  41 ++-
 runtime/syntax/named.vim          |  85 +++---
 runtime/syntax/nasm.vim           | 174 ++++++-------
 runtime/syntax/nastran.vim        |  62 ++---
 runtime/syntax/natural.vim        |  11 +-
 runtime/syntax/ncf.vim            |  67 +++--
 runtime/syntax/netrw.vim          |   5 +-
 runtime/syntax/nqc.vim            |  87 +++----
 runtime/syntax/nroff.vim          |  93 +++----
 runtime/syntax/nsis.vim           |  77 +++---
 runtime/syntax/obj.vim            |  47 ++--
 runtime/syntax/objcpp.vim         |  18 +-
 runtime/syntax/ocaml.vim          | 111 ++++----
 runtime/syntax/occam.vim          |  64 ++---
 runtime/syntax/omnimark.vim       |  39 +--
 runtime/syntax/openroad.vim       |  48 ++--
 runtime/syntax/opl.vim            |  31 +--
 runtime/syntax/ora.vim            |  48 ++--
 runtime/syntax/papp.vim           |  29 +--
 runtime/syntax/pascal.vim         |  87 +++----
 runtime/syntax/pcap.vim           |  33 +--
 runtime/syntax/pccts.vim          |  57 ++--
 runtime/syntax/perl6.vim          | 329 ++++++++++++-----------
 runtime/syntax/pfmain.vim         |  50 ++--
 runtime/syntax/php.vim            | 200 ++++++--------
 runtime/syntax/pic.vim            |  49 ++--
 runtime/syntax/pike.vim           |  85 +++---
 runtime/syntax/pilrc.vim          |  44 ++--
 runtime/syntax/pine.vim           |  33 +--
 runtime/syntax/pli.vim            |  96 +++----
 runtime/syntax/plm.vim            |  63 ++---
 runtime/syntax/plp.vim            |  18 +-
 runtime/syntax/plsql.vim          |  91 +++----
 runtime/syntax/po.vim             |  95 +++----
 runtime/syntax/pod.vim            |  39 +--
 runtime/syntax/postscr.vim        | 109 ++++----
 runtime/syntax/pov.vim            |  10 +-
 runtime/syntax/povini.vim         |  10 +-
 runtime/syntax/ppd.vim            |  35 +--
 runtime/syntax/ppwiz.vim          |  49 ++--
 runtime/syntax/prescribe.vim      |  33 +--
 runtime/syntax/procmail.vim       |  45 ++--
 runtime/syntax/progress.vim       |  77 +++---
 runtime/syntax/prolog.vim         |  62 ++---
 runtime/syntax/promela.vim        |   7 +-
 runtime/syntax/proto.vim          |   5 +-
 runtime/syntax/psf.vim            |  34 +--
 runtime/syntax/ptcap.vim          |  52 ++--
 runtime/syntax/purifylog.vim      |  99 ++++---
 runtime/syntax/pyrex.vim          |  44 ++--
 runtime/syntax/python.vim         |  86 +++---
 runtime/syntax/radiance.vim       |  51 ++--
 runtime/syntax/ratpoison.vim      |  49 ++--
 runtime/syntax/rc.vim             |  87 +++----
 runtime/syntax/rcs.vim            |  35 +--
 runtime/syntax/rcslog.vim         |  27 +-
 runtime/syntax/rebol.vim          | 101 +++----
 runtime/syntax/redif.vim          |   6 +-
 runtime/syntax/registry.vim       |  40 ++-
 runtime/syntax/remind.vim         |  52 ++--
 runtime/syntax/resolv.vim         |  52 ++--
 runtime/syntax/reva.vim           |   9 +-
 runtime/syntax/rexx.vim           | 121 ++++-----
 runtime/syntax/rib.vim            |  31 +--
 runtime/syntax/robots.vim         |  36 +--
 runtime/syntax/rpcgen.vim         |  40 +--
 runtime/syntax/rpl.vim            | 123 ++++-----
 runtime/syntax/rtf.vim            |  47 ++--
 runtime/syntax/ruby.vim           | 419 +++++++++++++++++++++---------
 runtime/syntax/samba.vim          |  35 +--
 runtime/syntax/sas.vim            | 103 ++++----
 runtime/syntax/sass.vim           |  12 +-
 runtime/syntax/sather.vim         |  73 +++---
 runtime/syntax/scala.vim          |   5 +-
 runtime/syntax/scheme.vim         |  55 ++--
 runtime/syntax/scilab.vim         |  71 +++--
 runtime/syntax/sd.vim             |  40 ++-
 runtime/syntax/sdl.vim            |  58 ++---
 runtime/syntax/sed.vim            |  80 +++---
 runtime/syntax/sendpr.vim         |   7 +-
 runtime/syntax/sgml.vim           |   7 +-
 runtime/syntax/sgmldecl.vim       |  43 ++-
 runtime/syntax/sgmllnx.vim        |  45 ++--
 runtime/syntax/sh.vim             |   7 +-
 runtime/syntax/sicad.vim          |  77 ++----
 runtime/syntax/simula.vim         |  68 +++--
 runtime/syntax/sinda.vim          |  59 ++---
 runtime/syntax/sindacmp.vim       |  33 +--
 runtime/syntax/sindaout.vim       |  49 ++--
 runtime/syntax/sisu.vim           |   6 +-
 runtime/syntax/skill.vim          |  57 ++--
 runtime/syntax/sl.vim             |  73 +++---
 runtime/syntax/slang.vim          |  77 +++---
 runtime/syntax/slice.vim          |  49 ++--
 runtime/syntax/slrnrc.vim         |  71 +++--
 runtime/syntax/slrnsc.vim         |  57 ++--
 runtime/syntax/sm.vim             |  48 ++--
 runtime/syntax/smarty.vim         |  38 ++-
 runtime/syntax/smcl.vim           |   5 +-
 runtime/syntax/smil.vim           |  57 ++--
 runtime/syntax/smith.vim          |  31 +--
 runtime/syntax/sml.vim            |  91 +++----
 runtime/syntax/snnsnet.vim        |  28 +-
 runtime/syntax/snnspat.vim        |  34 +--
 runtime/syntax/snnsres.vim        |  28 +-
 runtime/syntax/snobol4.vim        |  77 +++---
 runtime/syntax/spec.vim           | 135 +++++-----
 runtime/syntax/specman.vim        |  81 +++---
 runtime/syntax/spice.vim          |  39 +--
 runtime/syntax/splint.vim         | 111 ++++----
 runtime/syntax/spup.vim           | 127 +++++----
 runtime/syntax/spyce.vim          |  17 +-
 runtime/syntax/sql.vim            |   7 +-
 runtime/syntax/sqlanywhere.vim    |   7 +-
 runtime/syntax/sqlforms.vim       |  50 ++--
 runtime/syntax/sqlhana.vim        |   7 +-
 runtime/syntax/sqlinformix.vim    |  59 ++---
 runtime/syntax/sqlj.vim           |  37 +--
 runtime/syntax/sqr.vim            | 113 +++-----
 runtime/syntax/squid.vim          |  43 ++-
 runtime/syntax/srec.vim           |  49 ++--
 runtime/syntax/sshconfig.vim      |  74 +++---
 runtime/syntax/sshdconfig.vim     |  80 +++---
 runtime/syntax/st.vim             |  43 ++-
 runtime/syntax/stata.vim          |   5 +-
 runtime/syntax/stp.vim            |  55 ++--
 runtime/syntax/strace.vim         |  50 ++--
 runtime/syntax/svn.vim            |  39 +--
 runtime/syntax/systemverilog.vim  |  42 +--
 runtime/syntax/tads.vim           |  87 +++----
 runtime/syntax/tags.vim           |  33 +--
 runtime/syntax/tak.vim            |  61 ++---
 runtime/syntax/takcmp.vim         |  37 +--
 runtime/syntax/takout.vim         |  47 ++--
 runtime/syntax/taskdata.vim       |   7 +-
 runtime/syntax/taskedit.vim       |   7 +-
 runtime/syntax/tasm.vim           |  47 ++--
 runtime/syntax/tcl.vim            |  77 +++---
 runtime/syntax/tex.vim            |  39 +--
 runtime/syntax/texinfo.vim        |  69 +++--
 runtime/syntax/texmf.vim          |  58 ++---
 runtime/syntax/tf.vim             |  71 +++--
 runtime/syntax/tli.vim            |  37 +--
 runtime/syntax/tpp.vim            |  59 ++---
 runtime/syntax/trasys.vim         |  63 ++---
 runtime/syntax/trustees.vim       |   5 +-
 runtime/syntax/tsalt.vim          |  75 +++---
 runtime/syntax/tsscl.vim          |  53 ++--
 runtime/syntax/tssgm.vim          |  49 ++--
 runtime/syntax/tssop.vim          |  39 +--
 runtime/syntax/uc.vim             | 103 ++++----
 runtime/syntax/uil.vim            |  56 ++--
 runtime/syntax/upstart.vim        |   5 +-
 runtime/syntax/vb.vim             |  63 ++---
 runtime/syntax/vera.vim           | 129 +++++----
 runtime/syntax/verilog.vim        |  57 ++--
 runtime/syntax/verilogams.vim     |  61 ++---
 runtime/syntax/vhdl.vim           |  55 ++--
 runtime/syntax/virata.vim         |  98 ++++---
 runtime/syntax/vmasm.vim          |  75 +++---
 runtime/syntax/vrml.vim           |  73 +++---
 runtime/syntax/vroom.vim          |   7 +-
 runtime/syntax/vsejcl.vim         |  35 +--
 runtime/syntax/wdiff.vim          |  26 +-
 runtime/syntax/web.vim            |  15 +-
 runtime/syntax/webmacro.vim       |  53 ++--
 runtime/syntax/winbatch.vim       |  41 ++-
 runtime/syntax/wml.vim            |  60 ++---
 runtime/syntax/wsml.vim           |  76 +++---
 runtime/syntax/xdefaults.vim      |  57 ++--
 runtime/syntax/xf86conf.vim       |   8 +-
 runtime/syntax/xkb.vim            |  62 ++---
 runtime/syntax/xmath.vim          |  65 ++---
 runtime/syntax/xpm.vim            |  31 +--
 runtime/syntax/xpm2.vim           |  36 +--
 runtime/syntax/xs.vim             |  47 ++--
 runtime/syntax/xxd.vim            |  27 +-
 runtime/syntax/yacc.vim           |   3 -
 runtime/syntax/z8a.vim            |  43 ++-
 420 files changed, 9255 insertions(+), 12890 deletions(-)

diff --git a/runtime/autoload/rubycomplete.vim b/runtime/autoload/rubycomplete.vim
index e1064c8a58..440dfd42e9 100644
--- a/runtime/autoload/rubycomplete.vim
+++ b/runtime/autoload/rubycomplete.vim
@@ -93,7 +93,7 @@ function! s:GetBufferRubyEntity( name, type, ... )
 
     let stopline = 1
 
-    let crex = '^\s*\<' . a:type . '\>\s*\<' . a:name . '\>\s*\(<\s*.*\s*\)\?'
+    let crex = '^\s*\<' . a:type . '\>\s*\<' . escape(a:name, '*') . '\>\s*\(<\s*.*\s*\)\?'
     let [lnum,lcol] = searchpos( crex, 'w' )
     "let [lnum,lcol] = searchpairpos( crex . '\zs', '', '\(end\|}\)', 'w' )
 
@@ -149,7 +149,7 @@ function! s:GetRubyVarType(v)
     let ctors = ctors.'\)'
 
     let fstr = '=\s*\([^ \t]\+.' . ctors .'\>\|[\[{"''/]\|%[xwQqr][(\[{@]\|[A-Za-z0-9@:\-()\.]\+...\?\|lambda\|&\)'
-    let sstr = ''.a:v.'\>\s*[+\-*/]*'.fstr
+    let sstr = ''.escape(a:v, '*').'\>\s*[+\-*/]*'.fstr
     let [lnum,lcol] = searchpos(sstr,'nb',stopline)
     if lnum != 0 && lcol != 0
         let str = matchstr(getline(lnum),fstr,lcol)
@@ -266,6 +266,28 @@ class VimRubyCompletion
     end
   end
 
+  def load_gems
+    fpath = VIM::evaluate("get(g:, 'rubycomplete_gemfile_path', 'Gemfile')")
+    return unless File.file?(fpath) && File.readable?(fpath)
+    want_bundler = VIM::evaluate("get(g:, 'rubycomplete_use_bundler')")
+    parse_file = !want_bundler
+    begin
+      require 'bundler'
+      Bundler.setup
+      Bundler.require
+    rescue Exception
+      parse_file = true
+    end
+    if parse_file
+      File.new(fpath).each_line do |line|
+        begin
+          require $1 if /\s*gem\s*['"]([^'"]+)/.match(line)
+        rescue Exception
+        end
+      end
+    end
+  end
+
   def load_buffer_class(name)
     dprint "load_buffer_class(%s) START" % name
     classdef = get_buffer_entity(name, 's:GetBufferRubyClass("%s")')
@@ -588,6 +610,10 @@ class VimRubyCompletion
       load_rails
     end
 
+    want_gems = VIM::evaluate("get(g:, 'rubycomplete_load_gemfile')")
+    load_gems unless want_gems.to_i.zero?
+    
+
     input = VIM::Buffer.current.line
     cpos = VIM::Window.current.cursor[1] - 1
     input = input[0..cpos]
@@ -678,7 +704,9 @@ class VimRubyCompletion
         cv = eval("self.class.constants")
         vartype = get_var_type( receiver )
         dprint "vartype: %s" % vartype
-        if vartype != ''
+
+        invalid_vartype = ['', "gets"]
+        if !invalid_vartype.include?(vartype)
           load_buffer_class( vartype )
 
           begin
@@ -706,7 +734,7 @@ class VimRubyCompletion
             methods.concat m.instance_methods(false)
           }
         end
-        variables += add_rails_columns( "#{vartype}" ) if vartype && vartype.length > 0
+        variables += add_rails_columns( "#{vartype}" ) if vartype && !invalid_vartype.include?(vartype)
 
       when /^\(?\s*[A-Za-z0-9:^@.%\/+*\(\)]+\.\.\.?[A-Za-z0-9:^@.%\/+*\(\)]+\s*\)?\.([^.]*)/
         message = $1
diff --git a/runtime/compiler/cucumber.vim b/runtime/compiler/cucumber.vim
index c020be6e3b..17ce3627c1 100644
--- a/runtime/compiler/cucumber.vim
+++ b/runtime/compiler/cucumber.vim
@@ -1,7 +1,7 @@
 " Vim compiler file
 " Compiler:	Cucumber
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2010 Aug 09
+" Last Change:	2016 Aug 29
 
 if exists("current_compiler")
   finish
@@ -19,7 +19,7 @@ CompilerSet makeprg=cucumber
 
 CompilerSet errorformat=
       \%W%m\ (Cucumber::Undefined),
-      \%E%m\ (%.%#),
+      \%E%m\ (%\\S%#),
       \%Z%f:%l,
       \%Z%f:%l:%.%#
 
diff --git a/runtime/compiler/haml.vim b/runtime/compiler/haml.vim
index b06a672df7..9464c3dc85 100644
--- a/runtime/compiler/haml.vim
+++ b/runtime/compiler/haml.vim
@@ -1,7 +1,7 @@
 " Vim compiler file
 " Compiler:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2013 May 30
+" Last Change:	2016 Aug 29
 
 if exists("current_compiler")
   finish
@@ -15,7 +15,7 @@ endif
 let s:cpo_save = &cpo
 set cpo-=C
 
-CompilerSet makeprg=haml\ -c
+CompilerSet makeprg=haml
 
 CompilerSet errorformat=
       \Haml\ %trror\ on\ line\ %l:\ %m,
diff --git a/runtime/compiler/rake.vim b/runtime/compiler/rake.vim
index 3bd9da0daf..8490f2a9e9 100644
--- a/runtime/compiler/rake.vim
+++ b/runtime/compiler/rake.vim
@@ -27,7 +27,11 @@ CompilerSet errorformat=
       \%\\s%#[%f:%l:\ %#%m,
       \%\\s%#%f:%l:\ %#%m,
       \%\\s%#%f:%l:,
-      \%m\ [%f:%l]:
+      \%m\ [%f:%l]:,
+      \%+Erake\ aborted!,
+      \%+EDon't\ know\ how\ to\ build\ task\ %.%#,
+      \%+Einvalid\ option:%.%#,
+      \%+Irake\ %\\S%\\+%\\s%\\+#\ %.%#
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/compiler/rspec.vim b/runtime/compiler/rspec.vim
index 7c340bab15..c77bd70da7 100644
--- a/runtime/compiler/rspec.vim
+++ b/runtime/compiler/rspec.vim
@@ -22,9 +22,10 @@ CompilerSet errorformat=
     \%f:%l:\ %tarning:\ %m,
     \%E%.%#:in\ `load':\ %f:%l:%m,
     \%E%f:%l:in\ `%*[^']':\ %m,
-    \%-Z\ \ \ \ \ \#\ %f:%l:%.%#,
+    \%-Z\ \ \ \ \ %\\+\#\ %f:%l:%.%#,
     \%E\ \ %\\d%\\+)%.%#,
     \%C\ \ \ \ \ %m,
+    \%C%\\s%#,
     \%-G%.%#
 
 let &cpo = s:cpo_save
diff --git a/runtime/compiler/rubyunit.vim b/runtime/compiler/rubyunit.vim
index 93a0c8e653..ed0639b581 100644
--- a/runtime/compiler/rubyunit.vim
+++ b/runtime/compiler/rubyunit.vim
@@ -17,6 +17,8 @@ let s:cpo_save = &cpo
 set cpo-=C
 
 CompilerSet makeprg=testrb
+" CompilerSet makeprg=ruby\ -Itest
+" CompilerSet makeprg=m
 
 CompilerSet errorformat=\%W\ %\\+%\\d%\\+)\ Failure:,
 			\%C%m\ [%f:%l]:,
diff --git a/runtime/compiler/sass.vim b/runtime/compiler/sass.vim
index 376a52b303..9c540ac443 100644
--- a/runtime/compiler/sass.vim
+++ b/runtime/compiler/sass.vim
@@ -1,7 +1,7 @@
 " Vim compiler file
 " Compiler:	Sass
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2013 May 30
+" Last Change:	2016 Aug 29
 
 if exists("current_compiler")
   finish
@@ -15,7 +15,7 @@ endif
 let s:cpo_save = &cpo
 set cpo-=C
 
-CompilerSet makeprg=sass\ -c
+CompilerSet makeprg=sass
 
 CompilerSet errorformat=
       \%f:%l:%m\ (Sass::Syntax%trror),
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 90575e3438..b40f91ff35 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -631,13 +631,17 @@ It's possible to form a variable name with curly braces, see
 
 Expression syntax summary, from least to most significant:
 
-|expr1| expr2 ? expr1 : expr1	if-then-else
+|expr1|	expr2
+	expr2 ? expr1 : expr1	if-then-else
 
-|expr2|	expr3 || expr3 ..	logical OR
+|expr2|	expr3
+	expr3 || expr3 ..	logical OR
 
-|expr3|	expr4 && expr4 ..	logical AND
+|expr3|	expr4
+	expr4 && expr4 ..	logical AND
 
-|expr4|	expr5 == expr5		equal
+|expr4|	expr5
+	expr5 == expr5		equal
 	expr5 != expr5		not equal
 	expr5 >	 expr5		greater than
 	expr5 >= expr5		greater than or equal
@@ -654,24 +658,28 @@ Expression syntax summary, from least to most significant:
 	expr5 is expr5		same |List| instance
 	expr5 isnot expr5	different |List| instance
 
-|expr5|	expr6 +	 expr6 ..	number addition or list concatenation
+|expr5|	expr6
+	expr6 +	 expr6 ..	number addition or list concatenation
 	expr6 -	 expr6 ..	number subtraction
 	expr6 .	 expr6 ..	string concatenation
 
-|expr6|	expr7 *	 expr7 ..	number multiplication
+|expr6|	expr7
+	expr7 *	 expr7 ..	number multiplication
 	expr7 /	 expr7 ..	number division
 	expr7 %	 expr7 ..	number modulo
 
-|expr7|	! expr7			logical NOT
+|expr7|	expr8
+	! expr7			logical NOT
 	- expr7			unary minus
 	+ expr7			unary plus
 
-|expr8|	expr8[expr1]		byte of a String or item of a |List|
+|expr8|	expr9
+	expr8[expr1]		byte of a String or item of a |List|
 	expr8[expr1 : expr1]	substring of a String or sublist of a |List|
 	expr8.name		entry in a |Dictionary|
 	expr8(expr1, ...)	function call with |Funcref| variable
 
-|expr9| number			number constant
+|expr9|	number			number constant
 	"string"		string constant, backslash is special
 	'string'		string constant, ' is doubled
 	[expr1, ...]		|List|
diff --git a/runtime/ftplugin/cucumber.vim b/runtime/ftplugin/cucumber.vim
index 2ec1a5976f..f4848d1c60 100644
--- a/runtime/ftplugin/cucumber.vim
+++ b/runtime/ftplugin/cucumber.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:	Cucumber
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2013 Jun 01
+" Last Change:	2016 Aug 29
 
 " Only do this when not done yet for this buffer
 if (exists("b:did_ftplugin"))
@@ -19,27 +19,23 @@ setlocal omnifunc=CucumberComplete
 let b:undo_ftplugin = "setl fo< com< cms< ofu<"
 
 let b:cucumber_root = expand('%:p:h:s?.*[\/]\%(features\|stories\)\zs[\/].*??')
+if !exists("b:cucumber_steps_glob")
+  let b:cucumber_steps_glob = b:cucumber_root.'/**/*.rb'
+endif
 
 if !exists("g:no_plugin_maps") && !exists("g:no_cucumber_maps")
-  nnoremap <silent><buffer> <C-]>       :<C-U>exe <SID>jump('edit',v:count)<CR>
-  nnoremap <silent><buffer> [<C-D>      :<C-U>exe <SID>jump('edit',v:count)<CR>
-  nnoremap <silent><buffer> ]<C-D>      :<C-U>exe <SID>jump('edit',v:count)<CR>
-  nnoremap <silent><buffer> <C-W>]      :<C-U>exe <SID>jump('split',v:count)<CR>
-  nnoremap <silent><buffer> <C-W><C-]>  :<C-U>exe <SID>jump('split',v:count)<CR>
-  nnoremap <silent><buffer> <C-W>d      :<C-U>exe <SID>jump('split',v:count)<CR>
-  nnoremap <silent><buffer> <C-W><C-D>  :<C-U>exe <SID>jump('split',v:count)<CR>
-  nnoremap <silent><buffer> <C-W>}      :<C-U>exe <SID>jump('pedit',v:count)<CR>
-  nnoremap <silent><buffer> [d          :<C-U>exe <SID>jump('pedit',v:count)<CR>
-  nnoremap <silent><buffer> ]d          :<C-U>exe <SID>jump('pedit',v:count)<CR>
+  cnoremap <SID>foldopen <Bar>if &foldopen =~# 'tag'<Bar>exe 'norm! zv'<Bar>endif
+  nnoremap <silent> <script> <buffer> [<C-D>      :<C-U>exe <SID>jump('edit',v:count)<SID>foldopen<CR>
+  nnoremap <silent> <script> <buffer> ]<C-D>      :<C-U>exe <SID>jump('edit',v:count)<SID>foldopen<CR>
+  nnoremap <silent> <script> <buffer> <C-W>d      :<C-U>exe <SID>jump('split',v:count)<SID>foldopen<CR>
+  nnoremap <silent> <script> <buffer> <C-W><C-D>  :<C-U>exe <SID>jump('split',v:count)<SID>foldopen<CR>
+  nnoremap <silent> <script> <buffer> [d          :<C-U>exe <SID>jump('pedit',v:count)<CR>
+  nnoremap <silent> <script> <buffer> ]d          :<C-U>exe <SID>jump('pedit',v:count)<CR>
   let b:undo_ftplugin .=
-        \ "|sil! nunmap <buffer> <C-]>" .
         \ "|sil! nunmap <buffer> [<C-D>" .
         \ "|sil! nunmap <buffer> ]<C-D>" .
-        \ "|sil! nunmap <buffer> <C-W>]" .
-        \ "|sil! nunmap <buffer> <C-W><C-]>" .
         \ "|sil! nunmap <buffer> <C-W>d" .
         \ "|sil! nunmap <buffer> <C-W><C-D>" .
-        \ "|sil! nunmap <buffer> <C-W>}" .
         \ "|sil! nunmap <buffer> [d" .
         \ "|sil! nunmap <buffer> ]d"
 endif
@@ -59,7 +55,7 @@ endfunction
 function! s:allsteps()
   let step_pattern = '\C^\s*\K\k*\>\s*(\=\s*\zs\S.\{-\}\ze\s*)\=\s*\%(do\|{\)\s*\%(|[^|]*|\s*\)\=\%($\|#\)'
   let steps = []
-  for file in split(glob(b:cucumber_root.'/**/*.rb'),"\n")
+  for file in split(glob(b:cucumber_steps_glob),"\n")
     let lines = readfile(file)
     let num = 0
     for line in lines
diff --git a/runtime/ftplugin/eruby.vim b/runtime/ftplugin/eruby.vim
index 9bb8e86ff3..32f3fb868f 100644
--- a/runtime/ftplugin/eruby.vim
+++ b/runtime/ftplugin/eruby.vim
@@ -27,7 +27,7 @@ elseif !exists("b:eruby_subtype")
   let s:lines = getline(1)."\n".getline(2)."\n".getline(3)."\n".getline(4)."\n".getline(5)."\n".getline("$")
   let b:eruby_subtype = matchstr(s:lines,'eruby_subtype=\zs\w\+')
   if b:eruby_subtype == ''
-    let b:eruby_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.erb\|\.eruby\|\.erubis\)\+$','',''),'\.\zs\w\+$')
+    let b:eruby_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.erb\|\.eruby\|\.erubis\)\+$','',''),'\.\zs\w\+\%(\ze+\w\+\)\=$')
   endif
   if b:eruby_subtype == 'rhtml'
     let b:eruby_subtype = 'html'
diff --git a/runtime/ftplugin/git.vim b/runtime/ftplugin/git.vim
index 5fe5b2b0c3..b3d5cff804 100644
--- a/runtime/ftplugin/git.vim
+++ b/runtime/ftplugin/git.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:	generic git output
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2013 May 30
+" Last Change:	2016 Aug 29
 
 " Only do this when not done yet for this buffer
 if (exists("b:did_ftplugin"))
@@ -12,6 +12,8 @@ let b:did_ftplugin = 1
 if !exists('b:git_dir')
   if expand('%:p') =~# '[\/]\.git[\/]modules[\/]'
     " Stay out of the way
+  elseif expand('%:p') =~# '[\/]\.git[\/]worktrees'
+    let b:git_dir = matchstr(expand('%:p'),'.*\.git[\/]worktrees[\/][^\/]\+\>')
   elseif expand('%:p') =~# '\.git\>'
     let b:git_dir = matchstr(expand('%:p'),'.*\.git\>')
   elseif $GIT_DIR != ''
diff --git a/runtime/ftplugin/gitcommit.vim b/runtime/ftplugin/gitcommit.vim
index e8619004bf..6767ff719e 100644
--- a/runtime/ftplugin/gitcommit.vim
+++ b/runtime/ftplugin/gitcommit.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:	git commit file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2013 May 30
+" Last Change:	2016 Aug 29
 
 " Only do this when not done yet for this buffer
 if (exists("b:did_ftplugin"))
@@ -11,15 +11,10 @@ endif
 runtime! ftplugin/git.vim
 let b:did_ftplugin = 1
 
-setlocal nomodeline tabstop=8 formatoptions-=croq formatoptions+=tl
-
-let b:undo_ftplugin = 'setl modeline< tabstop< formatoptions<'
-
-if &textwidth == 0
-  " make sure that log messages play nice with git-log on standard terminals
-  setlocal textwidth=72
-  let b:undo_ftplugin .= "|setl tw<"
-endif
+setlocal comments=:# commentstring=#\ %s
+setlocal nomodeline tabstop=8 formatoptions+=tl textwidth=72
+setlocal formatoptions-=c formatoptions-=r formatoptions-=o formatoptions-=q
+let b:undo_ftplugin = 'setl modeline< tabstop< formatoptions< tw< com< cms<'
 
 if exists("g:no_gitcommit_commands") || v:version < 700
   finish
@@ -31,6 +26,8 @@ endif
 
 command! -bang -bar -buffer -complete=custom,s:diffcomplete -nargs=* DiffGitCached :call s:gitdiffcached(<bang>0,b:git_dir,<f-args>)
 
+let b:undo_ftplugin = b:undo_ftplugin . "|delc DiffGitCached"
+
 function! s:diffcomplete(A,L,P)
   let args = ""
   if a:P <= match(a:L." -- "," -- ")+3
diff --git a/runtime/ftplugin/gitrebase.vim b/runtime/ftplugin/gitrebase.vim
index 0200ba1acc..6f73b5c499 100644
--- a/runtime/ftplugin/gitrebase.vim
+++ b/runtime/ftplugin/gitrebase.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:	git rebase --interactive
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2010 May 21
+" Last Change:	2016 Aug 29
 
 " Only do this when not done yet for this buffer
 if (exists("b:did_ftplugin"))
@@ -12,10 +12,11 @@ runtime! ftplugin/git.vim
 let b:did_ftplugin = 1
 
 setlocal comments=:# commentstring=#\ %s formatoptions-=t
+setlocal nomodeline
 if !exists("b:undo_ftplugin")
   let b:undo_ftplugin = ""
 endif
-let b:undo_ftplugin = b:undo_ftplugin."|setl com< cms< fo<"
+let b:undo_ftplugin = b:undo_ftplugin."|setl com< cms< fo< ml<"
 
 function! s:choose(word)
   s/^\(\w\+\>\)\=\(\s*\)\ze\x\{4,40\}\>/\=(strlen(submatch(1)) == 1 ? a:word[0] : a:word) . substitute(submatch(2),'^$',' ','')/e
diff --git a/runtime/ftplugin/haml.vim b/runtime/ftplugin/haml.vim
index 654f1fca90..e74530b556 100644
--- a/runtime/ftplugin/haml.vim
+++ b/runtime/ftplugin/haml.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2013 Jun 01
+" Last Change:	2016 Aug 29
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
diff --git a/runtime/ftplugin/markdown.vim b/runtime/ftplugin/markdown.vim
index 5d6ebecd8c..277ba94e8b 100644
--- a/runtime/ftplugin/markdown.vim
+++ b/runtime/ftplugin/markdown.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:		Markdown
 " Maintainer:		Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:		2013 May 30
+" Last Change:		2016 Aug 29
 
 if exists("b:did_ftplugin")
   finish
@@ -11,7 +11,7 @@ runtime! ftplugin/html.vim ftplugin/html_*.vim ftplugin/html/*.vim
 
 setlocal comments=fb:*,fb:-,fb:+,n:> commentstring=>\ %s
 setlocal formatoptions+=tcqln formatoptions-=r formatoptions-=o
-setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^[-*+]\\s\\+
+setlocal formatlistpat=^\\s*\\d\\+\\.\\s\\+\\\|^[-*+]\\s\\+\\\|^\\[^\\ze[^\\]]\\+\\]:
 
 if exists('b:undo_ftplugin')
   let b:undo_ftplugin .= "|setl cms< com< fo< flp<"
@@ -19,4 +19,32 @@ else
   let b:undo_ftplugin = "setl cms< com< fo< flp<"
 endif
 
+function! MarkdownFold()
+  let line = getline(v:lnum)
+
+  " Regular headers
+  let depth = match(line, '\(^#\+\)\@<=\( .*$\)\@=')
+  if depth > 0
+    return ">" . depth
+  endif
+
+  " Setext style headings
+  let nextline = getline(v:lnum + 1)
+  if (line =~ '^.\+$') && (nextline =~ '^=\+$')
+    return ">1"
+  endif
+
+  if (line =~ '^.\+$') && (nextline =~ '^-\+$')
+    return ">2"
+  endif
+
+  return "="
+endfunction
+
+if has("folding") && exists("g:markdown_folding")
+  setlocal foldexpr=MarkdownFold()
+  setlocal foldmethod=expr
+  let b:undo_ftplugin .= " foldexpr< foldmethod<"
+endif
+
 " vim:set sw=2:
diff --git a/runtime/ftplugin/ruby.vim b/runtime/ftplugin/ruby.vim
index 9630a940ab..84fb9930a4 100644
--- a/runtime/ftplugin/ruby.vim
+++ b/runtime/ftplugin/ruby.vim
@@ -28,12 +28,13 @@ if exists("loaded_matchit") && !exists("b:match_words")
 	\ ':' .
 	\ '\<\%(else\|elsif\|ensure\|when\|rescue\|break\|redo\|next\|retry\)\>' .
 	\ ':' .
-	\ '\<end\>' .
+        \ '\%(^\|[^.\:@$]\)\@<=\<end\:\@!\>' .
 	\ ',{:},\[:\],(:)'
 
   let b:match_skip =
 	\ "synIDattr(synID(line('.'),col('.'),0),'name') =~ '" .
 	\ "\\<ruby\\%(String\\|StringDelimiter\\|ASCIICode\\|Escape\\|" .
+        \ "Regexp\\|RegexpDelimiter\\|" .
 	\ "Interpolation\\|NoInterpolation\\|Comment\\|Documentation\\|" .
 	\ "ConditionalModifier\\|RepeatModifier\\|OptionalDo\\|" .
 	\ "Function\\|BlockArgument\\|KeywordAsMethod\\|ClassVariable\\|" .
@@ -43,7 +44,7 @@ endif
 setlocal formatoptions-=t formatoptions+=croql
 
 setlocal include=^\\s*\\<\\(load\\>\\\|require\\>\\\|autoload\\s*:\\=[\"']\\=\\h\\w*[\"']\\=,\\)
-setlocal includeexpr=substitute(substitute(v:fname,'::','/','g'),'$','.rb','')
+setlocal includeexpr=substitute(substitute(v:fname,'::','/','g'),'\%(\.rb\)\=$','.rb','')
 setlocal suffixesadd=.rb
 
 if exists("&ofu") && has("ruby")
@@ -66,32 +67,32 @@ if !exists('g:ruby_version_paths')
   let g:ruby_version_paths = {}
 endif
 
-function! s:query_path(root)
+function! s:query_path(root) abort
   let code = "print $:.join %q{,}"
-  if &shell =~# 'sh' && $PATH !~# '\s'
-    let prefix = 'env PATH='.$PATH.' '
+  if &shell =~# 'sh'
+    let prefix = 'env PATH='.shellescape($PATH).' '
   else
     let prefix = ''
   endif
   if &shellxquote == "'"
-    let path_check = prefix.'ruby -e "' . code . '"'
+    let path_check = prefix.'ruby --disable-gems -e "' . code . '"'
   else
-    let path_check = prefix."ruby -e '" . code . "'"
+    let path_check = prefix."ruby --disable-gems -e '" . code . "'"
   endif
 
   let cd = haslocaldir() ? 'lcd' : 'cd'
-  let cwd = getcwd()
+  let cwd = fnameescape(getcwd())
   try
     exe cd fnameescape(a:root)
     let path = split(system(path_check),',')
-    exe cd fnameescape(cwd)
+    exe cd cwd
     return path
   finally
-    exe cd fnameescape(cwd)
+    exe cd cwd
   endtry
 endfunction
 
-function! s:build_path(path)
+function! s:build_path(path) abort
   let path = join(map(copy(a:path), 'v:val ==# "." ? "" : v:val'), ',')
   if &g:path !~# '\v^\.%(,/%(usr|emx)/include)=,,$'
     let path = substitute(&g:path,',,$',',','') . ',' . path
@@ -101,7 +102,7 @@ endfunction
 
 if !exists('b:ruby_version') && !exists('g:ruby_path') && isdirectory(expand('%:p:h'))
   let s:version_file = findfile('.ruby-version', '.;')
-  if !empty(s:version_file)
+  if !empty(s:version_file) && filereadable(s:version_file)
     let b:ruby_version = get(readfile(s:version_file, '', 1), '')
     if !has_key(g:ruby_version_paths, b:ruby_version)
       let g:ruby_version_paths[b:ruby_version] = s:query_path(fnamemodify(s:version_file, ':p:h'))
@@ -135,7 +136,7 @@ if exists('s:ruby_paths') && stridx(&l:tags, join(map(copy(s:ruby_paths),'v:val.
   let &l:tags = &tags . ',' . join(map(copy(s:ruby_paths),'v:val."/tags"'),',')
 endif
 
-if has("gui_win32") && !exists("b:browsefilter")
+if (has("gui_win32") || has("gui_gtk")) && !exists("b:browsefilter")
   let b:browsefilter = "Ruby Source Files (*.rb)\t*.rb\n" .
                      \ "All Files (*.*)\t*.*\n"
 endif
@@ -145,7 +146,22 @@ let b:undo_ftplugin = "setl fo< inc< inex< sua< def< com< cms< path< tags< kp<"
       \."| if exists('&ofu') && has('ruby') | setl ofu< | endif"
       \."| if has('balloon_eval') && exists('+bexpr') | setl bexpr< | endif"
 
+function! s:map(mode, flags, map) abort
+  let from = matchstr(a:map, '\S\+')
+  if empty(mapcheck(from, a:mode))
+    exe a:mode.'map' '<buffer>'.(a:0 ? a:1 : '') a:map
+    let b:undo_ftplugin .= '|sil! '.a:mode.'unmap <buffer> '.from
+  endif
+endfunction
+
+cmap <buffer><script><expr> <Plug><cword> substitute(RubyCursorIdentifier(),'^$',"\022\027",'')
+cmap <buffer><script><expr> <Plug><cfile> substitute(RubyCursorFile(),'^$',"\022\006",'')
+let b:undo_ftplugin .= "| sil! cunmap <buffer> <Plug><cword>| sil! cunmap <buffer> <Plug><cfile>"
+
 if !exists("g:no_plugin_maps") && !exists("g:no_ruby_maps")
+  nmap <buffer><script> <SID>:  :<C-U>
+  nmap <buffer><script> <SID>c: :<C-U><C-R>=v:count ? v:count : ''<CR>
+
   nnoremap <silent> <buffer> [m :<C-U>call <SID>searchsyn('\<def\>','rubyDefine','b','n')<CR>
   nnoremap <silent> <buffer> ]m :<C-U>call <SID>searchsyn('\<def\>','rubyDefine','','n')<CR>
   nnoremap <silent> <buffer> [M :<C-U>call <SID>searchsyn('\<end\>','rubyDefine','b','n')<CR>
@@ -168,7 +184,7 @@ if !exists("g:no_plugin_maps") && !exists("g:no_ruby_maps")
         \."| sil! exe 'unmap <buffer> [[' | sil! exe 'unmap <buffer> ]]' | sil! exe 'unmap <buffer> []' | sil! exe 'unmap <buffer> ]['"
         \."| sil! exe 'unmap <buffer> [m' | sil! exe 'unmap <buffer> ]m' | sil! exe 'unmap <buffer> [M' | sil! exe 'unmap <buffer> ]M'"
 
-  if maparg('im','n') == ''
+  if maparg('im','x') == '' && maparg('im','o') == '' && maparg('am','x') == '' && maparg('am','o') == ''
     onoremap <silent> <buffer> im :<C-U>call <SID>wrap_i('[m',']M')<CR>
     onoremap <silent> <buffer> am :<C-U>call <SID>wrap_a('[m',']M')<CR>
     xnoremap <silent> <buffer> im :<C-U>call <SID>wrap_i('[m',']M')<CR>
@@ -178,7 +194,7 @@ if !exists("g:no_plugin_maps") && !exists("g:no_ruby_maps")
           \."| sil! exe 'xunmap <buffer> im' | sil! exe 'xunmap <buffer> am'"
   endif
 
-  if maparg('iM','n') == ''
+  if maparg('iM','x') == '' && maparg('iM','o') == '' && maparg('aM','x') == '' && maparg('aM','o') == ''
     onoremap <silent> <buffer> iM :<C-U>call <SID>wrap_i('[[','][')<CR>
     onoremap <silent> <buffer> aM :<C-U>call <SID>wrap_a('[[','][')<CR>
     xnoremap <silent> <buffer> iM :<C-U>call <SID>wrap_i('[[','][')<CR>
@@ -188,33 +204,24 @@ if !exists("g:no_plugin_maps") && !exists("g:no_ruby_maps")
           \."| sil! exe 'xunmap <buffer> iM' | sil! exe 'xunmap <buffer> aM'"
   endif
 
-  if maparg("\<C-]>",'n') == ''
-    nnoremap <silent> <buffer> <C-]>       :<C-U>exe  v:count1."tag <C-R>=RubyCursorIdentifier()<CR>"<CR>
-    nnoremap <silent> <buffer> g<C-]>      :<C-U>exe         "tjump <C-R>=RubyCursorIdentifier()<CR>"<CR>
-    nnoremap <silent> <buffer> g]          :<C-U>exe       "tselect <C-R>=RubyCursorIdentifier()<CR>"<CR>
-    nnoremap <silent> <buffer> <C-W>]      :<C-U>exe v:count1."stag <C-R>=RubyCursorIdentifier()<CR>"<CR>
-    nnoremap <silent> <buffer> <C-W><C-]>  :<C-U>exe v:count1."stag <C-R>=RubyCursorIdentifier()<CR>"<CR>
-    nnoremap <silent> <buffer> <C-W>g<C-]> :<C-U>exe        "stjump <C-R>=RubyCursorIdentifier()<CR>"<CR>
-    nnoremap <silent> <buffer> <C-W>g]     :<C-U>exe      "stselect <C-R>=RubyCursorIdentifier()<CR>"<CR>
-    nnoremap <silent> <buffer> <C-W>}      :<C-U>exe          "ptag <C-R>=RubyCursorIdentifier()<CR>"<CR>
-    nnoremap <silent> <buffer> <C-W>g}     :<C-U>exe        "ptjump <C-R>=RubyCursorIdentifier()<CR>"<CR>
-    let b:undo_ftplugin = b:undo_ftplugin
-          \."| sil! exe 'nunmap <buffer> <C-]>'| sil! exe 'nunmap <buffer> g<C-]>'| sil! exe 'nunmap <buffer> g]'"
-          \."| sil! exe 'nunmap <buffer> <C-W>]'| sil! exe 'nunmap <buffer> <C-W><C-]>'"
-          \."| sil! exe 'nunmap <buffer> <C-W>g<C-]>'| sil! exe 'nunmap <buffer> <C-W>g]'"
-          \."| sil! exe 'nunmap <buffer> <C-W>}'| sil! exe 'nunmap <buffer> <C-W>g}'"
-  endif
+  call s:map('c', '', '<C-R><C-W> <Plug><cword>')
+  call s:map('c', '', '<C-R><C-F> <Plug><cfile>')
 
-  if maparg("gf",'n') == ''
-    " By using findfile() rather than gf's normal behavior, we prevent
-    " erroneously editing a directory.
-    nnoremap <silent> <buffer> gf         :<C-U>exe <SID>gf(v:count1,"gf",'edit')<CR>
-    nnoremap <silent> <buffer> <C-W>f     :<C-U>exe <SID>gf(v:count1,"\<Lt>C-W>f",'split')<CR>
-    nnoremap <silent> <buffer> <C-W><C-F> :<C-U>exe <SID>gf(v:count1,"\<Lt>C-W>\<Lt>C-F>",'split')<CR>
-    nnoremap <silent> <buffer> <C-W>gf    :<C-U>exe <SID>gf(v:count1,"\<Lt>C-W>gf",'tabedit')<CR>
-    let b:undo_ftplugin = b:undo_ftplugin
-          \."| sil! exe 'nunmap <buffer> gf' | sil! exe 'nunmap <buffer> <C-W>f' | sil! exe 'nunmap <buffer> <C-W><C-F>' | sil! exe 'nunmap <buffer> <C-W>gf'"
-  endif
+  cmap <buffer><script><expr> <SID>tagzv &foldopen =~# 'tag' ? '<Bar>norm! zv' : ''
+  call s:map('n', '<silent>', '<C-]>       <SID>:exe  v:count1."tag <Plug><cword>"<SID>tagzv<CR>')
+  call s:map('n', '<silent>', 'g<C-]>      <SID>:exe         "tjump <Plug><cword>"<SID>tagzv<CR>')
+  call s:map('n', '<silent>', 'g]          <SID>:exe       "tselect <Plug><cword>"<SID>tagzv<CR>')
+  call s:map('n', '<silent>', '<C-W>]      <SID>:exe v:count1."stag <Plug><cword>"<SID>tagzv<CR>')
+  call s:map('n', '<silent>', '<C-W><C-]>  <SID>:exe v:count1."stag <Plug><cword>"<SID>tagzv<CR>')
+  call s:map('n', '<silent>', '<C-W>g<C-]> <SID>:exe        "stjump <Plug><cword>"<SID>tagzv<CR>')
+  call s:map('n', '<silent>', '<C-W>g]     <SID>:exe      "stselect <Plug><cword>"<SID>tagzv<CR>')
+  call s:map('n', '<silent>', '<C-W>}      <SID>:exe v:count1."ptag <Plug><cword>"<CR>')
+  call s:map('n', '<silent>', '<C-W>g}     <SID>:exe        "ptjump <Plug><cword>"<CR>')
+
+  call s:map('n', '<silent>', 'gf           <SID>c:find <Plug><cfile><CR>')
+  call s:map('n', '<silent>', '<C-W>f      <SID>c:sfind <Plug><cfile><CR>')
+  call s:map('n', '<silent>', '<C-W><C-F>  <SID>c:sfind <Plug><cfile><CR>')
+  call s:map('n', '<silent>', '<C-W>gf   <SID>c:tabfind <Plug><cfile><CR>')
 endif
 
 let &cpo = s:cpo_save
@@ -225,7 +232,7 @@ if exists("g:did_ruby_ftplugin_functions")
 endif
 let g:did_ruby_ftplugin_functions = 1
 
-function! RubyBalloonexpr()
+function! RubyBalloonexpr() abort
   if !exists('s:ri_found')
     let s:ri_found = executable('ri')
   endif
@@ -274,13 +281,13 @@ function! RubyBalloonexpr()
   endif
 endfunction
 
-function! s:searchsyn(pattern,syn,flags,mode)
+function! s:searchsyn(pattern, syn, flags, mode) abort
+  let cnt = v:count1
   norm! m'
   if a:mode ==# 'v'
     norm! gv
   endif
   let i = 0
-  let cnt = v:count ? v:count : 1
   while i < cnt
     let i = i + 1
     let line = line('.')
@@ -296,11 +303,11 @@ function! s:searchsyn(pattern,syn,flags,mode)
   endwhile
 endfunction
 
-function! s:synname()
+function! s:synname() abort
   return synIDattr(synID(line('.'),col('.'),0),'name')
 endfunction
 
-function! s:wrap_i(back,forward)
+function! s:wrap_i(back,forward) abort
   execute 'norm k'.a:forward
   let line = line('.')
   execute 'norm '.a:back
@@ -310,7 +317,7 @@ function! s:wrap_i(back,forward)
   execute 'norm jV'.a:forward.'k'
 endfunction
 
-function! s:wrap_a(back,forward)
+function! s:wrap_a(back,forward) abort
   execute 'norm '.a:forward
   if line('.') < line('$') && getline(line('.')+1) ==# ''
     let after = 1
@@ -328,37 +335,55 @@ function! s:wrap_a(back,forward)
   endif
 endfunction
 
-function! RubyCursorIdentifier()
+function! RubyCursorIdentifier() abort
   let asciicode    = '\%(\w\|[]})\"'."'".']\)\@<!\%(?\%(\\M-\\C-\|\\C-\\M-\|\\M-\\c\|\\c\\M-\|\\c\|\\C-\|\\M-\)\=\%(\\\o\{1,3}\|\\x\x\{1,2}\|\\\=\S\)\)'
   let number       = '\%(\%(\w\|[]})\"'."'".']\s*\)\@<!-\)\=\%(\<[[:digit:]_]\+\%(\.[[:digit:]_]\+\)\=\%([Ee][[:digit:]_]\+\)\=\>\|\<0[xXbBoOdD][[:xdigit:]_]\+\>\)\|'.asciicode
   let operator     = '\%(\[\]\|<<\|<=>\|[!<>]=\=\|===\=\|[!=]\~\|>>\|\*\*\|\.\.\.\=\|=>\|[~^&|*/%+-]\)'
-  let method       = '\%(\<[_a-zA-Z]\w*\>\%([?!]\|\s*=>\@!\)\=\)'
+  let method       = '\%(\.[_a-zA-Z]\w*\s*=>\@!\|\<[_a-zA-Z]\w*\>[?!]\=\)'
   let global       = '$\%([!$&"'."'".'*+,./:;<=>?@\`~]\|-\=\w\+\>\)'
   let symbolizable = '\%(\%(@@\=\)\w\+\>\|'.global.'\|'.method.'\|'.operator.'\)'
   let pattern      = '\C\s*\%('.number.'\|\%(:\@<!:\)\='.symbolizable.'\)'
   let [lnum, col]  = searchpos(pattern,'bcn',line('.'))
   let raw          = matchstr(getline('.')[col-1 : ],pattern)
-  let stripped     = substitute(substitute(raw,'\s\+=$','=',''),'^\s*:\=','','')
+  let stripped     = substitute(substitute(raw,'\s\+=$','=',''),'^\s*[:.]\=','','')
   return stripped == '' ? expand("<cword>") : stripped
 endfunction
 
-function! s:gf(count,map,edit) abort
-  if getline('.') =~# '^\s*require_relative\s*\(["'']\).*\1\s*$'
-    let target = matchstr(getline('.'),'\(["'']\)\zs.\{-\}\ze\1')
-    return a:edit.' %:h/'.target.'.rb'
-  elseif getline('.') =~# '^\s*\%(require[( ]\|load[( ]\|autoload[( ]:\w\+,\)\s*\s*\%(::\)\=File\.expand_path(\(["'']\)\.\./.*\1,\s*__FILE__)\s*$'
-    let target = matchstr(getline('.'),'\(["'']\)\.\./\zs.\{-\}\ze\1')
-    return a:edit.' %:h/'.target.'.rb'
+function! RubyCursorFile() abort
+  let isfname = &isfname
+  try
+    set isfname+=:
+    let cfile = expand('<cfile>')
+  finally
+    let isfname = &isfname
+  endtry
+  let pre = matchstr(strpart(getline('.'), 0, col('.')-1), '.*\f\@<!')
+  let post = matchstr(strpart(getline('.'), col('.')), '\f\@!.*')
+  let ext = getline('.') =~# '^\s*\%(require\%(_relative\)\=\|autoload\)\>' && cfile !~# '\.rb$' ? '.rb' : ''
+  if s:synname() ==# 'rubyConstant'
+    let cfile = substitute(cfile,'\.\w\+[?!=]\=$','','')
+    let cfile = substitute(cfile,'::','/','g')
+    let cfile = substitute(cfile,'\(\u\+\)\(\u\l\)','\1_\2', 'g')
+    let cfile = substitute(cfile,'\(\l\|\d\)\(\u\)','\1_\2', 'g')
+    return tolower(cfile) . '.rb'
+  elseif getline('.') =~# '^\s*require_relative\s*\(["'']\).*\1\s*$'
+    let cfile = expand('%:p:h') . '/' . matchstr(getline('.'),'\(["'']\)\zs.\{-\}\ze\1') . ext
+  elseif getline('.') =~# '^\s*\%(require[( ]\|load[( ]\|autoload[( ]:\w\+,\)\s*\%(::\)\=File\.expand_path(\(["'']\)\.\./.*\1,\s*__FILE__)\s*$'
+    let target = matchstr(getline('.'),'\(["'']\)\.\.\zs/.\{-\}\ze\1')
+    let cfile = expand('%:p:h') . target . ext
   elseif getline('.') =~# '^\s*\%(require \|load \|autoload :\w\+,\)\s*\(["'']\).*\1\s*$'
-    let target = matchstr(getline('.'),'\(["'']\)\zs.\{-\}\ze\1')
+    let cfile = matchstr(getline('.'),'\(["'']\)\zs.\{-\}\ze\1') . ext
+  elseif pre.post =~# '\<File.expand_path[( ].*[''"]\{2\}, *__FILE__\>' && cfile =~# '^\.\.'
+    let cfile = expand('%:p:h') . strpart(cfile, 2)
   else
-    let target = expand('<cfile>')
+    return substitute(cfile, '\C\v^(.*):(\d+)%(:in)=$', '+\2 \1', '')
   endif
-  let found = findfile(target, &path, a:count)
-  if found ==# ''
-    return 'norm! '.a:count.a:map
+  let cwdpat = '^\M' . substitute(getcwd(), '[\/]', '\\[\\/]', 'g').'\ze\[\/]'
+  let cfile = substitute(cfile, cwdpat, '.', '')
+  if fnameescape(cfile) !=# cfile
+    return '+ '.fnameescape(cfile)
   else
-    return a:edit.' '.fnameescape(found)
+    return cfile
   endif
 endfunction
 
diff --git a/runtime/ftplugin/sass.vim b/runtime/ftplugin/sass.vim
index 64232a0894..d6909e7ad5 100644
--- a/runtime/ftplugin/sass.vim
+++ b/runtime/ftplugin/sass.vim
@@ -1,7 +1,7 @@
 " Vim filetype plugin
 " Language:	Sass
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2010 Jul 26
+" Last Change:	2016 Aug 29
 
 " Only do this when not done yet for this buffer
 if exists("b:did_ftplugin")
@@ -9,8 +9,9 @@ if exists("b:did_ftplugin")
 endif
 let b:did_ftplugin = 1
 
-let b:undo_ftplugin = "setl cms< def< inc< inex< ofu< sua<"
+let b:undo_ftplugin = "setl com< cms< def< inc< inex< ofu< sua<"
 
+setlocal comments=://
 setlocal commentstring=//\ %s
 setlocal define=^\\s*\\%(@mixin\\\|=\\)
 setlocal includeexpr=substitute(v:fname,'\\%(.*/\\\|^\\)\\zs','_','')
diff --git a/runtime/ftplugin/scss.vim b/runtime/ftplugin/scss.vim
index 981fb1b881..287d298f4a 100644
--- a/runtime/ftplugin/scss.vim
+++ b/runtime/ftplugin/scss.vim
@@ -1,12 +1,13 @@
 " Vim filetype plugin
 " Language:	SCSS
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2010 Jul 26
+" Last Change:	2016 Aug 29
 
 if exists("b:did_ftplugin")
   finish
 endif
 
 runtime! ftplugin/sass.vim
+setlocal comments=s1:/*,mb:*,ex:*/,://
 
 " vim:set sw=2:
diff --git a/runtime/indent/cucumber.vim b/runtime/indent/cucumber.vim
index 965c7786ed..999b8d6a76 100644
--- a/runtime/indent/cucumber.vim
+++ b/runtime/indent/cucumber.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Cucumber
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2013 May 30
+" Last Change:	2016 Aug 29
 
 if exists("b:did_indent")
   finish
@@ -27,6 +27,7 @@ function! GetCucumberIndent()
   let line  = getline(prevnonblank(v:lnum-1))
   let cline = getline(v:lnum)
   let nline = getline(nextnonblank(v:lnum+1))
+  let sw = exists('*shiftwidth') ? shiftwidth() : &sw
   let syn = s:syn(prevnonblank(v:lnum-1))
   let csyn = s:syn(v:lnum)
   let nsyn = s:syn(nextnonblank(v:lnum+1))
@@ -35,38 +36,38 @@ function! GetCucumberIndent()
     return 0
   elseif csyn ==# 'cucumberExamples' || cline =~# '^\s*\%(Examples\|Scenarios\):'
     " examples heading
-    return 2 * &sw
+    return 2 * sw
   elseif csyn =~# '^cucumber\%(Background\|Scenario\|ScenarioOutline\)$' || cline =~# '^\s*\%(Background\|Scenario\|Scenario Outline\):'
     " background, scenario or outline heading
-    return &sw
+    return sw
   elseif syn ==# 'cucumberFeature' || line =~# '^\s*Feature:'
     " line after feature heading
-    return &sw
+    return sw
   elseif syn ==# 'cucumberExamples' || line =~# '^\s*\%(Examples\|Scenarios\):'
     " line after examples heading
-    return 3 * &sw
+    return 3 * sw
   elseif syn =~# '^cucumber\%(Background\|Scenario\|ScenarioOutline\)$' || line =~# '^\s*\%(Background\|Scenario\|Scenario Outline\):'
     " line after background, scenario or outline heading
-    return 2 * &sw
+    return 2 * sw
   elseif cline =~# '^\s*[@#]' && (nsyn == 'cucumberFeature' || nline =~# '^\s*Feature:' || indent(prevnonblank(v:lnum-1)) <= 0)
     " tag or comment before a feature heading
     return 0
   elseif cline =~# '^\s*@'
     " other tags
-    return &sw
+    return sw
   elseif cline =~# '^\s*[#|]' && line =~# '^\s*|'
     " mid-table
     " preserve indent
     return indent(prevnonblank(v:lnum-1))
   elseif cline =~# '^\s*|' && line =~# '^\s*[^|]'
     " first line of a table, relative indent
-    return indent(prevnonblank(v:lnum-1)) + &sw
+    return indent(prevnonblank(v:lnum-1)) + sw
   elseif cline =~# '^\s*[^|]' && line =~# '^\s*|'
     " line after a table, relative unindent
-    return indent(prevnonblank(v:lnum-1)) - &sw
+    return indent(prevnonblank(v:lnum-1)) - sw
   elseif cline =~# '^\s*#' && getline(v:lnum-1) =~ '^\s*$' && (nsyn =~# '^cucumber\%(Background\|Scenario\|ScenarioOutline\)$' || nline =~# '^\s*\%(Background\|Scenario\|Scenario Outline\):')
     " comments on scenarios
-    return &sw
+    return sw
   endif
   return indent(prevnonblank(v:lnum-1))
 endfunction
diff --git a/runtime/indent/eruby.vim b/runtime/indent/eruby.vim
index 80cab7000e..afabd4fe5b 100644
--- a/runtime/indent/eruby.vim
+++ b/runtime/indent/eruby.vim
@@ -19,6 +19,9 @@ else
 endif
 unlet! b:did_indent
 
+" Force HTML indent to not keep state.
+let b:html_indent_usestate = 0
+
 if &l:indentexpr == ''
   if &l:cindent
     let &l:indentexpr = 'cindent(v:lnum)'
@@ -38,7 +41,18 @@ if exists("*GetErubyIndent")
   finish
 endif
 
+" this file uses line continuations
+let s:cpo_sav = &cpo
+set cpo&vim
+
 function! GetErubyIndent(...)
+  " The value of a single shift-width
+  if exists('*shiftwidth')
+    let sw = shiftwidth()
+  else
+    let sw = &sw
+  endif
+
   if a:0 && a:1 == '.'
     let v:lnum = line('.')
   elseif a:0 && a:1 =~ '^\d'
@@ -52,31 +66,44 @@ function! GetErubyIndent(...)
     let ind = GetRubyIndent(v:lnum)
   else
     exe "let ind = ".b:eruby_subtype_indentexpr
+
+    " Workaround for Andy Wokula's HTML indent. This should be removed after
+    " some time, since the newest version is fixed in a different way.
+    if b:eruby_subtype_indentexpr =~# '^HtmlIndent('
+	  \ && exists('b:indent')
+	  \ && type(b:indent) == type({})
+	  \ && has_key(b:indent, 'lnum')
+      " Force HTML indent to not keep state
+      let b:indent.lnum = -1
+    endif
   endif
   let lnum = prevnonblank(v:lnum-1)
   let line = getline(lnum)
   let cline = getline(v:lnum)
   if cline =~# '^\s*<%[-=]\=\s*\%(}\|end\|else\|\%(ensure\|rescue\|elsif\|when\).\{-\}\)\s*\%([-=]\=%>\|$\)'
-    let ind = ind - &sw
+    let ind = ind - sw
   endif
   if line =~# '\S\s*<%[-=]\=\s*\%(}\|end\).\{-\}\s*\%([-=]\=%>\|$\)'
-    let ind = ind - &sw
+    let ind = ind - sw
   endif
   if line =~# '\%({\|\<do\)\%(\s*|[^|]*|\)\=\s*[-=]\=%>'
-    let ind = ind + &sw
+    let ind = ind + sw
   elseif line =~# '<%[-=]\=\s*\%(module\|class\|def\|if\|for\|while\|until\|else\|elsif\|case\|when\|unless\|begin\|ensure\|rescue\)\>.*%>'
-    let ind = ind + &sw
+    let ind = ind + sw
   endif
   if line =~# '^\s*<%[=#-]\=\s*$' && cline !~# '^\s*end\>'
-    let ind = ind + &sw
+    let ind = ind + sw
   endif
-  if line !~# '^\s*<%' && line =~# '%>\s*$'
-    let ind = ind - &sw
+  if line !~# '^\s*<%' && line =~# '%>\s*$' && line !~# '^\s*end\>'
+    let ind = ind - sw
   endif
   if cline =~# '^\s*[-=]\=%>\s*$'
-    let ind = ind - &sw
+    let ind = ind - sw
   endif
   return ind
 endfunction
 
+let &cpo = s:cpo_sav
+unlet! s:cpo_sav
+
 " vim:set sw=2 sts=2 ts=8 noet:
diff --git a/runtime/indent/fortran.vim b/runtime/indent/fortran.vim
index be2f0866d5..00cced4c9c 100644
--- a/runtime/indent/fortran.vim
+++ b/runtime/indent/fortran.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
 " Version:	0.45
-" Last Change:	2016 Aug. 18
+" Last Change:	2016 Aug. 29
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
 " Usage:	For instructions, do :help fortran-indent from Vim
 " Credits:
@@ -152,9 +152,6 @@ function FortranGetIndent(lnum)
   if prevstat =~ '&\s*$' && prev2stat !~ '&\s*$'
     let ind = ind + shiftwidth()
   endif
-  if prevstat =~ '&\s*$' && prevstat =~ '\<else\s*if\>'
-    let ind = ind - shiftwidth()
-  endif
   "Line after last continuation line
   if prevstat !~ '&\s*$' && prev2stat =~ '&\s*$' && prevstat !~? '\<then\>'
     let ind = ind - shiftwidth()
diff --git a/runtime/indent/gitconfig.vim b/runtime/indent/gitconfig.vim
index 7d5d44b779..480c96d1b9 100644
--- a/runtime/indent/gitconfig.vim
+++ b/runtime/indent/gitconfig.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	git config file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2013 May 30
+" Last Change:	2016 Aug 29
 
 if exists("b:did_indent")
   finish
@@ -20,17 +20,18 @@ if exists("*GetGitconfigIndent")
 endif
 
 function! GetGitconfigIndent()
+  let sw    = exists('*shiftwidth') ? shiftwidth() : &sw
   let line  = getline(prevnonblank(v:lnum-1))
   let cline = getline(v:lnum)
   if line =~  '\\\@<!\%(\\\\\)*\\$'
     " odd number of slashes, in a line continuation
-    return 2 * &sw
+    return 2 * sw
   elseif cline =~ '^\s*\['
     return 0
   elseif cline =~ '^\s*\a'
-    return &sw
+    return sw
   elseif cline == ''       && line =~ '^\['
-    return &sw
+    return sw
   else
     return -1
   endif
diff --git a/runtime/indent/haml.vim b/runtime/indent/haml.vim
index c47a8a59c7..c3935af9e9 100644
--- a/runtime/indent/haml.vim
+++ b/runtime/indent/haml.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2013 May 30
+" Last Change:	2016 Aug 29
 
 if exists("b:did_indent")
   finish
@@ -37,10 +37,11 @@ function! GetHamlIndent()
   let line = substitute(line,'^\s\+','','')
   let indent = indent(lnum)
   let cindent = indent(v:lnum)
+  let sw = exists('*shiftwidth') ? shiftwidth() : &sw
   if cline =~# '\v^-\s*%(elsif|else|when)>'
-    let indent = cindent < indent ? cindent : indent - &sw
+    let indent = cindent < indent ? cindent : indent - sw
   endif
-  let increase = indent + &sw
+  let increase = indent + sw
   if indent == indent(lnum)
     let indent = cindent <= indent ? -1 : increase
   endif
diff --git a/runtime/indent/liquid.vim b/runtime/indent/liquid.vim
index 01e7223696..f8e1c83079 100644
--- a/runtime/indent/liquid.vim
+++ b/runtime/indent/liquid.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:     Liquid
 " Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2013 May 30
+" Last Change:	2016 Aug 29
 
 if exists('b:did_indent')
   finish
@@ -54,9 +54,10 @@ function! GetLiquidIndent(...)
   let line  = substitute(line,'\C^\%(\s*{%\s*end\w*\s*%}\)\+','','')
   let line .= matchstr(cline,'\C^\%(\s*{%\s*end\w*\s*%}\)\+')
   let cline = substitute(cline,'\C^\%(\s*{%\s*end\w*\s*%}\)\+','','')
-  let ind += &sw * s:count(line,'{%\s*\%(if\|elsif\|else\|unless\|ifchanged\|case\|when\|for\|empty\|tablerow\|capture\)\>')
-  let ind -= &sw * s:count(line,'{%\s*end\%(if\|unless\|ifchanged\|case\|for\|tablerow\|capture\)\>')
-  let ind -= &sw * s:count(cline,'{%\s*\%(elsif\|else\|when\|empty\)\>')
-  let ind -= &sw * s:count(cline,'{%\s*end\w*$')
+  let sw = exists('*shiftwidth') ? shiftwidth() : &sw
+  let ind += sw * s:count(line,'{%\s*\%(if\|elsif\|else\|unless\|ifchanged\|case\|when\|for\|empty\|tablerow\|capture\)\>')
+  let ind -= sw * s:count(line,'{%\s*end\%(if\|unless\|ifchanged\|case\|for\|tablerow\|capture\)\>')
+  let ind -= sw * s:count(cline,'{%\s*\%(elsif\|else\|when\|empty\)\>')
+  let ind -= sw * s:count(cline,'{%\s*end\w*$')
   return ind
 endfunction
diff --git a/runtime/indent/ruby.vim b/runtime/indent/ruby.vim
index 095b3a43c6..4f87ec7823 100644
--- a/runtime/indent/ruby.vim
+++ b/runtime/indent/ruby.vim
@@ -13,12 +13,23 @@ if exists("b:did_indent")
 endif
 let b:did_indent = 1
 
+if !exists('g:ruby_indent_access_modifier_style')
+  " Possible values: "normal", "indent", "outdent"
+  let g:ruby_indent_access_modifier_style = 'normal'
+endif
+
+if !exists('g:ruby_indent_block_style')
+  " Possible values: "expression", "do"
+  let g:ruby_indent_block_style = 'expression'
+endif
+
 setlocal nosmartindent
 
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetRubyIndent(v:lnum)
-setlocal indentkeys=0{,0},0),0],!^F,o,O,e
+setlocal indentkeys=0{,0},0),0],!^F,o,O,e,:,.
 setlocal indentkeys+==end,=else,=elsif,=when,=ensure,=rescue,==begin,==end
+setlocal indentkeys+==private,=protected,=public
 
 " Only define the function once.
 if exists("*GetRubyIndent")
@@ -34,7 +45,7 @@ set cpo&vim
 " Regex of syntax group names that are or delimit strings/symbols or are comments.
 let s:syng_strcom = '\<ruby\%(Regexp\|RegexpDelimiter\|RegexpEscape' .
       \ '\|Symbol\|String\|StringDelimiter\|StringEscape\|ASCIICode' .
-      \ '\|Interpolation\|NoInterpolation\|Comment\|Documentation\)\>'
+      \ '\|Interpolation\|InterpolationDelimiter\|NoInterpolation\|Comment\|Documentation\)\>'
 
 " Regex of syntax group names that are strings.
 let s:syng_string =
@@ -49,9 +60,10 @@ let s:skip_expr =
       \ "synIDattr(synID(line('.'),col('.'),1),'name') =~ '".s:syng_strcom."'"
 
 " Regex used for words that, at the start of a line, add a level of indent.
-let s:ruby_indent_keywords = '^\s*\zs\<\%(module\|class\|def\|if\|for' .
-      \ '\|while\|until\|else\|elsif\|case\|when\|unless\|begin\|ensure' .
-      \ '\|rescue\):\@!\>' .
+let s:ruby_indent_keywords =
+      \ '^\s*\zs\<\%(module\|class\|if\|for' .
+      \   '\|while\|until\|else\|elsif\|case\|when\|unless\|begin\|ensure\|rescue' .
+      \   '\|\%(public\|protected\|private\)\=\s*def\):\@!\>' .
       \ '\|\%([=,*/%+-]\|<<\|>>\|:\s\)\s*\zs' .
       \    '\<\%(if\|for\|while\|until\|case\|unless\|begin\):\@!\>'
 
@@ -64,7 +76,8 @@ let s:ruby_deindent_keywords =
 " TODO: the do here should be restricted somewhat (only at end of line)?
 let s:end_start_regex =
       \ '\C\%(^\s*\|[=,*/%+\-|;{]\|<<\|>>\|:\s\)\s*\zs' .
-      \ '\<\%(module\|class\|def\|if\|for\|while\|until\|case\|unless\|begin\):\@!\>' .
+      \ '\<\%(module\|class\|if\|for\|while\|until\|case\|unless\|begin' .
+      \   '\|\%(public\|protected\|private\)\=\s*def\):\@!\>' .
       \ '\|\%(^\|[^.:@$]\)\@<=\<do:\@!\>'
 
 " Regex that defines the middle-match for the 'end' keyword.
@@ -82,16 +95,35 @@ let s:end_skip_expr = s:skip_expr .
 let s:non_bracket_continuation_regex = '\%([\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)\s*\%(#.*\)\=$'
 
 " Regex that defines continuation lines.
-" TODO: this needs to deal with if ...: and so on
 let s:continuation_regex =
       \ '\%(%\@<![({[\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)\s*\%(#.*\)\=$'
 
+" Regex that defines continuable keywords
+let s:continuable_regex =
+      \ '\C\%(^\s*\|[=,*/%+\-|;{]\|<<\|>>\|:\s\)\s*\zs' .
+      \ '\<\%(if\|for\|while\|until\|unless\):\@!\>'
+
 " Regex that defines bracket continuations
 let s:bracket_continuation_regex = '%\@<!\%([({[]\)\s*\%(#.*\)\=$'
 
+" Regex that defines dot continuations
+let s:dot_continuation_regex = '%\@<!\.\s*\%(#.*\)\=$'
+
+" Regex that defines backslash continuations
+let s:backslash_continuation_regex = '%\@<!\\\s*$'
+
+" Regex that defines end of bracket continuation followed by another continuation
+let s:bracket_switch_continuation_regex = '^\([^(]\+\zs).\+\)\+'.s:continuation_regex
+
 " Regex that defines the first part of a splat pattern
 let s:splat_regex = '[[,(]\s*\*\s*\%(#.*\)\=$'
 
+" Regex that describes all indent access modifiers
+let s:access_modifier_regex = '\C^\s*\%(public\|protected\|private\)\s*\%(#.*\)\=$'
+
+" Regex that describes the indent access modifiers (excludes public)
+let s:indent_access_modifier_regex = '\C^\s*\%(protected\|private\)\s*\%(#.*\)\=$'
+
 " Regex that defines blocks.
 "
 " Note that there's a slight problem with this regex and s:continuation_regex.
@@ -102,10 +134,13 @@ let s:splat_regex = '[[,(]\s*\*\s*\%(#.*\)\=$'
 " The reason is that the pipe matches a hanging "|" operator.
 "
 let s:block_regex =
-      \ '\%(\<do:\@!\>\|%\@<!{\)\s*\%(|\s*(*\s*\%([*@&]\=\h\w*,\=\s*\)\%(,\s*(*\s*[*@&]\=\h\w*\s*)*\s*\)*|\)\=\s*\%(#.*\)\=$'
+      \ '\%(\<do:\@!\>\|%\@<!{\)\s*\%(|[^|]*|\)\=\s*\%(#.*\)\=$'
 
 let s:block_continuation_regex = '^\s*[^])}\t ].*'.s:block_regex
 
+" Regex that describes a leading operator (only a method call's dot for now)
+let s:leading_operator_regex = '^\s*[.]'
+
 " 2. Auxiliary Functions {{{1
 " ======================
 
@@ -165,7 +200,21 @@ function s:GetMSL(lnum)
     " Otherwise, terminate search as we have found our MSL already.
     let line = getline(lnum)
 
-    if s:Match(lnum, s:splat_regex)
+    if !s:Match(msl, s:backslash_continuation_regex) &&
+          \ s:Match(lnum, s:backslash_continuation_regex)
+      " If the current line doesn't end in a backslash, but the previous one
+      " does, look for that line's msl
+      "
+      " Example:
+      "   foo = "bar" \
+      "     "baz"
+      "
+      let msl = lnum
+    elseif s:Match(msl, s:leading_operator_regex)
+      " If the current line starts with a leading operator, keep its indent
+      " and keep looking for an MSL.
+      let msl = lnum
+    elseif s:Match(lnum, s:splat_regex)
       " If the above line looks like the "*" of a splat, use the current one's
       " indentation.
       "
@@ -175,7 +224,7 @@ function s:GetMSL(lnum)
       "       something
       "
       return msl
-    elseif s:Match(line, s:non_bracket_continuation_regex) &&
+    elseif s:Match(lnum, s:non_bracket_continuation_regex) &&
           \ s:Match(msl, s:non_bracket_continuation_regex)
       " If the current line is a non-bracket continuation and so is the
       " previous one, keep its indent and continue looking for an MSL.
@@ -186,6 +235,18 @@ function s:GetMSL(lnum)
       "     three
       "
       let msl = lnum
+    elseif s:Match(lnum, s:dot_continuation_regex) &&
+          \ (s:Match(msl, s:bracket_continuation_regex) || s:Match(msl, s:block_continuation_regex))
+      " If the current line is a bracket continuation or a block-starter, but
+      " the previous is a dot, keep going to see if the previous line is the
+      " start of another continuation.
+      "
+      " Example:
+      "   parent.
+      "     method_call {
+      "     three
+      "
+      let msl = lnum
     elseif s:Match(lnum, s:non_bracket_continuation_regex) &&
           \ (s:Match(msl, s:bracket_continuation_regex) || s:Match(msl, s:block_continuation_regex))
       " If the current line is a bracket continuation or a block-starter, but
@@ -299,18 +360,39 @@ function s:ExtraBrackets(lnum)
 endfunction
 
 function s:Match(lnum, regex)
-  let col = match(getline(a:lnum), '\C'.a:regex) + 1
-  return col > 0 && !s:IsInStringOrComment(a:lnum, col) ? col : 0
+  let line   = getline(a:lnum)
+  let offset = match(line, '\C'.a:regex)
+  let col    = offset + 1
+
+  while offset > -1 && s:IsInStringOrComment(a:lnum, col)
+    let offset = match(line, '\C'.a:regex, offset + 1)
+    let col = offset + 1
+  endwhile
+
+  if offset > -1
+    return col
+  else
+    return 0
+  endif
 endfunction
 
-function s:MatchLast(lnum, regex)
-  let line = getline(a:lnum)
-  let col = match(line, '.*\zs' . a:regex)
-  while col != -1 && s:IsInStringOrComment(a:lnum, col)
-    let line = strpart(line, 0, col)
-    let col = match(line, '.*' . a:regex)
-  endwhile
-  return col + 1
+" Locates the containing class/module's definition line, ignoring nested classes
+" along the way.
+"
+function! s:FindContainingClass()
+  let saved_position = getpos('.')
+
+  while searchpair(s:end_start_regex, s:end_middle_regex, s:end_end_regex, 'bW',
+        \ s:end_skip_expr) > 0
+    if expand('<cword>') =~# '\<class\|module\>'
+      let found_lnum = line('.')
+      call setpos('.', saved_position)
+      return found_lnum
+    endif
+  endif
+
+  call setpos('.', saved_position)
+  return 0
 endfunction
 
 " 3. GetRubyIndent Function {{{1
@@ -320,6 +402,13 @@ function GetRubyIndent(...)
   " 3.1. Setup {{{2
   " ----------
 
+  " The value of a single shift-width
+  if exists('*shiftwidth')
+    let sw = shiftwidth()
+  else
+    let sw = &sw
+  endif
+
   " For the current line, use the first argument if given, else v:lnum
   let clnum = a:0 ? a:1 : v:lnum
 
@@ -333,6 +422,24 @@ function GetRubyIndent(...)
   let line = getline(clnum)
   let ind = -1
 
+  " If this line is an access modifier keyword, align according to the closest
+  " class declaration.
+  if g:ruby_indent_access_modifier_style == 'indent'
+    if s:Match(clnum, s:access_modifier_regex)
+      let class_line = s:FindContainingClass()
+      if class_line > 0
+        return indent(class_line) + sw
+      endif
+    endif
+  elseif g:ruby_indent_access_modifier_style == 'outdent'
+    if s:Match(clnum, s:access_modifier_regex)
+      let class_line = s:FindContainingClass()
+      if class_line > 0
+        return indent(class_line)
+      endif
+    endif
+  endif
+
   " If we got a closing bracket on an empty line, find its match and indent
   " according to it.  For parentheses we indent to its column - 1, for the
   " others we indent to the containing line's MSL's level.  Return -1 if fail.
@@ -343,7 +450,9 @@ function GetRubyIndent(...)
     if searchpair(escape(bs[0], '\['), '', bs[1], 'bW', s:skip_expr) > 0
       if line[col-1]==')' && col('.') != col('$') - 1
         let ind = virtcol('.') - 1
-      else
+      elseif g:ruby_indent_block_style == 'do'
+        let ind = indent(line('.'))
+      else " g:ruby_indent_block_style == 'expression'
         let ind = indent(s:GetMSL(line('.')))
       endif
     endif
@@ -366,10 +475,17 @@ function GetRubyIndent(...)
 
       if strpart(line, 0, col('.') - 1) =~ '=\s*$' &&
             \ strpart(line, col('.') - 1, 2) !~ 'do'
+        " assignment to case/begin/etc, on the same line, hanging indent
         let ind = virtcol('.') - 1
+      elseif g:ruby_indent_block_style == 'do'
+        " align to line of the "do", not to the MSL
+        let ind = indent(line('.'))
       elseif getline(msl) =~ '=\s*\(#.*\)\=$'
+        " in the case of assignment to the MSL, align to the starting line,
+        " not to the MSL
         let ind = indent(line('.'))
       else
+        " align to the MSL
         let ind = indent(msl)
       endif
     endif
@@ -389,6 +505,11 @@ function GetRubyIndent(...)
     return 0
   endif
 
+  " If the current line starts with a leading operator, add a level of indent.
+  if s:Match(clnum, s:leading_operator_regex)
+    return indent(s:GetMSL(clnum)) + sw
+  endif
+
   " 3.3. Work on the previous line. {{{2
   " -------------------------------
 
@@ -409,14 +530,50 @@ function GetRubyIndent(...)
   let line = getline(lnum)
   let ind = indent(lnum)
 
+  if g:ruby_indent_access_modifier_style == 'indent'
+    " If the previous line was a private/protected keyword, add a
+    " level of indent.
+    if s:Match(lnum, s:indent_access_modifier_regex)
+      return indent(lnum) + sw
+    endif
+  elseif g:ruby_indent_access_modifier_style == 'outdent'
+    " If the previous line was a private/protected/public keyword, add
+    " a level of indent, since the keyword has been out-dented.
+    if s:Match(lnum, s:access_modifier_regex)
+      return indent(lnum) + sw
+    endif
+  endif
+
+  if s:Match(lnum, s:continuable_regex) && s:Match(lnum, s:continuation_regex)
+    return indent(s:GetMSL(lnum)) + sw + sw
+  endif
+
   " If the previous line ended with a block opening, add a level of indent.
   if s:Match(lnum, s:block_regex)
-    return indent(s:GetMSL(lnum)) + &sw
+    let msl = s:GetMSL(lnum)
+
+    if g:ruby_indent_block_style == 'do'
+      " don't align to the msl, align to the "do"
+      let ind = indent(lnum) + sw
+    elseif getline(msl) =~ '=\s*\(#.*\)\=$'
+      " in the case of assignment to the msl, align to the starting line,
+      " not to the msl
+      let ind = indent(lnum) + sw
+    else
+      let ind = indent(msl) + sw
+    endif
+    return ind
+  endif
+
+  " If the previous line started with a leading operator, use its MSL's level
+  " of indent
+  if s:Match(lnum, s:leading_operator_regex)
+    return indent(s:GetMSL(lnum))
   endif
 
   " If the previous line ended with the "*" of a splat, add a level of indent
   if line =~ s:splat_regex
-    return indent(lnum) + &sw
+    return indent(lnum) + sw
   endif
 
   " If the previous line contained unclosed opening brackets and we are still
@@ -431,22 +588,22 @@ function GetRubyIndent(...)
     if opening.pos != -1
       if opening.type == '(' && searchpair('(', '', ')', 'bW', s:skip_expr) > 0
         if col('.') + 1 == col('$')
-          return ind + &sw
+          return ind + sw
         else
           return virtcol('.')
         endif
       else
         let nonspace = matchend(line, '\S', opening.pos + 1) - 1
-        return nonspace > 0 ? nonspace : ind + &sw
+        return nonspace > 0 ? nonspace : ind + sw
       endif
     elseif closing.pos != -1
       call cursor(lnum, closing.pos + 1)
       normal! %
 
       if s:Match(line('.'), s:ruby_indent_keywords)
-        return indent('.') + &sw
+        return indent('.') + sw
       else
-        return indent('.')
+        return indent(s:GetMSL(line('.')))
       endif
     else
       call cursor(clnum, vcol)
@@ -473,7 +630,7 @@ function GetRubyIndent(...)
   let col = s:Match(lnum, s:ruby_indent_keywords)
   if col > 0
     call cursor(lnum, col)
-    let ind = virtcol('.') - 1 + &sw
+    let ind = virtcol('.') - 1 + sw
     " TODO: make this better (we need to count them) (or, if a searchpair
     " fails, we know that something is lacking an end and thus we indent a
     " level
@@ -490,10 +647,14 @@ function GetRubyIndent(...)
   let p_lnum = lnum
   let lnum = s:GetMSL(lnum)
 
-  " If the previous line wasn't a MSL and is continuation return its indent.
-  " TODO: the || s:IsInString() thing worries me a bit.
+  " If the previous line wasn't a MSL.
   if p_lnum != lnum
-    if s:Match(p_lnum, s:non_bracket_continuation_regex) || s:IsInString(p_lnum,strlen(line))
+    " If previous line ends bracket and begins non-bracket continuation decrease indent by 1.
+    if s:Match(p_lnum, s:bracket_switch_continuation_regex)
+      return ind - 1
+    " If previous line is a continuation return its indent.
+    " TODO: the || s:IsInString() thing worries me a bit.
+    elseif s:Match(p_lnum, s:non_bracket_continuation_regex) || s:IsInString(p_lnum,strlen(line))
       return ind
     endif
   endif
@@ -506,9 +667,9 @@ function GetRubyIndent(...)
   " TODO: this does not take into account contrived things such as
   " module Foo; class Bar; end
   if s:Match(lnum, s:ruby_indent_keywords)
-    let ind = msl_ind + &sw
+    let ind = msl_ind + sw
     if s:Match(lnum, s:end_end_regex)
-      let ind = ind - &sw
+      let ind = ind - sw
     endif
     return ind
   endif
@@ -517,7 +678,7 @@ function GetRubyIndent(...)
   " closing bracket, indent one extra level.
   if s:Match(lnum, s:non_bracket_continuation_regex) && !s:Match(lnum, '^\s*\([\])}]\|end\)')
     if lnum == p_lnum
-      let ind = msl_ind + &sw
+      let ind = msl_ind + sw
     else
       let ind = msl_ind
     endif
diff --git a/runtime/indent/sass.vim b/runtime/indent/sass.vim
index b6e2e66e8a..d87b371fdd 100644
--- a/runtime/indent/sass.vim
+++ b/runtime/indent/sass.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Sass
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
-" Last Change:	2013 May 30
+" Last Change:	2016 Aug 29
 
 if exists("b:did_indent")
   finish
@@ -29,9 +29,7 @@ function! GetSassIndent()
   let indent = indent(lnum)
   let cindent = indent(v:lnum)
   if line !~ s:property && line !~ s:extend && cline =~ s:property
-    return indent + &sw
-  "elseif line =~ s:property && cline !~ s:property
-    "return indent - &sw
+    return indent + (exists('*shiftwidth') ? shiftwidth() : &sw)
   else
     return -1
   endif
diff --git a/runtime/syntax/a65.vim b/runtime/syntax/a65.vim
index 94198e6a42..5ade809a1f 100644
--- a/runtime/syntax/a65.vim
+++ b/runtime/syntax/a65.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Clemens Kirchgatterer <clemens@1541.org>
 " Last Change:	2014 Jan 05
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -138,29 +135,21 @@ syn match  a65End			excludenl /end$/ contained
 syn match  a65Continue	"\\$" contained
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_a65_syntax_inits")
-  if version < 508
-    let did_a65_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink a65Section	Special
-  HiLink a65Address	Special
-  HiLink a65Comment	Comment
-  HiLink a65PreProc	PreProc
-  HiLink a65Number	Number
-  HiLink a65String	String
-  HiLink a65Type	Statement
-  HiLink a65Opcode	Type
-  HiLink a65PC		Error
-  HiLink a65Todo	Todo
-  HiLink a65HiLo	Number
+HiLink a65Section	Special
+HiLink a65Address	Special
+HiLink a65Comment	Comment
+HiLink a65PreProc	PreProc
+HiLink a65Number	Number
+HiLink a65String	String
+HiLink a65Type	Statement
+HiLink a65Opcode	Type
+HiLink a65PC		Error
+HiLink a65Todo	Todo
+HiLink a65HiLo	Number
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "a65"
diff --git a/runtime/syntax/abap.vim b/runtime/syntax/abap.vim
index 1d1f6afd0d..ac5504a952 100644
--- a/runtime/syntax/abap.vim
+++ b/runtime/syntax/abap.vim
@@ -5,11 +5,8 @@
 " Last Change: 2013 Jun 13
 "     Comment: Thanks to EPI-USE Labs for all your assistance. :)
 
-" For version  < 6.0: Clear all syntax items
-" For version >= 6.0: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -43,11 +40,7 @@ syn match   abapStringEscape contained "``"
 syn match   abapNumber  "\-\=\<\d\+\>"
 syn region  abapHex     matchgroup=abapHex start="X'" end="'"
 
-if version >= 600
-  setlocal iskeyword=48-57,_,A-Z,a-z,/
-else
-  set iskeyword=48-57,_,A-Z,a-z,/
-endif
+setlocal iskeyword=48-57,_,A-Z,a-z,/
 
 syn match   abapNamespace        "\</\w\+/"
 
@@ -175,38 +168,30 @@ syn keyword abapTodo     contained TODO NOTE
 syn match   abapTodo     "\#EC\W\+\w\+"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_abap_syntax_inits")
-  if version < 508
-    let did_abap_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink abapError          Error
-  HiLink abapComment        Comment
-  HiLink abapInclude        Include
-  HiLink abapStatement      Statement
-  HiLink abapComplexStatement      Statement
-  HiLink abapSpecial        Special
-  HiLink abapNamespace      Special
-  HiLink abapSpecialTables  Special
-  HiLink abapSymbolOperator abapOperator
-  HiLink abapOperator       Operator
-  HiLink abapCharString     String
-  HiLink abapString         String
-  HiLink abapFloat          Float
-  HiLink abapTypes          Type
-  HiLink abapSymbol         Structure
-  HiLink abapStructure      Structure
-  HiLink abapField          Variable
-  HiLink abapNumber         Number
-  HiLink abapHex            Number
+HiLink abapError          Error
+HiLink abapComment        Comment
+HiLink abapInclude        Include
+HiLink abapStatement      Statement
+HiLink abapComplexStatement      Statement
+HiLink abapSpecial        Special
+HiLink abapNamespace      Special
+HiLink abapSpecialTables  Special
+HiLink abapSymbolOperator abapOperator
+HiLink abapOperator       Operator
+HiLink abapCharString     String
+HiLink abapString         String
+HiLink abapFloat          Float
+HiLink abapTypes          Type
+HiLink abapSymbol         Structure
+HiLink abapStructure      Structure
+HiLink abapField          Variable
+HiLink abapNumber         Number
+HiLink abapHex            Number
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "abap"
 
diff --git a/runtime/syntax/abaqus.vim b/runtime/syntax/abaqus.vim
index cf4b0828fa..ddf0255845 100644
--- a/runtime/syntax/abaqus.vim
+++ b/runtime/syntax/abaqus.vim
@@ -4,11 +4,8 @@
 " Last Change:	2002 Feb 24
 " Remark:	Huge improvement in folding performance--see filetype plugin
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -25,24 +22,16 @@ syn match abaqusValue	"=\s*[^,]*"lc=1 contained display
 syn match abaqusBadLine	"^\s\+\*.*" display
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_abaqus_syn_inits")
-	if version < 508
-		let did_abaqus_syn_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	" The default methods for highlighting.  Can be overridden later
-	HiLink abaqusComment	Comment
-	HiLink abaqusKeyword	Statement
-	HiLink abaqusParameter	Identifier
-	HiLink abaqusValue	Constant
-	HiLink abaqusBadLine    Error
+" The default methods for highlighting.  Can be overridden later
+HiLink abaqusComment	Comment
+HiLink abaqusKeyword	Statement
+HiLink abaqusParameter	Identifier
+HiLink abaqusValue	Constant
+HiLink abaqusBadLine    Error
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "abaqus"
diff --git a/runtime/syntax/abc.vim b/runtime/syntax/abc.vim
index 3dc098e730..68f0cf16ff 100644
--- a/runtime/syntax/abc.vim
+++ b/runtime/syntax/abc.vim
@@ -4,11 +4,8 @@
 " URL:		http://perun.hscs.wmin.ac.uk/~jra/vim/syntax/abc.vim
 " Last Change:	27th April 2001
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -36,28 +33,20 @@ syn match abcComment "%.*$"
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_abc_syn_inits")
-  if version < 508
-    let did_abc_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink abcComment		Comment
-  HiLink abcHeadField		Type
-  HiLink abcBodyField		Special
-  HiLink abcBar			Statement
-  HiLink abcTuple			Statement
-  HiLink abcBroken			Statement
-  HiLink abcTie			Statement
-  HiLink abcGuitarChord	Identifier
-  HiLink abcNote			Constant
+HiLink abcComment		Comment
+HiLink abcHeadField		Type
+HiLink abcBodyField		Special
+HiLink abcBar			Statement
+HiLink abcTuple			Statement
+HiLink abcBroken			Statement
+HiLink abcTie			Statement
+HiLink abcGuitarChord	Identifier
+HiLink abcNote			Constant
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "abc"
 
diff --git a/runtime/syntax/abel.vim b/runtime/syntax/abel.vim
index 05e8dac913..dfa872f422 100644
--- a/runtime/syntax/abel.vim
+++ b/runtime/syntax/abel.vim
@@ -3,11 +3,8 @@
 " Maintainer:	John Cook <johncook3@gmail.com>
 " Last Change:	2011 Dec 27
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -123,48 +120,40 @@ endif
 syn sync minlines=1
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_abel_syn_inits")
-  if version < 508
-    let did_abel_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default highlighting.
-  HiLink abelHeader		abelStatement
-  HiLink abelSection		abelStatement
-  HiLink abelDeclaration	abelStatement
-  HiLink abelLogicalOperator	abelOperator
-  HiLink abelRangeOperator	abelOperator
-  HiLink abelAlternateOperator	abelOperator
-  HiLink abelArithmeticOperator	abelOperator
-  HiLink abelRelationalOperator	abelOperator
-  HiLink abelAssignmentOperator	abelOperator
-  HiLink abelTruthTableOperator	abelOperator
-  HiLink abelSpecifier		abelStatement
-  HiLink abelOperator		abelStatement
-  HiLink abelStatement		Statement
-  HiLink abelIdentifier		Identifier
-  HiLink abelTypeId		abelType
-  HiLink abelTypeIdChar		abelType
-  HiLink abelType		Type
-  HiLink abelNumber		abelString
-  HiLink abelString		String
-  HiLink abelConstant		Constant
-  HiLink abelComment		Comment
-  HiLink abelExtension		abelSpecial
-  HiLink abelSpecialChar	abelSpecial
-  HiLink abelTypeIdEnd		abelSpecial
-  HiLink abelSpecial		Special
-  HiLink abelDirective		PreProc
-  HiLink abelTodo		Todo
-  HiLink abelError		Error
+" The default highlighting.
+HiLink abelHeader		abelStatement
+HiLink abelSection		abelStatement
+HiLink abelDeclaration	abelStatement
+HiLink abelLogicalOperator	abelOperator
+HiLink abelRangeOperator	abelOperator
+HiLink abelAlternateOperator	abelOperator
+HiLink abelArithmeticOperator	abelOperator
+HiLink abelRelationalOperator	abelOperator
+HiLink abelAssignmentOperator	abelOperator
+HiLink abelTruthTableOperator	abelOperator
+HiLink abelSpecifier		abelStatement
+HiLink abelOperator		abelStatement
+HiLink abelStatement		Statement
+HiLink abelIdentifier		Identifier
+HiLink abelTypeId		abelType
+HiLink abelTypeIdChar		abelType
+HiLink abelType		Type
+HiLink abelNumber		abelString
+HiLink abelString		String
+HiLink abelConstant		Constant
+HiLink abelComment		Comment
+HiLink abelExtension		abelSpecial
+HiLink abelSpecialChar	abelSpecial
+HiLink abelTypeIdEnd		abelSpecial
+HiLink abelSpecial		Special
+HiLink abelDirective		PreProc
+HiLink abelTodo		Todo
+HiLink abelError		Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "abel"
 
diff --git a/runtime/syntax/acedb.vim b/runtime/syntax/acedb.vim
index 114e4aba9e..43cec3ac29 100644
--- a/runtime/syntax/acedb.vim
+++ b/runtime/syntax/acedb.vim
@@ -7,11 +7,8 @@
 " Syntax file to handle all $ACEDB/wspec/*.wrm files, primarily models.wrm
 " AceDB software is available from http://www.acedb.org
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -86,35 +83,27 @@ syn region	acedbString	start=/"/ end=/"/ skip=/\\"/ oneline
 " Rest of syntax highlighting rules start here
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_acedb_syn_inits")
-  if version < 508
-    let did_acedb_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink acedbMagic	Special
-  HiLink acedbHyb	Special
-  HiLink acedbType	Type
-  HiLink acedbOption	Type
-  HiLink acedbSubclass	Type
-  HiLink acedbSubtag	Include
-  HiLink acedbFlag	Include
-  HiLink acedbTag	Include
-  HiLink acedbClass	Todo
-  HiLink acedbHelp	Todo
-  HiLink acedbXref	Identifier
-  HiLink acedbModifier	Label
-  HiLink acedbComment	Comment
-  HiLink acedbBlock	ModeMsg
-  HiLink acedbNumber	Number
-  HiLink acedbString	String
+HiLink acedbMagic	Special
+HiLink acedbHyb	Special
+HiLink acedbType	Type
+HiLink acedbOption	Type
+HiLink acedbSubclass	Type
+HiLink acedbSubtag	Include
+HiLink acedbFlag	Include
+HiLink acedbTag	Include
+HiLink acedbClass	Todo
+HiLink acedbHelp	Todo
+HiLink acedbXref	Identifier
+HiLink acedbModifier	Label
+HiLink acedbComment	Comment
+HiLink acedbBlock	ModeMsg
+HiLink acedbNumber	Number
+HiLink acedbString	String
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "acedb"
 
diff --git a/runtime/syntax/aflex.vim b/runtime/syntax/aflex.vim
index 592c98e4f3..21b78d0d85 100644
--- a/runtime/syntax/aflex.vim
+++ b/runtime/syntax/aflex.vim
@@ -7,21 +7,14 @@
 " Comment:	Replaced sourcing c.vim file by ada.vim and rename lex*
 "		in aflex*
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-   syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
    finish
 endif
 
 " Read the Ada syntax to start with
-if version < 600
-   so <sfile>:p:h/ada.vim
-else
-   runtime! syntax/ada.vim
-   unlet b:current_syntax
-endif
+runtime! syntax/ada.vim
+unlet b:current_syntax
 
 
 " --- AfLex stuff ---
@@ -69,31 +62,22 @@ syn sync match aflexSyncPat	groupthere aflexPatBlock	"^<$"
 syn sync match aflexSyncPat	groupthere aflexPatBlock	"^%%$"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+HiLink	aflexSlashQuote	aflexPat
+HiLink	aflexBrace		aflexPat
+HiLink aflexAbbrvComment	aflexPatComment
 
-if version >= 508 || !exists("did_aflex_syntax_inits")
-   if version < 508
-      let did_aflex_syntax_inits = 1
-      command -nargs=+ HiLink hi link <args>
-   else
-      command -nargs=+ HiLink hi def link <args>
-   endif
-  HiLink	aflexSlashQuote	aflexPat
-  HiLink	aflexBrace		aflexPat
-  HiLink aflexAbbrvComment	aflexPatComment
-
-  HiLink	aflexAbbrv		SpecialChar
-  HiLink	aflexAbbrvRegExp	Macro
-  HiLink	aflexCFunctions	Function
-  HiLink	aflexMorePat	SpecialChar
-  HiLink	aflexPat		Function
-  HiLink	aflexPatComment	Comment
-  HiLink	aflexPatString	Function
-  HiLink	aflexPatTag		Special
-  HiLink	aflexSep		Delimiter
-  delcommand HiLink
-endif
+HiLink	aflexAbbrv		SpecialChar
+HiLink	aflexAbbrvRegExp	Macro
+HiLink	aflexCFunctions	Function
+HiLink	aflexMorePat	SpecialChar
+HiLink	aflexPat		Function
+HiLink	aflexPatComment	Comment
+HiLink	aflexPatString	Function
+HiLink	aflexPatTag		Special
+HiLink	aflexSep		Delimiter
+delcommand HiLink
 
 let b:current_syntax = "aflex"
 
diff --git a/runtime/syntax/ahdl.vim b/runtime/syntax/ahdl.vim
index b1417c374d..82f3918de8 100644
--- a/runtime/syntax/ahdl.vim
+++ b/runtime/syntax/ahdl.vim
@@ -3,11 +3,8 @@
 " Maintainer:	John Cook <john.cook@kla-tencor.com>
 " Last Change:	2001 Apr 25
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -66,29 +63,21 @@ syn match   ahdlSpecialChar "[\[\]().,;]"
 syn sync minlines=1
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_ahdl_syn_inits")
-  if version < 508
-    let did_ahdl_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default highlighting.
-  HiLink ahdlNumber		ahdlString
-  HiLink ahdlMegafunction	ahdlIdentifier
-  HiLink ahdlSpecialChar	SpecialChar
-  HiLink ahdlKeyword		Statement
-  HiLink ahdlString		String
-  HiLink ahdlComment		Comment
-  HiLink ahdlIdentifier		Identifier
-  HiLink ahdlOperator		Operator
-  HiLink ahdlTodo		Todo
+" The default highlighting.
+HiLink ahdlNumber		ahdlString
+HiLink ahdlMegafunction	ahdlIdentifier
+HiLink ahdlSpecialChar	SpecialChar
+HiLink ahdlKeyword		Statement
+HiLink ahdlString		String
+HiLink ahdlComment		Comment
+HiLink ahdlIdentifier		Identifier
+HiLink ahdlOperator		Operator
+HiLink ahdlTodo		Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "ahdl"
 " vim:ts=8
diff --git a/runtime/syntax/amiga.vim b/runtime/syntax/amiga.vim
index 4ccab1950f..e094cfc744 100644
--- a/runtime/syntax/amiga.vim
+++ b/runtime/syntax/amiga.vim
@@ -5,11 +5,8 @@
 " Version:     7
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_AMIGA
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -72,29 +69,21 @@ syn match	amiComment	";.*$" contains=amiCommentGroup
 syn sync lines=50
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_amiga_syn_inits")
-  if version < 508
-    let did_amiga_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink amiAlias	Type
-  HiLink amiComment	Comment
-  HiLink amiDev	Type
-  HiLink amiEcho	String
-  HiLink amiElse	Statement
-  HiLink amiError	Error
-  HiLink amiKey	Statement
-  HiLink amiNumber	Number
-  HiLink amiString	String
-  HiLink amiTest	Special
+HiLink amiAlias	Type
+HiLink amiComment	Comment
+HiLink amiDev	Type
+HiLink amiEcho	String
+HiLink amiElse	Statement
+HiLink amiError	Error
+HiLink amiKey	Statement
+HiLink amiNumber	Number
+HiLink amiString	String
+HiLink amiTest	Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "amiga"
 
diff --git a/runtime/syntax/aml.vim b/runtime/syntax/aml.vim
index 7cb16f1c1f..1b975ccabe 100644
--- a/runtime/syntax/aml.vim
+++ b/runtime/syntax/aml.vim
@@ -9,11 +9,8 @@
 "		    of [], in order to avoid -read highlighted,
 "		    or [quote] strings highlighted
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -123,35 +120,27 @@ syn region amlSkip matchgroup=amlOutput start="&typ" end="$" contains=amlVar
 syn region amlSkip matchgroup=amlOutput start="&type" end="$" contains=amlVar
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_aml_syntax_inits")
-  if version < 508
-    let did_aml_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink amlComment	Comment
-  HiLink amlNumber	Number
-  HiLink amlQuote	String
-  HiLink amlVar	Identifier
-  HiLink amlVar2	Identifier
-  HiLink amlFunction	PreProc
-  HiLink amlDir	Statement
-  HiLink amlDir2	Statement
-  HiLink amlDirSym	Statement
-  HiLink amlOutput	Statement
-  HiLink amlArcCmd	ModeMsg
-  HiLink amlFormedCmd	amlArcCmd
-  HiLink amlTabCmd	amlArcCmd
-  HiLink amlInfoCmd	amlArcCmd
-  HiLink amlVtrCmd	amlArcCmd
-  HiLink amlFormed	amlArcCmd
-  HiLink amlTab	amlArcCmd
+HiLink amlComment	Comment
+HiLink amlNumber	Number
+HiLink amlQuote	String
+HiLink amlVar	Identifier
+HiLink amlVar2	Identifier
+HiLink amlFunction	PreProc
+HiLink amlDir	Statement
+HiLink amlDir2	Statement
+HiLink amlDirSym	Statement
+HiLink amlOutput	Statement
+HiLink amlArcCmd	ModeMsg
+HiLink amlFormedCmd	amlArcCmd
+HiLink amlTabCmd	amlArcCmd
+HiLink amlInfoCmd	amlArcCmd
+HiLink amlVtrCmd	amlArcCmd
+HiLink amlFormed	amlArcCmd
+HiLink amlTab	amlArcCmd
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "aml"
diff --git a/runtime/syntax/ampl.vim b/runtime/syntax/ampl.vim
index 7f4dfa9942..99a683a0f4 100644
--- a/runtime/syntax/ampl.vim
+++ b/runtime/syntax/ampl.vim
@@ -3,9 +3,8 @@
 " Last Change:  2003 May 11
 
 
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
  finish
 endif
 
@@ -115,33 +114,26 @@ syn keyword amplTodo contained	 TODO FIXME XXX
 
 
 
-if version >= 508 || !exists("did_ampl_syntax_inits")
-  if version < 508
-    let did_ampl_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting. Can be overridden later.
-  HiLink amplEntityKeyword	Keyword
-  HiLink amplType		Type
-  HiLink amplStatement		Statement
-  HiLink amplOperators		Operator
-  HiLink amplBasicOperators	Operator
-  HiLink amplConditional	Conditional
-  HiLink amplRepeat		Repeat
-  HiLink amplStrings		String
-  HiLink amplNumerics		Number
-  HiLink amplSetFunction	Function
-  HiLink amplBuiltInFunction	Function
-  HiLink amplRandomGenerator	Function
-  HiLink amplComment		Comment
-  HiLink amplDotSuffix		Special
-  HiLink amplPiecewise		Special
+" The default methods for highlighting. Can be overridden later.
+HiLink amplEntityKeyword	Keyword
+HiLink amplType		Type
+HiLink amplStatement		Statement
+HiLink amplOperators		Operator
+HiLink amplBasicOperators	Operator
+HiLink amplConditional	Conditional
+HiLink amplRepeat		Repeat
+HiLink amplStrings		String
+HiLink amplNumerics		Number
+HiLink amplSetFunction	Function
+HiLink amplBuiltInFunction	Function
+HiLink amplRandomGenerator	Function
+HiLink amplComment		Comment
+HiLink amplDotSuffix		Special
+HiLink amplPiecewise		Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "ampl"
 
diff --git a/runtime/syntax/antlr.vim b/runtime/syntax/antlr.vim
index 19000293fb..2ac38d7747 100644
--- a/runtime/syntax/antlr.vim
+++ b/runtime/syntax/antlr.vim
@@ -4,11 +4,8 @@
 " LastChange:	02 May 2001
 " Original:	Comes from JavaCC.vim
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-   syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
    finish
 endif
 
@@ -18,12 +15,8 @@ endif
 " Those files usually have the extension  *.jj
 
 " source the java.vim file
-if version < 600
-   so <sfile>:p:h/java.vim
-else
-   runtime! syntax/java.vim
-   unlet b:current_syntax
-endif
+runtime! syntax/java.vim
+unlet b:current_syntax
 
 "remove catching errors caused by wrong parenthesis (does not work in antlr
 "files) (first define them in case they have not been defined in java)
@@ -53,17 +46,10 @@ syn match antlrSep "[|:]\|\.\."
 syn keyword antlrActionToken TOKEN SKIP MORE SPECIAL_TOKEN
 syn keyword antlrError DEBUG IGNORE_IN_BNF
 
-if version >= 508 || !exists("did_antlr_syntax_inits")
-   if version < 508
-      let did_antlr_syntax_inits = 1
-      command -nargs=+ HiLink hi link <args>
-   else
-      command -nargs=+ HiLink hi def link <args>
-   endif
-   HiLink antlrSep Statement
-   HiLink antlrPackages Statement
-  delcommand HiLink
-endif
+command -nargs=+ HiLink hi def link <args>
+HiLink antlrSep Statement
+HiLink antlrPackages Statement
+delcommand HiLink
 
 let b:current_syntax = "antlr"
 
diff --git a/runtime/syntax/apache.vim b/runtime/syntax/apache.vim
index 85cda4095a..b556fa350d 100644
--- a/runtime/syntax/apache.vim
+++ b/runtime/syntax/apache.vim
@@ -9,13 +9,9 @@
 "		make it really linewise?
 "		+ add `display' where appropriate
 
-" Setup
-if version >= 600
-	if exists("b:current_syntax")
-		finish
-	endif
-else
-	syntax clear
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
 endif
 
 syn case ignore
@@ -178,37 +174,30 @@ syn match apacheSection "<\/\=\(<IfVersion\)[^>]*>" contains=apacheAnything
 syn keyword apacheDeclaration VirtualDocumentRoot VirtualDocumentRootIP VirtualScriptAlias VirtualScriptAliasIP
 
 " Define the default highlighting
-if version >= 508 || !exists("did_apache_syntax_inits")
-	if version < 508
-		let did_apache_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink apacheAllowOverride apacheDeclaration
-	HiLink apacheAllowOverrideValue apacheOption
-	HiLink apacheAuthType apacheDeclaration
-	HiLink apacheAuthTypeValue apacheOption
-	HiLink apacheOptionOption apacheOption
-	HiLink apacheDeclaration Function
-	HiLink apacheAnything apacheOption
-	HiLink apacheOption Number
-	HiLink apacheComment Comment
-	HiLink apacheFixme Todo
-	HiLink apacheLimitSectionKeyword apacheLimitSection
-	HiLink apacheLimitSection apacheSection
-	HiLink apacheSection Label
-	HiLink apacheMethodOption Type
-	HiLink apacheAllowDeny Include
-	HiLink apacheAllowDenyValue Identifier
-	HiLink apacheOrder Special
-	HiLink apacheOrderValue String
-	HiLink apacheString String
-	HiLink apacheError Error
-	HiLink apacheUserID Number
+HiLink apacheAllowOverride apacheDeclaration
+HiLink apacheAllowOverrideValue apacheOption
+HiLink apacheAuthType apacheDeclaration
+HiLink apacheAuthTypeValue apacheOption
+HiLink apacheOptionOption apacheOption
+HiLink apacheDeclaration Function
+HiLink apacheAnything apacheOption
+HiLink apacheOption Number
+HiLink apacheComment Comment
+HiLink apacheFixme Todo
+HiLink apacheLimitSectionKeyword apacheLimitSection
+HiLink apacheLimitSection apacheSection
+HiLink apacheSection Label
+HiLink apacheMethodOption Type
+HiLink apacheAllowDeny Include
+HiLink apacheAllowDenyValue Identifier
+HiLink apacheOrder Special
+HiLink apacheOrderValue String
+HiLink apacheString String
+HiLink apacheError Error
+HiLink apacheUserID Number
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "apache"
diff --git a/runtime/syntax/apachestyle.vim b/runtime/syntax/apachestyle.vim
index 375fc70a9c..53d5907b9e 100644
--- a/runtime/syntax/apachestyle.vim
+++ b/runtime/syntax/apachestyle.vim
@@ -20,11 +20,8 @@
 "		</SubSection>
 "	</Section>
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -41,25 +38,17 @@ syn match  apTagOption	contained / [-\/_\.:*a-zA-Z0-9]\+/ms=s+1
 syn match  apTagError	contained /[^>]</ms=s+1
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_apachestyle_syn_inits")
-  if version < 508
-    let did_apachestyle_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink apComment	Comment
-  HiLink apOption	Keyword
-  "HiLink apLastValue	Identifier		ugly?
-  HiLink apTag		Special
-  HiLink apTagOption	Identifier
-  HiLink apTagError	Error
+HiLink apComment	Comment
+HiLink apOption	Keyword
+"HiLink apLastValue	Identifier		ugly?
+HiLink apTag		Special
+HiLink apTagOption	Identifier
+HiLink apTagError	Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "apachestyle"
 " vim: ts=8
diff --git a/runtime/syntax/aptconf.vim b/runtime/syntax/aptconf.vim
index 7a31b2d15e..8cb14321e2 100644
--- a/runtime/syntax/aptconf.vim
+++ b/runtime/syntax/aptconf.vim
@@ -3,12 +3,9 @@
 " Maintainer:	Yann Amar <quidame@poivron.org>
 " Last Change:	2015 Dec 22
 
-" For version 5.x: Clear all syntax items
-" For version 6.x and 7.x: Quit when a syntax file was already loaded
+" quit when a syntax file was already loaded
 if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
+  if exists("b:current_syntax")
     finish
   endif
   let main_syntax = 'aptconf'
diff --git a/runtime/syntax/arduino.vim b/runtime/syntax/arduino.vim
index 14299a441a..4a4ef82072 100644
--- a/runtime/syntax/arduino.vim
+++ b/runtime/syntax/arduino.vim
@@ -10,20 +10,13 @@
 
 " Thanks to Rik, Erik Nomitch, Adam Obeng and Graeme Cross for helpful feedback!
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " Read the C syntax to start with
-if version < 600
-  so <sfile>:p:h/cpp.vim
-else
-  runtime! syntax/cpp.vim
-endif
+runtime! syntax/cpp.vim
 
 syn keyword arduinoConstant HIGH LOW INPUT OUTPUT
 syn keyword arduinoConstant DEC BIN HEX OCT BYTE
diff --git a/runtime/syntax/asm.vim b/runtime/syntax/asm.vim
index e5f16c5bdc..501f5f0872 100644
--- a/runtime/syntax/asm.vim
+++ b/runtime/syntax/asm.vim
@@ -7,11 +7,8 @@
 
 " Thanks to Ori Avtalion for feedback on the comment markers!
 
-" For version 5.x: Clear all syntax items
-" For version 6.0 and later: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -103,37 +100,29 @@ syn match asmDirective		"\.[A-Za-z][0-9A-Za-z-_]*"
 syn case match
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_asm_syntax_inits")
-  if version < 508
-    let did_asm_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting.  Can be overridden later
-  HiLink asmSection	Special
-  HiLink asmLabel	Label
-  HiLink asmComment	Comment
-  HiLink asmTodo	Todo
-  HiLink asmDirective	Statement
+" The default methods for highlighting.  Can be overridden later
+HiLink asmSection	Special
+HiLink asmLabel	Label
+HiLink asmComment	Comment
+HiLink asmTodo	Todo
+HiLink asmDirective	Statement
 
-  HiLink asmInclude	Include
-  HiLink asmCond	PreCondit
-  HiLink asmMacro	Macro
+HiLink asmInclude	Include
+HiLink asmCond	PreCondit
+HiLink asmMacro	Macro
 
-  HiLink hexNumber	Number
-  HiLink decNumber	Number
-  HiLink octNumber	Number
-  HiLink binNumber	Number
+HiLink hexNumber	Number
+HiLink decNumber	Number
+HiLink octNumber	Number
+HiLink binNumber	Number
 
-  HiLink asmIdentifier	Identifier
-  HiLink asmType	Type
+HiLink asmIdentifier	Identifier
+HiLink asmType	Type
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "asm"
 
diff --git a/runtime/syntax/asm68k.vim b/runtime/syntax/asm68k.vim
index cd23517cad..ace56c854e 100644
--- a/runtime/syntax/asm68k.vim
+++ b/runtime/syntax/asm68k.vim
@@ -8,11 +8,8 @@
 " Feel free to contribute...
 "
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -328,63 +325,55 @@ syn match asm68kDirective	"\<XREF\(\.S\)\=\s"
 syn case match
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_asm68k_syntax_inits")
-  if version < 508
-    let did_asm68k_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting.  Can be overridden later
-  " Comment Constant Error Identifier PreProc Special Statement Todo Type
-  "
-  " Constant		Boolean Character Number String
-  " Identifier		Function
-  " PreProc		Define Include Macro PreCondit
-  " Special		Debug Delimiter SpecialChar SpecialComment Tag
-  " Statement		Conditional Exception Keyword Label Operator Repeat
-  " Type		StorageClass Structure Typedef
+" The default methods for highlighting.  Can be overridden later
+" Comment Constant Error Identifier PreProc Special Statement Todo Type
+"
+" Constant		Boolean Character Number String
+" Identifier		Function
+" PreProc		Define Include Macro PreCondit
+" Special		Debug Delimiter SpecialChar SpecialComment Tag
+" Statement		Conditional Exception Keyword Label Operator Repeat
+" Type		StorageClass Structure Typedef
 
-  HiLink asm68kComment		Comment
-  HiLink asm68kTodo		Todo
+HiLink asm68kComment		Comment
+HiLink asm68kTodo		Todo
 
-  HiLink hexNumber		Number		" Constant
-  HiLink octNumber		Number		" Constant
-  HiLink binNumber		Number		" Constant
-  HiLink decNumber		Number		" Constant
-  HiLink floatNumber		Number		" Constant
-  HiLink floatExponent		Number		" Constant
-  HiLink floatE			SpecialChar	" Statement
-  "HiLink floatE		Number		" Constant
+HiLink hexNumber		Number		" Constant
+HiLink octNumber		Number		" Constant
+HiLink binNumber		Number		" Constant
+HiLink decNumber		Number		" Constant
+HiLink floatNumber		Number		" Constant
+HiLink floatExponent		Number		" Constant
+HiLink floatE			SpecialChar	" Statement
+"HiLink floatE		Number		" Constant
 
-  HiLink asm68kImmediate	SpecialChar	" Statement
-  "HiLink asm68kSymbol		Constant
+HiLink asm68kImmediate	SpecialChar	" Statement
+"HiLink asm68kSymbol		Constant
 
-  HiLink asm68kString		String		" Constant
-  HiLink asm68kCharError	Error
-  HiLink asm68kStringError	Error
+HiLink asm68kString		String		" Constant
+HiLink asm68kCharError	Error
+HiLink asm68kStringError	Error
 
-  HiLink asm68kReg		Identifier
-  HiLink asm68kOperator		Identifier
+HiLink asm68kReg		Identifier
+HiLink asm68kOperator		Identifier
 
-  HiLink asm68kInclude		Include		" PreProc
-  HiLink asm68kMacro		Macro		" PreProc
-  HiLink asm68kMacroParam	Keyword		" Statement
+HiLink asm68kInclude		Include		" PreProc
+HiLink asm68kMacro		Macro		" PreProc
+HiLink asm68kMacroParam	Keyword		" Statement
 
-  HiLink asm68kDirective	Special
-  HiLink asm68kPreCond		Special
+HiLink asm68kDirective	Special
+HiLink asm68kPreCond		Special
 
 
-  HiLink asm68kOpcode		Statement
-  HiLink asm68kCond		Conditional	" Statement
-  HiLink asm68kRepeat		Repeat		" Statement
+HiLink asm68kOpcode		Statement
+HiLink asm68kCond		Conditional	" Statement
+HiLink asm68kRepeat		Repeat		" Statement
 
-  HiLink asm68kLabel		Type
-  delcommand HiLink
-endif
+HiLink asm68kLabel		Type
+delcommand HiLink
 
 let b:current_syntax = "asm68k"
 
diff --git a/runtime/syntax/asmh8300.vim b/runtime/syntax/asmh8300.vim
index 48699d89c5..5134c512e7 100644
--- a/runtime/syntax/asmh8300.vim
+++ b/runtime/syntax/asmh8300.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Kevin Dahlhausen <kdahlhaus@yahoo.com>
 " Last Change:	2002 Sep 19
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -52,33 +49,21 @@ syn case match
 
 
 " Read the general asm syntax
-if version < 600
-  source <sfile>:p:h/asm.vim
-else
-  runtime! syntax/asm.vim
-endif
+runtime! syntax/asm.vim
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_hitachi_syntax_inits")
-  if version < 508
-    let did_hitachi_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink asmOpcode  Statement
-  HiLink asmRegister  Identifier
+HiLink asmOpcode  Statement
+HiLink asmRegister  Identifier
 
-  " My default-color overrides:
-  "hi asmOpcode ctermfg=yellow
-  "hi asmReg	ctermfg=lightmagenta
+" My default-color overrides:
+"hi asmOpcode ctermfg=yellow
+"hi asmReg	ctermfg=lightmagenta
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "asmh8300"
 
diff --git a/runtime/syntax/asn.vim b/runtime/syntax/asn.vim
index 28c8efba95..8b553e884c 100644
--- a/runtime/syntax/asn.vim
+++ b/runtime/syntax/asn.vim
@@ -4,11 +4,8 @@
 " URL:		http://www.fleiner.com/vim/syntax/asn.vim
 " Last Change:	2012 Oct 05
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -50,34 +47,26 @@ syn match asnBraces     "[{}]"
 syn sync ccomment asnComment
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_asn_syn_inits")
-  if version < 508
-    let did_asn_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink asnDefinition	Function
-  HiLink asnBraces		Function
-  HiLink asnStructure	Statement
-  HiLink asnBoolValue	Boolean
-  HiLink asnSpecial		Special
-  HiLink asnString		String
-  HiLink asnCharacter	Character
-  HiLink asnSpecialCharacter	asnSpecial
-  HiLink asnNumber		asnValue
-  HiLink asnComment		Comment
-  HiLink asnLineComment	asnComment
-  HiLink asnType		Type
-  HiLink asnTypeInfo		PreProc
-  HiLink asnValue		Number
-  HiLink asnExternal		Include
-  HiLink asnTagModifier	Function
-  HiLink asnFieldOption	Type
-  delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+HiLink asnDefinition	Function
+HiLink asnBraces		Function
+HiLink asnStructure	Statement
+HiLink asnBoolValue	Boolean
+HiLink asnSpecial		Special
+HiLink asnString		String
+HiLink asnCharacter	Character
+HiLink asnSpecialCharacter	asnSpecial
+HiLink asnNumber		asnValue
+HiLink asnComment		Comment
+HiLink asnLineComment	asnComment
+HiLink asnType		Type
+HiLink asnTypeInfo		PreProc
+HiLink asnValue		Number
+HiLink asnExternal		Include
+HiLink asnTagModifier	Function
+HiLink asnFieldOption	Type
+delcommand HiLink
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/syntax/aspperl.vim b/runtime/syntax/aspperl.vim
index 0f7ef46872..5a9abedb19 100644
--- a/runtime/syntax/aspperl.vim
+++ b/runtime/syntax/aspperl.vim
@@ -4,11 +4,8 @@
 " URL:		http://nim.dhs.org/~edh/aspperl.vim
 " Last Change:	2001 May 09
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -16,14 +13,9 @@ if !exists("main_syntax")
   let main_syntax = 'perlscript'
 endif
 
-if version < 600
-  so <sfile>:p:h/html.vim
-  syn include @AspPerlScript <sfile>:p:h/perl.vim
-else
-  runtime! syntax/html.vim
-  unlet b:current_syntax
-  syn include @AspPerlScript syntax/perl.vim
-endif
+runtime! syntax/html.vim
+unlet b:current_syntax
+syn include @AspPerlScript syntax/perl.vim
 
 syn cluster htmlPreproc add=AspPerlScriptInsideHtmlTags
 
diff --git a/runtime/syntax/aspvbs.vim b/runtime/syntax/aspvbs.vim
index f1435cb04b..07273e190b 100644
--- a/runtime/syntax/aspvbs.vim
+++ b/runtime/syntax/aspvbs.vim
@@ -11,10 +11,8 @@
 " Thanks to Dean Hall <hall@apt7.com> for testing the use of classes in
 " VBScripts which I've been too scared to do.
 
-" Quit when a syntax file was already loaded
-if version < 600
-  syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -22,11 +20,7 @@ if !exists("main_syntax")
   let main_syntax = 'aspvbs'
 endif
 
-if version < 600
-  source <sfile>:p:h/html.vim
-else
-  runtime! syntax/html.vim
-endif
+runtime! syntax/html.vim
 unlet b:current_syntax
 
 syn cluster htmlPreProc add=AspVBScriptInsideHtmlTags
@@ -163,31 +157,23 @@ syn sync match htmlHighlight grouphere htmlTag "%>"
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_aspvbs_syn_inits")
-  if version < 508
-    let did_aspvbs_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  "HiLink AspVBScript		Special
-  HiLink AspVBSLineNumber	Comment
-  HiLink AspVBSNumber		Number
-  HiLink AspVBSError		Error
-  HiLink AspVBSStatement	Statement
-  HiLink AspVBSString		String
-  HiLink AspVBSComment		Comment
-  HiLink AspVBSTodo		Todo
-  HiLink AspVBSFunction		Identifier
-  HiLink AspVBSMethods		PreProc
-  HiLink AspVBSEvents		Special
-  HiLink AspVBSTypeSpecifier	Type
+"HiLink AspVBScript		Special
+HiLink AspVBSLineNumber	Comment
+HiLink AspVBSNumber		Number
+HiLink AspVBSError		Error
+HiLink AspVBSStatement	Statement
+HiLink AspVBSString		String
+HiLink AspVBSComment		Comment
+HiLink AspVBSTodo		Todo
+HiLink AspVBSFunction		Identifier
+HiLink AspVBSMethods		PreProc
+HiLink AspVBSEvents		Special
+HiLink AspVBSTypeSpecifier	Type
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "aspvbs"
 
diff --git a/runtime/syntax/asterisk.vim b/runtime/syntax/asterisk.vim
index fd4ec39c91..c562b85575 100644
--- a/runtime/syntax/asterisk.vim
+++ b/runtime/syntax/asterisk.vim
@@ -5,10 +5,9 @@
 " Updated for 1.2 by Tilghman Lesher (Corydon76)
 " Last Change:	2015 Feb 27
 " version 0.4
-"
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -57,42 +56,35 @@ syn match       asteriskSetting         "^port\s*=\s*\d\{1,5}\s*$" contains=aste
 syn match       asteriskSetting         "^host\s*=\s*\(dynamic\|\(\d\{1,3}\.\d\{1,3}\.\d\{1,3}\.\d\{1,3}\)\|\([[:alnum:]][[:alnum:]\-\.]*\.[[:alpha:]]{2,10}\)\)" contains=asteriskIP,asteriskHostname
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_conf_syntax_inits")
-  if version < 508
-    let did_conf_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+
+HiLink        asteriskComment		Comment
+HiLink        asteriskExten		String
+HiLink        asteriskContext         Preproc
+HiLink        asteriskPattern         Type
+HiLink        asteriskApp             Statement
+HiLink        asteriskInclude         Preproc
+HiLink        asteriskIncludeBad	Error
+HiLink        asteriskPriority        Preproc
+HiLink        asteriskLabel           Type
+HiLink        asteriskVar             String
+HiLink        asteriskVarLen          Function
+HiLink        asteriskExp             Type
+HiLink        asteriskCodecsPermit    Preproc
+HiLink        asteriskCodecs          String
+HiLink        asteriskType            Statement
+HiLink        asteriskTypeType        Type
+HiLink        asteriskAuth            String
+HiLink        asteriskAuthType        Type
+HiLink        asteriskIPRange         Identifier
+HiLink        asteriskIP              Identifier
+HiLink        asteriskPort            Identifier
+HiLink        asteriskHostname        Identifier
+HiLink        asteriskSetting         Statement
+HiLink        asteriskError           Error
+delcommand HiLink
 
-  HiLink        asteriskComment		Comment
-  HiLink        asteriskExten		String
-  HiLink        asteriskContext         Preproc
-  HiLink        asteriskPattern         Type
-  HiLink        asteriskApp             Statement
-  HiLink        asteriskInclude         Preproc
-  HiLink        asteriskIncludeBad	Error
-  HiLink        asteriskPriority        Preproc
-  HiLink        asteriskLabel           Type
-  HiLink        asteriskVar             String
-  HiLink        asteriskVarLen          Function
-  HiLink        asteriskExp             Type
-  HiLink        asteriskCodecsPermit    Preproc
-  HiLink        asteriskCodecs          String
-  HiLink        asteriskType            Statement
-  HiLink        asteriskTypeType        Type
-  HiLink        asteriskAuth            String
-  HiLink        asteriskAuthType        Type
-  HiLink        asteriskIPRange         Identifier
-  HiLink        asteriskIP              Identifier
-  HiLink        asteriskPort            Identifier
-  HiLink        asteriskHostname        Identifier
-  HiLink        asteriskSetting         Statement
-  HiLink        asteriskError           Error
- delcommand HiLink
-endif
 let b:current_syntax = "asterisk" 
 " vim: ts=8 sw=2
 
diff --git a/runtime/syntax/asteriskvm.vim b/runtime/syntax/asteriskvm.vim
index a6c9dba418..357b29936f 100644
--- a/runtime/syntax/asteriskvm.vim
+++ b/runtime/syntax/asteriskvm.vim
@@ -3,10 +3,9 @@
 " Maintainer: Tilghman Lesher (Corydon76)
 " Last Change:	2006 Mar 21
 " version 0.2
-"
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -33,28 +32,20 @@ syn match       mailboxEmail            ",\zs[^@=,]*@[[:alnum:]\-\.]\+\.[[:alpha
 syn match       comma                   "[,|]" contained
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-:if version >= 508 || !exists("did_conf_syntax_inits")
-  if version < 508
-    let did_conf_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink        asteriskvmComment Comment
-  HiLink        asteriskvmContext         Identifier
-  HiLink        asteriskvmZone            Type
-  HiLink        zoneName                String
-  HiLink        zoneDef                 String
-  HiLink        asteriskvmSetting         Type
-  HiLink        asteriskvmSettingBool     Type
+HiLink        asteriskvmComment Comment
+HiLink        asteriskvmContext         Identifier
+HiLink        asteriskvmZone            Type
+HiLink        zoneName                String
+HiLink        zoneDef                 String
+HiLink        asteriskvmSetting         Type
+HiLink        asteriskvmSettingBool     Type
 
-  HiLink        asteriskvmMailbox         Statement
-  HiLink        mailboxEmail            String
- delcommand HiLink
-endif
+HiLink        asteriskvmMailbox         Statement
+HiLink        mailboxEmail            String
+delcommand HiLink
 
 let b:current_syntax = "asteriskvm"
 
diff --git a/runtime/syntax/atlas.vim b/runtime/syntax/atlas.vim
index b8fe4356b5..30e136941f 100644
--- a/runtime/syntax/atlas.vim
+++ b/runtime/syntax/atlas.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Inaki Saez <jisaez@sfe.indra.es>
 " Last Change:	2001 May 09
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -61,37 +58,29 @@ syn sync maxlines=100
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_atlas_syntax_inits")
-  if version < 508
-    let did_atlas_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink atlasConditional	Conditional
-  HiLink atlasRepeat		Repeat
-  HiLink atlasStatement	Statement
-  HiLink atlasNumber		Number
-  HiLink atlasHexNumber	Number
-  HiLink atlasOctalNumber	Number
-  HiLink atlasBinNumber	Number
-  HiLink atlasDecimalNumber	Float
-  HiLink atlasFormatString	String
-  HiLink atlasString		String
-  HiLink atlasComment		Comment
-  HiLink atlasComment2		Comment
-  HiLink atlasInclude		Include
-  HiLink atlasDefine		Macro
-  HiLink atlasReserved		PreCondit
-  HiLink atlasStorageClass	StorageClass
-  HiLink atlasIdentifier	NONE
-  HiLink atlasSpecial		Special
+HiLink atlasConditional	Conditional
+HiLink atlasRepeat		Repeat
+HiLink atlasStatement	Statement
+HiLink atlasNumber		Number
+HiLink atlasHexNumber	Number
+HiLink atlasOctalNumber	Number
+HiLink atlasBinNumber	Number
+HiLink atlasDecimalNumber	Float
+HiLink atlasFormatString	String
+HiLink atlasString		String
+HiLink atlasComment		Comment
+HiLink atlasComment2		Comment
+HiLink atlasInclude		Include
+HiLink atlasDefine		Macro
+HiLink atlasReserved		PreCondit
+HiLink atlasStorageClass	StorageClass
+HiLink atlasIdentifier	NONE
+HiLink atlasSpecial		Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "atlas"
 
diff --git a/runtime/syntax/automake.vim b/runtime/syntax/automake.vim
index eea2a9f38c..b34f7516b2 100644
--- a/runtime/syntax/automake.vim
+++ b/runtime/syntax/automake.vim
@@ -18,18 +18,12 @@
 " EXTRA_SOURCES.
 
 " Standard syntax initialization
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
   finish
 endif
 
 " Read the Makefile syntax to start with
-if version < 600
-  source <sfile>:p:h/make.vim
-else
-  runtime! syntax/make.vim
-endif
+runtime! syntax/make.vim
 
 syn match automakePrimary "^\w\+\(_PROGRAMS\|_LIBRARIES\|_LISP\|_PYTHON\|_JAVA\|_SCRIPTS\|_DATA\|_HEADERS\|_MANS\|_TEXINFOS\|_LTLIBRARIES\)\s*\ze+\=="
 syn match automakePrimary "^TESTS\s*\ze+\=="me=e-1
@@ -59,34 +53,26 @@ syn region  automakeMakeSString start=+'+  skip=+\\'+  end=+'+  contains=makeIde
 syn region  automakeMakeBString start=+`+  skip=+\\`+  end=+`+  contains=makeIdent,makeSString,makeDString,makeNextLine,automakeSubstitution
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_automake_syntax_inits")
-  if version < 508
-    let did_automake_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink automakePrimary     Statement
-  HiLink automakeSecondary   Type
-  HiLink automakeExtra       Special
-  HiLink automakeOptions     Special
-  HiLink automakeClean       Special
-  HiLink automakeSubdirs     Statement
-  HiLink automakeConditional PreProc
-  HiLink automakeSubst       PreProc
-  HiLink automakeComment1    makeComment
-  HiLink automakeComment2    makeComment
-  HiLink automakeMakeError   makeError
-  HiLink automakeBadSubst    makeError
-  HiLink automakeMakeDString makeDString
-  HiLink automakeMakeSString makeSString
-  HiLink automakeMakeBString makeBString
+HiLink automakePrimary     Statement
+HiLink automakeSecondary   Type
+HiLink automakeExtra       Special
+HiLink automakeOptions     Special
+HiLink automakeClean       Special
+HiLink automakeSubdirs     Statement
+HiLink automakeConditional PreProc
+HiLink automakeSubst       PreProc
+HiLink automakeComment1    makeComment
+HiLink automakeComment2    makeComment
+HiLink automakeMakeError   makeError
+HiLink automakeBadSubst    makeError
+HiLink automakeMakeDString makeDString
+HiLink automakeMakeSString makeSString
+HiLink automakeMakeBString makeBString
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "automake"
 
diff --git a/runtime/syntax/ave.vim b/runtime/syntax/ave.vim
index 2a0a9d85af..ae36939364 100644
--- a/runtime/syntax/ave.vim
+++ b/runtime/syntax/ave.vim
@@ -11,11 +11,8 @@
 " I use some technologies to automatically load avenue scripts
 " into ArcView.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -59,34 +56,26 @@ syn match aveTypos	"=="
 syn match aveTypos	"!="
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting+yet
-if version >= 508 || !exists("did_ave_syn_inits")
-  if version < 508
-	let did_ave_syn_inits = 1
-	command -nargs=+ HiLink hi link <args>
-  else
-	command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting+yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink aveStatement		Statement
+HiLink aveStatement		Statement
 
-  HiLink aveString		String
-  HiLink aveNumber		Number
+HiLink aveString		String
+HiLink aveNumber		Number
 
-  HiLink aveFixVariables	Special
-  HiLink aveVariables		Identifier
-  HiLink globalVariables	Special
-  HiLink aveConst		Special
+HiLink aveFixVariables	Special
+HiLink aveVariables		Identifier
+HiLink globalVariables	Special
+HiLink aveConst		Special
 
-  HiLink aveClassMethods	Function
+HiLink aveClassMethods	Function
 
-  HiLink aveOperator		Operator
-  HiLink aveComment		Comment
+HiLink aveOperator		Operator
+HiLink aveComment		Comment
 
-  HiLink aveTypos		Error
+HiLink aveTypos		Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "ave"
diff --git a/runtime/syntax/ayacc.vim b/runtime/syntax/ayacc.vim
index fedd0e80a0..9f5ec566ee 100644
--- a/runtime/syntax/ayacc.vim
+++ b/runtime/syntax/ayacc.vim
@@ -6,21 +6,14 @@
 " Comment:	     Replaced sourcing c.vim file by ada.vim and rename yacc*
 "		in ayacc*
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-   syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
    finish
 endif
 
 " Read the Ada syntax to start with
-if version < 600
-   so <sfile>:p:h/ada.vim
-else
-   runtime! syntax/ada.vim
-   unlet b:current_syntax
-endif
+runtime! syntax/ada.vim
+unlet b:current_syntax
 
 let s:cpo_save = &cpo
 set cpo&vim
@@ -54,35 +47,28 @@ syn match	ayaccSep	"^[ \t]*%}"
 syn match	ayaccCurlyError	"[{}]"
 syn region	ayaccAction	matchgroup=ayaccCurly start="{" end="}" contains=ALLBUT,@ayaccActionGroup
 
-if version >= 508 || !exists("did_ayacc_syntax_inits")
-   if version < 508
-      let did_ayacc_syntax_inits = 1
-      command -nargs=+ HiLink hi link <args>
-   else
-      command -nargs=+ HiLink hi def link <args>
-   endif
+command -nargs=+ HiLink hi def link <args>
 
-  " Internal ayacc highlighting links
-  HiLink ayaccBrkt	ayaccStmt
-  HiLink ayaccKey	ayaccStmt
-  HiLink ayaccOper	ayaccStmt
-  HiLink ayaccUnionStart	ayaccKey
+" Internal ayacc highlighting links
+HiLink ayaccBrkt	ayaccStmt
+HiLink ayaccKey	ayaccStmt
+HiLink ayaccOper	ayaccStmt
+HiLink ayaccUnionStart	ayaccKey
 
-  " External ayacc highlighting links
-  HiLink ayaccCurly	Delimiter
-  HiLink ayaccCurlyError	Error
-  HiLink ayaccDefinition	Function
-  HiLink ayaccDelim	Function
-  HiLink ayaccKeyActn	Special
-  HiLink ayaccSectionSep	Todo
-  HiLink ayaccSep	Delimiter
-  HiLink ayaccStmt	Statement
-  HiLink ayaccType	Type
+" External ayacc highlighting links
+HiLink ayaccCurly	Delimiter
+HiLink ayaccCurlyError	Error
+HiLink ayaccDefinition	Function
+HiLink ayaccDelim	Function
+HiLink ayaccKeyActn	Special
+HiLink ayaccSectionSep	Todo
+HiLink ayaccSep	Delimiter
+HiLink ayaccStmt	Statement
+HiLink ayaccType	Type
 
-  " since Bram doesn't like my Delimiter :|
-  HiLink Delimiter	Type
-  delcommand HiLink
-endif
+" since Bram doesn't like my Delimiter :|
+HiLink Delimiter	Type
+delcommand HiLink
 
 let b:current_syntax = "ayacc"
 
diff --git a/runtime/syntax/b.vim b/runtime/syntax/b.vim
index b470ab9ef3..95f5ad7275 100644
--- a/runtime/syntax/b.vim
+++ b/runtime/syntax/b.vim
@@ -5,11 +5,8 @@
 " LastChange:	8 Dec 2007
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-   syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
    finish
 endif
 
@@ -69,58 +66,50 @@ syn region bPreProc		start="^\s*#\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error
 syn sync ccomment bComment minlines=10
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+" Only when an item doesn't have highlighting yet
 
-if version >= 508 || !exists("did_b_syntax_inits")
-   if version < 508
-      let did_b_syntax_inits = 1
-      command -nargs=+ HiLink hi link <args>
-   else
-      command -nargs=+ HiLink hi def link <args>
-   endif
+command -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting.  Can be overridden later
-  HiLink bLabel	Label
-  HiLink bUserLabel	Label
-  HiLink bConditional	Conditional
-  HiLink bRepeat	Repeat
-  HiLink bLogic	Special
-  HiLink bCharacter	Character
-  HiLink bSpecialCharacter bSpecial
-  HiLink bNumber	Number
-  HiLink bFloat	Float
-  HiLink bOctalError	bError
-  HiLink bParenError	bError
+" The default methods for highlighting.  Can be overridden later
+HiLink bLabel	Label
+HiLink bUserLabel	Label
+HiLink bConditional	Conditional
+HiLink bRepeat	Repeat
+HiLink bLogic	Special
+HiLink bCharacter	Character
+HiLink bSpecialCharacter bSpecial
+HiLink bNumber	Number
+HiLink bFloat	Float
+HiLink bOctalError	bError
+HiLink bParenError	bError
 " HiLink bInParen	bError
-  HiLink bCommentError	bError
-  HiLink bBoolean	Identifier
-  HiLink bConstant	Identifier
-  HiLink bGuard	Identifier
-  HiLink bOperator	Operator
-  HiLink bKeywords	Operator
-  HiLink bOps		Identifier
-  HiLink bStructure	Structure
-  HiLink bStorageClass	StorageClass
-  HiLink bInclude	Include
-  HiLink bPreProc	PreProc
-  HiLink bDefine	Macro
-  HiLink bIncluded	bString
-  HiLink bError	Error
-  HiLink bStatement	Statement
-  HiLink bPreCondit	PreCondit
-  HiLink bType		Type
-  HiLink bCommentError	bError
-  HiLink bCommentString bString
-  HiLink bComment2String bString
-  HiLink bCommentSkip	bComment
-  HiLink bString	String
-  HiLink bComment	Comment
-  HiLink bSpecial	SpecialChar
-  HiLink bTodo		Todo
-  "hi link bIdentifier	Identifier
-  delcommand HiLink
-endif
+HiLink bCommentError	bError
+HiLink bBoolean	Identifier
+HiLink bConstant	Identifier
+HiLink bGuard	Identifier
+HiLink bOperator	Operator
+HiLink bKeywords	Operator
+HiLink bOps		Identifier
+HiLink bStructure	Structure
+HiLink bStorageClass	StorageClass
+HiLink bInclude	Include
+HiLink bPreProc	PreProc
+HiLink bDefine	Macro
+HiLink bIncluded	bString
+HiLink bError	Error
+HiLink bStatement	Statement
+HiLink bPreCondit	PreCondit
+HiLink bType		Type
+HiLink bCommentError	bError
+HiLink bCommentString bString
+HiLink bComment2String bString
+HiLink bCommentSkip	bComment
+HiLink bString	String
+HiLink bComment	Comment
+HiLink bSpecial	SpecialChar
+HiLink bTodo		Todo
+"hi link bIdentifier	Identifier
+delcommand HiLink
 
 let b:current_syntax = "b"
 
diff --git a/runtime/syntax/baan.vim b/runtime/syntax/baan.vim
index 5009218b60..917562bcf7 100644
--- a/runtime/syntax/baan.vim
+++ b/runtime/syntax/baan.vim
@@ -4,15 +4,8 @@
 " Originally owned by: Erwin Smit / Her van de Vliert
 " Last change:  v1.17 2006/04/26 10:40:18
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-"
-if version < 600
-  syntax clear
-  if exists("baan_fold")
-	  unlet baan_fold
-  endif
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -1894,40 +1887,32 @@ syn keyword baanBshell bclm.productidlicensed
 syn keyword baanBshell bclm.set.desktop
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_baan_syn_inits")
-  if version < 508
-    let did_baan_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink baanConditional	Conditional
-  HiLink baan3gl		Statement
-  HiLink baan3glpre		PreProc
-  HiLink baan4gl		Statement
-  HiLink baan4glh		Statement
-  HiLink baansql		Statement
-  HiLink baansqlh		Statement
-  HiLink baanDalHook		Statement
-  HiLink baanNumber		Number
-  HiLink baanString		String
-  HiLink baanOpenStringError	Error
-  HiLink baanConstant		Constant
-  HiLink baanComment		Comment
-  HiLink baanCommenth		Comment
-  HiLink baanUncommented	Comment
-  HiLink baanDLLUsage		Comment
-  HiLink baanFunUsage		Comment
-  HiLink baanIdentifier		Normal
-  HiLink baanBshell		Function
-  HiLink baanType		Type
-  HiLink baanStorageClass	StorageClass
+HiLink baanConditional	Conditional
+HiLink baan3gl		Statement
+HiLink baan3glpre		PreProc
+HiLink baan4gl		Statement
+HiLink baan4glh		Statement
+HiLink baansql		Statement
+HiLink baansqlh		Statement
+HiLink baanDalHook		Statement
+HiLink baanNumber		Number
+HiLink baanString		String
+HiLink baanOpenStringError	Error
+HiLink baanConstant		Constant
+HiLink baanComment		Comment
+HiLink baanCommenth		Comment
+HiLink baanUncommented	Comment
+HiLink baanDLLUsage		Comment
+HiLink baanFunUsage		Comment
+HiLink baanIdentifier		Normal
+HiLink baanBshell		Function
+HiLink baanType		Type
+HiLink baanStorageClass	StorageClass
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "baan"
 
diff --git a/runtime/syntax/basic.vim b/runtime/syntax/basic.vim
index c72032da27..6384913e39 100644
--- a/runtime/syntax/basic.vim
+++ b/runtime/syntax/basic.vim
@@ -8,11 +8,8 @@
 " This syntax file not a complete implementation yet.  Send suggestions to the
 " maintainer.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -143,34 +140,26 @@ syn match   basicFilenumber  "#\d\+"
 syn match   basicMathsOperator   "-\|=\|[:<>+\*^/\\]\|AND\|OR"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_basic_syntax_inits")
-  if version < 508
-    let did_basic_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink basicLabel		Label
-  HiLink basicConditional	Conditional
-  HiLink basicRepeat		Repeat
-  HiLink basicLineNumber	Comment
-  HiLink basicNumber		Number
-  HiLink basicError		Error
-  HiLink basicStatement	Statement
-  HiLink basicString		String
-  HiLink basicComment		Comment
-  HiLink basicSpecial		Special
-  HiLink basicTodo		Todo
-  HiLink basicFunction		Identifier
-  HiLink basicTypeSpecifier Type
-  HiLink basicFilenumber basicTypeSpecifier
-  "hi basicMathsOperator term=bold cterm=bold gui=bold
+HiLink basicLabel		Label
+HiLink basicConditional	Conditional
+HiLink basicRepeat		Repeat
+HiLink basicLineNumber	Comment
+HiLink basicNumber		Number
+HiLink basicError		Error
+HiLink basicStatement	Statement
+HiLink basicString		String
+HiLink basicComment		Comment
+HiLink basicSpecial		Special
+HiLink basicTodo		Todo
+HiLink basicFunction		Identifier
+HiLink basicTypeSpecifier Type
+HiLink basicFilenumber basicTypeSpecifier
+"hi basicMathsOperator term=bold cterm=bold gui=bold
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "basic"
 
diff --git a/runtime/syntax/bc.vim b/runtime/syntax/bc.vim
index 965afc35b1..bf4a62afc9 100644
--- a/runtime/syntax/bc.vim
+++ b/runtime/syntax/bc.vim
@@ -5,11 +5,8 @@
 " 		(Dominique Pelle added @Spell)
 " Available on:	www.gjh.sk/~vlado/bc.vim
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -53,27 +50,19 @@ syn match bcParenError			")"
 syn case match
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_bc_syntax_inits")
-  if version < 508
-    let did_bc_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink bcKeyword		Statement
-  HiLink bcType		Type
-  HiLink bcConstant		Constant
-  HiLink bcNumber		Number
-  HiLink bcComment		Comment
-  HiLink bcString		String
-  HiLink bcSpecialChar		SpecialChar
-  HiLink bcParenError		Error
+HiLink bcKeyword		Statement
+HiLink bcType		Type
+HiLink bcConstant		Constant
+HiLink bcNumber		Number
+HiLink bcComment		Comment
+HiLink bcString		String
+HiLink bcSpecialChar		SpecialChar
+HiLink bcParenError		Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "bc"
 " vim: ts=8
diff --git a/runtime/syntax/bib.vim b/runtime/syntax/bib.vim
index 8bd0528e1e..24b80b51b7 100644
--- a/runtime/syntax/bib.vim
+++ b/runtime/syntax/bib.vim
@@ -8,11 +8,8 @@
 
 " Initialization
 " ==============
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -91,11 +88,7 @@ syn region bibField contained start="\S\+\s*=\s*" end=/[}),]/me=e-1 contains=bib
 syn region bibEntryData contained start=/[{(]/ms=e+1 end=/[})]/me=e-1 contains=bibKey,bibField
 " Actually, 5.8 <= Vim < 6.0 would ignore the `fold' keyword anyway, but Vim<5.8 would produce
 " an error, so we explicitly distinguish versions with and without folding functionality:
-if version < 600
-  syn region bibEntry start=/@\S\+\s*[{(]/ end=/^\s*[})]/ transparent contains=bibType,bibEntryData nextgroup=bibComment
-else
-  syn region bibEntry start=/@\S\+\s*[{(]/ end=/^\s*[})]/ transparent fold contains=bibType,bibEntryData nextgroup=bibComment
-endif
+syn region bibEntry start=/@\S\+\s*[{(]/ end=/^\s*[})]/ transparent fold contains=bibType,bibEntryData nextgroup=bibComment
 syn region bibComment2 start=/@Comment\s*[{(]/ end=/^\s*[})]/me=e-1 contains=@bibCommentContents nextgroup=bibEntry
 
 " Synchronization
@@ -107,25 +100,18 @@ syn sync minlines=50
 " Highlighting defaults
 " =====================
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_bib_syn_inits")
-  if version < 508
-    let did_bib_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink bibType	Identifier
-  HiLink bibEntryKw	Statement
-  HiLink bibNSEntryKw	PreProc
-  HiLink bibKey		Special
-  HiLink bibVariable	Constant
-  HiLink bibUnescapedSpecial	Error
-  HiLink bibComment	Comment
-  HiLink bibComment2	Comment
-  delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+
+HiLink bibType	Identifier
+HiLink bibEntryKw	Statement
+HiLink bibNSEntryKw	PreProc
+HiLink bibKey		Special
+HiLink bibVariable	Constant
+HiLink bibUnescapedSpecial	Error
+HiLink bibComment	Comment
+HiLink bibComment2	Comment
+delcommand HiLink
 
 let b:current_syntax = "bib"
 
diff --git a/runtime/syntax/bindzone.vim b/runtime/syntax/bindzone.vim
index d599a85db2..f2372556b1 100644
--- a/runtime/syntax/bindzone.vim
+++ b/runtime/syntax/bindzone.vim
@@ -9,11 +9,8 @@
 " 
 " $Id: bindzone.vim 12 2011-07-16 21:09:57Z julian $
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -70,40 +67,32 @@ syn region      zoneParen       contained start="(" end=")" contains=zoneSerial,
 syn match       zoneComment     /;.*/
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_bind_zone_syn_inits")
-  if version < 508
-    let did_bind_zone_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink zoneDirective    Macro
-  
-  HiLink zoneUnknown      Error
-  
-  HiLink zoneOrigin       Statement
-  HiLink zoneOwnerName    Statement
-  HiLink zoneDomain       Identifier
-  
-  HiLink zoneSpecial      Special
-  HiLink zoneTTL          Constant
-  HiLink zoneClass        Include
-  HiLink zoneRRType       Type
-  
-  HiLink zoneIPAddr       Number
-  HiLink zoneIP6Addr      Number
-  HiLink zoneText         String
-  HiLink zoneNumber       Number
-  HiLink zoneSerial       Special
-  
-  HiLink zoneErrParen     Error
-  HiLink zoneComment      Comment
+HiLink zoneDirective    Macro
 
-  delcommand HiLink
-endif
+HiLink zoneUnknown      Error
+
+HiLink zoneOrigin       Statement
+HiLink zoneOwnerName    Statement
+HiLink zoneDomain       Identifier
+
+HiLink zoneSpecial      Special
+HiLink zoneTTL          Constant
+HiLink zoneClass        Include
+HiLink zoneRRType       Type
+
+HiLink zoneIPAddr       Number
+HiLink zoneIP6Addr      Number
+HiLink zoneText         String
+HiLink zoneNumber       Number
+HiLink zoneSerial       Special
+
+HiLink zoneErrParen     Error
+HiLink zoneComment      Comment
+
+delcommand HiLink
 
 let b:current_syntax = "bindzone"
 
diff --git a/runtime/syntax/blank.vim b/runtime/syntax/blank.vim
index 60251c966c..53ef556a9f 100644
--- a/runtime/syntax/blank.vim
+++ b/runtime/syntax/blank.vim
@@ -3,11 +3,8 @@
 " Maintainer:   Rafal M. Sulejman <unefunge@friko2.onet.pl>
 " Last change:  2011 Dec 28 by Thilo Six
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -28,22 +25,14 @@ syn match blankNumber "\[[0-9]\+\]"
 syn case match
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_blank_syntax_inits")
-  if version < 508
-    let did_blank_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink blankInstruction      Statement
-  HiLink blankNumber	       Number
-  HiLink blankString	       String
+HiLink blankInstruction      Statement
+HiLink blankNumber	       Number
+HiLink blankString	       String
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "blank"
 
diff --git a/runtime/syntax/bst.vim b/runtime/syntax/bst.vim
index e7836d7811..995f1da464 100644
--- a/runtime/syntax/bst.vim
+++ b/runtime/syntax/bst.vim
@@ -4,21 +4,12 @@
 " Filenames:    *.bst
 " $Id: bst.vim,v 1.2 2007/05/05 18:24:42 vimboss Exp $
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
-if version < 600
-    command -nargs=1 SetIsk set iskeyword=<args>
-else
-    command -nargs=1 SetIsk setlocal iskeyword=<args>
-endif
-SetIsk 48-57,#,$,',.,A-Z,a-z
-delcommand SetIsk
+setlocal iskeyword=48-57,#,$,',.,A-Z,a-z
 
 syn case ignore
 
@@ -62,27 +53,19 @@ syn keyword bstField          title type
 syn keyword bstField          volume year
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_bst_syn_inits")
-    if version < 508
-        let did_bst_syn_inits = 1
-        command -nargs=+ HiLink hi link <args>
-    else
-        command -nargs=+ HiLink hi def link <args>
-    endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-    HiLink bstComment           Comment
-    HiLink bstString            String
-    HiLink bstCommand           PreProc
-    HiLink bstBuiltIn           Statement
-    HiLink bstField             Special
-    HiLink bstNumber            Number
-    HiLink bstType              Type
-    HiLink bstIdentifier        Identifier
-    HiLink bstError             Error
-    delcommand HiLink
-endif
+HiLink bstComment           Comment
+HiLink bstString            String
+HiLink bstCommand           PreProc
+HiLink bstBuiltIn           Statement
+HiLink bstField             Special
+HiLink bstNumber            Number
+HiLink bstType              Type
+HiLink bstIdentifier        Identifier
+HiLink bstError             Error
+delcommand HiLink
 
 let b:current_syntax = "bst"
 
diff --git a/runtime/syntax/btm.vim b/runtime/syntax/btm.vim
index 4fd5b2db99..133a51b127 100644
--- a/runtime/syntax/btm.vim
+++ b/runtime/syntax/btm.vim
@@ -11,11 +11,8 @@
 "//- After unary operators like "defined" can assume token type.
 "//  Should there be more of these?
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -184,45 +181,37 @@ syn keyword btmCommand	unlock unset ver verify vol
 syn keyword btmCommand	vscrput y
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_btm_syntax_inits")
-  if version < 508
-    let did_btm_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink btmLabel		Special
-  HiLink btmLabelMark		Special
-  HiLink btmCmdDivider		Special
-  HiLink btmConditional		btmStatement
-  HiLink btmDotBoolOp		btmStatement
-  HiLink btmRepeat		btmStatement
-  HiLink btmEchoCommand	btmStatement
-  HiLink btmEchoParam		btmStatement
-  HiLink btmStatement		Statement
-  HiLink btmTodo		Todo
-  HiLink btmString		String
-  HiLink btmNumber		Number
-  HiLink btmComment		Comment
-  HiLink btmArgument		Identifier
-  HiLink btmVariable		Identifier
-  HiLink btmEcho		String
-  HiLink btmBIFMatch		btmStatement
-  HiLink btmBuiltInFunc		btmStatement
-  HiLink btmBuiltInVar		btmStatement
-  HiLink btmSpecialVar		btmStatement
-  HiLink btmCommand		btmStatement
+HiLink btmLabel		Special
+HiLink btmLabelMark		Special
+HiLink btmCmdDivider		Special
+HiLink btmConditional		btmStatement
+HiLink btmDotBoolOp		btmStatement
+HiLink btmRepeat		btmStatement
+HiLink btmEchoCommand	btmStatement
+HiLink btmEchoParam		btmStatement
+HiLink btmStatement		Statement
+HiLink btmTodo		Todo
+HiLink btmString		String
+HiLink btmNumber		Number
+HiLink btmComment		Comment
+HiLink btmArgument		Identifier
+HiLink btmVariable		Identifier
+HiLink btmEcho		String
+HiLink btmBIFMatch		btmStatement
+HiLink btmBuiltInFunc		btmStatement
+HiLink btmBuiltInVar		btmStatement
+HiLink btmSpecialVar		btmStatement
+HiLink btmCommand		btmStatement
 
-  "optional highlighting
-  "HiLink btmShowTab		Error
-  "HiLink btmShowTabc		Error
-  "hiLink btmIdentifier		Identifier
+"optional highlighting
+"HiLink btmShowTab		Error
+"HiLink btmShowTabc		Error
+"hiLink btmIdentifier		Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "btm"
 
diff --git a/runtime/syntax/bzr.vim b/runtime/syntax/bzr.vim
index ef5445bf45..11450ba996 100644
--- a/runtime/syntax/bzr.vim
+++ b/runtime/syntax/bzr.vim
@@ -11,11 +11,8 @@
 "    Gioele Barabucci
 "       for idea of diff highlighting
 
-" For version 5.x: Clear all syntax items.
-" For version 6.x: Quit when a syntax file was already loaded.
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded.
+if exists("b:current_syntax")
   finish
 endif
 
@@ -40,24 +37,16 @@ syn sync clear
 syn sync match bzrSync  grouphere bzrRegion "^-\{14} This line and the following will be ignored -\{14}$"me=s-1
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already.
-" For version 5.8 and later: only when an item doesn't have highlighting yet.
-if version >= 508 || !exists("did_bzr_syn_inits")
-  if version <= 508
-    let did_bzr_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet.
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink bzrRemoved    Constant
-  HiLink bzrAdded      Identifier
-  HiLink bzrModified   Special
-  HiLink bzrRenamed    Special
-  HiLink bzrUnchanged  Special
-  HiLink bzrUnknown    Special
+HiLink bzrRemoved    Constant
+HiLink bzrAdded      Identifier
+HiLink bzrModified   Special
+HiLink bzrRenamed    Special
+HiLink bzrUnchanged  Special
+HiLink bzrUnknown    Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "bzr"
diff --git a/runtime/syntax/cabal.vim b/runtime/syntax/cabal.vim
index 4130bac894..0ba2704eba 100644
--- a/runtime/syntax/cabal.vim
+++ b/runtime/syntax/cabal.vim
@@ -18,11 +18,8 @@
 " v1.0: Cabal syntax in vimball format
 "       (thanks to Magnus Therning)
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -105,27 +102,19 @@ syn match	cabalStatement	"\ctype"
 syn match	cabalStatement	"\cversion"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_cabal_syn_inits")
-  if version < 508
-    let did_cabal_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink cabalVersion       Number
-  HiLink cabalTruth         Boolean
-  HiLink cabalComment       Comment
-  HiLink cabalStatement     Statement
-  HiLink cabalCategory      Type
-  HiLink cabalFunction      Function
-  HiLink cabalConditional   Conditional
-  HiLink cabalOperator      Operator
-  HiLink cabalCompiler      Constant
-  delcommand HiLink
-endif
+HiLink cabalVersion       Number
+HiLink cabalTruth         Boolean
+HiLink cabalComment       Comment
+HiLink cabalStatement     Statement
+HiLink cabalCategory      Type
+HiLink cabalFunction      Function
+HiLink cabalConditional   Conditional
+HiLink cabalOperator      Operator
+HiLink cabalCompiler      Constant
+delcommand HiLink
 
 let b:current_syntax = "cabal"
 
diff --git a/runtime/syntax/cfg.vim b/runtime/syntax/cfg.vim
index b82fb26fc0..c57b6f8711 100644
--- a/runtime/syntax/cfg.vim
+++ b/runtime/syntax/cfg.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Igor N. Prischepoff (igor@tyumbit.ru, pri_igor@mail.ru)
 " Last change:	2012 Aug 11
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syntax clear
-elseif exists ("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists ("b:current_syntax")
     finish
 endif
 
@@ -36,25 +33,18 @@ syn match  CfgComment	";.*"
 syn match  CfgComment	"\/\/.*"
 
 " Define the default hightlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_cfg_syn_inits")
-    if version < 508
-	let did_cfg_syn_inits = 1
-	command -nargs=+ HiLink hi link <args>
-    else
-	command -nargs=+ HiLink hi def link <args>
-    endif
-    HiLink CfgOnOff     Label
-    HiLink CfgComment	Comment
-    HiLink CfgSection	Type
-    HiLink CfgString	String
-    HiLink CfgParams    Keyword
-    HiLink CfgValues    Constant
-    HiLink CfgDirectory Directory
-    HiLink UncPath      Directory
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+HiLink CfgOnOff     Label
+HiLink CfgComment	Comment
+HiLink CfgSection	Type
+HiLink CfgString	String
+HiLink CfgParams    Keyword
+HiLink CfgValues    Constant
+HiLink CfgDirectory Directory
+HiLink UncPath      Directory
+
+delcommand HiLink
 
-    delcommand HiLink
-endif
 let b:current_syntax = "cfg"
 " vim:ts=8
diff --git a/runtime/syntax/ch.vim b/runtime/syntax/ch.vim
index add7395093..05a1fcbdd6 100644
--- a/runtime/syntax/ch.vim
+++ b/runtime/syntax/ch.vim
@@ -8,21 +8,14 @@
 " Ch is a C/C++ interpreter with many high level extensions
 "
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " Read the C syntax to start with
-if version < 600
-  so <sfile>:p:h/c.vim
-else
-  runtime! syntax/c.vim
-  unlet b:current_syntax
-endif
+runtime! syntax/c.vim
+unlet b:current_syntax
 
 " Ch extentions
 
@@ -33,20 +26,14 @@ syn keyword	chStructure	class
 syn keyword	chType		string_t array
 
 " Default highlighting
-if version >= 508 || !exists("did_ch_syntax_inits")
-  if version < 508
-    let did_ch_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink chAccess		chStatement
-  HiLink chExceptions		Exception
-  HiLink chStatement		Statement
-  HiLink chType			Type
-  HiLink chStructure		Structure
-  delcommand HiLink
-endif
+command -nargs=+ HiLink hi def link <args>
+
+HiLink chAccess		chStatement
+HiLink chExceptions		Exception
+HiLink chStatement		Statement
+HiLink chType			Type
+HiLink chStructure		Structure
+delcommand HiLink
 
 let b:current_syntax = "ch"
 
diff --git a/runtime/syntax/change.vim b/runtime/syntax/change.vim
index e9bf88b9d6..ae90f348bf 100644
--- a/runtime/syntax/change.vim
+++ b/runtime/syntax/change.vim
@@ -7,11 +7,8 @@
 " in the articles by Donald E. Knuth and Silvio Levy cited in "web.vim" and
 " "cweb.vim" respectively.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -21,21 +18,13 @@ syn region changeFromMaterial start="^@x.*$"ms=e+1 end="^@y.*$"me=s-1
 syn region changeToMaterial start="^@y.*$"ms=e+1 end="^@z.*$"me=s-1
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_change_syntax_inits")
-  if version < 508
-    let did_change_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink changeFromMaterial String
-  HiLink changeToMaterial Statement
+HiLink changeFromMaterial String
+HiLink changeToMaterial Statement
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "change"
 
diff --git a/runtime/syntax/changelog.vim b/runtime/syntax/changelog.vim
index 33d31ba466..fc55fb528f 100644
--- a/runtime/syntax/changelog.vim
+++ b/runtime/syntax/changelog.vim
@@ -4,11 +4,8 @@
 " Maintainer:	Corinna Vinschen <vinschen@redhat.com>
 " Last Change:	June 1, 2003
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -28,17 +25,12 @@ endif
 
 syn match	changelogText	"^\s.*$" contains=changelogMail,changelogNumber,changelogMonth,changelogDay,changelogError
 syn match	changelogHeader	"^\S.*$" contains=changelogNumber,changelogMonth,changelogDay,changelogMail
-if version < 600
-  syn region	changelogFiles	start="^\s\+[+*]\s" end=":\s" end="^$" contains=changelogBullet,changelogColon,changelogError keepend
-  syn region	changelogFiles	start="^\s\+[([]" end=":\s" end="^$" contains=changelogBullet,changelogColon,changelogError keepend
-  syn match	changelogColon	contained ":\s"
-else
-  syn region	changelogFiles	start="^\s\+[+*]\s" end=":" end="^$" contains=changelogBullet,changelogColon,changelogFuncs,changelogError keepend
-  syn region	changelogFiles	start="^\s\+[([]" end=":" end="^$" contains=changelogBullet,changelogColon,changelogFuncs,changelogError keepend
-  syn match	changelogFuncs  contained "(.\{-})" extend
-  syn match	changelogFuncs  contained "\[.\{-}]" extend
-  syn match	changelogColon	contained ":"
-endif
+syn region	changelogFiles	start="^\s\+[+*]\s" end=":" end="^$" contains=changelogBullet,changelogColon,changelogFuncs,changelogError keepend
+syn region	changelogFiles	start="^\s\+[([]" end=":" end="^$" contains=changelogBullet,changelogColon,changelogFuncs,changelogError keepend
+syn match	changelogFuncs  contained "(.\{-})" extend
+syn match	changelogFuncs  contained "\[.\{-}]" extend
+syn match	changelogColon	contained ":"
+
 syn match	changelogBullet	contained "^\s\+[+*]\s" contains=changelogError
 syn match	changelogMail	contained "<[A-Za-z0-9\._:+-]\+@[A-Za-z0-9\._-]\+>"
 syn keyword	changelogMonth	contained jan feb mar apr may jun jul aug sep oct nov dec
@@ -46,32 +38,22 @@ syn keyword	changelogDay	contained mon tue wed thu fri sat sun
 syn match	changelogNumber	contained "[.-]*[0-9]\+"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_changelog_syntax_inits")
-  if version < 508
-    let did_changelog_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink changelogText		Normal
-  HiLink changelogBullet	Type
-  HiLink changelogColon		Type
-  HiLink changelogFiles		Comment
-  if version >= 600
-    HiLink changelogFuncs	Comment
-  endif
-  HiLink changelogHeader	Statement
-  HiLink changelogMail		Special
-  HiLink changelogNumber	Number
-  HiLink changelogMonth		Number
-  HiLink changelogDay		Number
-  HiLink changelogError		Folded
+HiLink changelogText		Normal
+HiLink changelogBullet	Type
+HiLink changelogColon		Type
+HiLink changelogFiles		Comment
+HiLink changelogFuncs	Comment
+HiLink changelogHeader	Statement
+HiLink changelogMail		Special
+HiLink changelogNumber	Number
+HiLink changelogMonth		Number
+HiLink changelogDay		Number
+HiLink changelogError		Folded
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "changelog"
 
diff --git a/runtime/syntax/chaskell.vim b/runtime/syntax/chaskell.vim
index 3f764d0e8a..4b1e8c53be 100644
--- a/runtime/syntax/chaskell.vim
+++ b/runtime/syntax/chaskell.vim
@@ -9,10 +9,6 @@
 let b:hs_chs=1
 
 " Include standard Haskell highlighting
-if version < 600
-  source <sfile>:p:h/haskell.vim
-else
-  runtime! syntax/haskell.vim
-endif
+runtime! syntax/haskell.vim
 
 " vim: ts=8
diff --git a/runtime/syntax/cheetah.vim b/runtime/syntax/cheetah.vim
index 7eb17567cf..c1860def3c 100644
--- a/runtime/syntax/cheetah.vim
+++ b/runtime/syntax/cheetah.vim
@@ -8,11 +8,8 @@
 "  PSP-style tags: <% .. %> (obsoleted feature)
 "  doc-strings and header comments (rarely used feature)
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
@@ -36,25 +33,17 @@ syn match   cheetahComment "##.*$" display
 syn region  cheetahMultiLineComment start="#\*" end="\*#"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_cheetah_syn_inits")
-	if version < 508
-		let did_cheetah_syn_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink cheetahPlaceHolder Identifier
-	HiLink cheetahDirective PreCondit
-	HiLink cheetahKeyword Define
-	HiLink cheetahContinuation Special
-	HiLink cheetahComment Comment
-	HiLink cheetahMultiLineComment Comment
+HiLink cheetahPlaceHolder Identifier
+HiLink cheetahDirective PreCondit
+HiLink cheetahKeyword Define
+HiLink cheetahContinuation Special
+HiLink cheetahComment Comment
+HiLink cheetahMultiLineComment Comment
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "cheetah"
 
diff --git a/runtime/syntax/chill.vim b/runtime/syntax/chill.vim
index e5200fe722..6ccb32c4c3 100644
--- a/runtime/syntax/chill.vim
+++ b/runtime/syntax/chill.vim
@@ -11,11 +11,8 @@
 " & Communications LTd.)
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -124,67 +121,59 @@ endif
 exec "syn sync ccomment chillComment minlines=" . chill_minlines
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_ch_syntax_inits")
-  if version < 508
-    let did_ch_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink chillLabel	Label
-  HiLink chillUserLabel	Label
-  HiLink chillConditional	Conditional
-  " hi chillConditional	term=bold ctermfg=red guifg=red gui=bold
+HiLink chillLabel	Label
+HiLink chillUserLabel	Label
+HiLink chillConditional	Conditional
+" hi chillConditional	term=bold ctermfg=red guifg=red gui=bold
 
-  HiLink chillRepeat	Repeat
-  HiLink chillProcess	Repeat
-  HiLink chillSignal	Repeat
-  HiLink chillCharacter	Character
-  HiLink chillSpecialCharacter chillSpecial
-  HiLink chillNumber	Number
-  HiLink chillFloat	Float
-  HiLink chillOctalError	chillError
-  HiLink chillParenError	chillError
-  HiLink chillInParen	chillError
-  HiLink chillCommentError	chillError
-  HiLink chillSpaceError	chillError
-  HiLink chillOperator	Operator
-  HiLink chillStructure	Structure
-  HiLink chillBlock	Operator
-  HiLink chillScope	Operator
-  "hi chillEDML     term=underline ctermfg=DarkRed guifg=Red
-  HiLink chillEDML	PreProc
-  "hi chillBoolConst	term=bold ctermfg=brown guifg=brown
-  HiLink chillBoolConst	Constant
-  "hi chillLogical	term=bold ctermfg=brown guifg=brown
-  HiLink chillLogical	Constant
-  HiLink chillStorageClass	StorageClass
-  HiLink chillInclude	Include
-  HiLink chillPreProc	PreProc
-  HiLink chillDefine	Macro
-  HiLink chillIncluded	chillString
-  HiLink chillError	Error
-  HiLink chillStatement	Statement
-  HiLink chillPreCondit	PreCondit
-  HiLink chillType	Type
-  HiLink chillCommentError	chillError
-  HiLink chillCommentString chillString
-  HiLink chillComment2String chillString
-  HiLink chillCommentSkip	chillComment
-  HiLink chillString	String
-  HiLink chillComment	Comment
-  " hi chillComment	term=None ctermfg=lightblue guifg=lightblue
-  HiLink chillSpecial	SpecialChar
-  HiLink chillTodo	Todo
-  HiLink chillBlock	Statement
-  "HiLink chillIdentifier	Identifier
-  HiLink chillBracket	Delimiter
+HiLink chillRepeat	Repeat
+HiLink chillProcess	Repeat
+HiLink chillSignal	Repeat
+HiLink chillCharacter	Character
+HiLink chillSpecialCharacter chillSpecial
+HiLink chillNumber	Number
+HiLink chillFloat	Float
+HiLink chillOctalError	chillError
+HiLink chillParenError	chillError
+HiLink chillInParen	chillError
+HiLink chillCommentError	chillError
+HiLink chillSpaceError	chillError
+HiLink chillOperator	Operator
+HiLink chillStructure	Structure
+HiLink chillBlock	Operator
+HiLink chillScope	Operator
+"hi chillEDML     term=underline ctermfg=DarkRed guifg=Red
+HiLink chillEDML	PreProc
+"hi chillBoolConst	term=bold ctermfg=brown guifg=brown
+HiLink chillBoolConst	Constant
+"hi chillLogical	term=bold ctermfg=brown guifg=brown
+HiLink chillLogical	Constant
+HiLink chillStorageClass	StorageClass
+HiLink chillInclude	Include
+HiLink chillPreProc	PreProc
+HiLink chillDefine	Macro
+HiLink chillIncluded	chillString
+HiLink chillError	Error
+HiLink chillStatement	Statement
+HiLink chillPreCondit	PreCondit
+HiLink chillType	Type
+HiLink chillCommentError	chillError
+HiLink chillCommentString chillString
+HiLink chillComment2String chillString
+HiLink chillCommentSkip	chillComment
+HiLink chillString	String
+HiLink chillComment	Comment
+" hi chillComment	term=None ctermfg=lightblue guifg=lightblue
+HiLink chillSpecial	SpecialChar
+HiLink chillTodo	Todo
+HiLink chillBlock	Statement
+"HiLink chillIdentifier	Identifier
+HiLink chillBracket	Delimiter
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "chill"
 
diff --git a/runtime/syntax/cl.vim b/runtime/syntax/cl.vim
index 41c045fb09..057d005cae 100644
--- a/runtime/syntax/cl.vim
+++ b/runtime/syntax/cl.vim
@@ -10,19 +10,12 @@
 " Version:              6
 " Last Change:		Mar 06 2013
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
-if version >= 600
-	setlocal iskeyword=@,48-57,_,-
-else
-	set iskeyword=@,48-57,_,-
-endif
+setlocal iskeyword=@,48-57,_,-
 
 syn case ignore
 
@@ -75,40 +68,32 @@ syn keyword	clFunction	asc asize chr name random slen srandom day getarg getcgi
 syn keyword	clStatement	clear clear_eol clear_eos close copy create unique with where empty define define ldefine delay_form delete escape exit_block exit_do exit_process field fork format get getfile getnext getprev goto head join maintain message no_join on_eop on_key on_exit on_delete openin openout openapp pause popenin popenout popenio print put range read redisplay refresh restart_block screen select sleep text unlock write and not or do
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if	version >= 508 || !exists("did_cl_syntax_inits")
-	if	version < 508
-		let did_cl_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink clifError	Error
-	HiLink clSpaceError	Error
-	HiLink clWhile		Repeat
-	HiLink clConditional	Conditional
-	HiLink clDebug		Debug
-	HiLink clNeedsWork	Todo
-	HiLink clTodo		Todo
-	HiLink clComment	Comment
-	HiLink clProcedure	Procedure
-	HiLink clBreak		Procedure
-	HiLink clInclude	Include
-	HiLink clSetOption	Statement
-	HiLink clSet		Identifier
-	HiLink clPreProc	PreProc
-	HiLink clOperator	Operator
-	HiLink clNumber		Number
-	HiLink clString		String
-	HiLink clQuote		Delimiter
-	HiLink clReserved	Identifier
-	HiLink clFunction	Function
-	HiLink clStatement	Statement
+HiLink clifError	Error
+HiLink clSpaceError	Error
+HiLink clWhile		Repeat
+HiLink clConditional	Conditional
+HiLink clDebug		Debug
+HiLink clNeedsWork	Todo
+HiLink clTodo		Todo
+HiLink clComment	Comment
+HiLink clProcedure	Procedure
+HiLink clBreak		Procedure
+HiLink clInclude	Include
+HiLink clSetOption	Statement
+HiLink clSet		Identifier
+HiLink clPreProc	PreProc
+HiLink clOperator	Operator
+HiLink clNumber		Number
+HiLink clString		String
+HiLink clQuote		Delimiter
+HiLink clReserved	Identifier
+HiLink clFunction	Function
+HiLink clStatement	Statement
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "cl"
 
diff --git a/runtime/syntax/clean.vim b/runtime/syntax/clean.vim
index ea95aa209e..13ddfaba3c 100644
--- a/runtime/syntax/clean.vim
+++ b/runtime/syntax/clean.vim
@@ -4,11 +4,8 @@
 " Co-Author:	Arthur van Leeuwen <arthurvl@sci.kun.nl>
 " Last Change:	2013 Oct 15 by Jurriën Stutterheim
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -52,49 +49,41 @@ syn match cleanFuncTypeDef "\([a-zA-Z].*\|(\=[-~@#$%^?!+*<>\/|&=:]\+)\=\)\s*\(in
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_clean_syntax_init")
-  if version < 508
-    let did_clean_syntax_init = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-   " Comments
-   HiLink cleanComment      Comment
-   " Constants and denotations
-   HiLink cleanStringDenot  String
-   HiLink cleanCharDenot    Character
-   HiLink cleanIntegerDenot Number
-   HiLink cleanBoolDenot    Boolean
-   HiLink cleanRealDenot    Float
-   " Identifiers
-   " Statements
-   HiLink cleanTypeClass    Keyword
-   HiLink cleanConditional  Conditional
-   HiLink cleanLabel		Label
-   HiLink cleanKeyword      Keyword
-   " Generic Preprocessing
-   HiLink cleanIncludeKeyword      Include
-   HiLink cleanModuleSystem PreProc
-   " Type
-   HiLink cleanBasicType    Type
-   HiLink cleanSpecialType  Type
-   HiLink cleanFuncTypeDef  Typedef
-   " Special
-   HiLink cleanSpecial      Special
-   HiLink cleanList			Special
-   HiLink cleanArray		Special
-   HiLink cleanRecord		Special
-   HiLink cleanTuple		Special
-   " Error
-   " Todo
-   HiLink cleanTodo         Todo
+ " Comments
+ HiLink cleanComment      Comment
+ " Constants and denotations
+ HiLink cleanStringDenot  String
+ HiLink cleanCharDenot    Character
+ HiLink cleanIntegerDenot Number
+ HiLink cleanBoolDenot    Boolean
+ HiLink cleanRealDenot    Float
+ " Identifiers
+ " Statements
+ HiLink cleanTypeClass    Keyword
+ HiLink cleanConditional  Conditional
+ HiLink cleanLabel		Label
+ HiLink cleanKeyword      Keyword
+ " Generic Preprocessing
+ HiLink cleanIncludeKeyword      Include
+ HiLink cleanModuleSystem PreProc
+ " Type
+ HiLink cleanBasicType    Type
+ HiLink cleanSpecialType  Type
+ HiLink cleanFuncTypeDef  Typedef
+ " Special
+ HiLink cleanSpecial      Special
+ HiLink cleanList			Special
+ HiLink cleanArray		Special
+ HiLink cleanRecord		Special
+ HiLink cleanTuple		Special
+ " Error
+ " Todo
+ HiLink cleanTodo         Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "clean"
 
diff --git a/runtime/syntax/clipper.vim b/runtime/syntax/clipper.vim
index 6ee3892845..4eb7db2f7a 100644
--- a/runtime/syntax/clipper.vim
+++ b/runtime/syntax/clipper.vim
@@ -4,11 +4,8 @@
 " Some things based on c.vim by Bram Moolenaar and pascal.vim by Mario Eusebio
 " Last Change:	2011 Dec 29 by Thilo Six
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -114,32 +111,24 @@ syntax match clipperComment		"^\*.*"
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_clipper_syntax_inits")
-  if version < 508
-    let did_clipper_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink clipperConditional		Conditional
-  HiLink clipperRepeat			Repeat
-  HiLink clipperNumber			Number
-  HiLink clipperInclude		Include
-  HiLink clipperComment		Comment
-  HiLink clipperOperator		Operator
-  HiLink clipperStorageClass		StorageClass
-  HiLink clipperStatement		Statement
-  HiLink clipperString			String
-  HiLink clipperFunction		Function
-  HiLink clipperLineContinuation	Special
-  HiLink clipperDelimiters		Delimiter
-  HiLink clipperUserVariable		Identifier
+HiLink clipperConditional		Conditional
+HiLink clipperRepeat			Repeat
+HiLink clipperNumber			Number
+HiLink clipperInclude		Include
+HiLink clipperComment		Comment
+HiLink clipperOperator		Operator
+HiLink clipperStorageClass		StorageClass
+HiLink clipperStatement		Statement
+HiLink clipperString			String
+HiLink clipperFunction		Function
+HiLink clipperLineContinuation	Special
+HiLink clipperDelimiters		Delimiter
+HiLink clipperUserVariable		Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "clipper"
 
diff --git a/runtime/syntax/cmake.vim b/runtime/syntax/cmake.vim
index 4586940c5e..8e73e329e0 100644
--- a/runtime/syntax/cmake.vim
+++ b/runtime/syntax/cmake.vim
@@ -12,11 +12,8 @@
 "               http://www.cmake.org/HTML/Copyright.html
 "               This implies that distribution with Vim is allowed
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 let s:keepcpo= &cpo
@@ -52,32 +49,24 @@ syn keyword cmakeTodo
             \ contained
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_cmake_syntax_inits")
-  if version < 508
-    let did_cmake_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink cmakeStatement Statement
-  HiLink cmakeComment Comment
-  HiLink cmakeString String
-  HiLink cmakeVariableValue Type
-  HiLink cmakeRegistry Underlined
-  HiLink cmakeArguments Identifier
-  HiLink cmakeArgument Constant
-  HiLink cmakeEnvironment Special
-  HiLink cmakeOperators Operator
-  HiLink cmakeMacro PreProc
-  HiLink cmakeError Error
-  HiLink cmakeTodo TODO
-  HiLink cmakeEscaped Special
+HiLink cmakeStatement Statement
+HiLink cmakeComment Comment
+HiLink cmakeString String
+HiLink cmakeVariableValue Type
+HiLink cmakeRegistry Underlined
+HiLink cmakeArguments Identifier
+HiLink cmakeArgument Constant
+HiLink cmakeEnvironment Special
+HiLink cmakeOperators Operator
+HiLink cmakeMacro PreProc
+HiLink cmakeError Error
+HiLink cmakeTodo TODO
+HiLink cmakeEscaped Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "cmake"
 
diff --git a/runtime/syntax/cobol.vim b/runtime/syntax/cobol.vim
index 51ca3d8773..a63e8b3873 100644
--- a/runtime/syntax/cobol.vim
+++ b/runtime/syntax/cobol.vim
@@ -6,20 +6,13 @@
 "               James Mitchell <james_mitchell@acm.org>)
 " Last Change:  2015 Feb 13
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " MOST important - else most of the keywords wont work!
-if version < 600
-  set isk=@,48-57,-
-else
-  setlocal isk=@,48-57,-
-endif
+setlocal isk=@,48-57,-
 
 syn case ignore
 
@@ -157,52 +150,44 @@ else
 endif
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_cobol_syntax_inits")
-  if version < 508
-    let did_cobol_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink cobolBAD      Error
-  HiLink cobolBadID    Error
-  HiLink cobolBadLine  Error
-  if exists("g:cobol_legacy_code")
-      HiLink cobolMarker   Comment
-  else
-      HiLink cobolMarker   Error
-  endif
-  HiLink cobolCALLs    Function
-  HiLink cobolComment  Comment
-  HiLink cobolKeys     Comment
-  HiLink cobolAreaB    Special
-  HiLink cobolCompiler PreProc
-  HiLink cobolCondFlow Special
-  HiLink cobolCopy     PreProc
-  HiLink cobolDeclA    cobolDecl
-  HiLink cobolDecl     Type
-  HiLink cobolExtras   Special
-  HiLink cobolGoTo     Special
-  HiLink cobolConstant Constant
-  HiLink cobolNumber   Constant
-  HiLink cobolPic      Constant
-  HiLink cobolReserved Statement
-  HiLink cobolDivision Label
-  HiLink cobolSection  Label
-  HiLink cobolParagraph Label
-  HiLink cobolDivisionName  Keyword
-  HiLink cobolSectionName   Keyword
-  HiLink cobolParagraphName Keyword
-  HiLink cobolString   Constant
-  HiLink cobolTodo     Todo
-  HiLink cobolWatch    Special
-  HiLink cobolIndicator Special
-
-  delcommand HiLink
+HiLink cobolBAD      Error
+HiLink cobolBadID    Error
+HiLink cobolBadLine  Error
+if exists("g:cobol_legacy_code")
+    HiLink cobolMarker   Comment
+else
+    HiLink cobolMarker   Error
 endif
+HiLink cobolCALLs    Function
+HiLink cobolComment  Comment
+HiLink cobolKeys     Comment
+HiLink cobolAreaB    Special
+HiLink cobolCompiler PreProc
+HiLink cobolCondFlow Special
+HiLink cobolCopy     PreProc
+HiLink cobolDeclA    cobolDecl
+HiLink cobolDecl     Type
+HiLink cobolExtras   Special
+HiLink cobolGoTo     Special
+HiLink cobolConstant Constant
+HiLink cobolNumber   Constant
+HiLink cobolPic      Constant
+HiLink cobolReserved Statement
+HiLink cobolDivision Label
+HiLink cobolSection  Label
+HiLink cobolParagraph Label
+HiLink cobolDivisionName  Keyword
+HiLink cobolSectionName   Keyword
+HiLink cobolParagraphName Keyword
+HiLink cobolString   Constant
+HiLink cobolTodo     Todo
+HiLink cobolWatch    Special
+HiLink cobolIndicator Special
+
+delcommand HiLink
 
 let b:current_syntax = "cobol"
 
diff --git a/runtime/syntax/coco.vim b/runtime/syntax/coco.vim
index 4094a55303..ae32348bcb 100644
--- a/runtime/syntax/coco.vim
+++ b/runtime/syntax/coco.vim
@@ -5,9 +5,8 @@
 " Remark:       Coco/R syntax partially implemented.
 " License:      Vim license
 
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
diff --git a/runtime/syntax/config.vim b/runtime/syntax/config.vim
index cd83b24352..1bb5c2f3e9 100644
--- a/runtime/syntax/config.vim
+++ b/runtime/syntax/config.vim
@@ -11,11 +11,8 @@
 " script, so I wrote this quick and dirty patch.
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -37,28 +34,20 @@ syn region  configstring matchgroup=configfunction start="AC_MSG_[A-Z]*\ze(\[" m
 syn region  configstring matchgroup=configfunction start="AC_MSG_[A-Z]*\ze([^[]" matchgroup=configdelimiter end=")" contains=configdelimiter,@Spell
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_config_syntax_inits")
-  if version < 508
-    let did_config_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink configdelimiter Delimiter
-  HiLink configoperator  Operator
-  HiLink configcomment   Comment
-  HiLink configDnl  	 Comment
-  HiLink configfunction  Function
-  HiLink confignumber    Number
-  HiLink configkeyword   Keyword
-  HiLink configspecial   Special
-  HiLink configstring    String
+HiLink configdelimiter Delimiter
+HiLink configoperator  Operator
+HiLink configcomment   Comment
+HiLink configDnl  	 Comment
+HiLink configfunction  Function
+HiLink confignumber    Number
+HiLink configkeyword   Keyword
+HiLink configspecial   Special
+HiLink configstring    String
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "config"
 
diff --git a/runtime/syntax/cpp.vim b/runtime/syntax/cpp.vim
index fefd0ff7b0..be7381ea6a 100644
--- a/runtime/syntax/cpp.vim
+++ b/runtime/syntax/cpp.vim
@@ -4,21 +4,14 @@
 " Previous Maintainer:	Ken Shan <ccshan@post.harvard.edu>
 " Last Change:	2016 Jul 07
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " Read the C syntax to start with
-if version < 600
-  so <sfile>:p:h/c.vim
-else
-  runtime! syntax/c.vim
-  unlet b:current_syntax
-endif
+runtime! syntax/c.vim
+unlet b:current_syntax
 
 " C++ extensions
 syn keyword cppStatement	new delete this friend using
@@ -60,29 +53,22 @@ endif
 syn match cppMinMax "[<>]?"
 
 " Default highlighting
-if version >= 508 || !exists("did_cpp_syntax_inits")
-  if version < 508
-    let did_cpp_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink cppAccess		cppStatement
-  HiLink cppCast		cppStatement
-  HiLink cppExceptions		Exception
-  HiLink cppOperator		Operator
-  HiLink cppStatement		Statement
-  HiLink cppModifier		Type
-  HiLink cppType		Type
-  HiLink cppStorageClass	StorageClass
-  HiLink cppStructure		Structure
-  HiLink cppBoolean		Boolean
-  HiLink cppConstant		Constant
-  HiLink cppRawStringDelimiter	Delimiter
-  HiLink cppRawString		String
-  HiLink cppNumber		Number
-  delcommand HiLink
-endif
+command -nargs=+ HiLink hi def link <args>
+HiLink cppAccess		cppStatement
+HiLink cppCast		cppStatement
+HiLink cppExceptions		Exception
+HiLink cppOperator		Operator
+HiLink cppStatement		Statement
+HiLink cppModifier		Type
+HiLink cppType		Type
+HiLink cppStorageClass	StorageClass
+HiLink cppStructure		Structure
+HiLink cppBoolean		Boolean
+HiLink cppConstant		Constant
+HiLink cppRawStringDelimiter	Delimiter
+HiLink cppRawString		String
+HiLink cppNumber		Number
+delcommand HiLink
 
 let b:current_syntax = "cpp"
 
diff --git a/runtime/syntax/crontab.vim b/runtime/syntax/crontab.vim
index fd1c30023f..ed20254925 100644
--- a/runtime/syntax/crontab.vim
+++ b/runtime/syntax/crontab.vim
@@ -10,11 +10,8 @@
 " crontab line format:
 " Minutes   Hours   Days   Months   Days_of_Week   Commands # comments
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
@@ -39,41 +36,33 @@ syntax match crontabCmnt "^\s*#.*" contains=@Spell
 syntax match crontabPercent "[^\\]%.*"lc=1 contained
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_crontab_syn_inits")
-	if version < 508
-		let did_crontab_syn_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink crontabMin		Number
-	HiLink crontabHr		PreProc
-	HiLink crontabDay		Type
+HiLink crontabMin		Number
+HiLink crontabHr		PreProc
+HiLink crontabDay		Type
 
-	HiLink crontabMnth		Number
-	HiLink crontabMnth12		Number
-	HiLink crontabMnthS		Number
-	HiLink crontabMnthN		Number
+HiLink crontabMnth		Number
+HiLink crontabMnth12		Number
+HiLink crontabMnthS		Number
+HiLink crontabMnthN		Number
 
-	HiLink crontabDow		PreProc
-	HiLink crontabDow7		PreProc
-	HiLink crontabDowS		PreProc
-	HiLink crontabDowN		PreProc
+HiLink crontabDow		PreProc
+HiLink crontabDow7		PreProc
+HiLink crontabDowS		PreProc
+HiLink crontabDowN		PreProc
 
-	HiLink crontabNick		Special
-	HiLink crontabVar		Identifier
-	HiLink crontabPercent		Special
+HiLink crontabNick		Special
+HiLink crontabVar		Identifier
+HiLink crontabPercent		Special
 
 " comment out next line for to suppress unix commands coloring.
-	HiLink crontabCmd		Statement
+HiLink crontabCmd		Statement
 
-	HiLink crontabCmnt		Comment
+HiLink crontabCmnt		Comment
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "crontab"
 
diff --git a/runtime/syntax/csc.vim b/runtime/syntax/csc.vim
index 5493b17f5f..f4ce62c876 100644
--- a/runtime/syntax/csc.vim
+++ b/runtime/syntax/csc.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Raul Segura Acevedo <raulseguraaceved@netscape.net>
 " Last change:	2011 Dec 25 by Thilo Six
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
@@ -145,7 +142,7 @@ sy	match	cscBPMacro	contained	"!"
 sy	match	cscBPW	"!\s*\a*"	contains=cscBPmacro
 
 " when wanted, highlighting lhs members or erros in asignments (may lag the editing)
-if version >= 600 && exists("csc_asignment")
+if exists("csc_asignment")
 	sy	match	cscEqError	'\("[^"]*"\s*\|[^][\t !%()*+,--/:;<=>{}~]\+\s*\|->\s*\)*=\([^=]\@=\|$\)'
 	sy	region	cscFormula	transparent matchgroup=cscVarName start='\("[^"]*"\|[^][\t !%()*+,--/:;<=>{}~]\+\)\s*=\([^=]\@=\|\n\)' skip='"[^"]*"' end=';' contains=ALLBUT,cscFormula,cscFormulaIn,cscBPMacro,cscCondition
 	sy	region	cscFormulaIn	matchgroup=cscVarName transparent start='\("[^"]*"\|[^][\t !%()*+,--/:;<=>{}~]\+\)\(->\("[^"]*"\|[^][\t !%()*+,--/:;<=>{}~]\+\)\)*\s*=\([^=]\@=\|$\)' skip='"[^"]*"' end=';' contains=ALLBUT,cscFormula,cscFormulaIn,cscBPMacro,cscCondition contained
@@ -158,44 +155,36 @@ endif
 exec "sy sync ccomment cscComment minlines=" . csc_minlines
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_csc_syntax_inits")
-	if version < 508
-		let did_csc_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	hi cscVarName term=bold ctermfg=9 gui=bold guifg=blue
+hi cscVarName term=bold ctermfg=9 gui=bold guifg=blue
 
-	HiLink	cscNumber	Number
-	HiLink	cscOctal	Number
-	HiLink	cscFloat	Float
-	HiLink	cscParenE	Error
-	HiLink	cscCommentE	Error
-	HiLink	cscSpaceE	Error
-	HiLink	cscError	Error
-	HiLink	cscString	String
-	HiLink	cscComment	Comment
-	HiLink	cscTodo		Todo
-	HiLink	cscStatement	Statement
-	HiLink	cscIfError	Error
-	HiLink	cscEqError	Error
-	HiLink	cscFunction	Statement
-	HiLink	cscCondition	Statement
-	HiLink	cscWarn		WarningMsg
+HiLink	cscNumber	Number
+HiLink	cscOctal	Number
+HiLink	cscFloat	Float
+HiLink	cscParenE	Error
+HiLink	cscCommentE	Error
+HiLink	cscSpaceE	Error
+HiLink	cscError	Error
+HiLink	cscString	String
+HiLink	cscComment	Comment
+HiLink	cscTodo		Todo
+HiLink	cscStatement	Statement
+HiLink	cscIfError	Error
+HiLink	cscEqError	Error
+HiLink	cscFunction	Statement
+HiLink	cscCondition	Statement
+HiLink	cscWarn		WarningMsg
 
-	HiLink	cscComE	Error
-	HiLink	cscCom	Statement
-	HiLink	cscComW	WarningMsg
+HiLink	cscComE	Error
+HiLink	cscCom	Statement
+HiLink	cscComW	WarningMsg
 
-	HiLink	cscBPMacro	Identifier
-	HiLink	cscBPW		WarningMsg
+HiLink	cscBPMacro	Identifier
+HiLink	cscBPW		WarningMsg
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "csc"
 
diff --git a/runtime/syntax/csh.vim b/runtime/syntax/csh.vim
index 9dc2c4ef56..973a3550dc 100644
--- a/runtime/syntax/csh.vim
+++ b/runtime/syntax/csh.vim
@@ -5,11 +5,8 @@
 " Version:	11
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_CSH
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -100,60 +97,47 @@ syn match cshNumber	"-\=\<\d\+\>"
 "syn match cshIdentifier	"\<[a-zA-Z._][a-zA-Z0-9._]*\>"
 
 " Shell Input Redirection (Here Documents)
-if version < 600
-  syn region cshHereDoc matchgroup=cshRedir start="<<-\=\s*\**END[a-zA-Z_0-9]*\**" matchgroup=cshRedir end="^END[a-zA-Z_0-9]*$"
-  syn region cshHereDoc matchgroup=cshRedir start="<<-\=\s*\**EOF\**" matchgroup=cshRedir end="^EOF$"
-else
-  syn region cshHereDoc matchgroup=cshRedir start="<<-\=\s*\**\z(\h\w*\)\**" matchgroup=cshRedir end="^\z1$"
-endif
+syn region cshHereDoc matchgroup=cshRedir start="<<-\=\s*\**\z(\h\w*\)\**" matchgroup=cshRedir end="^\z1$"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_csh_syntax_inits")
-  if version < 508
-    let did_csh_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink cshArgv		cshVariables
-  HiLink cshBckQuote	cshCommand
-  HiLink cshDblQuote	cshString
-  HiLink cshExtVar	cshVariables
-  HiLink cshHereDoc	cshString
-  HiLink cshNoEndlineBQ	cshNoEndline
-  HiLink cshNoEndlineDQ	cshNoEndline
-  HiLink cshNoEndlineSQ	cshNoEndline
-  HiLink cshQtyWord	cshVariables
-  HiLink cshRedir		cshOperator
-  HiLink cshSelector	cshVariables
-  HiLink cshSetStmt	cshStatement
-  HiLink cshSetVariables	cshVariables
-  HiLink cshSnglQuote	cshString
-  HiLink cshSubst		cshVariables
+HiLink cshArgv		cshVariables
+HiLink cshBckQuote	cshCommand
+HiLink cshDblQuote	cshString
+HiLink cshExtVar	cshVariables
+HiLink cshHereDoc	cshString
+HiLink cshNoEndlineBQ	cshNoEndline
+HiLink cshNoEndlineDQ	cshNoEndline
+HiLink cshNoEndlineSQ	cshNoEndline
+HiLink cshQtyWord	cshVariables
+HiLink cshRedir		cshOperator
+HiLink cshSelector	cshVariables
+HiLink cshSetStmt	cshStatement
+HiLink cshSetVariables	cshVariables
+HiLink cshSnglQuote	cshString
+HiLink cshSubst		cshVariables
 
-  HiLink cshCommand	Statement
-  HiLink cshComment	Comment
-  HiLink cshConditional	Conditional
-  HiLink cshIdentifier	Error
-  HiLink cshModifier	Special
-  HiLink cshNoEndline	Error
-  HiLink cshNumber	Number
-  HiLink cshOperator	Operator
-  HiLink cshRedir		Statement
-  HiLink cshRepeat	Repeat
-  HiLink cshShellVariables	Special
-  HiLink cshSpecial	Special
-  HiLink cshStatement	Statement
-  HiLink cshString	String
-  HiLink cshSubstError	Error
-  HiLink cshTodo		Todo
-  HiLink cshVariables	Type
+HiLink cshCommand	Statement
+HiLink cshComment	Comment
+HiLink cshConditional	Conditional
+HiLink cshIdentifier	Error
+HiLink cshModifier	Special
+HiLink cshNoEndline	Error
+HiLink cshNumber	Number
+HiLink cshOperator	Operator
+HiLink cshRedir		Statement
+HiLink cshRepeat	Repeat
+HiLink cshShellVariables	Special
+HiLink cshSpecial	Special
+HiLink cshStatement	Statement
+HiLink cshString	String
+HiLink cshSubstError	Error
+HiLink cshTodo		Todo
+HiLink cshVariables	Type
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "csh"
 
diff --git a/runtime/syntax/csp.vim b/runtime/syntax/csp.vim
index bd6213efd9..a5460cddbb 100644
--- a/runtime/syntax/csp.vim
+++ b/runtime/syntax/csp.vim
@@ -15,11 +15,8 @@
 "		- The additional syntax for the RT-Tester (pseudo-comments)
 "		  should be optional.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -149,46 +146,38 @@ syn match cspSdlRttComment	"pragma\s\+SDL_MATCH\s\+" nextgroup=cspRttPragmaSdlAr
 syn sync lines=250
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_csp_syn_inits")
-  if version < 508
-    let did_csp_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting.  Can be overridden later
-  " (For vim version <=5.7, the command groups are defined in
-  " $VIMRUNTIME/syntax/synload.vim )
-  HiLink cspComment			Comment
-  HiLink cspNumber			Number
-  HiLink cspConditional			Conditional
-  HiLink cspOperator			Delimiter
-  HiLink cspKeyword			Keyword
-  HiLink cspReserved			SpecialChar
-  HiLink cspInclude			Error
-  HiLink cspIncludeKeyword		Include
-  HiLink cspIncludeArg			Include
-  HiLink cspAssert			PreCondit
-  HiLink cspType			Type
-  HiLink cspProcess			Function
-  HiLink cspTodo			Todo
-  HiLink cspOldRttComment		Define
-  HiLink cspRttPragmaKeyword		Define
-  HiLink cspSdlRttComment		Define
-  HiLink cspRttPragmaArg		Define
-  HiLink cspRttPragmaSdlArg		Define
-  HiLink cspRttPragmaSdlName		Default
-  HiLink cspRttPragmaSdlTailArg		Define
-  HiLink cspRttPragmaSdlTransName	Default
-  HiLink cspRttPragmaSdlTransTailArg	Define
-  HiLink cspReservedIdentifier	Error
-  " (Currently unused vim method: Debug)
+" The default methods for highlighting.  Can be overridden later
+" (For vim version <=5.7, the command groups are defined in
+" $VIMRUNTIME/syntax/synload.vim )
+HiLink cspComment			Comment
+HiLink cspNumber			Number
+HiLink cspConditional			Conditional
+HiLink cspOperator			Delimiter
+HiLink cspKeyword			Keyword
+HiLink cspReserved			SpecialChar
+HiLink cspInclude			Error
+HiLink cspIncludeKeyword		Include
+HiLink cspIncludeArg			Include
+HiLink cspAssert			PreCondit
+HiLink cspType			Type
+HiLink cspProcess			Function
+HiLink cspTodo			Todo
+HiLink cspOldRttComment		Define
+HiLink cspRttPragmaKeyword		Define
+HiLink cspSdlRttComment		Define
+HiLink cspRttPragmaArg		Define
+HiLink cspRttPragmaSdlArg		Define
+HiLink cspRttPragmaSdlName		Default
+HiLink cspRttPragmaSdlTailArg		Define
+HiLink cspRttPragmaSdlTransName	Default
+HiLink cspRttPragmaSdlTransTailArg	Define
+HiLink cspReservedIdentifier	Error
+" (Currently unused vim method: Debug)
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "csp"
 
diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim
index 51758ca98f..e8c2c85318 100644
--- a/runtime/syntax/css.vim
+++ b/runtime/syntax/css.vim
@@ -8,12 +8,9 @@
 " URL:          https://github.com/JulesWang/css.vim
 " Last Change:  2015 Apr.17
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
+" quit when a syntax file was already loaded
 if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
+  if exists("b:current_syntax")
     finish
   endif
   let main_syntax = 'css'
@@ -516,139 +513,131 @@ if main_syntax == "css"
 endif
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_css_syn_inits")
-  if version < 508
-    let did_css_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink cssComment Comment
-  HiLink cssVendor Comment
-  HiLink cssHacks Comment
-  HiLink cssTagName Statement
-  HiLink cssDeprecated Error
-  HiLink cssSelectorOp Special
-  HiLink cssSelectorOp2 Special
-  HiLink cssAttrComma Special
+HiLink cssComment Comment
+HiLink cssVendor Comment
+HiLink cssHacks Comment
+HiLink cssTagName Statement
+HiLink cssDeprecated Error
+HiLink cssSelectorOp Special
+HiLink cssSelectorOp2 Special
+HiLink cssAttrComma Special
 
-  HiLink cssAnimationProp cssProp
-  HiLink cssBackgroundProp cssProp
-  HiLink cssBorderProp cssProp
-  HiLink cssBoxProp cssProp
-  HiLink cssColorProp cssProp
-  HiLink cssContentForPagedMediaProp cssProp
-  HiLink cssDimensionProp cssProp
-  HiLink cssFlexibleBoxProp cssProp
-  HiLink cssFontProp cssProp
-  HiLink cssGeneratedContentProp cssProp
-  HiLink cssGridProp cssProp
-  HiLink cssHyerlinkProp cssProp
-  HiLink cssLineboxProp cssProp
-  HiLink cssListProp cssProp
-  HiLink cssMarqueeProp cssProp
-  HiLink cssMultiColumnProp cssProp
-  HiLink cssPagedMediaProp cssProp
-  HiLink cssPositioningProp cssProp
-  HiLink cssPrintProp cssProp
-  HiLink cssRubyProp cssProp
-  HiLink cssSpeechProp cssProp
-  HiLink cssTableProp cssProp
-  HiLink cssTextProp cssProp
-  HiLink cssTransformProp cssProp
-  HiLink cssTransitionProp cssProp
-  HiLink cssUIProp cssProp
-  HiLink cssIEUIProp cssProp
-  HiLink cssAuralProp cssProp
-  HiLink cssRenderProp cssProp
-  HiLink cssMobileTextProp cssProp
+HiLink cssAnimationProp cssProp
+HiLink cssBackgroundProp cssProp
+HiLink cssBorderProp cssProp
+HiLink cssBoxProp cssProp
+HiLink cssColorProp cssProp
+HiLink cssContentForPagedMediaProp cssProp
+HiLink cssDimensionProp cssProp
+HiLink cssFlexibleBoxProp cssProp
+HiLink cssFontProp cssProp
+HiLink cssGeneratedContentProp cssProp
+HiLink cssGridProp cssProp
+HiLink cssHyerlinkProp cssProp
+HiLink cssLineboxProp cssProp
+HiLink cssListProp cssProp
+HiLink cssMarqueeProp cssProp
+HiLink cssMultiColumnProp cssProp
+HiLink cssPagedMediaProp cssProp
+HiLink cssPositioningProp cssProp
+HiLink cssPrintProp cssProp
+HiLink cssRubyProp cssProp
+HiLink cssSpeechProp cssProp
+HiLink cssTableProp cssProp
+HiLink cssTextProp cssProp
+HiLink cssTransformProp cssProp
+HiLink cssTransitionProp cssProp
+HiLink cssUIProp cssProp
+HiLink cssIEUIProp cssProp
+HiLink cssAuralProp cssProp
+HiLink cssRenderProp cssProp
+HiLink cssMobileTextProp cssProp
 
-  HiLink cssAnimationAttr cssAttr
-  HiLink cssBackgroundAttr cssAttr
-  HiLink cssBorderAttr cssAttr
-  HiLink cssBoxAttr cssAttr
-  HiLink cssContentForPagedMediaAttr cssAttr
-  HiLink cssDimensionAttr cssAttr
-  HiLink cssFlexibleBoxAttr cssAttr
-  HiLink cssFontAttr cssAttr
-  HiLink cssGeneratedContentAttr cssAttr
-  HiLink cssGridAttr cssAttr
-  HiLink cssHyerlinkAttr cssAttr
-  HiLink cssLineboxAttr cssAttr
-  HiLink cssListAttr cssAttr
-  HiLink cssMarginAttr cssAttr
-  HiLink cssMarqueeAttr cssAttr
-  HiLink cssMultiColumnAttr cssAttr
-  HiLink cssPaddingAttr cssAttr
-  HiLink cssPagedMediaAttr cssAttr
-  HiLink cssPositioningAttr cssAttr
-  HiLink cssGradientAttr cssAttr
-  HiLink cssPrintAttr cssAttr
-  HiLink cssRubyAttr cssAttr
-  HiLink cssSpeechAttr cssAttr
-  HiLink cssTableAttr cssAttr
-  HiLink cssTextAttr cssAttr
-  HiLink cssTransformAttr cssAttr
-  HiLink cssTransitionAttr cssAttr
-  HiLink cssUIAttr cssAttr
-  HiLink cssIEUIAttr cssAttr
-  HiLink cssAuralAttr cssAttr
-  HiLink cssRenderAttr cssAttr
-  HiLink cssCommonAttr cssAttr
+HiLink cssAnimationAttr cssAttr
+HiLink cssBackgroundAttr cssAttr
+HiLink cssBorderAttr cssAttr
+HiLink cssBoxAttr cssAttr
+HiLink cssContentForPagedMediaAttr cssAttr
+HiLink cssDimensionAttr cssAttr
+HiLink cssFlexibleBoxAttr cssAttr
+HiLink cssFontAttr cssAttr
+HiLink cssGeneratedContentAttr cssAttr
+HiLink cssGridAttr cssAttr
+HiLink cssHyerlinkAttr cssAttr
+HiLink cssLineboxAttr cssAttr
+HiLink cssListAttr cssAttr
+HiLink cssMarginAttr cssAttr
+HiLink cssMarqueeAttr cssAttr
+HiLink cssMultiColumnAttr cssAttr
+HiLink cssPaddingAttr cssAttr
+HiLink cssPagedMediaAttr cssAttr
+HiLink cssPositioningAttr cssAttr
+HiLink cssGradientAttr cssAttr
+HiLink cssPrintAttr cssAttr
+HiLink cssRubyAttr cssAttr
+HiLink cssSpeechAttr cssAttr
+HiLink cssTableAttr cssAttr
+HiLink cssTextAttr cssAttr
+HiLink cssTransformAttr cssAttr
+HiLink cssTransitionAttr cssAttr
+HiLink cssUIAttr cssAttr
+HiLink cssIEUIAttr cssAttr
+HiLink cssAuralAttr cssAttr
+HiLink cssRenderAttr cssAttr
+HiLink cssCommonAttr cssAttr
 
-  HiLink cssPseudoClassId PreProc
-  HiLink cssPseudoClassLang Constant
-  HiLink cssValueLength Number
-  HiLink cssValueInteger Number
-  HiLink cssValueNumber Number
-  HiLink cssValueAngle Number
-  HiLink cssValueTime Number
-  HiLink cssValueFrequency Number
-  HiLink cssFunction Constant
-  HiLink cssURL String
-  HiLink cssFunctionName Function
-  HiLink cssFunctionComma Function
-  HiLink cssColor Constant
-  HiLink cssIdentifier Function
-  HiLink cssInclude Include
-  HiLink cssIncludeKeyword atKeyword
-  HiLink cssImportant Special
-  HiLink cssBraces Function
-  HiLink cssBraceError Error
-  HiLink cssError Error
-  HiLink cssUnicodeEscape Special
-  HiLink cssStringQQ String
-  HiLink cssStringQ String
-  HiLink cssAttributeSelector String
-  HiLink cssMedia atKeyword
-  HiLink cssMediaType Special
-  HiLink cssMediaComma Normal
-  HiLink cssMediaKeyword Statement
-  HiLink cssMediaProp cssProp
-  HiLink cssMediaAttr cssAttr
-  HiLink cssPage atKeyword
-  HiLink cssPagePseudo PreProc
-  HiLink cssPageMargin atKeyword
-  HiLink cssPageProp cssProp
-  HiLink cssKeyFrame atKeyword
-  HiLink cssKeyFrameSelector Constant
-  HiLink cssFontDescriptor Special
-  HiLink cssFontDescriptorFunction Constant
-  HiLink cssFontDescriptorProp cssProp
-  HiLink cssFontDescriptorAttr cssAttr
-  HiLink cssUnicodeRange Constant
-  HiLink cssClassName Function
-  HiLink cssClassNameDot Function
-  HiLink cssProp StorageClass
-  HiLink cssAttr Constant
-  HiLink cssUnitDecorators Number
-  HiLink cssNoise Noise
-  HiLink atKeyword PreProc
-  delcommand HiLink
-endif
+HiLink cssPseudoClassId PreProc
+HiLink cssPseudoClassLang Constant
+HiLink cssValueLength Number
+HiLink cssValueInteger Number
+HiLink cssValueNumber Number
+HiLink cssValueAngle Number
+HiLink cssValueTime Number
+HiLink cssValueFrequency Number
+HiLink cssFunction Constant
+HiLink cssURL String
+HiLink cssFunctionName Function
+HiLink cssFunctionComma Function
+HiLink cssColor Constant
+HiLink cssIdentifier Function
+HiLink cssInclude Include
+HiLink cssIncludeKeyword atKeyword
+HiLink cssImportant Special
+HiLink cssBraces Function
+HiLink cssBraceError Error
+HiLink cssError Error
+HiLink cssUnicodeEscape Special
+HiLink cssStringQQ String
+HiLink cssStringQ String
+HiLink cssAttributeSelector String
+HiLink cssMedia atKeyword
+HiLink cssMediaType Special
+HiLink cssMediaComma Normal
+HiLink cssMediaKeyword Statement
+HiLink cssMediaProp cssProp
+HiLink cssMediaAttr cssAttr
+HiLink cssPage atKeyword
+HiLink cssPagePseudo PreProc
+HiLink cssPageMargin atKeyword
+HiLink cssPageProp cssProp
+HiLink cssKeyFrame atKeyword
+HiLink cssKeyFrameSelector Constant
+HiLink cssFontDescriptor Special
+HiLink cssFontDescriptorFunction Constant
+HiLink cssFontDescriptorProp cssProp
+HiLink cssFontDescriptorAttr cssAttr
+HiLink cssUnicodeRange Constant
+HiLink cssClassName Function
+HiLink cssClassNameDot Function
+HiLink cssProp StorageClass
+HiLink cssAttr Constant
+HiLink cssUnitDecorators Number
+HiLink cssNoise Noise
+HiLink atKeyword PreProc
+delcommand HiLink
 
 let b:current_syntax = "css"
 
diff --git a/runtime/syntax/cterm.vim b/runtime/syntax/cterm.vim
index 139a0d5e17..8510f62cc7 100644
--- a/runtime/syntax/cterm.vim
+++ b/runtime/syntax/cterm.vim
@@ -4,11 +4,8 @@
 " Last Change:	2002 Apr 13
 " Version Info: @(#)cterm.vim	1.7	97/12/15 09:23:14
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -142,48 +139,40 @@ syn match   ctermCharacter		"'[^\\]'"
 syn match   ctermSpecialCharacter	"'\\.'"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_cterm_syntax_inits")
-  if version < 508
-    let did_cterm_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink ctermStatement		Statement
-	HiLink ctermFunction		Statement
-	HiLink ctermStrFunction	Statement
-	HiLink ctermIntFunction	Statement
-	HiLink ctermLabel		Statement
-	HiLink ctermConditional	Statement
-	HiLink ctermRepeat		Statement
-	HiLink ctermLibFunc		UserDefFunc
-	HiLink ctermType		Type
-	HiLink ctermFuncArg		PreCondit
+HiLink ctermStatement		Statement
+HiLink ctermFunction		Statement
+HiLink ctermStrFunction	Statement
+HiLink ctermIntFunction	Statement
+HiLink ctermLabel		Statement
+HiLink ctermConditional	Statement
+HiLink ctermRepeat		Statement
+HiLink ctermLibFunc		UserDefFunc
+HiLink ctermType		Type
+HiLink ctermFuncArg		PreCondit
 
-	HiLink ctermPreVarRO		PreCondit
-	HiLink ctermPreVarRW		PreConditBold
-	HiLink ctermVar		Type
+HiLink ctermPreVarRO		PreCondit
+HiLink ctermPreVarRW		PreConditBold
+HiLink ctermVar		Type
 
-	HiLink ctermComment		Comment
+HiLink ctermComment		Comment
 
-	HiLink ctermCharacter		SpecialChar
-	HiLink ctermSpecial		Special
-	HiLink ctermSpecialCharacter	SpecialChar
-	HiLink ctermSymbols		Special
-	HiLink ctermString		String
-	HiLink ctermTodo		Todo
-	HiLink ctermOperator		Statement
-	HiLink ctermNumber		Number
+HiLink ctermCharacter		SpecialChar
+HiLink ctermSpecial		Special
+HiLink ctermSpecialCharacter	SpecialChar
+HiLink ctermSymbols		Special
+HiLink ctermString		String
+HiLink ctermTodo		Todo
+HiLink ctermOperator		Statement
+HiLink ctermNumber		Number
 
-	" redefine the colors
-	"hi PreConditBold	term=bold ctermfg=1 cterm=bold guifg=Purple gui=bold
-	"hi Special	term=bold ctermfg=6 guifg=SlateBlue gui=underline
+" redefine the colors
+"hi PreConditBold	term=bold ctermfg=1 cterm=bold guifg=Purple gui=bold
+"hi Special	term=bold ctermfg=6 guifg=SlateBlue gui=underline
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "cterm"
 
diff --git a/runtime/syntax/cuda.vim b/runtime/syntax/cuda.vim
index 77930e3fd4..cfc70b9ea8 100644
--- a/runtime/syntax/cuda.vim
+++ b/runtime/syntax/cuda.vim
@@ -3,20 +3,13 @@
 " Maintainer:	Timothy B. Terriberry <tterribe@users.sourceforge.net>
 " Last Change:	2007 Oct 13
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " Read the C syntax to start with
-if version < 600
-  source <sfile>:p:h/c.vim
-else
-  runtime! syntax/c.vim
-endif
+runtime! syntax/c.vim
 
 " CUDA extentions
 syn keyword cudaStorageClass	__device__ __global__ __host__
diff --git a/runtime/syntax/cupl.vim b/runtime/syntax/cupl.vim
index 545d873af2..58540b63d4 100644
--- a/runtime/syntax/cupl.vim
+++ b/runtime/syntax/cupl.vim
@@ -3,11 +3,8 @@
 " Maintainer:	John Cook <johncook3@gmail.com>
 " Last Change:	2011 Dec 27
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -95,39 +92,31 @@ syn region cuplComment start=+/\*+ end=+\*/+ contains=cuplNumber,cuplTodo
 syn sync minlines=1
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_cupl_syn_inits")
-  if version < 508
-    let did_cupl_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default highlighting.
-  HiLink cuplHeader	cuplStatement
-  HiLink cuplLogicalOperator	 cuplOperator
-  HiLink cuplRangeOperator	 cuplOperator
-  HiLink cuplArithmeticOperator cuplOperator
-  HiLink cuplAssignmentOperator cuplOperator
-  HiLink cuplEqualityOperator	 cuplOperator
-  HiLink cuplTruthTableOperator cuplOperator
-  HiLink cuplOperator	cuplStatement
-  HiLink cuplFunction	cuplStatement
-  HiLink cuplStatement Statement
-  HiLink cuplNumberRange cuplNumber
-  HiLink cuplNumber	  cuplString
-  HiLink cuplString	String
-  HiLink cuplComment	Comment
-  HiLink cuplExtension   cuplSpecial
-  HiLink cuplSpecialChar cuplSpecial
-  HiLink cuplSpecial	Special
-  HiLink cuplDirective PreProc
-  HiLink cuplTodo	Todo
+" The default highlighting.
+HiLink cuplHeader	cuplStatement
+HiLink cuplLogicalOperator	 cuplOperator
+HiLink cuplRangeOperator	 cuplOperator
+HiLink cuplArithmeticOperator cuplOperator
+HiLink cuplAssignmentOperator cuplOperator
+HiLink cuplEqualityOperator	 cuplOperator
+HiLink cuplTruthTableOperator cuplOperator
+HiLink cuplOperator	cuplStatement
+HiLink cuplFunction	cuplStatement
+HiLink cuplStatement Statement
+HiLink cuplNumberRange cuplNumber
+HiLink cuplNumber	  cuplString
+HiLink cuplString	String
+HiLink cuplComment	Comment
+HiLink cuplExtension   cuplSpecial
+HiLink cuplSpecialChar cuplSpecial
+HiLink cuplSpecial	Special
+HiLink cuplDirective PreProc
+HiLink cuplTodo	Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "cupl"
 
diff --git a/runtime/syntax/cuplsim.vim b/runtime/syntax/cuplsim.vim
index 18a30ce256..d0c9ec34f5 100644
--- a/runtime/syntax/cuplsim.vim
+++ b/runtime/syntax/cuplsim.vim
@@ -3,21 +3,14 @@
 " Maintainer:	John Cook <john.cook@kla-tencor.com>
 " Last Change:	2001 Apr 25
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " Read the CUPL syntax to start with
-if version < 600
-  source <sfile>:p:h/cupl.vim
-else
-  runtime! syntax/cupl.vim
-  unlet b:current_syntax
-endif
+runtime! syntax/cupl.vim
+unlet b:current_syntax
 
 " omit definition-specific stuff
 syn clear cuplStatement
@@ -53,28 +46,20 @@ syn match cuplsimOutput +"\x\+"+
 syn sync minlines=1
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_cuplsim_syn_inits")
-  if version < 508
-    let did_cuplsim_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " append to the highlighting links in cupl.vim
-  " The default highlighting.
-  HiLink cuplsimOrder		cuplStatement
-  HiLink cuplsimBase		cuplStatement
-  HiLink cuplsimBaseType	cuplStatement
-  HiLink cuplsimVectors		cuplStatement
-  HiLink cuplsimStimulus	cuplNumber
-  HiLink cuplsimOutput		cuplNumber
-  HiLink cuplsimOrderFormat	cuplNumber
+" append to the highlighting links in cupl.vim
+" The default highlighting.
+HiLink cuplsimOrder		cuplStatement
+HiLink cuplsimBase		cuplStatement
+HiLink cuplsimBaseType	cuplStatement
+HiLink cuplsimVectors		cuplStatement
+HiLink cuplsimStimulus	cuplNumber
+HiLink cuplsimOutput		cuplNumber
+HiLink cuplsimOrderFormat	cuplNumber
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "cuplsim"
 " vim:ts=8
diff --git a/runtime/syntax/cvs.vim b/runtime/syntax/cvs.vim
index 94b2a809eb..4a01c2b8a8 100644
--- a/runtime/syntax/cvs.vim
+++ b/runtime/syntax/cvs.vim
@@ -4,11 +4,8 @@
 " URL:		http://www.zotikos.com/downloads/cvs.vim
 " Last Change:	Sat Nov 24 23:25:11 CET 2001
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
@@ -20,24 +17,16 @@ syn region cvsCom start="Committing in" end="$" contains=cvsDir contained extend
 syn match cvsDir   contained "\S\+$"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_cvs_syn_inits")
-	if version < 508
-		let did_cvs_syn_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink cvsLine		Comment
-	HiLink cvsDir		cvsFile
-	HiLink cvsFile		Constant
-	HiLink cvsFiles		cvsCom
-	HiLink cvsTag		cvsCom
-	HiLink cvsCom		Statement
+HiLink cvsLine		Comment
+HiLink cvsDir		cvsFile
+HiLink cvsFile		Constant
+HiLink cvsFiles		cvsCom
+HiLink cvsTag		cvsCom
+HiLink cvsCom		Statement
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "cvs"
diff --git a/runtime/syntax/cweb.vim b/runtime/syntax/cweb.vim
index 39b593d2be..1d6e0fdec6 100644
--- a/runtime/syntax/cweb.vim
+++ b/runtime/syntax/cweb.vim
@@ -13,11 +13,8 @@
 " TODO: names, and leaves C/C++ comments as such. (On the other hand,
 " TODO: switching to TeX mode in C/C++ comments might be colour overkill.)
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -25,12 +22,8 @@ endif
 " level in the CWEB syntax, e.g., in the preamble.  In general, a CWEB source
 " code can be seen as a normal TeX document with some C/C++ material
 " interspersed in certain defined regions.
-if version < 600
-  source <sfile>:p:h/tex.vim
-else
-  runtime! syntax/tex.vim
-  unlet b:current_syntax
-endif
+runtime! syntax/tex.vim
+unlet b:current_syntax
 
 " Read the C/C++ syntax too; C/C++ syntax items are treated as such in the
 " C/C++ section of a CWEB chunk or in inner C/C++ context in "|...|" groups.
@@ -63,20 +56,12 @@ syntax region webRestrictedTeX start="@[\^\.:t=q]" end="@>" oneline
 syntax match webIgnoredStuff "@@"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_cweb_syntax_inits")
-  if version < 508
-    let did_cweb_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink webRestrictedTeX String
+HiLink webRestrictedTeX String
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "cweb"
 
diff --git a/runtime/syntax/cynlib.vim b/runtime/syntax/cynlib.vim
index a9985074d6..5338c613d9 100644
--- a/runtime/syntax/cynlib.vim
+++ b/runtime/syntax/cynlib.vim
@@ -15,22 +15,15 @@
 
 
 " Remove any old syntax stuff hanging around
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 
 
 " Read the C++ syntax to start with - this includes the C syntax
-if version < 600
-  source <sfile>:p:h/cpp.vim
-else
-  runtime! syntax/cpp.vim
-endif
+runtime! syntax/cpp.vim
 unlet b:current_syntax
 
 " Cynlib extensions
@@ -69,23 +62,15 @@ syn match       cynlibOperator     "<<="
 syn keyword	cynlibType	   In Out InST OutST Int Uint Const Cynclock
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_cynlib_syntax_inits")
-  if version < 508
-    let did_cynlib_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink cynlibOperator   Operator
-  HiLink cynlibMacro      Statement
-  HiLink cynlibFunction   Statement
-  HiLink cynlibppMacro      Statement
-  HiLink cynlibType       Type
+HiLink cynlibOperator   Operator
+HiLink cynlibMacro      Statement
+HiLink cynlibFunction   Statement
+HiLink cynlibppMacro      Statement
+HiLink cynlibType       Type
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "cynlib"
diff --git a/runtime/syntax/cynpp.vim b/runtime/syntax/cynpp.vim
index b984bace35..ee54eb6a44 100644
--- a/runtime/syntax/cynpp.vim
+++ b/runtime/syntax/cynpp.vim
@@ -19,21 +19,13 @@
 
 
 
-" Remove any old syntax stuff hanging around
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " Read the Cynlib syntax to start with - this includes the C++ syntax
-if version < 600
-  source <sfile>:p:h/cynlib.vim
-else
-  runtime! syntax/cynlib.vim
-endif
+runtime! syntax/cynlib.vim
 unlet b:current_syntax
 
 
@@ -49,20 +41,12 @@ syn keyword     cynppMacro      Thread EndThread
 syn keyword     cynppMacro      Instantiate
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_cynpp_syntax_inits")
-  if version < 508
-    let did_cynpp_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink cLabel		Label
-  HiLink cynppMacro  Statement
+HiLink cLabel		Label
+HiLink cynppMacro  Statement
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "cynpp"
diff --git a/runtime/syntax/datascript.vim b/runtime/syntax/datascript.vim
index a983b8e34c..7b686a144e 100644
--- a/runtime/syntax/datascript.vim
+++ b/runtime/syntax/datascript.vim
@@ -8,9 +8,8 @@
 "
 " http://dstools.sourceforge.net/DataScriptLanguageOverview.html
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 let s:keepcpo= &cpo
diff --git a/runtime/syntax/dcd.vim b/runtime/syntax/dcd.vim
index a566745fbe..bde1d3d95e 100644
--- a/runtime/syntax/dcd.vim
+++ b/runtime/syntax/dcd.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Christopher Shinn <christopher@lucent.com>
 " Last Change:	2003 Apr 25
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -40,25 +37,17 @@ syn keyword dcdSpecial		PRV1 PRV2 PRV3 PRV4 PRV5 PRV6 PRV7 PRV8
 syn region  dcdComment		start="\*" end="\;"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_dcd_syntax_inits")
-  if version < 508
-    let did_dcd_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink dcdFunction		Identifier
-  HiLink dcdLabel		Constant
-  HiLink dcdConditional		Conditional
-  HiLink dcdDisplay		Type
-  HiLink dcdStatement		Statement
-  HiLink dcdSpecial		Special
-  HiLink dcdComment		Comment
+HiLink dcdFunction		Identifier
+HiLink dcdLabel		Constant
+HiLink dcdConditional		Conditional
+HiLink dcdDisplay		Type
+HiLink dcdStatement		Statement
+HiLink dcdSpecial		Special
+HiLink dcdComment		Comment
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "dcd"
diff --git a/runtime/syntax/dcl.vim b/runtime/syntax/dcl.vim
index 73bf577e3e..621c70f470 100644
--- a/runtime/syntax/dcl.vim
+++ b/runtime/syntax/dcl.vim
@@ -5,11 +5,8 @@
 " Version:	9
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_DCL
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -111,50 +108,42 @@ syn region  dclFuncList	matchgroup=Delimiter start="(" matchgroup=Delimiter end=
 syn match   dclError	")"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_dcl_syntax_inits")
-  if version < 508
-    let did_dcl_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
- HiLink dclLogOper	dclError
- HiLink dclLogical	dclOper
- HiLink dclLogSep	dclSep
+HiLink dclLogOper	dclError
+HiLink dclLogical	dclOper
+HiLink dclLogSep	dclSep
 
- HiLink dclAssign	Operator
- HiLink dclCmdProc	Special
- HiLink dclCmdProcStart	Operator
- HiLink dclComment	Comment
- HiLink dclContinue	Statement
- HiLink dclDevice	Identifier
- HiLink dclDirPath	Identifier
- HiLink dclDirPath	Identifier
- HiLink dclDirSep	Delimiter
- HiLink dclError	Error
- HiLink dclExe		Statement
- HiLink dclFilename	NONE
- HiLink dclGotoLabel	Label
- HiLink dclInstr	Statement
- HiLink dclLexical	Function
- HiLink dclMdfy	Type
- HiLink dclMdfyBrkt	Delimiter
- HiLink dclMdfySep	Delimiter
- HiLink dclMdfySet	Type
- HiLink dclMdfySetString	String
- HiLink dclNumber	Number
- HiLink dclOper	Operator
- HiLink dclParam	Special
- HiLink dclSep		Delimiter
- HiLink dclStart	Delimiter
- HiLink dclString	String
- HiLink dclTodo	Todo
+HiLink dclAssign	Operator
+HiLink dclCmdProc	Special
+HiLink dclCmdProcStart	Operator
+HiLink dclComment	Comment
+HiLink dclContinue	Statement
+HiLink dclDevice	Identifier
+HiLink dclDirPath	Identifier
+HiLink dclDirPath	Identifier
+HiLink dclDirSep	Delimiter
+HiLink dclError	Error
+HiLink dclExe		Statement
+HiLink dclFilename	NONE
+HiLink dclGotoLabel	Label
+HiLink dclInstr	Statement
+HiLink dclLexical	Function
+HiLink dclMdfy	Type
+HiLink dclMdfyBrkt	Delimiter
+HiLink dclMdfySep	Delimiter
+HiLink dclMdfySet	Type
+HiLink dclMdfySetString	String
+HiLink dclNumber	Number
+HiLink dclOper	Operator
+HiLink dclParam	Special
+HiLink dclSep		Delimiter
+HiLink dclStart	Delimiter
+HiLink dclString	String
+HiLink dclTodo	Todo
 
- delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "dcl"
 
diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim
index d0c658c75e..3668ea531f 100644
--- a/runtime/syntax/debchangelog.vim
+++ b/runtime/syntax/debchangelog.vim
@@ -7,9 +7,7 @@
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debchangelog.vim
 
 " Standard syntax initialization
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
   finish
 endif
 
@@ -36,28 +34,21 @@ syn region debchangelogFooter start="^ [^ ]" end="$" contains=debchangelogEmail
 syn region debchangelogEntry start="^  " end="$" contains=debchangelogCloses,debchangelogLP oneline
 
 " Associate our matches and regions with pretty colours
-if version >= 508 || !exists("did_debchangelog_syn_inits")
-  if version < 508
-    let did_debchangelog_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink debchangelogHeader		Error
-  HiLink debchangelogFooter		Identifier
-  HiLink debchangelogEntry		Normal
-  HiLink debchangelogCloses		Statement
-  HiLink debchangelogLP			Statement
-  HiLink debchangelogFirstKV		Identifier
-  HiLink debchangelogOtherKV		Identifier
-  HiLink debchangelogName		Comment
-  HiLink debchangelogVersion		Identifier
-  HiLink debchangelogTarget		Identifier
-  HiLink debchangelogEmail		Special
+HiLink debchangelogHeader		Error
+HiLink debchangelogFooter		Identifier
+HiLink debchangelogEntry		Normal
+HiLink debchangelogCloses		Statement
+HiLink debchangelogLP			Statement
+HiLink debchangelogFirstKV		Identifier
+HiLink debchangelogOtherKV		Identifier
+HiLink debchangelogName		Comment
+HiLink debchangelogVersion		Identifier
+HiLink debchangelogTarget		Identifier
+HiLink debchangelogEmail		Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "debchangelog"
 
diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
index 4fb53a55ca..4d354c4bd2 100644
--- a/runtime/syntax/debcontrol.vim
+++ b/runtime/syntax/debcontrol.vim
@@ -7,9 +7,7 @@
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debcontrol.vim
 
 " Standard syntax initialization
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
   finish
 endif
 
@@ -86,37 +84,30 @@ syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Inde
 syn region debcontrolMultiFieldSpell start="^\%(Description\):" skip="^ " end="^$"me=s-1 end="^[^ #]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment,@Spell
 
 " Associate our matches and regions with pretty colours
-if version >= 508 || !exists("did_debcontrol_syn_inits")
-  if version < 508
-    let did_debcontrol_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink debcontrolKey		Keyword
-  HiLink debcontrolField	Normal
-  HiLink debcontrolStrictField	Error
-  HiLink debcontrolDeprecatedKey	Error
-  HiLink debcontrolMultiField	Normal
-  HiLink debcontrolArchitecture	Normal
-  HiLink debcontrolMultiArch	Normal
-  HiLink debcontrolName		Normal
-  HiLink debcontrolPriority	Normal
-  HiLink debcontrolSection	Normal
-  HiLink debcontrolPackageType	Normal
-  HiLink debcontrolVariable	Identifier
-  HiLink debcontrolEmail	Identifier
-  HiLink debcontrolVcsSvn	Identifier
-  HiLink debcontrolVcsCvs	Identifier
-  HiLink debcontrolVcsGit	Identifier
-  HiLink debcontrolHTTPUrl	Identifier
-  HiLink debcontrolDmUpload	Identifier
-  HiLink debcontrolComment	Comment
-  HiLink debcontrolElse		Special
+HiLink debcontrolKey		Keyword
+HiLink debcontrolField	Normal
+HiLink debcontrolStrictField	Error
+HiLink debcontrolDeprecatedKey	Error
+HiLink debcontrolMultiField	Normal
+HiLink debcontrolArchitecture	Normal
+HiLink debcontrolMultiArch	Normal
+HiLink debcontrolName		Normal
+HiLink debcontrolPriority	Normal
+HiLink debcontrolSection	Normal
+HiLink debcontrolPackageType	Normal
+HiLink debcontrolVariable	Identifier
+HiLink debcontrolEmail	Identifier
+HiLink debcontrolVcsSvn	Identifier
+HiLink debcontrolVcsCvs	Identifier
+HiLink debcontrolVcsGit	Identifier
+HiLink debcontrolHTTPUrl	Identifier
+HiLink debcontrolDmUpload	Identifier
+HiLink debcontrolComment	Comment
+HiLink debcontrolElse		Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "debcontrol"
 
diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
index d35e24729d..5383602ef4 100644
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -6,9 +6,7 @@
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debsources.vim
 
 " Standard syntax initialization
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/def.vim b/runtime/syntax/def.vim
index 5efb41bc43..cfae2112e9 100644
--- a/runtime/syntax/def.vim
+++ b/runtime/syntax/def.vim
@@ -5,11 +5,8 @@
 " Last Change:	$Date: 2007/10/02 13:51:24 $
 " $Revision: 1.2 $
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -32,25 +29,17 @@ syn match   defNumber	"0x\x\+"
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_def_syntax_inits")
-  if version < 508
-    let did_def_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink defComment	Comment
-  HiLink defKeyword	Keyword
-  HiLink defStorage	StorageClass
-  HiLink defString	String
-  HiLink defNumber	Number
-  HiLink defOrdinal	Operator
+HiLink defComment	Comment
+HiLink defKeyword	Keyword
+HiLink defStorage	StorageClass
+HiLink defString	String
+HiLink defNumber	Number
+HiLink defOrdinal	Operator
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "def"
 
diff --git a/runtime/syntax/desc.vim b/runtime/syntax/desc.vim
index ca47176ff7..fa0189a3dc 100644
--- a/runtime/syntax/desc.vim
+++ b/runtime/syntax/desc.vim
@@ -3,11 +3,8 @@
 " Maintainer:	René Rebe <rene@exactcode.de>, Piotr Esden-Tempski <esden@rocklinux.org>
 " Last Change:	2006 Aug 14
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -63,40 +60,31 @@ syn region descTagRegion start=/^\[\(F\|FLAG\)\]/ end=/$/ contains=descTag,descF
 
 syn region descTagRegion start=/^\[\(L\|LICENSE\)\]/ end=/$/ contains=descTag,descLicense
 
-" For version 5.7 and earlier: only when not done already
-" Define the default highlighting.
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_desc_syntax_inits")
-  if version < 508
-    let did_desc_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink descFlag		Identifier
-  HiLink descLicense		Identifier
-  HiLink descCategory		Identifier
+HiLink descFlag		Identifier
+HiLink descLicense		Identifier
+HiLink descCategory		Identifier
 
-  HiLink descTag		Type
-  HiLink descUrl		Underlined
-  HiLink descEmail		Underlined
+HiLink descTag		Type
+HiLink descUrl		Underlined
+HiLink descEmail		Underlined
 
-  " priority tag colors
-  HiLink descInstallX		Boolean
-  HiLink descInstallO		Type
-  HiLink descDash		Operator
-  HiLink descDigit		Number
-  HiLink descCompilePriority	Number
+" priority tag colors
+HiLink descInstallX		Boolean
+HiLink descInstallO		Type
+HiLink descDash		Operator
+HiLink descDigit		Number
+HiLink descCompilePriority	Number
 
-  " download tag colors
-  HiLink descSum		Number
-  HiLink descTarball		Underlined
+" download tag colors
+HiLink descSum		Number
+HiLink descTarball		Underlined
 
-  " tag region colors
-  HiLink descText		Comment
+" tag region colors
+HiLink descText		Comment
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "desc"
diff --git a/runtime/syntax/desktop.vim b/runtime/syntax/desktop.vim
index 27dac5c8ee..efab6d5f6f 100644
--- a/runtime/syntax/desktop.vim
+++ b/runtime/syntax/desktop.vim
@@ -7,11 +7,8 @@
 " 		(added "Keywords")
 " Version Info: desktop.vim 0.9.4-1.2
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
@@ -79,41 +76,33 @@ syn match   dtALocale /\[.\{-}\]\s*=\@=/ containedin=ALL
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_desktop_syntax_inits")
-	if version < 508
-		let did_dosini_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink dtGroup		 Special
-	HiLink dtComment	 Comment
-	HiLink dtDelim		 String
+HiLink dtGroup		 Special
+HiLink dtComment	 Comment
+HiLink dtDelim		 String
 
-	HiLink dtLocaleKey	 Type
-	HiLink dtLocaleName	 Identifier
-	HiLink dtXLocale	 Identifier
-	HiLink dtALocale	 Identifier
+HiLink dtLocaleKey	 Type
+HiLink dtLocaleName	 Identifier
+HiLink dtXLocale	 Identifier
+HiLink dtALocale	 Identifier
 
-	HiLink dtNumericKey	 Type
+HiLink dtNumericKey	 Type
 
-	HiLink dtBooleanKey	 Type
-	HiLink dtBooleanValue	 Constant
+HiLink dtBooleanKey	 Type
+HiLink dtBooleanValue	 Constant
 
-	HiLink dtStringKey	 Type
+HiLink dtStringKey	 Type
 
-	HiLink dtExecKey	 Type
-	HiLink dtExecParam	 Special
-	HiLink dtTypeKey	 Type
-	HiLink dtTypeValue	 Constant
-	HiLink dtNotStLabel	 Type
-	HiLink dtXAddKey	 Type
+HiLink dtExecKey	 Type
+HiLink dtExecParam	 Special
+HiLink dtTypeKey	 Type
+HiLink dtTypeValue	 Constant
+HiLink dtNotStLabel	 Type
+HiLink dtXAddKey	 Type
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "desktop"
 
diff --git a/runtime/syntax/diva.vim b/runtime/syntax/diva.vim
index 78668fd85a..02fc46dcbb 100644
--- a/runtime/syntax/diva.vim
+++ b/runtime/syntax/diva.vim
@@ -11,11 +11,7 @@
 " Don't remove any old syntax stuff hanging around! We need stuff
 " from skill.vim.
 if !exists("did_skill_syntax_inits")
-  if version < 600
-	so <sfile>:p:h/skill.vim
-  else
-    runtime! syntax/skill.vim
-  endif
+  runtime! syntax/skill.vim
 endif
 
 syn keyword divaDRCKeywords		area enc notch ovlp sep width
@@ -81,29 +77,21 @@ syn match divaGeomFunctions		"(geom\u\a\+\(45\|90\)\=\>"hs=s+1
 syn match divaGeomFunctions		"\<geom\u\a\+\(45\|90\)\=("he=e-1
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_diva_syntax_inits")
-	if version < 508
-		let did_diva_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink divaDRCKeywords		Statement
-	HiLink divaMeasKeywords		Statement
-	HiLink divaCtrlFunctions	Conditional
-	HiLink divaExtFunctions		Function
-	HiLink divaDRCFunctions		Function
-	HiLink divaFunctions		Function
-	HiLink divaLayerFunctions	Function
-	HiLink divaChkFunctions		Function
-	HiLink divaLVSFunctions		Function
-	HiLink divaGeomFunctions	Function
+HiLink divaDRCKeywords		Statement
+HiLink divaMeasKeywords		Statement
+HiLink divaCtrlFunctions	Conditional
+HiLink divaExtFunctions		Function
+HiLink divaDRCFunctions		Function
+HiLink divaFunctions		Function
+HiLink divaLayerFunctions	Function
+HiLink divaChkFunctions		Function
+HiLink divaLVSFunctions		Function
+HiLink divaGeomFunctions	Function
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "diva"
 
diff --git a/runtime/syntax/django.vim b/runtime/syntax/django.vim
index da315ac302..a7104d37ec 100644
--- a/runtime/syntax/django.vim
+++ b/runtime/syntax/django.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Dave Hodder <dmh@dmh.org.uk>
 " Last Change:	2014 Jul 13
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -68,29 +65,21 @@ syn region djangoComment start="{%\s*comment\(\s\+.\{-}\)\?%}" end="{%\s*endcomm
 syn region djangoComBlock start="{#" end="#}" contains=djangoTodo
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_django_syn_inits")
-  if version < 508
-    let did_django_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink djangoTagBlock PreProc
-  HiLink djangoVarBlock PreProc
-  HiLink djangoStatement Statement
-  HiLink djangoFilter Identifier
-  HiLink djangoArgument Constant
-  HiLink djangoTagError Error
-  HiLink djangoVarError Error
-  HiLink djangoError Error
-  HiLink djangoComment Comment
-  HiLink djangoComBlock Comment
-  HiLink djangoTodo Todo
+HiLink djangoTagBlock PreProc
+HiLink djangoVarBlock PreProc
+HiLink djangoStatement Statement
+HiLink djangoFilter Identifier
+HiLink djangoArgument Constant
+HiLink djangoTagError Error
+HiLink djangoVarError Error
+HiLink djangoError Error
+HiLink djangoComment Comment
+HiLink djangoComBlock Comment
+HiLink djangoTodo Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "django"
diff --git a/runtime/syntax/dnsmasq.vim b/runtime/syntax/dnsmasq.vim
index 9fa32077b6..a4cc8b577b 100644
--- a/runtime/syntax/dnsmasq.vim
+++ b/runtime/syntax/dnsmasq.vim
@@ -20,10 +20,8 @@
 "		endif
 "
 
-" For version 5.x: Clear all syntax items
-if v:version < 600
-    syntax clear
-elseif exists("b:current_syntax") || &compatible
+" quit when a syntax file was already loaded
+if exists("b:current_syntax") || &compatible
     finish
 endif
 
diff --git a/runtime/syntax/docbk.vim b/runtime/syntax/docbk.vim
index fc679eecaf..3bc8049565 100644
--- a/runtime/syntax/docbk.vim
+++ b/runtime/syntax/docbk.vim
@@ -13,11 +13,8 @@
 "   http://www.open-oasis.org/docbook/
 "
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -174,26 +171,17 @@ syn region docbkRemark start="<comment>"lc=9  end="</comment>"me=e-10	contains=x
 syn region docbkCite   start="<citation>"lc=10 end="</citation>"me=e-11 contains=xmlRegion,xmlEntity,sgmlRegion,sgmlEntity keepend
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_docbk_syn_inits")
-  if version < 508
-    let did_docbk_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-    hi DocbkBold term=bold cterm=bold gui=bold
-  else
-    command -nargs=+ HiLink hi def link <args>
-    hi def DocbkBold term=bold cterm=bold gui=bold
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+hi def DocbkBold term=bold cterm=bold gui=bold
 
-  HiLink docbkKeyword	Statement
-  HiLink docbkRegion	DocbkBold
-  HiLink docbkTitle	Title
-  HiLink docbkRemark	Comment
-  HiLink docbkCite	Constant
+HiLink docbkKeyword	Statement
+HiLink docbkRegion	DocbkBold
+HiLink docbkTitle	Title
+HiLink docbkRemark	Comment
+HiLink docbkCite	Constant
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "docbk"
 
diff --git a/runtime/syntax/dosbatch.vim b/runtime/syntax/dosbatch.vim
index d9b1aa6703..b7f49ca4e9 100644
--- a/runtime/syntax/dosbatch.vim
+++ b/runtime/syntax/dosbatch.vim
@@ -9,11 +9,8 @@
 " dosbatch_cmdextversion	- 1 = Windows NT, 2 = Windows 2000 [default]
 "
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -111,49 +108,41 @@ syn keyword dosbatchImplicit    sort start subst time title tree type ver verify
 syn keyword dosbatchImplicit    vol xcopy
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_dosbatch_syntax_inits")
-  if version < 508
-    let did_dosbatch_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink dosbatchTodo		Todo
+HiLink dosbatchTodo		Todo
 
-  HiLink dosbatchStatement	Statement
-  HiLink dosbatchCommands	dosbatchStatement
-  HiLink dosbatchLabel		Label
-  HiLink dosbatchConditional	Conditional
-  HiLink dosbatchRepeat		Repeat
+HiLink dosbatchStatement	Statement
+HiLink dosbatchCommands	dosbatchStatement
+HiLink dosbatchLabel		Label
+HiLink dosbatchConditional	Conditional
+HiLink dosbatchRepeat		Repeat
 
-  HiLink dosbatchOperator       Operator
-  HiLink dosbatchEchoOperator   dosbatchOperator
-  HiLink dosbatchIfOperator     dosbatchOperator
+HiLink dosbatchOperator       Operator
+HiLink dosbatchEchoOperator   dosbatchOperator
+HiLink dosbatchIfOperator     dosbatchOperator
 
-  HiLink dosbatchArgument	Identifier
-  HiLink dosbatchIdentifier     Identifier
-  HiLink dosbatchVariable	dosbatchIdentifier
+HiLink dosbatchArgument	Identifier
+HiLink dosbatchIdentifier     Identifier
+HiLink dosbatchVariable	dosbatchIdentifier
 
-  HiLink dosbatchSpecialChar	SpecialChar
-  HiLink dosbatchString		String
-  HiLink dosbatchNumber		Number
-  HiLink dosbatchInteger	dosbatchNumber
-  HiLink dosbatchHex		dosbatchNumber
-  HiLink dosbatchBinary		dosbatchNumber
-  HiLink dosbatchOctal		dosbatchNumber
+HiLink dosbatchSpecialChar	SpecialChar
+HiLink dosbatchString		String
+HiLink dosbatchNumber		Number
+HiLink dosbatchInteger	dosbatchNumber
+HiLink dosbatchHex		dosbatchNumber
+HiLink dosbatchBinary		dosbatchNumber
+HiLink dosbatchOctal		dosbatchNumber
 
-  HiLink dosbatchComment	Comment
-  HiLink dosbatchImplicit	Function
+HiLink dosbatchComment	Comment
+HiLink dosbatchImplicit	Function
 
-  HiLink dosbatchSwitch		Special
+HiLink dosbatchSwitch		Special
 
-  HiLink dosbatchCmd		PreProc
+HiLink dosbatchCmd		PreProc
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "dosbatch"
 
diff --git a/runtime/syntax/dosini.vim b/runtime/syntax/dosini.vim
index e474f21116..2d8086b2d1 100644
--- a/runtime/syntax/dosini.vim
+++ b/runtime/syntax/dosini.vim
@@ -9,11 +9,8 @@
 " Last Change:            2011 Nov 8
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -28,23 +25,15 @@ syn region dosiniHeader   start="^\s*\[" end="\]"
 syn match  dosiniComment  "^[#;].*$"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_dosini_syntax_inits")
-  if version < 508
-    let did_dosini_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink dosiniNumber   Number
-  HiLink dosiniHeader   Special
-  HiLink dosiniComment  Comment
-  HiLink dosiniLabel    Type
+HiLink dosiniNumber   Number
+HiLink dosiniHeader   Special
+HiLink dosiniComment  Comment
+HiLink dosiniLabel    Type
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "dosini"
 
diff --git a/runtime/syntax/dot.vim b/runtime/syntax/dot.vim
index 4cc6f4f21d..e6a5d9a109 100644
--- a/runtime/syntax/dot.vim
+++ b/runtime/syntax/dot.vim
@@ -6,11 +6,8 @@
 " Last Change:  2011 May 17 - improved identifier matching + two new keywords
 "               2001 May 04 - initial version
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -74,36 +71,28 @@ syn sync minlines=50
 syn sync maxlines=500
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_dot_syntax_inits")
-  if version < 508
-    let did_dot_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink dotParErr	 Error
-  HiLink dotBraceErr	 Error
-  HiLink dotBrackErr	 Error
+HiLink dotParErr	 Error
+HiLink dotBraceErr	 Error
+HiLink dotBrackErr	 Error
 
-  HiLink dotComment	 Comment
-  HiLink dotTodo	 Todo
+HiLink dotComment	 Comment
+HiLink dotTodo	 Todo
 
-  HiLink dotParEncl	 Keyword
-  HiLink dotBrackEncl	 Keyword
-  HiLink dotBraceEncl	 Keyword
+HiLink dotParEncl	 Keyword
+HiLink dotBrackEncl	 Keyword
+HiLink dotBraceEncl	 Keyword
 
-  HiLink dotKeyword	 Keyword
-  HiLink dotType	 Type
-  HiLink dotKeyChar	 Keyword
+HiLink dotKeyword	 Keyword
+HiLink dotType	 Type
+HiLink dotKeyChar	 Keyword
 
-  HiLink dotString	 String
-  HiLink dotIdentifier	 Identifier
+HiLink dotString	 String
+HiLink dotIdentifier	 Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "dot"
 
diff --git a/runtime/syntax/dracula.vim b/runtime/syntax/dracula.vim
index 6a3806028e..b60e4846ed 100644
--- a/runtime/syntax/dracula.vim
+++ b/runtime/syntax/dracula.vim
@@ -8,11 +8,8 @@
 "		the purposes of Design Rule Checking, Layout vs. Schematic
 "		verification, and Layout Parameter Extraction.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -61,24 +58,16 @@ syn match   draculaPreProc "^#.*"
 syn sync lines=50
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_dracula_syn_inits")
-  if version < 508
-    let did_dracula_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink draculaIdentifier Identifier
-  HiLink draculaStatement  Statement
-  HiLink draculaType       Type
-  HiLink draculaComment    Comment
-  HiLink draculaPreProc    PreProc
+HiLink draculaIdentifier Identifier
+HiLink draculaStatement  Statement
+HiLink draculaType       Type
+HiLink draculaComment    Comment
+HiLink draculaPreProc    PreProc
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "dracula"
 
diff --git a/runtime/syntax/dtd.vim b/runtime/syntax/dtd.vim
index 001dbbddd3..e00c70d115 100644
--- a/runtime/syntax/dtd.vim
+++ b/runtime/syntax/dtd.vim
@@ -126,41 +126,33 @@ syn keyword dtdTodo contained TODO FIXME XXX
 syn sync lines=250
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_dtd_syn_inits")
-    if version < 508
-	let did_dtd_syn_inits = 1
-	command -nargs=+ HiLink hi link <args>
-    else
-	command -nargs=+ HiLink hi def link <args>
-    endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-    " The default highlighting.
-    HiLink dtdFunction		Function
-    HiLink dtdTag		Normal
-    HiLink dtdType		Type
-    HiLink dtdAttrType		dtdType
-    HiLink dtdAttrDef		dtdType
-    HiLink dtdConstant		Constant
-    HiLink dtdString		dtdConstant
-    HiLink dtdEnum		dtdConstant
-    HiLink dtdCard		dtdFunction
+" The default highlighting.
+HiLink dtdFunction		Function
+HiLink dtdTag		Normal
+HiLink dtdType		Type
+HiLink dtdAttrType		dtdType
+HiLink dtdAttrDef		dtdType
+HiLink dtdConstant		Constant
+HiLink dtdString		dtdConstant
+HiLink dtdEnum		dtdConstant
+HiLink dtdCard		dtdFunction
 
-    HiLink dtdEntity		Statement
-    HiLink dtdEntityPunct	dtdType
-    HiLink dtdParamEntityInst	dtdConstant
-    HiLink dtdParamEntityPunct	dtdType
-    HiLink dtdParamEntityDecl	dtdType
-    HiLink dtdParamEntityDPunct dtdComment
+HiLink dtdEntity		Statement
+HiLink dtdEntityPunct	dtdType
+HiLink dtdParamEntityInst	dtdConstant
+HiLink dtdParamEntityPunct	dtdType
+HiLink dtdParamEntityDecl	dtdType
+HiLink dtdParamEntityDPunct dtdComment
 
-    HiLink dtdComment		Comment
-    HiLink dtdTagName		Statement
-    HiLink dtdError		Error
-    HiLink dtdTodo		Todo
+HiLink dtdComment		Comment
+HiLink dtdTagName		Statement
+HiLink dtdError		Error
+HiLink dtdTodo		Todo
 
-    delcommand HiLink
-endif
+delcommand HiLink
 
 let &cpo = s:dtd_cpo_save
 unlet s:dtd_cpo_save
diff --git a/runtime/syntax/dtml.vim b/runtime/syntax/dtml.vim
index 7de722aabd..0cc2729f79 100644
--- a/runtime/syntax/dtml.vim
+++ b/runtime/syntax/dtml.vim
@@ -9,20 +9,13 @@
 " hacked out of the Zope Quick Reference in case someone finds something
 " sensible to do with them. I certainly haven't.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " First load the HTML syntax
-if version < 600
-  source <sfile>:p:h/html.vim
-else
-  runtime! syntax/html.vim
-endif
+runtime! syntax/html.vim
 
 syn case match
 
@@ -196,25 +189,17 @@ syn match   htmlTagN     contained +<\s*[-a-zA-Z0-9]\++hs=s+1 contains=htmlTagNa
 syn match   htmlTagN     contained +</\s*[-a-zA-Z0-9]\++hs=s+2 contains=htmlTagName,htmlSpecialTagName,dtmlIsTag,dtmlAttribute,dtmlMethod,@htmlTagNameCluster
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_dtml_syntax_inits")
-  if version < 508
-    let did_dtml_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink dtmlIsTag			PreProc
-  HiLink dtmlAttribute		Identifier
-  HiLink dtmlMethod			Function
-  HiLink dtmlComment		Comment
-  HiLink dtmlTODO			Todo
-  HiLink dtmlSpecialChar    Special
+HiLink dtmlIsTag			PreProc
+HiLink dtmlAttribute		Identifier
+HiLink dtmlMethod			Function
+HiLink dtmlComment		Comment
+HiLink dtmlTODO			Todo
+HiLink dtmlSpecialChar    Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "dtml"
 
diff --git a/runtime/syntax/dtrace.vim b/runtime/syntax/dtrace.vim
index 493de1ed0f..7ed9766e77 100644
--- a/runtime/syntax/dtrace.vim
+++ b/runtime/syntax/dtrace.vim
@@ -10,19 +10,14 @@
 " http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libdtrace/common/dt_lex.l
 " http://src.opensolaris.org/source/xref/onnv/onnv-gate/usr/src/lib/libdtrace/common/dt_grammar.y
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " Read the C syntax to start with
-if version < 600
-  so <sfile>:p:h/c.vim
-else
-  runtime! syntax/c.vim
-  unlet b:current_syntax
-endif
+runtime! syntax/c.vim
+unlet b:current_syntax
 
 syn clear cCommentL  " dtrace doesn't support // style comments
 
diff --git a/runtime/syntax/dylan.vim b/runtime/syntax/dylan.vim
index 14262d53d6..95684e5016 100644
--- a/runtime/syntax/dylan.vim
+++ b/runtime/syntax/dylan.vim
@@ -8,21 +8,14 @@
 " syntax files.
 
 " Part 1:  Syntax definition
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 syn case ignore
 
-if version < 600
-  set lisp
-else
-  setlocal lisp
-endif
+setlocal lisp
 
 " Highlight special characters (those that have backslashes) differently
 syn match	dylanSpecial		display contained "\\\(x\x\+\|\o\{1,3}\|.\|$\)"
@@ -67,42 +60,34 @@ syn region	dylanPrecondit		start="^\s*#\s*\(if\>\|else\>\|endif\>\)" skip="\\$"
 syn region	dylanHeader	start="^[Mm]odule:" end="^$"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_dylan_syntax_inits")
-  if version < 508
-    let did_dylan_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink dylanBlock		PreProc
-  HiLink dylanBoolean		Boolean
-  HiLink dylanCharacter		Character
-  HiLink dylanClass		Structure
-  HiLink dylanClassMods		StorageClass
-  HiLink dylanComment		Comment
-  HiLink dylanConditional	Conditional
-  HiLink dylanConstant		Constant
-  HiLink dylanException		Exception
-  HiLink dylanHeader		Macro
-  HiLink dylanImport		Include
-  HiLink dylanLabel		Label
-  HiLink dylanMiscMods		StorageClass
-  HiLink dylanNumber		Number
-  HiLink dylanOther		Keyword
-  HiLink dylanOperator		Operator
-  HiLink dylanParamDefs		Keyword
-  HiLink dylanPrecondit		PreCondit
-  HiLink dylanRepeat		Repeat
-  HiLink dylanSimpleDefs	Keyword
-  HiLink dylanStatement		Macro
-  HiLink dylanString		String
-  HiLink dylanVariable		Identifier
+HiLink dylanBlock		PreProc
+HiLink dylanBoolean		Boolean
+HiLink dylanCharacter		Character
+HiLink dylanClass		Structure
+HiLink dylanClassMods		StorageClass
+HiLink dylanComment		Comment
+HiLink dylanConditional	Conditional
+HiLink dylanConstant		Constant
+HiLink dylanException		Exception
+HiLink dylanHeader		Macro
+HiLink dylanImport		Include
+HiLink dylanLabel		Label
+HiLink dylanMiscMods		StorageClass
+HiLink dylanNumber		Number
+HiLink dylanOther		Keyword
+HiLink dylanOperator		Operator
+HiLink dylanParamDefs		Keyword
+HiLink dylanPrecondit		PreCondit
+HiLink dylanRepeat		Repeat
+HiLink dylanSimpleDefs	Keyword
+HiLink dylanStatement		Macro
+HiLink dylanString		String
+HiLink dylanVariable		Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "dylan"
 
diff --git a/runtime/syntax/dylanintr.vim b/runtime/syntax/dylanintr.vim
index 11ef816681..aaf2d740f0 100644
--- a/runtime/syntax/dylanintr.vim
+++ b/runtime/syntax/dylanintr.vim
@@ -4,11 +4,8 @@
 " Last Change:	Fri Sep 29 13:53:27 PDT 2000
 "
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -26,26 +23,18 @@ syn match	dylanintrInclude	"^\s*#\s*include\>\s*["<]" contains=intrIncluded
 "syn keyword intrMods pointer struct
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_dylan_intr_syntax_inits")
-  if version < 508
-    let did_dylan_intr_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink dylanintrInfo		Special
-  HiLink dylanintrInterface	Operator
-  HiLink dylanintrMods		Type
-  HiLink dylanintrClass		StorageClass
-  HiLink dylanintrType		Type
-  HiLink dylanintrIncluded	String
-  HiLink dylanintrInclude	Include
+HiLink dylanintrInfo		Special
+HiLink dylanintrInterface	Operator
+HiLink dylanintrMods		Type
+HiLink dylanintrClass		StorageClass
+HiLink dylanintrType		Type
+HiLink dylanintrIncluded	String
+HiLink dylanintrInclude	Include
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "dylanintr"
 
diff --git a/runtime/syntax/dylanlid.vim b/runtime/syntax/dylanlid.vim
index ec7b40114c..c7d2664005 100644
--- a/runtime/syntax/dylanlid.vim
+++ b/runtime/syntax/dylanlid.vim
@@ -5,11 +5,8 @@
 " Last Change:	Fri Sep 29 13:50:20 PDT 2000
 "
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -21,21 +18,13 @@ syn region	dylanlidEntry		matchgroup=Statement start=":%" end="$" oneline
 syn sync	lines=50
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_dylan_lid_syntax_inits")
-  if version < 508
-    let did_dylan_lid_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink dylanlidInfo		Type
-  HiLink dylanlidEntry		String
+HiLink dylanlidInfo		Type
+HiLink dylanlidEntry		String
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "dylanlid"
 
diff --git a/runtime/syntax/ecd.vim b/runtime/syntax/ecd.vim
index fff7a4b883..728cf28116 100644
--- a/runtime/syntax/ecd.vim
+++ b/runtime/syntax/ecd.vim
@@ -8,10 +8,8 @@
 " This syntax file was derived from apachestyle.vim
 " by Christian Hammers <ch@westend.com>
 
-" Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -31,26 +29,18 @@ syn match  ecdTagN	contained +<[/\s]*[-a-zA-Z0-9_]\++ms=s+1
 syn match  ecdTagError	contained "[^>]<"ms=s+1
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_ecd_syn_inits")
-  if version < 508
-    let did_ecd_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink ecdComment	Comment
-  HiLink ecdAttr	Type
-  HiLink ecdAttrN	Statement
-  HiLink ecdAttrV	Value
-  HiLink ecdTag		Function
-  HiLink ecdTagN	Statement
-  HiLink ecdTagError	Error
+HiLink ecdComment	Comment
+HiLink ecdAttr	Type
+HiLink ecdAttrN	Statement
+HiLink ecdAttrV	Value
+HiLink ecdTag		Function
+HiLink ecdTagN	Statement
+HiLink ecdTagError	Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "ecd"
 " vim: ts=8
diff --git a/runtime/syntax/edif.vim b/runtime/syntax/edif.vim
index 0c17834947..21c7ec7a03 100644
--- a/runtime/syntax/edif.vim
+++ b/runtime/syntax/edif.vim
@@ -8,18 +8,12 @@
 "   IEC 61690-1 (EDIF Version 3 0 0)
 "   IEC 61690-2 (EDIF Version 4 0 0)
 
-" Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
-if version >= 600
- setlocal iskeyword=48-57,-,+,A-Z,a-z,_,&
-else
- set iskeyword=A-Z,a-z,_,&
-endif
+setlocal iskeyword=48-57,-,+,A-Z,a-z,_,&
 
 syn region	edifList	matchgroup=Delimiter start="(" end=")" contains=edifList,edifKeyword,edifString,edifNumber
 
@@ -37,28 +31,17 @@ syn match       edifKeyword     "(\@<=\s*[a-zA-Z&][a-zA-Z_0-9]*\>" contained
 syn match       edifError       ")"
 
 " synchronization
-if version < 600
-  syntax sync maxlines=250
-else
-  syntax sync fromstart
-endif
+syntax sync fromstart
 
 " Define the default highlighting.
-if version >= 508 || !exists("did_edif_syntax_inits")
-  if version < 508
-    let did_edif_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink edifInString		SpecialChar
-  HiLink edifKeyword		Keyword
-  HiLink edifNumber		Number
-  HiLink edifInStringError	edifError
-  HiLink edifError		Error
-  HiLink edifString		String
-  delcommand HiLink
-endif
+HiLink edifInString		SpecialChar
+HiLink edifKeyword		Keyword
+HiLink edifNumber		Number
+HiLink edifInStringError	edifError
+HiLink edifError		Error
+HiLink edifString		String
+delcommand HiLink
 
 let b:current_syntax = "edif"
diff --git a/runtime/syntax/eiffel.vim b/runtime/syntax/eiffel.vim
index a91f85d03e..0ee5ea091f 100644
--- a/runtime/syntax/eiffel.vim
+++ b/runtime/syntax/eiffel.vim
@@ -5,11 +5,8 @@
 " Contributions from: Thilo Six
 " 
 " URL: https://github.com/eiffelhub/vim-eiffel
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -141,68 +138,60 @@ endif
 syn sync lines=40
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_eiffel_syntax_inits")
-  if version < 508
-    let did_eiffel_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink eiffelKeyword		Statement
-  HiLink eiffelProperty		Statement
-  HiLink eiffelInheritClause	Statement
-  HiLink eiffelStatement	Statement
-  HiLink eiffelDeclaration	Statement
-  HiLink eiffelAssertion	Statement
-  HiLink eiffelDebug		Statement
-  HiLink eiffelException	Statement
-  HiLink eiffelGenericCreate	Statement
+HiLink eiffelKeyword		Statement
+HiLink eiffelProperty		Statement
+HiLink eiffelInheritClause	Statement
+HiLink eiffelStatement	Statement
+HiLink eiffelDeclaration	Statement
+HiLink eiffelAssertion	Statement
+HiLink eiffelDebug		Statement
+HiLink eiffelException	Statement
+HiLink eiffelGenericCreate	Statement
 
-  HiLink eiffelAgent		Statement
-  HiLink eiffelConvert		Statement
+HiLink eiffelAgent		Statement
+HiLink eiffelConvert		Statement
 
-  HiLink eiffelTopStruct	PreProc
+HiLink eiffelTopStruct	PreProc
 
-  HiLink eiffelAll		Special
-  HiLink eiffelAnchored		Special
-  HiLink eiffelBitType		Special
+HiLink eiffelAll		Special
+HiLink eiffelAnchored		Special
+HiLink eiffelBitType		Special
 
 
-  HiLink eiffelBool		Boolean
-  HiLink eiffelString		String
-  HiLink eiffelCharacter	Character
-  HiLink eiffelClassName	Type
-  HiLink eiffelNumber		Number
+HiLink eiffelBool		Boolean
+HiLink eiffelString		String
+HiLink eiffelCharacter	Character
+HiLink eiffelClassName	Type
+HiLink eiffelNumber		Number
 
-  HiLink eiffelStringEscape	Special
+HiLink eiffelStringEscape	Special
 
-  HiLink eiffelOperator		Special
-  HiLink eiffelArray		Special
-  HiLink eiffelExport		Special
-  HiLink eiffelCreation		Special
-  HiLink eiffelBrackets		Special
-  HiLink eiffelGeneric		Special
-  HiLink eiffelGenericDecl	Special
-  HiLink eiffelConstraint	Special
-  HiLink eiffelCreate		Special
+HiLink eiffelOperator		Special
+HiLink eiffelArray		Special
+HiLink eiffelExport		Special
+HiLink eiffelCreation		Special
+HiLink eiffelBrackets		Special
+HiLink eiffelGeneric		Special
+HiLink eiffelGenericDecl	Special
+HiLink eiffelConstraint	Special
+HiLink eiffelCreate		Special
 
-  HiLink eiffelPredefined	Constant
+HiLink eiffelPredefined	Constant
 
-  HiLink eiffelComment		Comment
+HiLink eiffelComment		Comment
 
-  HiLink eiffelError		Error
-  HiLink eiffelBadConstant	Error
-  HiLink eiffelStringError	Error
-  HiLink eiffelParenError	Error
-  HiLink eiffelBracketError	Error
+HiLink eiffelError		Error
+HiLink eiffelBadConstant	Error
+HiLink eiffelStringError	Error
+HiLink eiffelParenError	Error
+HiLink eiffelBracketError	Error
 
-  HiLink eiffelTodo		Todo
+HiLink eiffelTodo		Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "eiffel"
 
diff --git a/runtime/syntax/elf.vim b/runtime/syntax/elf.vim
index 621e063ff8..7835f550fc 100644
--- a/runtime/syntax/elf.vim
+++ b/runtime/syntax/elf.vim
@@ -10,11 +10,8 @@
 "      This is the Applix Inc., Macro and Builder programming language.
 "      It has nothing in common with the binary format called ELF.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
@@ -63,32 +60,24 @@ syn match elfParens "[\[\]()]"
 syn match elfPunct "[,;]"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_elf_syn_inits")
-	if version < 508
-		let did_elf_syn_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-   endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting. Can be overridden later.
-  HiLink elfComment Comment
-  HiLink elfPPCom Include
-  HiLink elfKeyword Keyword
-  HiLink elfSpecial Special
-  HiLink elfEnvironment Special
-  HiLink elfBraceError Error
-  HiLink elfConditional Conditional
-  HiLink elfMacro Function
-  HiLink elfNumber Number
-  HiLink elfString String
-  HiLink elfParens Delimiter
-  HiLink elfPunct Delimiter
+" The default methods for highlighting. Can be overridden later.
+HiLink elfComment Comment
+HiLink elfPPCom Include
+HiLink elfKeyword Keyword
+HiLink elfSpecial Special
+HiLink elfEnvironment Special
+HiLink elfBraceError Error
+HiLink elfConditional Conditional
+HiLink elfMacro Function
+HiLink elfNumber Number
+HiLink elfString String
+HiLink elfParens Delimiter
+HiLink elfPunct Delimiter
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "elf"
 
diff --git a/runtime/syntax/elmfilt.vim b/runtime/syntax/elmfilt.vim
index e7d5df22aa..5858946648 100644
--- a/runtime/syntax/elmfilt.vim
+++ b/runtime/syntax/elmfilt.vim
@@ -5,11 +5,8 @@
 " Version:	6
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_ELMFILT
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -38,33 +35,25 @@ syn region	elmfiltString	contained	start="'" skip="'\(\\\\\)*\\['%]" end="'"	con
 syn match	elmfiltSpaceError	contained	"\s.*$"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_elmfilt_syntax_inits")
-  if version < 508
-    let did_elmfilt_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink elmfiltAction	Statement
-  HiLink elmfiltArg	Special
-  HiLink elmfiltComment	Comment
-  HiLink elmfiltCond	Statement
-  HiLink elmfiltIf	Statement
-  HiLink elmfiltMatch	Special
-  HiLink elmfiltMatchError	Error
-  HiLink elmfiltNumber	Number
-  HiLink elmfiltOper	Operator
-  HiLink elmfiltOperKey	Type
-  HiLink elmfiltParenError	Error
-  HiLink elmfiltSpaceError	Error
-  HiLink elmfiltString	String
-  HiLink elmfiltThenError	Error
+HiLink elmfiltAction	Statement
+HiLink elmfiltArg	Special
+HiLink elmfiltComment	Comment
+HiLink elmfiltCond	Statement
+HiLink elmfiltIf	Statement
+HiLink elmfiltMatch	Special
+HiLink elmfiltMatchError	Error
+HiLink elmfiltNumber	Number
+HiLink elmfiltOper	Operator
+HiLink elmfiltOperKey	Type
+HiLink elmfiltParenError	Error
+HiLink elmfiltSpaceError	Error
+HiLink elmfiltString	String
+HiLink elmfiltThenError	Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "elmfilt"
 " vim: ts=9
diff --git a/runtime/syntax/erlang.vim b/runtime/syntax/erlang.vim
index 02597e75f3..a49f24ed14 100644
--- a/runtime/syntax/erlang.vim
+++ b/runtime/syntax/erlang.vim
@@ -28,11 +28,8 @@
 "
 "     syn keyword erlangAttribute myattr1 myattr2 contained
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
@@ -42,9 +39,7 @@ set cpo&vim
 " Case sensitive
 syn case match
 
-if version >= 600
-  setlocal iskeyword+=$,@-@
-endif
+setlocal iskeyword+=$,@-@
 
 " Comments
 syn match erlangComment           '%.*$' contains=erlangCommentAnnotation,erlangTodo
@@ -147,116 +142,108 @@ let b:erlang_syntax_synced = 1
 let s:old_style = (exists("g:erlang_old_style_highlight") &&
                   \g:erlang_old_style_highlight == 1)
 
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_erlang_inits")
-  if version < 508
-    let did_erlang_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " Comments
-  HiLink erlangComment Comment
-  HiLink erlangCommentAnnotation Special
-  HiLink erlangTodo Todo
-  HiLink erlangShebang Comment
+" Comments
+HiLink erlangComment Comment
+HiLink erlangCommentAnnotation Special
+HiLink erlangTodo Todo
+HiLink erlangShebang Comment
 
-  " Numbers
-  HiLink erlangNumberInteger Number
-  HiLink erlangNumberFloat Float
+" Numbers
+HiLink erlangNumberInteger Number
+HiLink erlangNumberFloat Float
 
-  " Strings, atoms, characters
-  HiLink erlangString String
+" Strings, atoms, characters
+HiLink erlangString String
 
-  if s:old_style
-    HiLink erlangQuotedAtom Type
-  else
-    HiLink erlangQuotedAtom String
-  endif
-
-  HiLink erlangStringModifier Special
-  HiLink erlangQuotedAtomModifier Special
-  HiLink erlangModifier Special
-
-  " Operators, separators
-  HiLink erlangOperator Operator
-  HiLink erlangRightArrow Operator
-  if s:old_style
-    HiLink erlangBracket Normal
-    HiLink erlangPipe Normal
-  else
-    HiLink erlangBracket Delimiter
-    HiLink erlangPipe Delimiter
-  endif
-
-  " Atoms, functions, variables, macros
-  if s:old_style
-    HiLink erlangAtom Normal
-    HiLink erlangLocalFuncCall Normal
-    HiLink erlangLocalFuncRef Normal
-    HiLink erlangGlobalFuncCall Function
-    HiLink erlangGlobalFuncRef Function
-    HiLink erlangVariable Normal
-    HiLink erlangMacro Normal
-    HiLink erlangRecord Normal
-  else
-    HiLink erlangAtom String
-    HiLink erlangLocalFuncCall Normal
-    HiLink erlangLocalFuncRef Normal
-    HiLink erlangGlobalFuncCall Normal
-    HiLink erlangGlobalFuncRef Normal
-    HiLink erlangVariable Identifier
-    HiLink erlangMacro Macro
-    HiLink erlangRecord Structure
-  endif
-
-  " Bitstrings
-  if !s:old_style
-    HiLink erlangBitType Type
-  endif
-
-  " Constants and Directives
-  if s:old_style
-    HiLink erlangAttribute Type
-    HiLink erlangMacroDef Type
-    HiLink erlangUnknownAttribute Normal
-    HiLink erlangInclude Type
-    HiLink erlangRecordDef Type
-    HiLink erlangDefine Type
-    HiLink erlangPreCondit Type
-    HiLink erlangType Type
-  else
-    HiLink erlangAttribute Keyword
-    HiLink erlangMacroDef Macro
-    HiLink erlangUnknownAttribute Normal
-    HiLink erlangInclude Include
-    HiLink erlangRecordDef Keyword
-    HiLink erlangDefine Define
-    HiLink erlangPreCondit PreCondit
-    HiLink erlangType Type
-  endif
-
-  " Keywords
-  HiLink erlangKeyword Keyword
-
-  " Build-in-functions (BIFs)
-  HiLink erlangBIF Function
-
-  if s:old_style
-    HiLink erlangBoolean Statement
-    HiLink erlangExtra Statement
-    HiLink erlangSignal Statement
-  else
-    HiLink erlangBoolean Boolean
-    HiLink erlangExtra Statement
-    HiLink erlangSignal Statement
-  endif
-
-  delcommand HiLink
+if s:old_style
+HiLink erlangQuotedAtom Type
+else
+HiLink erlangQuotedAtom String
 endif
 
+HiLink erlangStringModifier Special
+HiLink erlangQuotedAtomModifier Special
+HiLink erlangModifier Special
+
+" Operators, separators
+HiLink erlangOperator Operator
+HiLink erlangRightArrow Operator
+if s:old_style
+HiLink erlangBracket Normal
+HiLink erlangPipe Normal
+else
+HiLink erlangBracket Delimiter
+HiLink erlangPipe Delimiter
+endif
+
+" Atoms, functions, variables, macros
+if s:old_style
+HiLink erlangAtom Normal
+HiLink erlangLocalFuncCall Normal
+HiLink erlangLocalFuncRef Normal
+HiLink erlangGlobalFuncCall Function
+HiLink erlangGlobalFuncRef Function
+HiLink erlangVariable Normal
+HiLink erlangMacro Normal
+HiLink erlangRecord Normal
+else
+HiLink erlangAtom String
+HiLink erlangLocalFuncCall Normal
+HiLink erlangLocalFuncRef Normal
+HiLink erlangGlobalFuncCall Normal
+HiLink erlangGlobalFuncRef Normal
+HiLink erlangVariable Identifier
+HiLink erlangMacro Macro
+HiLink erlangRecord Structure
+endif
+
+" Bitstrings
+if !s:old_style
+HiLink erlangBitType Type
+endif
+
+" Constants and Directives
+if s:old_style
+HiLink erlangAttribute Type
+HiLink erlangMacroDef Type
+HiLink erlangUnknownAttribute Normal
+HiLink erlangInclude Type
+HiLink erlangRecordDef Type
+HiLink erlangDefine Type
+HiLink erlangPreCondit Type
+HiLink erlangType Type
+else
+HiLink erlangAttribute Keyword
+HiLink erlangMacroDef Macro
+HiLink erlangUnknownAttribute Normal
+HiLink erlangInclude Include
+HiLink erlangRecordDef Keyword
+HiLink erlangDefine Define
+HiLink erlangPreCondit PreCondit
+HiLink erlangType Type
+endif
+
+" Keywords
+HiLink erlangKeyword Keyword
+
+" Build-in-functions (BIFs)
+HiLink erlangBIF Function
+
+if s:old_style
+HiLink erlangBoolean Statement
+HiLink erlangExtra Statement
+HiLink erlangSignal Statement
+else
+HiLink erlangBoolean Boolean
+HiLink erlangExtra Statement
+HiLink erlangSignal Statement
+endif
+
+delcommand HiLink
+
 let b:current_syntax = "erlang"
 
 let &cpo = s:cpo_save
diff --git a/runtime/syntax/eruby.vim b/runtime/syntax/eruby.vim
index c20b086ba5..4e175bcc25 100644
--- a/runtime/syntax/eruby.vim
+++ b/runtime/syntax/eruby.vim
@@ -22,7 +22,7 @@ elseif !exists("b:eruby_subtype") && main_syntax == 'eruby'
   let s:lines = getline(1)."\n".getline(2)."\n".getline(3)."\n".getline(4)."\n".getline(5)."\n".getline("$")
   let b:eruby_subtype = matchstr(s:lines,'eruby_subtype=\zs\w\+')
   if b:eruby_subtype == ''
-    let b:eruby_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.erb\|\.eruby\|\.erubis\)\+$','',''),'\.\zs\w\+$')
+    let b:eruby_subtype = matchstr(substitute(expand("%:t"),'\c\%(\.erb\|\.eruby\|\.erubis\)\+$','',''),'\.\zs\w\+\%(\ze+\w\+\)\=$')
   endif
   if b:eruby_subtype == 'rhtml'
     let b:eruby_subtype = 'html'
diff --git a/runtime/syntax/esmtprc.vim b/runtime/syntax/esmtprc.vim
index b22b1a1416..81f074b59c 100644
--- a/runtime/syntax/esmtprc.vim
+++ b/runtime/syntax/esmtprc.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Kornel Kielczewski <kornel@gazeta.pl>
 " Last Change:	16 Feb 2005
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/esqlc.vim b/runtime/syntax/esqlc.vim
index 6ad167a7e6..ea36d66e1a 100644
--- a/runtime/syntax/esqlc.vim
+++ b/runtime/syntax/esqlc.vim
@@ -3,20 +3,13 @@
 " Maintainer:	Jonathan A. George <jageorge@tel.gte.com>
 " Last Change:	2001 May 09
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " Read the C++ syntax to start with
-if version < 600
-  source <sfile>:p:h/cpp.vim
-else
-  runtime! syntax/cpp.vim
-endif
+runtime! syntax/cpp.vim
 
 " ESQL-C extentions
 
@@ -52,24 +45,16 @@ syntax keyword esqlcStatement	rename revoke rollback savepoint select set
 syntax keyword esqlcStatement	truncate update
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_esqlc_syntax_inits")
-  if version < 508
-    let did_esqlc_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink esqlcOperator	Operator
-  HiLink esqlcStatement	Statement
-  HiLink esqlcKeyword	esqlcSpecial
-  HiLink esqlcSpecial	Special
-  HiLink esqlcPreProc	PreProc
+HiLink esqlcOperator	Operator
+HiLink esqlcStatement	Statement
+HiLink esqlcKeyword	esqlcSpecial
+HiLink esqlcSpecial	Special
+HiLink esqlcPreProc	PreProc
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "esqlc"
 
diff --git a/runtime/syntax/esterel.vim b/runtime/syntax/esterel.vim
index d853e75208..0540843cd8 100644
--- a/runtime/syntax/esterel.vim
+++ b/runtime/syntax/esterel.vim
@@ -6,11 +6,8 @@
 " Last Change:		Tue May  6 13:29:56 CEST 2008
 " Version:			0.8
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -65,26 +62,19 @@ syn match esterelNone			"\<else\s\+if\>$"
 syn match esterelNone			"\<else\s\+if\>\s"
 
 " Class Linking
-if version >= 508 || !exists("did_esterel_syntax_inits")
-  if version < 508
-    let did_esterel_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink esterelStatement		Statement
-	HiLink esterelType			Type
-	HiLink esterelComment		Comment
-	HiLink esterelBoolean		Number
-	HiLink esterelExpressions	Number
-	HiLink esterelIO			String
-	HiLink esterelOperator		Type
-	HiLink esterelSysCall		Type
-	HiLink esterelFunctions		Type
-	HiLink esterelSpecial		Special
+HiLink esterelStatement		Statement
+HiLink esterelType			Type
+HiLink esterelComment		Comment
+HiLink esterelBoolean		Number
+HiLink esterelExpressions	Number
+HiLink esterelIO			String
+HiLink esterelOperator		Type
+HiLink esterelSysCall		Type
+HiLink esterelFunctions		Type
+HiLink esterelSpecial		Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "esterel"
diff --git a/runtime/syntax/euphoria3.vim b/runtime/syntax/euphoria3.vim
index 1254b96247..ece14027ba 100644
--- a/runtime/syntax/euphoria3.vim
+++ b/runtime/syntax/euphoria3.vim
@@ -5,10 +5,8 @@
 " Remark:       Euphoria has two syntax files, euphoria3.vim and euphoria4.vim; 
 "               For details see :help ft-euphoria-syntax
 
-" Quit if a (custom) syntax file was already loaded (compatible with Vim 5.8): 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/euphoria4.vim b/runtime/syntax/euphoria4.vim
index 53f5cea917..5e668a7d67 100644
--- a/runtime/syntax/euphoria4.vim
+++ b/runtime/syntax/euphoria4.vim
@@ -5,10 +5,8 @@
 " Remark:       Euphoria has two syntax files, euphoria3.vim and euphoria4.vim; 
 "               For details see :help ft-euphoria-syntax
 
-" Quit if a (custom) syntax file was already loaded (compatible with Vim 5.8): 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/eviews.vim b/runtime/syntax/eviews.vim
index aa65fda3ff..7d039c2122 100644
--- a/runtime/syntax/eviews.vim
+++ b/runtime/syntax/eviews.vim
@@ -4,19 +4,12 @@
 " Last Change:  2006 Apr 30
 " Filenames:	*.prg
 " URL:	http://uosis.mif.vu.lt/~zemlys/vim-syntax/eviews.vim
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
-if version >= 600
-  setlocal iskeyword=@,48-57,_,.
-else
-  set iskeyword=@,48-57,_,.
-endif
+setlocal iskeyword=@,48-57,_,.
 
 syn case match
 
@@ -69,35 +62,27 @@ syn match eCurlyError /[)\]]/ contained
 syn match eParenError /[\]}]/ contained
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_r_syn_inits")
-  if version < 508
-    let did_r_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink eComment     Comment
-  HiLink eConstant    Identifier
-  HiLink eStringId    Identifier
-  HiLink eCommand     Type
-  HiLink eString      String
-  HiLink eNumber      Number
-  HiLink eBoolean     Boolean
-  HiLink eFloat       Float
-  HiLink eConditional Conditional
-  HiLink eProgLang    Statement
-  HiLink eOVP	      Statement
-  HiLink eStdCmd      Statement
-  HiLink eIdentifier  Normal
-  HiLink eDelimiter   Delimiter
-  HiLink eError       Error
-  HiLink eBraceError  Error
-  HiLink eCurlyError  Error
-  HiLink eParenError  Error
-  delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+HiLink eComment     Comment
+HiLink eConstant    Identifier
+HiLink eStringId    Identifier
+HiLink eCommand     Type
+HiLink eString      String
+HiLink eNumber      Number
+HiLink eBoolean     Boolean
+HiLink eFloat       Float
+HiLink eConditional Conditional
+HiLink eProgLang    Statement
+HiLink eOVP	      Statement
+HiLink eStdCmd      Statement
+HiLink eIdentifier  Normal
+HiLink eDelimiter   Delimiter
+HiLink eError       Error
+HiLink eBraceError  Error
+HiLink eCurlyError  Error
+HiLink eParenError  Error
+delcommand HiLink
 
 let b:current_syntax="eviews"
 
diff --git a/runtime/syntax/exim.vim b/runtime/syntax/exim.vim
index ff8066f8af..f9017acb1e 100644
--- a/runtime/syntax/exim.vim
+++ b/runtime/syntax/exim.vim
@@ -6,12 +6,9 @@
 " URL: http://trific.ath.cx/Ftp/vim/syntax/exim.vim
 
 " Setup
-if version >= 600
-	if exists("b:current_syntax")
-		finish
-	endif
-else
-	syntax clear
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
 endif
 
 syn case match
@@ -91,27 +88,20 @@ syn keyword eximKeyword server_prompts server_condition client_send
 syn keyword eximKeyword server_secret client_name client_secret
 
 " Define the default highlighting
-if version >= 508 || !exists("did_exim_syntax_inits")
-	if version < 508
-		let did_exim_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink eximComment Comment
-	HiLink eximFixme Todo
-	HiLink eximEnd Keyword
-	HiLink eximNumber Number
-	HiLink eximDriverName Constant
-	HiLink eximConstant Constant
-	HiLink eximTime Constant
-	HiLink eximKeyword Type
-	HiLink eximSpecialChar Special
-	HiLink eximMacroName Preproc
-	HiLink eximTransport Identifier
+HiLink eximComment Comment
+HiLink eximFixme Todo
+HiLink eximEnd Keyword
+HiLink eximNumber Number
+HiLink eximDriverName Constant
+HiLink eximConstant Constant
+HiLink eximTime Constant
+HiLink eximKeyword Type
+HiLink eximSpecialChar Special
+HiLink eximMacroName Preproc
+HiLink eximTransport Identifier
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "exim"
diff --git a/runtime/syntax/expect.vim b/runtime/syntax/expect.vim
index 6ff7d4142c..4f05259fc1 100644
--- a/runtime/syntax/expect.vim
+++ b/runtime/syntax/expect.vim
@@ -4,11 +4,8 @@
 " Last Change:	2012 Jun 01
 " 		(Dominique Pelle added @Spell)
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -81,35 +78,27 @@ syn match   expectComment	"#.*$" contains=@Spell,expectTodo
 syn match   expectSharpBang	"\%^#!.*"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_expect_syntax_inits")
-  if version < 508
-    let did_expect_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink expectSharpBang	PreProc
-  HiLink expectVariables	Special
-  HiLink expectCommand		Function
-  HiLink expectStatement	Statement
-  HiLink expectConditional	Conditional
-  HiLink expectRepeat		Repeat
-  HiLink expectExpectOpts	Keyword
-  HiLink expectOutVar		Special
-  HiLink expectSpecial		Special
-  HiLink expectNumber		Number
+HiLink expectSharpBang	PreProc
+HiLink expectVariables	Special
+HiLink expectCommand		Function
+HiLink expectStatement	Statement
+HiLink expectConditional	Conditional
+HiLink expectRepeat		Repeat
+HiLink expectExpectOpts	Keyword
+HiLink expectOutVar		Special
+HiLink expectSpecial		Special
+HiLink expectNumber		Number
 
-  HiLink expectString		String
+HiLink expectString		String
 
-  HiLink expectComment		Comment
-  HiLink expectTodo		Todo
-  "HiLink expectIdentifier	Identifier
+HiLink expectComment		Comment
+HiLink expectTodo		Todo
+"HiLink expectIdentifier	Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "expect"
 
diff --git a/runtime/syntax/exports.vim b/runtime/syntax/exports.vim
index f695dc8d21..aa6b76a5b0 100644
--- a/runtime/syntax/exports.vim
+++ b/runtime/syntax/exports.vim
@@ -6,11 +6,8 @@
 " Notes:		This file includes both SysV and BSD 'isms
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_EXPORTS
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -39,32 +36,24 @@ syn match exportsSeparator	"[,:]"
 syn match exportsComment	"^\s*#.*$"	contains=@Spell
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_exports_syntax_inits")
-  if version < 508
-    let did_exports_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink exportsKeyOptSet	exportsKeySettings
-  HiLink exportsOptSet	exportsSettings
+HiLink exportsKeyOptSet	exportsKeySettings
+HiLink exportsOptSet	exportsSettings
 
-  HiLink exportsComment	Comment
-  HiLink exportsKeyOptions	Type
-  HiLink exportsKeySettings	Keyword
-  HiLink exportsOptions	Constant
-  HiLink exportsSeparator	Constant
-  HiLink exportsSettings	Constant
+HiLink exportsComment	Comment
+HiLink exportsKeyOptions	Type
+HiLink exportsKeySettings	Keyword
+HiLink exportsOptions	Constant
+HiLink exportsSeparator	Constant
+HiLink exportsSettings	Constant
 
-  HiLink exportsOptError	Error
-  HiLink exportsOptSetError	Error
-  HiLink exportsSetError	Error
+HiLink exportsOptError	Error
+HiLink exportsOptSetError	Error
+HiLink exportsSetError	Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "exports"
 " vim: ts=10
diff --git a/runtime/syntax/fasm.vim b/runtime/syntax/fasm.vim
index 696e05b4ca..172ba7c9b6 100644
--- a/runtime/syntax/fasm.vim
+++ b/runtime/syntax/fasm.vim
@@ -6,9 +6,8 @@
 " FASM Home:	http://flatassembler.net/
 " FASM Version: 1.56
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/fdcc.vim b/runtime/syntax/fdcc.vim
index 38717ebfb8..422fd31dae 100644
--- a/runtime/syntax/fdcc.vim
+++ b/runtime/syntax/fdcc.vim
@@ -4,11 +4,8 @@
 " Last Change:	2004 May 16
 " Remarks:      FDCC (Formal Definitions of Cultural Conventions) see ISO TR 14652
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -58,56 +55,48 @@ syn region fdccBlank matchgroup=fdccLCName start=/^LC_NAME$/ end=/^END LC_NAME$/
 syn region fdccBlank matchgroup=fdccLCAddress start=/^LC_ADDRESS$/ end=/^END LC_ADDRESS$/ contains=fdccKeywordAddress,fdccString,fdccComment,fdccNumber
 
 
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_fdcc_syn_inits")
-  if version < 508
-    let did_fdcc_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink fdccBlank		 Blank
+HiLink fdccBlank		 Blank
 
-  HiLink fdccTodo		 Todo
-  HiLink fdccComment		 Comment
-  HiLink fdccVariable		 Type
+HiLink fdccTodo		 Todo
+HiLink fdccComment		 Comment
+HiLink fdccVariable		 Type
 
-  HiLink fdccLCIdentification	 Statement
-  HiLink fdccLCCtype		 Statement
-  HiLink fdccLCCollate		 Statement
-  HiLink fdccLCMonetary		 Statement
-  HiLink fdccLCNumeric		 Statement
-  HiLink fdccLCTime		 Statement
-  HiLink fdccLCMessages		 Statement
-  HiLink fdccLCPaper		 Statement
-  HiLink fdccLCTelephone	 Statement
-  HiLink fdccLCMeasurement	 Statement
-  HiLink fdccLCName		 Statement
-  HiLink fdccLCAddress		 Statement
+HiLink fdccLCIdentification	 Statement
+HiLink fdccLCCtype		 Statement
+HiLink fdccLCCollate		 Statement
+HiLink fdccLCMonetary		 Statement
+HiLink fdccLCNumeric		 Statement
+HiLink fdccLCTime		 Statement
+HiLink fdccLCMessages		 Statement
+HiLink fdccLCPaper		 Statement
+HiLink fdccLCTelephone	 Statement
+HiLink fdccLCMeasurement	 Statement
+HiLink fdccLCName		 Statement
+HiLink fdccLCAddress		 Statement
 
-  HiLink fdccUnicodeInValid	 Error
-  HiLink fdccUnicodeValid	 String
-  HiLink fdccString		 String
-  HiLink fdccNumber		 Blank
+HiLink fdccUnicodeInValid	 Error
+HiLink fdccUnicodeValid	 String
+HiLink fdccString		 String
+HiLink fdccNumber		 Blank
 
-  HiLink fdccKeywordIdentification fdccKeyword
-  HiLink fdccKeywordCtype	   fdccKeyword
-  HiLink fdccKeywordCollate	   fdccKeyword
-  HiLink fdccKeywordMonetary	   fdccKeyword
-  HiLink fdccKeywordNumeric	   fdccKeyword
-  HiLink fdccKeywordTime	   fdccKeyword
-  HiLink fdccKeywordMessages	   fdccKeyword
-  HiLink fdccKeywordPaper	   fdccKeyword
-  HiLink fdccKeywordTelephone	   fdccKeyword
-  HiLink fdccKeywordMeasurement    fdccKeyword
-  HiLink fdccKeywordName	   fdccKeyword
-  HiLink fdccKeywordAddress	   fdccKeyword
-  HiLink fdccKeyword		   Identifier
+HiLink fdccKeywordIdentification fdccKeyword
+HiLink fdccKeywordCtype	   fdccKeyword
+HiLink fdccKeywordCollate	   fdccKeyword
+HiLink fdccKeywordMonetary	   fdccKeyword
+HiLink fdccKeywordNumeric	   fdccKeyword
+HiLink fdccKeywordTime	   fdccKeyword
+HiLink fdccKeywordMessages	   fdccKeyword
+HiLink fdccKeywordPaper	   fdccKeyword
+HiLink fdccKeywordTelephone	   fdccKeyword
+HiLink fdccKeywordMeasurement    fdccKeyword
+HiLink fdccKeywordName	   fdccKeyword
+HiLink fdccKeywordAddress	   fdccKeyword
+HiLink fdccKeyword		   Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "fdcc"
 
diff --git a/runtime/syntax/fgl.vim b/runtime/syntax/fgl.vim
index 1b2fe19a88..e45e31c395 100644
--- a/runtime/syntax/fgl.vim
+++ b/runtime/syntax/fgl.vim
@@ -7,11 +7,8 @@
 " - Conditionally allow case insensitive keywords (Julian Bridle)
 "
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -119,28 +116,20 @@ syn match fglSpecial	"--@"
 syn sync ccomment fglComment
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_fgl_syntax_inits")
-  if version < 508
-    let did_fgl_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink fglComment	Comment
-  "HiLink fglKeyword	fglSpecial
-  HiLink fglKeyword	fglStatement
-  HiLink fglNumber	Number
-  HiLink fglOperator	fglStatement
-  HiLink fglSpecial	Special
-  HiLink fglStatement	Statement
-  HiLink fglString	String
-  HiLink fglType	Type
+HiLink fglComment	Comment
+"HiLink fglKeyword	fglSpecial
+HiLink fglKeyword	fglStatement
+HiLink fglNumber	Number
+HiLink fglOperator	fglStatement
+HiLink fglSpecial	Special
+HiLink fglStatement	Statement
+HiLink fglString	String
+HiLink fglType	Type
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "fgl"
 
diff --git a/runtime/syntax/flexwiki.vim b/runtime/syntax/flexwiki.vim
index 34f893d927..6b15ab2d90 100644
--- a/runtime/syntax/flexwiki.vim
+++ b/runtime/syntax/flexwiki.vim
@@ -14,10 +14,8 @@
 " regexes, which use a different syntax than Vim (fewer \s).
 " The primary test case is FlexWiki\FormattingRules.wiki
 
-" Quit if syntax file is already loaded
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
diff --git a/runtime/syntax/focexec.vim b/runtime/syntax/focexec.vim
index 8be1b65cc4..54f4c0d55a 100644
--- a/runtime/syntax/focexec.vim
+++ b/runtime/syntax/focexec.vim
@@ -11,11 +11,8 @@
 " I think some of these things should get different hilights -
 "  should MODIFY commands look different than TABLE?
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -69,32 +66,24 @@ syn match   focexecNumber	"\<\d\+\.\d*\>"
 syn match   focexecComment	"-\*.*"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_focexec_syntax_inits")
-  if version < 508
-    let did_focexec_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink focexecString1		String
-  HiLink focexecString2		String
-  HiLink focexecNumber		Number
-  HiLink focexecComment		Comment
-  HiLink focexecTable		Keyword
-  HiLink focexecModify		Keyword
-  HiLink focexecNormal		Keyword
-  HiLink focexecSet		Keyword
-  HiLink focexecDash		Keyword
-  HiLink focexecFileDef		Keyword
-  HiLink focexecJoin		Keyword
-  HiLink focexecAmperVar	Identifier
-  HiLink focexecFuse		Function
+HiLink focexecString1		String
+HiLink focexecString2		String
+HiLink focexecNumber		Number
+HiLink focexecComment		Comment
+HiLink focexecTable		Keyword
+HiLink focexecModify		Keyword
+HiLink focexecNormal		Keyword
+HiLink focexecSet		Keyword
+HiLink focexecDash		Keyword
+HiLink focexecFileDef		Keyword
+HiLink focexecJoin		Keyword
+HiLink focexecAmperVar	Identifier
+HiLink focexecFuse		Function
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "focexec"
 
diff --git a/runtime/syntax/form.vim b/runtime/syntax/form.vim
index 19a47ed6b9..abd1c489dd 100644
--- a/runtime/syntax/form.vim
+++ b/runtime/syntax/form.vim
@@ -11,11 +11,8 @@
 " This syntax file is still in development. Please send suggestions
 " to the maintainer.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -109,49 +106,41 @@ syn match   formDirective	"^\=\.[a-zA-z][a-zA-Z0-9]*\>"
 syn sync ccomment formComment minlines=10
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_form_syn_inits")
-  if version < 508
-    let did_form_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink formConditional	Conditional
-  HiLink formNumber		Number
-  HiLink formStatement		Statement
-  HiLink formComment		Comment
-  HiLink formPreProc		PreProc
-  HiLink formDirective		PreProc
-  HiLink formType		Type
-  HiLink formString		String
-  HiLink formNestedString	String
-  HiLink formReserved           Error
-  HiLink formTodo               Todo
-  HiLink formSpecial            SpecialChar
+HiLink formConditional	Conditional
+HiLink formNumber		Number
+HiLink formStatement		Statement
+HiLink formComment		Comment
+HiLink formPreProc		PreProc
+HiLink formDirective		PreProc
+HiLink formType		Type
+HiLink formString		String
+HiLink formNestedString	String
+HiLink formReserved           Error
+HiLink formTodo               Todo
+HiLink formSpecial            SpecialChar
 
-  if !exists("form_enhanced_color")
-    HiLink formHeaderStatement	Statement
-  else
-  " enhanced color mode
-    HiLink formHeaderStatement	HeaderStatement
-    " dark and a light background for local types
-    if &background == "dark"
-      hi HeaderStatement term=underline ctermfg=LightGreen guifg=LightGreen gui=bold
-    else
-      hi HeaderStatement term=underline ctermfg=DarkGreen guifg=SeaGreen gui=bold
-    endif
-    " change slightly the default for dark gvim
-    if has("gui_running") && &background == "dark"
-      hi Conditional guifg=LightBlue gui=bold
-      hi Statement guifg=LightYellow
-    endif
-  endif
-
-  delcommand HiLink
+if !exists("form_enhanced_color")
+HiLink formHeaderStatement	Statement
+else
+" enhanced color mode
+HiLink formHeaderStatement	HeaderStatement
+" dark and a light background for local types
+if &background == "dark"
+hi HeaderStatement term=underline ctermfg=LightGreen guifg=LightGreen gui=bold
+else
+hi HeaderStatement term=underline ctermfg=DarkGreen guifg=SeaGreen gui=bold
 endif
+" change slightly the default for dark gvim
+if has("gui_running") && &background == "dark"
+hi Conditional guifg=LightBlue gui=bold
+hi Statement guifg=LightYellow
+endif
+endif
+
+delcommand HiLink
 
   let b:current_syntax = "form"
 
diff --git a/runtime/syntax/forth.vim b/runtime/syntax/forth.vim
index 99e9400b95..2559779f54 100644
--- a/runtime/syntax/forth.vim
+++ b/runtime/syntax/forth.vim
@@ -80,11 +80,8 @@
 "
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
@@ -104,11 +101,7 @@ syn match forthTodo contained 'Copyright\(\s([Cc])\)\=\(\s[0-9]\{2,4}\)\='
 
 " Characters allowed in keywords
 " I don't know if 128-255 are allowed in ANS-FORTH
-if version >= 600
-    setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255
-else
-    set iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255
-endif
+setlocal iskeyword=!,@,33-35,%,$,38-64,A-Z,91-96,a-z,123-126,128-255
 
 " when wanted, highlight trailing white space
 if exists("forth_space_errors")
@@ -289,56 +282,48 @@ syn match forthLocals '{ }' " otherwise, at least two spaces between
 syn region forthDeprecated start='locals|' end='|'
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_forth_syn_inits")
-    if version < 508
-	let did_forth_syn_inits = 1
-	command -nargs=+ HiLink hi link <args>
-    else
-	command -nargs=+ HiLink hi def link <args>
-    endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-    " The default methods for highlighting. Can be overridden later.
-    HiLink forthTodo Todo
-    HiLink forthOperators Operator
-    HiLink forthMath Number
-    HiLink forthInteger Number
-    HiLink forthFloat Float
-    HiLink forthStack Special
-    HiLink forthRstack Special
-    HiLink forthFStack Special
-    HiLink forthSP Special
-    HiLink forthMemory Function
-    HiLink forthAdrArith Function
-    HiLink forthMemBlks Function
-    HiLink forthCond Conditional
-    HiLink forthLoop Repeat
-    HiLink forthColonDef Define
-    HiLink forthEndOfColonDef Define
-    HiLink forthDefine Define
-    HiLink forthDebug Debug
-    HiLink forthAssembler Include
-    HiLink forthCharOps Character
-    HiLink forthConversion String
-    HiLink forthForth Statement
-    HiLink forthVocs Statement
-    HiLink forthString String
-    HiLink forthComment Comment
-    HiLink forthClassDef Define
-    HiLink forthEndOfClassDef Define
-    HiLink forthObjectDef Define
-    HiLink forthEndOfObjectDef Define
-    HiLink forthInclude Include
-    HiLink forthLocals Type " nothing else uses type and locals must stand out
-    HiLink forthDeprecated Error " if you must, change to Type
-    HiLink forthFileMode Function
-    HiLink forthFileWords Statement
-    HiLink forthBlocks Statement
-    HiLink forthSpaceError Error
+" The default methods for highlighting. Can be overridden later.
+HiLink forthTodo Todo
+HiLink forthOperators Operator
+HiLink forthMath Number
+HiLink forthInteger Number
+HiLink forthFloat Float
+HiLink forthStack Special
+HiLink forthRstack Special
+HiLink forthFStack Special
+HiLink forthSP Special
+HiLink forthMemory Function
+HiLink forthAdrArith Function
+HiLink forthMemBlks Function
+HiLink forthCond Conditional
+HiLink forthLoop Repeat
+HiLink forthColonDef Define
+HiLink forthEndOfColonDef Define
+HiLink forthDefine Define
+HiLink forthDebug Debug
+HiLink forthAssembler Include
+HiLink forthCharOps Character
+HiLink forthConversion String
+HiLink forthForth Statement
+HiLink forthVocs Statement
+HiLink forthString String
+HiLink forthComment Comment
+HiLink forthClassDef Define
+HiLink forthEndOfClassDef Define
+HiLink forthObjectDef Define
+HiLink forthEndOfObjectDef Define
+HiLink forthInclude Include
+HiLink forthLocals Type " nothing else uses type and locals must stand out
+HiLink forthDeprecated Error " if you must, change to Type
+HiLink forthFileMode Function
+HiLink forthFileWords Statement
+HiLink forthBlocks Statement
+HiLink forthSpaceError Error
 
-    delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "forth"
 
diff --git a/runtime/syntax/fortran.vim b/runtime/syntax/fortran.vim
index 06e5390c60..0b56f5b3ad 100644
--- a/runtime/syntax/fortran.vim
+++ b/runtime/syntax/fortran.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
 " Version:	0.98
-" Last Change:	2016 Aug. 26
+" Last Change:	2016 Aug. 29
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
 " Usage:	For instructions, do :help fortran-syntax from Vim
 " Credits:
@@ -11,7 +11,7 @@
 "  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 and Vishnu Krishnan.
+"  Stefano Zaghi and Vishnu V. Krishnan.
 
 if exists("b:current_syntax")
   finish
@@ -368,6 +368,7 @@ else
 endif
 
 syn match fortranComment	excludenl "!.*$" contains=@fortranCommentGroup,@spell
+syn match fortranOpenMP		excludenl 		"^\s*!\$\(OMP\)\=\s.*$"
 
 "cpp is often used with Fortran
 syn match	cPreProc		"^\s*#\s*\(define\|ifdef\)\>.*"
@@ -517,6 +518,7 @@ hi def link cIncluded		fortranString
 hi def link cInclude		Include
 hi def link cPreProc		PreProc
 hi def link cPreCondit		PreCondit
+hi def link fortranOpenMP       PreProc
 hi def link fortranParenError	Error
 hi def link fortranComment	Comment
 hi def link fortranSerialNumber	Todo
diff --git a/runtime/syntax/foxpro.vim b/runtime/syntax/foxpro.vim
index ca5d7e2f9d..b329368b34 100644
--- a/runtime/syntax/foxpro.vim
+++ b/runtime/syntax/foxpro.vim
@@ -13,9 +13,8 @@
 " 		corrected highlighting of comments at end of line (&&)
 " 
 " 
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
@@ -691,37 +690,29 @@ syn match foxproParenErr ")"
 syn sync minlines=1 maxlines=3
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_foxpro_syn_inits")
-    if version < 508
-	let did_foxpro_syn_inits = 1
-	command -nargs=+ HiLink hi link <args>
-    else
-	command -nargs=+ HiLink hi def link <args>
-    endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-    HiLink foxproSpecial  Special
-    HiLink foxproAtSymbol Special
-    HiLink foxproAtCmd    Statement
-    HiLink foxproPreProc  PreProc
-    HiLink foxproFunc     Identifier
-    HiLink foxproCmd      Statement
-    HiLink foxproEnBlk    Type
-    HiLink foxproSysVar   String
-    HiLink foxproString   String
-    HiLink foxproConst    Constant
-    HiLink foxproNumber   Number
-    HiLink foxproFloat    Float
-    HiLink foxproComment  Comment
-    HiLink foxproParenErr Error
-    HiLink foxproCBConst  PreProc
-    HiLink foxproCBField  Special
-    HiLink foxproCBVar    Identifier
-    HiLink foxproCBWin    Special
-    HiLink foxproCBObject Identifier
+HiLink foxproSpecial  Special
+HiLink foxproAtSymbol Special
+HiLink foxproAtCmd    Statement
+HiLink foxproPreProc  PreProc
+HiLink foxproFunc     Identifier
+HiLink foxproCmd      Statement
+HiLink foxproEnBlk    Type
+HiLink foxproSysVar   String
+HiLink foxproString   String
+HiLink foxproConst    Constant
+HiLink foxproNumber   Number
+HiLink foxproFloat    Float
+HiLink foxproComment  Comment
+HiLink foxproParenErr Error
+HiLink foxproCBConst  PreProc
+HiLink foxproCBField  Special
+HiLink foxproCBVar    Identifier
+HiLink foxproCBWin    Special
+HiLink foxproCBObject Identifier
 
-    delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "foxpro"
diff --git a/runtime/syntax/fstab.vim b/runtime/syntax/fstab.vim
index 3006d21fea..a17fc809a5 100644
--- a/runtime/syntax/fstab.vim
+++ b/runtime/syntax/fstab.vim
@@ -19,9 +19,8 @@
 "   let fstab_unknown_device_errors = 0
 "     do not highlight unknown devices as errors
 
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
@@ -229,66 +228,59 @@ syn match fsFreqPass /\s\+.\{-}$/ contains=@fsFreqPassCluster,@fsGeneralCluster
 " Whole line comments
 syn match fsCommentLine /^#.*$/ contains=@Spell
 
-if version >= 508 || !exists("did_config_syntax_inits")
-	if version < 508
-		let did_config_syntax_inits = 1
-		command! -nargs=+ HiLink hi link <args>
-	else
-		command! -nargs=+ HiLink hi def link <args>
-	endif
+command! -nargs=+ HiLink hi def link <args>
 
-	HiLink fsOperator Operator
-	HiLink fsComment Comment
-	HiLink fsCommentLine Comment
+HiLink fsOperator Operator
+HiLink fsComment Comment
+HiLink fsCommentLine Comment
 
-	HiLink fsTypeKeyword Type
-	HiLink fsDeviceKeyword Identifier
-	HiLink fsDeviceLabel String
-	HiLink fsDeviceUUID String
-	HiLink fsDeviceSshfs String
-	HiLink fsFreqPassNumber Number
+HiLink fsTypeKeyword Type
+HiLink fsDeviceKeyword Identifier
+HiLink fsDeviceLabel String
+HiLink fsDeviceUUID String
+HiLink fsDeviceSshfs String
+HiLink fsFreqPassNumber Number
 
-	if exists('fstab_unknown_fs_errors') && fstab_unknown_fs_errors == 1
-		HiLink fsTypeUnknown Error
-	endif
-
-	if !exists('fstab_unknown_device_errors') || fstab_unknown_device_errors == 1
-		HiLink fsDeviceError Error
-	endif
-
-	HiLink fsMountPointError Error
-	HiLink fsMountPointKeyword Keyword
-	HiLink fsFreqPassError Error
-
-	HiLink fsOptionsGeneral Type
-	HiLink fsOptionsKeywords Keyword
-	HiLink fsOptionsNumber Number
-	HiLink fsOptionsNumberOctal Number
-	HiLink fsOptionsString String
-	HiLink fsOptionsSize Number
-	HiLink fsOptionsExt2Check String
-	HiLink fsOptionsExt2Errors String
-	HiLink fsOptionsExt3Journal String
-	HiLink fsOptionsExt3Data String
-	HiLink fsOptionsExt4Journal String
-	HiLink fsOptionsExt4Data String
-	HiLink fsOptionsExt4Barrier Number
-	HiLink fsOptionsFatCheck String
-	HiLink fsOptionsConv String
-	HiLink fsOptionsFatType Number
-	HiLink fsOptionsYesNo String
-	HiLink fsOptionsHpfsCase String
-	HiLink fsOptionsIsoMap String
-	HiLink fsOptionsReiserHash String
-	HiLink fsOptionsSshYesNoAsk String
-	HiLink fsOptionsUfsType String
-	HiLink fsOptionsUfsError String
-
-	HiLink fsOptionsVfatShortname String
-
-	delcommand HiLink
+if exists('fstab_unknown_fs_errors') && fstab_unknown_fs_errors == 1
+HiLink fsTypeUnknown Error
 endif
 
+if !exists('fstab_unknown_device_errors') || fstab_unknown_device_errors == 1
+HiLink fsDeviceError Error
+endif
+
+HiLink fsMountPointError Error
+HiLink fsMountPointKeyword Keyword
+HiLink fsFreqPassError Error
+
+HiLink fsOptionsGeneral Type
+HiLink fsOptionsKeywords Keyword
+HiLink fsOptionsNumber Number
+HiLink fsOptionsNumberOctal Number
+HiLink fsOptionsString String
+HiLink fsOptionsSize Number
+HiLink fsOptionsExt2Check String
+HiLink fsOptionsExt2Errors String
+HiLink fsOptionsExt3Journal String
+HiLink fsOptionsExt3Data String
+HiLink fsOptionsExt4Journal String
+HiLink fsOptionsExt4Data String
+HiLink fsOptionsExt4Barrier Number
+HiLink fsOptionsFatCheck String
+HiLink fsOptionsConv String
+HiLink fsOptionsFatType Number
+HiLink fsOptionsYesNo String
+HiLink fsOptionsHpfsCase String
+HiLink fsOptionsIsoMap String
+HiLink fsOptionsReiserHash String
+HiLink fsOptionsSshYesNoAsk String
+HiLink fsOptionsUfsType String
+HiLink fsOptionsUfsError String
+
+HiLink fsOptionsVfatShortname String
+
+delcommand HiLink
+
 let b:current_syntax = "fstab"
 
 let &cpo = s:cpo_save
diff --git a/runtime/syntax/fvwm2m4.vim b/runtime/syntax/fvwm2m4.vim
index 243da18fa7..e296273e31 100644
--- a/runtime/syntax/fvwm2m4.vim
+++ b/runtime/syntax/fvwm2m4.vim
@@ -5,12 +5,9 @@
 " URI: http://physics.muni.cz/~yeti/download/syntax/fvwmm4.vim
 
 " Setup
-if version >= 600
-  if exists('b:current_syntax')
-    finish
-  endif
-else
-  syntax clear
+" quit when a syntax file was already loaded
+if exists('b:current_syntax')
+  finish
 endif
 
 " Let included files know they are included
@@ -19,19 +16,11 @@ if !exists('main_syntax')
 endif
 
 " Include M4 syntax
-if version >= 600
-  runtime! syntax/m4.vim
-else
-  so <sfile>:p:h/m4.vim
-endif
+runtime! syntax/m4.vim
 unlet b:current_syntax
 
 " Include Fvwm2 syntax (Fvwm1 doesn't have M4 preprocessor)
-if version >= 600
-  runtime! syntax/fvwm.vim
-else
-  so <sfile>:p:h/fvwm.vim
-endif
+runtime! syntax/fvwm.vim
 unlet b:current_syntax
 
 " That's all!
diff --git a/runtime/syntax/gdb.vim b/runtime/syntax/gdb.vim
index 64e89cce7f..677f948172 100644
--- a/runtime/syntax/gdb.vim
+++ b/runtime/syntax/gdb.vim
@@ -4,11 +4,8 @@
 " URL:		http://www.fleiner.com/vim/syntax/gdb.vim
 " Last Change:	2012 Oct 05
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -87,27 +84,19 @@ endif
 exec "syn sync ccomment gdbComment minlines=" . gdb_minlines
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_gdb_syn_inits")
-  if version < 508
-    let did_gdb_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink gdbFuncDef	Function
-  HiLink gdbComment	Comment
-  HiLink gdbStatement	Statement
-  HiLink gdbString	String
-  HiLink gdbCharacter	Character
-  HiLink gdbVariable	Identifier
-  HiLink gdbSet		Constant
-  HiLink gdbInfo	Type
-  HiLink gdbDocument	Special
-  HiLink gdbNumber	Number
-  delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+HiLink gdbFuncDef	Function
+HiLink gdbComment	Comment
+HiLink gdbStatement	Statement
+HiLink gdbString	String
+HiLink gdbCharacter	Character
+HiLink gdbVariable	Identifier
+HiLink gdbSet		Constant
+HiLink gdbInfo	Type
+HiLink gdbDocument	Special
+HiLink gdbNumber	Number
+delcommand HiLink
 
 let b:current_syntax = "gdb"
 
diff --git a/runtime/syntax/gdmo.vim b/runtime/syntax/gdmo.vim
index 86c6d5c76c..d9cebae1de 100644
--- a/runtime/syntax/gdmo.vim
+++ b/runtime/syntax/gdmo.vim
@@ -5,11 +5,8 @@
 " URL:		http://classicalprogrammer.wikidot.com/local--files/vim-syntax-file-for-gdmo/gdmo.vim
 " Last change:	8th June, 2011
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -64,32 +61,24 @@ syn match gdmoBraces     "[{}]"
 syn sync ccomment gdmoComment
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_gdmo_syntax_inits")
-  if version < 508
-    let did_gdmo_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink gdmoCategory	      Structure
-  HiLink gdmoRelationship     Macro
-  HiLink gdmoDefinition       Statement
-  HiLink gdmoReference	      Type
-  HiLink gdmoExtension	      Operator
-  HiLink gdmoBraces	      Function
-  HiLink gdmoSpecial	      Special
-  HiLink gdmoString	      String
-  HiLink gdmoCharacter	      Character
-  HiLink gdmoSpecialCharacter gdmoSpecial
-  HiLink gdmoComment	      Comment
-  HiLink gdmoLineComment      gdmoComment
-  HiLink gdmoType	      Type
+HiLink gdmoCategory	      Structure
+HiLink gdmoRelationship     Macro
+HiLink gdmoDefinition       Statement
+HiLink gdmoReference	      Type
+HiLink gdmoExtension	      Operator
+HiLink gdmoBraces	      Function
+HiLink gdmoSpecial	      Special
+HiLink gdmoString	      String
+HiLink gdmoCharacter	      Character
+HiLink gdmoSpecialCharacter gdmoSpecial
+HiLink gdmoComment	      Comment
+HiLink gdmoLineComment      gdmoComment
+HiLink gdmoType	      Type
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "gdmo"
 
diff --git a/runtime/syntax/gedcom.vim b/runtime/syntax/gedcom.vim
index 98851cc942..40a17863f8 100644
--- a/runtime/syntax/gedcom.vim
+++ b/runtime/syntax/gedcom.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Paul Johnson (pjcj@transeda.com)
 " Version 1.059 - 23rd December 1999
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -41,26 +38,18 @@ syntax match gedcom_date "\d\{1,2}\s\+\(jan\|feb\|mar\|apr\|may\|jun\|jul\|aug\|
 syntax match gedcom_date ".*" contained
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_gedcom_syntax_inits")
-  if version < 508
-    let did_gedcom_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink gedcom_record Statement
-  HiLink gedcom_id Comment
-  HiLink gedcom_ii PreProc
-  HiLink gedcom_in Type
-  HiLink gedcom_name PreProc
-  HiLink gedcom_cname Type
-  HiLink gedcom_surname Identifier
-  HiLink gedcom_date Constant
+HiLink gedcom_record Statement
+HiLink gedcom_id Comment
+HiLink gedcom_ii PreProc
+HiLink gedcom_in Type
+HiLink gedcom_name PreProc
+HiLink gedcom_cname Type
+HiLink gedcom_surname Identifier
+HiLink gedcom_date Constant
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "gedcom"
diff --git a/runtime/syntax/gitcommit.vim b/runtime/syntax/gitcommit.vim
index b0315a9465..5e0642fbcc 100644
--- a/runtime/syntax/gitcommit.vim
+++ b/runtime/syntax/gitcommit.vim
@@ -2,7 +2,7 @@
 " Language:	git commit file
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
 " Filenames:	*.git/COMMIT_EDITMSG
-" Last Change:	2013 May 30
+" Last Change:	2016 Aug 29
 
 if exists("b:current_syntax")
   finish
@@ -39,9 +39,10 @@ syn region  gitcommitDiscarded	start=/^# Change\%(s not staged for commit\|d but
 syn region  gitcommitSelected	start=/^# Changes to be committed:/ end=/^#$\|^#\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitSelectedType fold
 syn region  gitcommitUnmerged	start=/^# Unmerged paths:/ end=/^#$\|^#\@!/ contains=gitcommitHeader,gitcommitHead,gitcommitUnmergedType fold
 
-syn match   gitcommitDiscardedType	"\t\@<=[a-z][a-z ]*[a-z]: "he=e-2	contained containedin=gitcommitComment nextgroup=gitcommitDiscardedFile skipwhite
-syn match   gitcommitSelectedType	"\t\@<=[a-z][a-z ]*[a-z]: "he=e-2	contained containedin=gitcommitComment nextgroup=gitcommitSelectedFile skipwhite
-syn match   gitcommitUnmergedType	"\t\@<=[a-z][a-z ]*[a-z]: "he=e-2	contained containedin=gitcommitComment nextgroup=gitcommitUnmergedFile skipwhite
+
+syn match   gitcommitDiscardedType	"\t\@<=[[:lower:]][^:]*[[:lower:]]: "he=e-2	contained containedin=gitcommitComment nextgroup=gitcommitDiscardedFile skipwhite
+syn match   gitcommitSelectedType	"\t\@<=[[:lower:]][^:]*[[:lower:]]: "he=e-2	contained containedin=gitcommitComment nextgroup=gitcommitSelectedFile skipwhite
+syn match   gitcommitUnmergedType	"\t\@<=[[:lower:]][^:]*[[:lower:]]: "he=e-2	contained containedin=gitcommitComment nextgroup=gitcommitUnmergedFile skipwhite
 syn match   gitcommitDiscardedFile	".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitDiscardedArrow
 syn match   gitcommitSelectedFile	".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitSelectedArrow
 syn match   gitcommitUnmergedFile	".\{-\}\%($\| -> \)\@=" contained nextgroup=gitcommitSelectedArrow
diff --git a/runtime/syntax/gitrebase.vim b/runtime/syntax/gitrebase.vim
index a7460280d3..a944c14dd7 100644
--- a/runtime/syntax/gitrebase.vim
+++ b/runtime/syntax/gitrebase.vim
@@ -2,7 +2,7 @@
 " Language:	git rebase --interactive
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
 " Filenames:	git-rebase-todo
-" Last Change:	2013 May 30
+" Last Change:	2016 Aug 29
 
 if exists("b:current_syntax")
   finish
@@ -18,6 +18,7 @@ syn match   gitrebaseEdit   "\v^e%(dit)=>"   nextgroup=gitrebaseCommit skipwhite
 syn match   gitrebaseSquash "\v^s%(quash)=>" nextgroup=gitrebaseCommit skipwhite
 syn match   gitrebaseFixup  "\v^f%(ixup)=>"  nextgroup=gitrebaseCommit skipwhite
 syn match   gitrebaseExec   "\v^%(x|exec)>" nextgroup=gitrebaseCommand skipwhite
+syn match   gitrebaseDrop   "\v^d%(rop)=>"   nextgroup=gitrebaseCommit skipwhite
 syn match   gitrebaseSummary ".*"               contains=gitrebaseHash contained
 syn match   gitrebaseCommand ".*"                                      contained
 syn match   gitrebaseComment "^#.*"             contains=gitrebaseHash
@@ -31,6 +32,7 @@ hi def link gitrebaseEdit           PreProc
 hi def link gitrebaseSquash         Type
 hi def link gitrebaseFixup          Special
 hi def link gitrebaseExec           Function
+hi def link gitrebaseDrop           Comment
 hi def link gitrebaseSummary        String
 hi def link gitrebaseComment        Comment
 hi def link gitrebaseSquashError    Error
diff --git a/runtime/syntax/gitsendemail.vim b/runtime/syntax/gitsendemail.vim
index 8b938116fa..8fdf6839c8 100644
--- a/runtime/syntax/gitsendemail.vim
+++ b/runtime/syntax/gitsendemail.vim
@@ -1,14 +1,18 @@
 " Vim syntax file
 " Language:	git send-email message
 " Maintainer:	Tim Pope
-" Filenames:	*.msg.[0-9]* (first line is "From ... # This line is ignored.")
-" Last Change:	2010 May 21
+" Filenames:	.gitsendemail.*
+" Last Change:	2016 Aug 29
 
 if exists("b:current_syntax")
   finish
 endif
 
 runtime! syntax/mail.vim
+unlet! b:current_syntax
+syn include @gitsendemailDiff syntax/diff.vim
+syn region gitsendemailDiff start=/\%(^diff --\%(git\|cc\|combined\) \)\@=/ end=/^-- %/ fold contains=@gitsendemailDiff
+
 syn case match
 
 syn match   gitsendemailComment "\%^From.*#.*"
diff --git a/runtime/syntax/gkrellmrc.vim b/runtime/syntax/gkrellmrc.vim
index 6ce1238416..9840a90346 100644
--- a/runtime/syntax/gkrellmrc.vim
+++ b/runtime/syntax/gkrellmrc.vim
@@ -6,19 +6,12 @@
 " URL: http://trific.ath.cx/Ftp/vim/syntax/gkrellmrc.vim
 
 " Setup
-if version >= 600
-	if exists("b:current_syntax")
-		finish
-	endif
-else
-	syntax clear
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
 endif
 
-if version >= 600
-	setlocal iskeyword=_,-,a-z,A-Z,48-57
-else
-	set iskeyword=_,-,a-z,A-Z,48-57
-endif
+setlocal iskeyword=_,-,a-z,A-Z,48-57
 
 syn case match
 
@@ -55,37 +48,30 @@ syn keyword gkrellmrcStyleCmd StyleMeter StyleChart StylePanel
 syn keyword gkrellmrcStyleItem textcolor alt_textcolor font alt_font transparency border label_position margin margins left_margin right_margin top_margin bottom_margin krell_depth krell_yoff krell_x_hot krell_expand krell_left_margin krell_right_margin
 
 " Define the default highlighting
-if version >= 508 || !exists("did_gtkrc_syntax_inits")
-	if version < 508
-		let did_gtkrc_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink gkrellmrcComment Comment
-	HiLink gkrellmrcFixme Todo
+HiLink gkrellmrcComment Comment
+HiLink gkrellmrcFixme Todo
 
-	HiLink gkrellmrcString gkrellmrcConstant
-	HiLink gkrellmrcNumber gkrellmrcConstant
-	HiLink gkrellmrcRGBColor gkrellmrcConstant
-	HiLink gkrellmrcExpandMode gkrellmrcConstant
-	HiLink gkrellmrcConstant Constant
+HiLink gkrellmrcString gkrellmrcConstant
+HiLink gkrellmrcNumber gkrellmrcConstant
+HiLink gkrellmrcRGBColor gkrellmrcConstant
+HiLink gkrellmrcExpandMode gkrellmrcConstant
+HiLink gkrellmrcConstant Constant
 
-	HiLink gkrellmrcMeterName gkrellmrcClass
-	HiLink gkrellmrcChartName gkrellmrcClass
-	HiLink gkrellmrcSpecialClassName gkrellmrcClass
-	HiLink gkrellmrcClass Type
+HiLink gkrellmrcMeterName gkrellmrcClass
+HiLink gkrellmrcChartName gkrellmrcClass
+HiLink gkrellmrcSpecialClassName gkrellmrcClass
+HiLink gkrellmrcClass Type
 
-	HiLink gkrellmrcGlobal gkrellmrcItem
-	HiLink gkrellmrcBuiltinExt gkrellmrcItem
-	HiLink gkrellmrcStyleItem gkrellmrcItem
-	HiLink gkrellmrcItem Function
+HiLink gkrellmrcGlobal gkrellmrcItem
+HiLink gkrellmrcBuiltinExt gkrellmrcItem
+HiLink gkrellmrcStyleItem gkrellmrcItem
+HiLink gkrellmrcItem Function
 
-	HiLink gkrellmrcSetCmd Special
-	HiLink gkrellmrcStyleCmd Statement
+HiLink gkrellmrcSetCmd Special
+HiLink gkrellmrcStyleCmd Statement
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "gkrellmrc"
diff --git a/runtime/syntax/gnash.vim b/runtime/syntax/gnash.vim
index f9e2b519a5..cce522dd86 100644
--- a/runtime/syntax/gnash.vim
+++ b/runtime/syntax/gnash.vim
@@ -15,11 +15,8 @@
 "		Vim is Charityware, see ":help Uganda"
 "
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax") || &compatible
+" quit when a syntax file was already loaded
+if exists("b:current_syntax") || &compatible
     finish
 endif
 
diff --git a/runtime/syntax/gnuplot.vim b/runtime/syntax/gnuplot.vim
index d85932d401..38aadffa28 100644
--- a/runtime/syntax/gnuplot.vim
+++ b/runtime/syntax/gnuplot.vim
@@ -20,9 +20,8 @@
 " For vim version 5.x: Clear all syntax items
 " For vim version 6.x: Quit when a syntax file was already loaded
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -501,54 +500,46 @@ syn keyword gnuplotStatement	shell splot spstats stats system test undefine
 syn keyword gnuplotStatement	unset update
 
 " ---- Define the default highlighting ---- "
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_gnuplot_syntax_inits")
-  if version < 508
-    let did_gnuplot_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " ---- Comments ---- "
-  HiLink gnuplotComment		Comment
+" ---- Comments ---- "
+HiLink gnuplotComment		Comment
 
-  " ---- Constants ---- "
-  HiLink gnuplotString		String
-  HiLink gnuplotNumber		Number
-  HiLink gnuplotFloat		Float
+" ---- Constants ---- "
+HiLink gnuplotString		String
+HiLink gnuplotNumber		Number
+HiLink gnuplotFloat		Float
 
-  " ---- Identifiers ---- "
-  HiLink gnuplotIdentifier	Identifier
+" ---- Identifiers ---- "
+HiLink gnuplotIdentifier	Identifier
 
-  " ---- Statements ---- "
-  HiLink gnuplotConditional	Conditional
-  HiLink gnuplotRepeat		Repeat
-  HiLink gnuplotKeyword		Keyword
-  HiLink gnuplotOperator	Operator
+" ---- Statements ---- "
+HiLink gnuplotConditional	Conditional
+HiLink gnuplotRepeat		Repeat
+HiLink gnuplotKeyword		Keyword
+HiLink gnuplotOperator	Operator
 
-  " ---- PreProcs ---- "
-  HiLink gnuplotMacro		Macro
+" ---- PreProcs ---- "
+HiLink gnuplotMacro		Macro
 
-  " ---- Types ---- "
-  HiLink gnuplotStatement	Type
-  HiLink gnuplotFunc		Identifier
+" ---- Types ---- "
+HiLink gnuplotStatement	Type
+HiLink gnuplotFunc		Identifier
 
-  " ---- Specials ---- "
-  HiLink gnuplotSpecial		Special
-  HiLink gnuplotUnit		Special
-  HiLink gnuplotExternal	Special
+" ---- Specials ---- "
+HiLink gnuplotSpecial		Special
+HiLink gnuplotUnit		Special
+HiLink gnuplotExternal	Special
 
-  " ---- Errors ---- "
-  HiLink gnuplotError		Error
-  HiLink gnuplotOctalError	Error
+" ---- Errors ---- "
+HiLink gnuplotError		Error
+HiLink gnuplotOctalError	Error
 
-  " ---- Todos ---- "
-  HiLink gnuplotTodo		Todo
+" ---- Todos ---- "
+HiLink gnuplotTodo		Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "gnuplot"
 
diff --git a/runtime/syntax/gp.vim b/runtime/syntax/gp.vim
index f46a465215..2e898dad5d 100644
--- a/runtime/syntax/gp.vim
+++ b/runtime/syntax/gp.vim
@@ -4,9 +4,8 @@
 " Last change:	2012 Jan 08
 " URL:		http://pari.math.u-bordeaux.fr
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -59,33 +58,26 @@ syntax region gpParen		transparent start='(' end=')' contains=ALLBUT,gpParenErro
 syntax match gpParenError	")"
 syntax match gpInParen contained "[{}]"
 
-if version >= 508 || !exists("did_gp_syn_inits")
-  if version < 508
-    let did_gp_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink gpConditional		Conditional
-  HiLink gpRepeat		Repeat
-  HiLink gpError		Error
-  HiLink gpParenError		gpError
-  HiLink gpInParen		gpError
-  HiLink gpStatement		Statement
-  HiLink gpString		String
-  HiLink gpComment		Comment
-  HiLink gpInterface		Type
-  HiLink gpInput		Type
-  HiLink gpInterfaceKey		Statement
-  HiLink gpFunction		Function
-  HiLink gpScope		Type
-  " contained ones
-  HiLink gpSpecial		Special
-  HiLink gpTodo			Todo
-  HiLink gpArgs			Type
-  delcommand HiLink
-endif
+HiLink gpConditional		Conditional
+HiLink gpRepeat		Repeat
+HiLink gpError		Error
+HiLink gpParenError		gpError
+HiLink gpInParen		gpError
+HiLink gpStatement		Statement
+HiLink gpString		String
+HiLink gpComment		Comment
+HiLink gpInterface		Type
+HiLink gpInput		Type
+HiLink gpInterfaceKey		Statement
+HiLink gpFunction		Function
+HiLink gpScope		Type
+" contained ones
+HiLink gpSpecial		Special
+HiLink gpTodo			Todo
+HiLink gpArgs			Type
+delcommand HiLink
 
 let b:current_syntax = "gp"
 let &cpo = s:cpo_save
diff --git a/runtime/syntax/grads.vim b/runtime/syntax/grads.vim
index 0b88549d40..0f09483fed 100644
--- a/runtime/syntax/grads.vim
+++ b/runtime/syntax/grads.vim
@@ -7,11 +7,8 @@
 " This syntax file defines highlighting for only very few features of
 " the GrADS scripting language.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -53,34 +50,26 @@ syn match gradsComment	"\*.*"
 " syn match gradsTypos	"!="
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't hgs highlighting+yet
-if version >= 508 || !exists("did_gs_syn_inits")
-  if version < 508
-	let did_gs_syn_inits = 1
-	command -nargs=+ HiLink hi link <args>
-  else
-	command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't hgs highlighting+yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink gradsStatement		Statement
+HiLink gradsStatement		Statement
 
-  HiLink gradsString		String
-  HiLink gradsNumber		Number
+HiLink gradsString		String
+HiLink gradsNumber		Number
 
-  HiLink gradsFixVariables	Special
-  HiLink gradsVariables		Identifier
-  HiLink gradsglobalVariables	Special
-  HiLink gradsConst		Special
+HiLink gradsFixVariables	Special
+HiLink gradsVariables		Identifier
+HiLink gradsglobalVariables	Special
+HiLink gradsConst		Special
 
-  HiLink gradsClassMethods	Function
+HiLink gradsClassMethods	Function
 
-  HiLink gradsOperator		Operator
-  HiLink gradsComment		Comment
+HiLink gradsOperator		Operator
+HiLink gradsComment		Comment
 
-  HiLink gradsTypos		Error
+HiLink gradsTypos		Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "grads"
diff --git a/runtime/syntax/gretl.vim b/runtime/syntax/gretl.vim
index 37299b894a..40eb544610 100644
--- a/runtime/syntax/gretl.vim
+++ b/runtime/syntax/gretl.vim
@@ -4,20 +4,13 @@
 " Last Change:  2006 Apr 30
 " Filenames:	*.inp *.gretl
 " URL:	http://uosis.mif.vu.lt/~zemlys/vim-syntax/gretl.vim
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
-if version >= 600
-  setlocal iskeyword=@,48-57,_,.
-else
-  set iskeyword=@,48-57,_,.
-endif
+setlocal iskeyword=@,48-57,_,.
 
 syn case match
 
@@ -68,34 +61,26 @@ syn match gBCend /\*)/
 syn region gBlockComment matchgroup=gCommentStart start="(\*" end="\*)"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_r_syn_inits")
-  if version < 508
-    let did_r_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink gComment      Comment
-  HiLink gCommentStart Comment
-  HiLink gBlockComment Comment
-  HiLink gString       String
-  HiLink gNumber       Number
-  HiLink gBoolean      Boolean
-  HiLink gFloat        Float
-  HiLink gCommands     Repeat	
-  HiLink gGenrFunc     Type
-  HiLink gDelimiter    Delimiter
-  HiLink gError        Error
-  HiLink gBraceError   Error
-  HiLink gCurlyError   Error
-  HiLink gParenError   Error
-  HiLink gIdentifier   Normal
-  HiLink gVariable     Identifier
-  HiLink gArrow	       Repeat
-  delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+HiLink gComment      Comment
+HiLink gCommentStart Comment
+HiLink gBlockComment Comment
+HiLink gString       String
+HiLink gNumber       Number
+HiLink gBoolean      Boolean
+HiLink gFloat        Float
+HiLink gCommands     Repeat	
+HiLink gGenrFunc     Type
+HiLink gDelimiter    Delimiter
+HiLink gError        Error
+HiLink gBraceError   Error
+HiLink gCurlyError   Error
+HiLink gParenError   Error
+HiLink gIdentifier   Normal
+HiLink gVariable     Identifier
+HiLink gArrow	       Repeat
+delcommand HiLink
 
 let b:current_syntax="gretl"
 
diff --git a/runtime/syntax/groovy.vim b/runtime/syntax/groovy.vim
index dc39677724..84e3779e75 100644
--- a/runtime/syntax/groovy.vim
+++ b/runtime/syntax/groovy.vim
@@ -44,11 +44,9 @@
 " Let me know if you like it or send me patches, so that I can improve it
 " when I have time
 
-" Quit when a syntax file was already loaded
+" quit when a syntax file was already loaded
 if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
+  if exists("b:current_syntax")
     finish
   endif
   " we define it here so that included files can test for it
@@ -59,11 +57,7 @@ let s:cpo_save = &cpo
 set cpo&vim
 
 " don't use standard HiLink, it will not work with included syntax files
-if version < 508
-  command! -nargs=+ GroovyHiLink hi link <args>
-else
-  command! -nargs=+ GroovyHiLink hi def link <args>
-endif
+command! -nargs=+ GroovyHiLink hi def link <args>
 
 " ##########################
 " Java stuff taken from java.vim
@@ -329,23 +323,21 @@ if exists("groovy_highlight_debug")
 
   syn cluster groovyTop add=groovyDebug
 
-  if version >= 508 || !exists("did_c_syn_inits")
-    GroovyHiLink groovyDebug                 Debug
-    GroovyHiLink groovyDebugString           DebugString
-    GroovyHiLink groovyDebugStringError      groovyError
-    GroovyHiLink groovyDebugType             DebugType
-    GroovyHiLink groovyDebugBoolean          DebugBoolean
-    GroovyHiLink groovyDebugNumber           Debug
-    GroovyHiLink groovyDebugSpecial          DebugSpecial
-    GroovyHiLink groovyDebugSpecialCharacter DebugSpecial
-    GroovyHiLink groovyDebugCharacter        DebugString
-    GroovyHiLink groovyDebugParen            Debug
+  GroovyHiLink groovyDebug                 Debug
+  GroovyHiLink groovyDebugString           DebugString
+  GroovyHiLink groovyDebugStringError      groovyError
+  GroovyHiLink groovyDebugType             DebugType
+  GroovyHiLink groovyDebugBoolean          DebugBoolean
+  GroovyHiLink groovyDebugNumber           Debug
+  GroovyHiLink groovyDebugSpecial          DebugSpecial
+  GroovyHiLink groovyDebugSpecialCharacter DebugSpecial
+  GroovyHiLink groovyDebugCharacter        DebugString
+  GroovyHiLink groovyDebugParen            Debug
 
-    GroovyHiLink DebugString               String
-    GroovyHiLink DebugSpecial              Special
-    GroovyHiLink DebugBoolean              Boolean
-    GroovyHiLink DebugType                 Type
-  endif
+  GroovyHiLink DebugString               String
+  GroovyHiLink DebugSpecial              Special
+  GroovyHiLink DebugBoolean              Boolean
+  GroovyHiLink DebugType                 Type
 endif
 
 " Match all Exception classes
@@ -398,59 +390,54 @@ syn match   groovyParenError       "\]"
 
 " ###############################
 " java.vim default highlighting
-if version >= 508 || !exists("did_groovy_syn_inits")
-  if version < 508
-    let did_groovy_syn_inits = 1
-  endif
-  GroovyHiLink groovyFuncDef		Function
-  GroovyHiLink groovyBraces		Function
-  GroovyHiLink groovyBranch		Conditional
-  GroovyHiLink groovyUserLabelRef	groovyUserLabel
-  GroovyHiLink groovyLabel		Label
-  GroovyHiLink groovyUserLabel		Label
-  GroovyHiLink groovyConditional	Conditional
-  GroovyHiLink groovyRepeat		Repeat
-  GroovyHiLink groovyExceptions		Exception
-  GroovyHiLink groovyAssert 		Statement
-  GroovyHiLink groovyStorageClass	StorageClass
-  GroovyHiLink groovyMethodDecl		groovyStorageClass
-  GroovyHiLink groovyClassDecl		groovyStorageClass
-  GroovyHiLink groovyScopeDecl		groovyStorageClass
-  GroovyHiLink groovyBoolean		Boolean
-  GroovyHiLink groovySpecial		Special
-  GroovyHiLink groovySpecialError	Error
-  GroovyHiLink groovySpecialCharError	Error
-  GroovyHiLink groovyString		String
-  GroovyHiLink groovyRegexChar		String
-  GroovyHiLink groovyCharacter		Character
-  GroovyHiLink groovySpecialChar	SpecialChar
-  GroovyHiLink groovyNumber		Number
-  GroovyHiLink groovyError		Error
-  GroovyHiLink groovyStringError	Error
-  GroovyHiLink groovyStatement		Statement
-  GroovyHiLink groovyOperator		Operator
-  GroovyHiLink groovyComment		Comment
-  GroovyHiLink groovyDocComment		Comment
-  GroovyHiLink groovyLineComment	Comment
-  GroovyHiLink groovyConstant		Constant
-  GroovyHiLink groovyTypedef		Typedef
-  GroovyHiLink groovyTodo		Todo
+GroovyHiLink groovyFuncDef		Function
+GroovyHiLink groovyBraces		Function
+GroovyHiLink groovyBranch		Conditional
+GroovyHiLink groovyUserLabelRef	groovyUserLabel
+GroovyHiLink groovyLabel		Label
+GroovyHiLink groovyUserLabel		Label
+GroovyHiLink groovyConditional	Conditional
+GroovyHiLink groovyRepeat		Repeat
+GroovyHiLink groovyExceptions		Exception
+GroovyHiLink groovyAssert 		Statement
+GroovyHiLink groovyStorageClass	StorageClass
+GroovyHiLink groovyMethodDecl		groovyStorageClass
+GroovyHiLink groovyClassDecl		groovyStorageClass
+GroovyHiLink groovyScopeDecl		groovyStorageClass
+GroovyHiLink groovyBoolean		Boolean
+GroovyHiLink groovySpecial		Special
+GroovyHiLink groovySpecialError	Error
+GroovyHiLink groovySpecialCharError	Error
+GroovyHiLink groovyString		String
+GroovyHiLink groovyRegexChar		String
+GroovyHiLink groovyCharacter		Character
+GroovyHiLink groovySpecialChar	SpecialChar
+GroovyHiLink groovyNumber		Number
+GroovyHiLink groovyError		Error
+GroovyHiLink groovyStringError	Error
+GroovyHiLink groovyStatement		Statement
+GroovyHiLink groovyOperator		Operator
+GroovyHiLink groovyComment		Comment
+GroovyHiLink groovyDocComment		Comment
+GroovyHiLink groovyLineComment	Comment
+GroovyHiLink groovyConstant		Constant
+GroovyHiLink groovyTypedef		Typedef
+GroovyHiLink groovyTodo		Todo
 
-  GroovyHiLink groovyCommentTitle	SpecialComment
-  GroovyHiLink groovyDocTags		Special
-  GroovyHiLink groovyDocParam		Function
-  GroovyHiLink groovyCommentStar	groovyComment
+GroovyHiLink groovyCommentTitle	SpecialComment
+GroovyHiLink groovyDocTags		Special
+GroovyHiLink groovyDocParam		Function
+GroovyHiLink groovyCommentStar	groovyComment
 
-  GroovyHiLink groovyType		Type
-  GroovyHiLink groovyExternal		Include
+GroovyHiLink groovyType		Type
+GroovyHiLink groovyExternal		Include
 
-  GroovyHiLink htmlComment		Special
-  GroovyHiLink htmlCommentPart		Special
-  GroovyHiLink groovySpaceError		Error
-  GroovyHiLink groovyJDKBuiltin         Special
-  GroovyHiLink groovyJDKOperOverl       Operator
-  GroovyHiLink groovyJDKMethods         Function
-endif
+GroovyHiLink htmlComment		Special
+GroovyHiLink htmlCommentPart		Special
+GroovyHiLink groovySpaceError		Error
+GroovyHiLink groovyJDKBuiltin         Special
+GroovyHiLink groovyJDKOperOverl       Operator
+GroovyHiLink groovyJDKMethods         Function
 
 delcommand GroovyHiLink
 
diff --git a/runtime/syntax/gsp.vim b/runtime/syntax/gsp.vim
index e7b1b1632f..6270b2af64 100644
--- a/runtime/syntax/gsp.vim
+++ b/runtime/syntax/gsp.vim
@@ -5,11 +5,8 @@
 " Filenames:    *.gsp
 " URL:		http://www.constructicon.com/~nharward/vim/syntax/gsp.vim
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -18,21 +15,13 @@ if !exists("main_syntax")
 endif
 
 " Source HTML syntax
-if version < 600
-  source <sfile>:p:h/html.vim
-else
-  runtime! syntax/html.vim
-endif
+runtime! syntax/html.vim
 unlet b:current_syntax
 
 syn case match
 
 " Include Java syntax
-if version < 600
-  syn include @gspJava <sfile>:p:h/java.vim
-else
-  syn include @gspJava syntax/java.vim
-endif
+syn include @gspJava syntax/java.vim
 
 let s:cpo_save = &cpo
 set cpo&vim
diff --git a/runtime/syntax/gtkrc.vim b/runtime/syntax/gtkrc.vim
index 57054a21d3..e3a555006b 100644
--- a/runtime/syntax/gtkrc.vim
+++ b/runtime/syntax/gtkrc.vim
@@ -6,19 +6,12 @@
 " URL: http://trific.ath.cx/Ftp/vim/syntax/gtkrc.vim
 
 " Setup
-if version >= 600
-	if exists("b:current_syntax")
-		finish
-	endif
-else
-	syntax clear
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
 endif
 
-if version >= 600
-	setlocal iskeyword=_,-,a-z,A-Z,48-57
-else
-	set iskeyword=_,-,a-z,A-Z,48-57
-endif
+setlocal iskeyword=_,-,a-z,A-Z,48-57
 
 syn case match
 
@@ -86,57 +79,50 @@ syn sync minlines=50
 syn sync match gtkrcSyncClass groupthere NONE "^\s*class\>"
 
 " Define the default highlighting
-if version >= 508 || !exists("did_gtkrc_syntax_inits")
-	if version < 508
-		let did_gtkrc_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink gtkrcComment Comment
-	HiLink gtkrcFixme Todo
+HiLink gtkrcComment Comment
+HiLink gtkrcFixme Todo
 
-	HiLink gtkrcInclude Preproc
+HiLink gtkrcInclude Preproc
 
-	HiLink gtkrcACString gtkrcString
-	HiLink gtkrcBString gtkrcString
-	HiLink gtkrcString String
-	HiLink gtkrcNumber Number
-	HiLink gtkrcStateName gtkrcConstant
-	HiLink gtkrcPriorityName gtkrcConstant
-	HiLink gtkrcTextDirName gtkrcConstant
-	HiLink gtkrcSettingsName Function
-	HiLink gtkrcStockName Function
-	HiLink gtkrcConstant Constant
+HiLink gtkrcACString gtkrcString
+HiLink gtkrcBString gtkrcString
+HiLink gtkrcString String
+HiLink gtkrcNumber Number
+HiLink gtkrcStateName gtkrcConstant
+HiLink gtkrcPriorityName gtkrcConstant
+HiLink gtkrcTextDirName gtkrcConstant
+HiLink gtkrcSettingsName Function
+HiLink gtkrcStockName Function
+HiLink gtkrcConstant Constant
 
-	HiLink gtkrcPathSpecial gtkrcSpecial
-	HiLink gtkrcWPathSpecial gtkrcSpecial
-	HiLink gtkrcRGBColor gtkrcSpecial
-	HiLink gtkrcKeyMod gtkrcSpecial
-	HiLink gtkrcSpecial Special
+HiLink gtkrcPathSpecial gtkrcSpecial
+HiLink gtkrcWPathSpecial gtkrcSpecial
+HiLink gtkrcRGBColor gtkrcSpecial
+HiLink gtkrcKeyMod gtkrcSpecial
+HiLink gtkrcSpecial Special
 
-	HiLink gtkrcTop gtkrcKeyword
-	HiLink gtkrcPathSet gtkrcKeyword
-	HiLink gtkrcStyleKeyword gtkrcKeyword
-	HiLink gtkrcFunction gtkrcKeyword
-	HiLink gtkrcBind gtkrcKeyword
-	HiLink gtkrcKeyword Keyword
+HiLink gtkrcTop gtkrcKeyword
+HiLink gtkrcPathSet gtkrcKeyword
+HiLink gtkrcStyleKeyword gtkrcKeyword
+HiLink gtkrcFunction gtkrcKeyword
+HiLink gtkrcBind gtkrcKeyword
+HiLink gtkrcKeyword Keyword
 
-	HiLink gtkrcClassNameGnome gtkrcGtkClass
-	HiLink gtkrcClassName gtkrcGtkClass
-	HiLink gtkrcFunctionName gtkrcGtkClass
-	HiLink gtkrcGtkClass Type
+HiLink gtkrcClassNameGnome gtkrcGtkClass
+HiLink gtkrcClassName gtkrcGtkClass
+HiLink gtkrcFunctionName gtkrcGtkClass
+HiLink gtkrcGtkClass Type
 
-	HiLink gtkrcImage gtkrcOtherword
-	HiLink gtkrcOtherword Function
+HiLink gtkrcImage gtkrcOtherword
+HiLink gtkrcOtherword Function
 
-	HiLink gtkrcParenError gtkrcError
-	HiLink gtkrcBraceError gtkrcError
-	HiLink gtkrcBracketError gtkrcError
-	HiLink gtkrcError Error
+HiLink gtkrcParenError gtkrcError
+HiLink gtkrcBraceError gtkrcError
+HiLink gtkrcBracketError gtkrcError
+HiLink gtkrcError Error
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "gtkrc"
diff --git a/runtime/syntax/haml.vim b/runtime/syntax/haml.vim
index bf7a073633..5369695c22 100644
--- a/runtime/syntax/haml.vim
+++ b/runtime/syntax/haml.vim
@@ -2,7 +2,7 @@
 " Language:	Haml
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
 " Filenames:	*.haml
-" Last Change:	2010 Aug 09
+" Last Change:	2016 Aug 29
 
 if exists("b:current_syntax")
   finish
@@ -67,7 +67,7 @@ syn region  hamlJavascriptFilter matchgroup=hamlFilter start="^\z(\s*\):javascri
 syn region  hamlCSSFilter        matchgroup=hamlFilter start="^\z(\s*\):css\s*$"        end="^\%(\z1 \| *$\)\@!" contains=@htmlCss,hamlInterpolation keepend
 syn region  hamlSassFilter       matchgroup=hamlFilter start="^\z(\s*\):sass\s*$"       end="^\%(\z1 \| *$\)\@!" contains=@hamlSassTop
 
-syn region  hamlJavascriptBlock start="^\z(\s*\)%script" nextgroup=@hamlComponent,hamlError end="^\%(\z1 \| *$\)\@!" contains=@hamlTop,@htmlJavaScript keepend
+syn region  hamlJavascriptBlock start="^\z(\s*\)%script\%((type=[\"']text/javascript[\"'])\)\=\s*$" nextgroup=@hamlComponent,hamlError end="^\%(\z1 \| *$\)\@!" contains=@hamlTop,@htmlJavaScript keepend
 syn region  hamlCssBlock        start="^\z(\s*\)%style" nextgroup=@hamlComponent,hamlError  end="^\%(\z1 \| *$\)\@!" contains=@hamlTop,@htmlCss keepend
 syn match   hamlError "\$" contained
 
diff --git a/runtime/syntax/hamster.vim b/runtime/syntax/hamster.vim
index bd52300ca0..f9aada251f 100644
--- a/runtime/syntax/hamster.vim
+++ b/runtime/syntax/hamster.vim
@@ -12,10 +12,8 @@
 " for news and mail, a build-in script language, the GUI allows translation to
 " other languages, it can be used in a network and that's not all features...
 "
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
@@ -358,24 +356,16 @@ syn cluster hamsterComment	contains=hamsterHashComment
 syn sync ccomment hamsterHashComment
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_hamster_syn_inits")
-    if version < 508
-        let did_hamster_syn_inits = 1
-        command -nargs=+ HiLink hi link <args>
-    else
-        command -nargs=+ HiLink hi def link <args>
-    endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-    HiLink hamsterHashComment	Comment
-    HiLink hamsterSpecial	Special
-    HiLink hamsterStatement	Statement
-    HiLink hamsterString	String
-    HiLink hamsterFunction	Function
+HiLink hamsterHashComment	Comment
+HiLink hamsterSpecial	Special
+HiLink hamsterStatement	Statement
+HiLink hamsterString	String
+HiLink hamsterFunction	Function
 
-    delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "hamster"
 
diff --git a/runtime/syntax/haskell.vim b/runtime/syntax/haskell.vim
index 8afca048cc..86d554ba36 100644
--- a/runtime/syntax/haskell.vim
+++ b/runtime/syntax/haskell.vim
@@ -32,10 +32,8 @@
 "	       to attribution of work.
 " 2008 Dec 15: Added comments as contained element in import statements
 
-" Remove any old syntax stuff hanging around
-if version < 600
-  syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -127,67 +125,59 @@ syntax match	cCommentStartError display "/\*"me=e-1 contained
 syn region	cCppString	start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='$' contains=cSpecial contained
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_hs_syntax_inits")
-  if version < 508
-    let did_hs_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink hsModule			  hsStructure
-  HiLink hsImport			  Include
-  HiLink hsImportMod			  hsImport
-  HiLink hsInfix			  PreProc
-  HiLink hsStructure			  Structure
-  HiLink hsStatement			  Statement
-  HiLink hsConditional			  Conditional
-  HiLink hsSpecialChar			  SpecialChar
-  HiLink hsTypedef			  Typedef
-  HiLink hsVarSym			  hsOperator
-  HiLink hsConSym			  hsOperator
-  HiLink hsOperator			  Operator
-  if exists("hs_highlight_delimiters")
-    " Some people find this highlighting distracting.
-    HiLink hsDelimiter			  Delimiter
-  endif
-  HiLink hsSpecialCharError		  Error
-  HiLink hsString			  String
-  HiLink hsCharacter			  Character
-  HiLink hsNumber			  Number
-  HiLink hsFloat			  Float
-  HiLink hsConditional			  Conditional
-  HiLink hsLiterateComment		  hsComment
-  HiLink hsBlockComment		  hsComment
-  HiLink hsLineComment			  hsComment
-  HiLink hsComment			  Comment
-  HiLink hsPragma			  SpecialComment
-  HiLink hsBoolean			  Boolean
-  HiLink hsType			  Type
-  HiLink hsMaybe			  hsEnumConst
-  HiLink hsOrdering			  hsEnumConst
-  HiLink hsEnumConst			  Constant
-  HiLink hsDebug			  Debug
-
-  HiLink cCppString		hsString
-  HiLink cCommentStart		hsComment
-  HiLink cCommentError		hsError
-  HiLink cCommentStartError	hsError
-  HiLink cInclude		Include
-  HiLink cPreProc		PreProc
-  HiLink cDefine		Macro
-  HiLink cIncluded		hsString
-  HiLink cError			Error
-  HiLink cPreCondit		PreCondit
-  HiLink cComment		Comment
-  HiLink cCppSkip		cCppOut
-  HiLink cCppOut2		cCppOut
-  HiLink cCppOut		Comment
-
-  delcommand HiLink
+HiLink hsModule			  hsStructure
+HiLink hsImport			  Include
+HiLink hsImportMod			  hsImport
+HiLink hsInfix			  PreProc
+HiLink hsStructure			  Structure
+HiLink hsStatement			  Statement
+HiLink hsConditional			  Conditional
+HiLink hsSpecialChar			  SpecialChar
+HiLink hsTypedef			  Typedef
+HiLink hsVarSym			  hsOperator
+HiLink hsConSym			  hsOperator
+HiLink hsOperator			  Operator
+if exists("hs_highlight_delimiters")
+" Some people find this highlighting distracting.
+HiLink hsDelimiter			  Delimiter
 endif
+HiLink hsSpecialCharError		  Error
+HiLink hsString			  String
+HiLink hsCharacter			  Character
+HiLink hsNumber			  Number
+HiLink hsFloat			  Float
+HiLink hsConditional			  Conditional
+HiLink hsLiterateComment		  hsComment
+HiLink hsBlockComment		  hsComment
+HiLink hsLineComment			  hsComment
+HiLink hsComment			  Comment
+HiLink hsPragma			  SpecialComment
+HiLink hsBoolean			  Boolean
+HiLink hsType			  Type
+HiLink hsMaybe			  hsEnumConst
+HiLink hsOrdering			  hsEnumConst
+HiLink hsEnumConst			  Constant
+HiLink hsDebug			  Debug
+
+HiLink cCppString		hsString
+HiLink cCommentStart		hsComment
+HiLink cCommentError		hsError
+HiLink cCommentStartError	hsError
+HiLink cInclude		Include
+HiLink cPreProc		PreProc
+HiLink cDefine		Macro
+HiLink cIncluded		hsString
+HiLink cError			Error
+HiLink cPreCondit		PreCondit
+HiLink cComment		Comment
+HiLink cCppSkip		cCppOut
+HiLink cCppOut2		cCppOut
+HiLink cCppOut		Comment
+
+delcommand HiLink
 
 let b:current_syntax = "haskell"
 
diff --git a/runtime/syntax/haste.vim b/runtime/syntax/haste.vim
index b889c5c594..79e9f5ec56 100644
--- a/runtime/syntax/haste.vim
+++ b/runtime/syntax/haste.vim
@@ -12,11 +12,8 @@
 if exists("b:current_syntax")
     finish
 endif
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/hastepreproc.vim b/runtime/syntax/hastepreproc.vim
index 3fcb8ddd31..f08bf3fbf3 100644
--- a/runtime/syntax/hastepreproc.vim
+++ b/runtime/syntax/hastepreproc.vim
@@ -5,24 +5,13 @@
 "		files
 " Version:	0.5
 
-" HASTE
+" quit when a syntax file was already loaded
 if exists("b:current_syntax")
-    finish
-endif
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
   finish
 endif
-" Read the C syntax to start with
-if version < 600
-    so <sfile>:p:h/haste.vim
-else
-    runtime! syntax/haste.vim
-    unlet b:current_syntax
-endif
+" Read the haste syntax to start with
+runtime! syntax/haste.vim
+unlet b:current_syntax
 
 " case is significant
 syn case match
diff --git a/runtime/syntax/hb.vim b/runtime/syntax/hb.vim
index d4de3ff1e1..ab2fb7fbad 100644
--- a/runtime/syntax/hb.vim
+++ b/runtime/syntax/hb.vim
@@ -4,11 +4,8 @@
 " URL:		http://bachue.com/hb/vim/syntax/hb.vim
 " Last Change:	2012 Jan 08 by Thilo Six
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -63,31 +60,23 @@ syn region HBText matchgroup=HBDirectiveKeyword start=/^:\(set\|out\)\s*\S\+.*$/
 syn match HBComment "^#.*$"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_hb_syntax_inits")
-  if version < 508
-    let did_hb_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink HBhtmlString			 String
-  HiLink HBhtmlTagN			 Function
-  HiLink htmlSpecialChar		 String
+HiLink HBhtmlString			 String
+HiLink HBhtmlTagN			 Function
+HiLink htmlSpecialChar		 String
 
-  HiLink HBInvalidLine Error
-  HiLink HBFoobar Comment
-  hi HBFileName guibg=lightgray guifg=black
-  HiLink HBDirectiveError Error
-  HiLink HBDirectiveBlockEnd HBDirectiveKeyword
-  hi HBDirectiveKeyword guibg=lightgray guifg=darkgreen
-  HiLink HBComment Comment
-  HiLink HBhtmlTagSk Statement
+HiLink HBInvalidLine Error
+HiLink HBFoobar Comment
+hi HBFileName guibg=lightgray guifg=black
+HiLink HBDirectiveError Error
+HiLink HBDirectiveBlockEnd HBDirectiveKeyword
+hi HBDirectiveKeyword guibg=lightgray guifg=darkgreen
+HiLink HBComment Comment
+HiLink HBhtmlTagSk Statement
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 syn sync match Normal grouphere NONE "^:\s*$"
 syn sync match Normal grouphere NONE "^:\s*lib\s\+[^ \t]\+$"
diff --git a/runtime/syntax/hercules.vim b/runtime/syntax/hercules.vim
index 02d8e9bb78..2a786768dc 100644
--- a/runtime/syntax/hercules.vim
+++ b/runtime/syntax/hercules.vim
@@ -7,11 +7,8 @@
 "		that an IC's physical design matches its logical design and
 "		satisfies manufacturing rules.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -101,32 +98,23 @@ syn match     herculesOutput "error\s*=\s*(.*)"
 syn sync      lines=100
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_hercules_syntax_inits")
-  if version < 508
-    let did_hercules_syntax_inits = 1
-    " Default methods for highlighting.
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink herculesStatement  Statement
-  HiLink herculesType       Type
-  HiLink herculesComment    Comment
-  HiLink herculesPreProc    PreProc
-  HiLink herculesTodo       Todo
-  HiLink herculesOutput     Include
-  HiLink herculesCmdCmnt    Identifier
-  HiLink herculesNumber     Number
-  HiLink herculesBraceError herculesError
-  HiLink herculesCurlyError herculesError
-  HiLink herculesParenError herculesError
-  HiLink herculesError      Error
+HiLink herculesStatement  Statement
+HiLink herculesType       Type
+HiLink herculesComment    Comment
+HiLink herculesPreProc    PreProc
+HiLink herculesTodo       Todo
+HiLink herculesOutput     Include
+HiLink herculesCmdCmnt    Identifier
+HiLink herculesNumber     Number
+HiLink herculesBraceError herculesError
+HiLink herculesCurlyError herculesError
+HiLink herculesParenError herculesError
+HiLink herculesError      Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "hercules"
 
diff --git a/runtime/syntax/hex.vim b/runtime/syntax/hex.vim
index 40f7f0dd10..d2637eaaea 100644
--- a/runtime/syntax/hex.vim
+++ b/runtime/syntax/hex.vim
@@ -25,11 +25,8 @@
 " States in parentheses in the upper format description indicate that they
 " should not appear in a valid file.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -68,34 +65,26 @@ syn match hexChecksum "[0-9a-fA-F]\{2}$" contained
 syn region hexExtAdrBlock start="^:[0-9a-fA-F]\{7}[24]" skip="^:[0-9a-fA-F]\{7}0" end="^:"me=s-1 fold transparent
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_hex_syntax_inits")
-  if version < 508
-    let did_hex_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting. Can be overridden later
-  HiLink hexRecStart            hexRecType
-  HiLink hexDataByteCount       Constant
-  hi def hexAddressFieldUnknown term=italic cterm=italic gui=italic
-  HiLink hexDataAddress         Comment
-  HiLink hexNoAddress           DiffAdd
-  HiLink hexRecTypeUnknown      hexRecType
-  HiLink hexRecType             WarningMsg
-  hi def hexDataFieldUnknown    term=italic cterm=italic gui=italic
-  hi def hexDataOdd             term=bold cterm=bold gui=bold
-  hi def hexDataEven            term=NONE cterm=NONE gui=NONE
-  HiLink hexDataUnexpected      Error
-  HiLink hexExtendedAddress     hexDataAddress
-  HiLink hexStartAddress        hexDataAddress
-  HiLink hexChecksum            DiffChange
+" The default methods for highlighting. Can be overridden later
+HiLink hexRecStart            hexRecType
+HiLink hexDataByteCount       Constant
+hi def hexAddressFieldUnknown term=italic cterm=italic gui=italic
+HiLink hexDataAddress         Comment
+HiLink hexNoAddress           DiffAdd
+HiLink hexRecTypeUnknown      hexRecType
+HiLink hexRecType             WarningMsg
+hi def hexDataFieldUnknown    term=italic cterm=italic gui=italic
+hi def hexDataOdd             term=bold cterm=bold gui=bold
+hi def hexDataEven            term=NONE cterm=NONE gui=NONE
+HiLink hexDataUnexpected      Error
+HiLink hexExtendedAddress     hexDataAddress
+HiLink hexStartAddress        hexDataAddress
+HiLink hexChecksum            DiffChange
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "hex"
 
diff --git a/runtime/syntax/hog.vim b/runtime/syntax/hog.vim
index f37f7ae899..7206815202 100644
--- a/runtime/syntax/hog.vim
+++ b/runtime/syntax/hog.vim
@@ -4,9 +4,8 @@
 " Last Change: 2015 Oct 24  -> Rename syntax items from Snort -> Hog
 "              2012 Oct 24  -> Originalish release
 
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
diff --git a/runtime/syntax/hostsaccess.vim b/runtime/syntax/hostsaccess.vim
index 8a9f02eff5..7201816f48 100644
--- a/runtime/syntax/hostsaccess.vim
+++ b/runtime/syntax/hostsaccess.vim
@@ -15,12 +15,8 @@ if exists("b:current_syntax")
 endif
 
 " For a starter we just use conf.vim for highlighting
-if version < 600
-  so <sfile>:p:h/conf.vim
-else
-  runtime! syntax/conf.vim
-  unlet b:current_syntax
-endif
+runtime! syntax/conf.vim
+unlet b:current_syntax
 
 
 let b:current_syntax = "hostsaccess"
diff --git a/runtime/syntax/html.vim b/runtime/syntax/html.vim
index ab1f9b3c13..ac31e4848d 100644
--- a/runtime/syntax/html.vim
+++ b/runtime/syntax/html.vim
@@ -7,12 +7,9 @@
 
 " Please check :help html.vim for some comments and a description of the options
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
+" quit when a syntax file was already loaded
 if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
+  if exists("b:current_syntax")
     finish
   endif
   let main_syntax = 'html'
@@ -22,11 +19,7 @@ let s:cpo_save = &cpo
 set cpo&vim
 
 " don't use standard HiLink, it will not work with included syntax files
-if version < 508
-  command! -nargs=+ HtmlHiLink hi link <args>
-else
-  command! -nargs=+ HtmlHiLink hi def link <args>
-endif
+command! -nargs=+ HtmlHiLink hi def link <args>
 
 syntax spell toplevel
 
@@ -221,72 +214,67 @@ if main_syntax == "html"
 endif
 
 " The default highlighting.
-if version >= 508 || !exists("did_html_syn_inits")
-  if version < 508
-    let did_html_syn_inits = 1
+HtmlHiLink htmlTag                     Function
+HtmlHiLink htmlEndTag                  Identifier
+HtmlHiLink htmlArg                     Type
+HtmlHiLink htmlTagName                 htmlStatement
+HtmlHiLink htmlSpecialTagName          Exception
+HtmlHiLink htmlValue                     String
+HtmlHiLink htmlSpecialChar             Special
+
+if !exists("html_no_rendering")
+  HtmlHiLink htmlH1                      Title
+  HtmlHiLink htmlH2                      htmlH1
+  HtmlHiLink htmlH3                      htmlH2
+  HtmlHiLink htmlH4                      htmlH3
+  HtmlHiLink htmlH5                      htmlH4
+  HtmlHiLink htmlH6                      htmlH5
+  HtmlHiLink htmlHead                    PreProc
+  HtmlHiLink htmlTitle                   Title
+  HtmlHiLink htmlBoldItalicUnderline     htmlBoldUnderlineItalic
+  HtmlHiLink htmlUnderlineBold           htmlBoldUnderline
+  HtmlHiLink htmlUnderlineItalicBold     htmlBoldUnderlineItalic
+  HtmlHiLink htmlUnderlineBoldItalic     htmlBoldUnderlineItalic
+  HtmlHiLink htmlItalicUnderline         htmlUnderlineItalic
+  HtmlHiLink htmlItalicBold              htmlBoldItalic
+  HtmlHiLink htmlItalicBoldUnderline     htmlBoldUnderlineItalic
+  HtmlHiLink htmlItalicUnderlineBold     htmlBoldUnderlineItalic
+  HtmlHiLink htmlLink                    Underlined
+  HtmlHiLink htmlLeadingSpace            None
+  if !exists("html_my_rendering")
+    hi def htmlBold                term=bold cterm=bold gui=bold
+    hi def htmlBoldUnderline       term=bold,underline cterm=bold,underline gui=bold,underline
+    hi def htmlBoldItalic          term=bold,italic cterm=bold,italic gui=bold,italic
+    hi def htmlBoldUnderlineItalic term=bold,italic,underline cterm=bold,italic,underline gui=bold,italic,underline
+    hi def htmlUnderline           term=underline cterm=underline gui=underline
+    hi def htmlUnderlineItalic     term=italic,underline cterm=italic,underline gui=italic,underline
+    hi def htmlItalic              term=italic cterm=italic gui=italic
   endif
-  HtmlHiLink htmlTag                     Function
-  HtmlHiLink htmlEndTag                  Identifier
-  HtmlHiLink htmlArg                     Type
-  HtmlHiLink htmlTagName                 htmlStatement
-  HtmlHiLink htmlSpecialTagName          Exception
-  HtmlHiLink htmlValue                     String
-  HtmlHiLink htmlSpecialChar             Special
-  
-  if !exists("html_no_rendering")
-    HtmlHiLink htmlH1                      Title
-    HtmlHiLink htmlH2                      htmlH1
-    HtmlHiLink htmlH3                      htmlH2
-    HtmlHiLink htmlH4                      htmlH3
-    HtmlHiLink htmlH5                      htmlH4
-    HtmlHiLink htmlH6                      htmlH5
-    HtmlHiLink htmlHead                    PreProc
-    HtmlHiLink htmlTitle                   Title
-    HtmlHiLink htmlBoldItalicUnderline     htmlBoldUnderlineItalic
-    HtmlHiLink htmlUnderlineBold           htmlBoldUnderline
-    HtmlHiLink htmlUnderlineItalicBold     htmlBoldUnderlineItalic
-    HtmlHiLink htmlUnderlineBoldItalic     htmlBoldUnderlineItalic
-    HtmlHiLink htmlItalicUnderline         htmlUnderlineItalic
-    HtmlHiLink htmlItalicBold              htmlBoldItalic
-    HtmlHiLink htmlItalicBoldUnderline     htmlBoldUnderlineItalic
-    HtmlHiLink htmlItalicUnderlineBold     htmlBoldUnderlineItalic
-    HtmlHiLink htmlLink                    Underlined
-    HtmlHiLink htmlLeadingSpace            None
-    if !exists("html_my_rendering")
-      hi def htmlBold                term=bold cterm=bold gui=bold
-      hi def htmlBoldUnderline       term=bold,underline cterm=bold,underline gui=bold,underline
-      hi def htmlBoldItalic          term=bold,italic cterm=bold,italic gui=bold,italic
-      hi def htmlBoldUnderlineItalic term=bold,italic,underline cterm=bold,italic,underline gui=bold,italic,underline
-      hi def htmlUnderline           term=underline cterm=underline gui=underline
-      hi def htmlUnderlineItalic     term=italic,underline cterm=italic,underline gui=italic,underline
-      hi def htmlItalic              term=italic cterm=italic gui=italic
-    endif
-  endif
-  
-  HtmlHiLink htmlPreStmt            PreProc
-  HtmlHiLink htmlPreError           Error
-  HtmlHiLink htmlPreProc            PreProc
-  HtmlHiLink htmlPreAttr            String
-  HtmlHiLink htmlPreProcAttrName    PreProc
-  HtmlHiLink htmlPreProcAttrError   Error
-  HtmlHiLink htmlSpecial            Special
-  HtmlHiLink htmlSpecialChar        Special
-  HtmlHiLink htmlString             String
-  HtmlHiLink htmlStatement          Statement
-  HtmlHiLink htmlComment            Comment
-  HtmlHiLink htmlCommentPart        Comment
-  HtmlHiLink htmlValue              String
-  HtmlHiLink htmlCommentError       htmlError
-  HtmlHiLink htmlTagError           htmlError
-  HtmlHiLink htmlEvent              javaScript
-  HtmlHiLink htmlError              Error
-  
-  HtmlHiLink javaScript             Special
-  HtmlHiLink javaScriptExpression   javaScript
-  HtmlHiLink htmlCssStyleComment    Comment
-  HtmlHiLink htmlCssDefinition      Special
 endif
 
+HtmlHiLink htmlPreStmt            PreProc
+HtmlHiLink htmlPreError           Error
+HtmlHiLink htmlPreProc            PreProc
+HtmlHiLink htmlPreAttr            String
+HtmlHiLink htmlPreProcAttrName    PreProc
+HtmlHiLink htmlPreProcAttrError   Error
+HtmlHiLink htmlSpecial            Special
+HtmlHiLink htmlSpecialChar        Special
+HtmlHiLink htmlString             String
+HtmlHiLink htmlStatement          Statement
+HtmlHiLink htmlComment            Comment
+HtmlHiLink htmlCommentPart        Comment
+HtmlHiLink htmlValue              String
+HtmlHiLink htmlCommentError       htmlError
+HtmlHiLink htmlTagError           htmlError
+HtmlHiLink htmlEvent              javaScript
+HtmlHiLink htmlError              Error
+
+HtmlHiLink javaScript             Special
+HtmlHiLink javaScriptExpression   javaScript
+HtmlHiLink htmlCssStyleComment    Comment
+HtmlHiLink htmlCssDefinition      Special
+
 delcommand HtmlHiLink
 
 let b:current_syntax = "html"
diff --git a/runtime/syntax/htmlcheetah.vim b/runtime/syntax/htmlcheetah.vim
index f57df90dea..0721c76b44 100644
--- a/runtime/syntax/htmlcheetah.vim
+++ b/runtime/syntax/htmlcheetah.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Max Ischenko <mfi@ukr.net>
 " Last Change: 2003-05-11
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -15,14 +12,9 @@ if !exists("main_syntax")
   let main_syntax = 'html'
 endif
 
-if version < 600
-  so <sfile>:p:h/cheetah.vim
-  so <sfile>:p:h/html.vim
-else
-  runtime! syntax/cheetah.vim
-  runtime! syntax/html.vim
-  unlet b:current_syntax
-endif
+runtime! syntax/cheetah.vim
+runtime! syntax/html.vim
+unlet b:current_syntax
 
 syntax cluster htmlPreproc add=cheetahPlaceHolder
 syntax cluster htmlString add=cheetahPlaceHolder
diff --git a/runtime/syntax/htmldjango.vim b/runtime/syntax/htmldjango.vim
index 58afd1b62d..07b1c375e8 100644
--- a/runtime/syntax/htmldjango.vim
+++ b/runtime/syntax/htmldjango.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Dave Hodder <dmh@dmh.org.uk>
 " Last Change:	2014 Jul 13
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -15,14 +12,9 @@ if !exists("main_syntax")
   let main_syntax = 'html'
 endif
 
-if version < 600
-  so <sfile>:p:h/django.vim
-  so <sfile>:p:h/html.vim
-else
-  runtime! syntax/django.vim
-  runtime! syntax/html.vim
-  unlet b:current_syntax
-endif
+runtime! syntax/django.vim
+runtime! syntax/html.vim
+unlet b:current_syntax
 
 syn cluster djangoBlocks add=djangoTagBlock,djangoVarBlock,djangoComment,djangoComBlock
 
diff --git a/runtime/syntax/htmlm4.vim b/runtime/syntax/htmlm4.vim
index 3119d2d1ad..ee1f06e5f4 100644
--- a/runtime/syntax/htmlm4.vim
+++ b/runtime/syntax/htmlm4.vim
@@ -4,11 +4,8 @@
 " URL:		http://www.fleiner.com/vim/syntax/htmlm4.vim
 " Last Change:	2001 Apr 30
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -17,19 +14,12 @@ if !exists("main_syntax")
   let main_syntax='htmlm4'
 endif
 
-if version < 600
-  so <sfile>:p:h/html.vim
-else
-  runtime! syntax/html.vim
-endif
+runtime! syntax/html.vim
 unlet b:current_syntax
 syn case match
 
-if version < 600
-  so <sfile>:p:h/m4.vim
-else
-  runtime! syntax/m4.vim
-endif
+runtime! syntax/m4.vim
+
 unlet b:current_syntax
 syn cluster htmlPreproc add=@m4Top
 syn cluster m4StringContents add=htmlTag,htmlEndTag
diff --git a/runtime/syntax/htmlos.vim b/runtime/syntax/htmlos.vim
index f31b9f6543..530c046bac 100644
--- a/runtime/syntax/htmlos.vim
+++ b/runtime/syntax/htmlos.vim
@@ -6,11 +6,8 @@
 " Last Change:	2003 May 11
 "
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -18,12 +15,8 @@ if !exists("main_syntax")
   let main_syntax = 'htmlos'
 endif
 
-if version < 600
-  so <sfile>:p:h/html.vim
-else
-  runtime! syntax/html.vim
-  unlet b:current_syntax
-endif
+runtime! syntax/html.vim
+unlet b:current_syntax
 
 syn cluster htmlPreproc add=htmlosRegion
 
@@ -121,42 +114,34 @@ else
 endif
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_htmlos_syn_inits")
-  if version < 508
-    let did_htmlos_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting.  Can be overridden later
-  HiLink	 htmlosSpecialIdentifier	Operator
-  HiLink	 htmlosIdentifier	Identifier
-  HiLink	 htmlosStorageClass	StorageClass
-  HiLink	 htmlosComment	Comment
-  HiLink	 htmlosBoolean	Boolean
-  HiLink	 htmlosStringSingle	String
-  HiLink	 htmlosStringDouble	String
-  HiLink	 htmlosNumber	Number
-  HiLink	 htmlosFloat	Float
-  HiLink	 htmlosFunctions	Function
-  HiLink	 htmlosRepeat	Repeat
-  HiLink	 htmlosConditional	Conditional
-  HiLink	 htmlosLabel	Label
-  HiLink	 htmlosStatement	Statement
-  HiLink	 htmlosKeyword	Statement
-  HiLink	 htmlosType	Type
-  HiLink	 htmlosDefine	Define
-  HiLink	 htmlosParent	Delimiter
-  HiLink	 htmlosError	Error
-  HiLink	 htmlosTodo	Todo
-  HiLink	htmlosOperator	Operator
-  HiLink	htmlosRelation	Operator
+" The default methods for highlighting.  Can be overridden later
+HiLink	 htmlosSpecialIdentifier	Operator
+HiLink	 htmlosIdentifier	Identifier
+HiLink	 htmlosStorageClass	StorageClass
+HiLink	 htmlosComment	Comment
+HiLink	 htmlosBoolean	Boolean
+HiLink	 htmlosStringSingle	String
+HiLink	 htmlosStringDouble	String
+HiLink	 htmlosNumber	Number
+HiLink	 htmlosFloat	Float
+HiLink	 htmlosFunctions	Function
+HiLink	 htmlosRepeat	Repeat
+HiLink	 htmlosConditional	Conditional
+HiLink	 htmlosLabel	Label
+HiLink	 htmlosStatement	Statement
+HiLink	 htmlosKeyword	Statement
+HiLink	 htmlosType	Type
+HiLink	 htmlosDefine	Define
+HiLink	 htmlosParent	Delimiter
+HiLink	 htmlosError	Error
+HiLink	 htmlosTodo	Todo
+HiLink	htmlosOperator	Operator
+HiLink	htmlosRelation	Operator
 
-  delcommand HiLink
-endif
+delcommand HiLink
 let b:current_syntax = "htmlos"
 
 if main_syntax == 'htmlos'
diff --git a/runtime/syntax/ia64.vim b/runtime/syntax/ia64.vim
index ebfdc95bae..10d069de3f 100644
--- a/runtime/syntax/ia64.vim
+++ b/runtime/syntax/ia64.vim
@@ -6,11 +6,8 @@
 " File Version: 0.7
 " Last Change:  2006 Sep 08
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -19,11 +16,7 @@ endif
 syn case ignore
 
 "  Identifier Keyword characters (defines \k)
-if version >= 600
-	setlocal iskeyword=@,48-57,#,$,.,:,?,@-@,_,~
-else
-	set iskeyword=@,48-57,#,$,.,:,?,@-@,_,~
-endif
+setlocal iskeyword=@,48-57,#,$,.,:,?,@-@,_,~
 
 syn sync minlines=5
 
@@ -268,43 +261,35 @@ syn match ia64data "real\([48]\|1[06]\)\(\(\(\.ua\)\=\(\.msb\|\.lsb\)\=\)\|\(\(\
 syn match ia64data "stringz\=\(\(\(\.ua\)\=\(\.msb\|\.lsb\)\=\)\|\(\(\.msb\|\.lsb\)\=\(\.ua\)\=\)\)\=\>"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_ia64_syn_inits")
-	if version < 508
-		let did_ia64_syn_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	"put masm groups with our groups
-	HiLink masmOperator	ia64operator
-	HiLink masmDirective	ia64Directive
-	HiLink masmOpcode	ia64Opcode
-	HiLink masmIdentifier	ia64Identifier
-	HiLink masmFloat	ia64Float
+"put masm groups with our groups
+HiLink masmOperator	ia64operator
+HiLink masmDirective	ia64Directive
+HiLink masmOpcode	ia64Opcode
+HiLink masmIdentifier	ia64Identifier
+HiLink masmFloat	ia64Float
 
-	"ia64 specific stuff
-	HiLink ia64Label	Define
-	HiLink ia64Comment	Comment
-	HiLink ia64Directive	Type
-	HiLink ia64opcode	Statement
-	HiLink ia64registers	Operator
-	HiLink ia64string	String
-	HiLink ia64Hex		Number
-	HiLink ia64Binary	Number
-	HiLink ia64Octal	Number
-	HiLink ia64Float	Float
-	HiLink ia64Decimal	Number
-	HiLink ia64Identifier	Identifier
-	HiLink ia64data		Type
-	HiLink ia64delimiter	Delimiter
-	HiLink ia64operator	Operator
-	HiLink ia64Todo		Todo
+"ia64 specific stuff
+HiLink ia64Label	Define
+HiLink ia64Comment	Comment
+HiLink ia64Directive	Type
+HiLink ia64opcode	Statement
+HiLink ia64registers	Operator
+HiLink ia64string	String
+HiLink ia64Hex		Number
+HiLink ia64Binary	Number
+HiLink ia64Octal	Number
+HiLink ia64Float	Float
+HiLink ia64Decimal	Number
+HiLink ia64Identifier	Identifier
+HiLink ia64data		Type
+HiLink ia64delimiter	Delimiter
+HiLink ia64operator	Operator
+HiLink ia64Todo		Todo
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "ia64"
 
diff --git a/runtime/syntax/icemenu.vim b/runtime/syntax/icemenu.vim
index d3a733d579..6513287dfc 100644
--- a/runtime/syntax/icemenu.vim
+++ b/runtime/syntax/icemenu.vim
@@ -6,10 +6,8 @@
 " Comment:	Icewm is a lightweight window manager.  This adds syntax
 "		highlighting when editing your user's menu file (~/.icewm/menu).
 
-" clear existing syntax
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
diff --git a/runtime/syntax/icon.vim b/runtime/syntax/icon.vim
index 1a73c43d8f..1bd12d3220 100644
--- a/runtime/syntax/icon.vim
+++ b/runtime/syntax/icon.vim
@@ -4,11 +4,8 @@
 " URL:		ftp://ftp.halcyon.com/pub/users/wturner/icon.vim
 " Last Change:	2003 May 11
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -157,56 +154,48 @@ exec "syn sync ccomment iconComment minlines=" . icon_minlines
 
 " Define the default highlighting.
 
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting
-if version >= 508 || !exists("did_icon_syn_inits")
-  if version < 508
-    let did_icon_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting
+command -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting.  Can be overridden later
+" The default methods for highlighting.  Can be overridden later
 
-  " HiLink iconSpecialCharacter	iconSpecial
+" HiLink iconSpecialCharacter	iconSpecial
 
-  HiLink iconOctalError		iconError
-  HiLink iconParenError		iconError
-  HiLink iconInParen		iconError
-  HiLink iconCommentError	iconError
-  HiLink iconSpaceError		iconError
-  HiLink iconCommentError	iconError
-  HiLink iconIncluded		iconString
-  HiLink iconCommentString	iconString
-  HiLink iconComment2String	iconString
-  HiLink iconCommentSkip	iconComment
+HiLink iconOctalError		iconError
+HiLink iconParenError		iconError
+HiLink iconInParen		iconError
+HiLink iconCommentError	iconError
+HiLink iconSpaceError		iconError
+HiLink iconCommentError	iconError
+HiLink iconIncluded		iconString
+HiLink iconCommentString	iconString
+HiLink iconComment2String	iconString
+HiLink iconCommentSkip	iconComment
 
-  HiLink iconUserLabel		Label
-  HiLink iconCharacter		Character
-  HiLink iconNumber			Number
-  HiLink iconRadix			Number
-  HiLink iconFloat			Float
-  HiLink iconInclude		Include
-  HiLink iconPreProc		PreProc
-  HiLink iconDefine			Macro
-  HiLink iconError			Error
-  HiLink iconStatement		Statement
-  HiLink iconPreCondit		PreCondit
-  HiLink iconString			String
-  HiLink iconCset			String
-  HiLink iconComment		Comment
-  HiLink iconSpecial		SpecialChar
-  HiLink iconTodo			Todo
-  HiLink iconStorageClass	StorageClass
-  HiLink iconFunction		Statement
-  HiLink iconReserved		Label
-  HiLink iconKeyword		Operator
+HiLink iconUserLabel		Label
+HiLink iconCharacter		Character
+HiLink iconNumber			Number
+HiLink iconRadix			Number
+HiLink iconFloat			Float
+HiLink iconInclude		Include
+HiLink iconPreProc		PreProc
+HiLink iconDefine			Macro
+HiLink iconError			Error
+HiLink iconStatement		Statement
+HiLink iconPreCondit		PreCondit
+HiLink iconString			String
+HiLink iconCset			String
+HiLink iconComment		Comment
+HiLink iconSpecial		SpecialChar
+HiLink iconTodo			Todo
+HiLink iconStorageClass	StorageClass
+HiLink iconFunction		Statement
+HiLink iconReserved		Label
+HiLink iconKeyword		Operator
 
-  "HiLink iconIdentifier	Identifier
+"HiLink iconIdentifier	Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "icon"
 
diff --git a/runtime/syntax/idlang.vim b/runtime/syntax/idlang.vim
index 670d080a7d..6d639c9fa4 100644
--- a/runtime/syntax/idlang.vim
+++ b/runtime/syntax/idlang.vim
@@ -4,11 +4,8 @@
 " Created by: Hermann Rochholz <Hermann.Rochholz AT gmx.de>
 
 " Remove any old syntax stuff hanging around
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -219,35 +216,27 @@ syn keyword idlangRoutine XSQ_TEST XSURFACE XVAREDIT XVOLUME XVOLUME_ROTATE
 syn keyword idlangRoutine XVOLUME_WRITE_IMAGE XYOUTS ZOOM ZOOM_24
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_idlang_syn_inits")
-  if version < 508
-    let did_idlang_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-else
-    command -nargs=+ HiLink hi def link <args>
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink idlangConditional	Conditional
-  HiLink idlangRoutine	Type
-  HiLink idlangStatement	Statement
-  HiLink idlangContinueLine	Todo
-  HiLink idlangRealNumber	Float
-  HiLink idlangNumber	Number
-  HiLink idlangString	String
-  HiLink idlangOperator	Operator
-  HiLink idlangComment	Comment
-  HiLink idlangTodo	Todo
-  HiLink idlangPreCondit	Identifier
-  HiLink idlangDblCommaError	Error
-  HiLink idlangStop	Error
-  HiLink idlangStrucvar	PreProc
-  HiLink idlangSystem	Identifier
-  HiLink idlangKeyword	Special
+HiLink idlangConditional	Conditional
+HiLink idlangRoutine	Type
+HiLink idlangStatement	Statement
+HiLink idlangContinueLine	Todo
+HiLink idlangRealNumber	Float
+HiLink idlangNumber	Number
+HiLink idlangString	String
+HiLink idlangOperator	Operator
+HiLink idlangComment	Comment
+HiLink idlangTodo	Todo
+HiLink idlangPreCondit	Identifier
+HiLink idlangDblCommaError	Error
+HiLink idlangStop	Error
+HiLink idlangStrucvar	PreProc
+HiLink idlangSystem	Identifier
+HiLink idlangKeyword	Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "idlang"
 " vim: ts=18
diff --git a/runtime/syntax/inform.vim b/runtime/syntax/inform.vim
index d8ba43dcee..4d833c7df2 100644
--- a/runtime/syntax/inform.vim
+++ b/runtime/syntax/inform.vim
@@ -4,10 +4,8 @@
 " URL:		http://www.gowarthomas.com/informvim
 " Last Change:  2006 April 20
 
-" Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -294,13 +292,8 @@ endif
 
 " Handling for different versions of VIM.
 
-if version >= 600
-  setlocal iskeyword+=$
-  command -nargs=+ SynDisplay syntax <args> display
-else
-  set iskeyword+=$
-  command -nargs=+ SynDisplay syntax <args>
-endif
+setlocal iskeyword+=$
+command -nargs=+ SynDisplay syntax <args> display
 
 " Grammar sections.
 
@@ -347,61 +340,54 @@ syn sync maxlines=500
 delcommand SynDisplay
 
 " The default highlighting.
-if version >= 508 || !exists("did_inform_syn_inits")
-  if version < 508
-    let did_inform_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink informDefine		Define
-  HiLink informType		Type
-  HiLink informInclude		Include
-  HiLink informPreCondit	PreCondit
-  HiLink informPreProc		PreProc
-  HiLink informGramPreProc	PreProc
-  HiLink informAsm		Special
-  if !exists("inform_suppress_obsolete")
-    HiLink informAsmObsolete		informError
-    HiLink informKeywordObsolete	informError
-  else
-    HiLink informAsmObsolete		Special
-    HiLink informKeywordObsolete	Keyword
-  endif
-  HiLink informPredicate	Operator
-  HiLink informSysFunc		Identifier
-  HiLink informSysConst		Identifier
-  HiLink informConditional	Conditional
-  HiLink informRepeat		Repeat
-  HiLink informStatement	Statement
-  HiLink informOperator		Operator
-  HiLink informKeyword		Keyword
-  HiLink informGrammar		Keyword
-  HiLink informDictString	String
-  HiLink informNumber		Number
-  HiLink informError		Error
-  HiLink informString		String
-  HiLink informComment		Comment
-  HiLink informAccent		Special
-  HiLink informStringUnicode	Special
-  HiLink informStringCode	Special
-  HiLink informTodo		Todo
-  if !exists("inform_highlight_simple")
-    HiLink informLibAttrib	Identifier
-    HiLink informLibProp	Identifier
-    HiLink informLibObj		Identifier
-    HiLink informLibRoutine	Identifier
-    HiLink informLibVariable	Identifier
-    HiLink informLibConst	Identifier
-    HiLink informLibAction	Identifier
-  endif
-  HiLink informBadDictString	informError
-  HiLink informBadAccent	informError
-  HiLink informBadStrUnicode	informError
-
-  delcommand HiLink
+HiLink informDefine		Define
+HiLink informType		Type
+HiLink informInclude		Include
+HiLink informPreCondit	PreCondit
+HiLink informPreProc		PreProc
+HiLink informGramPreProc	PreProc
+HiLink informAsm		Special
+if !exists("inform_suppress_obsolete")
+HiLink informAsmObsolete		informError
+HiLink informKeywordObsolete	informError
+else
+HiLink informAsmObsolete		Special
+HiLink informKeywordObsolete	Keyword
 endif
+HiLink informPredicate	Operator
+HiLink informSysFunc		Identifier
+HiLink informSysConst		Identifier
+HiLink informConditional	Conditional
+HiLink informRepeat		Repeat
+HiLink informStatement	Statement
+HiLink informOperator		Operator
+HiLink informKeyword		Keyword
+HiLink informGrammar		Keyword
+HiLink informDictString	String
+HiLink informNumber		Number
+HiLink informError		Error
+HiLink informString		String
+HiLink informComment		Comment
+HiLink informAccent		Special
+HiLink informStringUnicode	Special
+HiLink informStringCode	Special
+HiLink informTodo		Todo
+if !exists("inform_highlight_simple")
+HiLink informLibAttrib	Identifier
+HiLink informLibProp	Identifier
+HiLink informLibObj		Identifier
+HiLink informLibRoutine	Identifier
+HiLink informLibVariable	Identifier
+HiLink informLibConst	Identifier
+HiLink informLibAction	Identifier
+endif
+HiLink informBadDictString	informError
+HiLink informBadAccent	informError
+HiLink informBadStrUnicode	informError
+
+delcommand HiLink
 
 let b:current_syntax = "inform"
 
diff --git a/runtime/syntax/inittab.vim b/runtime/syntax/inittab.vim
index b7472f9e0f..a743c82f82 100644
--- a/runtime/syntax/inittab.vim
+++ b/runtime/syntax/inittab.vim
@@ -6,12 +6,9 @@
 " URL: http://physics.muni.cz/~yeti/download/syntax/inittab.vim
 
 " Setup
-if version >= 600
-  if exists("b:current_syntax")
-    finish
-  endif
-else
-  syntax clear
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
 endif
 
 syn case match
@@ -45,31 +42,24 @@ syn match inittabProcessPlus "+" contained nextgroup=inittabProcess,inittabError
 syn region inittabProcess start="/" end="$" transparent oneline contained contains=@inittabSh,inittabComment
 
 " Define the default highlighting
-if version >= 508 || !exists("did_inittab_syntax_inits")
-  if version < 508
-    let did_inittab_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink inittabComment Comment
-  HiLink inittabFixme Todo
-  HiLink inittabActionName Type
-  HiLink inittabError Error
-  HiLink inittabId Identifier
-  HiLink inittabRunLevels Special
+HiLink inittabComment Comment
+HiLink inittabFixme Todo
+HiLink inittabActionName Type
+HiLink inittabError Error
+HiLink inittabId Identifier
+HiLink inittabRunLevels Special
 
-  HiLink inittabColonProcess inittabColon
-  HiLink inittabColonAction inittabColon
-  HiLink inittabColonRunLevels inittabColon
-  HiLink inittabColon PreProc
+HiLink inittabColonProcess inittabColon
+HiLink inittabColonAction inittabColon
+HiLink inittabColonRunLevels inittabColon
+HiLink inittabColon PreProc
 
-  HiLink inittabShString String
-  HiLink inittabShOption Special
-  HiLink inittabShCommand Statement
+HiLink inittabShString String
+HiLink inittabShOption Special
+HiLink inittabShCommand Statement
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "inittab"
diff --git a/runtime/syntax/ipfilter.vim b/runtime/syntax/ipfilter.vim
index db99812852..a7b7df2bac 100644
--- a/runtime/syntax/ipfilter.vim
+++ b/runtime/syntax/ipfilter.vim
@@ -9,11 +9,8 @@
 " not correctly identified.
 " Please send comments to hendrik@scholz.net
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/ishd.vim b/runtime/syntax/ishd.vim
index 1c011f1b92..78d88b9c17 100644
--- a/runtime/syntax/ishd.vim
+++ b/runtime/syntax/ishd.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Robert M. Cortopassi <cortopar@mindspring.com>
 " Last Change:	2001 May 09
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -387,35 +384,27 @@ syn cluster	ishdPreProcGroup	contains=ishdPreCondit,ishdIncluded,ishdInclude,ish
 syn region	ishdDefine		start="^\s*#\s*\(define\|undef\)\>" end="$" contains=ALLBUT,@ishdPreProcGroup
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_is_syntax_inits")
-  if version < 508
-    let did_is_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink ishdNumber	    Number
-  HiLink ishdError	    Error
-  HiLink ishdStatement	    Statement
-  HiLink ishdString	    String
-  HiLink ishdComment	    Comment
-  HiLink ishdTodo	    Todo
-  HiLink ishdFunction	    Identifier
-  HiLink ishdConstant	    PreProc
-  HiLink ishdType	    Type
-  HiLink ishdInclude	    Include
-  HiLink ishdDefine	    Macro
-  HiLink ishdIncluded	    String
-  HiLink ishdPreCondit	    PreCondit
-  HiLink ishdHashIf0Skip   ishdHashIf0
-  HiLink ishdHashIf0End    ishdHashIf0
-  HiLink ishdHashIf0	    Comment
+HiLink ishdNumber	    Number
+HiLink ishdError	    Error
+HiLink ishdStatement	    Statement
+HiLink ishdString	    String
+HiLink ishdComment	    Comment
+HiLink ishdTodo	    Todo
+HiLink ishdFunction	    Identifier
+HiLink ishdConstant	    PreProc
+HiLink ishdType	    Type
+HiLink ishdInclude	    Include
+HiLink ishdDefine	    Macro
+HiLink ishdIncluded	    String
+HiLink ishdPreCondit	    PreCondit
+HiLink ishdHashIf0Skip   ishdHashIf0
+HiLink ishdHashIf0End    ishdHashIf0
+HiLink ishdHashIf0	    Comment
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "ishd"
 
diff --git a/runtime/syntax/iss.vim b/runtime/syntax/iss.vim
index 26d9150b5a..63a453adac 100644
--- a/runtime/syntax/iss.vim
+++ b/runtime/syntax/iss.vim
@@ -9,11 +9,8 @@
 "  - Pascal scripting syntax is not recognized.
 "  - Embedded double quotes confuse string matches. e.g. "asfd""asfa"
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -105,44 +102,36 @@ syn keyword issTasksFlags checkedonce dontinheritcheck exclusive restart uncheck
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_iss_syntax_inits")
-  if version < 508
-    let did_iss_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-   " The default methods for highlighting.  Can be overridden later
-   HiLink issSection	Special
-   HiLink issComment	Comment
-   HiLink issDirective	Type
-   HiLink issParam	Type
-   HiLink issFolder	Special
-   HiLink issString	String
-   HiLink issURL	Include
-   HiLink issPreProc	PreProc 
+" The default methods for highlighting.  Can be overridden later
+HiLink issSection	Special
+HiLink issComment	Comment
+HiLink issDirective	Type
+HiLink issParam	Type
+HiLink issFolder	Special
+HiLink issString	String
+HiLink issURL	Include
+HiLink issPreProc	PreProc 
 
-   HiLink issDirsFlags		Keyword
-   HiLink issFilesCopyMode	Keyword
-   HiLink issFilesAttribs	Keyword
-   HiLink issFilesPermissions	Keyword
-   HiLink issFilesFlags		Keyword
-   HiLink issIconsFlags		Keyword
-   HiLink issINIFlags		Keyword
-   HiLink issRegRootKey		Keyword
-   HiLink issRegValueType	Keyword
-   HiLink issRegFlags		Keyword
-   HiLink issRunFlags		Keyword
-   HiLink issTypesFlags		Keyword
-   HiLink issComponentsFlags	Keyword
-   HiLink issInstallDeleteType	Keyword
-   HiLink issTasksFlags		Keyword
+HiLink issDirsFlags		Keyword
+HiLink issFilesCopyMode	Keyword
+HiLink issFilesAttribs	Keyword
+HiLink issFilesPermissions	Keyword
+HiLink issFilesFlags		Keyword
+HiLink issIconsFlags		Keyword
+HiLink issINIFlags		Keyword
+HiLink issRegRootKey		Keyword
+HiLink issRegValueType	Keyword
+HiLink issRegFlags		Keyword
+HiLink issRunFlags		Keyword
+HiLink issTypesFlags		Keyword
+HiLink issComponentsFlags	Keyword
+HiLink issInstallDeleteType	Keyword
+HiLink issTasksFlags		Keyword
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "iss"
 
diff --git a/runtime/syntax/ist.vim b/runtime/syntax/ist.vim
index 131d833cbc..f3f005bf00 100644
--- a/runtime/syntax/ist.vim
+++ b/runtime/syntax/ist.vim
@@ -3,22 +3,15 @@
 " Maintainer:	Peter Meszaros <pmeszaros@effice.hu>
 " Last Change:	2012 Jan 08 by Thilo Six
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 let s:cpo_save = &cpo
 set cpo&vim
 
-if version >= 600
-  setlocal iskeyword=$,@,48-57,_
-else
-  set iskeyword=$,@,48-57,_
-endif
+setlocal iskeyword=$,@,48-57,_
 
 syn case ignore
 syn keyword IstInpSpec  actual  arg_close arg_open encap       escape
@@ -45,28 +38,20 @@ syn match   IstSpecial	   "\\\\\|{\|}\|#\|\\n"  contained
 syn match   IstTodo	   "DEBUG\|TODO"	 contained
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_dummy_syn_inits")
-  if version < 508
-    let did_dummy_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink IstInpSpec	Type
-  HiLink IstOutSpec	Identifier
-  HiLink IstString	String
-  HiLink IstNumber	Number
-  HiLink IstComment	Comment
-  HiLink IstTodo	Todo
-  HiLink IstSpecial	Special
-  HiLink IstDoubleQuote	Label
-  HiLink IstCharacter	Label
+HiLink IstInpSpec	Type
+HiLink IstOutSpec	Identifier
+HiLink IstString	String
+HiLink IstNumber	Number
+HiLink IstComment	Comment
+HiLink IstTodo	Todo
+HiLink IstSpecial	Special
+HiLink IstDoubleQuote	Label
+HiLink IstCharacter	Label
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "ist"
 
diff --git a/runtime/syntax/jal.vim b/runtime/syntax/jal.vim
index d0ba672851..ded2ecd3d1 100644
--- a/runtime/syntax/jal.vim
+++ b/runtime/syntax/jal.vim
@@ -9,11 +9,8 @@
 "
 " TODO test.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -171,77 +168,69 @@ endif
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_jal_syn_inits")
-if version < 508
-  let did_jal_syn_inits = 1
-  command -nargs=+ HiLink hi link <args>
-else
-  command -nargs=+ HiLink hi def link <args>
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink jalAcces		jalStatement
-  HiLink jalBoolean		Boolean
-  HiLink jalBit			Boolean
-  HiLink jalComment		Comment
-  HiLink jalConditional		Conditional
-  HiLink jalConstant		Constant
-  HiLink jalDelimiter		Identifier
-  HiLink jalDirective		PreProc
-  HiLink jalException		Exception
-  HiLink jalFloat		Float
-  HiLink jalFunction		Function
-  HiLink jalPsudoVarsKey	Function
-  HiLink jalLabel		Label
-  HiLink jalMatrixDelimiter	Identifier
-  HiLink jalModifier		Type
-  HiLink jalNumber		Number
-  HiLink jalBinNumber		Number
-  HiLink jalHexNumber		Number
-  HiLink jalOperator		Operator
-  HiLink jalPredefined		Constant
-  HiLink jalPreProc		PreProc
-  HiLink jalRepeat		Repeat
-  HiLink jalStatement		Statement
-  HiLink jalString		String
-  HiLink jalStringEscape	Special
-  HiLink jalStringEscapeGPC	Special
-  HiLink jalStringError		Error
-  HiLink jalStruct		jalStatement
-  HiLink jalSymbolOperator	jalOperator
-  HiLink jalTodo		Todo
-  HiLink jalType		Type
-  HiLink jalUnclassified	Statement
-  HiLink jalAsm			Assembler
-  HiLink jalError		Error
-  HiLink jalAsmKey		Statement
-  HiLink jalPIC			Statement
+HiLink jalAcces		jalStatement
+HiLink jalBoolean		Boolean
+HiLink jalBit			Boolean
+HiLink jalComment		Comment
+HiLink jalConditional		Conditional
+HiLink jalConstant		Constant
+HiLink jalDelimiter		Identifier
+HiLink jalDirective		PreProc
+HiLink jalException		Exception
+HiLink jalFloat		Float
+HiLink jalFunction		Function
+HiLink jalPsudoVarsKey	Function
+HiLink jalLabel		Label
+HiLink jalMatrixDelimiter	Identifier
+HiLink jalModifier		Type
+HiLink jalNumber		Number
+HiLink jalBinNumber		Number
+HiLink jalHexNumber		Number
+HiLink jalOperator		Operator
+HiLink jalPredefined		Constant
+HiLink jalPreProc		PreProc
+HiLink jalRepeat		Repeat
+HiLink jalStatement		Statement
+HiLink jalString		String
+HiLink jalStringEscape	Special
+HiLink jalStringEscapeGPC	Special
+HiLink jalStringError		Error
+HiLink jalStruct		jalStatement
+HiLink jalSymbolOperator	jalOperator
+HiLink jalTodo		Todo
+HiLink jalType		Type
+HiLink jalUnclassified	Statement
+HiLink jalAsm			Assembler
+HiLink jalError		Error
+HiLink jalAsmKey		Statement
+HiLink jalPIC			Statement
 
-  HiLink jalShowTab		Error
+HiLink jalShowTab		Error
 
-  HiLink picTodo		Todo
-  HiLink picComment		Comment
-  HiLink picDirective		Statement
-  HiLink picLabel		Label
-  HiLink picString		String
+HiLink picTodo		Todo
+HiLink picComment		Comment
+HiLink picDirective		Statement
+HiLink picLabel		Label
+HiLink picString		String
 
-  HiLink picOpcode		Keyword
-  HiLink picRegister		Structure
-  HiLink picRegisterPart	Special
-  HiLink picPinDir		SPecial
-  HiLink picPortDir		SPecial
+HiLink picOpcode		Keyword
+HiLink picRegister		Structure
+HiLink picRegisterPart	Special
+HiLink picPinDir		SPecial
+HiLink picPortDir		SPecial
 
-  HiLink picASCII		String
-  HiLink picBinary		Number
-  HiLink picDecimal		Number
-  HiLink picHexadecimal		Number
-  HiLink picOctal		Number
+HiLink picASCII		String
+HiLink picBinary		Number
+HiLink picDecimal		Number
+HiLink picHexadecimal		Number
+HiLink picOctal		Number
 
-  HiLink picIdentifier		Identifier
+HiLink picIdentifier		Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "jal"
diff --git a/runtime/syntax/jam.vim b/runtime/syntax/jam.vim
index cbd99bb9ce..f165a78eff 100644
--- a/runtime/syntax/jam.vim
+++ b/runtime/syntax/jam.vim
@@ -3,22 +3,15 @@
 " Maintainer:	Ralf Lemke (ralflemk@t-online.de)
 " Last change:	2012 Jan 08 by Thilo Six
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 let s:cpo_save = &cpo
 set cpo&vim
 
-if version >= 600
-  setlocal iskeyword=@,48-57,_,-
-else
-  set iskeyword=@,48-57,_,-
-endif
+setlocal iskeyword=@,48-57,_,-
 
 " A bunch of useful jam keywords
 syn keyword	jamStatement	break call dbms flush global include msg parms proc public receive return send unload vars
@@ -167,88 +160,80 @@ syntax match	jamCommentError	"\*/"
 syntax match    jamOperator3Error   "*/"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_jam_syn_inits")
-  if version < 508
-    let did_jam_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-    HiLink jamCommentL		jamComment
-    HiLink jamCommentL2		jamComment
-    HiLink jamOperator3Error	jamError
-    HiLink jamConditional	Conditional
-    HiLink jamRepeat		Repeat
-    HiLink jamCharacter		Character
-    HiLink jamSpecialCharacter	jamSpecial
-    HiLink jamNumber		Number
-    HiLink jamParenError	jamError
-    HiLink jamErrInParen	jamError
-    HiLink jamErrInBracket	jamError
-    HiLink jamCommentError	jamError
-    HiLink jamSpaceError	jamError
-    HiLink jamSpecialError	jamError
-    HiLink jamOperator1		jamOperator
-    HiLink jamOperator2		jamOperator
-    HiLink jamOperator3		jamOperator
-    HiLink jamOperator4		jamOperator
-    HiLink jamOperator5		jamOperator
-    HiLink jamOperator6		jamOperator
-    HiLink jamOperator7		jamOperator
-    HiLink jamOperator8		jamOperator
-    HiLink jamOperator9		jamOperator
-    HiLink jamOperator10	jamOperator
-    HiLink jamOperator11	jamOperator
-    HiLink jamOperator12	jamOperator
-    HiLink jamOperator13	jamOperator
-    HiLink jamOperator14	jamOperator
-    HiLink jamError		Error
-    HiLink jamStatement		Statement
-    HiLink jamPreCondit		PreCondit
-    HiLink jamCommentError	jamError
-    HiLink jamCommentString	jamString
-    HiLink jamComment2String	jamString
-    HiLink jamCommentSkip	jamComment
-    HiLink jamString		String
-    HiLink jamComment		Comment
-    HiLink jamSpecial		SpecialChar
-    HiLink jamTodo		Todo
-    HiLink jamCppSkip		jamCppOut
-    HiLink jamCppOut2		jamCppOut
-    HiLink jamCppOut		Comment
-    HiLink jamDBState1		Identifier
-    HiLink jamDBState2		Identifier
-    HiLink jamSQLState1		jamSQL
-    HiLink jamSQLState2		jamSQL
-    HiLink jamLibFunc1		jamLibFunc
-    HiLink jamLibFunc2		jamLibFunc
-    HiLink jamLibFunc3		jamLibFunc
-    HiLink jamLibFunc4		jamLibFunc
-    HiLink jamLibFunc5		jamLibFunc
-    HiLink jamLibFunc6		jamLibFunc
-    HiLink jamLibFunc7		jamLibFunc
-    HiLink jamLibFunc8		jamLibFunc
-    HiLink jamLibFunc9		jamLibFunc
-    HiLink jamVariable1		jamVariablen
-    HiLink jamVariable2		jamVariablen
-    HiLink jamVariable3		jamVariablen
-    HiLink jamVariable4		jamVariablen
-    HiLink jamVariable5		jamVariablen
-    HiLink jamVariable6		jamVariablen
-    HiLink jamVariable7		jamVariablen
-    HiLink jamVariable8		jamVariablen
-    HiLink jamVariable9		jamVariablen
-    HiLink jamVariable10	jamVariablen
-    HiLink jamVariablen		Constant
-    HiLink jamSQL		Type
-    HiLink jamLibFunc		PreProc
-    HiLink jamOperator		Special
+HiLink jamCommentL		jamComment
+HiLink jamCommentL2		jamComment
+HiLink jamOperator3Error	jamError
+HiLink jamConditional	Conditional
+HiLink jamRepeat		Repeat
+HiLink jamCharacter		Character
+HiLink jamSpecialCharacter	jamSpecial
+HiLink jamNumber		Number
+HiLink jamParenError	jamError
+HiLink jamErrInParen	jamError
+HiLink jamErrInBracket	jamError
+HiLink jamCommentError	jamError
+HiLink jamSpaceError	jamError
+HiLink jamSpecialError	jamError
+HiLink jamOperator1		jamOperator
+HiLink jamOperator2		jamOperator
+HiLink jamOperator3		jamOperator
+HiLink jamOperator4		jamOperator
+HiLink jamOperator5		jamOperator
+HiLink jamOperator6		jamOperator
+HiLink jamOperator7		jamOperator
+HiLink jamOperator8		jamOperator
+HiLink jamOperator9		jamOperator
+HiLink jamOperator10	jamOperator
+HiLink jamOperator11	jamOperator
+HiLink jamOperator12	jamOperator
+HiLink jamOperator13	jamOperator
+HiLink jamOperator14	jamOperator
+HiLink jamError		Error
+HiLink jamStatement		Statement
+HiLink jamPreCondit		PreCondit
+HiLink jamCommentError	jamError
+HiLink jamCommentString	jamString
+HiLink jamComment2String	jamString
+HiLink jamCommentSkip	jamComment
+HiLink jamString		String
+HiLink jamComment		Comment
+HiLink jamSpecial		SpecialChar
+HiLink jamTodo		Todo
+HiLink jamCppSkip		jamCppOut
+HiLink jamCppOut2		jamCppOut
+HiLink jamCppOut		Comment
+HiLink jamDBState1		Identifier
+HiLink jamDBState2		Identifier
+HiLink jamSQLState1		jamSQL
+HiLink jamSQLState2		jamSQL
+HiLink jamLibFunc1		jamLibFunc
+HiLink jamLibFunc2		jamLibFunc
+HiLink jamLibFunc3		jamLibFunc
+HiLink jamLibFunc4		jamLibFunc
+HiLink jamLibFunc5		jamLibFunc
+HiLink jamLibFunc6		jamLibFunc
+HiLink jamLibFunc7		jamLibFunc
+HiLink jamLibFunc8		jamLibFunc
+HiLink jamLibFunc9		jamLibFunc
+HiLink jamVariable1		jamVariablen
+HiLink jamVariable2		jamVariablen
+HiLink jamVariable3		jamVariablen
+HiLink jamVariable4		jamVariablen
+HiLink jamVariable5		jamVariablen
+HiLink jamVariable6		jamVariablen
+HiLink jamVariable7		jamVariablen
+HiLink jamVariable8		jamVariablen
+HiLink jamVariable9		jamVariablen
+HiLink jamVariable10	jamVariablen
+HiLink jamVariablen		Constant
+HiLink jamSQL		Type
+HiLink jamLibFunc		PreProc
+HiLink jamOperator		Special
 
-    delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "jam"
 
diff --git a/runtime/syntax/jargon.vim b/runtime/syntax/jargon.vim
index 25a88bc981..97b03c3478 100644
--- a/runtime/syntax/jargon.vim
+++ b/runtime/syntax/jargon.vim
@@ -3,11 +3,8 @@
 " Maintainer:	<rms@poczta.onet.pl>
 " Last Change:	2001 May 26
 "
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
@@ -17,20 +14,12 @@ syn match jargonUrl	 +\(http\|ftp\)://[^\t )"]*+
 syn match jargonMark	/{[^}]*}/
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_jargon_syntax_inits")
-	if version < 508
-		let did_jargon_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
-	HiLink jargonChaptTitle	Title
-	HiLink jargonEmailAddr	 Comment
-	HiLink jargonUrl	 Comment
-	HiLink jargonMark	Label
-	delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+HiLink jargonChaptTitle	Title
+HiLink jargonEmailAddr	 Comment
+HiLink jargonUrl	 Comment
+HiLink jargonMark	Label
+delcommand HiLink
 
 let b:current_syntax = "jargon"
diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim
index e113a904c3..c22c67bba3 100644
--- a/runtime/syntax/java.vim
+++ b/runtime/syntax/java.vim
@@ -6,11 +6,9 @@
 
 " Please check :help java.vim for comments on some of the options available.
 
-" Quit when a syntax file was already loaded
+" quit when a syntax file was already loaded
 if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
+  if exists("b:current_syntax")
     finish
   endif
   " we define it here so that included files can test for it
@@ -22,11 +20,7 @@ let s:cpo_save = &cpo
 set cpo&vim
 
 " don't use standard HiLink, it will not work with included syntax files
-if version < 508
-  command! -nargs=+ JavaHiLink hi link <args>
-else
-  command! -nargs=+ JavaHiLink hi def link <args>
-endif
+command! -nargs=+ JavaHiLink hi def link <args>
 
 " some characters that cannot be in a java program (outside a string)
 syn match javaError "[\\@`]"
@@ -242,23 +236,21 @@ if exists("java_highlight_debug")
 
   syn cluster javaTop add=javaDebug
 
-  if version >= 508 || !exists("did_c_syn_inits")
-    JavaHiLink javaDebug		 Debug
-    JavaHiLink javaDebugString		 DebugString
-    JavaHiLink javaDebugStringError	 javaError
-    JavaHiLink javaDebugType		 DebugType
-    JavaHiLink javaDebugBoolean		 DebugBoolean
-    JavaHiLink javaDebugNumber		 Debug
-    JavaHiLink javaDebugSpecial		 DebugSpecial
-    JavaHiLink javaDebugSpecialCharacter DebugSpecial
-    JavaHiLink javaDebugCharacter	 DebugString
-    JavaHiLink javaDebugParen		 Debug
+  JavaHiLink javaDebug		 Debug
+  JavaHiLink javaDebugString		 DebugString
+  JavaHiLink javaDebugStringError	 javaError
+  JavaHiLink javaDebugType		 DebugType
+  JavaHiLink javaDebugBoolean		 DebugBoolean
+  JavaHiLink javaDebugNumber		 Debug
+  JavaHiLink javaDebugSpecial		 DebugSpecial
+  JavaHiLink javaDebugSpecialCharacter DebugSpecial
+  JavaHiLink javaDebugCharacter	 DebugString
+  JavaHiLink javaDebugParen		 Debug
 
-    JavaHiLink DebugString		 String
-    JavaHiLink DebugSpecial		 Special
-    JavaHiLink DebugBoolean		 Boolean
-    JavaHiLink DebugType		 Type
-  endif
+  JavaHiLink DebugString		 String
+  JavaHiLink DebugSpecial		 Special
+  JavaHiLink DebugBoolean		 Boolean
+  JavaHiLink DebugType		 Type
 endif
 
 if exists("java_mark_braces_in_parens_as_errors")
@@ -291,59 +283,54 @@ endif
 exec "syn sync ccomment javaComment minlines=" . java_minlines
 
 " The default highlighting.
-if version >= 508 || !exists("did_java_syn_inits")
-  if version < 508
-    let did_java_syn_inits = 1
-  endif
-  JavaHiLink javaLambdaDef		Function
-  JavaHiLink javaFuncDef		Function
-  JavaHiLink javaVarArg			Function
-  JavaHiLink javaBraces			Function
-  JavaHiLink javaBranch			Conditional
-  JavaHiLink javaUserLabelRef		javaUserLabel
-  JavaHiLink javaLabel			Label
-  JavaHiLink javaUserLabel		Label
-  JavaHiLink javaConditional		Conditional
-  JavaHiLink javaRepeat			Repeat
-  JavaHiLink javaExceptions		Exception
-  JavaHiLink javaAssert			Statement
-  JavaHiLink javaStorageClass		StorageClass
-  JavaHiLink javaMethodDecl		javaStorageClass
-  JavaHiLink javaClassDecl		javaStorageClass
-  JavaHiLink javaScopeDecl		javaStorageClass
-  JavaHiLink javaBoolean		Boolean
-  JavaHiLink javaSpecial		Special
-  JavaHiLink javaSpecialError		Error
-  JavaHiLink javaSpecialCharError	Error
-  JavaHiLink javaString			String
-  JavaHiLink javaCharacter		Character
-  JavaHiLink javaSpecialChar		SpecialChar
-  JavaHiLink javaNumber			Number
-  JavaHiLink javaError			Error
-  JavaHiLink javaStringError		Error
-  JavaHiLink javaStatement		Statement
-  JavaHiLink javaOperator		Operator
-  JavaHiLink javaComment		Comment
-  JavaHiLink javaDocComment		Comment
-  JavaHiLink javaLineComment		Comment
-  JavaHiLink javaConstant		Constant
-  JavaHiLink javaTypedef		Typedef
-  JavaHiLink javaTodo			Todo
-  JavaHiLink javaAnnotation		PreProc
+JavaHiLink javaLambdaDef		Function
+JavaHiLink javaFuncDef		Function
+JavaHiLink javaVarArg			Function
+JavaHiLink javaBraces			Function
+JavaHiLink javaBranch			Conditional
+JavaHiLink javaUserLabelRef		javaUserLabel
+JavaHiLink javaLabel			Label
+JavaHiLink javaUserLabel		Label
+JavaHiLink javaConditional		Conditional
+JavaHiLink javaRepeat			Repeat
+JavaHiLink javaExceptions		Exception
+JavaHiLink javaAssert			Statement
+JavaHiLink javaStorageClass		StorageClass
+JavaHiLink javaMethodDecl		javaStorageClass
+JavaHiLink javaClassDecl		javaStorageClass
+JavaHiLink javaScopeDecl		javaStorageClass
+JavaHiLink javaBoolean		Boolean
+JavaHiLink javaSpecial		Special
+JavaHiLink javaSpecialError		Error
+JavaHiLink javaSpecialCharError	Error
+JavaHiLink javaString			String
+JavaHiLink javaCharacter		Character
+JavaHiLink javaSpecialChar		SpecialChar
+JavaHiLink javaNumber			Number
+JavaHiLink javaError			Error
+JavaHiLink javaStringError		Error
+JavaHiLink javaStatement		Statement
+JavaHiLink javaOperator		Operator
+JavaHiLink javaComment		Comment
+JavaHiLink javaDocComment		Comment
+JavaHiLink javaLineComment		Comment
+JavaHiLink javaConstant		Constant
+JavaHiLink javaTypedef		Typedef
+JavaHiLink javaTodo			Todo
+JavaHiLink javaAnnotation		PreProc
 
-  JavaHiLink javaCommentTitle		SpecialComment
-  JavaHiLink javaDocTags		Special
-  JavaHiLink javaDocParam		Function
-  JavaHiLink javaDocSeeTagParam		Function
-  JavaHiLink javaCommentStar		javaComment
+JavaHiLink javaCommentTitle		SpecialComment
+JavaHiLink javaDocTags		Special
+JavaHiLink javaDocParam		Function
+JavaHiLink javaDocSeeTagParam		Function
+JavaHiLink javaCommentStar		javaComment
 
-  JavaHiLink javaType			Type
-  JavaHiLink javaExternal		Include
+JavaHiLink javaType			Type
+JavaHiLink javaExternal		Include
 
-  JavaHiLink htmlComment		Special
-  JavaHiLink htmlCommentPart		Special
-  JavaHiLink javaSpaceError		Error
-endif
+JavaHiLink htmlComment		Special
+JavaHiLink htmlCommentPart		Special
+JavaHiLink javaSpaceError		Error
 
 delcommand JavaHiLink
 
diff --git a/runtime/syntax/javacc.vim b/runtime/syntax/javacc.vim
index 5458de754e..93d174097e 100644
--- a/runtime/syntax/javacc.vim
+++ b/runtime/syntax/javacc.vim
@@ -7,11 +7,8 @@
 " Uses java.vim, and adds a few special things for JavaCC Parser files.
 " Those files usually have the extension  *.jj
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -19,11 +16,7 @@ let s:cpo_save = &cpo
 set cpo&vim
 
 " source the java.vim file
-if version < 600
-  source <sfile>:p:h/java.vim
-else
-  runtime! syntax/java.vim
-endif
+runtime! syntax/java.vim
 unlet b:current_syntax
 
 "remove catching errors caused by wrong parenthesis (does not work in javacc
@@ -58,22 +51,14 @@ syn keyword javaccActionToken TOKEN SKIP MORE SPECIAL_TOKEN
 syn keyword javaccError DEBUG IGNORE_IN_BNF
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_css_syn_inits")
-  if version < 508
-    let did_css_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink javaccSpecToken Statement
-  HiLink javaccActionToken Type
-  HiLink javaccPackages javaScopeDecl
-  HiLink javaccToken String
-  HiLink javaccError Error
-  delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+HiLink javaccSpecToken Statement
+HiLink javaccActionToken Type
+HiLink javaccPackages javaScopeDecl
+HiLink javaccToken String
+HiLink javaccError Error
+delcommand HiLink
 
 let b:current_syntax = "javacc"
 let &cpo = s:cpo_save
diff --git a/runtime/syntax/javascript.vim b/runtime/syntax/javascript.vim
index 1b20f987d9..e3e8262d39 100644
--- a/runtime/syntax/javascript.vim
+++ b/runtime/syntax/javascript.vim
@@ -10,15 +10,12 @@
 " Last Change:	2012 Oct 05
 " 		2013 Jun 12: adjusted javaScriptRegexpString (Kevin Locke)
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
 " tuning parameters:
 " unlet javaScript_fold
 
 if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
+  " quit when a syntax file was already loaded
+  if exists("b:current_syntax")
     finish
   endif
   let main_syntax = 'javascript'
@@ -29,11 +26,6 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-" Drop fold if it set but vim doesn't support it.
-if version < 600 && exists("javaScript_fold")
-  unlet javaScript_fold
-endif
-
 
 syn keyword javaScriptCommentTodo      TODO FIXME XXX TBD contained
 syn match   javaScriptLineComment      "\/\/.*" contains=@Spell,javaScriptCommentTodo
@@ -87,51 +79,43 @@ if main_syntax == "javascript"
 endif
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_javascript_syn_inits")
-  if version < 508
-    let did_javascript_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink javaScriptComment		Comment
-  HiLink javaScriptLineComment		Comment
-  HiLink javaScriptCommentTodo		Todo
-  HiLink javaScriptSpecial		Special
-  HiLink javaScriptStringS		String
-  HiLink javaScriptStringD		String
-  HiLink javaScriptCharacter		Character
-  HiLink javaScriptSpecialCharacter	javaScriptSpecial
-  HiLink javaScriptNumber		javaScriptValue
-  HiLink javaScriptConditional		Conditional
-  HiLink javaScriptRepeat		Repeat
-  HiLink javaScriptBranch		Conditional
-  HiLink javaScriptOperator		Operator
-  HiLink javaScriptType			Type
-  HiLink javaScriptStatement		Statement
-  HiLink javaScriptFunction		Function
-  HiLink javaScriptBraces		Function
-  HiLink javaScriptError		Error
-  HiLink javaScrParenError		javaScriptError
-  HiLink javaScriptNull			Keyword
-  HiLink javaScriptBoolean		Boolean
-  HiLink javaScriptRegexpString		String
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+HiLink javaScriptComment		Comment
+HiLink javaScriptLineComment		Comment
+HiLink javaScriptCommentTodo		Todo
+HiLink javaScriptSpecial		Special
+HiLink javaScriptStringS		String
+HiLink javaScriptStringD		String
+HiLink javaScriptCharacter		Character
+HiLink javaScriptSpecialCharacter	javaScriptSpecial
+HiLink javaScriptNumber		javaScriptValue
+HiLink javaScriptConditional		Conditional
+HiLink javaScriptRepeat		Repeat
+HiLink javaScriptBranch		Conditional
+HiLink javaScriptOperator		Operator
+HiLink javaScriptType			Type
+HiLink javaScriptStatement		Statement
+HiLink javaScriptFunction		Function
+HiLink javaScriptBraces		Function
+HiLink javaScriptError		Error
+HiLink javaScrParenError		javaScriptError
+HiLink javaScriptNull			Keyword
+HiLink javaScriptBoolean		Boolean
+HiLink javaScriptRegexpString		String
 
-  HiLink javaScriptIdentifier		Identifier
-  HiLink javaScriptLabel		Label
-  HiLink javaScriptException		Exception
-  HiLink javaScriptMessage		Keyword
-  HiLink javaScriptGlobal		Keyword
-  HiLink javaScriptMember		Keyword
-  HiLink javaScriptDeprecated		Exception 
-  HiLink javaScriptReserved		Keyword
-  HiLink javaScriptDebug		Debug
-  HiLink javaScriptConstant		Label
+HiLink javaScriptIdentifier		Identifier
+HiLink javaScriptLabel		Label
+HiLink javaScriptException		Exception
+HiLink javaScriptMessage		Keyword
+HiLink javaScriptGlobal		Keyword
+HiLink javaScriptMember		Keyword
+HiLink javaScriptDeprecated		Exception 
+HiLink javaScriptReserved		Keyword
+HiLink javaScriptDebug		Debug
+HiLink javaScriptConstant		Label
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "javascript"
 if main_syntax == 'javascript'
diff --git a/runtime/syntax/jess.vim b/runtime/syntax/jess.vim
index 243bab351e..ad625ac73f 100644
--- a/runtime/syntax/jess.vim
+++ b/runtime/syntax/jess.vim
@@ -4,19 +4,12 @@
 " Last change:	September 14, 2000
 " Based on lisp.vim by : Dr. Charles E. Campbell, Jr.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
-if version < 600
-  set iskeyword=42,43,45,47-58,60-62,64-90,97-122,_
-else
-  setlocal iskeyword=42,43,45,47-58,60-62,64-90,97-122,_
-endif
+setlocal iskeyword=42,43,45,47-58,60-62,64-90,97-122,_
 
 " Lists
 syn match	jessSymbol	![^()'`,"; \t]\+!	contained
@@ -125,36 +118,28 @@ syn match	jessComment	";.*$"
 syn sync lines=100
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_jess_syntax_inits")
-  if version < 508
-    let did_jess_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink jessAtomNmbr	jessNumber
-  HiLink jessAtomMark	jessMark
+HiLink jessAtomNmbr	jessNumber
+HiLink jessAtomMark	jessMark
 
-  HiLink jessAtom		Identifier
-  HiLink jessAtomBarSymbol	Special
-  HiLink jessBarSymbol	Special
-  HiLink jessComment	Comment
-  HiLink jessConcat	Statement
-  HiLink jessDeclaration	Statement
-  HiLink jessFunc		Statement
-  HiLink jessKey		Type
-  HiLink jessMark		Delimiter
-  HiLink jessNumber	Number
-  HiLink jessParenError	Error
-  HiLink jessSpecial	Type
-  HiLink jessString	String
-  HiLink jessVar		Identifier
+HiLink jessAtom		Identifier
+HiLink jessAtomBarSymbol	Special
+HiLink jessBarSymbol	Special
+HiLink jessComment	Comment
+HiLink jessConcat	Statement
+HiLink jessDeclaration	Statement
+HiLink jessFunc		Statement
+HiLink jessKey		Type
+HiLink jessMark		Delimiter
+HiLink jessNumber	Number
+HiLink jessParenError	Error
+HiLink jessSpecial	Type
+HiLink jessString	String
+HiLink jessVar		Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "jess"
 
diff --git a/runtime/syntax/jgraph.vim b/runtime/syntax/jgraph.vim
index 7ecd5afaec..43fc4275de 100644
--- a/runtime/syntax/jgraph.vim
+++ b/runtime/syntax/jgraph.vim
@@ -5,11 +5,8 @@
 " this syntax file is not yet complete
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -36,23 +33,15 @@ syn match  jgraphNumber		 "\-\=\.\d\+\>"
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_jgraph_syn_inits")
-  if version < 508
-    let did_jgraph_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink jgraphComment	Comment
-  HiLink jgraphCmd	Identifier
-  HiLink jgraphType	Type
-  HiLink jgraphNumber	Number
+HiLink jgraphComment	Comment
+HiLink jgraphCmd	Identifier
+HiLink jgraphType	Type
+HiLink jgraphNumber	Number
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "jgraph"
diff --git a/runtime/syntax/jproperties.vim b/runtime/syntax/jproperties.vim
index 9343bd292b..bde160b24d 100644
--- a/runtime/syntax/jproperties.vim
+++ b/runtime/syntax/jproperties.vim
@@ -43,11 +43,8 @@ endif
 
 " =============================================================================
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -120,28 +117,20 @@ syn match   jpropertiesComment		"^\s*[#!].*$" contains=jpropertiesTODO
 syn keyword jpropertiesTodo		TODO FIXME XXX contained
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_jproperties_syntax_inits")
-  if version < 508
-    let did_jproperties_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink jpropertiesComment	Comment
-	HiLink jpropertiesTodo		Todo
-	HiLink jpropertiesIdentifier	Identifier
-	HiLink jpropertiesString	String
-	HiLink jpropertiesExtendString	String
-	HiLink jpropertiesCharacter	Character
-	HiLink jpropertiesSpecial	Special
-	HiLink jpropertiesSpecialChar	SpecialChar
-	HiLink jpropertiesError	Error
+HiLink jpropertiesComment	Comment
+HiLink jpropertiesTodo		Todo
+HiLink jpropertiesIdentifier	Identifier
+HiLink jpropertiesString	String
+HiLink jpropertiesExtendString	String
+HiLink jpropertiesCharacter	Character
+HiLink jpropertiesSpecial	Special
+HiLink jpropertiesSpecialChar	SpecialChar
+HiLink jpropertiesError	Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "jproperties"
 
diff --git a/runtime/syntax/json.vim b/runtime/syntax/json.vim
index 1fdfea2d09..34c26d37d8 100644
--- a/runtime/syntax/json.vim
+++ b/runtime/syntax/json.vim
@@ -5,9 +5,8 @@
 " Version:      0.12
 
 if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
+  " quit when a syntax file was already loaded
+  if exists("b:current_syntax")
     finish
   endif
   let main_syntax = 'json'
@@ -93,39 +92,31 @@ syn region  jsonFold matchgroup=jsonBraces start="{" end=/}\(\_s\+\ze\("\|{\)\)\
 syn region  jsonFold matchgroup=jsonBraces start="\[" end=/]\(\_s\+\ze"\)\@!/ transparent fold
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_json_syn_inits")
-  if version < 508
-    let did_json_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink jsonPadding         Operator
-  HiLink jsonString          String
-  HiLink jsonTest          Label
-  HiLink jsonEscape          Special
-  HiLink jsonNumber          Number
-  HiLink jsonBraces          Delimiter
-  HiLink jsonNull            Function
-  HiLink jsonBoolean         Boolean
-  HiLink jsonKeyword         Label
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+HiLink jsonPadding         Operator
+HiLink jsonString          String
+HiLink jsonTest          Label
+HiLink jsonEscape          Special
+HiLink jsonNumber          Number
+HiLink jsonBraces          Delimiter
+HiLink jsonNull            Function
+HiLink jsonBoolean         Boolean
+HiLink jsonKeyword         Label
 
-	if (!exists("g:vim_json_warnings") || g:vim_json_warnings==1)
-	  HiLink jsonNumError        Error
-	  HiLink jsonCommentError    Error
-	  HiLink jsonSemicolonError  Error
-	  HiLink jsonTrailingCommaError     Error
-	  HiLink jsonMissingCommaError      Error
-	  HiLink jsonStringSQError        	Error
-	  HiLink jsonNoQuotesError        	Error
-	  HiLink jsonTripleQuotesError     	Error
-  endif
-  HiLink jsonQuote           Quote
-  HiLink jsonNoise           Noise
-  delcommand HiLink
+if (!exists("g:vim_json_warnings") || g:vim_json_warnings==1)
+HiLink jsonNumError        Error
+HiLink jsonCommentError    Error
+HiLink jsonSemicolonError  Error
+HiLink jsonTrailingCommaError     Error
+HiLink jsonMissingCommaError      Error
+HiLink jsonStringSQError        	Error
+HiLink jsonNoQuotesError        	Error
+HiLink jsonTripleQuotesError     	Error
 endif
+HiLink jsonQuote           Quote
+HiLink jsonNoise           Noise
+delcommand HiLink
 
 let b:current_syntax = "json"
 if main_syntax == 'json'
diff --git a/runtime/syntax/jsp.vim b/runtime/syntax/jsp.vim
index 9766657596..812a81465b 100644
--- a/runtime/syntax/jsp.vim
+++ b/runtime/syntax/jsp.vim
@@ -6,11 +6,8 @@
 " Credits : Patch by Darren Greaves (recognizes <jsp:...> tags)
 "	    Patch by Thomas Kimpton (recognizes jspExpr inside HTML tags)
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -19,11 +16,7 @@ if !exists("main_syntax")
 endif
 
 " Source HTML syntax
-if version < 600
-  source <sfile>:p:h/html.vim
-else
-  runtime! syntax/html.vim
-endif
+runtime! syntax/html.vim
 unlet b:current_syntax
 
 " Next syntax items are case-sensitive
@@ -52,29 +45,21 @@ syn clear htmlTag
 syn region htmlTag start=+<[^/%]+ end=+>+ contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent,htmlCssDefinition,@htmlPreproc,@htmlArgCluster,jspExpr,javaScript
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_jsp_syn_inits")
-  if version < 508
-    let did_jsp_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  " java.vim has redefined htmlComment highlighting
-  HiLink htmlComment	 Comment
-  HiLink htmlCommentPart Comment
-  " Be consistent with html highlight settings
-  HiLink jspComment	 htmlComment
-  HiLink jspTag		 htmlTag
-  HiLink jspDirective	 jspTag
-  HiLink jspDirName	 htmlTagName
-  HiLink jspDirArg	 htmlArg
-  HiLink jspCommand	 jspTag
-  HiLink jspCommandName  htmlTagName
-  HiLink jspCommandArg	 htmlArg
-  delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+" java.vim has redefined htmlComment highlighting
+HiLink htmlComment	 Comment
+HiLink htmlCommentPart Comment
+" Be consistent with html highlight settings
+HiLink jspComment	 htmlComment
+HiLink jspTag		 htmlTag
+HiLink jspDirective	 jspTag
+HiLink jspDirName	 htmlTagName
+HiLink jspDirArg	 htmlArg
+HiLink jspCommand	 jspTag
+HiLink jspCommandName  htmlTagName
+HiLink jspCommandArg	 htmlArg
+delcommand HiLink
 
 if main_syntax == 'jsp'
   unlet main_syntax
diff --git a/runtime/syntax/kix.vim b/runtime/syntax/kix.vim
index 800e286042..cbc837c4d1 100644
--- a/runtime/syntax/kix.vim
+++ b/runtime/syntax/kix.vim
@@ -19,10 +19,8 @@
 "	Work out how to error too many "(", i.e. (() should be an error.
 "	Similarly, "if" without "endif" and similar constructs should error.
 
-" Clear legacy syntax rules for version 5.x, exit if already processed for version 6+
-if version < 600
-	syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
@@ -130,52 +128,44 @@ syn match   kixExpression	"<\|>\|<=\|>=\|<>"
 
 
 " Default highlighting.
-" Version < 5.8 set default highlight if file not already processed.
-" Version >= 5.8 set default highlight only if it doesn't already have a value.
-if version > 508 || !exists("did_kix_syn_inits")
-	if version < 508
-		let did_kix_syn_inits=1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+" Set default highlight only if it doesn't already have a value.
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink kixDoubleString		String
-	HiLink kixSingleString		String
-	HiLink kixStatement		Statement
-	HiLink kixRepeat		Repeat
-	HiLink kixComment		Comment
-	HiLink kixBuiltin		Function
-	HiLink kixLocalVar		Special
-	HiLink kixMacro			Special
-	HiLink kixEnvVar		Special
-	HiLink kixLabel			Type
-	HiLink kixFunction		Function
-	HiLink kixInteger		Number
-	HiLink kixHex			Number
-	HiLink kixFloat			Number
-	HiLink kixOperator		Operator
-	HiLink kixExpression		Operator
+HiLink kixDoubleString		String
+HiLink kixSingleString		String
+HiLink kixStatement		Statement
+HiLink kixRepeat		Repeat
+HiLink kixComment		Comment
+HiLink kixBuiltin		Function
+HiLink kixLocalVar		Special
+HiLink kixMacro			Special
+HiLink kixEnvVar		Special
+HiLink kixLabel			Type
+HiLink kixFunction		Function
+HiLink kixInteger		Number
+HiLink kixHex			Number
+HiLink kixFloat			Number
+HiLink kixOperator		Operator
+HiLink kixExpression		Operator
 
-	HiLink kixParenCloseError	Error
-	HiLink kixBrackCloseError	Error
-	HiLink kixStringError		Error
+HiLink kixParenCloseError	Error
+HiLink kixBrackCloseError	Error
+HiLink kixStringError		Error
 
-	HiLink kixWhileError		Error
-	HiLink kixWhileOK		Conditional
-	HiLink kixDoError		Error
-	HiLink kixDoOK			Conditional
-	HiLink kixIfError		Error
-	HiLink kixIfOK			Conditional
-	HiLink kixSelectError		Error
-	HiLink kixSelectOK		Conditional
-	HiLink kixForNextError		Error
-	HiLink kixForNextOK		Conditional
-	HiLink kixForEachError		Error
-	HiLink kixForEachOK		Conditional
+HiLink kixWhileError		Error
+HiLink kixWhileOK		Conditional
+HiLink kixDoError		Error
+HiLink kixDoOK			Conditional
+HiLink kixIfError		Error
+HiLink kixIfOK			Conditional
+HiLink kixSelectError		Error
+HiLink kixSelectOK		Conditional
+HiLink kixForNextError		Error
+HiLink kixForNextOK		Conditional
+HiLink kixForEachError		Error
+HiLink kixForEachOK		Conditional
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "kix"
 
diff --git a/runtime/syntax/kscript.vim b/runtime/syntax/kscript.vim
index cefbe39a29..e06b49d880 100644
--- a/runtime/syntax/kscript.vim
+++ b/runtime/syntax/kscript.vim
@@ -4,11 +4,8 @@
 " URL:		http://aquila.rezel.enst.fr/thomas/vim/kscript.vim
 " CVS:		$Id: kscript.vim,v 1.1 2004/06/13 17:40:02 vimboss Exp $
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -37,33 +34,25 @@ syn region	kscriptString		start=+"""+  end=+"""+
 syn region	kscriptString		start=+'''+  end=+'''+
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_kscript_syntax_inits")
-  if version < 508
-    let did_kscript_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink kscriptConditional		Conditional
-  HiLink kscriptRepeat			Repeat
-  HiLink kscriptExceptions		Statement
-  HiLink kscriptFunction		Function
-  HiLink kscriptConst			Constant
-  HiLink kscriptStatement		Statement
-  HiLink kscriptLabel			Label
-  HiLink kscriptStorageClass		StorageClass
-  HiLink kscriptType			Type
-  HiLink kscriptTodo			Todo
-  HiLink kscriptComment		Comment
-  HiLink kscriptString			String
-  HiLink kscriptPreCondit		PreCondit
-  HiLink kscriptHardCoded		Statement
+HiLink kscriptConditional		Conditional
+HiLink kscriptRepeat			Repeat
+HiLink kscriptExceptions		Statement
+HiLink kscriptFunction		Function
+HiLink kscriptConst			Constant
+HiLink kscriptStatement		Statement
+HiLink kscriptLabel			Label
+HiLink kscriptStorageClass		StorageClass
+HiLink kscriptType			Type
+HiLink kscriptTodo			Todo
+HiLink kscriptComment		Comment
+HiLink kscriptString			String
+HiLink kscriptPreCondit		PreCondit
+HiLink kscriptHardCoded		Statement
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "kscript"
 
diff --git a/runtime/syntax/kwt.vim b/runtime/syntax/kwt.vim
index 4c2c9d9dc0..b711663c46 100644
--- a/runtime/syntax/kwt.vim
+++ b/runtime/syntax/kwt.vim
@@ -3,21 +3,14 @@
 " Maintainer:	Michael Piefel <entwurf@piefel.de>
 " Last Change:	2 May 2001
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
 " Read the C++ syntax to start with
-if version < 600
-  source <sfile>:p:h/cpp.vim
-else
-  runtime! syntax/cpp.vim
-  unlet b:current_syntax
-endif
+runtime! syntax/cpp.vim
+unlet b:current_syntax
 
 " kimwitu++ extentions
 
@@ -58,27 +51,19 @@ syn region kwtUnpBody		transparent keepend extend fold start="->\s*\[" start="^\
 syn region kwtRewBody		transparent keepend extend fold start="->\s*<" start="^\s*<" end="\s>\s\=;\=$" end="^>\s\=;\=$"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_kwt_syn_inits")
-    if version < 508
-	let did_kwt_syn_inits = 1
-	command -nargs=+ HiLink hi link <args>
-    else
-	command -nargs=+ HiLink hi def link <args>
-    endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-    HiLink kwtStatement	cppStatement
-    HiLink kwtDecl	cppStatement
-    HiLink kwtCast	cppStatement
-    HiLink kwtSep	Delimiter
-    HiLink kwtViews	Label
-    HiLink kwtPhylum	Type
-    HiLink kwtOption	PreProc
-    "HiLink cText	Comment
+HiLink kwtStatement	cppStatement
+HiLink kwtDecl	cppStatement
+HiLink kwtCast	cppStatement
+HiLink kwtSep	Delimiter
+HiLink kwtViews	Label
+HiLink kwtPhylum	Type
+HiLink kwtOption	PreProc
+"HiLink cText	Comment
 
-    delcommand HiLink
-endif
+delcommand HiLink
 
 syn sync lines=300
 
diff --git a/runtime/syntax/lace.vim b/runtime/syntax/lace.vim
index 9e64eea7d1..dbdaf8bec8 100644
--- a/runtime/syntax/lace.vim
+++ b/runtime/syntax/lace.vim
@@ -9,11 +9,8 @@
 " it to the maintainer at <utilities@eiffel.com>
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -85,50 +82,42 @@ syn region laceParen		transparent start="(" end=")" contains=ALLBUT,laceParenErr
 syn sync lines=40
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_lace_syntax_inits")
-  if version < 508
-    let did_lace_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink laceTopStruct			PreProc
+HiLink laceTopStruct			PreProc
 
-  HiLink laceOptionClause		Statement
-  HiLink laceOptionMark			Constant
-  HiLink laceClusterProp		Label
-  HiLink laceAdaptClassName		Label
-  HiLink laceExternal			Statement
-  HiLink laceCluster			ModeMsg
+HiLink laceOptionClause		Statement
+HiLink laceOptionMark			Constant
+HiLink laceClusterProp		Label
+HiLink laceAdaptClassName		Label
+HiLink laceExternal			Statement
+HiLink laceCluster			ModeMsg
 
-  HiLink laceEscape				Special
+HiLink laceEscape				Special
 
-  HiLink laceBool				Boolean
-  HiLink laceString				String
-  HiLink laceCharacter			Character
-  HiLink laceClassName			Type
-  HiLink laceNumber				Number
+HiLink laceBool				Boolean
+HiLink laceString				String
+HiLink laceCharacter			Character
+HiLink laceClassName			Type
+HiLink laceNumber				Number
 
-  HiLink laceOperator			Special
-  HiLink laceArray				Special
-  HiLink laceExport				Special
-  HiLink laceCreation			Special
-  HiLink laceBrackets			Special
-  HiLink laceConstraint			Special
+HiLink laceOperator			Special
+HiLink laceArray				Special
+HiLink laceExport				Special
+HiLink laceCreation			Special
+HiLink laceBrackets			Special
+HiLink laceConstraint			Special
 
-  HiLink laceComment			Comment
+HiLink laceComment			Comment
 
-  HiLink laceError				Error
-  HiLink laceStringError		Error
-  HiLink laceParenError			Error
-  HiLink laceBracketError		Error
-  HiLink laceTodo				Todo
+HiLink laceError				Error
+HiLink laceStringError		Error
+HiLink laceParenError			Error
+HiLink laceBracketError		Error
+HiLink laceTodo				Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "lace"
 
diff --git a/runtime/syntax/latte.vim b/runtime/syntax/latte.vim
index e2a8729f3f..f95c7b5c73 100644
--- a/runtime/syntax/latte.vim
+++ b/runtime/syntax/latte.vim
@@ -7,11 +7,8 @@
 " I based this on the TeX and Scheme syntax files (but mostly scheme).
 " See http://www.latte.org for info on the language.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -20,11 +17,7 @@ syn match latteOther "\\{"
 syn match latteOther "\\}"
 syn match latteOther "\\\\"
 
-if version < 600
-  set iskeyword=33,43,45,48-57,63,65-90,95,97-122,_
-else
-  setlocal iskeyword=33,43,45,48-57,63,65-90,95,97-122,_
-endif
+setlocal iskeyword=33,43,45,48-57,63,65-90,95,97-122,_
 
 syn region latteVar matchgroup=SpecialChar start=!\\[A-Za-z_]!rs=s+1 end=![^A-Za-z0-9?!+_-]!me=e-1 contains=ALLBUT,latteNumber,latteOther
 syn region latteVar matchgroup=SpecialChar start=!\\[=\&][A-Za-z_]!rs=s+2 end=![^A-Za-z0-9?!+_-]!me=e-1 contains=ALLBUT,latteNumber,latteOther
@@ -70,29 +63,21 @@ syn sync match matchPlace grouphere NONE "^[^ \t]"
 " ... i.e. synchronize on a line that starts at the left margin
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_latte_syntax_inits")
-  if version < 508
-    let did_latte_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink latteSyntax		Statement
-  HiLink latteVar			Function
+HiLink latteSyntax		Statement
+HiLink latteVar			Function
 
-  HiLink latteString		String
-  HiLink latteQuote			String
+HiLink latteString		String
+HiLink latteQuote			String
 
-  HiLink latteDelimiter		Delimiter
-  HiLink latteOperator		Operator
+HiLink latteDelimiter		Delimiter
+HiLink latteOperator		Operator
 
-  HiLink latteComment		Comment
-  HiLink latteError			Error
+HiLink latteComment		Comment
+HiLink latteError			Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "latte"
diff --git a/runtime/syntax/ldif.vim b/runtime/syntax/ldif.vim
index 9f67b57f51..704a590ec5 100644
--- a/runtime/syntax/ldif.vim
+++ b/runtime/syntax/ldif.vim
@@ -3,9 +3,8 @@
 " Maintainer:	Zak Johnson <zakj@nox.cx>
 " Last Change:	2003-12-30
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -21,23 +20,16 @@ syn region ldifFileValue   matchgroup=ldifPunctuation start=/:< / end=/\_$/ skip
 
 syn region ldifComment start=/^#/ end=/\_$/ skip=/\n /
 
-if version >= 508 || !exists("did_ldif_syn_inits")
-  if version < 508
-    let did_ldif_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink ldifAttribute		Type
-  HiLink ldifOption		Identifier
-  HiLink ldifPunctuation	Normal
-  HiLink ldifStringValue	String
-  HiLink ldifBase64Value	Special
-  HiLink ldifFileValue		Special
-  HiLink ldifComment		Comment
+HiLink ldifAttribute		Type
+HiLink ldifOption		Identifier
+HiLink ldifPunctuation	Normal
+HiLink ldifStringValue	String
+HiLink ldifBase64Value	Special
+HiLink ldifFileValue		Special
+HiLink ldifComment		Comment
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "ldif"
diff --git a/runtime/syntax/lex.vim b/runtime/syntax/lex.vim
index b7aff34d6b..83eb212f2f 100644
--- a/runtime/syntax/lex.vim
+++ b/runtime/syntax/lex.vim
@@ -8,11 +8,8 @@
 " Option:
 "   lex_uses_cpp : if this variable exists, then C++ is loaded rather than C
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/lhaskell.vim b/runtime/syntax/lhaskell.vim
index 077549a0c8..78207812f0 100644
--- a/runtime/syntax/lhaskell.vim
+++ b/runtime/syntax/lhaskell.vim
@@ -36,11 +36,8 @@
 "
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -84,15 +81,10 @@ endif
 
 " If user wants us to highlight TeX syntax or guess thinks it's TeX, read it.
 if b:lhs_markup == "tex"
-    if version < 600
-	source <sfile>:p:h/tex.vim
-	set isk+=_
-    else
-	runtime! syntax/tex.vim
-	unlet b:current_syntax
-	" Tex.vim removes "_" from 'iskeyword', but we need it for Haskell.
-	setlocal isk+=_
-    endif
+    runtime! syntax/tex.vim
+    unlet b:current_syntax
+    " Tex.vim removes "_" from 'iskeyword', but we need it for Haskell.
+    setlocal isk+=_
     syntax cluster lhsTeXContainer contains=tex.*Zone,texAbstract
 else
     syntax cluster lhsTeXContainer contains=.*
@@ -100,11 +92,7 @@ endif
 
 " Literate Haskell is Haskell in between text, so at least read Haskell
 " highlighting
-if version < 600
-    syntax include @haskellTop <sfile>:p:h/haskell.vim
-else
-    syntax include @haskellTop syntax/haskell.vim
-endif
+syntax include @haskellTop syntax/haskell.vim
 
 syntax region lhsHaskellBirdTrack start="^>" end="\%(^[^>]\)\@=" contains=@haskellTop,lhsBirdTrack containedin=@lhsTeXContainer
 syntax region lhsHaskellBeginEndBlock start="^\\begin{code}\s*$" matchgroup=NONE end="\%(^\\end{code}.*$\)\@=" contains=@haskellTop,beginCodeBegin containedin=@lhsTeXContainer
@@ -115,23 +103,15 @@ syntax match beginCodeBegin "^\\begin" nextgroup=beginCodeCode contained
 syntax region beginCodeCode  matchgroup=texDelimiter start="{" end="}"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_tex_syntax_inits")
-  if version < 508
-    let did_tex_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink lhsBirdTrack Comment
+HiLink lhsBirdTrack Comment
 
-  HiLink beginCodeBegin	      texCmdName
-  HiLink beginCodeCode	      texSection
+HiLink beginCodeBegin	      texCmdName
+HiLink beginCodeCode	      texSection
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 " Restore cursor to original position, as it may have been disturbed
 " by the searches in our guessing code
diff --git a/runtime/syntax/lifelines.vim b/runtime/syntax/lifelines.vim
index f8bea015bd..041c50963d 100644
--- a/runtime/syntax/lifelines.vim
+++ b/runtime/syntax/lifelines.vim
@@ -11,9 +11,8 @@
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -110,9 +109,7 @@ syn match	lifelinesNumber	"-\=\<\d\+\.\d*\>"
 syn match	lifelinesNumber	"-\=\.\d\+\>"
 
 " folding using {}
-if version >= 600
-	syn region lifelinesFoldBlock	start="{" end="}" transparent fold
-endif
+syn region lifelinesFoldBlock	start="{" end="}" transparent fold
 
 "catch errors caused by wrong parenthesis
 "adapted from original c.vim written by Bram Moolenaar
@@ -123,44 +120,36 @@ syn match	lifelinesParenError	")"
 syn match	lifelinesErrInParen	contained "[{}]"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+" Only when an item doesn't have highlighting yet
 
-if version >= 508 || !exists("did_lifelines_syn_inits")
-  if version < 508
-    let did_lifelines_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink lifelinesConditional	Conditional
-  HiLink lifelinesArithm	Operator
-  HiLink lifelinesLogical	Conditional
-  HiLink lifelinesInclude	Include
-  HiLink lifelinesComment	Comment
-  HiLink lifelinesStatement	Statement
-  HiLink lifelinesUser		Statement
-  HiLink lifelinesFunct		Statement
-  HiLink lifelinesTable		Statement
-  HiLink lifelinesGedcom	Statement
-  HiLink lifelinesList		Statement
-  HiLink lifelinesRepeat	Repeat
-  HiLink lifelinesFam		Statement
-  HiLink lifelinesIndi		Statement
-  HiLink lifelinesProc		Statement
-  HiLink lifelinesDef		Statement
-  HiLink lifelinesString	String
-  HiLink lifelinesSpecial	Special
-  HiLink lifelinesNumber	Number
-  HiLink lifelinesParenError	Error
-  HiLink lifelinesErrInParen	Error
-  HiLink lifelinesError		Error
-  HiLink lifelinesTodo		Todo
-  HiLink lifelinesDecl		PreProc
+HiLink lifelinesConditional	Conditional
+HiLink lifelinesArithm	Operator
+HiLink lifelinesLogical	Conditional
+HiLink lifelinesInclude	Include
+HiLink lifelinesComment	Comment
+HiLink lifelinesStatement	Statement
+HiLink lifelinesUser		Statement
+HiLink lifelinesFunct		Statement
+HiLink lifelinesTable		Statement
+HiLink lifelinesGedcom	Statement
+HiLink lifelinesList		Statement
+HiLink lifelinesRepeat	Repeat
+HiLink lifelinesFam		Statement
+HiLink lifelinesIndi		Statement
+HiLink lifelinesProc		Statement
+HiLink lifelinesDef		Statement
+HiLink lifelinesString	String
+HiLink lifelinesSpecial	Special
+HiLink lifelinesNumber	Number
+HiLink lifelinesParenError	Error
+HiLink lifelinesErrInParen	Error
+HiLink lifelinesError		Error
+HiLink lifelinesTodo		Todo
+HiLink lifelinesDecl		PreProc
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "lifelines"
 
diff --git a/runtime/syntax/lilo.vim b/runtime/syntax/lilo.vim
index 3e9459267b..f58e34061c 100644
--- a/runtime/syntax/lilo.vim
+++ b/runtime/syntax/lilo.vim
@@ -5,21 +5,12 @@
 " Last Change: 2010-02-03
 
 " Setup
-if version >= 600
-  if exists("b:current_syntax")
-    finish
-  endif
-else
-  syntax clear
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
 endif
 
-if version >= 600
-  command -nargs=1 SetIsk setlocal iskeyword=<args>
-else
-  command -nargs=1 SetIsk set iskeyword=<args>
-endif
-SetIsk @,48-57,.,-,_
-delcommand SetIsk
+setlocal iskeyword=@,48-57,.,-,_
 
 syn case ignore
 
@@ -128,65 +119,58 @@ syn match liloDecNumberPListComment "#.*$" contained nextgroup=liloDecNumberPLis
 syn match liloAnythingComment "#.*$" contained nextgroup=liloAnything,liloAnythingComment,liloError skipwhite skipempty
 
 " Define the default highlighting
-if version >= 508 || !exists("did_lilo_syntax_inits")
-  if version < 508
-    let did_lilo_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink liloEqPath             liloEquals
-  HiLink liloEqWord             liloEquals
-  HiLink liloEqVga              liloEquals
-  HiLink liloEqDecNumber        liloEquals
-  HiLink liloEqHexNumber        liloEquals
-  HiLink liloEqNumber           liloEquals
-  HiLink liloEqString           liloEquals
-  HiLink liloEqAnything         liloEquals
-  HiLink liloEquals             Special
+HiLink liloEqPath             liloEquals
+HiLink liloEqWord             liloEquals
+HiLink liloEqVga              liloEquals
+HiLink liloEqDecNumber        liloEquals
+HiLink liloEqHexNumber        liloEquals
+HiLink liloEqNumber           liloEquals
+HiLink liloEqString           liloEquals
+HiLink liloEqAnything         liloEquals
+HiLink liloEquals             Special
 
-  HiLink liloError              Error
+HiLink liloError              Error
 
-  HiLink liloEqPathComment      liloComment
-  HiLink liloEqVgaComment       liloComment
-  HiLink liloEqDecNumberComment liloComment
-  HiLink liloEqHexNumberComment liloComment
-  HiLink liloEqStringComment    liloComment
-  HiLink liloEqAnythingComment  liloComment
-  HiLink liloPathComment        liloComment
-  HiLink liloVgaComment         liloComment
-  HiLink liloDecNumberComment   liloComment
-  HiLink liloHexNumberComment   liloComment
-  HiLink liloNumberComment      liloComment
-  HiLink liloStringComment      liloComment
-  HiLink liloAnythingComment    liloComment
-  HiLink liloComment            Comment
+HiLink liloEqPathComment      liloComment
+HiLink liloEqVgaComment       liloComment
+HiLink liloEqDecNumberComment liloComment
+HiLink liloEqHexNumberComment liloComment
+HiLink liloEqStringComment    liloComment
+HiLink liloEqAnythingComment  liloComment
+HiLink liloPathComment        liloComment
+HiLink liloVgaComment         liloComment
+HiLink liloDecNumberComment   liloComment
+HiLink liloHexNumberComment   liloComment
+HiLink liloNumberComment      liloComment
+HiLink liloStringComment      liloComment
+HiLink liloAnythingComment    liloComment
+HiLink liloComment            Comment
 
-  HiLink liloDiskOpt            liloOption
-  HiLink liloKernelOpt          liloOption
-  HiLink liloImageOpt           liloOption
-  HiLink liloOption             Keyword
+HiLink liloDiskOpt            liloOption
+HiLink liloKernelOpt          liloOption
+HiLink liloImageOpt           liloOption
+HiLink liloOption             Keyword
 
-  HiLink liloDecNumber          liloNumber
-  HiLink liloHexNumber          liloNumber
-  HiLink liloDecNumberP         liloNumber
-  HiLink liloNumber             Number
-  HiLink liloString             String
-  HiLink liloPath               Constant
+HiLink liloDecNumber          liloNumber
+HiLink liloHexNumber          liloNumber
+HiLink liloDecNumberP         liloNumber
+HiLink liloNumber             Number
+HiLink liloString             String
+HiLink liloPath               Constant
 
-  HiLink liloSpecial            Special
-  HiLink liloLabel              Title
-  HiLink liloDecNumberList      Special
-  HiLink liloDecNumberPList     Special
-  HiLink liloAnything           Normal
-  HiLink liloEnviron            Identifier
-  HiLink liloVgaKeyword         Identifier
-  HiLink liloImage              Type
-  HiLink liloChRules            Preproc
-  HiLink liloDisk               Preproc
+HiLink liloSpecial            Special
+HiLink liloLabel              Title
+HiLink liloDecNumberList      Special
+HiLink liloDecNumberPList     Special
+HiLink liloAnything           Normal
+HiLink liloEnviron            Identifier
+HiLink liloVgaKeyword         Identifier
+HiLink liloImage              Type
+HiLink liloChRules            Preproc
+HiLink liloDisk               Preproc
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "lilo"
diff --git a/runtime/syntax/lisp.vim b/runtime/syntax/lisp.vim
index a402452389..f555070032 100644
--- a/runtime/syntax/lisp.vim
+++ b/runtime/syntax/lisp.vim
@@ -561,61 +561,58 @@ syn sync lines=100
 
 " ---------------------------------------------------------------------
 " Define Highlighting: {{{1
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508
-  command -nargs=+ HiLink hi def link <args>
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink lispCommentRegion	lispComment
-  HiLink lispAtomNmbr		lispNumber
-  HiLink lispAtomMark		lispMark
-  HiLink lispInStringString	lispString
+HiLink lispCommentRegion	lispComment
+HiLink lispAtomNmbr		lispNumber
+HiLink lispAtomMark		lispMark
+HiLink lispInStringString	lispString
 
-  HiLink lispAtom		Identifier
-  HiLink lispAtomBarSymbol	Special
-  HiLink lispBarSymbol		Special
-  HiLink lispComment		Comment
-  HiLink lispConcat		Statement
-  HiLink lispDecl		Statement
-  HiLink lispFunc		Statement
-  HiLink lispKey		Type
-  HiLink lispMark		Delimiter
-  HiLink lispNumber		Number
-  HiLink lispParenError		Error
-  HiLink lispEscapeSpecial	Type
-  HiLink lispString		String
-  HiLink lispTodo		Todo
-  HiLink lispVar		Statement
+HiLink lispAtom		Identifier
+HiLink lispAtomBarSymbol	Special
+HiLink lispBarSymbol		Special
+HiLink lispComment		Comment
+HiLink lispConcat		Statement
+HiLink lispDecl		Statement
+HiLink lispFunc		Statement
+HiLink lispKey		Type
+HiLink lispMark		Delimiter
+HiLink lispNumber		Number
+HiLink lispParenError		Error
+HiLink lispEscapeSpecial	Type
+HiLink lispString		String
+HiLink lispTodo		Todo
+HiLink lispVar		Statement
 
-  if exists("g:lisp_rainbow") && g:lisp_rainbow != 0
-   if &bg == "dark"
-    hi def hlLevel0 ctermfg=red         guifg=red1
-    hi def hlLevel1 ctermfg=yellow      guifg=orange1
-    hi def hlLevel2 ctermfg=green       guifg=yellow1
-    hi def hlLevel3 ctermfg=cyan        guifg=greenyellow
-    hi def hlLevel4 ctermfg=magenta     guifg=green1
-    hi def hlLevel5 ctermfg=red         guifg=springgreen1
-    hi def hlLevel6 ctermfg=yellow      guifg=cyan1
-    hi def hlLevel7 ctermfg=green       guifg=slateblue1
-    hi def hlLevel8 ctermfg=cyan        guifg=magenta1
-    hi def hlLevel9 ctermfg=magenta     guifg=purple1
-   else
-    hi def hlLevel0 ctermfg=red         guifg=red3
-    hi def hlLevel1 ctermfg=darkyellow  guifg=orangered3
-    hi def hlLevel2 ctermfg=darkgreen   guifg=orange2
-    hi def hlLevel3 ctermfg=blue        guifg=yellow3
-    hi def hlLevel4 ctermfg=darkmagenta guifg=olivedrab4
-    hi def hlLevel5 ctermfg=red         guifg=green4
-    hi def hlLevel6 ctermfg=darkyellow  guifg=paleturquoise3
-    hi def hlLevel7 ctermfg=darkgreen   guifg=deepskyblue4
-    hi def hlLevel8 ctermfg=blue        guifg=darkslateblue
-    hi def hlLevel9 ctermfg=darkmagenta guifg=darkviolet
-   endif
-  endif
-
-  delcommand HiLink
+if exists("g:lisp_rainbow") && g:lisp_rainbow != 0
+ if &bg == "dark"
+  hi def hlLevel0 ctermfg=red         guifg=red1
+  hi def hlLevel1 ctermfg=yellow      guifg=orange1
+  hi def hlLevel2 ctermfg=green       guifg=yellow1
+  hi def hlLevel3 ctermfg=cyan        guifg=greenyellow
+  hi def hlLevel4 ctermfg=magenta     guifg=green1
+  hi def hlLevel5 ctermfg=red         guifg=springgreen1
+  hi def hlLevel6 ctermfg=yellow      guifg=cyan1
+  hi def hlLevel7 ctermfg=green       guifg=slateblue1
+  hi def hlLevel8 ctermfg=cyan        guifg=magenta1
+  hi def hlLevel9 ctermfg=magenta     guifg=purple1
+ else
+  hi def hlLevel0 ctermfg=red         guifg=red3
+  hi def hlLevel1 ctermfg=darkyellow  guifg=orangered3
+  hi def hlLevel2 ctermfg=darkgreen   guifg=orange2
+  hi def hlLevel3 ctermfg=blue        guifg=yellow3
+  hi def hlLevel4 ctermfg=darkmagenta guifg=olivedrab4
+  hi def hlLevel5 ctermfg=red         guifg=green4
+  hi def hlLevel6 ctermfg=darkyellow  guifg=paleturquoise3
+  hi def hlLevel7 ctermfg=darkgreen   guifg=deepskyblue4
+  hi def hlLevel8 ctermfg=blue        guifg=darkslateblue
+  hi def hlLevel9 ctermfg=darkmagenta guifg=darkviolet
+ endif
 endif
 
+delcommand HiLink
+
 let b:current_syntax = "lisp"
 
 " ---------------------------------------------------------------------
diff --git a/runtime/syntax/lite.vim b/runtime/syntax/lite.vim
index 8abc51dea1..1a76e6c7f5 100644
--- a/runtime/syntax/lite.vim
+++ b/runtime/syntax/lite.vim
@@ -8,11 +8,8 @@
 " Options	lite_sql_query = 1 for SQL syntax highligthing inside strings
 "		lite_minlines = x     to sync at least x lines backwards
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -138,39 +135,31 @@ if main_syntax == 'lite'
 endif
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_lite_syn_inits")
-  if version < 508
-    let did_lite_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink liteComment		Comment
-  HiLink liteString		String
-  HiLink liteNumber		Number
-  HiLink liteFloat		Float
-  HiLink liteIdentifier	Identifier
-  HiLink liteGlobalIdentifier	Identifier
-  HiLink liteIntVar		Identifier
-  HiLink liteFunctions		Function
-  HiLink liteRepeat		Repeat
-  HiLink liteConditional	Conditional
-  HiLink liteStatement		Statement
-  HiLink liteType		Type
-  HiLink liteInclude		Include
-  HiLink liteDefine		Define
-  HiLink liteSpecialChar	SpecialChar
-  HiLink liteParentError	liteError
-  HiLink liteError		Error
-  HiLink liteTodo		Todo
-  HiLink liteOperator		Operator
-  HiLink liteRelation		Operator
+HiLink liteComment		Comment
+HiLink liteString		String
+HiLink liteNumber		Number
+HiLink liteFloat		Float
+HiLink liteIdentifier	Identifier
+HiLink liteGlobalIdentifier	Identifier
+HiLink liteIntVar		Identifier
+HiLink liteFunctions		Function
+HiLink liteRepeat		Repeat
+HiLink liteConditional	Conditional
+HiLink liteStatement		Statement
+HiLink liteType		Type
+HiLink liteInclude		Include
+HiLink liteDefine		Define
+HiLink liteSpecialChar	SpecialChar
+HiLink liteParentError	liteError
+HiLink liteError		Error
+HiLink liteTodo		Todo
+HiLink liteOperator		Operator
+HiLink liteRelation		Operator
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "lite"
 
diff --git a/runtime/syntax/logtalk.vim b/runtime/syntax/logtalk.vim
index be34c7ed74..e4decf2ef9 100644
--- a/runtime/syntax/logtalk.vim
+++ b/runtime/syntax/logtalk.vim
@@ -5,11 +5,8 @@
 " Last Change:	February 4, 2012
 
 
-" Quit when a syntax file was already loaded:
-
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
@@ -389,59 +386,49 @@ syn sync ccomment logtalkBlockComment maxlines=50
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-if version >= 508 || !exists("did_logtalk_syn_inits")
-	if version < 508
-		let did_logtalk_syn_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+HiLink	logtalkBlockComment	Comment
+HiLink	logtalkLineComment	Comment
 
-	HiLink	logtalkBlockComment	Comment
-	HiLink	logtalkLineComment	Comment
+HiLink	logtalkOpenEntityDir	Normal
+HiLink	logtalkOpenEntityDirTag	PreProc
 
-	HiLink	logtalkOpenEntityDir	Normal
-	HiLink	logtalkOpenEntityDirTag	PreProc
+HiLink	logtalkIfContainer	PreProc
+HiLink	logtalkIf		PreProc
+HiLink	logtalkElseIf		PreProc
+HiLink	logtalkElse		PreProc
 
-	HiLink	logtalkIfContainer	PreProc
-	HiLink	logtalkIf		PreProc
-	HiLink	logtalkElseIf		PreProc
-	HiLink	logtalkElse		PreProc
+HiLink	logtalkEntity		Normal
 
-	HiLink	logtalkEntity		Normal
+HiLink	logtalkEntityRel	Normal
+HiLink	logtalkEntityRelTag	PreProc
 
-	HiLink	logtalkEntityRel	Normal
-	HiLink	logtalkEntityRelTag	PreProc
+HiLink	logtalkCloseEntityDir	PreProc
 
-	HiLink	logtalkCloseEntityDir	PreProc
+HiLink	logtalkDir		Normal
+HiLink	logtalkDirTag		PreProc
 
-	HiLink	logtalkDir		Normal
-	HiLink	logtalkDirTag		PreProc
+HiLink	logtalkAtom		String
+HiLink	logtalkString		String
+HiLink	logtalkEscapeSequence	SpecialChar
 
-	HiLink	logtalkAtom		String
-	HiLink	logtalkString		String
-	HiLink	logtalkEscapeSequence	SpecialChar
+HiLink	logtalkNumber		Number
 
-	HiLink	logtalkNumber		Number
+HiLink	logtalkKeyword		Keyword
 
-	HiLink	logtalkKeyword		Keyword
+HiLink	logtalkBuiltIn		Keyword
+HiLink	logtalkBuiltInMethod	Keyword
 
-	HiLink	logtalkBuiltIn		Keyword
-	HiLink	logtalkBuiltInMethod	Keyword
+HiLink	logtalkOperator		Operator
 
-	HiLink	logtalkOperator		Operator
+HiLink	logtalkExtCall		Normal
+HiLink	logtalkExtCallTag	Operator
 
-	HiLink	logtalkExtCall		Normal
-	HiLink	logtalkExtCallTag	Operator
+HiLink	logtalkVariable		Identifier
 
-	HiLink	logtalkVariable		Identifier
-
-	delcommand HiLink
-
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "logtalk"
diff --git a/runtime/syntax/lotos.vim b/runtime/syntax/lotos.vim
index 3cd83c4d86..e617bdb086 100644
--- a/runtime/syntax/lotos.vim
+++ b/runtime/syntax/lotos.vim
@@ -7,11 +7,8 @@
 " I'm not sure I understand all of the syntax highlight language,
 " but this file seems to do the job for standard LOTOS.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -56,26 +53,18 @@ syn keyword lotosType   using
 syn sync lines=250
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_lotos_syntax_inits")
-  if version < 508
-    let did_lotos_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink lotosStatement		Statement
-  HiLink lotosProcess		Label
-  HiLink lotosOperator		Operator
-  HiLink lotosSort		Function
-  HiLink lotosType		Type
-  HiLink lotosComment		Comment
-  HiLink lotosDelimiter		String
+HiLink lotosStatement		Statement
+HiLink lotosProcess		Label
+HiLink lotosOperator		Operator
+HiLink lotosSort		Function
+HiLink lotosType		Type
+HiLink lotosComment		Comment
+HiLink lotosDelimiter		String
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "lotos"
 
diff --git a/runtime/syntax/lout.vim b/runtime/syntax/lout.vim
index 9a34328ac3..e7a1e15627 100644
--- a/runtime/syntax/lout.vim
+++ b/runtime/syntax/lout.vim
@@ -16,11 +16,8 @@
 " See the discussion at http://thread.gmane.org/gmane.editors.vim.devel/32151
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
@@ -36,11 +33,7 @@ syn sync lines=1000
 
 " Characters allowed in keywords
 " I don't know if 128-255 are allowed in ANS-FORHT
-if version >= 600
-	setlocal iskeyword=@,48-57,.,@-@,_,192-255
-else
-	set iskeyword=@,48-57,.,@-@,_,192-255
-endif
+setlocal iskeyword=@,48-57,.,@-@,_,192-255
 
 " Some special keywords
 syn keyword loutTodo contained TODO lout Lout LOUT
@@ -106,44 +99,36 @@ syn region loutBoldItalic matchgroup=loutBIBraces start='@BI\s*{' matchgroup=lou
 syn region loutHeadings matchgroup=loutHeads start='@\(\(Title\)\|\(Caption\)\)\s*{' matchgroup=loutHeads end='}' contains=ALLBUT,loutBraceError
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_lout_syn_inits")
-	if version < 508
-		let did_lout_syn_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	" The default methods for highlighting. Can be overrriden later.
-	HiLink loutTodo Todo
-	HiLink loutDefine Define
-	HiLink loutEOmlDef Define
-	HiLink loutFunction Function
-	HiLink loutBraceError Error
-	HiLink loutNULL Special
-	HiLink loutComment Comment
-	HiLink loutSpecial Special
-	HiLink loutSymbols Character
-	HiLink loutInclude Include
-	HiLink loutKeyword Keyword
-	HiLink loutTag Tag
-	HiLink loutMath Number
+" The default methods for highlighting. Can be overrriden later.
+HiLink loutTodo Todo
+HiLink loutDefine Define
+HiLink loutEOmlDef Define
+HiLink loutFunction Function
+HiLink loutBraceError Error
+HiLink loutNULL Special
+HiLink loutComment Comment
+HiLink loutSpecial Special
+HiLink loutSymbols Character
+HiLink loutInclude Include
+HiLink loutKeyword Keyword
+HiLink loutTag Tag
+HiLink loutMath Number
 
-	" HiLink Not really needed here, but I think it is more consistent.
-	HiLink loutMBraces loutMath
-	hi loutItalic term=italic cterm=italic gui=italic
-	HiLink loutIBraces loutItalic
-	hi loutBold term=bold cterm=bold gui=bold
-	HiLink loutBBraces loutBold
-	hi loutBoldItalic term=bold,italic cterm=bold,italic gui=bold,italic
-	HiLink loutBIBraces loutBoldItalic
-	hi loutHeadings term=bold cterm=bold guifg=indianred
-	HiLink loutHeads loutHeadings
+" HiLink Not really needed here, but I think it is more consistent.
+HiLink loutMBraces loutMath
+hi loutItalic term=italic cterm=italic gui=italic
+HiLink loutIBraces loutItalic
+hi loutBold term=bold cterm=bold gui=bold
+HiLink loutBBraces loutBold
+hi loutBoldItalic term=bold,italic cterm=bold,italic gui=bold,italic
+HiLink loutBIBraces loutBoldItalic
+hi loutHeadings term=bold cterm=bold guifg=indianred
+HiLink loutHeads loutHeadings
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "lout"
 
diff --git a/runtime/syntax/lpc.vim b/runtime/syntax/lpc.vim
index e948f3d70c..45aba92159 100644
--- a/runtime/syntax/lpc.vim
+++ b/runtime/syntax/lpc.vim
@@ -9,11 +9,8 @@
 
 " Nodule: This is the start nodule. {{{1
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -360,94 +357,86 @@ endif
 " Nodule: Highlight links {{{1
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_lpc_syn_inits")
-  if version < 508
-    let did_lpc_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink lpcModifier		lpcStorageClass
+HiLink lpcModifier		lpcStorageClass
 
-  HiLink lpcQuotedFmt		lpcFormat
-  HiLink lpcFormat		lpcSpecial
-  HiLink lpcCppString		lpcString	" Cpp means
-						" C Pre-Processor
-  HiLink lpcCommentL		lpcComment
-  HiLink lpcCommentStart	lpcComment
-  HiLink lpcUserLabel		lpcLabel
-  HiLink lpcSpecialCharacter	lpcSpecial
-  HiLink lpcOctal		lpcPreProc
-  HiLink lpcOctalZero		lpcSpecial  " LPC will treat octal numbers
-					    " as decimals, programmers should
-					    " be aware of that.
-  HiLink lpcEfunError		lpcError
-  HiLink lpcKeywdError		lpcError
-  HiLink lpcOctalError		lpcError
-  HiLink lpcParenError		lpcError
-  HiLink lpcErrInParen		lpcError
-  HiLink lpcErrInBracket	lpcError
-  HiLink lpcCommentError	lpcError
-  HiLink lpcCommentStartError	lpcError
-  HiLink lpcSpaceError		lpcError
-  HiLink lpcSpecialError	lpcError
-  HiLink lpcErrFunc		lpcError
+HiLink lpcQuotedFmt		lpcFormat
+HiLink lpcFormat		lpcSpecial
+HiLink lpcCppString		lpcString	" Cpp means
+					      " C Pre-Processor
+HiLink lpcCommentL		lpcComment
+HiLink lpcCommentStart	lpcComment
+HiLink lpcUserLabel		lpcLabel
+HiLink lpcSpecialCharacter	lpcSpecial
+HiLink lpcOctal		lpcPreProc
+HiLink lpcOctalZero		lpcSpecial  " LPC will treat octal numbers
+					  " as decimals, programmers should
+					  " be aware of that.
+HiLink lpcEfunError		lpcError
+HiLink lpcKeywdError		lpcError
+HiLink lpcOctalError		lpcError
+HiLink lpcParenError		lpcError
+HiLink lpcErrInParen		lpcError
+HiLink lpcErrInBracket	lpcError
+HiLink lpcCommentError	lpcError
+HiLink lpcCommentStartError	lpcError
+HiLink lpcSpaceError		lpcError
+HiLink lpcSpecialError	lpcError
+HiLink lpcErrFunc		lpcError
 
-  if exists("lpc_pre_v22")
-      HiLink lpcOldEfuns	lpc_efuns
-      HiLink lpcNewEfuns	lpcError
-  else
-      HiLink lpcOldEfuns	lpcReserved
-      HiLink lpcNewEfuns	lpc_efuns
-  endif
-  HiLink lpc_efuns		lpcFunction
-
-  HiLink lpcReserved		lpcPreProc
-  HiLink lpcTextString		lpcString   " This should be preprocessors, but
-  HiLink lpcArrayString		lpcPreProc  " let's make some difference
-					    " between text and array
-
-  HiLink lpcIncluded		lpcString
-  HiLink lpcCommentString	lpcString
-  HiLink lpcComment2String	lpcString
-  HiLink lpcCommentSkip		lpcComment
-  HiLink lpcCommentFunc		lpcComment
-
-  HiLink lpcCppSkip		lpcCppOut
-  HiLink lpcCppOut2		lpcCppOut
-  HiLink lpcCppOut		lpcComment
-
-  " Standard type below
-  HiLink lpcApplies		Special
-  HiLink lpcCharacter		Character
-  HiLink lpcComment		Comment
-  HiLink lpcConditional		Conditional
-  HiLink lpcConstant		Constant
-  HiLink lpcDefine		Macro
-  HiLink lpcError		Error
-  HiLink lpcFloat		Float
-  HiLink lpcFunction		Function
-  HiLink lpcIdentifier		Identifier
-  HiLink lpcInclude		Include
-  HiLink lpcLabel		Label
-  HiLink lpcNumber		Number
-  HiLink lpcOperator		Operator
-  HiLink lpcPreCondit		PreCondit
-  HiLink lpcPreProc		PreProc
-  HiLink lpcRepeat		Repeat
-  HiLink lpcStatement		Statement
-  HiLink lpcStorageClass	StorageClass
-  HiLink lpcString		String
-  HiLink lpcStructure		Structure
-  HiLink lpcSpecial		LineNr
-  HiLink lpcTodo		Todo
-  HiLink lpcType		Type
-
-  delcommand HiLink
+if exists("lpc_pre_v22")
+    HiLink lpcOldEfuns	lpc_efuns
+    HiLink lpcNewEfuns	lpcError
+else
+    HiLink lpcOldEfuns	lpcReserved
+    HiLink lpcNewEfuns	lpc_efuns
 endif
+HiLink lpc_efuns		lpcFunction
+
+HiLink lpcReserved		lpcPreProc
+HiLink lpcTextString		lpcString   " This should be preprocessors, but
+HiLink lpcArrayString		lpcPreProc  " let's make some difference
+					  " between text and array
+
+HiLink lpcIncluded		lpcString
+HiLink lpcCommentString	lpcString
+HiLink lpcComment2String	lpcString
+HiLink lpcCommentSkip		lpcComment
+HiLink lpcCommentFunc		lpcComment
+
+HiLink lpcCppSkip		lpcCppOut
+HiLink lpcCppOut2		lpcCppOut
+HiLink lpcCppOut		lpcComment
+
+" Standard type below
+HiLink lpcApplies		Special
+HiLink lpcCharacter		Character
+HiLink lpcComment		Comment
+HiLink lpcConditional		Conditional
+HiLink lpcConstant		Constant
+HiLink lpcDefine		Macro
+HiLink lpcError		Error
+HiLink lpcFloat		Float
+HiLink lpcFunction		Function
+HiLink lpcIdentifier		Identifier
+HiLink lpcInclude		Include
+HiLink lpcLabel		Label
+HiLink lpcNumber		Number
+HiLink lpcOperator		Operator
+HiLink lpcPreCondit		PreCondit
+HiLink lpcPreProc		PreProc
+HiLink lpcRepeat		Repeat
+HiLink lpcStatement		Statement
+HiLink lpcStorageClass	StorageClass
+HiLink lpcString		String
+HiLink lpcStructure		Structure
+HiLink lpcSpecial		LineNr
+HiLink lpcTodo		Todo
+HiLink lpcType		Type
+
+delcommand HiLink
 
 " Nodule: This is the end nodule. {{{1
 
diff --git a/runtime/syntax/lprolog.vim b/runtime/syntax/lprolog.vim
index 086c00fd5d..1256758049 100644
--- a/runtime/syntax/lprolog.vim
+++ b/runtime/syntax/lprolog.vim
@@ -7,11 +7,8 @@
 "               2001 Apr 26 - Upgraded for new Vim version
 "               2000 Jun  5 - Initial release
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -96,41 +93,33 @@ syn sync maxlines=500
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_lprolog_syntax_inits")
-  if version < 508
-    let did_lprolog_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink lprologComment     Comment
-  HiLink lprologTodo	    Todo
+HiLink lprologComment     Comment
+HiLink lprologTodo	    Todo
 
-  HiLink lprologKeyword     Keyword
-  HiLink lprologSpecial     Special
-  HiLink lprologOperator    Operator
-  HiLink lprologIdentifier  Normal
+HiLink lprologKeyword     Keyword
+HiLink lprologSpecial     Special
+HiLink lprologOperator    Operator
+HiLink lprologIdentifier  Normal
 
-  HiLink lprologInteger     Number
-  HiLink lprologReal	    Number
-  HiLink lprologString	    String
+HiLink lprologInteger     Number
+HiLink lprologReal	    Number
+HiLink lprologString	    String
 
-  HiLink lprologCommentErr  Error
-  HiLink lprologBrackErr    Error
-  HiLink lprologParenErr    Error
+HiLink lprologCommentErr  Error
+HiLink lprologBrackErr    Error
+HiLink lprologParenErr    Error
 
-  HiLink lprologModuleName  Special
-  HiLink lprologTypeName    Identifier
+HiLink lprologModuleName  Special
+HiLink lprologTypeName    Identifier
 
-  HiLink lprologVariable    Keyword
-  HiLink lprologAtom	    Normal
-  HiLink lprologClause	    Type
+HiLink lprologVariable    Keyword
+HiLink lprologAtom	    Normal
+HiLink lprologClause	    Type
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "lprolog"
 
diff --git a/runtime/syntax/lscript.vim b/runtime/syntax/lscript.vim
index 648a0ebeab..2dbd33ddba 100644
--- a/runtime/syntax/lscript.vim
+++ b/runtime/syntax/lscript.vim
@@ -9,11 +9,8 @@
 " and b) I'm not so crash hot at LotusScript either. If you see any problems
 " feel free to email me with them.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -179,34 +176,26 @@ syn region  lscriptLineNumber	start="^\d" end="\s"
 syn match   lscriptTypeSpecifier	"[a-zA-Z0-9][\$%&!#]"ms=s+1
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_lscript_syntax_inits")
-  if version < 508
-    let did_lscript_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  hi lscriptNotesType	term=underline ctermfg=DarkGreen guifg=SeaGreen gui=bold
+hi lscriptNotesType	term=underline ctermfg=DarkGreen guifg=SeaGreen gui=bold
 
-  HiLink lscriptNotesConst	lscriptNotesType
-  HiLink lscriptLineNumber	Comment
-  HiLink lscriptDatatype	Type
-  HiLink lscriptNumber		Number
-  HiLink lscriptError		Error
-  HiLink lscriptStatement	Statement
-  HiLink lscriptString		String
-  HiLink lscriptComment		Comment
-  HiLink lscriptTodo		Todo
-  HiLink lscriptFunction	Identifier
-  HiLink lscriptMethods		PreProc
-  HiLink lscriptEvents		Special
-  HiLink lscriptTypeSpecifier	Type
+HiLink lscriptNotesConst	lscriptNotesType
+HiLink lscriptLineNumber	Comment
+HiLink lscriptDatatype	Type
+HiLink lscriptNumber		Number
+HiLink lscriptError		Error
+HiLink lscriptStatement	Statement
+HiLink lscriptString		String
+HiLink lscriptComment		Comment
+HiLink lscriptTodo		Todo
+HiLink lscriptFunction	Identifier
+HiLink lscriptMethods		PreProc
+HiLink lscriptEvents		Special
+HiLink lscriptTypeSpecifier	Type
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "lscript"
 
diff --git a/runtime/syntax/lss.vim b/runtime/syntax/lss.vim
index 6620707f92..6ee717bcb4 100644
--- a/runtime/syntax/lss.vim
+++ b/runtime/syntax/lss.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Scott Bigham <dsb@killerbunnies.org>
 " Last Change:	2004 Oct 06
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -70,64 +67,57 @@ syn case match
 syn match lssComment "#.*$"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_lss_syntax_inits")
-  if version < 508
-    let did_lss_syntax_inits = 1
-  endif
+" Only when an item doesn't have highlighting yet
+hi def link lssComment Comment
+hi def link lssElement Identifier
 
-  hi def link lssComment Comment
-  hi def link lssElement Identifier
+hi def lssBold		term=bold cterm=bold
+hi def lssReverse		term=reverse cterm=reverse
+hi def lssUnderline		term=underline cterm=underline
+hi def lssStandout		term=standout cterm=standout
 
-  hi def lssBold		term=bold cterm=bold
-  hi def lssReverse		term=reverse cterm=reverse
-  hi def lssUnderline		term=underline cterm=underline
-  hi def lssStandout		term=standout cterm=standout
-
-  hi def lssRedFg		ctermfg=red
-  hi def lssBlueFg		ctermfg=blue
-  hi def lssGreenFg		ctermfg=green
-  hi def lssBrownFg		ctermfg=brown
-  hi def lssMagentaFg		ctermfg=magenta
-  hi def lssCyanFg		ctermfg=cyan
-  hi def lssGrayFg		ctermfg=gray
-  if $COLORTERM == "rxvt"
-    " On rxvt's, bright colors are activated by setting the bold attribute.
-    hi def lssLightgrayFg	ctermfg=gray cterm=bold
-    hi def lssBrightredFg	ctermfg=red cterm=bold
-    hi def lssBrightgreenFg	ctermfg=green cterm=bold
-    hi def lssYellowFg		ctermfg=yellow cterm=bold
-    hi def lssBrightblueFg	ctermfg=blue cterm=bold
-    hi def lssBrightmagentaFg	ctermfg=magenta cterm=bold
-    hi def lssBrightcyanFg	ctermfg=cyan cterm=bold
-  else
-    hi def lssLightgrayFg	ctermfg=lightgray
-    hi def lssBrightredFg	ctermfg=lightred
-    hi def lssBrightgreenFg	ctermfg=lightgreen
-    hi def lssYellowFg		ctermfg=yellow
-    hi def lssBrightblueFg	ctermfg=lightblue
-    hi def lssBrightmagentaFg	ctermfg=lightmagenta
-    hi def lssBrightcyanFg	ctermfg=lightcyan
-  endif
-
-  hi def lssRedBg		ctermbg=red
-  hi def lssBlueBg		ctermbg=blue
-  hi def lssGreenBg		ctermbg=green
-  hi def lssBrownBg		ctermbg=brown
-  hi def lssMagentaBg		ctermbg=magenta
-  hi def lssCyanBg		ctermbg=cyan
-  hi def lssLightgrayBg		ctermbg=lightgray
-  hi def lssGrayBg		ctermbg=gray
-  hi def lssBrightredBg		ctermbg=lightred
-  hi def lssBrightgreenBg	ctermbg=lightgreen
-  hi def lssYellowBg		ctermbg=yellow
-  hi def lssBrightblueBg	ctermbg=lightblue
-  hi def lssBrightmagentaBg	ctermbg=lightmagenta
-  hi def lssBrightcyanBg	ctermbg=lightcyan
-  hi def lssWhiteBg		ctermbg=white ctermfg=black
+hi def lssRedFg		ctermfg=red
+hi def lssBlueFg		ctermfg=blue
+hi def lssGreenFg		ctermfg=green
+hi def lssBrownFg		ctermfg=brown
+hi def lssMagentaFg		ctermfg=magenta
+hi def lssCyanFg		ctermfg=cyan
+hi def lssGrayFg		ctermfg=gray
+if $COLORTERM == "rxvt"
+  " On rxvt's, bright colors are activated by setting the bold attribute.
+  hi def lssLightgrayFg	ctermfg=gray cterm=bold
+  hi def lssBrightredFg	ctermfg=red cterm=bold
+  hi def lssBrightgreenFg	ctermfg=green cterm=bold
+  hi def lssYellowFg		ctermfg=yellow cterm=bold
+  hi def lssBrightblueFg	ctermfg=blue cterm=bold
+  hi def lssBrightmagentaFg	ctermfg=magenta cterm=bold
+  hi def lssBrightcyanFg	ctermfg=cyan cterm=bold
+else
+  hi def lssLightgrayFg	ctermfg=lightgray
+  hi def lssBrightredFg	ctermfg=lightred
+  hi def lssBrightgreenFg	ctermfg=lightgreen
+  hi def lssYellowFg		ctermfg=yellow
+  hi def lssBrightblueFg	ctermfg=lightblue
+  hi def lssBrightmagentaFg	ctermfg=lightmagenta
+  hi def lssBrightcyanFg	ctermfg=lightcyan
 endif
 
+hi def lssRedBg		ctermbg=red
+hi def lssBlueBg		ctermbg=blue
+hi def lssGreenBg		ctermbg=green
+hi def lssBrownBg		ctermbg=brown
+hi def lssMagentaBg		ctermbg=magenta
+hi def lssCyanBg		ctermbg=cyan
+hi def lssLightgrayBg		ctermbg=lightgray
+hi def lssGrayBg		ctermbg=gray
+hi def lssBrightredBg		ctermbg=lightred
+hi def lssBrightgreenBg	ctermbg=lightgreen
+hi def lssYellowBg		ctermbg=yellow
+hi def lssBrightblueBg	ctermbg=lightblue
+hi def lssBrightmagentaBg	ctermbg=lightmagenta
+hi def lssBrightcyanBg	ctermbg=lightcyan
+hi def lssWhiteBg		ctermbg=white ctermfg=black
+
 let b:current_syntax = "lss"
 
 " vim: ts=8
diff --git a/runtime/syntax/lua.vim b/runtime/syntax/lua.vim
index 3ff80b1ebe..5ef771bb75 100644
--- a/runtime/syntax/lua.vim
+++ b/runtime/syntax/lua.vim
@@ -7,11 +7,8 @@
 "		lua_subversion = 0 (4.0, 5.0) or 1 (5.1) or 2 (5.2)
 "		default 5.2
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -325,40 +322,32 @@ elseif lua_version == 5
 endif
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_lua_syntax_inits")
-  if version < 508
-    let did_lua_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink luaStatement		Statement
-  HiLink luaRepeat		Repeat
-  HiLink luaFor			Repeat
-  HiLink luaString		String
-  HiLink luaString2		String
-  HiLink luaNumber		Number
-  HiLink luaOperator		Operator
-  HiLink luaIn			Operator
-  HiLink luaConstant		Constant
-  HiLink luaCond		Conditional
-  HiLink luaElse		Conditional
-  HiLink luaFunction		Function
-  HiLink luaComment		Comment
-  HiLink luaTodo		Todo
-  HiLink luaTable		Structure
-  HiLink luaError		Error
-  HiLink luaParenError		Error
-  HiLink luaBraceError		Error
-  HiLink luaSpecial		SpecialChar
-  HiLink luaFunc		Identifier
-  HiLink luaLabel		Label
+HiLink luaStatement		Statement
+HiLink luaRepeat		Repeat
+HiLink luaFor			Repeat
+HiLink luaString		String
+HiLink luaString2		String
+HiLink luaNumber		Number
+HiLink luaOperator		Operator
+HiLink luaIn			Operator
+HiLink luaConstant		Constant
+HiLink luaCond		Conditional
+HiLink luaElse		Conditional
+HiLink luaFunction		Function
+HiLink luaComment		Comment
+HiLink luaTodo		Todo
+HiLink luaTable		Structure
+HiLink luaError		Error
+HiLink luaParenError		Error
+HiLink luaBraceError		Error
+HiLink luaSpecial		SpecialChar
+HiLink luaFunc		Identifier
+HiLink luaLabel		Label
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "lua"
 
diff --git a/runtime/syntax/m4.vim b/runtime/syntax/m4.vim
index ba7a294d14..8325405261 100644
--- a/runtime/syntax/m4.vim
+++ b/runtime/syntax/m4.vim
@@ -8,15 +8,12 @@
 " capital letters and have at least one argument (i.e. the '('
 " must be there). Let me know if this is a problem.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
+" quit when a syntax file was already loaded
 if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
-  finish
-endif
-" we define it here so that included files can test for it
+  if exists("b:current_syntax")
+	finish
+  endif
+  " we define it here so that included files can test for it
   let main_syntax='m4'
 endif
 
@@ -39,30 +36,22 @@ syn region m4String   start="`" end="'" contained contains=@m4Top,@m4StringConte
 syn cluster m4Top     contains=m4Comment,m4Constants,m4Special,m4Variable,m4String,m4Paren,m4Command,m4Statement,m4Function
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_m4_syn_inits")
-  if version < 508
-    let did_m4_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink m4Delimiter Delimiter
-  HiLink m4Comment   Comment
-  HiLink m4Function  Function
-  HiLink m4Keyword   Keyword
-  HiLink m4Special   Special
-  HiLink m4String    String
-  HiLink m4Statement Statement
-  HiLink m4Preproc   PreProc
-  HiLink m4Type      Type
-  HiLink m4Special   Special
-  HiLink m4Variable  Special
-  HiLink m4Constants Constant
-  HiLink m4Builtin   Statement
-  delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+HiLink m4Delimiter Delimiter
+HiLink m4Comment   Comment
+HiLink m4Function  Function
+HiLink m4Keyword   Keyword
+HiLink m4Special   Special
+HiLink m4String    String
+HiLink m4Statement Statement
+HiLink m4Preproc   PreProc
+HiLink m4Type      Type
+HiLink m4Special   Special
+HiLink m4Variable  Special
+HiLink m4Constants Constant
+HiLink m4Builtin   Statement
+delcommand HiLink
 
 let b:current_syntax = "m4"
 
diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim
index 35b09341a6..f022a4e9ac 100644
--- a/runtime/syntax/make.vim
+++ b/runtime/syntax/make.vim
@@ -4,11 +4,8 @@
 " URL:		http://www.fleiner.com/vim/syntax/make.vim
 " Last Change:	2015 Feb 28
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -101,40 +98,32 @@ syn sync match makeCommandSync groupthere makeCommands "^[A-Za-z0-9_./$()%-][A-Z
 syn sync match makeCommandSync groupthere makeCommands "^[A-Za-z0-9_./$()%-][A-Za-z0-9_./\t $()%-]*:\{1,2}\s*$"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_make_syn_inits")
-  if version < 508
-    let did_make_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink makeNextLine		makeSpecial
-  HiLink makeCmdNextLine	makeSpecial
-  HiLink makeSpecTarget		Statement
-  if !exists("make_no_commands")
-    HiLink makeCommands		Number
-  endif
-  HiLink makeImplicit		Function
-  HiLink makeTarget		Function
-  HiLink makeInclude		Include
-  HiLink makePreCondit		PreCondit
-  HiLink makeStatement		Statement
-  HiLink makeIdent		Identifier
-  HiLink makeSpecial		Special
-  HiLink makeComment		Comment
-  HiLink makeDString		String
-  HiLink makeSString		String
-  HiLink makeBString		Function
-  HiLink makeError		Error
-  HiLink makeTodo		Todo
-  HiLink makeDefine		Define
-  HiLink makeCommandError	Error
-  HiLink makeConfig		PreCondit
-  delcommand HiLink
+HiLink makeNextLine		makeSpecial
+HiLink makeCmdNextLine	makeSpecial
+HiLink makeSpecTarget		Statement
+if !exists("make_no_commands")
+HiLink makeCommands		Number
 endif
+HiLink makeImplicit		Function
+HiLink makeTarget		Function
+HiLink makeInclude		Include
+HiLink makePreCondit		PreCondit
+HiLink makeStatement		Statement
+HiLink makeIdent		Identifier
+HiLink makeSpecial		Special
+HiLink makeComment		Comment
+HiLink makeDString		String
+HiLink makeSString		String
+HiLink makeBString		Function
+HiLink makeError		Error
+HiLink makeTodo		Todo
+HiLink makeDefine		Define
+HiLink makeCommandError	Error
+HiLink makeConfig		PreCondit
+delcommand HiLink
 
 let b:current_syntax = "make"
 
diff --git a/runtime/syntax/maple.vim b/runtime/syntax/maple.vim
index 77b1507b36..ad94053b39 100644
--- a/runtime/syntax/maple.vim
+++ b/runtime/syntax/maple.vim
@@ -21,11 +21,8 @@
 " but only the contents of packages of Maple V Release 4, and the top-level
 " routines of Release 4.  <Jacques Carette - carette@mcmaster.ca>
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -551,82 +548,74 @@ endif
 " =====================================================================
 
 " Highlighting: Define the default highlighting. {{{1
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_maplev_syntax_inits")
-  if version < 508
-    let did_maplev_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " Maple->Maple Links {{{2
-  HiLink mvBraceError	mvError
-  HiLink mvCurlyError	mvError
-  HiLink mvDebug		mvTodo
-  HiLink mvParenError	mvError
-  HiLink mvPkg_DEtools	mvPkgFunc
-  HiLink mvPkg_Galois	mvPkgFunc
-  HiLink mvPkg_GaussInt	mvPkgFunc
-  HiLink mvPkg_LREtools	mvPkgFunc
-  HiLink mvPkg_combinat	mvPkgFunc
-  HiLink mvPkg_combstruct	mvPkgFunc
-  HiLink mvPkg_difforms	mvPkgFunc
-  HiLink mvPkg_finance	mvPkgFunc
-  HiLink mvPkg_genfunc	mvPkgFunc
-  HiLink mvPkg_geometry	mvPkgFunc
-  HiLink mvPkg_grobner	mvPkgFunc
-  HiLink mvPkg_group	mvPkgFunc
-  HiLink mvPkg_inttrans	mvPkgFunc
-  HiLink mvPkg_liesymm	mvPkgFunc
-  HiLink mvPkg_linalg	mvPkgFunc
-  HiLink mvPkg_logic	mvPkgFunc
-  HiLink mvPkg_networks	mvPkgFunc
-  HiLink mvPkg_numapprox	mvPkgFunc
-  HiLink mvPkg_numtheory	mvPkgFunc
-  HiLink mvPkg_orthopoly	mvPkgFunc
-  HiLink mvPkg_padic	mvPkgFunc
-  HiLink mvPkg_plots	mvPkgFunc
-  HiLink mvPkg_plottools	mvPkgFunc
-  HiLink mvPkg_powseries	mvPkgFunc
-  HiLink mvPkg_process	mvPkgFunc
-  HiLink mvPkg_simplex	mvPkgFunc
-  HiLink mvPkg_stats	mvPkgFunc
-  HiLink mvPkg_student	mvPkgFunc
-  HiLink mvPkg_sumtools	mvPkgFunc
-  HiLink mvPkg_tensor	mvPkgFunc
-  HiLink mvPkg_totorder	mvPkgFunc
-  HiLink mvRange		mvOper
-  HiLink mvSemiError	mvError
-  HiLink mvDelim		Delimiter
+" Maple->Maple Links {{{2
+HiLink mvBraceError	mvError
+HiLink mvCurlyError	mvError
+HiLink mvDebug		mvTodo
+HiLink mvParenError	mvError
+HiLink mvPkg_DEtools	mvPkgFunc
+HiLink mvPkg_Galois	mvPkgFunc
+HiLink mvPkg_GaussInt	mvPkgFunc
+HiLink mvPkg_LREtools	mvPkgFunc
+HiLink mvPkg_combinat	mvPkgFunc
+HiLink mvPkg_combstruct	mvPkgFunc
+HiLink mvPkg_difforms	mvPkgFunc
+HiLink mvPkg_finance	mvPkgFunc
+HiLink mvPkg_genfunc	mvPkgFunc
+HiLink mvPkg_geometry	mvPkgFunc
+HiLink mvPkg_grobner	mvPkgFunc
+HiLink mvPkg_group	mvPkgFunc
+HiLink mvPkg_inttrans	mvPkgFunc
+HiLink mvPkg_liesymm	mvPkgFunc
+HiLink mvPkg_linalg	mvPkgFunc
+HiLink mvPkg_logic	mvPkgFunc
+HiLink mvPkg_networks	mvPkgFunc
+HiLink mvPkg_numapprox	mvPkgFunc
+HiLink mvPkg_numtheory	mvPkgFunc
+HiLink mvPkg_orthopoly	mvPkgFunc
+HiLink mvPkg_padic	mvPkgFunc
+HiLink mvPkg_plots	mvPkgFunc
+HiLink mvPkg_plottools	mvPkgFunc
+HiLink mvPkg_powseries	mvPkgFunc
+HiLink mvPkg_process	mvPkgFunc
+HiLink mvPkg_simplex	mvPkgFunc
+HiLink mvPkg_stats	mvPkgFunc
+HiLink mvPkg_student	mvPkgFunc
+HiLink mvPkg_sumtools	mvPkgFunc
+HiLink mvPkg_tensor	mvPkgFunc
+HiLink mvPkg_totorder	mvPkgFunc
+HiLink mvRange		mvOper
+HiLink mvSemiError	mvError
+HiLink mvDelim		Delimiter
 
-  " Maple->Standard Links {{{2
-  HiLink mvAssign		Delimiter
-  HiLink mvBool		Boolean
-  HiLink mvComma		Delimiter
-  HiLink mvComment		Comment
-  HiLink mvCond		Conditional
-  HiLink mvConstant		Number
-  HiLink mvDelayEval	Label
-  HiLink mvDcolon		Delimiter
-  HiLink mvError		Error
-  HiLink mvLibrary		Statement
-  HiLink mvNumber		Number
-  HiLink mvOper		Operator
-  HiLink mvAssign		Delimiter
-  HiLink mvPackage		Type
-  HiLink mvPkgFunc		Function
-  HiLink mvPktOption	Special
-  HiLink mvRepeat		Repeat
-  HiLink mvSpecial		Special
-  HiLink mvStatement	Statement
-  HiLink mvName		String
-  HiLink mvString		String
-  HiLink mvTodo		Todo
+" Maple->Standard Links {{{2
+HiLink mvAssign		Delimiter
+HiLink mvBool		Boolean
+HiLink mvComma		Delimiter
+HiLink mvComment		Comment
+HiLink mvCond		Conditional
+HiLink mvConstant		Number
+HiLink mvDelayEval	Label
+HiLink mvDcolon		Delimiter
+HiLink mvError		Error
+HiLink mvLibrary		Statement
+HiLink mvNumber		Number
+HiLink mvOper		Operator
+HiLink mvAssign		Delimiter
+HiLink mvPackage		Type
+HiLink mvPkgFunc		Function
+HiLink mvPktOption	Special
+HiLink mvRepeat		Repeat
+HiLink mvSpecial		Special
+HiLink mvStatement	Statement
+HiLink mvName		String
+HiLink mvString		String
+HiLink mvTodo		Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 " Current Syntax: {{{1
 let b:current_syntax = "maple"
diff --git a/runtime/syntax/markdown.vim b/runtime/syntax/markdown.vim
index 068115e92d..1955a7443e 100644
--- a/runtime/syntax/markdown.vim
+++ b/runtime/syntax/markdown.vim
@@ -2,7 +2,7 @@
 " Language:     Markdown
 " Maintainer:   Tim Pope <vimNOSPAM@tpope.org>
 " Filenames:    *.markdown
-" Last Change:  2013 May 30
+" Last Change:  2016 Aug 29
 
 if exists("b:current_syntax")
   finish
@@ -70,29 +70,34 @@ syn region markdownUrlTitle matchgroup=markdownUrlTitleDelimiter start=+"+ end=+
 syn region markdownUrlTitle matchgroup=markdownUrlTitleDelimiter start=+'+ end=+'+ keepend contained
 syn region markdownUrlTitle matchgroup=markdownUrlTitleDelimiter start=+(+ end=+)+ keepend contained
 
-syn region markdownLinkText matchgroup=markdownLinkTextDelimiter start="!\=\[\%(\_[^]]*]\%( \=[[(]\)\)\@=" end="\]\%( \=[[(]\)\@=" keepend nextgroup=markdownLink,markdownId skipwhite contains=@markdownInline,markdownLineStart
+syn region markdownLinkText matchgroup=markdownLinkTextDelimiter start="!\=\[\%(\_[^]]*]\%( \=[[(]\)\)\@=" end="\]\%( \=[[(]\)\@=" nextgroup=markdownLink,markdownId skipwhite contains=@markdownInline,markdownLineStart
 syn region markdownLink matchgroup=markdownLinkDelimiter start="(" end=")" contains=markdownUrl keepend contained
 syn region markdownId matchgroup=markdownIdDelimiter start="\[" end="\]" keepend contained
 syn region markdownAutomaticLink matchgroup=markdownUrlDelimiter start="<\%(\w\+:\|[[:alnum:]_+-]\+@\)\@=" end=">" keepend oneline
 
-syn region markdownItalic start="\S\@<=\*\|\*\S\@=" end="\S\@<=\*\|\*\S\@=" keepend contains=markdownLineStart
-syn region markdownItalic start="\S\@<=_\|_\S\@=" end="\S\@<=_\|_\S\@=" keepend contains=markdownLineStart
-syn region markdownBold start="\S\@<=\*\*\|\*\*\S\@=" end="\S\@<=\*\*\|\*\*\S\@=" keepend contains=markdownLineStart,markdownItalic
-syn region markdownBold start="\S\@<=__\|__\S\@=" end="\S\@<=__\|__\S\@=" keepend contains=markdownLineStart,markdownItalic
-syn region markdownBoldItalic start="\S\@<=\*\*\*\|\*\*\*\S\@=" end="\S\@<=\*\*\*\|\*\*\*\S\@=" keepend contains=markdownLineStart
-syn region markdownBoldItalic start="\S\@<=___\|___\S\@=" end="\S\@<=___\|___\S\@=" keepend contains=markdownLineStart
+let s:concealends = has('conceal') ? ' concealends' : ''
+exe 'syn region markdownItalic matchgroup=markdownItalicDelimiter start="\S\@<=\*\|\*\S\@=" end="\S\@<=\*\|\*\S\@=" keepend contains=markdownLineStart' . s:concealends
+exe 'syn region markdownItalic matchgroup=markdownItalicDelimiter start="\S\@<=_\|_\S\@=" end="\S\@<=_\|_\S\@=" keepend contains=markdownLineStart' . s:concealends
+exe 'syn region markdownBold matchgroup=markdownBoldDelimiter start="\S\@<=\*\*\|\*\*\S\@=" end="\S\@<=\*\*\|\*\*\S\@=" keepend contains=markdownLineStart,markdownItalic' . s:concealends
+exe 'syn region markdownBold matchgroup=markdownBoldDelimiter start="\S\@<=__\|__\S\@=" end="\S\@<=__\|__\S\@=" keepend contains=markdownLineStart,markdownItalic' . s:concealends
+exe 'syn region markdownBoldItalic matchgroup=markdownBoldItalicDelimiter start="\S\@<=\*\*\*\|\*\*\*\S\@=" end="\S\@<=\*\*\*\|\*\*\*\S\@=" keepend contains=markdownLineStart' . s:concealends
+exe 'syn region markdownBoldItalic matchgroup=markdownBoldItalicDelimiter start="\S\@<=___\|___\S\@=" end="\S\@<=___\|___\S\@=" keepend contains=markdownLineStart' . s:concealends
+
 syn region markdownCode matchgroup=markdownCodeDelimiter start="`" end="`" keepend contains=markdownLineStart
 syn region markdownCode matchgroup=markdownCodeDelimiter start="`` \=" end=" \=``" keepend contains=markdownLineStart
 syn region markdownCode matchgroup=markdownCodeDelimiter start="^\s*```.*$" end="^\s*```\ze\s*$" keepend
 
+syn match markdownFootnote "\[^[^\]]\+\]"
+syn match markdownFootnoteDefinition "^\[^[^\]]\+\]:"
+
 if main_syntax ==# 'markdown'
   for s:type in g:markdown_fenced_languages
-    exe 'syn region markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\..*','','').' matchgroup=markdownCodeDelimiter start="^\s*```'.matchstr(s:type,'[^=]*').'\>.*$" end="^\s*```\ze\s*$" keepend contains=@markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\.','','g')
+    exe 'syn region markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\..*','','').' matchgroup=markdownCodeDelimiter start="^\s*```\s*'.matchstr(s:type,'[^=]*').'\>.*$" end="^\s*```\ze\s*$" keepend contains=@markdownHighlight'.substitute(matchstr(s:type,'[^=]*$'),'\.','','g')
   endfor
   unlet! s:type
 endif
 
-syn match markdownEscape "\\[][\\`*_{}()#+.!-]"
+syn match markdownEscape "\\[][\\`*_{}()<>#+.!-]"
 syn match markdownError "\w\@<=_\w\@="
 
 hi def link markdownH1                    htmlH1
@@ -108,6 +113,9 @@ hi def link markdownListMarker            htmlTagName
 hi def link markdownBlockquote            Comment
 hi def link markdownRule                  PreProc
 
+hi def link markdownFootnote              Typedef
+hi def link markdownFootnoteDefinition    Typedef
+
 hi def link markdownLinkText              htmlLink
 hi def link markdownIdDeclaration         Typedef
 hi def link markdownId                    Type
@@ -119,8 +127,11 @@ hi def link markdownUrlDelimiter          htmlTag
 hi def link markdownUrlTitleDelimiter     Delimiter
 
 hi def link markdownItalic                htmlItalic
+hi def link markdownItalicDelimiter       markdownItalic
 hi def link markdownBold                  htmlBold
+hi def link markdownBoldDelimiter         markdownBold
 hi def link markdownBoldItalic            htmlBoldItalic
+hi def link markdownBoldItalicDelimiter   markdownBoldItalic
 hi def link markdownCodeDelimiter         Delimiter
 
 hi def link markdownEscape                Special
diff --git a/runtime/syntax/mason.vim b/runtime/syntax/mason.vim
index 40bdb0eaa4..6789e11aef 100644
--- a/runtime/syntax/mason.vim
+++ b/runtime/syntax/mason.vim
@@ -13,12 +13,8 @@
 "  - Fix <%text> blocks to show HTML tags but ignore Mason tags.
 "
 
-" Clear previous syntax settings unless this is v6 or above, in which case just
-" exit without doing anything.
-"
-if version < 600
-	syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
@@ -30,22 +26,14 @@ endif
 
 " First pull in the HTML syntax.
 "
-if version < 600
-	so <sfile>:p:h/html.vim
-else
-	runtime! syntax/html.vim
-	unlet b:current_syntax
-endif
+runtime! syntax/html.vim
+unlet b:current_syntax
 
 syn cluster htmlPreproc add=@masonTop
 
 " Now pull in the Perl syntax.
 "
-if version < 600
-	syn include @perlTop <sfile>:p:h/perl.vim
-else
-	syn include @perlTop syntax/perl.vim
-endif
+syn include @perlTop syntax/perl.vim
 
 " It's hard to reduce down to the correct sub-set of Perl to highlight in some
 " of these cases so I've taken the safe option of just using perlTop in all of
@@ -78,19 +66,7 @@ syn cluster masonTop contains=masonLine,masonExpr,masonPerl,masonComp,masonArgs,
 
 " Set up default highlighting. Almost all of this is done in the included
 " syntax files.
-"
-if version >= 508 || !exists("did_mason_syn_inits")
-	if version < 508
-		let did_mason_syn_inits = 1
-		com -nargs=+ HiLink hi link <args>
-	else
-		com -nargs=+ HiLink hi def link <args>
-	endif
-
-	HiLink masonDoc Comment
-
-	delc HiLink
-endif
+hi def link masonDoc Comment
 
 let b:current_syntax = "mason"
 
diff --git a/runtime/syntax/master.vim b/runtime/syntax/master.vim
index 40d644eef9..14440ee13d 100644
--- a/runtime/syntax/master.vim
+++ b/runtime/syntax/master.vim
@@ -8,11 +8,8 @@
 " this is a very simple syntax file - I will be improving it
 " add entire DEFINE syntax
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -28,22 +25,14 @@ syn region  masterString	start=+'+  end=+'+
 syn match   masterComment	"\$.*"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_master_syntax_inits")
-  if version < 508
-    let did_master_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink masterKeyword Keyword
-  HiLink masterComment Comment
-  HiLink masterString  String
+HiLink masterKeyword Keyword
+HiLink masterComment Comment
+HiLink masterString  String
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "master"
 
diff --git a/runtime/syntax/matlab.vim b/runtime/syntax/matlab.vim
index 3828f3e8a8..9cc2be877c 100644
--- a/runtime/syntax/matlab.vim
+++ b/runtime/syntax/matlab.vim
@@ -8,11 +8,8 @@
 " Change History:
 " 		- 'global' and 'persistent' keyword are now recognized
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -76,49 +73,41 @@ syn match matlabError	"-\=\<\d\+\.\d\+\.[^*/\\^]"
 syn match matlabError	"-\=\<\d\+\.\d\+[eEdD][-+]\=\d\+\.\([^*/\\^]\)"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_matlab_syntax_inits")
-  if version < 508
-    let did_matlab_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink matlabTransposeOperator	matlabOperator
-  HiLink matlabOperator			Operator
-  HiLink matlabLineContinuation		Special
-  HiLink matlabLabel			Label
-  HiLink matlabConditional		Conditional
-  HiLink matlabExceptions		Conditional
-  HiLink matlabRepeat			Repeat
-  HiLink matlabTodo			Todo
-  HiLink matlabString			String
-  HiLink matlabDelimiter		Identifier
-  HiLink matlabTransposeOther		Identifier
-  HiLink matlabNumber			Number
-  HiLink matlabFloat			Float
-  HiLink matlabFunction			Function
-  HiLink matlabError			Error
-  HiLink matlabImplicit			matlabStatement
-  HiLink matlabStatement		Statement
-  HiLink matlabOO			Statement
-  HiLink matlabSemicolon		SpecialChar
-  HiLink matlabComment			Comment
-  HiLink matlabMultilineComment		Comment
-  HiLink matlabScope			Type
+HiLink matlabTransposeOperator	matlabOperator
+HiLink matlabOperator			Operator
+HiLink matlabLineContinuation		Special
+HiLink matlabLabel			Label
+HiLink matlabConditional		Conditional
+HiLink matlabExceptions		Conditional
+HiLink matlabRepeat			Repeat
+HiLink matlabTodo			Todo
+HiLink matlabString			String
+HiLink matlabDelimiter		Identifier
+HiLink matlabTransposeOther		Identifier
+HiLink matlabNumber			Number
+HiLink matlabFloat			Float
+HiLink matlabFunction			Function
+HiLink matlabError			Error
+HiLink matlabImplicit			matlabStatement
+HiLink matlabStatement		Statement
+HiLink matlabOO			Statement
+HiLink matlabSemicolon		SpecialChar
+HiLink matlabComment			Comment
+HiLink matlabMultilineComment		Comment
+HiLink matlabScope			Type
 
-  HiLink matlabArithmeticOperator	matlabOperator
-  HiLink matlabRelationalOperator	matlabOperator
-  HiLink matlabLogicalOperator		matlabOperator
+HiLink matlabArithmeticOperator	matlabOperator
+HiLink matlabRelationalOperator	matlabOperator
+HiLink matlabLogicalOperator		matlabOperator
 
 "optional highlighting
-  "HiLink matlabIdentifier		Identifier
-  "HiLink matlabTab			Error
+"HiLink matlabIdentifier		Identifier
+"HiLink matlabTab			Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "matlab"
 
diff --git a/runtime/syntax/maxima.vim b/runtime/syntax/maxima.vim
index 27dcc18842..be13b0ef25 100644
--- a/runtime/syntax/maxima.vim
+++ b/runtime/syntax/maxima.vim
@@ -6,11 +6,8 @@
 " Adapted mostly from xmath.vim
 " Number formats adapted from r.vim
 "
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -234,41 +231,33 @@ syn sync match maximaSyncComment	grouphere maximaCommentBlock "/*"
 syn sync match maximaSyncComment	groupthere NONE "*/"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_maxima_syntax_inits")
-  if version < 508
-    let did_maxima_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink maximaBraceError	maximaError
-  HiLink maximaCmd	maximaStatement
-  HiLink maximaCurlyError	maximaError
-  HiLink maximaFuncCmd	maximaStatement
-  HiLink maximaParenError	maximaError
+HiLink maximaBraceError	maximaError
+HiLink maximaCmd	maximaStatement
+HiLink maximaCurlyError	maximaError
+HiLink maximaFuncCmd	maximaStatement
+HiLink maximaParenError	maximaError
 
-  " The default methods for highlighting.  Can be overridden later
-  HiLink maximaCharacter	Character
-  HiLink maximaComma	Function
-  HiLink maximaCommentBlock	Comment
-  HiLink maximaConditional	Conditional
-  HiLink maximaError	Error
-  HiLink maximaFunc	Delimiter
-  HiLink maximaOp                 Delimiter
-  HiLink maximaLabel	PreProc
-  HiLink maximaNumber	Number
-  HiLink maximaFloat	Float
-  HiLink maximaRepeat	Repeat
-  HiLink maximaSpecial	Type
-  HiLink maximaSpecialChar	SpecialChar
-  HiLink maximaStatement	Statement
-  HiLink maximaString	String
-  HiLink maximaTodo	Todo
+" The default methods for highlighting.  Can be overridden later
+HiLink maximaCharacter	Character
+HiLink maximaComma	Function
+HiLink maximaCommentBlock	Comment
+HiLink maximaConditional	Conditional
+HiLink maximaError	Error
+HiLink maximaFunc	Delimiter
+HiLink maximaOp                 Delimiter
+HiLink maximaLabel	PreProc
+HiLink maximaNumber	Number
+HiLink maximaFloat	Float
+HiLink maximaRepeat	Repeat
+HiLink maximaSpecial	Type
+HiLink maximaSpecialChar	SpecialChar
+HiLink maximaStatement	Statement
+HiLink maximaString	String
+HiLink maximaTodo	Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "maxima"
diff --git a/runtime/syntax/mel.vim b/runtime/syntax/mel.vim
index a668e70378..3d89f72a57 100644
--- a/runtime/syntax/mel.vim
+++ b/runtime/syntax/mel.vim
@@ -4,11 +4,8 @@
 " Last Change:	May 27 1999
 " Based on:	Bram Moolenaar <Bram@vim.org> C syntax file
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -77,45 +74,37 @@ endif
 exec "sy sync ccomment melComment minlines=" . mel_minlines
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_mel_syntax_inits")
-  if version < 508
-    let did_mel_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink melBoolean	Boolean
-  HiLink melFunction	Function
-  HiLink melIdentifier	Identifier
-  HiLink melStatement	Statement
-  HiLink melConditional Conditional
-  HiLink melRepeat	Repeat
-  HiLink melLabel	Label
-  HiLink melOperator	Operator
-  HiLink melKeyword	Keyword
-  HiLink melException	Exception
-  HiLink melInclude	Include
-  HiLink melType	Type
-  HiLink melStorageClass StorageClass
-  HiLink melDebug	Debug
-  HiLink melTodo	Todo
-  HiLink melCharSpecial SpecialChar
-  HiLink melString	String
-  HiLink melInteger	Number
-  HiLink melFloat	Float
-  HiLink melMatrixVector Float
-  HiLink melComment	Comment
-  HiLink melError	Error
-  HiLink melSpaceError	melError
-  HiLink melCharError	melError
-  HiLink melParenError	melError
-  HiLink melInParen	melError
-  HiLink melCommentError melError
+HiLink melBoolean	Boolean
+HiLink melFunction	Function
+HiLink melIdentifier	Identifier
+HiLink melStatement	Statement
+HiLink melConditional Conditional
+HiLink melRepeat	Repeat
+HiLink melLabel	Label
+HiLink melOperator	Operator
+HiLink melKeyword	Keyword
+HiLink melException	Exception
+HiLink melInclude	Include
+HiLink melType	Type
+HiLink melStorageClass StorageClass
+HiLink melDebug	Debug
+HiLink melTodo	Todo
+HiLink melCharSpecial SpecialChar
+HiLink melString	String
+HiLink melInteger	Number
+HiLink melFloat	Float
+HiLink melMatrixVector Float
+HiLink melComment	Comment
+HiLink melError	Error
+HiLink melSpaceError	melError
+HiLink melCharError	melError
+HiLink melParenError	melError
+HiLink melInParen	melError
+HiLink melCommentError melError
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "mel"
diff --git a/runtime/syntax/mf.vim b/runtime/syntax/mf.vim
index 8bc48fee46..e277c2d6c0 100644
--- a/runtime/syntax/mf.vim
+++ b/runtime/syntax/mf.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Andreas Scherer <andreas.scherer@pobox.com>
 " Last Change:	April 25, 2001
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -157,40 +154,32 @@ syn match mfComment	"%.*$"
 syn sync maxlines=50
 
 " Define the default highlighting
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_mf_syntax_inits")
-  if version < 508
-    let did_mf_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink mfBoolExp	Statement
-  HiLink mfNumExp	Statement
-  HiLink mfInternal	Identifier
-  HiLink mfPairExp	Statement
-  HiLink mfPathExp	Statement
-  HiLink mfPenExp	Statement
-  HiLink mfPicExp	Statement
-  HiLink mfStringExp	Statement
-  HiLink mfCommand	Statement
-  HiLink mfType	Type
-  HiLink mfStatement	Statement
-  HiLink mfDefinition	Statement
-  HiLink mfCondition	Conditional
-  HiLink mfPrimitive	Statement
-  HiLink mfMacro	Macro
-  HiLink mfCoord	Identifier
-  HiLink mfPoint	Identifier
-  HiLink mfNumeric	Number
-  HiLink mfLength	Number
-  HiLink mfComment	Comment
-  HiLink mfString	String
+HiLink mfBoolExp	Statement
+HiLink mfNumExp	Statement
+HiLink mfInternal	Identifier
+HiLink mfPairExp	Statement
+HiLink mfPathExp	Statement
+HiLink mfPenExp	Statement
+HiLink mfPicExp	Statement
+HiLink mfStringExp	Statement
+HiLink mfCommand	Statement
+HiLink mfType	Type
+HiLink mfStatement	Statement
+HiLink mfDefinition	Statement
+HiLink mfCondition	Conditional
+HiLink mfPrimitive	Statement
+HiLink mfMacro	Macro
+HiLink mfCoord	Identifier
+HiLink mfPoint	Identifier
+HiLink mfNumeric	Number
+HiLink mfLength	Number
+HiLink mfComment	Comment
+HiLink mfString	String
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "mf"
 
diff --git a/runtime/syntax/mgl.vim b/runtime/syntax/mgl.vim
index 55ae137f2f..4fd718e05b 100644
--- a/runtime/syntax/mgl.vim
+++ b/runtime/syntax/mgl.vim
@@ -6,9 +6,8 @@
 "
 " $Id: mgl.vim,v 1.1 2006/02/21 22:08:20 vimboss Exp $
 "
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -84,43 +83,35 @@ syn keyword mglPredefined	exception
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_mgl_syn_inits")
-  if version < 508
-    let did_mgl_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink mglBoolean		Boolean
-  HiLink mglComment		Comment
-  HiLink mglConditional		Conditional
-  HiLink mglConstant		Constant
-  HiLink mglException		Exception
-  HiLink mglFunction		Function
-  HiLink mglLabel		Label
-  HiLink mglMatrixDelimiter	Identifier
-  HiLink mglNumber		Number
-  HiLink mglHexNumber		Number
-  HiLink mglCharacter		Number
-  HiLink mglIpAddr		Number
-  HiLink mglOperator		Operator
-  HiLink mglPredefined		mglFunction
-  HiLink mglPreProc		PreProc
-  HiLink mglRepeat		Repeat
-  HiLink mglStatement		Statement
-  HiLink mglString		String
-  HiLink mglStringEscape	Special
-  HiLink mglStringEscapeGPC	Special
-  HiLink mglStringError		Error
-  HiLink mglStruct		mglStatement
-  HiLink mglSymbolOperator	mglOperator
-  HiLink mglType		Type
+HiLink mglBoolean		Boolean
+HiLink mglComment		Comment
+HiLink mglConditional		Conditional
+HiLink mglConstant		Constant
+HiLink mglException		Exception
+HiLink mglFunction		Function
+HiLink mglLabel		Label
+HiLink mglMatrixDelimiter	Identifier
+HiLink mglNumber		Number
+HiLink mglHexNumber		Number
+HiLink mglCharacter		Number
+HiLink mglIpAddr		Number
+HiLink mglOperator		Operator
+HiLink mglPredefined		mglFunction
+HiLink mglPreProc		PreProc
+HiLink mglRepeat		Repeat
+HiLink mglStatement		Statement
+HiLink mglString		String
+HiLink mglStringEscape	Special
+HiLink mglStringEscapeGPC	Special
+HiLink mglStringError		Error
+HiLink mglStruct		mglStatement
+HiLink mglSymbolOperator	mglOperator
+HiLink mglType		Type
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "mgl"
diff --git a/runtime/syntax/mgp.vim b/runtime/syntax/mgp.vim
index 76b96612e2..a5c6186c43 100644
--- a/runtime/syntax/mgp.vim
+++ b/runtime/syntax/mgp.vim
@@ -10,11 +10,8 @@
 " SPAM is _NOT_ welcome - be ready to be reported!
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -48,36 +45,27 @@ syn match mgpNoDefault +^%nodefault$+
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_mgp_syn_inits")
-  let did_mgp_syn_inits = 1
-  if version < 508
-    let did_mgp_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink mgpLineSkip	Special
+HiLink mgpLineSkip	Special
 
-  HiLink mgpHash	mgpComment
-  HiLink mgpPercent	mgpComment
-  HiLink mgpComment	Comment
+HiLink mgpHash	mgpComment
+HiLink mgpPercent	mgpComment
+HiLink mgpComment	Comment
 
-  HiLink mgpCommand	Identifier
+HiLink mgpCommand	Identifier
 
-  HiLink mgpLine	Type
+HiLink mgpLine	Type
 
-  HiLink mgpFile	String
-  HiLink mgpSize	Number
-  HiLink mgpValue	Number
+HiLink mgpFile	String
+HiLink mgpSize	Number
+HiLink mgpValue	Number
 
-  HiLink mgpPage	mgpDefine
-  HiLink mgpNoDefault	mgpDefine
-  HiLink mgpDefine	Define
+HiLink mgpPage	mgpDefine
+HiLink mgpNoDefault	mgpDefine
+HiLink mgpDefine	Define
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "mgp"
diff --git a/runtime/syntax/mma.vim b/runtime/syntax/mma.vim
index c63beb1195..9bdb7019b7 100644
--- a/runtime/syntax/mma.vim
+++ b/runtime/syntax/mma.vim
@@ -35,9 +35,8 @@
 "   fix nesting
 "   finish populating popular symbols
 
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
@@ -283,47 +282,40 @@ syntax sync fromstart
 "set foldnestmax=1
 "set foldminlines=15
 
-if version >= 508 || !exists("did_mma_syn_inits")
-	if version < 508
-		let did_mma_syn_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+command -nargs=+ HiLink hi def link <args>
 
-    " NOTE - the following links are not guaranteed to
-    " look good under all colorschemes.  You might need to
-    " :so $VIMRUNTIME/syntax/hitest.vim and tweak these to
-    " look good in yours
+" NOTE - the following links are not guaranteed to
+" look good under all colorschemes.  You might need to
+" :so $VIMRUNTIME/syntax/hitest.vim and tweak these to
+" look good in yours
 
 
-    HiLink mmaComment           Comment
-    HiLink mmaCommentStar       Comment
-    HiLink mmaFunctionComment   Comment
-    HiLink mmaLooseQuote        Comment
-	HiLink mmaGenericFunction   Function
-	HiLink mmaVariable          Identifier
+HiLink mmaComment           Comment
+HiLink mmaCommentStar       Comment
+HiLink mmaFunctionComment   Comment
+HiLink mmaLooseQuote        Comment
+HiLink mmaGenericFunction   Function
+HiLink mmaVariable          Identifier
 "    HiLink mmaSymbol            Identifier
-	HiLink mmaOperator          Operator
-    HiLink mmaPatternOp         Operator
-	HiLink mmaPureFunction      Operator
-	HiLink mmaString            String
-    HiLink mmaCommentString     String
-	HiLink mmaUnicode           String
-	HiLink mmaMessage           Type
-    HiLink mmaNumber            Type
-	HiLink mmaPattern           Type
-	HiLink mmaError             Error
-	HiLink mmaFixme             Error
-    HiLink mmaPatternError      Error
-    HiLink mmaTodo              Todo
-    HiLink mmaemPHAsis          Special
-    HiLink mmaFunctionTitle     Special
-    HiLink mmaMessageType       Special
-    HiLink mmaItem              Preproc
+HiLink mmaOperator          Operator
+HiLink mmaPatternOp         Operator
+HiLink mmaPureFunction      Operator
+HiLink mmaString            String
+HiLink mmaCommentString     String
+HiLink mmaUnicode           String
+HiLink mmaMessage           Type
+HiLink mmaNumber            Type
+HiLink mmaPattern           Type
+HiLink mmaError             Error
+HiLink mmaFixme             Error
+HiLink mmaPatternError      Error
+HiLink mmaTodo              Todo
+HiLink mmaemPHAsis          Special
+HiLink mmaFunctionTitle     Special
+HiLink mmaMessageType       Special
+HiLink mmaItem              Preproc
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "mma"
 
diff --git a/runtime/syntax/mmix.vim b/runtime/syntax/mmix.vim
index 79ca781402..724bdd35e4 100644
--- a/runtime/syntax/mmix.vim
+++ b/runtime/syntax/mmix.vim
@@ -9,9 +9,8 @@
 " Limitations:	Comments must start with either % or //
 "		(preferably %, Knuth-Style)
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -119,44 +118,36 @@ syn match mmixRegister		"r[A-Z]"
 syn keyword mmixRegister	rBB rTT rWW rXX rYY rZZ
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_mmix_syntax_inits")
-  if version < 508
-    let did_mmix_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting.  Can be overridden later
-  HiLink mmixAt		Type
-  HiLink mmixPseudo	Type
-  HiLink mmixRegister	Special
-  HiLink mmixSegments	Type
+" The default methods for highlighting.  Can be overridden later
+HiLink mmixAt		Type
+HiLink mmixPseudo	Type
+HiLink mmixRegister	Special
+HiLink mmixSegments	Type
 
-  HiLink mmixLabel	Special
-  HiLink mmixComment	Comment
-  HiLink mmixOpcode	Keyword
+HiLink mmixLabel	Special
+HiLink mmixComment	Comment
+HiLink mmixOpcode	Keyword
 
-  HiLink hexNumber	Number
-  HiLink decNumber	Number
-  HiLink octNumber	Number
+HiLink hexNumber	Number
+HiLink decNumber	Number
+HiLink octNumber	Number
 
-  HiLink mmixString	String
-  HiLink mmixChar	String
+HiLink mmixString	String
+HiLink mmixChar	String
 
-  HiLink mmixType	Type
-  HiLink mmixIdentifier	Normal
-  HiLink mmixSpecialComment Comment
+HiLink mmixType	Type
+HiLink mmixIdentifier	Normal
+HiLink mmixSpecialComment Comment
 
-  " My default color overrides:
-  " hi mmixSpecialComment ctermfg=red
-  "hi mmixLabel ctermfg=lightcyan
-  " hi mmixType ctermbg=black ctermfg=brown
+" My default color overrides:
+" hi mmixSpecialComment ctermfg=red
+"hi mmixLabel ctermfg=lightcyan
+" hi mmixType ctermbg=black ctermfg=brown
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "mmix"
 
diff --git a/runtime/syntax/mmp.vim b/runtime/syntax/mmp.vim
index 0117e77925..d0b9f7cfb5 100644
--- a/runtime/syntax/mmp.vim
+++ b/runtime/syntax/mmp.vim
@@ -5,11 +5,8 @@
 " URL: http://ronware.org/wiki/vim/mmp
 " Filetypes:	*.mmp
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -34,8 +31,7 @@ syn match   mmpNumber	"0x\x\+"
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+" Only when an item doesn't have highlighting yet
 if !exists("did_mmp_syntax_inits")
   let did_mmp_syntax_inits=1
 
diff --git a/runtime/syntax/modsim3.vim b/runtime/syntax/modsim3.vim
index 04e9ab9ab6..ba1963b695 100644
--- a/runtime/syntax/modsim3.vim
+++ b/runtime/syntax/modsim3.vim
@@ -12,10 +12,8 @@
 "
 " very basic things only (based on the modula2 and c files).
 
-if version < 600
-  " Remove any old syntax stuff hanging around
-  syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -77,31 +75,23 @@ syn region modsim3String start=+"+ end=+"+
 syn match modsim3Literal "'[^']'\|''''"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_modsim3_syntax_inits")
-  if version < 508
-    let did_modsim3_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting.  Can be overridden later
-  HiLink modsim3Keyword	Statement
-  HiLink modsim3Block		Statement
-  HiLink modsim3Comment1	Comment
-  HiLink modsim3Comment2	Comment
-  HiLink modsim3String		String
-  HiLink modsim3Literal	Character
-  HiLink modsim3Include	Statement
-  HiLink modsim3Type		Type
-  HiLink modsim3ParenError	Error
-  HiLink modsim3Builtin	Function
-  HiLink modsim3BuiltinNoParen	Function
+" The default methods for highlighting.  Can be overridden later
+HiLink modsim3Keyword	Statement
+HiLink modsim3Block		Statement
+HiLink modsim3Comment1	Comment
+HiLink modsim3Comment2	Comment
+HiLink modsim3String		String
+HiLink modsim3Literal	Character
+HiLink modsim3Include	Statement
+HiLink modsim3Type		Type
+HiLink modsim3ParenError	Error
+HiLink modsim3Builtin	Function
+HiLink modsim3BuiltinNoParen	Function
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "modsim3"
 
diff --git a/runtime/syntax/modula2.vim b/runtime/syntax/modula2.vim
index 3018900e80..9873201cda 100644
--- a/runtime/syntax/modula2.vim
+++ b/runtime/syntax/modula2.vim
@@ -4,11 +4,8 @@
 "   based on original work of Bram Moolenaar <Bram@vim.org>
 " Last Change:	2001 May 09
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -54,32 +51,24 @@ syn region modula2String start="'" end="'"
 syn region modula2Set start="{" end="}"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_modula2_syntax_inits")
-  if version < 508
-    let did_modula2_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink modula2Ident		Identifier
-  HiLink modula2StdConst	Boolean
-  HiLink modula2Type		Identifier
-  HiLink modula2StdFunc		Identifier
-  HiLink modula2Header		Type
-  HiLink modula2Keyword		Statement
-  HiLink modula2AttKeyword	PreProc
-  HiLink modula2Comment		Comment
-  " The following is just a matter of taste (you want to try this instead):
-  " hi modula2Comment term=bold ctermfg=DarkBlue guifg=Blue gui=bold
-  HiLink modula2Todo		Todo
-  HiLink modula2String		String
-  HiLink modula2Set		String
+HiLink modula2Ident		Identifier
+HiLink modula2StdConst	Boolean
+HiLink modula2Type		Identifier
+HiLink modula2StdFunc		Identifier
+HiLink modula2Header		Type
+HiLink modula2Keyword		Statement
+HiLink modula2AttKeyword	PreProc
+HiLink modula2Comment		Comment
+" The following is just a matter of taste (you want to try this instead):
+" hi modula2Comment term=bold ctermfg=DarkBlue guifg=Blue gui=bold
+HiLink modula2Todo		Todo
+HiLink modula2String		String
+HiLink modula2Set		String
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "modula2"
 
diff --git a/runtime/syntax/modula3.vim b/runtime/syntax/modula3.vim
index d6f72afbca..5f00efb76b 100644
--- a/runtime/syntax/modula3.vim
+++ b/runtime/syntax/modula3.vim
@@ -6,11 +6,8 @@
 " Basic things only...
 " Based on the modula 2 syntax file
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -46,24 +43,16 @@ syn region modula3String start=+"+ end=+"+
 syn region modula3String start=+'+ end=+'+
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_modula3_syntax_inits")
-  if version < 508
-    let did_modula3_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting.  Can be overridden later
-  HiLink modula3Keyword	Statement
-  HiLink modula3Block		PreProc
-  HiLink modula3Comment	Comment
-  HiLink modula3String		String
+" The default methods for highlighting.  Can be overridden later
+HiLink modula3Keyword	Statement
+HiLink modula3Block		PreProc
+HiLink modula3Comment	Comment
+HiLink modula3String		String
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "modula3"
 
diff --git a/runtime/syntax/monk.vim b/runtime/syntax/monk.vim
index afe2b56190..851560a3a9 100644
--- a/runtime/syntax/monk.vim
+++ b/runtime/syntax/monk.vim
@@ -21,11 +21,8 @@
 
 " Initializing:
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -60,11 +57,7 @@ syn region monkUnquote matchgroup=Delimiter start=",@#(" end=")" contains=ALLBUT
 
 " R5RS Scheme Functions and Syntax:
 
-if version < 600
-  set iskeyword=33,35-39,42-58,60-90,94,95,97-122,126,_
-else
-  setlocal iskeyword=33,35-39,42-58,60-90,94,95,97-122,126,_
-endif
+setlocal iskeyword=33,35-39,42-58,60-90,94,95,97-122,126,_
 
 syn keyword monkSyntax lambda and or if cond case define let let* letrec
 syn keyword monkSyntax begin do delay set! else =>
@@ -201,32 +194,24 @@ syn sync match matchPlace grouphere NONE "^[^ \t]"
 " ... i.e. synchronize on a line that starts at the left margin
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_monk_syntax_inits")
-  if version < 508
-    let did_monk_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink monkSyntax		Statement
-  HiLink monkFunc		Function
+HiLink monkSyntax		Statement
+HiLink monkFunc		Function
 
-  HiLink monkString		String
-  HiLink monkChar		Character
-  HiLink monkNumber		Number
-  HiLink monkBoolean		Boolean
+HiLink monkString		String
+HiLink monkChar		Character
+HiLink monkNumber		Number
+HiLink monkBoolean		Boolean
 
-  HiLink monkDelimiter	Delimiter
-  HiLink monkConstant	Constant
+HiLink monkDelimiter	Delimiter
+HiLink monkConstant	Constant
 
-  HiLink monkComment		Comment
-  HiLink monkError		Error
+HiLink monkComment		Comment
+HiLink monkError		Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "monk"
 
diff --git a/runtime/syntax/moo.vim b/runtime/syntax/moo.vim
index 10c5d3b4bc..617058f8e3 100644
--- a/runtime/syntax/moo.vim
+++ b/runtime/syntax/moo.vim
@@ -4,8 +4,8 @@
 " Last Change:	2001 Oct 06
 " Note:		Requires Vim 6.0 or above
 
-" Quit when a syntax file was already loaded
-if version < 600 || exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/mp.vim b/runtime/syntax/mp.vim
index c0fd60b3da..480db2a1b1 100644
--- a/runtime/syntax/mp.vim
+++ b/runtime/syntax/mp.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Andreas Scherer <andreas.scherer@pobox.com>
 " Last Change:	April 30, 2001
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -15,11 +12,7 @@ let plain_mf_macros = 0 " plain.mf has no special meaning for MetaPost
 let other_mf_macros = 0 " cmbase.mf, logo.mf, ... neither
 
 " Read the Metafont syntax to start with
-if version < 600
-  source <sfile>:p:h/mf.vim
-else
-  runtime! syntax/mf.vim
-endif
+runtime! syntax/mf.vim
 
 " MetaPost has TeX inserts for typeset labels
 " verbatimtex, btex, and etex will be treated as keywords
@@ -108,24 +101,16 @@ if other_mp_macros
 endif
 
 " Define the default highlighting
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_mp_syntax_inits")
-  if version < 508
-    let did_mp_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink mpTeXinsert	String
-  HiLink mpTeXbegin	Statement
-  HiLink mpTeXend	Statement
-  HiLink mpInternal	mfInternal
-  HiLink mpMacro	Macro
+HiLink mpTeXinsert	String
+HiLink mpTeXbegin	Statement
+HiLink mpTeXend	Statement
+HiLink mpInternal	mfInternal
+HiLink mpMacro	Macro
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "mp"
 
diff --git a/runtime/syntax/msidl.vim b/runtime/syntax/msidl.vim
index 79585bebc6..3bf5940a81 100644
--- a/runtime/syntax/msidl.vim
+++ b/runtime/syntax/msidl.vim
@@ -3,11 +3,8 @@
 " Maintainer:   Vadim Zeitlin <vadim@wxwindows.org>
 " Last Change:  2012 Feb 12 by Thilo Six
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -56,39 +53,31 @@ syn region  msidlSafeArray      start="SAFEARRAY(" end=")" contains=msidlStandar
 syn sync lines=50
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_msidl_syntax_inits")
-  if version < 508
-    let did_msidl_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink msidlInclude		Include
-  HiLink msidlPreProc		PreProc
-  HiLink msidlPreCondit		PreCondit
-  HiLink msidlDefine		Macro
-  HiLink msidlIncluded		String
-  HiLink msidlString		String
-  HiLink msidlComment		Comment
-  HiLink msidlTodo		Todo
-  HiLink msidlSpecial		SpecialChar
-  HiLink msidlLiteral		Number
-  HiLink msidlUUID		Number
+HiLink msidlInclude		Include
+HiLink msidlPreProc		PreProc
+HiLink msidlPreCondit		PreCondit
+HiLink msidlDefine		Macro
+HiLink msidlIncluded		String
+HiLink msidlString		String
+HiLink msidlComment		Comment
+HiLink msidlTodo		Todo
+HiLink msidlSpecial		SpecialChar
+HiLink msidlLiteral		Number
+HiLink msidlUUID		Number
 
-  HiLink msidlImport		Include
-  HiLink msidlEnum		StorageClass
-  HiLink msidlStruct		Structure
-  HiLink msidlTypedef		Typedef
-  HiLink msidlAttribute		StorageClass
+HiLink msidlImport		Include
+HiLink msidlEnum		StorageClass
+HiLink msidlStruct		Structure
+HiLink msidlTypedef		Typedef
+HiLink msidlAttribute		StorageClass
 
-  HiLink msidlStandardType	Type
-  HiLink msidlSafeArray		Type
+HiLink msidlStandardType	Type
+HiLink msidlSafeArray		Type
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "msidl"
 
diff --git a/runtime/syntax/msmessages.vim b/runtime/syntax/msmessages.vim
index 60588571c9..5faee978b4 100644
--- a/runtime/syntax/msmessages.vim
+++ b/runtime/syntax/msmessages.vim
@@ -7,11 +7,8 @@
 " See format description at <http://msdn2.microsoft.com/en-us/library/aa385646.aspx>
 " This file is based on the rc.vim and c.vim
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/msql.vim b/runtime/syntax/msql.vim
index 0716fbb1f6..6195786260 100644
--- a/runtime/syntax/msql.vim
+++ b/runtime/syntax/msql.vim
@@ -8,11 +8,8 @@
 " Options	msql_sql_query = 1 for SQL syntax highligthing inside strings
 "		msql_minlines = x     to sync at least x lines backwards
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -20,12 +17,8 @@ if !exists("main_syntax")
   let main_syntax = 'msql'
 endif
 
-if version < 600
-  so <sfile>:p:h/html.vim
-else
-  runtime! syntax/html.vim
-  unlet b:current_syntax
-endif
+runtime! syntax/html.vim
+unlet b:current_syntax
 
 syn cluster htmlPreproc add=msqlRegion
 
@@ -57,39 +50,31 @@ else
 endif
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_msql_syn_inits")
-  if version < 508
-    let did_msql_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink msqlComment		Comment
-  HiLink msqlString		String
-  HiLink msqlNumber		Number
-  HiLink msqlFloat		Float
-  HiLink msqlIdentifier	Identifier
-  HiLink msqlGlobalIdentifier	Identifier
-  HiLink msqlIntVar		Identifier
-  HiLink msqlEnvVar		Identifier
-  HiLink msqlFunctions		Function
-  HiLink msqlRepeat		Repeat
-  HiLink msqlConditional	Conditional
-  HiLink msqlStatement		Statement
-  HiLink msqlType		Type
-  HiLink msqlInclude		Include
-  HiLink msqlDefine		Define
-  HiLink msqlSpecialChar	SpecialChar
-  HiLink msqlParentError	Error
-  HiLink msqlTodo		Todo
-  HiLink msqlOperator		Operator
-  HiLink msqlRelation		Operator
+HiLink msqlComment		Comment
+HiLink msqlString		String
+HiLink msqlNumber		Number
+HiLink msqlFloat		Float
+HiLink msqlIdentifier	Identifier
+HiLink msqlGlobalIdentifier	Identifier
+HiLink msqlIntVar		Identifier
+HiLink msqlEnvVar		Identifier
+HiLink msqlFunctions		Function
+HiLink msqlRepeat		Repeat
+HiLink msqlConditional	Conditional
+HiLink msqlStatement		Statement
+HiLink msqlType		Type
+HiLink msqlInclude		Include
+HiLink msqlDefine		Define
+HiLink msqlSpecialChar	SpecialChar
+HiLink msqlParentError	Error
+HiLink msqlTodo		Todo
+HiLink msqlOperator		Operator
+HiLink msqlRelation		Operator
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "msql"
 
diff --git a/runtime/syntax/mupad.vim b/runtime/syntax/mupad.vim
index 109f880ee1..7f981f0b7a 100644
--- a/runtime/syntax/mupad.vim
+++ b/runtime/syntax/mupad.vim
@@ -5,11 +5,8 @@
 " Date:        6/30/2004
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -268,28 +265,21 @@ syn keyword mupadIdentifier	Tubular
 " graphics  meta-documentation Attributes
 syn keyword mupadIdentifier	objectGroupsListed
 
-if version >= 508 || !exists("did_mupad_syntax_inits")
-  if version < 508
-    let did_mupad_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink mupadComment		Comment
-  HiLink mupadString		String
-  HiLink mupadOperator		Operator
-  HiLink mupadSpecial		Special
-  HiLink mupadStatement		Statement
-  HiLink mupadUnderlined	Underlined
-  HiLink mupadConditional	Conditional
-  HiLink mupadRepeat		Repeat
-  HiLink mupadFunction		Function
-  HiLink mupadType		Type
-  HiLink mupadDefine		Define
-  HiLink mupadIdentifier	Identifier
+HiLink mupadComment		Comment
+HiLink mupadString		String
+HiLink mupadOperator		Operator
+HiLink mupadSpecial		Special
+HiLink mupadStatement		Statement
+HiLink mupadUnderlined	Underlined
+HiLink mupadConditional	Conditional
+HiLink mupadRepeat		Repeat
+HiLink mupadFunction		Function
+HiLink mupadType		Type
+HiLink mupadDefine		Define
+HiLink mupadIdentifier	Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 " TODO  More comprehensive listing.
diff --git a/runtime/syntax/mush.vim b/runtime/syntax/mush.vim
index 0645f33565..cf95d2a9e9 100644
--- a/runtime/syntax/mush.vim
+++ b/runtime/syntax/mush.vim
@@ -3,11 +3,8 @@
 " Based on vim Syntax file by: Bek Oberin <gossamer@tertius.net.au>
 " Last Updated: Fri Nov 04 20:28:15 2005
 "
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -185,42 +182,35 @@ syntax keyword mushAttribute use va vb vc vd ve vf vg vh vi vj vk vl vm vn
 syntax keyword mushAttribute vo vp vq vr vs vt vu vv vw vx vy vz
 
 
-if version >= 508 || !exists("did_mush_syntax_inits")
-  if version < 508
-    let did_mush_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting.  Can be overridden later
-  HiLink mushAttribute  Constant
-  HiLink mushCommand    Function
-  HiLink mushNumber     Number
-  HiLink mushSetting    PreProc
-  HiLink mushFunction   Statement
-  HiLink mushVariable   Identifier
-  HiLink mushSpecial    Special
-  HiLink mushTodo       Todo
-  HiLink mushFlag       Special
-  HiLink mushIdentifier Identifier
-  HiLink mushDefine     Macro
-  HiLink mushPreProc    PreProc
-  HiLink mushPreProcGroup PreProc 
-  HiLink mushPreCondit PreCondit
-  HiLink mushIncluded cString
-  HiLink  mushInclude Include
+" The default methods for highlighting.  Can be overridden later
+HiLink mushAttribute  Constant
+HiLink mushCommand    Function
+HiLink mushNumber     Number
+HiLink mushSetting    PreProc
+HiLink mushFunction   Statement
+HiLink mushVariable   Identifier
+HiLink mushSpecial    Special
+HiLink mushTodo       Todo
+HiLink mushFlag       Special
+HiLink mushIdentifier Identifier
+HiLink mushDefine     Macro
+HiLink mushPreProc    PreProc
+HiLink mushPreProcGroup PreProc 
+HiLink mushPreCondit PreCondit
+HiLink mushIncluded cString
+HiLink  mushInclude Include
 
 
 
 " Comments
-  HiLink mushCommentStart mushComment
-  HiLink mushComment    Comment
-  HiLink mushCommentString mushString
+HiLink mushCommentStart mushComment
+HiLink mushComment    Comment
+HiLink mushCommentString mushString
 
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "mush"
 
diff --git a/runtime/syntax/muttrc.vim b/runtime/syntax/muttrc.vim
index 94b27313b2..4e073b887e 100644
--- a/runtime/syntax/muttrc.vim
+++ b/runtime/syntax/muttrc.vim
@@ -6,11 +6,8 @@
 
 " This file covers mutt version 1.7.0
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -18,11 +15,7 @@ let s:cpo_save = &cpo
 set cpo&vim
 
 " Set the keyword characters
-if version < 600
-  set isk=@,48-57,_,-
-else
-  setlocal isk=@,48-57,_,-
-endif
+setlocal isk=@,48-57,_,-
 
 " handling optional variables
 if !exists("use_mutt_sidebar")
@@ -636,160 +629,152 @@ syn keyword muttrcMono		contained mono		skipwhite nextgroup=muttrcColorField
 syn match   muttrcMonoLine	"^\s*mono\s\+\S\+"	skipwhite nextgroup=muttrcMonoAttrib contains=muttrcMono
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_muttrc_syntax_inits")
-  if version < 508
-    let did_muttrc_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink muttrcComment		Comment
-  HiLink muttrcEscape		SpecialChar
-  HiLink muttrcRXChars		SpecialChar
-  HiLink muttrcString		String
-  HiLink muttrcRXString		String
-  HiLink muttrcRXString2	String
-  HiLink muttrcSpecial		Special
-  HiLink muttrcHooks		Type
-  HiLink muttrcGroupFlag	Type
-  HiLink muttrcGroupDef		Macro
-  HiLink muttrcAddrDef		muttrcGroupFlag
-  HiLink muttrcRXDef		muttrcGroupFlag
-  HiLink muttrcRXPat		String
-  HiLink muttrcAliasGroupName	Macro
-  HiLink muttrcAliasKey	        Identifier
-  HiLink muttrcUnAliasKey	Identifier
-  HiLink muttrcAliasEncEmail	Identifier
-  HiLink muttrcAliasParens	Type
-  HiLink muttrcSetNumAssignment	Number
-  HiLink muttrcSetBoolAssignment	Boolean
-  HiLink muttrcSetQuadAssignment	Boolean
-  HiLink muttrcSetStrAssignment	String
-  HiLink muttrcEmail		Special
-  HiLink muttrcVariableInner	Special
-  HiLink muttrcEscapedVariable	String
-  HiLink muttrcHeader		Type
-  HiLink muttrcKeySpecial	SpecialChar
-  HiLink muttrcKey		Type
-  HiLink muttrcKeyName		SpecialChar
-  HiLink muttrcVarBool		Identifier
-  HiLink muttrcVarQuad		Identifier
-  HiLink muttrcVarNum		Identifier
-  HiLink muttrcVarStr		Identifier
-  HiLink muttrcMenu		Identifier
-  HiLink muttrcCommand		Keyword
-  HiLink muttrcMacroDescr	String
-  HiLink muttrcAction		Macro
-  HiLink muttrcBadAction	Error
-  HiLink muttrcBindFunction	Error
-  HiLink muttrcBindMenuList	Error
-  HiLink muttrcFunction		Macro
-  HiLink muttrcGroupKeyword	muttrcCommand
-  HiLink muttrcGroupLine	Error
-  HiLink muttrcSubscribeKeyword	muttrcCommand
-  HiLink muttrcSubscribeLine	Error
-  HiLink muttrcListsKeyword	muttrcCommand
-  HiLink muttrcListsLine	Error
-  HiLink muttrcAlternateKeyword	muttrcCommand
-  HiLink muttrcAlternatesLine	Error
-  HiLink muttrcAttachmentsLine	muttrcCommand
-  HiLink muttrcAttachmentsFlag	Type
-  HiLink muttrcAttachmentsMimeType	String
-  HiLink muttrcColorLine	Error
-  HiLink muttrcColorContext	Error
-  HiLink muttrcColorContextI	Identifier
-  HiLink muttrcColorContextH	Identifier
-  HiLink muttrcColorKeyword	muttrcCommand
-  HiLink muttrcColorKeywordI	muttrcColorKeyword
-  HiLink muttrcColorKeywordH	muttrcColorKeyword
-  HiLink muttrcColorField	Identifier
-  HiLink muttrcColor		Type
-  HiLink muttrcColorFG		Error
-  HiLink muttrcColorFGI		Error
-  HiLink muttrcColorFGH		Error
-  HiLink muttrcColorBG		Error
-  HiLink muttrcColorBGI		Error
-  HiLink muttrcColorBGH		Error
-  HiLink muttrcMonoAttrib	muttrcColor
-  HiLink muttrcMono		muttrcCommand
-  HiLink muttrcSimplePat	Identifier
-  HiLink muttrcSimplePatString	Macro
-  HiLink muttrcSimplePatMetas	Special
-  HiLink muttrcPattern		Error
-  HiLink muttrcUnColorLine	Error
-  HiLink muttrcUnColorKeyword	muttrcCommand
-  HiLink muttrcUnColorIndex	Identifier
-  HiLink muttrcShellString	muttrcEscape
-  HiLink muttrcRXHooks		muttrcCommand
-  HiLink muttrcRXHookNot	Type
-  HiLink muttrcPatHooks		muttrcCommand
-  HiLink muttrcPatHookNot	Type
-  HiLink muttrcFormatConditionals2 Type
-  HiLink muttrcIndexFormatStr	muttrcString
-  HiLink muttrcIndexFormatEscapes muttrcEscape
-  HiLink muttrcIndexFormatConditionals muttrcFormatConditionals2
-  HiLink muttrcAliasFormatStr	muttrcString
-  HiLink muttrcAliasFormatEscapes muttrcEscape
-  HiLink muttrcAttachFormatStr	muttrcString
-  HiLink muttrcAttachFormatEscapes muttrcEscape
-  HiLink muttrcAttachFormatConditionals muttrcFormatConditionals2
-  HiLink muttrcComposeFormatStr	muttrcString
-  HiLink muttrcComposeFormatEscapes muttrcEscape
-  HiLink muttrcFolderFormatStr	muttrcString
-  HiLink muttrcFolderFormatEscapes muttrcEscape
-  HiLink muttrcFolderFormatConditionals muttrcFormatConditionals2
-  HiLink muttrcMixFormatStr	muttrcString
-  HiLink muttrcMixFormatEscapes muttrcEscape
-  HiLink muttrcMixFormatConditionals muttrcFormatConditionals2
-  HiLink muttrcPGPFormatStr	muttrcString
-  HiLink muttrcPGPFormatEscapes muttrcEscape
-  HiLink muttrcPGPFormatConditionals muttrcFormatConditionals2
-  HiLink muttrcPGPCmdFormatStr	muttrcString
-  HiLink muttrcPGPCmdFormatEscapes muttrcEscape
-  HiLink muttrcPGPCmdFormatConditionals muttrcFormatConditionals2
-  HiLink muttrcStatusFormatStr	muttrcString
-  HiLink muttrcStatusFormatEscapes muttrcEscape
-  HiLink muttrcStatusFormatConditionals muttrcFormatConditionals2
-  HiLink muttrcPGPGetKeysFormatStr	muttrcString
-  HiLink muttrcPGPGetKeysFormatEscapes muttrcEscape
-  HiLink muttrcSmimeFormatStr	muttrcString
-  HiLink muttrcSmimeFormatEscapes muttrcEscape
-  HiLink muttrcSmimeFormatConditionals muttrcFormatConditionals2
-  HiLink muttrcTimeEscapes	muttrcEscape
-  HiLink muttrcPGPTimeEscapes	muttrcEscape
-  HiLink muttrcStrftimeEscapes	Type
-  HiLink muttrcStrftimeFormatStr muttrcString
-  HiLink muttrcFormatErrors Error
+HiLink muttrcComment		Comment
+HiLink muttrcEscape		SpecialChar
+HiLink muttrcRXChars		SpecialChar
+HiLink muttrcString		String
+HiLink muttrcRXString		String
+HiLink muttrcRXString2	String
+HiLink muttrcSpecial		Special
+HiLink muttrcHooks		Type
+HiLink muttrcGroupFlag	Type
+HiLink muttrcGroupDef		Macro
+HiLink muttrcAddrDef		muttrcGroupFlag
+HiLink muttrcRXDef		muttrcGroupFlag
+HiLink muttrcRXPat		String
+HiLink muttrcAliasGroupName	Macro
+HiLink muttrcAliasKey	        Identifier
+HiLink muttrcUnAliasKey	Identifier
+HiLink muttrcAliasEncEmail	Identifier
+HiLink muttrcAliasParens	Type
+HiLink muttrcSetNumAssignment	Number
+HiLink muttrcSetBoolAssignment	Boolean
+HiLink muttrcSetQuadAssignment	Boolean
+HiLink muttrcSetStrAssignment	String
+HiLink muttrcEmail		Special
+HiLink muttrcVariableInner	Special
+HiLink muttrcEscapedVariable	String
+HiLink muttrcHeader		Type
+HiLink muttrcKeySpecial	SpecialChar
+HiLink muttrcKey		Type
+HiLink muttrcKeyName		SpecialChar
+HiLink muttrcVarBool		Identifier
+HiLink muttrcVarQuad		Identifier
+HiLink muttrcVarNum		Identifier
+HiLink muttrcVarStr		Identifier
+HiLink muttrcMenu		Identifier
+HiLink muttrcCommand		Keyword
+HiLink muttrcMacroDescr	String
+HiLink muttrcAction		Macro
+HiLink muttrcBadAction	Error
+HiLink muttrcBindFunction	Error
+HiLink muttrcBindMenuList	Error
+HiLink muttrcFunction		Macro
+HiLink muttrcGroupKeyword	muttrcCommand
+HiLink muttrcGroupLine	Error
+HiLink muttrcSubscribeKeyword	muttrcCommand
+HiLink muttrcSubscribeLine	Error
+HiLink muttrcListsKeyword	muttrcCommand
+HiLink muttrcListsLine	Error
+HiLink muttrcAlternateKeyword	muttrcCommand
+HiLink muttrcAlternatesLine	Error
+HiLink muttrcAttachmentsLine	muttrcCommand
+HiLink muttrcAttachmentsFlag	Type
+HiLink muttrcAttachmentsMimeType	String
+HiLink muttrcColorLine	Error
+HiLink muttrcColorContext	Error
+HiLink muttrcColorContextI	Identifier
+HiLink muttrcColorContextH	Identifier
+HiLink muttrcColorKeyword	muttrcCommand
+HiLink muttrcColorKeywordI	muttrcColorKeyword
+HiLink muttrcColorKeywordH	muttrcColorKeyword
+HiLink muttrcColorField	Identifier
+HiLink muttrcColor		Type
+HiLink muttrcColorFG		Error
+HiLink muttrcColorFGI		Error
+HiLink muttrcColorFGH		Error
+HiLink muttrcColorBG		Error
+HiLink muttrcColorBGI		Error
+HiLink muttrcColorBGH		Error
+HiLink muttrcMonoAttrib	muttrcColor
+HiLink muttrcMono		muttrcCommand
+HiLink muttrcSimplePat	Identifier
+HiLink muttrcSimplePatString	Macro
+HiLink muttrcSimplePatMetas	Special
+HiLink muttrcPattern		Error
+HiLink muttrcUnColorLine	Error
+HiLink muttrcUnColorKeyword	muttrcCommand
+HiLink muttrcUnColorIndex	Identifier
+HiLink muttrcShellString	muttrcEscape
+HiLink muttrcRXHooks		muttrcCommand
+HiLink muttrcRXHookNot	Type
+HiLink muttrcPatHooks		muttrcCommand
+HiLink muttrcPatHookNot	Type
+HiLink muttrcFormatConditionals2 Type
+HiLink muttrcIndexFormatStr	muttrcString
+HiLink muttrcIndexFormatEscapes muttrcEscape
+HiLink muttrcIndexFormatConditionals muttrcFormatConditionals2
+HiLink muttrcAliasFormatStr	muttrcString
+HiLink muttrcAliasFormatEscapes muttrcEscape
+HiLink muttrcAttachFormatStr	muttrcString
+HiLink muttrcAttachFormatEscapes muttrcEscape
+HiLink muttrcAttachFormatConditionals muttrcFormatConditionals2
+HiLink muttrcComposeFormatStr	muttrcString
+HiLink muttrcComposeFormatEscapes muttrcEscape
+HiLink muttrcFolderFormatStr	muttrcString
+HiLink muttrcFolderFormatEscapes muttrcEscape
+HiLink muttrcFolderFormatConditionals muttrcFormatConditionals2
+HiLink muttrcMixFormatStr	muttrcString
+HiLink muttrcMixFormatEscapes muttrcEscape
+HiLink muttrcMixFormatConditionals muttrcFormatConditionals2
+HiLink muttrcPGPFormatStr	muttrcString
+HiLink muttrcPGPFormatEscapes muttrcEscape
+HiLink muttrcPGPFormatConditionals muttrcFormatConditionals2
+HiLink muttrcPGPCmdFormatStr	muttrcString
+HiLink muttrcPGPCmdFormatEscapes muttrcEscape
+HiLink muttrcPGPCmdFormatConditionals muttrcFormatConditionals2
+HiLink muttrcStatusFormatStr	muttrcString
+HiLink muttrcStatusFormatEscapes muttrcEscape
+HiLink muttrcStatusFormatConditionals muttrcFormatConditionals2
+HiLink muttrcPGPGetKeysFormatStr	muttrcString
+HiLink muttrcPGPGetKeysFormatEscapes muttrcEscape
+HiLink muttrcSmimeFormatStr	muttrcString
+HiLink muttrcSmimeFormatEscapes muttrcEscape
+HiLink muttrcSmimeFormatConditionals muttrcFormatConditionals2
+HiLink muttrcTimeEscapes	muttrcEscape
+HiLink muttrcPGPTimeEscapes	muttrcEscape
+HiLink muttrcStrftimeEscapes	Type
+HiLink muttrcStrftimeFormatStr muttrcString
+HiLink muttrcFormatErrors Error
 
-  HiLink muttrcBindFunctionNL	SpecialChar
-  HiLink muttrcBindKeyNL	SpecialChar
-  HiLink muttrcBindMenuListNL	SpecialChar
-  HiLink muttrcMacroDescrNL	SpecialChar
-  HiLink muttrcMacroBodyNL	SpecialChar
-  HiLink muttrcMacroKeyNL	SpecialChar
-  HiLink muttrcMacroMenuListNL	SpecialChar
-  HiLink muttrcColorMatchCountNL SpecialChar
-  HiLink muttrcColorNL		SpecialChar
-  HiLink muttrcColorRXNL	SpecialChar
-  HiLink muttrcColorBGNL	SpecialChar
-  HiLink muttrcColorFGNL	SpecialChar
-  HiLink muttrcAliasNameNL	SpecialChar
-  HiLink muttrcAliasENNL	SpecialChar
-  HiLink muttrcAliasNL		SpecialChar
-  HiLink muttrcUnAliasNL	SpecialChar
-  HiLink muttrcAliasGroupDefNL	SpecialChar
-  HiLink muttrcAliasEncEmailNL	SpecialChar
-  HiLink muttrcPatternNL	SpecialChar
-  HiLink muttrcUnColorPatNL	SpecialChar
-  HiLink muttrcUnColorAPNL	SpecialChar
-  HiLink muttrcUnColorIndexNL	SpecialChar
-  HiLink muttrcStringNL		SpecialChar
+HiLink muttrcBindFunctionNL	SpecialChar
+HiLink muttrcBindKeyNL	SpecialChar
+HiLink muttrcBindMenuListNL	SpecialChar
+HiLink muttrcMacroDescrNL	SpecialChar
+HiLink muttrcMacroBodyNL	SpecialChar
+HiLink muttrcMacroKeyNL	SpecialChar
+HiLink muttrcMacroMenuListNL	SpecialChar
+HiLink muttrcColorMatchCountNL SpecialChar
+HiLink muttrcColorNL		SpecialChar
+HiLink muttrcColorRXNL	SpecialChar
+HiLink muttrcColorBGNL	SpecialChar
+HiLink muttrcColorFGNL	SpecialChar
+HiLink muttrcAliasNameNL	SpecialChar
+HiLink muttrcAliasENNL	SpecialChar
+HiLink muttrcAliasNL		SpecialChar
+HiLink muttrcUnAliasNL	SpecialChar
+HiLink muttrcAliasGroupDefNL	SpecialChar
+HiLink muttrcAliasEncEmailNL	SpecialChar
+HiLink muttrcPatternNL	SpecialChar
+HiLink muttrcUnColorPatNL	SpecialChar
+HiLink muttrcUnColorAPNL	SpecialChar
+HiLink muttrcUnColorIndexNL	SpecialChar
+HiLink muttrcStringNL		SpecialChar
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "muttrc"
 
diff --git a/runtime/syntax/mysql.vim b/runtime/syntax/mysql.vim
index d7cf74710d..8d0361c220 100644
--- a/runtime/syntax/mysql.vim
+++ b/runtime/syntax/mysql.vim
@@ -6,11 +6,8 @@
 " URL:          ftp://cedar-solutions.com/software/mysql.vim
 " Note:         The definitions below are taken from the mysql user manual as of April 2002, for version 3.23
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -273,29 +270,21 @@ syn region mysqlFunction         start="weekday(" end=")" contains=ALL
 syn region mysqlFunction         start="yearweek(" end=")" contains=ALL
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_mysql_syn_inits")
-  if version < 508
-    let did_mysql_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink mysqlKeyword            Statement
-  HiLink mysqlSpecial            Special
-  HiLink mysqlString             String
-  HiLink mysqlNumber             Number
-  HiLink mysqlVariable           Identifier
-  HiLink mysqlComment            Comment
-  HiLink mysqlType               Type
-  HiLink mysqlOperator           Statement
-  HiLink mysqlFlow               Statement
-  HiLink mysqlFunction           Function
+HiLink mysqlKeyword            Statement
+HiLink mysqlSpecial            Special
+HiLink mysqlString             String
+HiLink mysqlNumber             Number
+HiLink mysqlVariable           Identifier
+HiLink mysqlComment            Comment
+HiLink mysqlType               Type
+HiLink mysqlOperator           Statement
+HiLink mysqlFlow               Statement
+HiLink mysqlFunction           Function
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "mysql"
 
diff --git a/runtime/syntax/named.vim b/runtime/syntax/named.vim
index faec5f68e5..6d6cbd484d 100644
--- a/runtime/syntax/named.vim
+++ b/runtime/syntax/named.vim
@@ -11,25 +11,16 @@
 " This file could do with a lot of improvements, so comments are welcome.
 " Please submit the named.conf (segment) with any comments.
 "
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 syn case match
 
-if version >= 600
-  setlocal iskeyword=.,-,48-58,A-Z,a-z,_
-else
-  set iskeyword=.,-,48-58,A-Z,a-z,_
-endif
+setlocal iskeyword=.,-,48-58,A-Z,a-z,_
 
-if version >= 600
-  syn sync match namedSync grouphere NONE "^(zone|controls|acl|key)"
-endif
+syn sync match namedSync grouphere NONE "^(zone|controls|acl|key)"
 
 let s:save_cpo = &cpo
 set cpo-=C
@@ -197,48 +188,40 @@ syn match	namedEParenError	contained +{+
 syn match	namedParenError	+}\([^;]\|$\)+
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_named_syn_inits")
-  if version < 508
-    let did_named_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink namedComment	Comment
-  HiLink namedInclude	Include
-  HiLink namedKeyword	Keyword
-  HiLink namedIntKeyword	Keyword
-  HiLink namedIdentifier	Identifier
-  HiLink namedIntIdent	Identifier
+HiLink namedComment	Comment
+HiLink namedInclude	Include
+HiLink namedKeyword	Keyword
+HiLink namedIntKeyword	Keyword
+HiLink namedIdentifier	Identifier
+HiLink namedIntIdent	Identifier
 
-  HiLink namedString	String
-  HiLink namedBool	Type
-  HiLink namedNotBool	Error
-  HiLink namedNumber	Number
-  HiLink namedNotNumber	Error
+HiLink namedString	String
+HiLink namedBool	Type
+HiLink namedNotBool	Error
+HiLink namedNumber	Number
+HiLink namedNotNumber	Error
 
-  HiLink namedOption	namedKeyword
-  HiLink namedLogOption	namedKeyword
-  HiLink namedCNOption	namedKeyword
-  HiLink namedQSKeywords	Type
-  HiLink namedCNKeywords	Type
-  HiLink namedLogCategory	Type
-  HiLink namedIPaddr	Number
-  HiLink namedDomain	Identifier
-  HiLink namedZoneOpt	namedKeyword
-  HiLink namedZoneType	Type
-  HiLink namedParenError	Error
-  HiLink namedEParenError	Error
-  HiLink namedIllegalDom	Error
-  HiLink namedIPerror	Error
-  HiLink namedSpareDot	Error
-  HiLink namedError	Error
+HiLink namedOption	namedKeyword
+HiLink namedLogOption	namedKeyword
+HiLink namedCNOption	namedKeyword
+HiLink namedQSKeywords	Type
+HiLink namedCNKeywords	Type
+HiLink namedLogCategory	Type
+HiLink namedIPaddr	Number
+HiLink namedDomain	Identifier
+HiLink namedZoneOpt	namedKeyword
+HiLink namedZoneType	Type
+HiLink namedParenError	Error
+HiLink namedEParenError	Error
+HiLink namedIllegalDom	Error
+HiLink namedIPerror	Error
+HiLink namedSpareDot	Error
+HiLink namedError	Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/runtime/syntax/nasm.vim b/runtime/syntax/nasm.vim
index a6ed056650..0f81ceb5a9 100644
--- a/runtime/syntax/nasm.vim
+++ b/runtime/syntax/nasm.vim
@@ -9,10 +9,8 @@
 
 
 " Setup Syntax:
-"  Clear old syntax settings
-if version < 600
-  syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 "  Assembler syntax is case insensetive
@@ -21,18 +19,10 @@ syn case ignore
 
 
 " Vim search and movement commands on identifers
-if version < 600
-  "  Comments at start of a line inside which to skip search for indentifiers
-  set comments=:;
-  "  Identifier Keyword characters (defines \k)
-  set iskeyword=@,48-57,#,$,.,?,@-@,_,~
-else
-  "  Comments at start of a line inside which to skip search for indentifiers
-  setlocal comments=:;
-  "  Identifier Keyword characters (defines \k)
-  setlocal iskeyword=@,48-57,#,$,.,?,@-@,_,~
-endif
-
+"  Comments at start of a line inside which to skip search for indentifiers
+setlocal comments=:;
+"  Identifier Keyword characters (defines \k)
+setlocal iskeyword=@,48-57,#,$,.,?,@-@,_,~
 
 
 " Comments:
@@ -431,96 +421,88 @@ syn sync match	nasmSync	grouphere NONE	       "^\s*%endmacro\>"
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later  : only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_nasm_syntax_inits")
-  if version < 508
-    let did_nasm_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " Sub Links:
-  HiLink nasmInMacDirective	nasmDirective
-  HiLink nasmInMacLabel		nasmLocalLabel
-  HiLink nasmInMacLblWarn	nasmLabelWarn
-  HiLink nasmInMacMacro		nasmMacro
-  HiLink nasmInMacParam		nasmMacro
-  HiLink nasmInMacParamNum	nasmDecNumber
-  HiLink nasmInMacPreCondit	nasmPreCondit
-  HiLink nasmInMacPreProc	nasmPreProc
-  HiLink nasmInPreCondit	nasmPreCondit
-  HiLink nasmInStructure	nasmStructure
-  HiLink nasmStructureLabel	nasmStructure
+" Sub Links:
+HiLink nasmInMacDirective	nasmDirective
+HiLink nasmInMacLabel		nasmLocalLabel
+HiLink nasmInMacLblWarn	nasmLabelWarn
+HiLink nasmInMacMacro		nasmMacro
+HiLink nasmInMacParam		nasmMacro
+HiLink nasmInMacParamNum	nasmDecNumber
+HiLink nasmInMacPreCondit	nasmPreCondit
+HiLink nasmInMacPreProc	nasmPreProc
+HiLink nasmInPreCondit	nasmPreCondit
+HiLink nasmInStructure	nasmStructure
+HiLink nasmStructureLabel	nasmStructure
 
-  " Comment Group:
-  HiLink nasmComment		Comment
-  HiLink nasmSpecialComment	SpecialComment
-  HiLink nasmInCommentTodo	Todo
+" Comment Group:
+HiLink nasmComment		Comment
+HiLink nasmSpecialComment	SpecialComment
+HiLink nasmInCommentTodo	Todo
 
-  " Constant Group:
-  HiLink nasmString		String
-  HiLink nasmStringError	Error
-  HiLink nasmBinNumber		Number
-  HiLink nasmOctNumber		Number
-  HiLink nasmDecNumber		Number
-  HiLink nasmHexNumber		Number
-  HiLink nasmFltNumber		Float
-  HiLink nasmNumberError	Error
+" Constant Group:
+HiLink nasmString		String
+HiLink nasmStringError	Error
+HiLink nasmBinNumber		Number
+HiLink nasmOctNumber		Number
+HiLink nasmDecNumber		Number
+HiLink nasmHexNumber		Number
+HiLink nasmFltNumber		Float
+HiLink nasmNumberError	Error
 
-  " Identifier Group:
-  HiLink nasmLabel		Identifier
-  HiLink nasmLocalLabel		Identifier
-  HiLink nasmSpecialLabel	Special
-  HiLink nasmLabelError		Error
-  HiLink nasmLabelWarn		Todo
+" Identifier Group:
+HiLink nasmLabel		Identifier
+HiLink nasmLocalLabel		Identifier
+HiLink nasmSpecialLabel	Special
+HiLink nasmLabelError		Error
+HiLink nasmLabelWarn		Todo
 
-  " PreProc Group:
-  HiLink nasmPreProc		PreProc
-  HiLink nasmDefine		Define
-  HiLink nasmInclude		Include
-  HiLink nasmMacro		Macro
-  HiLink nasmPreCondit		PreCondit
-  HiLink nasmPreProcError	Error
-  HiLink nasmPreProcWarn	Todo
+" PreProc Group:
+HiLink nasmPreProc		PreProc
+HiLink nasmDefine		Define
+HiLink nasmInclude		Include
+HiLink nasmMacro		Macro
+HiLink nasmPreCondit		PreCondit
+HiLink nasmPreProcError	Error
+HiLink nasmPreProcWarn	Todo
 
-  " Type Group:
-  HiLink nasmType		Type
-  HiLink nasmStorage		StorageClass
-  HiLink nasmStructure		Structure
-  HiLink nasmTypeError		Error
+" Type Group:
+HiLink nasmType		Type
+HiLink nasmStorage		StorageClass
+HiLink nasmStructure		Structure
+HiLink nasmTypeError		Error
 
-  " Directive Group:
-  HiLink nasmConstant		Constant
-  HiLink nasmInstrModifier	Operator
-  HiLink nasmRepeat		Repeat
-  HiLink nasmDirective		Keyword
-  HiLink nasmStdDirective	Operator
-  HiLink nasmFmtDirective	Keyword
+" Directive Group:
+HiLink nasmConstant		Constant
+HiLink nasmInstrModifier	Operator
+HiLink nasmRepeat		Repeat
+HiLink nasmDirective		Keyword
+HiLink nasmStdDirective	Operator
+HiLink nasmFmtDirective	Keyword
 
-  " Register Group:
-  HiLink nasmCtrlRegister	Special
-  HiLink nasmDebugRegister	Debug
-  HiLink nasmTestRegister	Special
-  HiLink nasmRegisterError	Error
-  HiLink nasmMemRefError	Error
+" Register Group:
+HiLink nasmCtrlRegister	Special
+HiLink nasmDebugRegister	Debug
+HiLink nasmTestRegister	Special
+HiLink nasmRegisterError	Error
+HiLink nasmMemRefError	Error
 
-  " Instruction Group:
-  HiLink nasmStdInstruction	Statement
-  HiLink nasmSysInstruction	Statement
-  HiLink nasmDbgInstruction	Debug
-  HiLink nasmFpuInstruction	Statement
-  HiLink nasmMmxInstruction	Statement
-  HiLink nasmSseInstruction	Statement
-  HiLink nasmNowInstruction	Statement
-  HiLink nasmAmdInstruction	Special
-  HiLink nasmCrxInstruction	Special
-  HiLink nasmUndInstruction	Todo
-  HiLink nasmInstructnError	Error
+" Instruction Group:
+HiLink nasmStdInstruction	Statement
+HiLink nasmSysInstruction	Statement
+HiLink nasmDbgInstruction	Debug
+HiLink nasmFpuInstruction	Statement
+HiLink nasmMmxInstruction	Statement
+HiLink nasmSseInstruction	Statement
+HiLink nasmNowInstruction	Statement
+HiLink nasmAmdInstruction	Special
+HiLink nasmCrxInstruction	Special
+HiLink nasmUndInstruction	Todo
+HiLink nasmInstructnError	Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "nasm"
 
diff --git a/runtime/syntax/nastran.vim b/runtime/syntax/nastran.vim
index f7927693fa..34ad1bf378 100644
--- a/runtime/syntax/nastran.vim
+++ b/runtime/syntax/nastran.vim
@@ -6,11 +6,8 @@
 "		Since DMAP shares some traits with fortran, this syntax file
 "		is based on the fortran.vim syntax file.
 "----------------------------------------------------------------------
-" Remove any old syntax stuff hanging around
-"syn clear
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 " DMAP is not case dependent
@@ -156,37 +153,30 @@ syn region nastranBulkData start=+ *[Bb][Uu][Ll][Kk] *$+ end=+^ [Ee][Nn][Dd] *[D
 syn keyword nastranUtilCard ECHOON ECHOOFF INCLUDE PARAM
 
 
-if version >= 508 || !exists("did_nastran_syntax_inits")
-  if version < 508
-     let did_nastran_syntax_inits = 1
-     command -nargs=+ HiLink hi link <args>
-  else
-     command -nargs=+ HiLink hi link <args>
-  endif
-  " The default methods for highlighting.  Can be overridden later
-  HiLink nastranDmapexecmod	     Statement
-  HiLink nastranDmapType	     Type
-  HiLink nastranDmapPreCondit	     Error
-  HiLink nastranDmapUtilmod	     PreProc
-  HiLink nastranDmapMatmod	     nastranDmapUtilmod
-  HiLink nastranDmapString	     String
-  HiLink nastranDmapNumber	     Constant
-  HiLink nastranDmapFloat	     nastranDmapNumber
-  HiLink nastranDmapInitTab	     nastranDmapNumber
-  HiLink nastranDmapTab		     nastranDmapNumber
-  HiLink nastranDmapLogical	     nastranDmapExecmod
-  HiLink nastranDmapImplicit	     Identifier
-  HiLink nastranDmapComment	     Comment
-  HiLink nastranDmapRepeat	     nastranDmapexecmod
-  HiLink nastranNastranCard	     nastranDmapPreCondit
-  HiLink nastranECSCard		     nastranDmapUtilmod
-  HiLink nastranFMSCard		     nastranNastranCard
-  HiLink nastranCC		     nastranDmapexecmod
-  HiLink nastranDelimiter	     Special
-  HiLink nastranBulkData	     nastranDmapType
-  HiLink nastranUtilCard	     nastranDmapexecmod
-  delcommand HiLink
-endif
+command -nargs=+ HiLink hi link <args>
+" The default methods for highlighting.  Can be overridden later
+HiLink nastranDmapexecmod	     Statement
+HiLink nastranDmapType	     Type
+HiLink nastranDmapPreCondit	     Error
+HiLink nastranDmapUtilmod	     PreProc
+HiLink nastranDmapMatmod	     nastranDmapUtilmod
+HiLink nastranDmapString	     String
+HiLink nastranDmapNumber	     Constant
+HiLink nastranDmapFloat	     nastranDmapNumber
+HiLink nastranDmapInitTab	     nastranDmapNumber
+HiLink nastranDmapTab		     nastranDmapNumber
+HiLink nastranDmapLogical	     nastranDmapExecmod
+HiLink nastranDmapImplicit	     Identifier
+HiLink nastranDmapComment	     Comment
+HiLink nastranDmapRepeat	     nastranDmapexecmod
+HiLink nastranNastranCard	     nastranDmapPreCondit
+HiLink nastranECSCard		     nastranDmapUtilmod
+HiLink nastranFMSCard		     nastranNastranCard
+HiLink nastranCC		     nastranDmapexecmod
+HiLink nastranDelimiter	     Special
+HiLink nastranBulkData	     nastranDmapType
+HiLink nastranUtilCard	     nastranDmapexecmod
+delcommand HiLink
 
 let b:current_syntax = "nastran"
 
diff --git a/runtime/syntax/natural.vim b/runtime/syntax/natural.vim
index 4fbc916be2..c94231d9f2 100644
--- a/runtime/syntax/natural.vim
+++ b/runtime/syntax/natural.vim
@@ -6,16 +6,11 @@
 " Last Changed:	2012-02-05 18:50:43
 " Support:	http://www.von-oppen.com/
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when this syntax file was already loaded
-if v:version < 600
-  syntax clear
-  set iskeyword+=-,*,#,+,_,/
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
-else
-  setlocal iskeyword+=-,*,#,+,_,/
 endif
+setlocal iskeyword+=-,*,#,+,_,/
 
 let s:cpo_save = &cpo
 set cpo&vim
diff --git a/runtime/syntax/ncf.vim b/runtime/syntax/ncf.vim
index 2019c03723..b458e630f2 100644
--- a/runtime/syntax/ncf.vim
+++ b/runtime/syntax/ncf.vim
@@ -4,10 +4,8 @@
 " Last Change:	Tue, 04 Sep 2001 16:20:33 CDT
 " $Id: ncf.vim,v 1.1 2004/06/13 16:31:58 vimboss Exp $
 
-" Remove any old syntax stuff hanging around
-if version < 600
-    syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
@@ -217,42 +215,35 @@ if exists("ncf_highlight_unknowns")
     syn match Error "[^ \t]*" contains=ALL
 endif
 
-if version >= 508 || !exists("did_ncf_syntax_inits")
-    if version < 508
-	let did_ncf_syntax_inits = 1
-	command -nargs=+ HiLink hi link <args>
-    else
-	command -nargs=+ HiLink hi def link <args>
-    endif
+command -nargs=+ HiLink hi def link <args>
 
-    " The default methods for highlighting.  Can be overridden later
-    HiLink ncfCommands		Statement
-    HiLink ncfSetCommands	ncfCommands
-    HiLink ncfLogins		ncfCommands
-    HiLink ncfString		String
-    HiLink ncfContString	ncfString
-    HiLink ncfComment		Comment
-    HiLink ncfImplicit		Type
-    HiLink ncfBoolean		Boolean
-    HiLink ncfScript		Identifier
-    HiLink ncfNumber		Number
-    HiLink ncfIPAddr		ncfNumber
-    HiLink ncfHexNumber		ncfNumber
-    HiLink ncfTime		ncfNumber
-    HiLink ncfDSTTime		ncfNumber
-    HiLink ncfPath		Constant
-    HiLink ncfServerName	Special
-    HiLink ncfIPXNet		ncfServerName
-    HiLink ncfTimeTypes		Constant
-    HiLink ncfSetCommandsNum	   ncfSetCommands
-    HiLink ncfSetCommandsBool	   ncfSetCommands
-    HiLink ncfSetCommandsStr	   ncfSetCommands
-    HiLink ncfSetCommandsTime	   ncfSetCommands
-    HiLink ncfSetCommandsTimeDate  ncfSetCommands
-    HiLink ncfSetCommandsBindCon   ncfSetCommands
+" The default methods for highlighting.  Can be overridden later
+HiLink ncfCommands		Statement
+HiLink ncfSetCommands	ncfCommands
+HiLink ncfLogins		ncfCommands
+HiLink ncfString		String
+HiLink ncfContString	ncfString
+HiLink ncfComment		Comment
+HiLink ncfImplicit		Type
+HiLink ncfBoolean		Boolean
+HiLink ncfScript		Identifier
+HiLink ncfNumber		Number
+HiLink ncfIPAddr		ncfNumber
+HiLink ncfHexNumber		ncfNumber
+HiLink ncfTime		ncfNumber
+HiLink ncfDSTTime		ncfNumber
+HiLink ncfPath		Constant
+HiLink ncfServerName	Special
+HiLink ncfIPXNet		ncfServerName
+HiLink ncfTimeTypes		Constant
+HiLink ncfSetCommandsNum	   ncfSetCommands
+HiLink ncfSetCommandsBool	   ncfSetCommands
+HiLink ncfSetCommandsStr	   ncfSetCommands
+HiLink ncfSetCommandsTime	   ncfSetCommands
+HiLink ncfSetCommandsTimeDate  ncfSetCommands
+HiLink ncfSetCommandsBindCon   ncfSetCommands
 
-    delcommand HiLink
+delcommand HiLink
 
-endif
 
 let b:current_syntax = "ncf"
diff --git a/runtime/syntax/netrw.vim b/runtime/syntax/netrw.vim
index 718cee1429..3d3aa993bd 100644
--- a/runtime/syntax/netrw.vim
+++ b/runtime/syntax/netrw.vim
@@ -5,9 +5,8 @@
 " ---------------------------------------------------------------------
 
 " Syntax Clearing: {{{1
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
  finish
 endif
 
diff --git a/runtime/syntax/nqc.vim b/runtime/syntax/nqc.vim
index 0a3cd6bc73..9105705241 100644
--- a/runtime/syntax/nqc.vim
+++ b/runtime/syntax/nqc.vim
@@ -6,11 +6,8 @@
 " URL:		http://www.enotes.de/twiki/pub/Home/LegoMindstorms/nqc.vim
 " Filenames:	.nqc
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -326,52 +323,44 @@ endif
 exec "syn sync ccomment nqcComment minlines=" . nqc_minlines
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_nqc_syn_inits")
-  if version < 508
-    let did_nqc_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting.  Can be overridden later
-  HiLink nqcLabel		Label
-  HiLink nqcConditional		Conditional
-  HiLink nqcRepeat		Repeat
-  HiLink nqcCharacter		Character
-  HiLink nqcNumber		Number
-  HiLink nqcFloat		Float
-  HiLink nqcFunction		Function
-  HiLink nqcParenError		nqcError
-  HiLink nqcErrInParen		nqcError
-  HiLink nqcErrInBracket	nqcError
-  HiLink nqcCommentL		nqcComment
-  HiLink nqcCommentStart	nqcComment
-  HiLink nqcCommentError	nqcError
-  HiLink nqcCommentStartError	nqcError
-  HiLink nqcSpaceError		nqcError
-  HiLink nqcStorageClass	StorageClass
-  HiLink nqcInclude		Include
-  HiLink nqcPreProc		PreProc
-  HiLink nqcDefine		Macro
-  HiLink nqcIncluded		String
-  HiLink nqcError		Error
-  HiLink nqcStatement		Statement
-  HiLink nqcEvents		Statement
-  HiLink nqcPreCondit		PreCondit
-  HiLink nqcType		Type
-  HiLink nqcConstant		Constant
-  HiLink nqcCommentSkip		nqcComment
-  HiLink nqcComment		Comment
-  HiLink nqcTodo		Todo
-  HiLink nqcCppSkip		nqcCppOut
-  HiLink nqcCppOut2		nqcCppOut
-  HiLink nqcCppOut		Comment
+" The default methods for highlighting.  Can be overridden later
+HiLink nqcLabel		Label
+HiLink nqcConditional		Conditional
+HiLink nqcRepeat		Repeat
+HiLink nqcCharacter		Character
+HiLink nqcNumber		Number
+HiLink nqcFloat		Float
+HiLink nqcFunction		Function
+HiLink nqcParenError		nqcError
+HiLink nqcErrInParen		nqcError
+HiLink nqcErrInBracket	nqcError
+HiLink nqcCommentL		nqcComment
+HiLink nqcCommentStart	nqcComment
+HiLink nqcCommentError	nqcError
+HiLink nqcCommentStartError	nqcError
+HiLink nqcSpaceError		nqcError
+HiLink nqcStorageClass	StorageClass
+HiLink nqcInclude		Include
+HiLink nqcPreProc		PreProc
+HiLink nqcDefine		Macro
+HiLink nqcIncluded		String
+HiLink nqcError		Error
+HiLink nqcStatement		Statement
+HiLink nqcEvents		Statement
+HiLink nqcPreCondit		PreCondit
+HiLink nqcType		Type
+HiLink nqcConstant		Constant
+HiLink nqcCommentSkip		nqcComment
+HiLink nqcComment		Comment
+HiLink nqcTodo		Todo
+HiLink nqcCppSkip		nqcCppOut
+HiLink nqcCppOut2		nqcCppOut
+HiLink nqcCppOut		Comment
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "nqc"
 
diff --git a/runtime/syntax/nroff.vim b/runtime/syntax/nroff.vim
index 280ba9e7d9..2619d02c44 100644
--- a/runtime/syntax/nroff.vim
+++ b/runtime/syntax/nroff.vim
@@ -22,12 +22,9 @@
 "
 " {{{1 Start syntax highlighting.
 "
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
+" quit when a syntax file was already loaded
 "
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
 	finish
 endif
 
@@ -197,65 +194,55 @@ syn keyword nroffTodo TODO XXX FIXME contained
 
 "
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+" Only when an item doesn't have highlighting yet
 "
-if version >= 508 || !exists("did_nroff_syn_inits")
+command -nargs=+ HiLink hi def link <args>
 
-	if version < 508
-		let did_nroff_syn_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+HiLink nroffEscChar nroffSpecialChar
+HiLink nroffEscCharAr nroffSpecialChar
+HiLink nroffSpecialChar SpecialChar
+HiLink nroffSpace Delimiter
 
-	HiLink nroffEscChar nroffSpecialChar
-	HiLink nroffEscCharAr nroffSpecialChar
-	HiLink nroffSpecialChar SpecialChar
-	HiLink nroffSpace Delimiter
+HiLink nroffEscRegArg2 nroffEscRegArg
+HiLink nroffEscRegArg nroffIdent
 
-	HiLink nroffEscRegArg2 nroffEscRegArg
-	HiLink nroffEscRegArg nroffIdent
+HiLink nroffEscArg2 nroffEscArg
+HiLink nroffEscPar nroffEscape
 
-	HiLink nroffEscArg2 nroffEscArg
-	HiLink nroffEscPar nroffEscape
+HiLink nroffEscRegPar nroffEscape
+HiLink nroffEscArg nroffEscape
+HiLink nroffSize nroffEscape
+HiLink nroffEscape Preproc
 
-	HiLink nroffEscRegPar nroffEscape
-	HiLink nroffEscArg nroffEscape
-	HiLink nroffSize nroffEscape
-	HiLink nroffEscape Preproc
+HiLink nroffIgnore Comment
+HiLink nroffComment Comment
+HiLink nroffTodo Todo
 
-	HiLink nroffIgnore Comment
-	HiLink nroffComment Comment
-	HiLink nroffTodo Todo
+HiLink nroffReqLeader nroffRequest
+HiLink nroffReqName nroffRequest
+HiLink nroffRequest Statement
+HiLink nroffCond PreCondit
+HiLink nroffDefIdent nroffIdent
+HiLink nroffIdent Identifier
 
-	HiLink nroffReqLeader nroffRequest
-	HiLink nroffReqName nroffRequest
-	HiLink nroffRequest Statement
-	HiLink nroffCond PreCondit
-	HiLink nroffDefIdent nroffIdent
-	HiLink nroffIdent Identifier
+HiLink nroffEquation PreProc
+HiLink nroffTable PreProc
+HiLink nroffPicture PreProc
+HiLink nroffRefer PreProc
+HiLink nroffGrap PreProc
+HiLink nroffGremlin PreProc
 
-	HiLink nroffEquation PreProc
-	HiLink nroffTable PreProc
-	HiLink nroffPicture PreProc
-	HiLink nroffRefer PreProc
-	HiLink nroffGrap PreProc
-	HiLink nroffGremlin PreProc
+HiLink nroffNumber Number
+HiLink nroffBadChar nroffError
+HiLink nroffSpaceError nroffError
+HiLink nroffError Error
 
-	HiLink nroffNumber Number
-	HiLink nroffBadChar nroffError
-	HiLink nroffSpaceError nroffError
-	HiLink nroffError Error
+HiLink nroffPreserve String
+HiLink nroffString String
+HiLink nroffDefinition String
+HiLink nroffDefSpecial Special
 
-	HiLink nroffPreserve String
-	HiLink nroffString String
-	HiLink nroffDefinition String
-	HiLink nroffDefSpecial Special
-
-	delcommand HiLink
-
-endif
+delcommand HiLink
 
 let b:current_syntax = "nroff"
 
diff --git a/runtime/syntax/nsis.vim b/runtime/syntax/nsis.vim
index d6d803714e..8f3aa2507a 100644
--- a/runtime/syntax/nsis.vim
+++ b/runtime/syntax/nsis.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Alex Jakushev <Alex.Jakushev@kemek.lt>
 " Last Change:	2004 May 12
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -224,48 +221,38 @@ syn keyword nsisError		UninstallExeName
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_nsis_syn_inits")
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  if version < 508
-    let did_nsys_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+HiLink nsisInstruction		Function
+HiLink nsisComment			Comment
+HiLink nsisLocalLabel			Label
+HiLink nsisGlobalLabel		Label
+HiLink nsisStatement			Statement
+HiLink nsisString			String
+HiLink nsisBoolean			Boolean
+HiLink nsisAttribOptions		Constant
+HiLink nsisExecShell			Constant
+HiLink nsisFileAttrib			Constant
+HiLink nsisMessageBox			Constant
+HiLink nsisRegistry			Identifier
+HiLink nsisNumber			Number
+HiLink nsisError			Error
+HiLink nsisUserVar			Identifier
+HiLink nsisSysVar			Identifier
+HiLink nsisAttribute			Type
+HiLink nsisCompiler			Type
+HiLink nsisTodo			Todo
+HiLink nsisCallback			Operator
+" preprocessor commands
+HiLink nsisPreprocSubst		PreProc
+HiLink nsisDefine			Define
+HiLink nsisMacro			Macro
+HiLink nsisPreCondit			PreCondit
+HiLink nsisInclude			Include
+HiLink nsisSystem			PreProc
 
-
-  HiLink nsisInstruction		Function
-  HiLink nsisComment			Comment
-  HiLink nsisLocalLabel			Label
-  HiLink nsisGlobalLabel		Label
-  HiLink nsisStatement			Statement
-  HiLink nsisString			String
-  HiLink nsisBoolean			Boolean
-  HiLink nsisAttribOptions		Constant
-  HiLink nsisExecShell			Constant
-  HiLink nsisFileAttrib			Constant
-  HiLink nsisMessageBox			Constant
-  HiLink nsisRegistry			Identifier
-  HiLink nsisNumber			Number
-  HiLink nsisError			Error
-  HiLink nsisUserVar			Identifier
-  HiLink nsisSysVar			Identifier
-  HiLink nsisAttribute			Type
-  HiLink nsisCompiler			Type
-  HiLink nsisTodo			Todo
-  HiLink nsisCallback			Operator
-  " preprocessor commands
-  HiLink nsisPreprocSubst		PreProc
-  HiLink nsisDefine			Define
-  HiLink nsisMacro			Macro
-  HiLink nsisPreCondit			PreCondit
-  HiLink nsisInclude			Include
-  HiLink nsisSystem			PreProc
-
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "nsis"
 
diff --git a/runtime/syntax/obj.vim b/runtime/syntax/obj.vim
index 66cd6c2bde..f2cd8a47a9 100644
--- a/runtime/syntax/obj.vim
+++ b/runtime/syntax/obj.vim
@@ -4,11 +4,8 @@
 " File Types:	.obj (used in 3D)
 " Last Change:  2010 May 18
 "
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -62,34 +59,26 @@ syn match       objInt          "\d\+"
 syn match       objIndex        "\d\+\/\d*\/\d*"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_cabal_syn_inits")
-  if version < 508
-    let did_cabal_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink objError           Error
-  HiLink objComment         Comment
-  HiLink objInclude         PreProc
-  HiLink objFloat           Float
-  HiLink objInt             Number
-  HiLink objGroup           Structure
-  HiLink objIndex           Constant
-  HiLink objMaterial        Label
+HiLink objError           Error
+HiLink objComment         Comment
+HiLink objInclude         PreProc
+HiLink objFloat           Float
+HiLink objInt             Number
+HiLink objGroup           Structure
+HiLink objIndex           Constant
+HiLink objMaterial        Label
 
-  HiLink objVertex          Keyword
-  HiLink objNormale         Keyword
-  HiLink objVertice         Keyword
-  HiLink objFace            Keyword
-  HiLink objKeywords        Keyword
+HiLink objVertex          Keyword
+HiLink objNormale         Keyword
+HiLink objVertice         Keyword
+HiLink objFace            Keyword
+HiLink objKeywords        Keyword
 
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "obj"
 
diff --git a/runtime/syntax/objcpp.vim b/runtime/syntax/objcpp.vim
index e80eed900d..f11e307444 100644
--- a/runtime/syntax/objcpp.vim
+++ b/runtime/syntax/objcpp.vim
@@ -4,23 +4,15 @@
 " Ex-Maintainer:    Anthony Hodsdon <ahodsdon@fastmail.fm>
 " Last Change:	    2007 Oct 29
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-   syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
    finish
 endif
 
 " Read in C++ and ObjC syntax files
-if version < 600
-   so <sfile>:p:h/cpp.vim
-   so <sfile>:p:h/objc.vim
-else
-   runtime! syntax/cpp.vim
-   unlet b:current_syntax
-   runtime! syntax/objc.vim
-endif
+runtime! syntax/cpp.vim
+unlet b:current_syntax
+runtime! syntax/objc.vim
 
 syn keyword objCppNonStructure    class template namespace transparent contained
 syn keyword objCppNonStatement    new delete friend using transparent contained
diff --git a/runtime/syntax/ocaml.vim b/runtime/syntax/ocaml.vim
index 24116f0e02..1884c31823 100644
--- a/runtime/syntax/ocaml.vim
+++ b/runtime/syntax/ocaml.vim
@@ -13,11 +13,8 @@
 " can be distinguished from begin/end, which is used for indentation,
 " and folding. (David Baelde)
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax") && b:current_syntax == "ocaml"
+" quit when a syntax file was already loaded
+if exists("b:current_syntax") && b:current_syntax == "ocaml"
   finish
 endif
 
@@ -253,78 +250,70 @@ syn sync match ocamlSigSync     grouphere  ocamlSig     "\<sig\>"
 syn sync match ocamlSigSync     groupthere ocamlSig     "\<end\>"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_ocaml_syntax_inits")
-  if version < 508
-    let did_ocaml_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink ocamlBraceErr	   Error
-  HiLink ocamlBrackErr	   Error
-  HiLink ocamlParenErr	   Error
-  HiLink ocamlArrErr	   Error
+HiLink ocamlBraceErr	   Error
+HiLink ocamlBrackErr	   Error
+HiLink ocamlParenErr	   Error
+HiLink ocamlArrErr	   Error
 
-  HiLink ocamlCommentErr   Error
+HiLink ocamlCommentErr   Error
 
-  HiLink ocamlCountErr	   Error
-  HiLink ocamlDoErr	   Error
-  HiLink ocamlDoneErr	   Error
-  HiLink ocamlEndErr	   Error
-  HiLink ocamlThenErr	   Error
+HiLink ocamlCountErr	   Error
+HiLink ocamlDoErr	   Error
+HiLink ocamlDoneErr	   Error
+HiLink ocamlEndErr	   Error
+HiLink ocamlThenErr	   Error
 
-  HiLink ocamlCharErr	   Error
+HiLink ocamlCharErr	   Error
 
-  HiLink ocamlErr	   Error
+HiLink ocamlErr	   Error
 
-  HiLink ocamlComment	   Comment
+HiLink ocamlComment	   Comment
 
-  HiLink ocamlModPath	   Include
-  HiLink ocamlObject	   Include
-  HiLink ocamlModule	   Include
-  HiLink ocamlModParam1    Include
-  HiLink ocamlModType	   Include
-  HiLink ocamlMPRestr3	   Include
-  HiLink ocamlFullMod	   Include
-  HiLink ocamlModTypeRestr Include
-  HiLink ocamlWith	   Include
-  HiLink ocamlMTDef	   Include
+HiLink ocamlModPath	   Include
+HiLink ocamlObject	   Include
+HiLink ocamlModule	   Include
+HiLink ocamlModParam1    Include
+HiLink ocamlModType	   Include
+HiLink ocamlMPRestr3	   Include
+HiLink ocamlFullMod	   Include
+HiLink ocamlModTypeRestr Include
+HiLink ocamlWith	   Include
+HiLink ocamlMTDef	   Include
 
-  HiLink ocamlScript	   Include
+HiLink ocamlScript	   Include
 
-  HiLink ocamlConstructor  Constant
+HiLink ocamlConstructor  Constant
 
-  HiLink ocamlVal          Keyword
-  HiLink ocamlModPreRHS    Keyword
-  HiLink ocamlMPRestr2	   Keyword
-  HiLink ocamlKeyword	   Keyword
-  HiLink ocamlMethod	   Include
-  HiLink ocamlFunDef	   Keyword
-  HiLink ocamlRefAssign    Keyword
-  HiLink ocamlKeyChar	   Keyword
-  HiLink ocamlAnyVar	   Keyword
-  HiLink ocamlTopStop	   Keyword
-  HiLink ocamlOperator	   Keyword
+HiLink ocamlVal          Keyword
+HiLink ocamlModPreRHS    Keyword
+HiLink ocamlMPRestr2	   Keyword
+HiLink ocamlKeyword	   Keyword
+HiLink ocamlMethod	   Include
+HiLink ocamlFunDef	   Keyword
+HiLink ocamlRefAssign    Keyword
+HiLink ocamlKeyChar	   Keyword
+HiLink ocamlAnyVar	   Keyword
+HiLink ocamlTopStop	   Keyword
+HiLink ocamlOperator	   Keyword
 
-  HiLink ocamlBoolean	   Boolean
-  HiLink ocamlCharacter    Character
-  HiLink ocamlNumber	   Number
-  HiLink ocamlFloat	   Float
-  HiLink ocamlString	   String
+HiLink ocamlBoolean	   Boolean
+HiLink ocamlCharacter    Character
+HiLink ocamlNumber	   Number
+HiLink ocamlFloat	   Float
+HiLink ocamlString	   String
 
-  HiLink ocamlLabel	   Identifier
+HiLink ocamlLabel	   Identifier
 
-  HiLink ocamlType	   Type
+HiLink ocamlType	   Type
 
-  HiLink ocamlTodo	   Todo
+HiLink ocamlTodo	   Todo
 
-  HiLink ocamlEncl	   Keyword
+HiLink ocamlEncl	   Keyword
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "ocaml"
 
diff --git a/runtime/syntax/occam.vim b/runtime/syntax/occam.vim
index 1c84bf00f6..bab84f2e18 100644
--- a/runtime/syntax/occam.vim
+++ b/runtime/syntax/occam.vim
@@ -4,9 +4,8 @@
 " Maintainer:	Mario Schweigler <ms44@kent.ac.uk>
 " Last Change:	24 May 2003
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -86,41 +85,34 @@ syn match occamCDString		/<\|>\|=\|(\|)/ contained
 
 syn region occamCDirective	start=/#\(USE\|INCLUDE\|PRAGMA\|DEFINE\|UNDEFINE\|UNDEF\|IF\|ELIF\|ELSE\|ENDIF\|WARNING\|ERROR\|RELAX\)\>/ end=/$/ contains=occamString,occamComment,occamCDString
 
-if version >= 508 || !exists("did_occam_syn_inits")
-  if version < 508
-    let did_occam_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink occamType Type
-  HiLink occamKeyword Keyword
-  HiLink occamComment Comment
-  HiLink occamCommentTitle PreProc
-  HiLink occamTodo Todo
-  HiLink occamNote Todo
-  HiLink occamString String
-  HiLink occamCharString String
-  HiLink occamNumber Number
-  HiLink occamCDirective PreProc
-  HiLink occamCDString String
-  HiLink occamPPIdentifier PreProc
-  HiLink occamBoolean Boolean
-  HiLink occamSpecialChar SpecialChar
-  HiLink occamChar Character
-  HiLink occamStructure Structure
-  HiLink occamIdentifier Identifier
-  HiLink occamConstant Constant
-  HiLink occamOperator Operator
-  HiLink occamFunction Ignore
-  HiLink occamRepeat Repeat
-  HiLink occamConditional Conditional
-  HiLink occamBrackets Type
-  HiLink occamParantheses Delimiter
+HiLink occamType Type
+HiLink occamKeyword Keyword
+HiLink occamComment Comment
+HiLink occamCommentTitle PreProc
+HiLink occamTodo Todo
+HiLink occamNote Todo
+HiLink occamString String
+HiLink occamCharString String
+HiLink occamNumber Number
+HiLink occamCDirective PreProc
+HiLink occamCDString String
+HiLink occamPPIdentifier PreProc
+HiLink occamBoolean Boolean
+HiLink occamSpecialChar SpecialChar
+HiLink occamChar Character
+HiLink occamStructure Structure
+HiLink occamIdentifier Identifier
+HiLink occamConstant Constant
+HiLink occamOperator Operator
+HiLink occamFunction Ignore
+HiLink occamRepeat Repeat
+HiLink occamConditional Conditional
+HiLink occamBrackets Type
+HiLink occamParantheses Delimiter
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "occam"
 
diff --git a/runtime/syntax/omnimark.vim b/runtime/syntax/omnimark.vim
index 698b3c09fb..9887352a68 100644
--- a/runtime/syntax/omnimark.vim
+++ b/runtime/syntax/omnimark.vim
@@ -3,19 +3,12 @@
 " Maintainer:	Paul Terray <mailto:terray@4dconcept.fr>
 " Last Change:	11 Oct 2000
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
-if version < 600
-  set iskeyword=@,48-57,_,128-167,224-235,-
-else
-  setlocal iskeyword=@,48-57,_,128-167,224-235,-
-endif
+setlocal iskeyword=@,48-57,_,128-167,224-235,-
 
 syn keyword omnimarkKeywords	ACTIVATE AGAIN
 syn keyword omnimarkKeywords	CATCH CLEAR CLOSE COPY COPY-CLEAR CROSS-TRANSLATE
@@ -96,26 +89,18 @@ syn match  omnimarkEscape contained +%[0-9][0-9]#+
 syn sync minlines=2000
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_omnimark_syntax_inits")
-  if version < 508
-    let did_omnimark_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink omnimarkCommands		Statement
-  HiLink omnimarkKeywords		Identifier
-  HiLink omnimarkString		String
-  HiLink omnimarkPatterns		Macro
+HiLink omnimarkCommands		Statement
+HiLink omnimarkKeywords		Identifier
+HiLink omnimarkString		String
+HiLink omnimarkPatterns		Macro
 "  HiLink omnimarkNumber			Number
-  HiLink omnimarkComment		Comment
-  HiLink omnimarkEscape		Special
+HiLink omnimarkComment		Comment
+HiLink omnimarkEscape		Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "omnimark"
 
diff --git a/runtime/syntax/openroad.vim b/runtime/syntax/openroad.vim
index 3f9a78d552..6d2affca9b 100644
--- a/runtime/syntax/openroad.vim
+++ b/runtime/syntax/openroad.vim
@@ -3,12 +3,8 @@
 " Maintainer:	Luis Moreno <lmoreno@eresmas.net>
 " Last change:	2001 Jun 12
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-"
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
@@ -235,32 +231,24 @@ else
 endif
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
+" Only when an item doesn't have highlighting yet
 "
-if version >= 508 || !exists("did_openroad_syntax_inits")
-	if version < 508
-		let did_openroad_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink openroadKeyword	Statement
-	HiLink openroadNumber	Number
-	HiLink openroadString	String
-	HiLink openroadComment	Comment
-	HiLink openroadOperator	Operator
-	HiLink openroadType		Type
-	HiLink openroadFunc		Special
-	HiLink openroadClass	Type
-	HiLink openroadEvent	Statement
-	HiLink openroadConst	Constant
-	HiLink openroadVar		Identifier
-	HiLink openroadIdent	Identifier
-	HiLink openroadTodo		Todo
+HiLink openroadKeyword	Statement
+HiLink openroadNumber	Number
+HiLink openroadString	String
+HiLink openroadComment	Comment
+HiLink openroadOperator	Operator
+HiLink openroadType		Type
+HiLink openroadFunc		Special
+HiLink openroadClass	Type
+HiLink openroadEvent	Statement
+HiLink openroadConst	Constant
+HiLink openroadVar		Identifier
+HiLink openroadIdent	Identifier
+HiLink openroadTodo		Todo
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "openroad"
diff --git a/runtime/syntax/opl.vim b/runtime/syntax/opl.vim
index 1b07e3596c..8959cf6d6f 100644
--- a/runtime/syntax/opl.vim
+++ b/runtime/syntax/opl.vim
@@ -6,11 +6,8 @@
 
 " Open Psion Language... (EPOC16/EPOC32)
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -75,25 +72,17 @@ syn region  OPLComment		start="REM[\t ]" end="$"
 syn match   OPLMathsOperator    "-\|=\|[:<>+\*^/\\]"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_OPL_syntax_inits")
-  if version < 508
-    let did_OPL_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink OPLStatement		Statement
-  HiLink OPLNumber		Number
-  HiLink OPLString		String
-  HiLink OPLComment		Comment
-  HiLink OPLMathsOperator	Conditional
+HiLink OPLStatement		Statement
+HiLink OPLNumber		Number
+HiLink OPLString		String
+HiLink OPLComment		Comment
+HiLink OPLMathsOperator	Conditional
 "  HiLink OPLError		Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "opl"
 
diff --git a/runtime/syntax/ora.vim b/runtime/syntax/ora.vim
index bf5d3220a0..e84299a53b 100644
--- a/runtime/syntax/ora.vim
+++ b/runtime/syntax/ora.vim
@@ -11,10 +11,8 @@
 "   sqlnet-ora and tnsnames.ora; since will not cause(?) problems
 "   is easier to follow separately each file's keywords)
 
-" Remove any old syntax stuff hanging around, if needed
-if version < 600
-  syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -437,36 +435,26 @@ syn cluster oraAll add=oraValue,oraModifier,oraString,oraSpecial,oraComment
 "==============================================================================
 " highlighting
 
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_ora_syn_inits")
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  if version < 508
-    let did_ora_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+HiLink oraKeyword	  Statement		"usual keywords
+HiLink oraKeywordGroup  Type			"keywords which group other keywords
+HiLink oraKeywordPref   oraKeywordGroup	"keywords which act as prefixes
+HiLink oraKeywordObs	  Todo			"obsolete keywords
+HiLink oraKeywordUnd	  PreProc		"undocumented keywords
+HiLink oraKeywordUndObs oraKeywordObs		"undocumented obsolete keywords
+HiLink oraValue	  Identifier		"values, like true or false
+HiLink oraModifier	  oraValue		"modifies values
+HiLink oraString	  String		"strings
 
-  HiLink oraKeyword	  Statement		"usual keywords
-  HiLink oraKeywordGroup  Type			"keywords which group other keywords
-  HiLink oraKeywordPref   oraKeywordGroup	"keywords which act as prefixes
-  HiLink oraKeywordObs	  Todo			"obsolete keywords
-  HiLink oraKeywordUnd	  PreProc		"undocumented keywords
-  HiLink oraKeywordUndObs oraKeywordObs		"undocumented obsolete keywords
-  HiLink oraValue	  Identifier		"values, like true or false
-  HiLink oraModifier	  oraValue		"modifies values
-  HiLink oraString	  String		"strings
+HiLink oraSpecial	  Special		"special characters
+HiLink oraError	  Error			"errors
+HiLink oraParenError	  oraError		"errors caused by mismatching parantheses
 
-  HiLink oraSpecial	  Special		"special characters
-  HiLink oraError	  Error			"errors
-  HiLink oraParenError	  oraError		"errors caused by mismatching parantheses
-
-  HiLink oraComment	  Comment		"comments
-
-  delcommand HiLink
-endif
+HiLink oraComment	  Comment		"comments
 
+delcommand HiLink
 
 
 let b:current_syntax = "ora"
diff --git a/runtime/syntax/papp.vim b/runtime/syntax/papp.vim
index d86dce603f..5b65f05cf4 100644
--- a/runtime/syntax/papp.vim
+++ b/runtime/syntax/papp.vim
@@ -14,41 +14,24 @@
 
 " pod is, btw, allowed everywhere, which is actually wrong :(
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " source is basically xml, with included html (this is common) and perl bits
-if version < 600
-  so <sfile>:p:h/xml.vim
-else
-  runtime! syntax/xml.vim
-endif
+runtime! syntax/xml.vim
 unlet b:current_syntax
 
 if exists("papp_include_html")
-  if version < 600
-    syn include @PAppHtml <sfile>:p:h/html.vim
-  else
-    syn include @PAppHtml syntax/html.vim
-  endif
+  syn include @PAppHtml syntax/html.vim
   unlet b:current_syntax
   syntax spell default  " added by Bram
 endif
 
-if version < 600
-  syn include @PAppPerl <sfile>:p:h/perl.vim
-else
-  syn include @PAppPerl syntax/perl.vim
-endif
+syn include @PAppPerl syntax/perl.vim
 
-if v:version >= 600
-   syn cluster xmlFoldCluster add=papp_perl,papp_xperl,papp_phtml,papp_pxml,papp_perlPOD
-endif
+syn cluster xmlFoldCluster add=papp_perl,papp_xperl,papp_phtml,papp_pxml,papp_perlPOD
 
 " preprocessor commands
 syn region papp_prep matchgroup=papp_prep start="^#\s*\(if\|elsif\)" end="$" keepend contains=@perlExpr contained
diff --git a/runtime/syntax/pascal.vim b/runtime/syntax/pascal.vim
index d2b6060acc..4a290f059d 100644
--- a/runtime/syntax/pascal.vim
+++ b/runtime/syntax/pascal.vim
@@ -12,11 +12,8 @@
 "	Austin Ziegler <austin@halostatue.ca>,
 "	Markus Koenig <markus@stber-koenig.de>
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -320,52 +317,44 @@ if !exists("pascal_traditional")
 endif
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_pascal_syn_inits")
-  if version < 508
-    let did_pascal_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink pascalAcces		pascalStatement
-  HiLink pascalBoolean		Boolean
-  HiLink pascalComment		Comment
-  HiLink pascalConditional	Conditional
-  HiLink pascalConstant		Constant
-  HiLink pascalDelimiter	Identifier
-  HiLink pascalDirective	pascalStatement
-  HiLink pascalException	Exception
-  HiLink pascalFloat		Float
-  HiLink pascalFunction		Function
-  HiLink pascalLabel		Label
-  HiLink pascalMatrixDelimiter	Identifier
-  HiLink pascalModifier		Type
-  HiLink pascalNumber		Number
-  HiLink pascalOperator		Operator
-  HiLink pascalPredefined	pascalStatement
-  HiLink pascalPreProc		PreProc
-  HiLink pascalRepeat		Repeat
-  HiLink pascalSpaceError	Error
-  HiLink pascalStatement	Statement
-  HiLink pascalString		String
-  HiLink pascalStringEscape	Special
-  HiLink pascalStringEscapeGPC	Special
-  HiLink pascalStringError	Error
-  HiLink pascalStruct		pascalStatement
-  HiLink pascalSymbolOperator	pascalOperator
-  HiLink pascalTodo		Todo
-  HiLink pascalType		Type
-  HiLink pascalUnclassified	pascalStatement
-  "  HiLink pascalAsm		Assembler
-  HiLink pascalError		Error
-  HiLink pascalAsmKey		pascalStatement
-  HiLink pascalShowTab		Error
+HiLink pascalAcces		pascalStatement
+HiLink pascalBoolean		Boolean
+HiLink pascalComment		Comment
+HiLink pascalConditional	Conditional
+HiLink pascalConstant		Constant
+HiLink pascalDelimiter	Identifier
+HiLink pascalDirective	pascalStatement
+HiLink pascalException	Exception
+HiLink pascalFloat		Float
+HiLink pascalFunction		Function
+HiLink pascalLabel		Label
+HiLink pascalMatrixDelimiter	Identifier
+HiLink pascalModifier		Type
+HiLink pascalNumber		Number
+HiLink pascalOperator		Operator
+HiLink pascalPredefined	pascalStatement
+HiLink pascalPreProc		PreProc
+HiLink pascalRepeat		Repeat
+HiLink pascalSpaceError	Error
+HiLink pascalStatement	Statement
+HiLink pascalString		String
+HiLink pascalStringEscape	Special
+HiLink pascalStringEscapeGPC	Special
+HiLink pascalStringError	Error
+HiLink pascalStruct		pascalStatement
+HiLink pascalSymbolOperator	pascalOperator
+HiLink pascalTodo		Todo
+HiLink pascalType		Type
+HiLink pascalUnclassified	pascalStatement
+"  HiLink pascalAsm		Assembler
+HiLink pascalError		Error
+HiLink pascalAsmKey		pascalStatement
+HiLink pascalShowTab		Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "pascal"
diff --git a/runtime/syntax/pcap.vim b/runtime/syntax/pcap.vim
index 17d0d42c0b..7c97738520 100644
--- a/runtime/syntax/pcap.vim
+++ b/runtime/syntax/pcap.vim
@@ -4,20 +4,13 @@
 "		Modified by Bram
 " Last Change:	2003 May 11
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 "define keywords
-if version < 600
-  set isk=@,46-57,_,-,#,=,192-255
-else
-  setlocal isk=@,46-57,_,-,#,=,192-255
-endif
+setlocal isk=@,46-57,_,-,#,=,192-255
 
 "first all the bad guys
 syn match pcapBad '^.\+$'	       "define any line as bad
@@ -43,22 +36,14 @@ syn sync minlines=50
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_pcap_syntax_inits")
-  if version < 508
-    let did_pcap_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink pcapBad WarningMsg
-  HiLink pcapBadword WarningMsg
-  HiLink pcapComment Comment
+HiLink pcapBad WarningMsg
+HiLink pcapBadword WarningMsg
+HiLink pcapComment Comment
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "pcap"
 
diff --git a/runtime/syntax/pccts.vim b/runtime/syntax/pccts.vim
index 8341f5bd43..5ddc570bbe 100644
--- a/runtime/syntax/pccts.vim
+++ b/runtime/syntax/pccts.vim
@@ -3,20 +3,13 @@
 " Maintainer:	Scott Bigham <dsb@killerbunnies.org>
 " Last Change:	10 Aug 1999
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " Read the C++ syntax to start with
-if version < 600
-  syn include @cppTopLevel <sfile>:p:h/cpp.vim
-else
-  syn include @cppTopLevel syntax/cpp.vim
-endif
+syn include @cppTopLevel syntax/cpp.vim
 
 syn region pcctsAction matchgroup=pcctsDelim start="<<" end=">>?\=" contains=@cppTopLevel,pcctsRuleRef
 
@@ -72,34 +65,26 @@ syn sync match pcctsSyncRule grouphere pcctsRule "\<[a-z][A-Za-z0-9_]*\>\s*\[[^]
 syn sync match pcctsSyncRule grouphere pcctsRule "\<[a-z][A-Za-z0-9_]*\>\(\s*\[[^]]*\]\)\=\s*>\s*\[[^]]*\]\s*:"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_pccts_syntax_inits")
-  if version < 508
-    let did_pccts_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink pcctsDelim		Special
-  HiLink pcctsTokenName		Identifier
-  HiLink pcctsRuleName		Statement
-  HiLink pcctsLabelHack		Label
-  HiLink pcctsDirective		PreProc
-  HiLink pcctsString		String
-  HiLink pcctsComment		Comment
-  HiLink pcctsClass		Statement
-  HiLink pcctsClassName		Identifier
-  HiLink pcctsException		Statement
-  HiLink pcctsExceptionHandler	Keyword
-  HiLink pcctsExceptionRuleRef	pcctsDelim
-  HiLink pcctsExceptionID	Identifier
-  HiLink pcctsRuleRef		Identifier
-  HiLink pcctsSpecialChar	SpecialChar
+HiLink pcctsDelim		Special
+HiLink pcctsTokenName		Identifier
+HiLink pcctsRuleName		Statement
+HiLink pcctsLabelHack		Label
+HiLink pcctsDirective		PreProc
+HiLink pcctsString		String
+HiLink pcctsComment		Comment
+HiLink pcctsClass		Statement
+HiLink pcctsClassName		Identifier
+HiLink pcctsException		Statement
+HiLink pcctsExceptionHandler	Keyword
+HiLink pcctsExceptionRuleRef	pcctsDelim
+HiLink pcctsExceptionID	Identifier
+HiLink pcctsRuleRef		Identifier
+HiLink pcctsSpecialChar	SpecialChar
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "pccts"
 
diff --git a/runtime/syntax/perl6.vim b/runtime/syntax/perl6.vim
index 3d82ced89f..f40a040a45 100644
--- a/runtime/syntax/perl6.vim
+++ b/runtime/syntax/perl6.vim
@@ -61,11 +61,8 @@
 "  unlet perl6_extended_q
 "  unlet perl6_extended_all
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 let s:keepcpo= &cpo
@@ -2063,176 +2060,168 @@ syn region p6PodFormatFrench
     \ contains=p6PodFormatAnglesFrench,p6PodFormatFrench,p6PodFormatOne,p6PodFormatTwo,p6PodFormatThree,p6PodVerticalBar,p6PodSemiColon,p6PodComma
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_perl6_syntax_inits")
-    if version < 508
-        let did_perl6_syntax_inits = 1
-        command -nargs=+ HiLink hi link <args>
-    else
-        command -nargs=+ HiLink hi def link <args>
-    endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-    HiLink p6EscOctOld       p6Error
-    HiLink p6PackageTwigil   p6Twigil
-    HiLink p6StringAngle     p6String
-    HiLink p6StringFrench    p6String
-    HiLink p6StringAngles    p6String
-    HiLink p6StringSQ        p6String
-    HiLink p6StringDQ        p6String
-    HiLink p6StringQ         p6String
-    HiLink p6RxStringSQ      p6String
-    HiLink p6RxStringDQ      p6String
-    HiLink p6Substitution    p6String
-    HiLink p6Transliteration p6String
-    HiLink p6StringAuto      p6String
-    HiLink p6StringP5Auto    p6String
-    HiLink p6Key             p6String
-    HiLink p6Match           p6String
-    HiLink p6RegexBlock      p6String
-    HiLink p6RxP5CharClass   p6String
-    HiLink p6RxP5QuoteMeta   p6String
-    HiLink p6RxCharClass     p6String
-    HiLink p6RxQuoteWords    p6String
-    HiLink p6ReduceOp        p6Operator
-    HiLink p6ReverseCrossOp  p6Operator
-    HiLink p6HyperOp         p6Operator
-    HiLink p6QuoteQ          p6Operator
-    HiLink p6RxRange         p6StringSpecial
-    HiLink p6RxAnchor        p6StringSpecial
-    HiLink p6RxP5Anchor      p6StringSpecial
-    HiLink p6CodePoint       p6StringSpecial
-    HiLink p6RxMeta          p6StringSpecial
-    HiLink p6RxP5Range       p6StringSpecial
-    HiLink p6RxP5CPId        p6StringSpecial
-    HiLink p6RxP5Posix       p6StringSpecial
-    HiLink p6RxP5Mod         p6StringSpecial
-    HiLink p6RxP5HexSeq      p6StringSpecial
-    HiLink p6RxP5OctSeq      p6StringSpecial
-    HiLink p6RxP5WriteRefId  p6StringSpecial
-    HiLink p6HexSequence     p6StringSpecial
-    HiLink p6OctSequence     p6StringSpecial
-    HiLink p6RxP5Named       p6StringSpecial
-    HiLink p6RxP5PropId      p6StringSpecial
-    HiLink p6RxP5Quantifier  p6StringSpecial
-    HiLink p6RxP5CountId     p6StringSpecial
-    HiLink p6RxP5Verb        p6StringSpecial
-    HiLink p6Escape          p6StringSpecial2
-    HiLink p6EscNull         p6StringSpecial2
-    HiLink p6EscHash         p6StringSpecial2
-    HiLink p6EscQQ           p6StringSpecial2
-    HiLink p6EscQuote        p6StringSpecial2
-    HiLink p6EscDoubleQuote  p6StringSpecial2
-    HiLink p6EscBackTick     p6StringSpecial2
-    HiLink p6EscForwardSlash p6StringSpecial2
-    HiLink p6EscVerticalBar  p6StringSpecial2
-    HiLink p6EscExclamation  p6StringSpecial2
-    HiLink p6EscDollar       p6StringSpecial2
-    HiLink p6EscOpenCurly    p6StringSpecial2
-    HiLink p6EscCloseCurly   p6StringSpecial2
-    HiLink p6EscCloseBracket p6StringSpecial2
-    HiLink p6EscCloseAngle   p6StringSpecial2
-    HiLink p6EscCloseFrench  p6StringSpecial2
-    HiLink p6EscBackSlash    p6StringSpecial2
-    HiLink p6RxEscape        p6StringSpecial2
-    HiLink p6RxCapture       p6StringSpecial2
-    HiLink p6RxAlternation   p6StringSpecial2
-    HiLink p6RxP5            p6StringSpecial2
-    HiLink p6RxP5ReadRef     p6StringSpecial2
-    HiLink p6RxP5Oct         p6StringSpecial2
-    HiLink p6RxP5Hex         p6StringSpecial2
-    HiLink p6RxP5EscMeta     p6StringSpecial2
-    HiLink p6RxP5Meta        p6StringSpecial2
-    HiLink p6RxP5Escape      p6StringSpecial2
-    HiLink p6RxP5CodePoint   p6StringSpecial2
-    HiLink p6RxP5WriteRef    p6StringSpecial2
-    HiLink p6RxP5Prop        p6StringSpecial2
+HiLink p6EscOctOld       p6Error
+HiLink p6PackageTwigil   p6Twigil
+HiLink p6StringAngle     p6String
+HiLink p6StringFrench    p6String
+HiLink p6StringAngles    p6String
+HiLink p6StringSQ        p6String
+HiLink p6StringDQ        p6String
+HiLink p6StringQ         p6String
+HiLink p6RxStringSQ      p6String
+HiLink p6RxStringDQ      p6String
+HiLink p6Substitution    p6String
+HiLink p6Transliteration p6String
+HiLink p6StringAuto      p6String
+HiLink p6StringP5Auto    p6String
+HiLink p6Key             p6String
+HiLink p6Match           p6String
+HiLink p6RegexBlock      p6String
+HiLink p6RxP5CharClass   p6String
+HiLink p6RxP5QuoteMeta   p6String
+HiLink p6RxCharClass     p6String
+HiLink p6RxQuoteWords    p6String
+HiLink p6ReduceOp        p6Operator
+HiLink p6ReverseCrossOp  p6Operator
+HiLink p6HyperOp         p6Operator
+HiLink p6QuoteQ          p6Operator
+HiLink p6RxRange         p6StringSpecial
+HiLink p6RxAnchor        p6StringSpecial
+HiLink p6RxP5Anchor      p6StringSpecial
+HiLink p6CodePoint       p6StringSpecial
+HiLink p6RxMeta          p6StringSpecial
+HiLink p6RxP5Range       p6StringSpecial
+HiLink p6RxP5CPId        p6StringSpecial
+HiLink p6RxP5Posix       p6StringSpecial
+HiLink p6RxP5Mod         p6StringSpecial
+HiLink p6RxP5HexSeq      p6StringSpecial
+HiLink p6RxP5OctSeq      p6StringSpecial
+HiLink p6RxP5WriteRefId  p6StringSpecial
+HiLink p6HexSequence     p6StringSpecial
+HiLink p6OctSequence     p6StringSpecial
+HiLink p6RxP5Named       p6StringSpecial
+HiLink p6RxP5PropId      p6StringSpecial
+HiLink p6RxP5Quantifier  p6StringSpecial
+HiLink p6RxP5CountId     p6StringSpecial
+HiLink p6RxP5Verb        p6StringSpecial
+HiLink p6Escape          p6StringSpecial2
+HiLink p6EscNull         p6StringSpecial2
+HiLink p6EscHash         p6StringSpecial2
+HiLink p6EscQQ           p6StringSpecial2
+HiLink p6EscQuote        p6StringSpecial2
+HiLink p6EscDoubleQuote  p6StringSpecial2
+HiLink p6EscBackTick     p6StringSpecial2
+HiLink p6EscForwardSlash p6StringSpecial2
+HiLink p6EscVerticalBar  p6StringSpecial2
+HiLink p6EscExclamation  p6StringSpecial2
+HiLink p6EscDollar       p6StringSpecial2
+HiLink p6EscOpenCurly    p6StringSpecial2
+HiLink p6EscCloseCurly   p6StringSpecial2
+HiLink p6EscCloseBracket p6StringSpecial2
+HiLink p6EscCloseAngle   p6StringSpecial2
+HiLink p6EscCloseFrench  p6StringSpecial2
+HiLink p6EscBackSlash    p6StringSpecial2
+HiLink p6RxEscape        p6StringSpecial2
+HiLink p6RxCapture       p6StringSpecial2
+HiLink p6RxAlternation   p6StringSpecial2
+HiLink p6RxP5            p6StringSpecial2
+HiLink p6RxP5ReadRef     p6StringSpecial2
+HiLink p6RxP5Oct         p6StringSpecial2
+HiLink p6RxP5Hex         p6StringSpecial2
+HiLink p6RxP5EscMeta     p6StringSpecial2
+HiLink p6RxP5Meta        p6StringSpecial2
+HiLink p6RxP5Escape      p6StringSpecial2
+HiLink p6RxP5CodePoint   p6StringSpecial2
+HiLink p6RxP5WriteRef    p6StringSpecial2
+HiLink p6RxP5Prop        p6StringSpecial2
 
-    HiLink p6Property       Tag
-    HiLink p6Attention      Todo
-    HiLink p6Type           Type
-    HiLink p6Error          Error
-    HiLink p6BlockLabel     Label
-    HiLink p6Float          Float
-    HiLink p6Normal         Normal
-    HiLink p6Package        Normal
-    HiLink p6PackageScope   Normal
-    HiLink p6Number         Number
-    HiLink p6VersionNum     Number
-    HiLink p6String         String
-    HiLink p6Repeat         Repeat
-    HiLink p6Keyword        Keyword
-    HiLink p6Pragma         Keyword
-    HiLink p6Module         Keyword
-    HiLink p6DeclareRoutine Keyword
-    HiLink p6VarStorage     Special
-    HiLink p6FlowControl    Special
-    HiLink p6NumberBase     Special
-    HiLink p6Twigil         Special
-    HiLink p6StringSpecial2 Special
-    HiLink p6VersionDot     Special
-    HiLink p6Comment        Comment
-    HiLink p6Include        Include
-    HiLink p6Shebang        PreProc
-    HiLink p6ClosureTrait   PreProc
-    HiLink p6Routine        Function
-    HiLink p6Operator       Operator
-    HiLink p6Version        Operator
-    HiLink p6Context        Operator
-    HiLink p6Quote          Delimiter
-    HiLink p6TypeConstraint PreCondit
-    HiLink p6Exception      Exception
-    HiLink p6Placeholder    Identifier
-    HiLink p6Variable       Identifier
-    HiLink p6VarSlash       Identifier
-    HiLink p6VarNum         Identifier
-    HiLink p6VarExclam      Identifier
-    HiLink p6VarMatch       Identifier
-    HiLink p6VarName        Identifier
-    HiLink p6MatchVar       Identifier
-    HiLink p6RxP5ReadRefId  Identifier
-    HiLink p6RxP5ModDef     Identifier
-    HiLink p6RxP5ModName    Identifier
-    HiLink p6Conditional    Conditional
-    HiLink p6StringSpecial  SpecialChar
+HiLink p6Property       Tag
+HiLink p6Attention      Todo
+HiLink p6Type           Type
+HiLink p6Error          Error
+HiLink p6BlockLabel     Label
+HiLink p6Float          Float
+HiLink p6Normal         Normal
+HiLink p6Package        Normal
+HiLink p6PackageScope   Normal
+HiLink p6Number         Number
+HiLink p6VersionNum     Number
+HiLink p6String         String
+HiLink p6Repeat         Repeat
+HiLink p6Keyword        Keyword
+HiLink p6Pragma         Keyword
+HiLink p6Module         Keyword
+HiLink p6DeclareRoutine Keyword
+HiLink p6VarStorage     Special
+HiLink p6FlowControl    Special
+HiLink p6NumberBase     Special
+HiLink p6Twigil         Special
+HiLink p6StringSpecial2 Special
+HiLink p6VersionDot     Special
+HiLink p6Comment        Comment
+HiLink p6Include        Include
+HiLink p6Shebang        PreProc
+HiLink p6ClosureTrait   PreProc
+HiLink p6Routine        Function
+HiLink p6Operator       Operator
+HiLink p6Version        Operator
+HiLink p6Context        Operator
+HiLink p6Quote          Delimiter
+HiLink p6TypeConstraint PreCondit
+HiLink p6Exception      Exception
+HiLink p6Placeholder    Identifier
+HiLink p6Variable       Identifier
+HiLink p6VarSlash       Identifier
+HiLink p6VarNum         Identifier
+HiLink p6VarExclam      Identifier
+HiLink p6VarMatch       Identifier
+HiLink p6VarName        Identifier
+HiLink p6MatchVar       Identifier
+HiLink p6RxP5ReadRefId  Identifier
+HiLink p6RxP5ModDef     Identifier
+HiLink p6RxP5ModName    Identifier
+HiLink p6Conditional    Conditional
+HiLink p6StringSpecial  SpecialChar
 
-    HiLink p6PodAbbr         p6Pod
-    HiLink p6PodAbbrEOF      p6Pod
-    HiLink p6PodAbbrNoCode   p6Pod
-    HiLink p6PodAbbrCode     p6PodCode
-    HiLink p6PodPara         p6Pod
-    HiLink p6PodParaEOF      p6Pod
-    HiLink p6PodParaNoCode   p6Pod
-    HiLink p6PodParaCode     p6PodCode
-    HiLink p6PodDelim        p6Pod
-    HiLink p6PodDelimEOF     p6Pod
-    HiLink p6PodDelimNoCode  p6Pod
-    HiLink p6PodDelimCode    p6PodCode
-    HiLink p6PodImplicitCode p6PodCode
-    HiLink p6PodExtraConfig  p6PodPrefix
-    HiLink p6PodVerticalBar  p6PodFormatCode
-    HiLink p6PodColon        p6PodFormatCode
-    HiLink p6PodSemicolon    p6PodFormatCode
-    HiLink p6PodComma        p6PodFormatCode
-    HiLink p6PodFormatOne    p6PodFormat
-    HiLink p6PodFormatTwo    p6PodFormat
-    HiLink p6PodFormatThree  p6PodFormat
-    HiLink p6PodFormatFrench p6PodFormat
+HiLink p6PodAbbr         p6Pod
+HiLink p6PodAbbrEOF      p6Pod
+HiLink p6PodAbbrNoCode   p6Pod
+HiLink p6PodAbbrCode     p6PodCode
+HiLink p6PodPara         p6Pod
+HiLink p6PodParaEOF      p6Pod
+HiLink p6PodParaNoCode   p6Pod
+HiLink p6PodParaCode     p6PodCode
+HiLink p6PodDelim        p6Pod
+HiLink p6PodDelimEOF     p6Pod
+HiLink p6PodDelimNoCode  p6Pod
+HiLink p6PodDelimCode    p6PodCode
+HiLink p6PodImplicitCode p6PodCode
+HiLink p6PodExtraConfig  p6PodPrefix
+HiLink p6PodVerticalBar  p6PodFormatCode
+HiLink p6PodColon        p6PodFormatCode
+HiLink p6PodSemicolon    p6PodFormatCode
+HiLink p6PodComma        p6PodFormatCode
+HiLink p6PodFormatOne    p6PodFormat
+HiLink p6PodFormatTwo    p6PodFormat
+HiLink p6PodFormatThree  p6PodFormat
+HiLink p6PodFormatFrench p6PodFormat
 
-    HiLink p6PodType           Type
-    HiLink p6PodConfigOption   String
-    HiLink p6PodCode           PreProc
-    HiLink p6Pod               Comment
-    HiLink p6PodComment        Comment
-    HiLink p6PodAutoQuote      Operator
-    HiLink p6PodConfigOperator Operator
-    HiLink p6PodPrefix         Statement
-    HiLink p6PodName           Identifier
-    HiLink p6PodFormatCode     SpecialChar
-    HiLink p6PodFormat         SpecialComment
+HiLink p6PodType           Type
+HiLink p6PodConfigOption   String
+HiLink p6PodCode           PreProc
+HiLink p6Pod               Comment
+HiLink p6PodComment        Comment
+HiLink p6PodAutoQuote      Operator
+HiLink p6PodConfigOperator Operator
+HiLink p6PodPrefix         Statement
+HiLink p6PodName           Identifier
+HiLink p6PodFormatCode     SpecialChar
+HiLink p6PodFormat         SpecialComment
 
-    delcommand HiLink
-endif
+delcommand HiLink
 
 " Syncing to speed up processing
 "syn sync match p6SyncPod groupthere p6PodAbbrRegion     "^=\K\k*\>"
diff --git a/runtime/syntax/pfmain.vim b/runtime/syntax/pfmain.vim
index 32ed6975c0..794aa5dc23 100644
--- a/runtime/syntax/pfmain.vim
+++ b/runtime/syntax/pfmain.vim
@@ -7,17 +7,12 @@
 " URL:		http://cern.ch/fuji/vim/syntax/pfmain.vim
 " Comment:	Based on Postfix 2.12/3.0 postconf.5.html.
 
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
-if version >= 600
-	setlocal iskeyword=@,48-57,_,-
-else
-	set iskeyword=@,48-57,_,-
-endif
+setlocal iskeyword=@,48-57,_,-
 
 syntax case match
 syntax sync minlines=1
@@ -1816,33 +1811,26 @@ syntax match pfmainSpecial	"\<smtpd\>"
 syntax match pfmainSpecial	"\<trace\>"
 syntax match pfmainSpecial	"\<verify\>"
 
-if version >= 508 || !exists("pfmain_syntax_init")
-	if version < 508
-		let pfmain_syntax_init = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink pfmainConf	Statement
-	HiLink pfmainRef	PreProc
-	HiLink pfmainWord	identifier
+HiLink pfmainConf	Statement
+HiLink pfmainRef	PreProc
+HiLink pfmainWord	identifier
 
-	HiLink pfmainDict	Type
-	HiLink pfmainQueueDir	Constant
-	HiLink pfmainTransport	Constant
-	HiLink pfmainLock	Constant
-	HiLink pfmainAnswer	Constant
+HiLink pfmainDict	Type
+HiLink pfmainQueueDir	Constant
+HiLink pfmainTransport	Constant
+HiLink pfmainLock	Constant
+HiLink pfmainAnswer	Constant
 
-	HiLink pfmainComment	Comment
-	HiLink pfmainNumber	Number
-	HiLink pfmainTime	Number
-	HiLink pfmainIP		Number
-	HiLink pfmainVariable	Error
-	HiLink pfmainSpecial	Special
+HiLink pfmainComment	Comment
+HiLink pfmainNumber	Number
+HiLink pfmainTime	Number
+HiLink pfmainIP		Number
+HiLink pfmainVariable	Error
+HiLink pfmainSpecial	Special
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "pfmain"
 
diff --git a/runtime/syntax/php.vim b/runtime/syntax/php.vim
index ae3f82d64a..a1b658e17a 100644
--- a/runtime/syntax/php.vim
+++ b/runtime/syntax/php.vim
@@ -55,11 +55,8 @@
 "    ii) Same problem if you are setting php_folding = 2 with a closing
 "        } inside an string on the first line of this string.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -67,16 +64,8 @@ if !exists("main_syntax")
   let main_syntax = 'php'
 endif
 
-if version < 600
-  unlet! php_folding
-  if exists("php_sync_method") && !php_sync_method
-    let php_sync_method=-1
-  endif
-  so <sfile>:p:h/html.vim
-else
-  runtime! syntax/html.vim
-  unlet b:current_syntax
-endif
+runtime! syntax/html.vim
+unlet b:current_syntax
 
 " accept old options
 if !exists("php_sync_method")
@@ -94,11 +83,7 @@ endif
 
 syn cluster htmlPreproc add=phpRegion,phpRegionAsp,phpRegionSc
 
-if version < 600
-  syn include @sqlTop <sfile>:p:h/sql.vim
-else
-  syn include @sqlTop syntax/sql.vim
-endif
+syn include @sqlTop syntax/sql.vim
 syn sync clear
 unlet b:current_syntax
 syn cluster sqlTop remove=sqlString,sqlComment
@@ -381,15 +366,8 @@ if exists("php_parent_error_open")
 else
   syn region  phpComment  start="/\*" end="\*/" contained contains=phpTodo,@Spell extend
 endif
-if version >= 600
-  syn match phpComment  "#.\{-}\(?>\|$\)\@="  contained contains=phpTodo,@Spell
-  syn match phpComment  "//.\{-}\(?>\|$\)\@=" contained contains=phpTodo,@Spell
-else
-  syn match phpComment  "#.\{-}$" contained contains=phpTodo,@Spell
-  syn match phpComment  "#.\{-}?>"me=e-2  contained contains=phpTodo,@Spell
-  syn match phpComment  "//.\{-}$"  contained contains=phpTodo,@Spell
-  syn match phpComment  "//.\{-}?>"me=e-2 contained contains=phpTodo,@Spell
-endif
+syn match phpComment  "#.\{-}\(?>\|$\)\@="  contained contains=phpTodo,@Spell
+syn match phpComment  "//.\{-}\(?>\|$\)\@=" contained contains=phpTodo,@Spell
 
 " String
 if exists("php_parent_error_open")
@@ -403,24 +381,22 @@ else
 endif
 
 " HereDoc and NowDoc
-if version >= 600
-  syn case match
+syn case match
 
-  " HereDoc
-  syn region  phpHereDoc  matchgroup=Delimiter start="\(<<<\)\@<=\(\"\=\)\z(\I\i*\)\2$" end="^\z1\(;\=$\)\@=" contained contains=phpIdentifier,phpIdentifierSimply,phpIdentifierComplex,phpBackslashSequences,phpMethodsVar,@Spell keepend extend
+" HereDoc
+syn region  phpHereDoc  matchgroup=Delimiter start="\(<<<\)\@<=\(\"\=\)\z(\I\i*\)\2$" end="^\z1\(;\=$\)\@=" contained contains=phpIdentifier,phpIdentifierSimply,phpIdentifierComplex,phpBackslashSequences,phpMethodsVar,@Spell keepend extend
 " including HTML,JavaScript,SQL even if not enabled via options
-  syn region  phpHereDoc  matchgroup=Delimiter start="\(<<<\)\@<=\(\"\=\)\z(\(\I\i*\)\=\(html\)\c\(\i*\)\)\2$" end="^\z1\(;\=$\)\@="  contained contains=@htmlTop,phpIdentifier,phpIdentifierSimply,phpIdentifierComplex,phpBackslashSequences,phpMethodsVar,@Spell keepend extend
-  syn region  phpHereDoc  matchgroup=Delimiter start="\(<<<\)\@<=\(\"\=\)\z(\(\I\i*\)\=\(sql\)\c\(\i*\)\)\2$" end="^\z1\(;\=$\)\@=" contained contains=@sqlTop,phpIdentifier,phpIdentifierSimply,phpIdentifierComplex,phpBackslashSequences,phpMethodsVar,@Spell keepend extend
-  syn region  phpHereDoc  matchgroup=Delimiter start="\(<<<\)\@<=\(\"\=\)\z(\(\I\i*\)\=\(javascript\)\c\(\i*\)\)\2$" end="^\z1\(;\=$\)\@="  contained contains=@htmlJavascript,phpIdentifierSimply,phpIdentifier,phpIdentifierComplex,phpBackslashSequences,phpMethodsVar,@Spell keepend extend
+syn region  phpHereDoc  matchgroup=Delimiter start="\(<<<\)\@<=\(\"\=\)\z(\(\I\i*\)\=\(html\)\c\(\i*\)\)\2$" end="^\z1\(;\=$\)\@="  contained contains=@htmlTop,phpIdentifier,phpIdentifierSimply,phpIdentifierComplex,phpBackslashSequences,phpMethodsVar,@Spell keepend extend
+syn region  phpHereDoc  matchgroup=Delimiter start="\(<<<\)\@<=\(\"\=\)\z(\(\I\i*\)\=\(sql\)\c\(\i*\)\)\2$" end="^\z1\(;\=$\)\@=" contained contains=@sqlTop,phpIdentifier,phpIdentifierSimply,phpIdentifierComplex,phpBackslashSequences,phpMethodsVar,@Spell keepend extend
+syn region  phpHereDoc  matchgroup=Delimiter start="\(<<<\)\@<=\(\"\=\)\z(\(\I\i*\)\=\(javascript\)\c\(\i*\)\)\2$" end="^\z1\(;\=$\)\@="  contained contains=@htmlJavascript,phpIdentifierSimply,phpIdentifier,phpIdentifierComplex,phpBackslashSequences,phpMethodsVar,@Spell keepend extend
 
-  " NowDoc
-  syn region  phpNowDoc  matchgroup=Delimiter start="\(<<<\)\@<='\z(\I\i*\)'$" end="^\z1\(;\=$\)\@=" contained contains=@Spell keepend extend
+" NowDoc
+syn region  phpNowDoc  matchgroup=Delimiter start="\(<<<\)\@<='\z(\I\i*\)'$" end="^\z1\(;\=$\)\@=" contained contains=@Spell keepend extend
 " including HTML,JavaScript,SQL even if not enabled via options
-  syn region  phpNowDoc  matchgroup=Delimiter start="\(<<<\)\@<='\z(\(\I\i*\)\=\(html\)\c\(\i*\)\)'$" end="^\z1\(;\=$\)\@="  contained contains=@htmlTop,@Spell keepend extend
-  syn region  phpNowDoc  matchgroup=Delimiter start="\(<<<\)\@<='\z(\(\I\i*\)\=\(sql\)\c\(\i*\)\)'$" end="^\z1\(;\=$\)\@=" contained contains=@sqlTop,@Spell keepend extend
-  syn region  phpNowDoc  matchgroup=Delimiter start="\(<<<\)\@<='\z(\(\I\i*\)\=\(javascript\)\c\(\i*\)\)'$" end="^\z1\(;\=$\)\@="  contained contains=@htmlJavascript,@Spell keepend extend
-  syn case ignore
-endif
+syn region  phpNowDoc  matchgroup=Delimiter start="\(<<<\)\@<='\z(\(\I\i*\)\=\(html\)\c\(\i*\)\)'$" end="^\z1\(;\=$\)\@="  contained contains=@htmlTop,@Spell keepend extend
+syn region  phpNowDoc  matchgroup=Delimiter start="\(<<<\)\@<='\z(\(\I\i*\)\=\(sql\)\c\(\i*\)\)'$" end="^\z1\(;\=$\)\@=" contained contains=@sqlTop,@Spell keepend extend
+syn region  phpNowDoc  matchgroup=Delimiter start="\(<<<\)\@<='\z(\(\I\i*\)\=\(javascript\)\c\(\i*\)\)'$" end="^\z1\(;\=$\)\@="  contained contains=@htmlJavascript,@Spell keepend extend
+syn case ignore
 
 " Parent
 if exists("php_parent_error_close") || exists("php_parent_error_open")
@@ -621,82 +597,74 @@ syntax match  phpDocTags  "@\(abstract\|access\|author\|category\|copyright\|dep
 syntax match  phpDocTodo  "@\(todo\|fixme\|xxx\)\(\s\+\)\?" containedin=phpComment
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_php_syn_inits")
-  if version < 508
-    let did_php_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink   phpConstant  Constant
-  HiLink   phpCoreConstant  Constant
-  HiLink   phpComment Comment
-  HiLink   phpDocTags PreProc
-  HiLink   phpDocCustomTags Type
-  HiLink   phpException Exception
-  HiLink   phpBoolean Boolean
-  HiLink   phpStorageClass  StorageClass
-  HiLink   phpSCKeyword StorageClass
-  HiLink   phpFCKeyword Define
-  HiLink   phpStructure Structure
-  HiLink   phpStringSingle  String
-  HiLink   phpStringDouble  String
-  HiLink   phpBacktick  String
-  HiLink   phpNumber  Number
-  HiLink   phpFloat Float
-  HiLink   phpMethods Function
-  HiLink   phpFunctions Function
-  HiLink   phpBaselib Function
-  HiLink   phpRepeat  Repeat
-  HiLink   phpConditional Conditional
-  HiLink   phpLabel Label
-  HiLink   phpStatement Statement
-  HiLink   phpKeyword Statement
-  HiLink   phpType  Type
-  HiLink   phpInclude Include
-  HiLink   phpDefine  Define
-  HiLink   phpBackslashSequences SpecialChar
-  HiLink   phpBackslashDoubleQuote SpecialChar
-  HiLink   phpBackslashSingleQuote SpecialChar
-  HiLink   phpParent  Delimiter
-  HiLink   phpBrackets  Delimiter
-  HiLink   phpIdentifierConst Delimiter
-  HiLink   phpParentError Error
-  HiLink   phpOctalError  Error
-  HiLink   phpInterpSimpleError Error
-  HiLink   phpInterpBogusDollarCurley Error
-  HiLink   phpInterpDollarCurly1 Error
-  HiLink   phpInterpDollarCurly2 Error
-  HiLink   phpInterpSimpleBracketsInner String
-  HiLink   phpInterpSimpleCurly Delimiter
-  HiLink   phpInterpVarname Identifier
-  HiLink   phpTodo  Todo
-  HiLink   phpDocTodo Todo
-  HiLink   phpMemberSelector  Structure
-  if exists("php_oldStyle")
-  hi  phpIntVar guifg=Red ctermfg=DarkRed
-  hi  phpEnvVar guifg=Red ctermfg=DarkRed
-  hi  phpOperator guifg=SeaGreen ctermfg=DarkGreen
-  hi  phpVarSelector guifg=SeaGreen ctermfg=DarkGreen
-  hi  phpRelation guifg=SeaGreen ctermfg=DarkGreen
-  hi  phpIdentifier guifg=DarkGray ctermfg=Brown
-  hi  phpIdentifierSimply guifg=DarkGray ctermfg=Brown
-  else
-  HiLink   phpIntVar Identifier
-  HiLink   phpEnvVar Identifier
-  HiLink   phpOperator Operator
-  HiLink   phpVarSelector  Operator
-  HiLink   phpRelation Operator
-  HiLink   phpIdentifier Identifier
-  HiLink   phpIdentifierSimply Identifier
-  endif
-
-  delcommand HiLink
+HiLink   phpConstant  Constant
+HiLink   phpCoreConstant  Constant
+HiLink   phpComment Comment
+HiLink   phpDocTags PreProc
+HiLink   phpDocCustomTags Type
+HiLink   phpException Exception
+HiLink   phpBoolean Boolean
+HiLink   phpStorageClass  StorageClass
+HiLink   phpSCKeyword StorageClass
+HiLink   phpFCKeyword Define
+HiLink   phpStructure Structure
+HiLink   phpStringSingle  String
+HiLink   phpStringDouble  String
+HiLink   phpBacktick  String
+HiLink   phpNumber  Number
+HiLink   phpFloat Float
+HiLink   phpMethods Function
+HiLink   phpFunctions Function
+HiLink   phpBaselib Function
+HiLink   phpRepeat  Repeat
+HiLink   phpConditional Conditional
+HiLink   phpLabel Label
+HiLink   phpStatement Statement
+HiLink   phpKeyword Statement
+HiLink   phpType  Type
+HiLink   phpInclude Include
+HiLink   phpDefine  Define
+HiLink   phpBackslashSequences SpecialChar
+HiLink   phpBackslashDoubleQuote SpecialChar
+HiLink   phpBackslashSingleQuote SpecialChar
+HiLink   phpParent  Delimiter
+HiLink   phpBrackets  Delimiter
+HiLink   phpIdentifierConst Delimiter
+HiLink   phpParentError Error
+HiLink   phpOctalError  Error
+HiLink   phpInterpSimpleError Error
+HiLink   phpInterpBogusDollarCurley Error
+HiLink   phpInterpDollarCurly1 Error
+HiLink   phpInterpDollarCurly2 Error
+HiLink   phpInterpSimpleBracketsInner String
+HiLink   phpInterpSimpleCurly Delimiter
+HiLink   phpInterpVarname Identifier
+HiLink   phpTodo  Todo
+HiLink   phpDocTodo Todo
+HiLink   phpMemberSelector  Structure
+if exists("php_oldStyle")
+hi  phpIntVar guifg=Red ctermfg=DarkRed
+hi  phpEnvVar guifg=Red ctermfg=DarkRed
+hi  phpOperator guifg=SeaGreen ctermfg=DarkGreen
+hi  phpVarSelector guifg=SeaGreen ctermfg=DarkGreen
+hi  phpRelation guifg=SeaGreen ctermfg=DarkGreen
+hi  phpIdentifier guifg=DarkGray ctermfg=Brown
+hi  phpIdentifierSimply guifg=DarkGray ctermfg=Brown
+else
+HiLink   phpIntVar Identifier
+HiLink   phpEnvVar Identifier
+HiLink   phpOperator Operator
+HiLink   phpVarSelector  Operator
+HiLink   phpRelation Operator
+HiLink   phpIdentifier Identifier
+HiLink   phpIdentifierSimply Identifier
 endif
 
+delcommand HiLink
+
 let b:current_syntax = "php"
 
 if main_syntax == 'php'
diff --git a/runtime/syntax/pic.vim b/runtime/syntax/pic.vim
index adc964ea96..b98984ed3d 100644
--- a/runtime/syntax/pic.vim
+++ b/runtime/syntax/pic.vim
@@ -5,11 +5,8 @@
 " URL:		http://galeb.etf.bg.ac.yu/~alexa/vim/syntax/pic.vim
 " Revision:     1.01
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -91,36 +88,28 @@ syn match picDirective   "#\=DEFINE"
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_pic16f84_syntax_inits")
-  if version < 508
-    let did_pic16f84_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink picTodo		Todo
-  HiLink picComment		Comment
-  HiLink picDirective		Statement
-  HiLink picLabel		Label
-  HiLink picString		String
+HiLink picTodo		Todo
+HiLink picComment		Comment
+HiLink picDirective		Statement
+HiLink picLabel		Label
+HiLink picString		String
 
- "HiLink picOpcode		Keyword
- "HiLink picRegister		Structure
- "HiLink picRegisterPart	Special
+"HiLink picOpcode		Keyword
+"HiLink picRegister		Structure
+"HiLink picRegisterPart	Special
 
-  HiLink picASCII		String
-  HiLink picBinary		Number
-  HiLink picDecimal		Number
-  HiLink picHexadecimal		Number
-  HiLink picOctal		Number
+HiLink picASCII		String
+HiLink picBinary		Number
+HiLink picDecimal		Number
+HiLink picHexadecimal		Number
+HiLink picOctal		Number
 
-  HiLink picIdentifier		Identifier
+HiLink picIdentifier		Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "pic"
 
diff --git a/runtime/syntax/pike.vim b/runtime/syntax/pike.vim
index efbafd5d82..dcf32113c5 100644
--- a/runtime/syntax/pike.vim
+++ b/runtime/syntax/pike.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Francesco Chemolli <kinkie@kame.usr.dsi.unimi.it>
 " Last Change:	2001 May 10
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -104,51 +101,43 @@ syn match	pikeBitField	";\s*\I\i*\s*:\s*[1-9]"me=e-1
 syn sync ccomment pikeComment minlines=10
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_pike_syntax_inits")
-  if version < 508
-    let did_pike_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink pikeLabel		Label
-  HiLink pikeUserLabel		Label
-  HiLink pikeConditional	Conditional
-  HiLink pikeRepeat		Repeat
-  HiLink pikeCharacter		Character
-  HiLink pikeSpecialCharacter pikeSpecial
-  HiLink pikeNumber		Number
-  HiLink pikeFloat		Float
-  HiLink pikeOctalError		pikeError
-  HiLink pikeParenError		pikeError
-  HiLink pikeInParen		pikeError
-  HiLink pikeCommentError	pikeError
-  HiLink pikeOperator		Operator
-  HiLink pikeInclude		Include
-  HiLink pikePreProc		PreProc
-  HiLink pikeDefine		Macro
-  HiLink pikeIncluded		pikeString
-  HiLink pikeError		Error
-  HiLink pikeStatement		Statement
-  HiLink pikePreCondit		PreCondit
-  HiLink pikeType		Type
-  HiLink pikeCommentError	pikeError
-  HiLink pikeCommentString	pikeString
-  HiLink pikeComment2String	pikeString
-  HiLink pikeCommentSkip	pikeComment
-  HiLink pikeString		String
-  HiLink pikeComment		Comment
-  HiLink pikeSpecial		SpecialChar
-  HiLink pikeTodo		Todo
-  HiLink pikeException		pikeStatement
-  HiLink pikeCompoundType	Constant
-  "HiLink pikeIdentifier	Identifier
+HiLink pikeLabel		Label
+HiLink pikeUserLabel		Label
+HiLink pikeConditional	Conditional
+HiLink pikeRepeat		Repeat
+HiLink pikeCharacter		Character
+HiLink pikeSpecialCharacter pikeSpecial
+HiLink pikeNumber		Number
+HiLink pikeFloat		Float
+HiLink pikeOctalError		pikeError
+HiLink pikeParenError		pikeError
+HiLink pikeInParen		pikeError
+HiLink pikeCommentError	pikeError
+HiLink pikeOperator		Operator
+HiLink pikeInclude		Include
+HiLink pikePreProc		PreProc
+HiLink pikeDefine		Macro
+HiLink pikeIncluded		pikeString
+HiLink pikeError		Error
+HiLink pikeStatement		Statement
+HiLink pikePreCondit		PreCondit
+HiLink pikeType		Type
+HiLink pikeCommentError	pikeError
+HiLink pikeCommentString	pikeString
+HiLink pikeComment2String	pikeString
+HiLink pikeCommentSkip	pikeComment
+HiLink pikeString		String
+HiLink pikeComment		Comment
+HiLink pikeSpecial		SpecialChar
+HiLink pikeTodo		Todo
+HiLink pikeException		pikeStatement
+HiLink pikeCompoundType	Constant
+"HiLink pikeIdentifier	Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "pike"
 
diff --git a/runtime/syntax/pilrc.vim b/runtime/syntax/pilrc.vim
index 86d5611589..c1d3288b05 100644
--- a/runtime/syntax/pilrc.vim
+++ b/runtime/syntax/pilrc.vim
@@ -4,10 +4,8 @@
 " Last change:	2003 May 11
 " Available on:	http://www.schau.com/pilrcvim/pilrc.vim
 
-" Remove any old syntax
-if version < 600
-	syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
@@ -119,30 +117,22 @@ syn region pilrcInclude start="public class" end="}"
 
 syn sync ccomment pilrcComment
 
-if version >= 508 || !exists("did_pilrc_syntax_inits")
-	if version < 508
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+command -nargs=+ HiLink hi def link <args>
 
-	let did_pilrc_syntax_inits = 1
+" The default methods for highlighting
+HiLink pilrcKeyword		Statement
+HiLink pilrcType		Type
+HiLink pilrcError		Error
+HiLink pilrcCountry		SpecialChar
+HiLink pilrcLanguage		SpecialChar
+HiLink pilrcString		SpecialChar
+HiLink pilrcNumber		Number
+HiLink pilrcComment		Comment
+HiLink pilrcConstant		Constant
+HiLink pilrcFunction		Function
+HiLink pilrcInclude		SpecialChar
+HiLink pilrcIdentifier		Number
 
-	" The default methods for highlighting
-	HiLink pilrcKeyword		Statement
-	HiLink pilrcType		Type
-	HiLink pilrcError		Error
-	HiLink pilrcCountry		SpecialChar
-	HiLink pilrcLanguage		SpecialChar
-	HiLink pilrcString		SpecialChar
-	HiLink pilrcNumber		Number
-	HiLink pilrcComment		Comment
-	HiLink pilrcConstant		Constant
-	HiLink pilrcFunction		Function
-	HiLink pilrcInclude		SpecialChar
-	HiLink pilrcIdentifier		Number
-
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "pilrc"
diff --git a/runtime/syntax/pine.vim b/runtime/syntax/pine.vim
index 4c64b9bbc7..e41dd87007 100644
--- a/runtime/syntax/pine.vim
+++ b/runtime/syntax/pine.vim
@@ -3,19 +3,12 @@
 " Maintainer:	David Pascoe <pascoedj@spamcop.net>
 " Last Change:	Thu Feb 27 10:18:48 WST 2003, update for pine 4.53
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
-if version >= 600
-  setlocal iskeyword=@,48-57,_,128-167,224-235,-
-else
-  set iskeyword=@,48-57,_,128-167,224-235,-
-endif
+setlocal iskeyword=@,48-57,_,128-167,224-235,-
 
 syn keyword pineConfig addrbook-sort-rule
 syn keyword pineConfig address-book
@@ -351,21 +344,13 @@ syn keyword pineOption vertical-folder-list
 syn match  pineComment  "^#.*$"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_pine_syn_inits")
-  if version < 508
-    let did_pine_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink pineConfig	Type
-  HiLink pineComment	Comment
-  HiLink pineOption	Macro
-  delcommand HiLink
-endif
+HiLink pineConfig	Type
+HiLink pineComment	Comment
+HiLink pineOption	Macro
+delcommand HiLink
 
 let b:current_syntax = "pine"
 
diff --git a/runtime/syntax/pli.vim b/runtime/syntax/pli.vim
index f8d7e51cf3..9c74f9b0f8 100644
--- a/runtime/syntax/pli.vim
+++ b/runtime/syntax/pli.vim
@@ -3,9 +3,8 @@
 " using keywords from http://www.kednos.com/pli/docs/reference_manual/6291pro_contents.html
 "    2012-11-13 Alan Thompson
 
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
@@ -222,57 +221,48 @@ endif
 syn sync minlines=10 maxlines=100
 
 " Define the default highlighting.
-" For version 5.x and earlier, only when not done already.
-" For version 5.8 and later, only when and item doesn't have highlighting
-" yet.
-if version >= 508 || !exists("did_pl1_syn_inits")
-    if version < 508
-        let did_pl1_syn_inits = 1
-        command -nargs=+ HiLink hi link <args>
-    else
-        command -nargs=+ HiLink hi def link <args>
-    endif
+" Only when and item doesn't have highlighting yet.
+command -nargs=+ HiLink hi def link <args>
 
-    HiLink pl1Attribute       Macro
-    HiLink pl1BlockError      Error
-    HiLink pl1BooleanLiteral  Boolean
-    HiLink pl1CharLiteral     Character
-    HiLink pl1Comment         Comment
-    HiLink pl1CommentL        Comment
-    HiLink pl1Conditional     Conditional
-    HiLink pl1Error           Error
-    HiLink pl1ErrInBracket    Error
-    HiLink pl1ErrInBlock      Error
-    HiLink pl1ErrInParen      Error
-    HiLink pl1Exception       Function
-    HiLink pl1FloatLiteral    Float
-    HiLink pl1Function        Function
-    HiLink pl1Garbage         Error
-    HiLink pl1HostIdentifier  Label
-    HiLink pl1Identifier      Normal
-    HiLink pl1IntLiteral      Number
-    HiLink pl1Operator        Operator
-    HiLink pl1Paren           Normal
-    HiLink pl1ParenError      Error
-    HiLink pl1SpaceError      Error
-    HiLink pl1Pseudo          PreProc
-    HiLink pl1PreProc         PreProc
-    HiLink pl1PreProcSym      PreProc
-    HiLink pl1Keyword         Keyword
-    HiLink pl1Other           Keyword
-    HiLink pl1Repeat          Repeat
-    HiLink pl1Statement       Keyword
-    HiLink pl1Storage         StorageClass
-    HiLink pl1StringError     Error
-    HiLink pl1StringLiteral   String
-    HiLink pl1CommentString   String
-    HiLink pl1Comment2String  String
-    HiLink pl1Symbol          Normal
-    HiLink pl1Trigger         Function
-    HiLink pl1TypeAttribute   StorageClass
-    HiLink pl1Todo            Todo
+HiLink pl1Attribute       Macro
+HiLink pl1BlockError      Error
+HiLink pl1BooleanLiteral  Boolean
+HiLink pl1CharLiteral     Character
+HiLink pl1Comment         Comment
+HiLink pl1CommentL        Comment
+HiLink pl1Conditional     Conditional
+HiLink pl1Error           Error
+HiLink pl1ErrInBracket    Error
+HiLink pl1ErrInBlock      Error
+HiLink pl1ErrInParen      Error
+HiLink pl1Exception       Function
+HiLink pl1FloatLiteral    Float
+HiLink pl1Function        Function
+HiLink pl1Garbage         Error
+HiLink pl1HostIdentifier  Label
+HiLink pl1Identifier      Normal
+HiLink pl1IntLiteral      Number
+HiLink pl1Operator        Operator
+HiLink pl1Paren           Normal
+HiLink pl1ParenError      Error
+HiLink pl1SpaceError      Error
+HiLink pl1Pseudo          PreProc
+HiLink pl1PreProc         PreProc
+HiLink pl1PreProcSym      PreProc
+HiLink pl1Keyword         Keyword
+HiLink pl1Other           Keyword
+HiLink pl1Repeat          Repeat
+HiLink pl1Statement       Keyword
+HiLink pl1Storage         StorageClass
+HiLink pl1StringError     Error
+HiLink pl1StringLiteral   String
+HiLink pl1CommentString   String
+HiLink pl1Comment2String  String
+HiLink pl1Symbol          Normal
+HiLink pl1Trigger         Function
+HiLink pl1TypeAttribute   StorageClass
+HiLink pl1Todo            Todo
 
-    delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "pl1"
diff --git a/runtime/syntax/plm.vim b/runtime/syntax/plm.vim
index bf7c32fd1c..de806b3335 100644
--- a/runtime/syntax/plm.vim
+++ b/runtime/syntax/plm.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Philippe Coulonges <cphil@cphil.net>
 " Last change:	2003 May 11
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -103,43 +100,35 @@ syn keyword plm386w16BuiltIn SETD SKIPD SKIPRD
 syn sync lines=50
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_plm_syntax_inits")
-  if version < 508
-    let did_plm_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
- " The default methods for highlighting.  Can be overridden later
+" The default methods for highlighting.  Can be overridden later
 "  HiLink plmLabel			Label
 "  HiLink plmConditional		Conditional
 "  HiLink plmRepeat			Repeat
-  HiLink plmTodo			Todo
-  HiLink plmNumber			Number
-  HiLink plmOperator			Operator
-  HiLink plmDelimiter			Operator
-  "HiLink plmShowTab			Error
-  "HiLink plmShowTabc			Error
-  HiLink plmIdentifier			Identifier
-  HiLink plmBuiltIn			Statement
-  HiLink plm286BuiltIn			Statement
-  HiLink plm386BuiltIn			Statement
-  HiLink plm386w16BuiltIn		Statement
-  HiLink plmReserved			Statement
-  HiLink plm386Reserved			Statement
-  HiLink plmPreProc			PreProc
-  HiLink plmCommentError		plmError
-  HiLink plmCommentString		plmString
-  HiLink plmComment2String		plmString
-  HiLink plmCommentSkip			plmComment
-  HiLink plmString			String
-  HiLink plmComment			Comment
+HiLink plmTodo			Todo
+HiLink plmNumber			Number
+HiLink plmOperator			Operator
+HiLink plmDelimiter			Operator
+"HiLink plmShowTab			Error
+"HiLink plmShowTabc			Error
+HiLink plmIdentifier			Identifier
+HiLink plmBuiltIn			Statement
+HiLink plm286BuiltIn			Statement
+HiLink plm386BuiltIn			Statement
+HiLink plm386w16BuiltIn		Statement
+HiLink plmReserved			Statement
+HiLink plm386Reserved			Statement
+HiLink plmPreProc			PreProc
+HiLink plmCommentError		plmError
+HiLink plmCommentString		plmString
+HiLink plmComment2String		plmString
+HiLink plmCommentSkip			plmComment
+HiLink plmString			String
+HiLink plmComment			Comment
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "plm"
 
diff --git a/runtime/syntax/plp.vim b/runtime/syntax/plp.vim
index f59702d3b5..48dc4b249e 100644
--- a/runtime/syntax/plp.vim
+++ b/runtime/syntax/plp.vim
@@ -7,11 +7,8 @@
 " Add to filetype.vim the following line (without quote sign):
 " au BufNewFile,BufRead *.plp setf plp
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -19,14 +16,9 @@ if !exists("main_syntax")
   let main_syntax = 'perlscript'
 endif
 
-if version < 600
-  so <sfile>:p:h/html.vim
-  syn include @PLPperl <sfile>:p:h/perl.vim
-else
-  runtime! syntax/html.vim
-  unlet b:current_syntax
-  syn include @PLPperl syntax/perl.vim
-endif
+runtime! syntax/html.vim
+unlet b:current_syntax
+syn include @PLPperl syntax/perl.vim
 
 syn cluster htmlPreproc add=PLPperlblock
 
diff --git a/runtime/syntax/plsql.vim b/runtime/syntax/plsql.vim
index 6e513660f8..173c22f761 100644
--- a/runtime/syntax/plsql.vim
+++ b/runtime/syntax/plsql.vim
@@ -9,11 +9,8 @@
 "	   Austin Ziegler (austin at halostatue dot ca)
 "		Added 8i+ features.
 "
-" For version 5.x, clear all syntax items.
-" For version 6.x, quit when a syntax file was already loaded.
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -223,54 +220,46 @@ endif
 syn sync minlines=10 maxlines=100
 
 " Define the default highlighting.
-" For version 5.x and earlier, only when not done already.
-" For version 5.8 and later, only when an item doesn't have highlighting yet.
-if version >= 508 || !exists("did_plsql_syn_inits")
-  if version < 508
-    let did_plsql_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet.
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink plsqlAttribute		Macro
-  HiLink plsqlBlockError	Error
-  HiLink plsqlBooleanLiteral	Boolean
-  HiLink plsqlCharLiteral	Character
-  HiLink plsqlComment		Comment
-  HiLink plsqlCommentL		Comment
-  HiLink plsqlConditional	Conditional
-  HiLink plsqlError		Error
-  HiLink plsqlErrInBracket	Error
-  HiLink plsqlErrInBlock	Error
-  HiLink plsqlErrInParen	Error
-  HiLink plsqlException		Function
-  HiLink plsqlFloatLiteral	Float
-  HiLink plsqlFunction		Function
-  HiLink plsqlGarbage		Error
-  HiLink plsqlHostIdentifier	Label
-  HiLink plsqlIdentifier	Normal
-  HiLink plsqlIntLiteral	Number
-  HiLink plsqlOperator		Operator
-  HiLink plsqlParen		Normal
-  HiLink plsqlParenError	Error
-  HiLink plsqlSpaceError	Error
-  HiLink plsqlPseudo		PreProc
-  HiLink plsqlKeyword		Keyword
-  HiLink plsqlRepeat		Repeat
-  HiLink plsqlStorage		StorageClass
-  HiLink plsqlSQLKeyword	Function
-  HiLink plsqlStringError	Error
-  HiLink plsqlStringLiteral	String
-  HiLink plsqlCommentString	String
-  HiLink plsqlComment2String	String
-  HiLink plsqlSymbol		Normal
-  HiLink plsqlTrigger		Function
-  HiLink plsqlTypeAttribute	StorageClass
-  HiLink plsqlTodo		Todo
+HiLink plsqlAttribute		Macro
+HiLink plsqlBlockError	Error
+HiLink plsqlBooleanLiteral	Boolean
+HiLink plsqlCharLiteral	Character
+HiLink plsqlComment		Comment
+HiLink plsqlCommentL		Comment
+HiLink plsqlConditional	Conditional
+HiLink plsqlError		Error
+HiLink plsqlErrInBracket	Error
+HiLink plsqlErrInBlock	Error
+HiLink plsqlErrInParen	Error
+HiLink plsqlException		Function
+HiLink plsqlFloatLiteral	Float
+HiLink plsqlFunction		Function
+HiLink plsqlGarbage		Error
+HiLink plsqlHostIdentifier	Label
+HiLink plsqlIdentifier	Normal
+HiLink plsqlIntLiteral	Number
+HiLink plsqlOperator		Operator
+HiLink plsqlParen		Normal
+HiLink plsqlParenError	Error
+HiLink plsqlSpaceError	Error
+HiLink plsqlPseudo		PreProc
+HiLink plsqlKeyword		Keyword
+HiLink plsqlRepeat		Repeat
+HiLink plsqlStorage		StorageClass
+HiLink plsqlSQLKeyword	Function
+HiLink plsqlStringError	Error
+HiLink plsqlStringLiteral	String
+HiLink plsqlCommentString	String
+HiLink plsqlComment2String	String
+HiLink plsqlSymbol		Normal
+HiLink plsqlTrigger		Function
+HiLink plsqlTypeAttribute	StorageClass
+HiLink plsqlTodo		Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "plsql"
 
diff --git a/runtime/syntax/po.vim b/runtime/syntax/po.vim
index 2ab13ac0b1..f98813c62a 100644
--- a/runtime/syntax/po.vim
+++ b/runtime/syntax/po.vim
@@ -6,11 +6,8 @@
 "               Leonardo Fontenelle (Spell checking)
 "               Nam SungHyun <namsh@kldp.org> (Original maintainer)
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 let s:keepcpo= &cpo
@@ -82,61 +79,53 @@ syn match poAcceleratorStr  contained "[^&_~][&_~]\(\a\|\d\)[^:]"ms=s+1,me=e-1 c
 syn match poVariable contained "%\d"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_po_syn_inits")
-  if version < 508
-    let did_po_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink poCommentSources    PreProc
-  HiLink poComment	     Comment
-  HiLink poCommentAutomatic  Comment
-  HiLink poCommentTranslator Comment
-  HiLink poCommentFlags      Special
-  HiLink poCommentDiff       Comment
-  HiLink poCopyrightUnset    Todo
-  HiLink poFlagFuzzy         Todo
-  HiLink poDiffOld           Todo
-  HiLink poDiffNew          Special
-  HiLink poObsolete         Comment
+HiLink poCommentSources    PreProc
+HiLink poComment	     Comment
+HiLink poCommentAutomatic  Comment
+HiLink poCommentTranslator Comment
+HiLink poCommentFlags      Special
+HiLink poCommentDiff       Comment
+HiLink poCopyrightUnset    Todo
+HiLink poFlagFuzzy         Todo
+HiLink poDiffOld           Todo
+HiLink poDiffNew          Special
+HiLink poObsolete         Comment
 
-  HiLink poStatementMsgid   Statement
-  HiLink poStatementMsgstr  Statement
-  HiLink poStatementMsgidplural  Statement
-  HiLink poStatementMsgCTxt Statement
-  HiLink poPluralCaseN      Constant
+HiLink poStatementMsgid   Statement
+HiLink poStatementMsgstr  Statement
+HiLink poStatementMsgidplural  Statement
+HiLink poStatementMsgCTxt Statement
+HiLink poPluralCaseN      Constant
 
-  HiLink poStringCTxt	    Comment
-  HiLink poStringID	    String
-  HiLink poStringSTR	    String
-  HiLink poCommentKDE       Comment
-  HiLink poCommentKDEError  Error
-  HiLink poPluralKDE        Comment
-  HiLink poPluralKDEError   Error
-  HiLink poHeaderItem       Identifier
-  HiLink poHeaderUndefined  Todo
-  HiLink poKDEdesktopFile   Identifier
+HiLink poStringCTxt	    Comment
+HiLink poStringID	    String
+HiLink poStringSTR	    String
+HiLink poCommentKDE       Comment
+HiLink poCommentKDEError  Error
+HiLink poPluralKDE        Comment
+HiLink poPluralKDEError   Error
+HiLink poHeaderItem       Identifier
+HiLink poHeaderUndefined  Todo
+HiLink poKDEdesktopFile   Identifier
 
-  HiLink poHtml              Identifier
-  HiLink poHtmlNot           String
-  HiLink poHtmlTranslatables String
-  HiLink poLineBreak         String
+HiLink poHtml              Identifier
+HiLink poHtmlNot           String
+HiLink poHtmlTranslatables String
+HiLink poLineBreak         String
 
-  HiLink poFormat	    poSpecial
-  HiLink poSpecial	    Special
-  HiLink poAcceleratorId    Special
-  HiLink poAcceleratorStr   Special
-  HiLink poVariable         Special
+HiLink poFormat	    poSpecial
+HiLink poSpecial	    Special
+HiLink poAcceleratorId    Special
+HiLink poAcceleratorStr   Special
+HiLink poVariable         Special
 
-  HiLink poMsguniqError        Special
-  HiLink poMsguniqErrorMarkers Comment
+HiLink poMsguniqError        Special
+HiLink poMsguniqErrorMarkers Comment
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "po"
 
diff --git a/runtime/syntax/pod.vim b/runtime/syntax/pod.vim
index b9f2e0854f..c545141275 100644
--- a/runtime/syntax/pod.vim
+++ b/runtime/syntax/pod.vim
@@ -19,11 +19,8 @@
 
 " Remove any old syntax stuff hanging around (this is suppressed
 " automatically by ":syn include" if necessary).
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -67,28 +64,20 @@ syn match  podEscape	"\I\i*>"me=e-1 contained contains=@NoSpell
 syn match  podEscape2	"\d\+>"me=e-1 contained contains=@NoSpell
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_pod_syntax_inits")
-  if version < 508
-    let did_pod_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink podCommand		Statement
-  HiLink podCmdText		String
-  HiLink podOverIndent		Number
-  HiLink podForKeywd		Identifier
-  HiLink podFormat		Identifier
-  HiLink podVerbatimLine	PreProc
-  HiLink podSpecial		Identifier
-  HiLink podEscape		String
-  HiLink podEscape2		Number
+HiLink podCommand		Statement
+HiLink podCmdText		String
+HiLink podOverIndent		Number
+HiLink podForKeywd		Identifier
+HiLink podFormat		Identifier
+HiLink podVerbatimLine	PreProc
+HiLink podSpecial		Identifier
+HiLink podEscape		String
+HiLink podEscape2		Number
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 if exists("perl_pod_spellcheck_headings")
   " Spell-check headings
diff --git a/runtime/syntax/postscr.vim b/runtime/syntax/postscr.vim
index 8b051d33b3..33cc6ec128 100644
--- a/runtime/syntax/postscr.vim
+++ b/runtime/syntax/postscr.vim
@@ -13,11 +13,8 @@
 " postscr_encodings             - highlight encoding names (there are a lot)
 " postscr_andornot_binary       - highlight and, or, and not as binary operators (not logical)
 "
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -25,11 +22,7 @@ endif
 syn case match
 
 " Keyword characters - all 7-bit ASCII bar PS delimiters and ws
-if version >= 600
-  setlocal iskeyword=33-127,^(,^),^<,^>,^[,^],^{,^},^/,^%
-else
-  set iskeyword=33-127,^(,^),^<,^>,^[,^],^{,^},^/,^%
-endif
+setlocal iskeyword=33-127,^(,^),^<,^>,^[,^],^{,^},^/,^%
 
 " Yer trusty old TODO highlghter!
 syn keyword postscrTodo contained  TODO
@@ -730,68 +723,60 @@ if exists("postscr_ghostscript")
 endif " GhostScript highlighting
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_postscr_syntax_inits")
-  if version < 508
-    let did_postscr_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink postscrComment         Comment
+HiLink postscrComment         Comment
 
-  HiLink postscrConstant        Constant
-  HiLink postscrString          String
-  HiLink postscrASCIIString     postscrString
-  HiLink postscrHexString       postscrString
-  HiLink postscrASCII85String   postscrString
-  HiLink postscrNumber          Number
-  HiLink postscrInteger         postscrNumber
-  HiLink postscrHex             postscrNumber
-  HiLink postscrRadix           postscrNumber
-  HiLink postscrFloat           Float
-  HiLink postscrBoolean         Boolean
+HiLink postscrConstant        Constant
+HiLink postscrString          String
+HiLink postscrASCIIString     postscrString
+HiLink postscrHexString       postscrString
+HiLink postscrASCII85String   postscrString
+HiLink postscrNumber          Number
+HiLink postscrInteger         postscrNumber
+HiLink postscrHex             postscrNumber
+HiLink postscrRadix           postscrNumber
+HiLink postscrFloat           Float
+HiLink postscrBoolean         Boolean
 
-  HiLink postscrIdentifier      Identifier
-  HiLink postscrProcedure       Function
+HiLink postscrIdentifier      Identifier
+HiLink postscrProcedure       Function
 
-  HiLink postscrName            Statement
-  HiLink postscrConditional     Conditional
-  HiLink postscrRepeat          Repeat
-  HiLink postscrL2Repeat        postscrRepeat
-  HiLink postscrOperator        Operator
-  HiLink postscrL1Operator      postscrOperator
-  HiLink postscrL2Operator      postscrOperator
-  HiLink postscrL3Operator      postscrOperator
-  HiLink postscrMathOperator    postscrOperator
-  HiLink postscrLogicalOperator postscrOperator
-  HiLink postscrBinaryOperator  postscrOperator
+HiLink postscrName            Statement
+HiLink postscrConditional     Conditional
+HiLink postscrRepeat          Repeat
+HiLink postscrL2Repeat        postscrRepeat
+HiLink postscrOperator        Operator
+HiLink postscrL1Operator      postscrOperator
+HiLink postscrL2Operator      postscrOperator
+HiLink postscrL3Operator      postscrOperator
+HiLink postscrMathOperator    postscrOperator
+HiLink postscrLogicalOperator postscrOperator
+HiLink postscrBinaryOperator  postscrOperator
 
-  HiLink postscrDSCComment      SpecialComment
-  HiLink postscrSpecialChar     SpecialChar
+HiLink postscrDSCComment      SpecialComment
+HiLink postscrSpecialChar     SpecialChar
 
-  HiLink postscrTodo            Todo
+HiLink postscrTodo            Todo
 
-  HiLink postscrError           Error
-  HiLink postscrSpecialCharError postscrError
-  HiLink postscrASCII85CharError postscrError
-  HiLink postscrHexCharError    postscrError
-  HiLink postscrASCIIStringError postscrError
-  HiLink postscrIdentifierError postscrError
+HiLink postscrError           Error
+HiLink postscrSpecialCharError postscrError
+HiLink postscrASCII85CharError postscrError
+HiLink postscrHexCharError    postscrError
+HiLink postscrASCIIStringError postscrError
+HiLink postscrIdentifierError postscrError
 
-  if exists("postscr_ghostscript")
-    HiLink postscrGSOperator      postscrOperator
-    HiLink postscrGSMathOperator  postscrMathOperator
-  else
-    HiLink postscrGSOperator      postscrError
-    HiLink postscrGSMathOperator  postscrError
-  endif
-
-  delcommand HiLink
+if exists("postscr_ghostscript")
+HiLink postscrGSOperator      postscrOperator
+HiLink postscrGSMathOperator  postscrMathOperator
+else
+HiLink postscrGSOperator      postscrError
+HiLink postscrGSMathOperator  postscrError
 endif
 
+delcommand HiLink
+
 let b:current_syntax = "postscr"
 
 " vim: ts=8
diff --git a/runtime/syntax/pov.vim b/runtime/syntax/pov.vim
index 4c1fd9624a..8595bcb151 100644
--- a/runtime/syntax/pov.vim
+++ b/runtime/syntax/pov.vim
@@ -5,14 +5,8 @@
 " Required Vim Version: 6.0
 
 " Setup
-if version >= 600
-  " Quit when a syntax file was already loaded
-  if exists("b:current_syntax")
-    finish
-  endif
-else
-  " Croak when an old Vim is sourcing us.
-  echo "Sorry, but this syntax file relies on Vim 6 features.  Either upgrade Vim or use a version of " . expand("<sfile>:t:r") . " syntax file appropriate for Vim " . version/100 . "." . version %100 . "."
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/povini.vim b/runtime/syntax/povini.vim
index 726fe1fc74..ac1f87875e 100644
--- a/runtime/syntax/povini.vim
+++ b/runtime/syntax/povini.vim
@@ -5,14 +5,8 @@
 " Required Vim Version: 6.0
 
 " Setup
-if version >= 600
-  " Quit when a syntax file was already loaded
-  if exists("b:current_syntax")
-    finish
-  endif
-else
-  " Croak when an old Vim is sourcing us.
-  echo "Sorry, but this syntax file relies on Vim 6 features.  Either upgrade Vim or usea version of " . expand("<sfile>:t:r") . " syntax file appropriate for Vim " . version/100 . "." . version %100 . "."
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/ppd.vim b/runtime/syntax/ppd.vim
index 192f70c05d..31d3841e33 100644
--- a/runtime/syntax/ppd.vim
+++ b/runtime/syntax/ppd.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Bjoern Jacke <bjacke@suse.de>
 " Last Change:	2001-10-06
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -21,27 +18,19 @@ syn match	ppdGUIText	"/.*:"
 syn match	ppdContraints	"^*UIConstraints:"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_ahdl_syn_inits")
-  if version < 508
-    let did_ahdl_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
 
-  HiLink ppdComment		Comment
-  HiLink ppdDefine		Statement
-  HiLink ppdUI			Function
-  HiLink ppdUIGroup		Function
-  HiLink ppdDef			String
-  HiLink ppdGUIText		Type
-  HiLink ppdContraints		Special
+HiLink ppdComment		Comment
+HiLink ppdDefine		Statement
+HiLink ppdUI			Function
+HiLink ppdUIGroup		Function
+HiLink ppdDef			String
+HiLink ppdGUIText		Type
+HiLink ppdContraints		Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "ppd"
 
diff --git a/runtime/syntax/ppwiz.vim b/runtime/syntax/ppwiz.vim
index d3d7b3a17a..599bf0b89f 100644
--- a/runtime/syntax/ppwiz.vim
+++ b/runtime/syntax/ppwiz.vim
@@ -6,11 +6,8 @@
 " Filename:     ppwiz.vim
 
 " Remove old syntax stuff
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -63,33 +60,25 @@ syn match   ppwizInteger  "\d\+" contained
 syn cluster ppwizArgVal add=ppwizString,ppwizInteger
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_ppwiz_syn_inits")
-    if version < 508
-		let did_ppwiz_syn_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-    endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-    HiLink ppwizSpecial  Special
-    HiLink ppwizEqual    ppwizSpecial
-    HiLink ppwizOperator ppwizSpecial
-    HiLink ppwizComment  Comment
-    HiLink ppwizDef      PreProc
-    HiLink ppwizMacro    Statement
-    HiLink ppwizArg      Identifier
-    HiLink ppwizStdVar   Identifier
-    HiLink ppwizRexxVar  Identifier
-    HiLink ppwizString   Constant
-    HiLink ppwizInteger  Constant
-    HiLink ppwizCont     ppwizSpecial
-    HiLink ppwizError    Error
-    HiLink ppwizHTML     Type
+HiLink ppwizSpecial  Special
+HiLink ppwizEqual    ppwizSpecial
+HiLink ppwizOperator ppwizSpecial
+HiLink ppwizComment  Comment
+HiLink ppwizDef      PreProc
+HiLink ppwizMacro    Statement
+HiLink ppwizArg      Identifier
+HiLink ppwizStdVar   Identifier
+HiLink ppwizRexxVar  Identifier
+HiLink ppwizString   Constant
+HiLink ppwizInteger  Constant
+HiLink ppwizCont     ppwizSpecial
+HiLink ppwizError    Error
+HiLink ppwizHTML     Type
 
-    delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "ppwiz"
 
diff --git a/runtime/syntax/prescribe.vim b/runtime/syntax/prescribe.vim
index d89ee35253..05f9162e4c 100644
--- a/runtime/syntax/prescribe.vim
+++ b/runtime/syntax/prescribe.vim
@@ -4,11 +4,8 @@
 " URL:          http://www.hampft.de/vim/syntax/prescribe.vim
 " Last Change:	2005 Mar 04
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -44,25 +41,17 @@ syn region  prescribeString	start=+'+ end=+'+ skip=+\\'+
 syn region  prescribeComment	start=+CMNT+ end=+;+
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_prescribe_syn_inits")
-  if version < 508
-    let did_prescribe_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink prescribeSpecial		PreProc
-  HiLink prescribeStatement		Statement
-  HiLink prescribeNumber		Number
-  HiLink prescribeCSETArg		String
-  HiLink prescribeFRPOArg		String
-  HiLink prescribeComment		Comment
+HiLink prescribeSpecial		PreProc
+HiLink prescribeStatement		Statement
+HiLink prescribeNumber		Number
+HiLink prescribeCSETArg		String
+HiLink prescribeFRPOArg		String
+HiLink prescribeComment		Comment
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "prescribe"
 
diff --git a/runtime/syntax/procmail.vim b/runtime/syntax/procmail.vim
index c2ffa39883..9202dbf29a 100644
--- a/runtime/syntax/procmail.vim
+++ b/runtime/syntax/procmail.vim
@@ -4,11 +4,8 @@
 " Last Change:	2003 Aug 14
 " Author:	Sonia Heimann
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -33,34 +30,26 @@ syn region procmailActionNested start=+^\s*{+ end=+^\s*}+ contains=procmailRecip
 syn region procmailRecipe start=+^\s*:.*$+ end=+^\s*\($\|}\)+me=e-1 contains=procmailComment,procmailCondition,procmailActionFolder,procmailActionVariable,procmailActionForward,procmailActionPipe,procmailActionNested,procmailVarDeclRegion
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_procmail_syntax_inits")
-  if version < 508
-    let did_procmail_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink procmailComment Comment
-  HiLink procmailTodo    Todo
+HiLink procmailComment Comment
+HiLink procmailTodo    Todo
 
-  HiLink procmailRecipe   Statement
-  "HiLink procmailCondition   Statement
+HiLink procmailRecipe   Statement
+"HiLink procmailCondition   Statement
 
-  HiLink procmailActionFolder	procmailAction
-  HiLink procmailActionVariable procmailAction
-  HiLink procmailActionForward	procmailAction
-  HiLink procmailActionPipe	procmailAction
-  HiLink procmailAction		Function
-  HiLink procmailVar		Identifier
-  HiLink procmailVarDecl	Identifier
+HiLink procmailActionFolder	procmailAction
+HiLink procmailActionVariable procmailAction
+HiLink procmailActionForward	procmailAction
+HiLink procmailActionPipe	procmailAction
+HiLink procmailAction		Function
+HiLink procmailVar		Identifier
+HiLink procmailVarDecl	Identifier
 
-  HiLink procmailString String
+HiLink procmailString String
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "procmail"
 
diff --git a/runtime/syntax/progress.vim b/runtime/syntax/progress.vim
index 85a54a6505..9ff506960e 100644
--- a/runtime/syntax/progress.vim
+++ b/runtime/syntax/progress.vim
@@ -11,22 +11,15 @@
 " Version:              13
 " Last Change:		Nov 11 2012
 
-" For version 5.x: Clear all syntax item
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
 let s:cpo_save = &cpo
 set cpo&vim
 
-if version >= 600
-  setlocal iskeyword=@,48-57,_,-,!,#,$,%
-else
-  set iskeyword=@,48-57,_,-,!,#,$,%
-endif
+setlocal iskeyword=@,48-57,_,-,!,#,$,%
 
 " The Progress editor doesn't cope with tabs very well.
 set expandtab
@@ -282,44 +275,36 @@ syn keyword ProgressType	char[acter] int[eger] int64 dec[imal] log[ical] da[te]
 syn sync lines=800
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_progress_syntax_inits")
-	if version < 508
-		let did_progress_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	" The default methods for highlighting. Can be overridden later.
-	HiLink ProgressByte		Number
-	HiLink ProgressCase		Repeat
-	HiLink ProgressComment		Comment
-	HiLink ProgressConditional	Conditional
-	HiLink ProgressDebug		Debug
-	HiLink ProgressDo		Repeat
-	HiLink ProgressEndError		Error
-	HiLink ProgressFor		Repeat
-	HiLink ProgressFunction		Procedure
-	HiLink ProgressIdentifier	Identifier
-	HiLink ProgressInclude		Include
-	HiLink ProgressMatrixDelimiter	Identifier
-	HiLink ProgressNumber		Number
-	HiLink ProgressOperator		Operator
-	HiLink ProgressPreProc		PreProc
-	HiLink ProgressProcedure	Procedure
-	HiLink ProgressQuote		Delimiter
-	HiLink ProgressRepeat		Repeat
-	HiLink ProgressReserved		Statement
-	HiLink ProgressSpaceError	Error
-	HiLink ProgressString		String
-	HiLink ProgressTodo		Todo
-	HiLink ProgressType		Statement
-	HiLink ProgressShowTab		Error
+" The default methods for highlighting. Can be overridden later.
+HiLink ProgressByte		Number
+HiLink ProgressCase		Repeat
+HiLink ProgressComment		Comment
+HiLink ProgressConditional	Conditional
+HiLink ProgressDebug		Debug
+HiLink ProgressDo		Repeat
+HiLink ProgressEndError		Error
+HiLink ProgressFor		Repeat
+HiLink ProgressFunction		Procedure
+HiLink ProgressIdentifier	Identifier
+HiLink ProgressInclude		Include
+HiLink ProgressMatrixDelimiter	Identifier
+HiLink ProgressNumber		Number
+HiLink ProgressOperator		Operator
+HiLink ProgressPreProc		PreProc
+HiLink ProgressProcedure	Procedure
+HiLink ProgressQuote		Delimiter
+HiLink ProgressRepeat		Repeat
+HiLink ProgressReserved		Statement
+HiLink ProgressSpaceError	Error
+HiLink ProgressString		String
+HiLink ProgressTodo		Todo
+HiLink ProgressType		Statement
+HiLink ProgressShowTab		Error
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "progress"
 
diff --git a/runtime/syntax/prolog.vim b/runtime/syntax/prolog.vim
index f5f0e673ec..2131308b80 100644
--- a/runtime/syntax/prolog.vim
+++ b/runtime/syntax/prolog.vim
@@ -8,10 +8,8 @@
 " If the "prolog_highlighting_clean" variable exists, it is rather sparse.
 " Otherwise you get more highlighting.
 
-" Quit when a syntax file was already loaded
-if version < 600
-   syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -78,46 +76,38 @@ syn sync maxlines=50
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_prolog_syn_inits")
-  if version < 508
-    let did_prolog_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default highlighting.
-  HiLink prologComment          Comment
-  HiLink prologCComment         Comment
-  HiLink prologCharCode         Special
+" The default highlighting.
+HiLink prologComment          Comment
+HiLink prologCComment         Comment
+HiLink prologCharCode         Special
 
-  if exists ("prolog_highlighting_clean")
+if exists ("prolog_highlighting_clean")
 
-    HiLink prologKeyword        Statement
-    HiLink prologClauseHead     Statement
-    HiLink prologClause Normal
+HiLink prologKeyword        Statement
+HiLink prologClauseHead     Statement
+HiLink prologClause Normal
 
-  else
+else
 
-    HiLink prologKeyword        Keyword
-    HiLink prologClauseHead     Constant
-    HiLink prologClause Normal
-    HiLink prologQuestion       PreProc
-    HiLink prologSpecialCharacter Special
-    HiLink prologNumber         Number
-    HiLink prologAsIs           Normal
-    HiLink prologCommentError   Error
-    HiLink prologAtom           String
-    HiLink prologString         String
-    HiLink prologOperator       Operator
+HiLink prologKeyword        Keyword
+HiLink prologClauseHead     Constant
+HiLink prologClause Normal
+HiLink prologQuestion       PreProc
+HiLink prologSpecialCharacter Special
+HiLink prologNumber         Number
+HiLink prologAsIs           Normal
+HiLink prologCommentError   Error
+HiLink prologAtom           String
+HiLink prologString         String
+HiLink prologOperator       Operator
 
-  endif
-
-  delcommand HiLink
 endif
 
+delcommand HiLink
+
 let b:current_syntax = "prolog"
 
 " vim: ts=8
diff --git a/runtime/syntax/promela.vim b/runtime/syntax/promela.vim
index e812bc2749..add4514561 100644
--- a/runtime/syntax/promela.vim
+++ b/runtime/syntax/promela.vim
@@ -5,11 +5,8 @@
 " Last Change:		Thu Aug 7 21:22:48 CEST 2008
 " Version:			0.5
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/proto.vim b/runtime/syntax/proto.vim
index 4d6a77e84a..4615e0ca0e 100644
--- a/runtime/syntax/proto.vim
+++ b/runtime/syntax/proto.vim
@@ -22,9 +22,8 @@
 "
 " http://code.google.com/p/protobuf/
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/psf.vim b/runtime/syntax/psf.vim
index 2b376f94cc..e059ff9f4d 100644
--- a/runtime/syntax/psf.vim
+++ b/runtime/syntax/psf.vim
@@ -4,10 +4,8 @@
 " Maintainer:	Rex Barzee <rex_barzee@hp.com>
 " Last change:	25 Apr 2001
 
-if version < 600
-  " Remove any old syntax stuff hanging around
-  syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -73,27 +71,19 @@ syn match  psfComment "#.*$"
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_psf_syntax_inits")
-  if version < 508
-    let did_psf_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink psfObject       Statement
-  HiLink psfAttrib       Type
-  HiLink psfQuotString   String
-  HiLink psfObjTag       Identifier
-  HiLink psfAttAbbrev    PreProc
-  HiLink psfObjTags      Identifier
+HiLink psfObject       Statement
+HiLink psfAttrib       Type
+HiLink psfQuotString   String
+HiLink psfObjTag       Identifier
+HiLink psfAttAbbrev    PreProc
+HiLink psfObjTags      Identifier
 
-  HiLink psfComment      Comment
+HiLink psfComment      Comment
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 " Long descriptions and copyrights confuse the syntax highlighting, so
 " force vim to backup at least 100 lines before the top visible line
diff --git a/runtime/syntax/ptcap.vim b/runtime/syntax/ptcap.vim
index 45590cf61b..6d3c460d39 100644
--- a/runtime/syntax/ptcap.vim
+++ b/runtime/syntax/ptcap.vim
@@ -4,11 +4,8 @@
 " URL:		http://folk.uio.no/hakonrk/vim/syntax/ptcap.vim
 " Last Change:	2001 May 15
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
@@ -73,34 +70,27 @@ syn region ptcapField	    start=":" skip="[^\\]\(\\\\\)*\\$" end="[^\\]\(\\\\\)*
 syn region ptcapString	    matchgroup=ptcapOperator start="=" skip="[^\\]\(\\\\\)*\\:" matchgroup=ptcapDelimiter end=":"me=e-1 matchgroup=NONE end="[^\\]\(\\\\\)*[^\\]$" end="^$" contains=ptcapEscapedChar,ptcapLineCont keepend contained
 syn region ptcapComment	    start="^\s*#" end="$" contains=ptcapLeadBlank
 
-if version >= 508 || !exists("did_ptcap_syntax_inits")
-    if version < 508
-	let did_ptcap_syntax_inits = 1
-	command -nargs=+ HiLink hi link <args>
-    else
-	command -nargs=+ HiLink hi def link <args>
-    endif
+command -nargs=+ HiLink hi def link <args>
 
-    HiLink ptcapComment		Comment
-    HiLink ptcapDelimiter	Delimiter
-    " The highlighting of "ptcapEntry" should always be overridden by
-    " its contents, so I use Todo highlighting to indicate that there
-    " is work to be done with the syntax file if you can see it :-)
-    HiLink ptcapEntry		Todo
-    HiLink ptcapError		Error
-    HiLink ptcapEscapedChar	SpecialChar
-    HiLink ptcapField		Type
-    HiLink ptcapLeadBlank	NONE
-    HiLink ptcapLineCont	Special
-    HiLink ptcapNames		Label
-    HiLink ptcapNumber		NONE
-    HiLink ptcapNumberError	Error
-    HiLink ptcapOperator	Operator
-    HiLink ptcapSpecialCap	Type
-    HiLink ptcapString		NONE
+HiLink ptcapComment		Comment
+HiLink ptcapDelimiter	Delimiter
+" The highlighting of "ptcapEntry" should always be overridden by
+" its contents, so I use Todo highlighting to indicate that there
+" is work to be done with the syntax file if you can see it :-)
+HiLink ptcapEntry		Todo
+HiLink ptcapError		Error
+HiLink ptcapEscapedChar	SpecialChar
+HiLink ptcapField		Type
+HiLink ptcapLeadBlank	NONE
+HiLink ptcapLineCont	Special
+HiLink ptcapNames		Label
+HiLink ptcapNumber		NONE
+HiLink ptcapNumberError	Error
+HiLink ptcapOperator	Operator
+HiLink ptcapSpecialCap	Type
+HiLink ptcapString		NONE
 
-    delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "ptcap"
 
diff --git a/runtime/syntax/purifylog.vim b/runtime/syntax/purifylog.vim
index 8bcfb4b006..b56ca6ae1d 100644
--- a/runtime/syntax/purifylog.vim
+++ b/runtime/syntax/purifylog.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Gautam H. Mudunuri <gmudunur@informatica.com>
 " Last Change:	2003 May 11
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -57,62 +54,54 @@ syn match purifyLogZPR "^ZPR:.*$"
 syn match purifyLogZPW "^ZPW:.*$"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_purifyLog_syntax_inits")
-  if version < 508
-    let did_purifyLog_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink purifyLogFIU purifyLogInformational
-	HiLink purifyLogMAF purifyLogInformational
-	HiLink purifyLogMIU purifyLogInformational
-	HiLink purifyLogSIG purifyLogInformational
-	HiLink purifyLogWPF purifyLogInformational
-	HiLink purifyLogWPM purifyLogInformational
-	HiLink purifyLogWPN purifyLogInformational
-	HiLink purifyLogWPR purifyLogInformational
-	HiLink purifyLogWPW purifyLogInformational
-	HiLink purifyLogWPX purifyLogInformational
+HiLink purifyLogFIU purifyLogInformational
+HiLink purifyLogMAF purifyLogInformational
+HiLink purifyLogMIU purifyLogInformational
+HiLink purifyLogSIG purifyLogInformational
+HiLink purifyLogWPF purifyLogInformational
+HiLink purifyLogWPM purifyLogInformational
+HiLink purifyLogWPN purifyLogInformational
+HiLink purifyLogWPR purifyLogInformational
+HiLink purifyLogWPW purifyLogInformational
+HiLink purifyLogWPX purifyLogInformational
 
-	HiLink purifyLogABR purifyLogWarning
-	HiLink purifyLogBSR purifyLogWarning
-	HiLink purifyLogBSW purifyLogWarning
-	HiLink purifyLogFMR purifyLogWarning
-	HiLink purifyLogMLK purifyLogWarning
-	HiLink purifyLogMSE purifyLogWarning
-	HiLink purifyLogPAR purifyLogWarning
-	HiLink purifyLogPLK purifyLogWarning
-	HiLink purifyLogSBR purifyLogWarning
-	HiLink purifyLogSOF purifyLogWarning
-	HiLink purifyLogUMC purifyLogWarning
-	HiLink purifyLogUMR purifyLogWarning
+HiLink purifyLogABR purifyLogWarning
+HiLink purifyLogBSR purifyLogWarning
+HiLink purifyLogBSW purifyLogWarning
+HiLink purifyLogFMR purifyLogWarning
+HiLink purifyLogMLK purifyLogWarning
+HiLink purifyLogMSE purifyLogWarning
+HiLink purifyLogPAR purifyLogWarning
+HiLink purifyLogPLK purifyLogWarning
+HiLink purifyLogSBR purifyLogWarning
+HiLink purifyLogSOF purifyLogWarning
+HiLink purifyLogUMC purifyLogWarning
+HiLink purifyLogUMR purifyLogWarning
 
-	HiLink purifyLogABW purifyLogCorrupting
-	HiLink purifyLogBRK purifyLogCorrupting
-	HiLink purifyLogFMW purifyLogCorrupting
-	HiLink purifyLogFNH purifyLogCorrupting
-	HiLink purifyLogFUM purifyLogCorrupting
-	HiLink purifyLogMRE purifyLogCorrupting
-	HiLink purifyLogSBW purifyLogCorrupting
+HiLink purifyLogABW purifyLogCorrupting
+HiLink purifyLogBRK purifyLogCorrupting
+HiLink purifyLogFMW purifyLogCorrupting
+HiLink purifyLogFNH purifyLogCorrupting
+HiLink purifyLogFUM purifyLogCorrupting
+HiLink purifyLogMRE purifyLogCorrupting
+HiLink purifyLogSBW purifyLogCorrupting
 
-	HiLink purifyLogCOR purifyLogFatal
-	HiLink purifyLogNPR purifyLogFatal
-	HiLink purifyLogNPW purifyLogFatal
-	HiLink purifyLogZPR purifyLogFatal
-	HiLink purifyLogZPW purifyLogFatal
+HiLink purifyLogCOR purifyLogFatal
+HiLink purifyLogNPR purifyLogFatal
+HiLink purifyLogNPW purifyLogFatal
+HiLink purifyLogZPR purifyLogFatal
+HiLink purifyLogZPW purifyLogFatal
 
-	HiLink purifyLogHeader		Comment
-	HiLink purifyLogInformational	PreProc
-	HiLink purifyLogWarning		Type
-	HiLink purifyLogCorrupting	Error
-	HiLink purifyLogFatal		Error
+HiLink purifyLogHeader		Comment
+HiLink purifyLogInformational	PreProc
+HiLink purifyLogWarning		Type
+HiLink purifyLogCorrupting	Error
+HiLink purifyLogFatal		Error
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "purifylog"
 
diff --git a/runtime/syntax/pyrex.vim b/runtime/syntax/pyrex.vim
index 7dc9b955b0..cd743df889 100644
--- a/runtime/syntax/pyrex.vim
+++ b/runtime/syntax/pyrex.vim
@@ -4,21 +4,14 @@
 " URL:		http://marcobari.altervista.org/pyrex_vim.html
 " Last Change:	2009 Nov 09
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " Read the Python syntax to start with
-if version < 600
-  so <sfile>:p:h/python.vim
-else
-  runtime! syntax/python.vim
-  unlet b:current_syntax
-endif
+runtime! syntax/python.vim
+unlet b:current_syntax
 
 " Pyrex extentions
 syn keyword pyrexStatement      cdef typedef ctypedef sizeof
@@ -44,24 +37,17 @@ syn match   pythonInclude     "from"
 syn match   pyrexForFrom        "\(for[^:]*\)\@<=from"
 
 " Default highlighting
-if version >= 508 || !exists("did_pyrex_syntax_inits")
-  if version < 508
-    let did_pyrex_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink pyrexStatement		Statement
-  HiLink pyrexType		Type
-  HiLink pyrexStructure		Structure
-  HiLink pyrexInclude		PreCondit
-  HiLink pyrexAccess		pyrexStatement
-  if exists("python_highlight_builtins") || exists("pyrex_highlight_builtins")
-      HiLink pyrexBuiltin	Function
-  endif
-  HiLink pyrexForFrom		Statement
-
-  delcommand HiLink
+command -nargs=+ HiLink hi def link <args>
+HiLink pyrexStatement		Statement
+HiLink pyrexType		Type
+HiLink pyrexStructure		Structure
+HiLink pyrexInclude		PreCondit
+HiLink pyrexAccess		pyrexStatement
+if exists("python_highlight_builtins") || exists("pyrex_highlight_builtins")
+HiLink pyrexBuiltin	Function
 endif
+HiLink pyrexForFrom		Statement
+
+delcommand HiLink
 
 let b:current_syntax = "pyrex"
diff --git a/runtime/syntax/python.vim b/runtime/syntax/python.vim
index f0f03a8c8d..e44721b7fa 100644
--- a/runtime/syntax/python.vim
+++ b/runtime/syntax/python.vim
@@ -36,11 +36,8 @@
 "   let python_highlight_all = 1
 "
 
-" For version 5.x: Clear all syntax items.
-" For version 6.x: Quit when a syntax file was already loaded.
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded.
+if exists("b:current_syntax")
   finish
 endif
 
@@ -292,51 +289,44 @@ endif
 " Sync at the beginning of class, function, or method definition.
 syn sync match pythonSync grouphere NONE "^\s*\%(def\|class\)\s\+\h\w*\s*("
 
-if version >= 508 || !exists("did_python_syn_inits")
-  if version <= 508
-    let did_python_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  " The default highlight links.  Can be overridden later.
-  HiLink pythonStatement	Statement
-  HiLink pythonConditional	Conditional
-  HiLink pythonRepeat		Repeat
-  HiLink pythonOperator		Operator
-  HiLink pythonException	Exception
-  HiLink pythonInclude		Include
-  HiLink pythonAsync		Statement
-  HiLink pythonDecorator	Define
-  HiLink pythonDecoratorName	Function
-  HiLink pythonFunction		Function
-  HiLink pythonComment		Comment
-  HiLink pythonTodo		Todo
-  HiLink pythonString		String
-  HiLink pythonRawString	String
-  HiLink pythonQuotes		String
-  HiLink pythonTripleQuotes	pythonQuotes
-  HiLink pythonEscape		Special
-  if !exists("python_no_number_highlight")
-    HiLink pythonNumber		Number
-  endif
-  if !exists("python_no_builtin_highlight")
-    HiLink pythonBuiltin	Function
-  endif
-  if !exists("python_no_exception_highlight")
-    HiLink pythonExceptions	Structure
-  endif
-  if exists("python_space_error_highlight")
-    HiLink pythonSpaceError	Error
-  endif
-  if !exists("python_no_doctest_highlight")
-    HiLink pythonDoctest	Special
-    HiLink pythonDoctestValue	Define
-  endif
-
-  delcommand HiLink
+" The default highlight links.  Can be overridden later.
+HiLink pythonStatement	Statement
+HiLink pythonConditional	Conditional
+HiLink pythonRepeat		Repeat
+HiLink pythonOperator		Operator
+HiLink pythonException	Exception
+HiLink pythonInclude		Include
+HiLink pythonAsync		Statement
+HiLink pythonDecorator	Define
+HiLink pythonDecoratorName	Function
+HiLink pythonFunction		Function
+HiLink pythonComment		Comment
+HiLink pythonTodo		Todo
+HiLink pythonString		String
+HiLink pythonRawString	String
+HiLink pythonQuotes		String
+HiLink pythonTripleQuotes	pythonQuotes
+HiLink pythonEscape		Special
+if !exists("python_no_number_highlight")
+  HiLink pythonNumber		Number
 endif
+if !exists("python_no_builtin_highlight")
+  HiLink pythonBuiltin	Function
+endif
+if !exists("python_no_exception_highlight")
+  HiLink pythonExceptions	Structure
+endif
+if exists("python_space_error_highlight")
+  HiLink pythonSpaceError	Error
+endif
+if !exists("python_no_doctest_highlight")
+  HiLink pythonDoctest	Special
+  HiLink pythonDoctestValue	Define
+endif
+
+delcommand HiLink
 
 let b:current_syntax = "python"
 
diff --git a/runtime/syntax/radiance.vim b/runtime/syntax/radiance.vim
index 461b708f0e..134792ac11 100644
--- a/runtime/syntax/radiance.vim
+++ b/runtime/syntax/radiance.vim
@@ -18,20 +18,13 @@
 " comments, external command names and the null-modifier "void".
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " all printing characters except '#' and '!' are valid in names.
-if version >= 600
-  setlocal iskeyword=\",$-~
-else
-  set iskeyword=\",$-~
-endif
+setlocal iskeyword=\",$-~
 
 " The null-modifier
 syn keyword radianceKeyword void
@@ -130,29 +123,21 @@ syn keyword radianceTodo contained TODO XXX
 syn match radianceComment "#.*$" contains=radianceTodo
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_radiance_syn_inits")
-  if version < 508
-    let did_radiance_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink radianceKeyword	Keyword
-  HiLink radianceExtraType	Type
-  HiLink radianceSurfType	Type
-  HiLink radianceLightType	Type
-  HiLink radianceMatType	Type
-  HiLink radiancePatType	Type
-  HiLink radianceTexType	Type
-  HiLink radianceMixType	Type
-  HiLink radianceComment	Comment
-  HiLink radianceCommand	Function
-  HiLink radianceID		String
-  HiLink radianceTodo		Todo
-  delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+HiLink radianceKeyword	Keyword
+HiLink radianceExtraType	Type
+HiLink radianceSurfType	Type
+HiLink radianceLightType	Type
+HiLink radianceMatType	Type
+HiLink radiancePatType	Type
+HiLink radianceTexType	Type
+HiLink radianceMixType	Type
+HiLink radianceComment	Comment
+HiLink radianceCommand	Function
+HiLink radianceID		String
+HiLink radianceTodo		Todo
+delcommand HiLink
 
 let b:current_syntax = "radiance"
 
diff --git a/runtime/syntax/ratpoison.vim b/runtime/syntax/ratpoison.vim
index 9fc59bec0d..30cf369803 100644
--- a/runtime/syntax/ratpoison.vim
+++ b/runtime/syntax/ratpoison.vim
@@ -5,11 +5,8 @@
 " Last Change:	2011 Apr 11
 " Previous Maintainer:	Doug Kearns <djkea2@gus.gscit.monash.edu.au>
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -247,33 +244,25 @@ syn match   ratpoisonVoidCommand	"^\s*\zsvsplit\ze\s*$"
 syn match   ratpoisonVoidCommand	"^\s*\zswindows\ze\s*$"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_ratpoison_syn_inits")
-  if version < 508
-    let did_ratpoison_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink ratpoisonBooleanArg	Boolean
-  HiLink ratpoisonCommandArg	Keyword
-  HiLink ratpoisonComment	Comment
-  HiLink ratpoisonDefCommand	Identifier
-  HiLink ratpoisonGravityArg	Constant
-  HiLink ratpoisonKeySeqArg	Special
-  HiLink ratpoisonNumberArg	Number
-  HiLink ratpoisonSetArg	Keyword
-  HiLink ratpoisonStringCommand	Identifier
-  HiLink ratpoisonTodo		Todo
-  HiLink ratpoisonVoidCommand	Identifier
-  HiLink ratpoisonWinFmtArg	Special
-  HiLink ratpoisonWinNameArg	Constant
-  HiLink ratpoisonWinListArg	Constant
+HiLink ratpoisonBooleanArg	Boolean
+HiLink ratpoisonCommandArg	Keyword
+HiLink ratpoisonComment	Comment
+HiLink ratpoisonDefCommand	Identifier
+HiLink ratpoisonGravityArg	Constant
+HiLink ratpoisonKeySeqArg	Special
+HiLink ratpoisonNumberArg	Number
+HiLink ratpoisonSetArg	Keyword
+HiLink ratpoisonStringCommand	Identifier
+HiLink ratpoisonTodo		Todo
+HiLink ratpoisonVoidCommand	Identifier
+HiLink ratpoisonWinFmtArg	Special
+HiLink ratpoisonWinNameArg	Constant
+HiLink ratpoisonWinListArg	Constant
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "ratpoison"
 
diff --git a/runtime/syntax/rc.vim b/runtime/syntax/rc.vim
index a2d5824d3e..13900b339a 100644
--- a/runtime/syntax/rc.vim
+++ b/runtime/syntax/rc.vim
@@ -8,11 +8,8 @@
 
 " This file is based on the c.vim
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -148,55 +145,47 @@ syn region rcPreProc		start="^\s*#\s*\(pragma\>\|line\>\|warning\>\|warn\>\|erro
 syn sync ccomment rcComment minlines=10
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_rc_syntax_inits")
-  if version < 508
-    let did_rc_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink rcCharacter	Character
-  HiLink rcSpecialCharacter rcSpecial
-  HiLink rcNumber	Number
-  HiLink rcFloat	Float
-  HiLink rcOctalError	rcError
-  HiLink rcParenError	rcError
-  HiLink rcInParen	rcError
-  HiLink rcCommentError	rcError
-  HiLink rcInclude	Include
-  HiLink rcPreProc	PreProc
-  HiLink rcDefine	Macro
-  HiLink rcIncluded	rcString
-  HiLink rcError	Error
-  HiLink rcPreCondit	PreCondit
-  HiLink rcCommentString rcString
-  HiLink rcComment2String rcString
-  HiLink rcCommentSkip	rcComment
-  HiLink rcString	String
-  HiLink rcComment	Comment
-  HiLink rcSpecial	SpecialChar
-  HiLink rcTodo	Todo
+HiLink rcCharacter	Character
+HiLink rcSpecialCharacter rcSpecial
+HiLink rcNumber	Number
+HiLink rcFloat	Float
+HiLink rcOctalError	rcError
+HiLink rcParenError	rcError
+HiLink rcInParen	rcError
+HiLink rcCommentError	rcError
+HiLink rcInclude	Include
+HiLink rcPreProc	PreProc
+HiLink rcDefine	Macro
+HiLink rcIncluded	rcString
+HiLink rcError	Error
+HiLink rcPreCondit	PreCondit
+HiLink rcCommentString rcString
+HiLink rcComment2String rcString
+HiLink rcCommentSkip	rcComment
+HiLink rcString	String
+HiLink rcComment	Comment
+HiLink rcSpecial	SpecialChar
+HiLink rcTodo	Todo
 
-  HiLink rcAttribute	rcCommonAttribute
-  HiLink rcStdId	rcStatement
-  HiLink rcStatement	Statement
+HiLink rcAttribute	rcCommonAttribute
+HiLink rcStdId	rcStatement
+HiLink rcStatement	Statement
 
-  " Default color overrides
-  hi def rcLanguage	term=reverse ctermbg=Red ctermfg=Yellow guibg=Red guifg=Yellow
-  hi def rcMainObject	term=underline ctermfg=Blue guifg=Blue
-  hi def rcSubObject	ctermfg=Green guifg=Green
-  hi def rcCaptionParam	term=underline ctermfg=DarkGreen guifg=Green
-  hi def rcParam	ctermfg=DarkGreen guifg=DarkGreen
-  hi def rcStatement	ctermfg=DarkGreen guifg=DarkGreen
-  hi def rcCommonAttribute	ctermfg=Brown guifg=Brown
+" Default color overrides
+hi def rcLanguage	term=reverse ctermbg=Red ctermfg=Yellow guibg=Red guifg=Yellow
+hi def rcMainObject	term=underline ctermfg=Blue guifg=Blue
+hi def rcSubObject	ctermfg=Green guifg=Green
+hi def rcCaptionParam	term=underline ctermfg=DarkGreen guifg=Green
+hi def rcParam	ctermfg=DarkGreen guifg=DarkGreen
+hi def rcStatement	ctermfg=DarkGreen guifg=DarkGreen
+hi def rcCommonAttribute	ctermfg=Brown guifg=Brown
 
-  "HiLink rcIdentifier	Identifier
+"HiLink rcIdentifier	Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "rc"
 
diff --git a/runtime/syntax/rcs.vim b/runtime/syntax/rcs.vim
index e45d5fdbb6..5fa66c49b0 100644
--- a/runtime/syntax/rcs.vim
+++ b/runtime/syntax/rcs.vim
@@ -9,11 +9,8 @@
 " Options:
 "   rcs_folding = 1   For folding strings
 
-" For version 5.x: Clear all syntax items.
-" For version 6.x: Quit when a syntax file was already loaded.
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded.
+if exists("b:current_syntax")
   finish
 endif
 
@@ -52,25 +49,17 @@ else
 endif
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already.
-" For version 5.8 and later: only when an item doesn't have highlighting yet.
-if version >= 508 || !exists("did_rcs_syn_inits")
-  if version <= 508
-    let did_rcs_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet.
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink rcsKeyword     Keyword
-  HiLink rcsNumber      Identifier
-  HiLink rcsString      String
-  HiLink rcsTextStr     String
-  HiLink rcsSpecial     Special
-  HiLink rcsDiffLines   Special
-  HiLink rcsEOFError    Error
+HiLink rcsKeyword     Keyword
+HiLink rcsNumber      Identifier
+HiLink rcsString      String
+HiLink rcsTextStr     String
+HiLink rcsSpecial     Special
+HiLink rcsDiffLines   Special
+HiLink rcsEOFError    Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "rcs"
diff --git a/runtime/syntax/rcslog.vim b/runtime/syntax/rcslog.vim
index acacfa124b..8451852993 100644
--- a/runtime/syntax/rcslog.vim
+++ b/runtime/syntax/rcslog.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Joe Karthauser <joe@freebsd.org>
 " Last Change:	2001 May 09
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -16,22 +13,14 @@ syn match rcslogFile		"^RCS file:.*"
 syn match rcslogDate		"^date: .*$"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_rcslog_syntax_inits")
-  if version < 508
-    let did_rcslog_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink rcslogFile		Type
-  HiLink rcslogRevision	Constant
-  HiLink rcslogDate		Identifier
+HiLink rcslogFile		Type
+HiLink rcslogRevision	Constant
+HiLink rcslogDate		Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "rcslog"
 
diff --git a/runtime/syntax/rebol.vim b/runtime/syntax/rebol.vim
index e6395758f3..9c367b01b7 100644
--- a/runtime/syntax/rebol.vim
+++ b/runtime/syntax/rebol.vim
@@ -6,11 +6,8 @@
 " URL:		http://www.eandem.co.uk/mrw/vim
 "
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -18,11 +15,7 @@ endif
 syn case ignore
 
 " As per current users documentation
-if version < 600
-  set isk=@,48-57,?,!,.,',+,-,*,&,\|,=,_,~
-else
-  setlocal isk=@,48-57,?,!,.,',+,-,*,&,\|,=,_,~
-endif
+setlocal isk=@,48-57,?,!,.,',+,-,*,&,\|,=,_,~
 
 " Yer TODO highlighter
 syn keyword	rebolTodo	contained TODO
@@ -145,65 +138,57 @@ syn keyword     rebolConstant   none
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_rebol_syntax_inits")
-  if version < 508
-    let did_rebol_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink rebolTodo     Todo
+HiLink rebolTodo     Todo
 
-  HiLink rebolStatement Statement
-  HiLink rebolLabel	Label
-  HiLink rebolConditional Conditional
-  HiLink rebolRepeat	Repeat
+HiLink rebolStatement Statement
+HiLink rebolLabel	Label
+HiLink rebolConditional Conditional
+HiLink rebolRepeat	Repeat
 
-  HiLink rebolOperator	Operator
-  HiLink rebolLogicOperator rebolOperator
-  HiLink rebolLogicFunction rebolLogicOperator
-  HiLink rebolMathOperator rebolOperator
-  HiLink rebolMathFunction rebolMathOperator
-  HiLink rebolBinaryOperator rebolOperator
-  HiLink rebolBinaryFunction rebolBinaryOperator
+HiLink rebolOperator	Operator
+HiLink rebolLogicOperator rebolOperator
+HiLink rebolLogicFunction rebolLogicOperator
+HiLink rebolMathOperator rebolOperator
+HiLink rebolMathFunction rebolMathOperator
+HiLink rebolBinaryOperator rebolOperator
+HiLink rebolBinaryFunction rebolBinaryOperator
 
-  HiLink rebolType     Type
-  HiLink rebolTypeFunction rebolOperator
+HiLink rebolType     Type
+HiLink rebolTypeFunction rebolOperator
 
-  HiLink rebolWord     Identifier
-  HiLink rebolWordPath rebolWord
-  HiLink rebolFunction	Function
+HiLink rebolWord     Identifier
+HiLink rebolWordPath rebolWord
+HiLink rebolFunction	Function
 
-  HiLink rebolCharacter Character
-  HiLink rebolSpecialCharacter SpecialChar
-  HiLink rebolString	String
+HiLink rebolCharacter Character
+HiLink rebolSpecialCharacter SpecialChar
+HiLink rebolString	String
 
-  HiLink rebolNumber   Number
-  HiLink rebolInteger  rebolNumber
-  HiLink rebolDecimal  rebolNumber
-  HiLink rebolTime     rebolNumber
-  HiLink rebolDate     rebolNumber
-  HiLink rebolMoney    rebolNumber
-  HiLink rebolBinary   rebolNumber
-  HiLink rebolEmail    rebolString
-  HiLink rebolFile     rebolString
-  HiLink rebolURL      rebolString
-  HiLink rebolIssue    rebolNumber
-  HiLink rebolTuple    rebolNumber
-  HiLink rebolFloat    Float
-  HiLink rebolBoolean  Boolean
+HiLink rebolNumber   Number
+HiLink rebolInteger  rebolNumber
+HiLink rebolDecimal  rebolNumber
+HiLink rebolTime     rebolNumber
+HiLink rebolDate     rebolNumber
+HiLink rebolMoney    rebolNumber
+HiLink rebolBinary   rebolNumber
+HiLink rebolEmail    rebolString
+HiLink rebolFile     rebolString
+HiLink rebolURL      rebolString
+HiLink rebolIssue    rebolNumber
+HiLink rebolTuple    rebolNumber
+HiLink rebolFloat    Float
+HiLink rebolBoolean  Boolean
 
-  HiLink rebolConstant Constant
+HiLink rebolConstant Constant
 
-  HiLink rebolComment	Comment
+HiLink rebolComment	Comment
 
-  HiLink rebolError	Error
+HiLink rebolError	Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 if exists("my_rebol_file")
   if file_readable(expand(my_rebol_file))
diff --git a/runtime/syntax/redif.vim b/runtime/syntax/redif.vim
index 1a44a9f479..725067fd32 100644
--- a/runtime/syntax/redif.vim
+++ b/runtime/syntax/redif.vim
@@ -7,10 +7,8 @@
 " File Extension:    rdf
 " Note:              The ReDIF format is used by RePEc.
 
-" To be compatible with Vim 5.8 use:
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/registry.vim b/runtime/syntax/registry.vim
index 4524247a08..652b609f09 100644
--- a/runtime/syntax/registry.vim
+++ b/runtime/syntax/registry.vim
@@ -6,11 +6,8 @@
 "		Included patch from Alexander A. Ulitin
 
 " clear any unwanted syntax defs
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -85,29 +82,22 @@ syn match registryHex		"^\s*\([0-9a-fA-F]\{2},\)\{0,999}\([0-9a-fA-F]\{2}\|\\\)$
 " Dword (32 bits)
 syn match registryDword		"dword:[0-9a-fA-F]\{8}$" contains=registrySpecial
 
-if version >= 508 || !exists("did_registry_syntax_inits")
-  if version < 508
-    let did_registry_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-   HiLink registryComment	Comment
-   HiLink registryHead		Constant
-   HiLink registryHKEY		Constant
-   HiLink registryPath		Special
-   HiLink registryRemove	PreProc
-   HiLink registryGUID		Identifier
-   HiLink registrySpecial	Special
-   HiLink registrySubKey	Type
-   HiLink registryString	String
-   HiLink registryHex		Number
-   HiLink registryDword		Number
+HiLink registryComment	Comment
+HiLink registryHead		Constant
+HiLink registryHKEY		Constant
+HiLink registryPath		Special
+HiLink registryRemove	PreProc
+HiLink registryGUID		Identifier
+HiLink registrySpecial	Special
+HiLink registrySubKey	Type
+HiLink registryString	String
+HiLink registryHex		Number
+HiLink registryDword		Number
 
-   delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "registry"
diff --git a/runtime/syntax/remind.vim b/runtime/syntax/remind.vim
index 98064e043a..8e4e554343 100644
--- a/runtime/syntax/remind.vim
+++ b/runtime/syntax/remind.vim
@@ -13,9 +13,8 @@
 " version 0.7: updated email and link
 " version 0.6: added THROUGH keyword (courtesy of Ben Orchard)
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -48,35 +47,28 @@ syn match remindDates		"'[0-9]\{4}[/-][0-9]\{1,2}[/-][0-9]\{1,2}\(@[0-9]\{1,2}[:
 syn match remindWarning		display excludenl "\S\s\+$"ms=s+1
 
 
-if version >= 508 || !exists("did_remind_syn_inits")
-  if version < 508
-    let did_remind_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink remindCommands		Function
-  HiLink remindExpiry		Repeat
-  HiLink remindTag		Label
-  HiLink remindTimed		Statement
-  HiLink remindMove		Statement
-  HiLink remindSpecial		Include
-  HiLink remindRun		Function
-  HiLink remindConditional	Conditional
-  HiLink remindComment		Comment
-  HiLink remindTimes		String
-  HiLink remindString		String
-  HiLink remindDebug		Debug
-  HiLink remindVar		Identifier
-  HiLink remindSubst		Constant
-  HiLink remindAdvanceNumber	Number
-  HiLink remindDateSeparators	Comment
-  HiLink remindDates		String
-  HiLink remindWarning		Error
+HiLink remindCommands		Function
+HiLink remindExpiry		Repeat
+HiLink remindTag		Label
+HiLink remindTimed		Statement
+HiLink remindMove		Statement
+HiLink remindSpecial		Include
+HiLink remindRun		Function
+HiLink remindConditional	Conditional
+HiLink remindComment		Comment
+HiLink remindTimes		String
+HiLink remindString		String
+HiLink remindDebug		Debug
+HiLink remindVar		Identifier
+HiLink remindSubst		Constant
+HiLink remindAdvanceNumber	Number
+HiLink remindDateSeparators	Comment
+HiLink remindDates		String
+HiLink remindWarning		Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "remind"
 
diff --git a/runtime/syntax/resolv.vim b/runtime/syntax/resolv.vim
index 06d6885c1c..1744e66f82 100644
--- a/runtime/syntax/resolv.vim
+++ b/runtime/syntax/resolv.vim
@@ -9,9 +9,8 @@
 "   David Necas (Yeti) <yeti@physics.muni.cz>
 "   Stefano Zacchiroli <zack@debian.org>
 
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
@@ -50,38 +49,31 @@ syn match resolvOption /\<\%(ndots\|timeout\|attempts\):\d\+\>/ contained contai
 " Additional errors
 syn match resolvError /^search .\{257,}/
 
-if version >= 508 || !exists("did_config_syntax_inits")
-	if version < 508
-		let did_config_syntax_inits = 1
-		command! -nargs=+ HiLink hi link <args>
-	else
-		command! -nargs=+ HiLink hi def link <args>
-	endif
+command! -nargs=+ HiLink hi def link <args>
 
-	HiLink resolvIP Number
-	HiLink resolvIPNetmask Number
-	HiLink resolvHostname String
-	HiLink resolvOption String
+HiLink resolvIP Number
+HiLink resolvIPNetmask Number
+HiLink resolvHostname String
+HiLink resolvOption String
 
-	HiLink resolvIPNameserver Number
-	HiLink resolvHostnameSearch String
-	HiLink resolvIPNetmaskSortList Number
+HiLink resolvIPNameserver Number
+HiLink resolvHostnameSearch String
+HiLink resolvIPNetmaskSortList Number
 
-	HiLink resolvNameServer Identifier
-	HiLink resolvLwserver Identifier
-	HiLink resolvDomain Identifier
-	HiLink resolvSearch Identifier
-	HiLink resolvSortList Identifier
-	HiLink resolvOptions Identifier
+HiLink resolvNameServer Identifier
+HiLink resolvLwserver Identifier
+HiLink resolvDomain Identifier
+HiLink resolvSearch Identifier
+HiLink resolvSortList Identifier
+HiLink resolvOptions Identifier
 
-	HiLink resolvComment Comment
-	HiLink resolvOperator Operator
-	HiLink resolvError Error
-	HiLink resolvIPError Error
-	HiLink resolvIPSpecial Special
+HiLink resolvComment Comment
+HiLink resolvOperator Operator
+HiLink resolvError Error
+HiLink resolvIPError Error
+HiLink resolvIPSpecial Special
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "resolv"
 
diff --git a/runtime/syntax/reva.vim b/runtime/syntax/reva.vim
index 03dfc9d4c3..f605992190 100644
--- a/runtime/syntax/reva.vim
+++ b/runtime/syntax/reva.vim
@@ -7,13 +7,8 @@
 " Filetypes:	*.rf *.frt
 " NOTE: 	You should also have the ftplugin/reva.vim file to set 'isk'
 
-" For version 5.x: Clear all syntax items and don't load
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-  echo "Reva syntax file requires version 6.0 or later of vim!"
-  finish
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
    finish
 endif
 
diff --git a/runtime/syntax/rexx.vim b/runtime/syntax/rexx.vim
index ef698a5351..b22af93c18 100644
--- a/runtime/syntax/rexx.vim
+++ b/runtime/syntax/rexx.vim
@@ -6,11 +6,8 @@
 " Special Thanks to Dan Sharp <dwsharp@hotmail.com> and Rony G. Flatscher
 " <Rony.Flatscher@wu-wien.ac.at> for comments and additions
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -244,87 +241,79 @@ syn sync linecont "\(,\|-\ze-\@!\)\ze\s*\(--.*\|\/\*.*\)*$"
 exec "syn sync fromstart"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_rexx_syn_inits")
-  if version < 508
-    let did_rexx_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " make binary and hex strings stand out
-  hi rexxStringConstant term=bold,underline ctermfg=5 cterm=bold guifg=darkMagenta gui=bold
+" make binary and hex strings stand out
+hi rexxStringConstant term=bold,underline ctermfg=5 cterm=bold guifg=darkMagenta gui=bold
 
-  HiLink rexxLabel2		Function
-  HiLink doLoopSelectLabelRegion	rexxKeyword
-  HiLink endIterateLeaveLabelRegion	rexxKeyword
-  HiLink rexxLoopKeywords	rexxKeyword " Todo
+HiLink rexxLabel2		Function
+HiLink doLoopSelectLabelRegion	rexxKeyword
+HiLink endIterateLeaveLabelRegion	rexxKeyword
+HiLink rexxLoopKeywords	rexxKeyword " Todo
 
-  HiLink rexxNumber		Normal "DiffChange
+HiLink rexxNumber		Normal "DiffChange
 "  HiLink rexxIdentifier		DiffChange
 
-  HiLink rexxRegularCallSignal	Statement
-  HiLink rexxExceptionHandling	Statement
+HiLink rexxRegularCallSignal	Statement
+HiLink rexxExceptionHandling	Statement
 
-  HiLink rexxLabel		Function
-  HiLink rexxCharacter		Character
-  HiLink rexxParenError		rexxError
-  HiLink rexxInParen		rexxError
-  HiLink rexxCommentError	rexxError
-  HiLink rexxError		Error
-  HiLink rexxKeyword		Statement
-  HiLink rexxKeywordStatements	Statement
+HiLink rexxLabel		Function
+HiLink rexxCharacter		Character
+HiLink rexxParenError		rexxError
+HiLink rexxInParen		rexxError
+HiLink rexxCommentError	rexxError
+HiLink rexxError		Error
+HiLink rexxKeyword		Statement
+HiLink rexxKeywordStatements	Statement
 
-  HiLink rexxFunction		Function
-  HiLink rexxString		String
-  HiLink rexxComment		Comment
-  HiLink rexxTodo		Todo
-  HiLink rexxSpecialVariable	Special
-  HiLink rexxConditional	rexxKeyword
+HiLink rexxFunction		Function
+HiLink rexxString		String
+HiLink rexxComment		Comment
+HiLink rexxTodo		Todo
+HiLink rexxSpecialVariable	Special
+HiLink rexxConditional	rexxKeyword
 
-  HiLink rexxOperator		Operator
-  HiLink rexxMessageOperator	rexxOperator
-  HiLink rexxLineComment	Comment
+HiLink rexxOperator		Operator
+HiLink rexxMessageOperator	rexxOperator
+HiLink rexxLineComment	Comment
 
-  HiLink rexxLineContinue	WildMenu
+HiLink rexxLineContinue	WildMenu
 
-  HiLink rexxDirective		rexxKeyword
-  HiLink rexxClassDirective	Type
-  HiLink rexxMethodDirective	rexxFunction
-  HiLink rexxAttributeDirective	rexxFunction
-  HiLink rexxRequiresDirective	Include
-  HiLink rexxRoutineDirective	rexxFunction
+HiLink rexxDirective		rexxKeyword
+HiLink rexxClassDirective	Type
+HiLink rexxMethodDirective	rexxFunction
+HiLink rexxAttributeDirective	rexxFunction
+HiLink rexxRequiresDirective	Include
+HiLink rexxRoutineDirective	rexxFunction
 
 " rgf, 2012-09-09
-  HiLink rexxOptionsDirective	rexxFunction
-  HiLink rexxOptionsDirective2  rexxOptionsDirective
-  HiLink rexxOptionsDirective3  Normal " rexxOptionsDirective
+HiLink rexxOptionsDirective	rexxFunction
+HiLink rexxOptionsDirective2  rexxOptionsDirective
+HiLink rexxOptionsDirective3  Normal " rexxOptionsDirective
 
-  HiLink rexxConstantDirective	rexxFunction
+HiLink rexxConstantDirective	rexxFunction
 
-  HiLink rexxConst		Constant
-  HiLink rexxTypeSpecifier	Type
-  HiLink rexxBuiltinClass	rexxTypeSpecifier
+HiLink rexxConst		Constant
+HiLink rexxTypeSpecifier	Type
+HiLink rexxBuiltinClass	rexxTypeSpecifier
 
-  HiLink rexxEnvironmentSymbol  rexxConst
-  HiLink rexxMessage		rexxFunction
+HiLink rexxEnvironmentSymbol  rexxConst
+HiLink rexxMessage		rexxFunction
 
-  HiLink rexxParse              rexxKeyword
-  HiLink rexxParse2             rexxParse
+HiLink rexxParse              rexxKeyword
+HiLink rexxParse2             rexxParse
 
-  HiLink rexxGuard              rexxKeyword
-  HiLink rexxTrace              rexxKeyword
+HiLink rexxGuard              rexxKeyword
+HiLink rexxTrace              rexxKeyword
 
-  HiLink rexxRaise              rexxKeyword
-  HiLink rexxRaise2             rexxRaise
+HiLink rexxRaise              rexxKeyword
+HiLink rexxRaise2             rexxRaise
 
-  HiLink rexxForward            rexxKeyword
-  HiLink rexxForward2           rexxForward
+HiLink rexxForward            rexxKeyword
+HiLink rexxForward2           rexxForward
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "rexx"
 
diff --git a/runtime/syntax/rib.vim b/runtime/syntax/rib.vim
index 6b9f2b0bd4..3d2235ffcb 100644
--- a/runtime/syntax/rib.vim
+++ b/runtime/syntax/rib.vim
@@ -4,10 +4,8 @@
 " Last Change:	2003 May 11
 "
 
-" Remove any old syntax stuff hanging around
-if version < 600
-  syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -46,26 +44,19 @@ syn match	ribFloat	  display contained "[-]\=\.\d\+\(e[-+]\=\d\+\)\=\>"
 syn match	ribFloat	  display contained "[-]\=\d\+e[-+]\d\+\>"
 syn case match
 
-if version >= 508 || !exists("did_rib_syntax_inits")
-  if version < 508
-    let did_rib_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink ribStructure		Structure
-  HiLink ribCommand		Statement
+HiLink ribStructure		Structure
+HiLink ribCommand		Statement
 
-  HiLink ribStructureComment	SpecialComment
-  HiLink ribLineComment		Comment
+HiLink ribStructureComment	SpecialComment
+HiLink ribLineComment		Comment
 
-  HiLink ribString		String
-  HiLink ribNumber		Number
-  HiLink ribFloat		Float
+HiLink ribString		String
+HiLink ribNumber		Number
+HiLink ribFloat		Float
 
-  delcommand HiLink
-end
+delcommand HiLink
 
 
 let b:current_syntax = "rib"
diff --git a/runtime/syntax/robots.vim b/runtime/syntax/robots.vim
index 066628bb3c..23be8d2280 100644
--- a/runtime/syntax/robots.vim
+++ b/runtime/syntax/robots.vim
@@ -5,11 +5,8 @@
 " URL: http://www.mggen.com/vim/syntax/robots.zip
 " Last change:	2001 May 09
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
@@ -41,26 +38,19 @@ syn match  robotsUrl		"http[s]\=://\S*"
 syn match  robotsMail		"\S*@\S*"
 syn region robotsString		start=+L\="+ skip=+\\\\\|\\"+ end=+"+
 
-if version >= 508 || !exists("did_robos_syntax_inits")
-  if version < 508
-    let did_robots_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink robotsComment		Comment
-  HiLink robotsAgent		Type
-  HiLink robotsDisallow		Statement
-  HiLink robotsLine		Special
-  HiLink robotsStar		Operator
-  HiLink robotsDelimiter	Delimiter
-  HiLink robotsUrl		String
-  HiLink robotsMail		String
-  HiLink robotsString		String
+HiLink robotsComment		Comment
+HiLink robotsAgent		Type
+HiLink robotsDisallow		Statement
+HiLink robotsLine		Special
+HiLink robotsStar		Operator
+HiLink robotsDelimiter	Delimiter
+HiLink robotsUrl		String
+HiLink robotsMail		String
+HiLink robotsString		String
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "robots"
diff --git a/runtime/syntax/rpcgen.vim b/runtime/syntax/rpcgen.vim
index 85036dc049..ee4cc3fdab 100644
--- a/runtime/syntax/rpcgen.vim
+++ b/runtime/syntax/rpcgen.vim
@@ -10,11 +10,7 @@ if exists("b:current_syntax")
 endif
 
 " Read the C syntax to start with
-if version < 600
-  source <sfile>:p:h/c.vim
-else
-  runtime! syntax/c.vim
-endif
+runtime! syntax/c.vim
 
 syn keyword rpcProgram	program				skipnl skipwhite nextgroup=rpcProgName
 syn match   rpcProgName	contained	"\<\i\I*\>"	skipnl skipwhite nextgroup=rpcProgZone
@@ -28,31 +24,23 @@ syn match   rpcProgNmbrErr contained	"=\s*0x[^23]\x*"ms=s+1
 syn match   rpcPassThru			"^\s*%.*$"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_rpcgen_syntax_inits")
-  if version < 508
-    let did_rpcgen_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink rpcProgName	rpcName
-  HiLink rpcProgram	rpcStatement
-  HiLink rpcVersName	rpcName
-  HiLink rpcVersion	rpcStatement
+HiLink rpcProgName	rpcName
+HiLink rpcProgram	rpcStatement
+HiLink rpcVersName	rpcName
+HiLink rpcVersion	rpcStatement
 
-  HiLink rpcDecl	cType
-  HiLink rpcPassThru	cComment
+HiLink rpcDecl	cType
+HiLink rpcPassThru	cComment
 
-  HiLink rpcName	Special
-  HiLink rpcProcNmbr	Delimiter
-  HiLink rpcProgNmbrErr	Error
-  HiLink rpcStatement	Statement
+HiLink rpcName	Special
+HiLink rpcProcNmbr	Delimiter
+HiLink rpcProgNmbrErr	Error
+HiLink rpcStatement	Statement
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "rpcgen"
 
diff --git a/runtime/syntax/rpl.vim b/runtime/syntax/rpl.vim
index 6457803a06..d2bffbaaae 100644
--- a/runtime/syntax/rpl.vim
+++ b/runtime/syntax/rpl.vim
@@ -6,11 +6,8 @@
 " URL:		http://www.makalis.fr/~bertrand/rpl2/download/vim/indent/rpl.vim
 " Credits:	Nothing
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -417,77 +414,69 @@ syntax region rplString start=+\(^\|\s\+\)"+ end=+"\ze\($\|\s\+\)+ contains=rplS
 syntax match rplTab "\t"  transparent
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_rpl_syntax_inits")
-  if version < 508
-    let did_rpl_syntax_inits = 1
-    command -nargs=+ HiLink highlight link <args>
-  else
-    command -nargs=+ HiLink highlight default link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink highlight default link <args>
 
-  " The default highlighting.
+" The default highlighting.
 
-  HiLink rplControl		Statement
-  HiLink rplStatement		Statement
-  HiLink rplAlgConditional	Conditional
-  HiLink rplConditional		Repeat
-  HiLink rplConditionalError	Error
-  HiLink rplRepeat		Repeat
-  HiLink rplCycle		Repeat
-  HiLink rplUntil		Repeat
-  HiLink rplIntrinsic		Special
-  HiLink rplStorage		StorageClass
-  HiLink rplStorageExpr		StorageClass
-  HiLink rplStorageError	Error
-  HiLink rplReadWrite		rplIntrinsic
+HiLink rplControl		Statement
+HiLink rplStatement		Statement
+HiLink rplAlgConditional	Conditional
+HiLink rplConditional		Repeat
+HiLink rplConditionalError	Error
+HiLink rplRepeat		Repeat
+HiLink rplCycle		Repeat
+HiLink rplUntil		Repeat
+HiLink rplIntrinsic		Special
+HiLink rplStorage		StorageClass
+HiLink rplStorageExpr		StorageClass
+HiLink rplStorageError	Error
+HiLink rplReadWrite		rplIntrinsic
 
-  HiLink rplOperator		Operator
+HiLink rplOperator		Operator
 
-  HiLink rplList		Special
-  HiLink rplArray		Special
-  HiLink rplConstant		Identifier
-  HiLink rplExpr		Type
+HiLink rplList		Special
+HiLink rplArray		Special
+HiLink rplConstant		Identifier
+HiLink rplExpr		Type
 
-  HiLink rplString		String
-  HiLink rplStringGuilles	String
-  HiLink rplStringAntislash	String
+HiLink rplString		String
+HiLink rplStringGuilles	String
+HiLink rplStringAntislash	String
 
-  HiLink rplBinary		Boolean
-  HiLink rplOctal		Boolean
-  HiLink rplDecimal		Boolean
-  HiLink rplHexadecimal		Boolean
-  HiLink rplInteger		Number
-  HiLink rplFloat		Float
-  HiLink rplComplex		Float
-  HiLink rplBoolean		Identifier
+HiLink rplBinary		Boolean
+HiLink rplOctal		Boolean
+HiLink rplDecimal		Boolean
+HiLink rplHexadecimal		Boolean
+HiLink rplInteger		Number
+HiLink rplFloat		Float
+HiLink rplComplex		Float
+HiLink rplBoolean		Identifier
 
-  HiLink rplObsolete		Todo
+HiLink rplObsolete		Todo
 
-  HiLink rplPreCondit		PreCondit
-  HiLink rplInclude		Include
-  HiLink rplIncluded		rplString
-  HiLink rplInclude		Include
-  HiLink rplExecPath		Include
-  HiLink rplPreProc		PreProc
-  HiLink rplComment		Comment
-  HiLink rplCommentLine		Comment
-  HiLink rplCommentString	Comment
-  HiLink rplSubDelimitor	rplStorage
-  HiLink rplCommentError	Error
-  HiLink rplParenError		Error
-  HiLink rplSubError		Error
-  HiLink rplArrayError		Error
-  HiLink rplListError		Error
-  HiLink rplTab			Error
-  HiLink rplBinaryError		Error
-  HiLink rplOctalError		Error
-  HiLink rplDecimalError	Error
-  HiLink rplHexadecimalError	Error
+HiLink rplPreCondit		PreCondit
+HiLink rplInclude		Include
+HiLink rplIncluded		rplString
+HiLink rplInclude		Include
+HiLink rplExecPath		Include
+HiLink rplPreProc		PreProc
+HiLink rplComment		Comment
+HiLink rplCommentLine		Comment
+HiLink rplCommentString	Comment
+HiLink rplSubDelimitor	rplStorage
+HiLink rplCommentError	Error
+HiLink rplParenError		Error
+HiLink rplSubError		Error
+HiLink rplArrayError		Error
+HiLink rplListError		Error
+HiLink rplTab			Error
+HiLink rplBinaryError		Error
+HiLink rplOctalError		Error
+HiLink rplDecimalError	Error
+HiLink rplHexadecimalError	Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "rpl"
 
diff --git a/runtime/syntax/rtf.vim b/runtime/syntax/rtf.vim
index 8f5ea71a36..0c63e8d523 100644
--- a/runtime/syntax/rtf.vim
+++ b/runtime/syntax/rtf.vim
@@ -13,11 +13,8 @@
 
 " TODO: render underline, italic, bold
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -52,35 +49,27 @@ syn match rtfBlue		"\\blue[0-9][0-9]*"
 syn match rtfFootNote "[#$K+]{\\footnote.*}" contains=rtfControlWord,rtfNewControlWord
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_rtf_syntax_inits")
-  if version < 508
-    let did_rtf_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
 
-   HiLink rtfControlWord		Statement
-   HiLink rtfNewControlWord	Special
-   HiLink rtfControlSymbol	Constant
-   HiLink rtfCharacter		Character
-   HiLink rtfUnicodeCharacter	SpecialChar
-   HiLink rtfFootNote		Comment
+HiLink rtfControlWord		Statement
+HiLink rtfNewControlWord	Special
+HiLink rtfControlSymbol	Constant
+HiLink rtfCharacter		Character
+HiLink rtfUnicodeCharacter	SpecialChar
+HiLink rtfFootNote		Comment
 
-   " Define colors for the syntax file
-   hi rtfRed	      term=underline cterm=underline ctermfg=DarkRed gui=underline guifg=DarkRed
-   hi rtfGreen	      term=underline cterm=underline ctermfg=DarkGreen gui=underline guifg=DarkGreen
-   hi rtfBlue	      term=underline cterm=underline ctermfg=DarkBlue gui=underline guifg=DarkBlue
+" Define colors for the syntax file
+hi rtfRed	      term=underline cterm=underline ctermfg=DarkRed gui=underline guifg=DarkRed
+hi rtfGreen	      term=underline cterm=underline ctermfg=DarkGreen gui=underline guifg=DarkGreen
+hi rtfBlue	      term=underline cterm=underline ctermfg=DarkBlue gui=underline guifg=DarkBlue
 
-   HiLink rtfRed	rtfRed
-   HiLink rtfGreen	rtfGreen
-   HiLink rtfBlue	rtfBlue
+HiLink rtfRed	rtfRed
+HiLink rtfGreen	rtfGreen
+HiLink rtfBlue	rtfBlue
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "rtf"
diff --git a/runtime/syntax/ruby.vim b/runtime/syntax/ruby.vim
index 28f553decb..ca7f51b1ea 100644
--- a/runtime/syntax/ruby.vim
+++ b/runtime/syntax/ruby.vim
@@ -9,16 +9,45 @@
 " Thanks to perl.vim authors, and to Reimer Behrends. :-) (MN)
 " ----------------------------------------------------------------------------
 
+" Prelude {{{1
 if exists("b:current_syntax")
   finish
 endif
 
+" this file uses line continuations
+let s:cpo_sav = &cpo
+set cpo&vim
+
+" Folding Config {{{1
 if has("folding") && exists("ruby_fold")
   setlocal foldmethod=syntax
 endif
 
+let s:foldable_groups = split(
+      \	  get(
+      \	    b:,
+      \	    'ruby_foldable_groups',
+      \	    get(g:, 'ruby_foldable_groups', 'ALL')
+      \	  )
+      \	)
+
+function! s:foldable(...) abort
+  if index(s:foldable_groups, 'ALL') > -1
+    return 1
+  endif
+
+  for l:i in a:000
+    if index(s:foldable_groups, l:i) > -1
+      return 1
+    endif
+  endfor
+
+  return 0
+endfunction " }}}
+
 syn cluster rubyNotTop contains=@rubyExtendedStringSpecial,@rubyRegexpSpecial,@rubyDeclaration,rubyConditional,rubyExceptional,rubyMethodExceptional,rubyTodo
 
+" Whitespace Errors {{{1
 if exists("ruby_space_errors")
   if !exists("ruby_no_trail_space_error")
     syn match rubySpaceError display excludenl "\s\+$"
@@ -28,14 +57,14 @@ if exists("ruby_space_errors")
   endif
 endif
 
-" Operators
+" Operators {{{1
 if exists("ruby_operators")
-  syn match  rubyOperator "[~!^&|*/%+-]\|\%(class\s*\)\@<!<<\|<=>\|<=\|\%(<\|\<class\s\+\u\w*\s*\)\@<!<[^<]\@=\|===\|==\|=\~\|>>\|>=\|=\@<!>\|\*\*\|\.\.\.\|\.\.\|::"
+  syn match  rubyOperator "[~!^|*/%+-]\|&\.\@!\|\%(class\s*\)\@<!<<\|<=>\|<=\|\%(<\|\<class\s\+\u\w*\s*\)\@<!<[^<]\@=\|===\|==\|=\~\|>>\|>=\|=\@1<!>\|\*\*\|\.\.\.\|\.\.\|::"
   syn match  rubyOperator "->\|-=\|/=\|\*\*=\|\*=\|&&=\|&=\|&&\|||=\||=\|||\|%=\|+=\|!\~\|!="
-  syn region rubyBracketOperator matchgroup=rubyOperator start="\%(\w[?!]\=\|[]})]\)\@<=\[\s*" end="\s*]" contains=ALLBUT,@rubyNotTop
+  syn region rubyBracketOperator matchgroup=rubyOperator start="\%(\w[?!]\=\|[]})]\)\@2<=\[\s*" end="\s*]" contains=ALLBUT,@rubyNotTop
 endif
 
-" Expression Substitution and Backslash Notation
+" Expression Substitution and Backslash Notation {{{1
 syn match rubyStringEscape "\\\\\|\\[abefnrstv]\|\\\o\{1,3}\|\\x\x\{1,2}"						    contained display
 syn match rubyStringEscape "\%(\\M-\\C-\|\\C-\\M-\|\\M-\\c\|\\c\\M-\|\\c\|\\C-\|\\M-\)\%(\\\o\{1,3}\|\\x\x\{1,2}\|\\\=\S\)" contained display
 syn match rubyQuoteEscape  "\\[\\']"											    contained display
@@ -45,18 +74,19 @@ syn match  rubyInterpolation	      "#\%(\$\|@@\=\)\w\+"    display contained con
 syn match  rubyInterpolationDelimiter "#\ze\%(\$\|@@\=\)\w\+" display contained
 syn match  rubyInterpolation	      "#\$\%(-\w\|\W\)"       display contained contains=rubyInterpolationDelimiter,rubyPredefinedVariable,rubyInvalidVariable
 syn match  rubyInterpolationDelimiter "#\ze\$\%(-\w\|\W\)"    display contained
-syn region rubyNoInterpolation	      start="\\#{" end="}"            contained
+syn region rubyNoInterpolation	      start="\\#{" end="}"	      contained
 syn match  rubyNoInterpolation	      "\\#{"		      display contained
 syn match  rubyNoInterpolation	      "\\#\%(\$\|@@\=\)\w\+"  display contained
 syn match  rubyNoInterpolation	      "\\#\$\W"		      display contained
 
-syn match rubyDelimEscape	"\\[(<{\[)>}\]]" transparent display contained contains=NONE
+syn match rubyDelimiterEscape	"\\[(<{\[)>}\]]" transparent display contained contains=NONE
 
 syn region rubyNestedParentheses    start="("  skip="\\\\\|\\)"  matchgroup=rubyString end=")"	transparent contained
 syn region rubyNestedCurlyBraces    start="{"  skip="\\\\\|\\}"  matchgroup=rubyString end="}"	transparent contained
 syn region rubyNestedAngleBrackets  start="<"  skip="\\\\\|\\>"  matchgroup=rubyString end=">"	transparent contained
 syn region rubyNestedSquareBrackets start="\[" skip="\\\\\|\\\]" matchgroup=rubyString end="\]"	transparent contained
 
+" Regular Expression Metacharacters {{{1
 " These are mostly Oniguruma ready
 syn region rubyRegexpComment	matchgroup=rubyRegexpSpecial   start="(?#"								  skip="\\)"  end=")"  contained
 syn region rubyRegexpParens	matchgroup=rubyRegexpSpecial   start="(\(?:\|?<\=[=!]\|?>\|?<[a-z_]\w*>\|?[imx]*-[imx]*:\=\|\%(?#\)\@!\)" skip="\\)"  end=")"  contained transparent contains=@rubyRegexpSpecial
@@ -79,36 +109,40 @@ syn cluster rubyStringSpecial	      contains=rubyInterpolation,rubyNoInterpolati
 syn cluster rubyExtendedStringSpecial contains=@rubyStringSpecial,rubyNestedParentheses,rubyNestedCurlyBraces,rubyNestedAngleBrackets,rubyNestedSquareBrackets
 syn cluster rubyRegexpSpecial	      contains=rubyInterpolation,rubyNoInterpolation,rubyStringEscape,rubyRegexpSpecial,rubyRegexpEscape,rubyRegexpBrackets,rubyRegexpCharClass,rubyRegexpDot,rubyRegexpQuantifier,rubyRegexpAnchor,rubyRegexpParens,rubyRegexpComment
 
-" Numbers and ASCII Codes
-syn match rubyASCIICode	"\%(\w\|[]})\"'/]\)\@<!\%(?\%(\\M-\\C-\|\\C-\\M-\|\\M-\\c\|\\c\\M-\|\\c\|\\C-\|\\M-\)\=\%(\\\o\{1,3}\|\\x\x\{1,2}\|\\\=\S\)\)"
-syn match rubyInteger	"\%(\%(\w\|[]})\"']\s*\)\@<!-\)\=\<0[xX]\x\+\%(_\x\+\)*\>"								display
-syn match rubyInteger	"\%(\%(\w\|[]})\"']\s*\)\@<!-\)\=\<\%(0[dD]\)\=\%(0\|[1-9]\d*\%(_\d\+\)*\)\>"						display
-syn match rubyInteger	"\%(\%(\w\|[]})\"']\s*\)\@<!-\)\=\<0[oO]\=\o\+\%(_\o\+\)*\>"								display
-syn match rubyInteger	"\%(\%(\w\|[]})\"']\s*\)\@<!-\)\=\<0[bB][01]\+\%(_[01]\+\)*\>"								display
-syn match rubyFloat	"\%(\%(\w\|[]})\"']\s*\)\@<!-\)\=\<\%(0\|[1-9]\d*\%(_\d\+\)*\)\.\d\+\%(_\d\+\)*\>"					display
-syn match rubyFloat	"\%(\%(\w\|[]})\"']\s*\)\@<!-\)\=\<\%(0\|[1-9]\d*\%(_\d\+\)*\)\%(\.\d\+\%(_\d\+\)*\)\=\%([eE][-+]\=\d\+\%(_\d\+\)*\)\>"	display
+" Numbers and ASCII Codes {{{1
+syn match rubyASCIICode "\%(\w\|[]})\"'/]\)\@1<!\%(?\%(\\M-\\C-\|\\C-\\M-\|\\M-\\c\|\\c\\M-\|\\c\|\\C-\|\\M-\)\=\%(\\\o\{1,3}\|\\x\x\{1,2}\|\\\=\S\)\)"
+syn match rubyInteger	"\%(\%(\w\|[]})\"']\s*\)\@<!-\)\=\<0[xX]\x\+\%(_\x\+\)*r\=i\=\>"								display
+syn match rubyInteger	"\%(\%(\w\|[]})\"']\s*\)\@<!-\)\=\<\%(0[dD]\)\=\%(0\|[1-9]\d*\%(_\d\+\)*\)r\=i\=\>"						display
+syn match rubyInteger	"\%(\%(\w\|[]})\"']\s*\)\@<!-\)\=\<0[oO]\=\o\+\%(_\o\+\)*r\=i\=\>"								display
+syn match rubyInteger	"\%(\%(\w\|[]})\"']\s*\)\@<!-\)\=\<0[bB][01]\+\%(_[01]\+\)*r\=i\=\>"								display
+syn match rubyFloat	"\%(\%(\w\|[]})\"']\s*\)\@<!-\)\=\<\%(0\|[1-9]\d*\%(_\d\+\)*\)\.\d\+\%(_\d\+\)*r\=i\=\>"					display
+syn match rubyFloat	"\%(\%(\w\|[]})\"']\s*\)\@<!-\)\=\<\%(0\|[1-9]\d*\%(_\d\+\)*\)\%(\.\d\+\%(_\d\+\)*\)\=\%([eE][-+]\=\d\+\%(_\d\+\)*\)r\=i\=\>"	display
 
-" Identifiers
+" Identifiers {{{1
 syn match rubyLocalVariableOrMethod "\<[_[:lower:]][_[:alnum:]]*[?!=]\=" contains=NONE display transparent
 syn match rubyBlockArgument	    "&[_[:lower:]][_[:alnum:]]"		 contains=NONE display transparent
 
-syn match  rubyConstant		"\%(\%([.@$]\@<!\.\)\@<!\<\|::\)\_s*\zs\u\w*\%(\>\|::\)\@=\%(\s*(\)\@!"
+syn match  rubyConstant		"\%(\%(^\|[^.]\)\.\s*\)\@<!\<\u\%(\w\|[^\x00-\x7F]\)*\>\%(\s*(\)\@!"
 syn match  rubyClassVariable	"@@\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*" display
-syn match  rubyInstanceVariable "@\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*"  display
+syn match  rubyInstanceVariable "@\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*"	display
 syn match  rubyGlobalVariable	"$\%(\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\|-.\)"
-syn match  rubySymbol		"[]})\"':]\@<!:\%(\^\|\~\|<<\|<=>\|<=\|<\|===\|[=!]=\|[=!]\~\|!\|>>\|>=\|>\||\|-@\|-\|/\|\[]=\|\[]\|\*\*\|\*\|&\|%\|+@\|+\|`\)"
-syn match  rubySymbol		"[]})\"':]\@<!:\$\%(-.\|[`~<=>_,;:!?/.'"@$*\&+0]\)"
-syn match  rubySymbol		"[]})\"':]\@<!:\%(\$\|@@\=\)\=\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*"
-syn match  rubySymbol		"[]})\"':]\@<!:\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\%([?!=]>\@!\)\="
-syn match  rubySymbol		"\%([{(,]\_s*\)\@<=\l\w*[!?]\=::\@!"he=e-1
-syn match  rubySymbol		"[]})\"':]\@<!\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[!?]\=:\s\@="he=e-1
-syn match  rubySymbol		"\%([{(,]\_s*\)\@<=[[:space:],{]\l\w*[!?]\=::\@!"hs=s+1,he=e-1
-syn match  rubySymbol		"[[:space:],{]\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[!?]\=:\s\@="hs=s+1,he=e-1
-syn region rubySymbol		start="[]})\"':]\@<!:'"  end="'"  skip="\\\\\|\\'"  contains=rubyQuoteEscape fold
-syn region rubySymbol		start="[]})\"':]\@<!:\"" end="\"" skip="\\\\\|\\\"" contains=@rubyStringSpecial fold
+syn match  rubySymbol		"[]})\"':]\@1<!:\%(\^\|\~@\|\~\|<<\|<=>\|<=\|<\|===\|[=!]=\|[=!]\~\|!@\|!\|>>\|>=\|>\||\|-@\|-\|/\|\[]=\|\[]\|\*\*\|\*\|&\|%\|+@\|+\|`\)"
+syn match  rubySymbol		"[]})\"':]\@1<!:\$\%(-.\|[`~<=>_,;:!?/.'"@$*\&+0]\)"
+syn match  rubySymbol		"[]})\"':]\@1<!:\%(\$\|@@\=\)\=\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*"
+syn match  rubySymbol		"[]})\"':]\@1<!:\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\%([?!=]>\@!\)\="
+
+if s:foldable(':')
+  syn region rubySymbol		start="[]})\"':]\@1<!:'"  end="'"  skip="\\\\\|\\'"  contains=rubyQuoteEscape fold
+  syn region rubySymbol		start="[]})\"':]\@1<!:\"" end="\"" skip="\\\\\|\\\"" contains=@rubyStringSpecial fold
+else
+  syn region rubySymbol		start="[]})\"':]\@1<!:'"  end="'"  skip="\\\\\|\\'"  contains=rubyQuoteEscape
+  syn region rubySymbol		start="[]})\"':]\@1<!:\"" end="\"" skip="\\\\\|\\\"" contains=@rubyStringSpecial
+endif
+
+syn match  rubyCapitalizedMethod	"\%(\%(^\|[^.]\)\.\s*\)\@<!\<\u\%(\w\|[^\x00-\x7F]\)*\>\%(\s*(\)*\s*(\@="
 
 syn match  rubyBlockParameter	  "\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*" contained
-syn region rubyBlockParameterList start="\%(\%(\<do\>\|{\)\s*\)\@<=|" end="|" oneline display contains=rubyBlockParameter
+syn region rubyBlockParameterList start="\%(\%(\<do\>\|{\)\_s*\)\@32<=|" end="|" oneline display contains=rubyBlockParameter
 
 syn match rubyInvalidVariable	 "$[^ A-Za-z_-]"
 syn match rubyPredefinedVariable #$[!$&"'*+,./0:;<=>?@\`~]#
@@ -117,93 +151,187 @@ syn match rubyPredefinedVariable "$_\>"											   display
 syn match rubyPredefinedVariable "$-[0FIKadilpvw]\>"									   display
 syn match rubyPredefinedVariable "$\%(deferr\|defout\|stderr\|stdin\|stdout\)\>"					   display
 syn match rubyPredefinedVariable "$\%(DEBUG\|FILENAME\|KCODE\|LOADED_FEATURES\|LOAD_PATH\|PROGRAM_NAME\|SAFE\|VERBOSE\)\>" display
-syn match rubyPredefinedConstant "\%(\%(\.\@<!\.\)\@<!\|::\)\_s*\zs\%(MatchingData\|ARGF\|ARGV\|ENV\)\>\%(\s*(\)\@!"
-syn match rubyPredefinedConstant "\%(\%(\.\@<!\.\)\@<!\|::\)\_s*\zs\%(DATA\|FALSE\|NIL\)\>\%(\s*(\)\@!"
-syn match rubyPredefinedConstant "\%(\%(\.\@<!\.\)\@<!\|::\)\_s*\zs\%(STDERR\|STDIN\|STDOUT\|TOPLEVEL_BINDING\|TRUE\)\>\%(\s*(\)\@!"
-syn match rubyPredefinedConstant "\%(\%(\.\@<!\.\)\@<!\|::\)\_s*\zs\%(RUBY_\%(VERSION\|RELEASE_DATE\|PLATFORM\|PATCHLEVEL\|REVISION\|DESCRIPTION\|COPYRIGHT\|ENGINE\)\)\>\%(\s*(\)\@!"
+syn match rubyPredefinedConstant "\%(\%(^\|[^.]\)\.\s*\)\@<!\<\%(ARGF\|ARGV\|ENV\|DATA\|FALSE\|NIL\|STDERR\|STDIN\|STDOUT\|TOPLEVEL_BINDING\|TRUE\)\>\%(\s*(\)\@!"
+syn match rubyPredefinedConstant "\%(\%(^\|[^.]\)\.\s*\)\@<!\<\%(RUBY_\%(VERSION\|RELEASE_DATE\|PLATFORM\|PATCHLEVEL\|REVISION\|DESCRIPTION\|COPYRIGHT\|ENGINE\)\)\>\%(\s*(\)\@!"
 
-" Normal Regular Expression
-syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="\%(\%(^\|\<\%(and\|or\|while\|until\|unless\|if\|elsif\|when\|not\|then\|else\)\|[;\~=!|&(,[<>?:*+-]\)\s*\)\@<=/" end="/[iomxneus]*" skip="\\\\\|\\/" contains=@rubyRegexpSpecial fold
-syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="\%(\h\k*\s\+\)\@<=/[ \t=]\@!" end="/[iomxneus]*" skip="\\\\\|\\/" contains=@rubyRegexpSpecial fold
+" Normal Regular Expression {{{1
+if s:foldable('/')
+  syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="\%(\%(^\|\<\%(and\|or\|while\|until\|unless\|if\|elsif\|when\|not\|then\|else\)\|[;\~=!|&(,{[<>?:*+-]\)\s*\)\@<=/" end="/[iomxneus]*" skip="\\\\\|\\/" contains=@rubyRegexpSpecial fold
+  syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="\%(\h\k*\s\+\)\@<=/[ \t=]\@!" end="/[iomxneus]*" skip="\\\\\|\\/" contains=@rubyRegexpSpecial fold
+else
+  syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="\%(\%(^\|\<\%(and\|or\|while\|until\|unless\|if\|elsif\|when\|not\|then\|else\)\|[;\~=!|&(,{[<>?:*+-]\)\s*\)\@<=/" end="/[iomxneus]*" skip="\\\\\|\\/" contains=@rubyRegexpSpecial
+  syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="\%(\h\k*\s\+\)\@<=/[ \t=]\@!" end="/[iomxneus]*" skip="\\\\\|\\/" contains=@rubyRegexpSpecial
+endif
 
-" Generalized Regular Expression
-syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r\z([~`!@#$%^&*_\-+=|\:;"',.? /]\)" end="\z1[iomxneus]*" skip="\\\\\|\\\z1" contains=@rubyRegexpSpecial fold
-syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r{"				 end="}[iomxneus]*"   skip="\\\\\|\\}"	 contains=@rubyRegexpSpecial fold
-syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r<"				 end=">[iomxneus]*"   skip="\\\\\|\\>"	 contains=@rubyRegexpSpecial,rubyNestedAngleBrackets,rubyDelimEscape fold
-syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r\["				 end="\][iomxneus]*"  skip="\\\\\|\\\]"	 contains=@rubyRegexpSpecial fold
-syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r("				 end=")[iomxneus]*"   skip="\\\\\|\\)"	 contains=@rubyRegexpSpecial fold
+" Generalized Regular Expression {{{1
+if s:foldable('%')
+  syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1[iomxneus]*" skip="\\\\\|\\\z1" contains=@rubyRegexpSpecial fold
+  syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r{"				end="}[iomxneus]*"   skip="\\\\\|\\}"	 contains=@rubyRegexpSpecial fold
+  syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r<"				end=">[iomxneus]*"   skip="\\\\\|\\>"	 contains=@rubyRegexpSpecial,rubyNestedAngleBrackets,rubyDelimiterEscape fold
+  syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r\["				end="\][iomxneus]*"  skip="\\\\\|\\\]"	 contains=@rubyRegexpSpecial fold
+  syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r("				end=")[iomxneus]*"   skip="\\\\\|\\)"	 contains=@rubyRegexpSpecial fold
+  syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r\z(\s\)"				end="\z1[iomxneus]*" skip="\\\\\|\\\z1" contains=@rubyRegexpSpecial fold
+else
+  syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1[iomxneus]*" skip="\\\\\|\\\z1" contains=@rubyRegexpSpecial
+  syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r{"				end="}[iomxneus]*"   skip="\\\\\|\\}"	 contains=@rubyRegexpSpecial
+  syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r<"				end=">[iomxneus]*"   skip="\\\\\|\\>"	 contains=@rubyRegexpSpecial,rubyNestedAngleBrackets,rubyDelimiterEscape
+  syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r\["				end="\][iomxneus]*"  skip="\\\\\|\\\]"	 contains=@rubyRegexpSpecial
+  syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r("				end=")[iomxneus]*"   skip="\\\\\|\\)"	 contains=@rubyRegexpSpecial
+  syn region rubyRegexp matchgroup=rubyRegexpDelimiter start="%r\z(\s\)"				end="\z1[iomxneus]*" skip="\\\\\|\\\z1" contains=@rubyRegexpSpecial
+endif
 
-" Normal String and Shell Command Output
-syn region rubyString matchgroup=rubyStringDelimiter start="\"" end="\"" skip="\\\\\|\\\"" contains=@rubyStringSpecial,@Spell fold
-syn region rubyString matchgroup=rubyStringDelimiter start="'"	end="'"  skip="\\\\\|\\'"  contains=rubyQuoteEscape,@Spell    fold
-syn region rubyString matchgroup=rubyStringDelimiter start="`"	end="`"  skip="\\\\\|\\`"  contains=@rubyStringSpecial fold
+" Normal String {{{1
+let s:spell_cluster = exists('ruby_spellcheck_strings') ? ',@Spell' : ''
+exe 'syn region rubyString matchgroup=rubyStringDelimiter start="\"" end="\"" skip="\\\\\|\\\"" ' .
+      \ (s:foldable('%') ? 'fold' : '') . ' contains=@rubyStringSpecial' . s:spell_cluster
+exe 'syn region rubyString matchgroup=rubyStringDelimiter start="''" end="''" skip="\\\\\|\\''" ' .
+      \ (s:foldable('%') ? 'fold' : '') . ' contains=rubyQuoteEscape'	 . s:spell_cluster
 
-" Generalized Single Quoted String, Symbol and Array of Strings
-syn region rubyString matchgroup=rubyStringDelimiter start="%[qwi]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" fold
-syn region rubyString matchgroup=rubyStringDelimiter start="%[qwi]{"				   end="}"   skip="\\\\\|\\}"	fold contains=rubyNestedCurlyBraces,rubyDelimEscape
-syn region rubyString matchgroup=rubyStringDelimiter start="%[qwi]<"				   end=">"   skip="\\\\\|\\>"	fold contains=rubyNestedAngleBrackets,rubyDelimEscape
-syn region rubyString matchgroup=rubyStringDelimiter start="%[qwi]\["				   end="\]"  skip="\\\\\|\\\]"	fold contains=rubyNestedSquareBrackets,rubyDelimEscape
-syn region rubyString matchgroup=rubyStringDelimiter start="%[qwi]("				   end=")"   skip="\\\\\|\\)"	fold contains=rubyNestedParentheses,rubyDelimEscape
-syn region rubyString matchgroup=rubyStringDelimiter start="%q "				   end=" "   skip="\\\\\|\\)"	fold
-syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s\z([~`!@#$%^&*_\-+=|\:;"',.? /]\)"   end="\z1" skip="\\\\\|\\\z1" fold
-syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s{"				   end="}"   skip="\\\\\|\\}"	fold contains=rubyNestedCurlyBraces,rubyDelimEscape
-syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s<"				   end=">"   skip="\\\\\|\\>"	fold contains=rubyNestedAngleBrackets,rubyDelimEscape
-syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s\["				   end="\]"  skip="\\\\\|\\\]"	fold contains=rubyNestedSquareBrackets,rubyDelimEscape
-syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s("				   end=")"   skip="\\\\\|\\)"	fold contains=rubyNestedParentheses,rubyDelimEscape
+" Shell Command Output {{{1
+if s:foldable('%')
+  syn region rubyString matchgroup=rubyStringDelimiter start="`" end="`" skip="\\\\\|\\`" contains=@rubyStringSpecial fold
+else
+  syn region rubyString matchgroup=rubyStringDelimiter start="`" end="`" skip="\\\\\|\\`" contains=@rubyStringSpecial
+endif
 
-" Generalized Double Quoted String and Array of Strings and Shell Command Output
+" Generalized Single Quoted String, Symbol and Array of Strings {{{1
+if s:foldable('%')
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[qw]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" fold
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[qw]{"				     end="}"   skip="\\\\\|\\}"	  fold contains=rubyNestedCurlyBraces,rubyDelimiterEscape
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[qw]<"				     end=">"   skip="\\\\\|\\>"	  fold contains=rubyNestedAngleBrackets,rubyDelimiterEscape
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[qw]\["				     end="\]"  skip="\\\\\|\\\]"  fold contains=rubyNestedSquareBrackets,rubyDelimiterEscape
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[qw]("				     end=")"   skip="\\\\\|\\)"	  fold contains=rubyNestedParentheses,rubyDelimiterEscape
+  syn region rubyString matchgroup=rubyStringDelimiter start="%q\z(\s\)"			     end="\z1" skip="\\\\\|\\\z1" fold
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)"    end="\z1" skip="\\\\\|\\\z1" fold
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s{"				     end="}"   skip="\\\\\|\\}"	  fold contains=rubyNestedCurlyBraces,rubyDelimiterEscape
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s<"				     end=">"   skip="\\\\\|\\>"	  fold contains=rubyNestedAngleBrackets,rubyDelimiterEscape
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s\["				     end="\]"  skip="\\\\\|\\\]"  fold contains=rubyNestedSquareBrackets,rubyDelimiterEscape
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s("				     end=")"   skip="\\\\\|\\)"	  fold contains=rubyNestedParentheses,rubyDelimiterEscape
+  syn region rubyString matchgroup=rubyStringDelimiter start="%s\z(\s\)"			     end="\z1" skip="\\\\\|\\\z1" fold
+else
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[qw]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1"
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[qw]{"				     end="}"   skip="\\\\\|\\}"	  contains=rubyNestedCurlyBraces,rubyDelimiterEscape
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[qw]<"				     end=">"   skip="\\\\\|\\>"	  contains=rubyNestedAngleBrackets,rubyDelimiterEscape
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[qw]\["				     end="\]"  skip="\\\\\|\\\]"  contains=rubyNestedSquareBrackets,rubyDelimiterEscape
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[qw]("				     end=")"   skip="\\\\\|\\)"	  contains=rubyNestedParentheses,rubyDelimiterEscape
+  syn region rubyString matchgroup=rubyStringDelimiter start="%q\z(\s\)"			     end="\z1" skip="\\\\\|\\\z1"
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)"    end="\z1" skip="\\\\\|\\\z1"
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s{"				     end="}"   skip="\\\\\|\\}"	  contains=rubyNestedCurlyBraces,rubyDelimiterEscape
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s<"				     end=">"   skip="\\\\\|\\>"	  contains=rubyNestedAngleBrackets,rubyDelimiterEscape
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s\["				     end="\]"  skip="\\\\\|\\\]"  contains=rubyNestedSquareBrackets,rubyDelimiterEscape
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%s("				     end=")"   skip="\\\\\|\\)"	  contains=rubyNestedParentheses,rubyDelimiterEscape
+  syn region rubyString matchgroup=rubyStringDelimiter start="%s\z(\s\)"			     end="\z1" skip="\\\\\|\\\z1"
+endif
+
+" Generalized Double Quoted String and Array of Strings and Shell Command Output {{{1
 " Note: %= is not matched here as the beginning of a double quoted string
-syn region rubyString matchgroup=rubyStringDelimiter start="%\z([~`!@#$%^&*_\-+|\:;"',.?/]\)"	    end="\z1" skip="\\\\\|\\\z1" contains=@rubyStringSpecial fold
-syn region rubyString matchgroup=rubyStringDelimiter start="%[QWIx]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" contains=@rubyStringSpecial fold
-syn region rubyString matchgroup=rubyStringDelimiter start="%[QWIx]\={"				    end="}"   skip="\\\\\|\\}"	 contains=@rubyStringSpecial,rubyNestedCurlyBraces,rubyDelimEscape    fold
-syn region rubyString matchgroup=rubyStringDelimiter start="%[QWIx]\=<"				    end=">"   skip="\\\\\|\\>"	 contains=@rubyStringSpecial,rubyNestedAngleBrackets,rubyDelimEscape  fold
-syn region rubyString matchgroup=rubyStringDelimiter start="%[QWIx]\=\["				    end="\]"  skip="\\\\\|\\\]"	 contains=@rubyStringSpecial,rubyNestedSquareBrackets,rubyDelimEscape fold
-syn region rubyString matchgroup=rubyStringDelimiter start="%[QWIx]\=("				    end=")"   skip="\\\\\|\\)"	 contains=@rubyStringSpecial,rubyNestedParentheses,rubyDelimEscape    fold
-syn region rubyString matchgroup=rubyStringDelimiter start="%[Qx] "				    end=" "   skip="\\\\\|\\)"   contains=@rubyStringSpecial fold
+if s:foldable('%')
+  syn region rubyString matchgroup=rubyStringDelimiter start="%\z([~`!@#$%^&*_\-+|\:;"',.?/]\)"	      end="\z1" skip="\\\\\|\\\z1" contains=@rubyStringSpecial fold
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[QWx]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" contains=@rubyStringSpecial fold
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[QWx]\={"			      end="}"	skip="\\\\\|\\}"   contains=@rubyStringSpecial,rubyNestedCurlyBraces,rubyDelimiterEscape    fold
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[QWx]\=<"			      end=">"	skip="\\\\\|\\>"   contains=@rubyStringSpecial,rubyNestedAngleBrackets,rubyDelimiterEscape  fold
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[QWx]\=\["			      end="\]"	skip="\\\\\|\\\]"  contains=@rubyStringSpecial,rubyNestedSquareBrackets,rubyDelimiterEscape fold
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[QWx]\=("			      end=")"	skip="\\\\\|\\)"   contains=@rubyStringSpecial,rubyNestedParentheses,rubyDelimiterEscape    fold
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[Qx]\z(\s\)"			      end="\z1" skip="\\\\\|\\\z1" contains=@rubyStringSpecial fold
+else
+  syn region rubyString matchgroup=rubyStringDelimiter start="%\z([~`!@#$%^&*_\-+|\:;"',.?/]\)"	      end="\z1" skip="\\\\\|\\\z1" contains=@rubyStringSpecial
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[QWx]\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1" contains=@rubyStringSpecial
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[QWx]\={"			      end="}"	skip="\\\\\|\\}"   contains=@rubyStringSpecial,rubyNestedCurlyBraces,rubyDelimiterEscape
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[QWx]\=<"			      end=">"	skip="\\\\\|\\>"   contains=@rubyStringSpecial,rubyNestedAngleBrackets,rubyDelimiterEscape
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[QWx]\=\["			      end="\]"	skip="\\\\\|\\\]"  contains=@rubyStringSpecial,rubyNestedSquareBrackets,rubyDelimiterEscape
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[QWx]\=("			      end=")"	skip="\\\\\|\\)"   contains=@rubyStringSpecial,rubyNestedParentheses,rubyDelimiterEscape
+  syn region rubyString matchgroup=rubyStringDelimiter start="%[Qx]\z(\s\)"			      end="\z1" skip="\\\\\|\\\z1" contains=@rubyStringSpecial
+endif
 
-" Here Document
-syn region rubyHeredocStart matchgroup=rubyStringDelimiter start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<-\=\zs\%(\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)+	 end=+$+ oneline contains=ALLBUT,@rubyNotTop
-syn region rubyHeredocStart matchgroup=rubyStringDelimiter start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<-\=\zs"\%([^"]*\)"+ end=+$+ oneline contains=ALLBUT,@rubyNotTop
-syn region rubyHeredocStart matchgroup=rubyStringDelimiter start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<-\=\zs'\%([^']*\)'+ end=+$+ oneline contains=ALLBUT,@rubyNotTop
-syn region rubyHeredocStart matchgroup=rubyStringDelimiter start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<-\=\zs`\%([^`]*\)`+ end=+$+ oneline contains=ALLBUT,@rubyNotTop
+" Array of Symbols {{{1
+if s:foldable('%')
+  " Array of Symbols
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%i\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1"	fold
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%i{"				  end="}"   skip="\\\\\|\\}"	fold contains=rubyNestedCurlyBraces,rubyDelimiterEscape
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%i<"				  end=">"   skip="\\\\\|\\>"	fold contains=rubyNestedAngleBrackets,rubyDelimiterEscape
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%i\["				  end="\]"  skip="\\\\\|\\\]"	fold contains=rubyNestedSquareBrackets,rubyDelimiterEscape
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%i("				  end=")"   skip="\\\\\|\\)"	fold contains=rubyNestedParentheses,rubyDelimiterEscape
 
-syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]})"'.]\)\s\|\w\)\@<!<<\z(\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)\ze\%(.*<<-\=['`"]\=\h\)\@!+hs=s+2	matchgroup=rubyStringDelimiter end=+^\z1$+ contains=rubyHeredocStart,rubyHeredoc,@rubyStringSpecial fold keepend
-syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]})"'.]\)\s\|\w\)\@<!<<"\z([^"]*\)"\ze\%(.*<<-\=['`"]\=\h\)\@!+hs=s+2	matchgroup=rubyStringDelimiter end=+^\z1$+ contains=rubyHeredocStart,rubyHeredoc,@rubyStringSpecial fold keepend
-syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]})"'.]\)\s\|\w\)\@<!<<'\z([^']*\)'\ze\%(.*<<-\=['`"]\=\h\)\@!+hs=s+2	matchgroup=rubyStringDelimiter end=+^\z1$+ contains=rubyHeredocStart,rubyHeredoc			fold keepend
-syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]})"'.]\)\s\|\w\)\@<!<<`\z([^`]*\)`\ze\%(.*<<-\=['`"]\=\h\)\@!+hs=s+2	matchgroup=rubyStringDelimiter end=+^\z1$+ contains=rubyHeredocStart,rubyHeredoc,@rubyStringSpecial fold keepend
+  " Array of interpolated Symbols
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%I\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1"	contains=@rubyStringSpecial fold
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%I{"				  end="}"   skip="\\\\\|\\}"	contains=@rubyStringSpecial,rubyNestedCurlyBraces,rubyDelimiterEscape    fold
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%I<"				  end=">"   skip="\\\\\|\\>"	contains=@rubyStringSpecial,rubyNestedAngleBrackets,rubyDelimiterEscape  fold
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%I\["				  end="\]"  skip="\\\\\|\\\]"	contains=@rubyStringSpecial,rubyNestedSquareBrackets,rubyDelimiterEscape fold
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%I("				  end=")"   skip="\\\\\|\\)"	contains=@rubyStringSpecial,rubyNestedParentheses,rubyDelimiterEscape    fold
+else
+  " Array of Symbols
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%i\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1"
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%i{"				  end="}"   skip="\\\\\|\\}"	contains=rubyNestedCurlyBraces,rubyDelimiterEscape
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%i<"				  end=">"   skip="\\\\\|\\>"	contains=rubyNestedAngleBrackets,rubyDelimiterEscape
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%i\["				  end="\]"  skip="\\\\\|\\\]"	contains=rubyNestedSquareBrackets,rubyDelimiterEscape
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%i("				  end=")"   skip="\\\\\|\\)"	contains=rubyNestedParentheses,rubyDelimiterEscape
 
-syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]}).]\)\s\|\w\)\@<!<<-\z(\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)\ze\%(.*<<-\=['`"]\=\h\)\@!+hs=s+3    matchgroup=rubyStringDelimiter end=+^\s*\zs\z1$+ contains=rubyHeredocStart,@rubyStringSpecial fold keepend
-syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]}).]\)\s\|\w\)\@<!<<-"\z([^"]*\)"\ze\%(.*<<-\=['`"]\=\h\)\@!+hs=s+3  matchgroup=rubyStringDelimiter end=+^\s*\zs\z1$+ contains=rubyHeredocStart,@rubyStringSpecial fold keepend
-syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]}).]\)\s\|\w\)\@<!<<-'\z([^']*\)'\ze\%(.*<<-\=['`"]\=\h\)\@!+hs=s+3  matchgroup=rubyStringDelimiter end=+^\s*\zs\z1$+ contains=rubyHeredocStart		     fold keepend
-syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]}).]\)\s\|\w\)\@<!<<-`\z([^`]*\)`\ze\%(.*<<-\=['`"]\=\h\)\@!+hs=s+3  matchgroup=rubyStringDelimiter end=+^\s*\zs\z1$+ contains=rubyHeredocStart,@rubyStringSpecial fold keepend
+  " Array of interpolated Symbols
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%I\z([~`!@#$%^&*_\-+=|\:;"',.?/]\)" end="\z1" skip="\\\\\|\\\z1"	contains=@rubyStringSpecial
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%I{"				  end="}"   skip="\\\\\|\\}"	contains=@rubyStringSpecial,rubyNestedCurlyBraces,rubyDelimiterEscape
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%I<"				  end=">"   skip="\\\\\|\\>"	contains=@rubyStringSpecial,rubyNestedAngleBrackets,rubyDelimiterEscape
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%I\["				  end="\]"  skip="\\\\\|\\\]"	contains=@rubyStringSpecial,rubyNestedSquareBrackets,rubyDelimiterEscape
+  syn region rubySymbol matchgroup=rubySymbolDelimiter start="%I("				  end=")"   skip="\\\\\|\\)"	contains=@rubyStringSpecial,rubyNestedParentheses,rubyDelimiterEscape
+endif
 
+" Here Document {{{1
+syn region rubyHeredocStart matchgroup=rubyStringDelimiter start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<[-~]\=\zs\%(\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)+	 end=+$+ oneline contains=ALLBUT,@rubyNotTop
+syn region rubyHeredocStart matchgroup=rubyStringDelimiter start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<[-~]\=\zs"\%([^"]*\)"+ end=+$+ oneline contains=ALLBUT,@rubyNotTop
+syn region rubyHeredocStart matchgroup=rubyStringDelimiter start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<[-~]\=\zs'\%([^']*\)'+ end=+$+ oneline contains=ALLBUT,@rubyNotTop
+syn region rubyHeredocStart matchgroup=rubyStringDelimiter start=+\%(\%(class\s*\|\%([]})"'.]\|::\)\)\_s*\|\w\)\@<!<<[-~]\=\zs`\%([^`]*\)`+ end=+$+ oneline contains=ALLBUT,@rubyNotTop
+
+if s:foldable('<<')
+  syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]})"'.]\)\s\|\w\)\@<!<<\z(\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)\ze\%(.*<<[-~]\=['`"]\=\h\)\@!+hs=s+2	matchgroup=rubyStringDelimiter end=+^\z1$+ contains=rubyHeredocStart,rubyHeredoc,@rubyStringSpecial fold keepend
+  syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]})"'.]\)\s\|\w\)\@<!<<"\z([^"]*\)"\ze\%(.*<<[-~]\=['`"]\=\h\)\@!+hs=s+2	matchgroup=rubyStringDelimiter end=+^\z1$+ contains=rubyHeredocStart,rubyHeredoc,@rubyStringSpecial fold keepend
+  syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]})"'.]\)\s\|\w\)\@<!<<'\z([^']*\)'\ze\%(.*<<[-~]\=['`"]\=\h\)\@!+hs=s+2	matchgroup=rubyStringDelimiter end=+^\z1$+ contains=rubyHeredocStart,rubyHeredoc		    fold keepend
+  syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]})"'.]\)\s\|\w\)\@<!<<`\z([^`]*\)`\ze\%(.*<<[-~]\=['`"]\=\h\)\@!+hs=s+2	matchgroup=rubyStringDelimiter end=+^\z1$+ contains=rubyHeredocStart,rubyHeredoc,@rubyStringSpecial fold keepend
+
+  syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]}).]\)\s\|\w\)\@<!<<[-~]\z(\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)\ze\%(.*<<[-~]\=['`"]\=\h\)\@!+hs=s+3    matchgroup=rubyStringDelimiter end=+^\s*\zs\z1$+ contains=rubyHeredocStart,@rubyStringSpecial fold keepend
+  syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]}).]\)\s\|\w\)\@<!<<[-~]"\z([^"]*\)"\ze\%(.*<<[-~]\=['`"]\=\h\)\@!+hs=s+3  matchgroup=rubyStringDelimiter end=+^\s*\zs\z1$+ contains=rubyHeredocStart,@rubyStringSpecial fold keepend
+  syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]}).]\)\s\|\w\)\@<!<<[-~]'\z([^']*\)'\ze\%(.*<<[-~]\=['`"]\=\h\)\@!+hs=s+3  matchgroup=rubyStringDelimiter end=+^\s*\zs\z1$+ contains=rubyHeredocStart		    fold keepend
+  syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]}).]\)\s\|\w\)\@<!<<[-~]`\z([^`]*\)`\ze\%(.*<<[-~]\=['`"]\=\h\)\@!+hs=s+3  matchgroup=rubyStringDelimiter end=+^\s*\zs\z1$+ contains=rubyHeredocStart,@rubyStringSpecial fold keepend
+else
+  syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]})"'.]\)\s\|\w\)\@<!<<\z(\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)\ze\%(.*<<[-~]\=['`"]\=\h\)\@!+hs=s+2	matchgroup=rubyStringDelimiter end=+^\z1$+ contains=rubyHeredocStart,rubyHeredoc,@rubyStringSpecial keepend
+  syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]})"'.]\)\s\|\w\)\@<!<<"\z([^"]*\)"\ze\%(.*<<[-~]\=['`"]\=\h\)\@!+hs=s+2	matchgroup=rubyStringDelimiter end=+^\z1$+ contains=rubyHeredocStart,rubyHeredoc,@rubyStringSpecial keepend
+  syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]})"'.]\)\s\|\w\)\@<!<<'\z([^']*\)'\ze\%(.*<<[-~]\=['`"]\=\h\)\@!+hs=s+2	matchgroup=rubyStringDelimiter end=+^\z1$+ contains=rubyHeredocStart,rubyHeredoc		    keepend
+  syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]})"'.]\)\s\|\w\)\@<!<<`\z([^`]*\)`\ze\%(.*<<[-~]\=['`"]\=\h\)\@!+hs=s+2	matchgroup=rubyStringDelimiter end=+^\z1$+ contains=rubyHeredocStart,rubyHeredoc,@rubyStringSpecial keepend
+
+  syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]}).]\)\s\|\w\)\@<!<<[-~]\z(\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*\)\ze\%(.*<<[-~]\=['`"]\=\h\)\@!+hs=s+3    matchgroup=rubyStringDelimiter end=+^\s*\zs\z1$+ contains=rubyHeredocStart,@rubyStringSpecial keepend
+  syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]}).]\)\s\|\w\)\@<!<<[-~]"\z([^"]*\)"\ze\%(.*<<[-~]\=['`"]\=\h\)\@!+hs=s+3  matchgroup=rubyStringDelimiter end=+^\s*\zs\z1$+ contains=rubyHeredocStart,@rubyStringSpecial keepend
+  syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]}).]\)\s\|\w\)\@<!<<[-~]'\z([^']*\)'\ze\%(.*<<[-~]\=['`"]\=\h\)\@!+hs=s+3  matchgroup=rubyStringDelimiter end=+^\s*\zs\z1$+ contains=rubyHeredocStart		    keepend
+  syn region rubyString start=+\%(\%(class\|::\)\_s*\|\%([]}).]\)\s\|\w\)\@<!<<[-~]`\z([^`]*\)`\ze\%(.*<<[-~]\=['`"]\=\h\)\@!+hs=s+3  matchgroup=rubyStringDelimiter end=+^\s*\zs\z1$+ contains=rubyHeredocStart,@rubyStringSpecial keepend
+endif
+
+" eRuby Config {{{1
 if exists('main_syntax') && main_syntax == 'eruby'
   let b:ruby_no_expensive = 1
 end
 
+" Module, Class, Method and Alias Declarations {{{1
 syn match  rubyAliasDeclaration    "[^[:space:];#.()]\+" contained contains=rubySymbol,rubyGlobalVariable,rubyPredefinedVariable nextgroup=rubyAliasDeclaration2 skipwhite
 syn match  rubyAliasDeclaration2   "[^[:space:];#.()]\+" contained contains=rubySymbol,rubyGlobalVariable,rubyPredefinedVariable
 syn match  rubyMethodDeclaration   "[^[:space:];#(]\+"	 contained contains=rubyConstant,rubyBoolean,rubyPseudoVariable,rubyInstanceVariable,rubyClassVariable,rubyGlobalVariable
 syn match  rubyClassDeclaration    "[^[:space:];#<]\+"	 contained contains=rubyConstant,rubyOperator
 syn match  rubyModuleDeclaration   "[^[:space:];#<]\+"	 contained contains=rubyConstant,rubyOperator
 syn match  rubyFunction "\<[_[:alpha:]][_[:alnum:]]*[?!=]\=[[:alnum:]_.:?!=]\@!" contained containedin=rubyMethodDeclaration
-syn match  rubyFunction "\%(\s\|^\)\@<=[_[:alpha:]][_[:alnum:]]*[?!=]\=\%(\s\|$\)\@=" contained containedin=rubyAliasDeclaration,rubyAliasDeclaration2
-syn match  rubyFunction "\%([[:space:].]\|^\)\@<=\%(\[\]=\=\|\*\*\|[+-]@\=\|[*/%|&^~]\|<<\|>>\|[<>]=\=\|<=>\|===\|[=!]=\|[=!]\~\|!\|`\)\%([[:space:];#(]\|$\)\@=" contained containedin=rubyAliasDeclaration,rubyAliasDeclaration2,rubyMethodDeclaration
+syn match  rubyFunction "\%(\s\|^\)\@1<=[_[:alpha:]][_[:alnum:]]*[?!=]\=\%(\s\|$\)\@=" contained containedin=rubyAliasDeclaration,rubyAliasDeclaration2
+syn match  rubyFunction "\%([[:space:].]\|^\)\@2<=\%(\[\]=\=\|\*\*\|[-+!~]@\=\|[*/%|&^~]\|<<\|>>\|[<>]=\=\|<=>\|===\|[=!]=\|[=!]\~\|!\|`\)\%([[:space:];#(]\|$\)\@=" contained containedin=rubyAliasDeclaration,rubyAliasDeclaration2,rubyMethodDeclaration
 
 syn cluster rubyDeclaration contains=rubyAliasDeclaration,rubyAliasDeclaration2,rubyMethodDeclaration,rubyModuleDeclaration,rubyClassDeclaration,rubyFunction,rubyBlockParameter
 
-" Keywords
+" Keywords {{{1
 " Note: the following keywords have already been defined:
 " begin case class def do end for if module unless until while
 syn match   rubyControl	       "\<\%(and\|break\|in\|next\|not\|or\|redo\|rescue\|retry\|return\)\>[?!]\@!"
 syn match   rubyOperator       "\<defined?" display
 syn match   rubyKeyword	       "\<\%(super\|yield\)\>[?!]\@!"
 syn match   rubyBoolean	       "\<\%(true\|false\)\>[?!]\@!"
-syn match   rubyPseudoVariable "\<\%(nil\|self\|__ENCODING__\|__FILE__\|__LINE__\|__callee__\|__method__\)\>[?!]\@!" " TODO: reorganise
+syn match   rubyPseudoVariable "\<\%(nil\|self\|__ENCODING__\|__dir__\|__FILE__\|__LINE__\|__callee__\|__method__\)\>[?!]\@!" " TODO: reorganise
 syn match   rubyBeginEnd       "\<\%(BEGIN\|END\)\>[?!]\@!"
 
-" Expensive Mode - match 'end' with the appropriate opening keyword for syntax
-" based folding and special highlighting of module/class/method definitions
+" Expensive Mode {{{1
+" Match 'end' with the appropriate opening keyword for syntax based folding
+" and special highlighting of module/class/method definitions
 if !exists("b:ruby_no_expensive") && !exists("ruby_no_expensive")
   syn match  rubyDefine "\<alias\>"  nextgroup=rubyAliasDeclaration  skipwhite skipnl
   syn match  rubyDefine "\<def\>"    nextgroup=rubyMethodDeclaration skipwhite skipnl
@@ -211,23 +339,66 @@ if !exists("b:ruby_no_expensive") && !exists("ruby_no_expensive")
   syn match  rubyClass	"\<class\>"  nextgroup=rubyClassDeclaration  skipwhite skipnl
   syn match  rubyModule "\<module\>" nextgroup=rubyModuleDeclaration skipwhite skipnl
 
-  syn region rubyMethodBlock start="\<def\>"	matchgroup=rubyDefine end="\%(\<def\_s\+\)\@<!\<end\>" contains=ALLBUT,@rubyNotTop fold
-  syn region rubyBlock	     start="\<class\>"	matchgroup=rubyClass  end="\<end\>"		       contains=ALLBUT,@rubyNotTop fold
-  syn region rubyBlock	     start="\<module\>" matchgroup=rubyModule end="\<end\>"		       contains=ALLBUT,@rubyNotTop fold
+  if s:foldable('def')
+    syn region rubyMethodBlock start="\<def\>"	matchgroup=rubyDefine end="\%(\<def\_s\+\)\@<!\<end\>" contains=ALLBUT,@rubyNotTop fold
+  else
+    syn region rubyMethodBlock start="\<def\>"	matchgroup=rubyDefine end="\%(\<def\_s\+\)\@<!\<end\>" contains=ALLBUT,@rubyNotTop
+  endif
+
+  if s:foldable('class')
+    syn region rubyBlock start="\<class\>"	matchgroup=rubyClass end="\<end\>" contains=ALLBUT,@rubyNotTop fold
+  else
+    syn region rubyBlock start="\<class\>"	matchgroup=rubyClass end="\<end\>" contains=ALLBUT,@rubyNotTop
+  endif
+
+  if s:foldable('module')
+    syn region rubyBlock start="\<module\>" matchgroup=rubyModule end="\<end\>" contains=ALLBUT,@rubyNotTop fold
+  else
+    syn region rubyBlock start="\<module\>" matchgroup=rubyModule end="\<end\>" contains=ALLBUT,@rubyNotTop
+  endif
 
   " modifiers
-  syn match rubyConditionalModifier "\<\%(if\|unless\)\>"    display
-  syn match rubyRepeatModifier	     "\<\%(while\|until\)\>" display
+  syn match rubyLineContinuation    "\\$" nextgroup=rubyConditionalModifier,rubyRepeatModifier skipwhite skipnl
+  syn match rubyConditionalModifier "\<\%(if\|unless\)\>"
+  syn match rubyRepeatModifier	    "\<\%(while\|until\)\>"
+
+  if s:foldable('do')
+    syn region rubyDoBlock matchgroup=rubyControl start="\<do\>" end="\<end\>" contains=ALLBUT,@rubyNotTop fold
+  else
+    syn region rubyDoBlock matchgroup=rubyControl start="\<do\>" end="\<end\>" contains=ALLBUT,@rubyNotTop
+  endif
 
-  syn region rubyDoBlock      matchgroup=rubyControl start="\<do\>" end="\<end\>"                 contains=ALLBUT,@rubyNotTop fold
   " curly bracket block or hash literal
-  syn region rubyCurlyBlock	matchgroup=rubyCurlyBlockDelimiter  start="{" end="}"				contains=ALLBUT,@rubyNotTop fold
-  syn region rubyArrayLiteral	matchgroup=rubyArrayDelimiter	    start="\%(\w\|[\]})]\)\@<!\[" end="]"	contains=ALLBUT,@rubyNotTop fold
+  if s:foldable('{')
+    syn region rubyCurlyBlock matchgroup=rubyCurlyBlockDelimiter start="{" end="}" contains=ALLBUT,@rubyNotTop fold
+  else
+    syn region rubyCurlyBlock matchgroup=rubyCurlyBlockDelimiter start="{" end="}" contains=ALLBUT,@rubyNotTop
+  endif
+
+  if s:foldable('[')
+    syn region rubyArrayLiteral	matchgroup=rubyArrayDelimiter start="\%(\w\|[\]})]\)\@<!\[" end="]" contains=ALLBUT,@rubyNotTop fold
+  else
+    syn region rubyArrayLiteral	matchgroup=rubyArrayDelimiter start="\%(\w\|[\]})]\)\@<!\[" end="]" contains=ALLBUT,@rubyNotTop
+  endif
 
   " statements without 'do'
-  syn region rubyBlockExpression       matchgroup=rubyControl	  start="\<begin\>" end="\<end\>" contains=ALLBUT,@rubyNotTop fold
-  syn region rubyCaseExpression	       matchgroup=rubyConditional start="\<case\>"  end="\<end\>" contains=ALLBUT,@rubyNotTop fold
-  syn region rubyConditionalExpression matchgroup=rubyConditional start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*/%&^|+=-]\|\%(\<[_[:lower:]][_[:alnum:]]*\)\@<![?!]\)\s*\)\@<=\%(if\|unless\)\>" end="\%(\%(\%(\.\@<!\.\)\|::\)\s*\)\@<!\<end\>" contains=ALLBUT,@rubyNotTop fold
+  if s:foldable('begin')
+    syn region rubyBlockExpression matchgroup=rubyControl start="\<begin\>" end="\<end\>" contains=ALLBUT,@rubyNotTop fold
+  else
+    syn region rubyBlockExpression matchgroup=rubyControl start="\<begin\>" end="\<end\>" contains=ALLBUT,@rubyNotTop
+  endif
+
+  if s:foldable('case')
+    syn region rubyCaseExpression matchgroup=rubyConditional start="\<case\>" end="\<end\>" contains=ALLBUT,@rubyNotTop fold
+  else
+    syn region rubyCaseExpression matchgroup=rubyConditional start="\<case\>" end="\<end\>" contains=ALLBUT,@rubyNotTop
+  endif
+
+  if s:foldable('if')
+    syn region rubyConditionalExpression matchgroup=rubyConditional start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*%&^|+=-]\|\%(\<[_[:lower:]][_[:alnum:]]*\)\@<![?!]\)\s*\)\@<=\%(if\|unless\)\>" end="\%(\%(\%(\.\@1<!\.\)\|::\)\s*\)\@<!\<end\>" contains=ALLBUT,@rubyNotTop fold
+  else
+    syn region rubyConditionalExpression matchgroup=rubyConditional start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*%&^|+=-]\|\%(\<[_[:lower:]][_[:alnum:]]*\)\@<![?!]\)\s*\)\@<=\%(if\|unless\)\>" end="\%(\%(\%(\.\@1<!\.\)\|::\)\s*\)\@<!\<end\>" contains=ALLBUT,@rubyNotTop
+  endif
 
   syn match rubyConditional "\<\%(then\|else\|when\)\>[?!]\@!"	contained containedin=rubyCaseExpression
   syn match rubyConditional "\<\%(then\|else\|elsif\)\>[?!]\@!" contained containedin=rubyConditionalExpression
@@ -237,7 +408,12 @@ if !exists("b:ruby_no_expensive") && !exists("ruby_no_expensive")
 
   " statements with optional 'do'
   syn region rubyOptionalDoLine   matchgroup=rubyRepeat start="\<for\>[?!]\@!" start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*/%&^|+-]\|\%(\<[_[:lower:]][_[:alnum:]]*\)\@<![!=?]\)\s*\)\@<=\<\%(until\|while\)\>" matchgroup=rubyOptionalDo end="\%(\<do\>\)" end="\ze\%(;\|$\)" oneline contains=ALLBUT,@rubyNotTop
-  syn region rubyRepeatExpression start="\<for\>[?!]\@!" start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*/%&^|+-]\|\%(\<[_[:lower:]][_[:alnum:]]*\)\@<![!=?]\)\s*\)\@<=\<\%(until\|while\)\>" matchgroup=rubyRepeat end="\<end\>" contains=ALLBUT,@rubyNotTop nextgroup=rubyOptionalDoLine fold
+
+  if s:foldable('for')
+    syn region rubyRepeatExpression start="\<for\>[?!]\@!" start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*/%&^|+-]\|\%(\<[_[:lower:]][_[:alnum:]]*\)\@<![!=?]\)\s*\)\@<=\<\%(until\|while\)\>" matchgroup=rubyRepeat end="\<end\>" contains=ALLBUT,@rubyNotTop nextgroup=rubyOptionalDoLine fold
+  else
+    syn region rubyRepeatExpression start="\<for\>[?!]\@!" start="\%(\%(^\|\.\.\.\=\|[{:,;([<>~\*/%&^|+-]\|\%(\<[_[:lower:]][_[:alnum:]]*\)\@<![!=?]\)\s*\)\@<=\<\%(until\|while\)\>" matchgroup=rubyRepeat end="\<end\>" contains=ALLBUT,@rubyNotTop nextgroup=rubyOptionalDoLine
+  endif
 
   if !exists("ruby_minlines")
     let ruby_minlines = 500
@@ -252,7 +428,7 @@ else
   syn match rubyKeyword "\<\%(alias\|undef\)\>[?!]\@!"
 endif
 
-" Special Methods
+" Special Methods {{{1
 if !exists("ruby_no_special_methods")
   syn keyword rubyAccess    public protected private public_class_method private_class_method public_constant private_constant module_function
   " attr is a common variable name
@@ -263,40 +439,40 @@ if !exists("ruby_no_special_methods")
   syn keyword rubyException raise fail catch throw
   " false positive with 'include?'
   syn match   rubyInclude   "\<include\>[?!]\@!"
-  syn keyword rubyInclude   autoload extend load prepend require require_relative
+  syn keyword rubyInclude   autoload extend load prepend refine require require_relative using
   syn keyword rubyKeyword   callcc caller lambda proc
 endif
 
-" Comments and Documentation
+" Comments and Documentation {{{1
 syn match   rubySharpBang "\%^#!.*" display
-syn keyword rubyTodo	  FIXME NOTE TODO OPTIMIZE XXX todo contained
+syn keyword rubyTodo	  FIXME NOTE TODO OPTIMIZE HACK REVIEW XXX todo contained
 syn match   rubyComment   "#.*" contains=rubySharpBang,rubySpaceError,rubyTodo,@Spell
-if !exists("ruby_no_comment_fold")
-  syn region rubyMultilineComment start="\%(\%(^\s*#.*\n\)\@<!\%(^\s*#.*\n\)\)\%(\(^\s*#.*\n\)\{1,}\)\@=" end="\%(^\s*#.*\n\)\@<=\%(^\s*#.*\n\)\%(^\s*#\)\@!" contains=rubyComment transparent fold keepend
+if !exists("ruby_no_comment_fold") && s:foldable('#')
+  syn region rubyMultilineComment start="^\s*#.*\n\%(^\s*#\)\@=" end="^\s*#.*\n\%(^\s*#\)\@!" contains=rubyComment transparent fold keepend
   syn region rubyDocumentation	  start="^=begin\ze\%(\s.*\)\=$" end="^=end\%(\s.*\)\=$" contains=rubySpaceError,rubyTodo,@Spell fold
 else
   syn region rubyDocumentation	  start="^=begin\s*$" end="^=end\s*$" contains=rubySpaceError,rubyTodo,@Spell
 endif
 
+" Keyword Nobbling {{{1
 " Note: this is a hack to prevent 'keywords' being highlighted as such when called as methods with an explicit receiver
-syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(alias\|and\|begin\|break\|case\|class\|def\|defined\|do\|else\)\>"		  transparent contains=NONE
-syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(elsif\|end\|ensure\|false\|for\|if\|in\|module\|next\|nil\)\>"		  transparent contains=NONE
-syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(not\|or\|redo\|rescue\|retry\|return\|self\|super\|then\|true\)\>"		  transparent contains=NONE
-syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(undef\|unless\|until\|when\|while\|yield\|BEGIN\|END\|__FILE__\|__LINE__\)\>" transparent contains=NONE
+syn match rubyKeywordAsMethod "\%(\%(\.\@1<!\.\)\|::\)\_s*\%([_[:lower:]][_[:alnum:]]*\|\<\%(BEGIN\|END\)\>\)" transparent contains=NONE
+syn match rubyKeywordAsMethod "\(defined?\|exit!\)\@!\<[_[:lower:]][_[:alnum:]]*[?!]"			       transparent contains=NONE
 
-syn match rubyKeywordAsMethod "\<\%(alias\|begin\|case\|class\|def\|do\|end\)[?!]" transparent contains=NONE
-syn match rubyKeywordAsMethod "\<\%(if\|module\|undef\|unless\|until\|while\)[?!]" transparent contains=NONE
+" More Symbols {{{1
+syn match  rubySymbol		"\%([{(,]\_s*\)\zs\l\w*[!?]\=::\@!"he=e-1
+syn match  rubySymbol		"[]})\"':]\@1<!\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[!?]\=:[[:space:],]\@="he=e-1
+syn match  rubySymbol		"\%([{(,]\_s*\)\zs[[:space:],{]\l\w*[!?]\=::\@!"hs=s+1,he=e-1
+syn match  rubySymbol		"[[:space:],{(]\%(\h\|[^\x00-\x7F]\)\%(\w\|[^\x00-\x7F]\)*[!?]\=:[[:space:],]\@="hs=s+1,he=e-1
 
-syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(abort\|at_exit\|attr\|attr_accessor\|attr_reader\)\>"	transparent contains=NONE
-syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(attr_writer\|autoload\|callcc\|catch\|caller\)\>"		transparent contains=NONE
-syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(eval\|class_eval\|instance_eval\|module_eval\|exit\)\>"	transparent contains=NONE
-syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(extend\|fail\|fork\|include\|lambda\)\>"			transparent contains=NONE
-syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(load\|loop\|prepend\|private\|proc\|protected\)\>"		transparent contains=NONE
-syn match rubyKeywordAsMethod "\%(\%(\.\@<!\.\)\|::\)\_s*\%(public\|require\|require_relative\|raise\|throw\|trap\)\>"	transparent contains=NONE
-
-" __END__ Directive
-syn region rubyData matchgroup=rubyDataDirective start="^__END__$" end="\%$" fold
+" __END__ Directive {{{1
+if s:foldable('__END__')
+  syn region rubyData matchgroup=rubyDataDirective start="^__END__$" end="\%$" fold
+else
+  syn region rubyData matchgroup=rubyDataDirective start="^__END__$" end="\%$"
+endif
 
+" Default Highlighting {{{1
 hi def link rubyClass			rubyDefine
 hi def link rubyModule			rubyDefine
 hi def link rubyMethodExceptional	rubyDefine
@@ -336,6 +512,7 @@ hi def link rubyAccess			Statement
 hi def link rubyAttribute		Statement
 hi def link rubyEval			Statement
 hi def link rubyPseudoVariable		Constant
+hi def link rubyCapitalizedMethod	rubyLocalVariableOrMethod
 
 hi def link rubyComment			Comment
 hi def link rubyData			Comment
@@ -349,7 +526,7 @@ hi def link rubyInterpolationDelimiter	Delimiter
 hi def link rubyNoInterpolation		rubyString
 hi def link rubySharpBang		PreProc
 hi def link rubyRegexpDelimiter		rubyStringDelimiter
-hi def link rubySymbolDelimiter		rubyStringDelimiter
+hi def link rubySymbolDelimiter		rubySymbol
 hi def link rubyStringDelimiter		Delimiter
 hi def link rubyHeredoc			rubyString
 hi def link rubyString			String
@@ -366,6 +543,10 @@ hi def link rubyInvalidVariable		Error
 hi def link rubyError			Error
 hi def link rubySpaceError		rubyError
 
+" Postscript {{{1
 let b:current_syntax = "ruby"
 
-" vim: nowrap sw=2 sts=2 ts=8 noet:
+let &cpo = s:cpo_sav
+unlet! s:cpo_sav
+
+" vim: nowrap sw=2 sts=2 ts=8 noet fdm=marker:
diff --git a/runtime/syntax/samba.vim b/runtime/syntax/samba.vim
index 93029cc202..ddd35a8e3d 100644
--- a/runtime/syntax/samba.vim
+++ b/runtime/syntax/samba.vim
@@ -8,11 +8,8 @@
 "
 " Don't forget to run your config file through testparm(1)!
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -107,24 +104,16 @@ syn keyword sambaKeyword contained shutdown signing special spnego
 syn keyword sambaKeyword contained store unknown unwriteable
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_samba_syn_inits")
-  if version < 508
-    let did_samba_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink sambaParameter Normal
-  HiLink sambaKeyword   Type
-  HiLink sambaSection   Statement
-  HiLink sambaMacro     PreProc
-  HiLink sambaComment   Comment
-  HiLink sambaContinue  Operator
-  HiLink sambaBoolean   Constant
-  delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+HiLink sambaParameter Normal
+HiLink sambaKeyword   Type
+HiLink sambaSection   Statement
+HiLink sambaMacro     PreProc
+HiLink sambaComment   Comment
+HiLink sambaContinue  Operator
+HiLink sambaBoolean   Constant
+delcommand HiLink
 
 let b:current_syntax = "samba"
 
diff --git a/runtime/syntax/sas.vim b/runtime/syntax/sas.vim
index dc70e1fd90..a99501103d 100644
--- a/runtime/syntax/sas.vim
+++ b/runtime/syntax/sas.vim
@@ -12,11 +12,8 @@
 "		Attempted to match SAS default syntax colors;
 "		Changed syncing so it doesn't lose colors on large blocks;
 "		Much thanks to Bob Heckel for knowledgeable tweaking.
-"  For version 5.x: Clear all syntax items
-"  For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-   syntax clear
-elseif exists("b:current_syntax")
+"  quit when a syntax file was already loaded
+if exists("b:current_syntax")
    finish
 endif
 
@@ -52,11 +49,7 @@ syn region sasComment start="^\s*\*" end=";" contains=sasTodo
 " Thanks to ronald h�llwarth for this fix to an intra-versioning
 " problem with this little feature
 
-if version < 600
-   syn region sasMacroVar	start="\&" skip="[_&]" end="\W"he=e-1
-else		 " for the older Vim's just do it their way ...
-   syn region sasMacroVar	start="&" skip="[_&]" end="\W"he=e-1
-endif
+syn region sasMacroVar	start="&" skip="[_&]" end="\W"he=e-1
 
 
 " I dont think specific PROCs need to be listed if use this line (Bob Heckel).
@@ -218,62 +211,54 @@ syn keyword sasUnderscore	_ALL_ _AUTOMATIC_ _CHARACTER_ _INFILE_ _N_ _NAME_ _NUL
 " End of SAS Functions
 
 "  Define the default highlighting.
-"  For version 5.7 and earlier: only when not done already
-"  For version 5.8 and later: only when an item doesn't have highlighting yet
+"  Only when an item doesn't have highlighting yet
 
-if version >= 508 || !exists("did_sas_syntax_inits")
-   if version < 508
-      let did_sas_syntax_inits = 1
-      command -nargs=+ HiLink hi link <args>
-   else
-      command -nargs=+ HiLink hi def link <args>
-   endif
+command -nargs=+ HiLink hi def link <args>
 
-   " Default sas enhanced editor color syntax
-	hi sComment	term=bold cterm=NONE ctermfg=Green ctermbg=Black gui=NONE guifg=DarkGreen guibg=White
-	hi sCard	term=bold cterm=NONE ctermfg=Black ctermbg=Yellow gui=NONE guifg=Black guibg=LightYellow
-	hi sDate_Time	term=NONE cterm=bold ctermfg=Green ctermbg=Black gui=bold guifg=SeaGreen guibg=White
-	hi sKeyword	term=NONE cterm=NONE ctermfg=Blue  ctermbg=Black gui=NONE guifg=Blue guibg=White
-	hi sFmtInfmt	term=NONE cterm=NONE ctermfg=LightGreen ctermbg=Black gui=NONE guifg=SeaGreen guibg=White
-	hi sString	term=NONE cterm=NONE ctermfg=Magenta ctermbg=Black gui=NONE guifg=Purple guibg=White
-	hi sText	term=NONE cterm=NONE ctermfg=White ctermbg=Black gui=bold guifg=Black guibg=White
-	hi sNumber	term=NONE cterm=bold ctermfg=Green ctermbg=Black gui=bold guifg=SeaGreen guibg=White
-	hi sProc	term=NONE cterm=bold ctermfg=Blue ctermbg=Black gui=bold guifg=Navy guibg=White
-	hi sSection	term=NONE cterm=bold ctermfg=Blue ctermbg=Black gui=bold guifg=Navy guibg=White
-	hi mDefine	term=NONE cterm=bold ctermfg=White ctermbg=Black gui=bold guifg=Black guibg=White
-	hi mKeyword	term=NONE cterm=NONE ctermfg=Blue ctermbg=Black gui=NONE guifg=Blue guibg=White
-	hi mReference	term=NONE cterm=bold ctermfg=White ctermbg=Black gui=bold guifg=Blue guibg=White
-	hi mSection	term=NONE cterm=NONE ctermfg=Blue ctermbg=Black gui=bold guifg=Navy guibg=White
-	hi mText	term=NONE cterm=NONE ctermfg=White ctermbg=Black gui=bold guifg=Black guibg=White
+" Default sas enhanced editor color syntax
+hi sComment	term=bold cterm=NONE ctermfg=Green ctermbg=Black gui=NONE guifg=DarkGreen guibg=White
+hi sCard	term=bold cterm=NONE ctermfg=Black ctermbg=Yellow gui=NONE guifg=Black guibg=LightYellow
+hi sDate_Time	term=NONE cterm=bold ctermfg=Green ctermbg=Black gui=bold guifg=SeaGreen guibg=White
+hi sKeyword	term=NONE cterm=NONE ctermfg=Blue  ctermbg=Black gui=NONE guifg=Blue guibg=White
+hi sFmtInfmt	term=NONE cterm=NONE ctermfg=LightGreen ctermbg=Black gui=NONE guifg=SeaGreen guibg=White
+hi sString	term=NONE cterm=NONE ctermfg=Magenta ctermbg=Black gui=NONE guifg=Purple guibg=White
+hi sText	term=NONE cterm=NONE ctermfg=White ctermbg=Black gui=bold guifg=Black guibg=White
+hi sNumber	term=NONE cterm=bold ctermfg=Green ctermbg=Black gui=bold guifg=SeaGreen guibg=White
+hi sProc	term=NONE cterm=bold ctermfg=Blue ctermbg=Black gui=bold guifg=Navy guibg=White
+hi sSection	term=NONE cterm=bold ctermfg=Blue ctermbg=Black gui=bold guifg=Navy guibg=White
+hi mDefine	term=NONE cterm=bold ctermfg=White ctermbg=Black gui=bold guifg=Black guibg=White
+hi mKeyword	term=NONE cterm=NONE ctermfg=Blue ctermbg=Black gui=NONE guifg=Blue guibg=White
+hi mReference	term=NONE cterm=bold ctermfg=White ctermbg=Black gui=bold guifg=Blue guibg=White
+hi mSection	term=NONE cterm=NONE ctermfg=Blue ctermbg=Black gui=bold guifg=Navy guibg=White
+hi mText	term=NONE cterm=NONE ctermfg=White ctermbg=Black gui=bold guifg=Black guibg=White
 
 " Colors that closely match SAS log colors for default color scheme
-	hi lError	term=NONE cterm=NONE ctermfg=Red ctermbg=Black gui=none guifg=Red guibg=White
-	hi lWarning	term=NONE cterm=NONE ctermfg=Green ctermbg=Black gui=none guifg=Green guibg=White
-	hi lNote	term=NONE cterm=NONE ctermfg=Cyan ctermbg=Black gui=none guifg=Blue guibg=White
+hi lError	term=NONE cterm=NONE ctermfg=Red ctermbg=Black gui=none guifg=Red guibg=White
+hi lWarning	term=NONE cterm=NONE ctermfg=Green ctermbg=Black gui=none guifg=Green guibg=White
+hi lNote	term=NONE cterm=NONE ctermfg=Cyan ctermbg=Black gui=none guifg=Blue guibg=White
 
 
-   " Special hilighting for the SAS proc section
+" Special hilighting for the SAS proc section
 
-	HiLink	sasComment	sComment
-	HiLink	sasConditional	sKeyword
-	HiLink	sasStep		sSection
-	HiLink	sasFunction	sKeyword
-	HiLink	sasMacro	mKeyword
-	HiLink	sasMacroVar	NonText
-	HiLink	sasNumber	sNumber
-	HiLink	sasStatement	sKeyword
-	HiLink	sasString	sString
-	HiLink	sasProc		sProc
-   " (Bob Heckel)
-	HiLink	sasTodo		Todo
-	HiLink	sasErrMsg	lError
-	HiLink	sasWarnMsg	lWarning
-	HiLink	sasLogMsg	lNote
-	HiLink	sasCards	sCard
-  " (Bob Heckel)
-	HiLink	sasUnderscore	PreProc
-	delcommand HiLink
-endif
+HiLink	sasComment	sComment
+HiLink	sasConditional	sKeyword
+HiLink	sasStep		sSection
+HiLink	sasFunction	sKeyword
+HiLink	sasMacro	mKeyword
+HiLink	sasMacroVar	NonText
+HiLink	sasNumber	sNumber
+HiLink	sasStatement	sKeyword
+HiLink	sasString	sString
+HiLink	sasProc		sProc
+" (Bob Heckel)
+HiLink	sasTodo		Todo
+HiLink	sasErrMsg	lError
+HiLink	sasWarnMsg	lWarning
+HiLink	sasLogMsg	lNote
+HiLink	sasCards	sCard
+" (Bob Heckel)
+HiLink	sasUnderscore	PreProc
+delcommand HiLink
 
 " Syncronize from beginning to keep large blocks from losing
 " syntax coloring while moving through code.
diff --git a/runtime/syntax/sass.vim b/runtime/syntax/sass.vim
index 2ea0722696..d075c8736e 100644
--- a/runtime/syntax/sass.vim
+++ b/runtime/syntax/sass.vim
@@ -2,7 +2,7 @@
 " Language:	Sass
 " Maintainer:	Tim Pope <vimNOSPAM@tpope.org>
 " Filenames:	*.sass
-" Last Change:	2013 May 30
+" Last Change:	2016 Aug 29
 
 if exists("b:current_syntax")
   finish
@@ -13,7 +13,7 @@ runtime! syntax/css.vim
 syn case ignore
 
 syn cluster sassCssProperties contains=cssFontProp,cssFontDescriptorProp,cssColorProp,cssTextProp,cssBoxProp,cssGeneratedContentProp,cssPagingProp,cssUIProp,cssRenderProp,cssAuralProp,cssTableProp
-syn cluster sassCssAttributes contains=css.*Attr,scssComment,cssValue.*,cssColor,cssURL,sassDefault,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssRenderProp
+syn cluster sassCssAttributes contains=css.*Attr,sassEndOfLineComment,scssComment,cssValue.*,cssColor,cssURL,sassDefault,cssImportant,cssError,cssStringQ,cssStringQQ,cssFunction,cssUnicodeEscape,cssRenderProp
 
 syn region sassDefinition matchgroup=cssBraces start="{" end="}" contains=TOP
 
@@ -58,6 +58,9 @@ syn match sassAmpersand  "&"
 " TODO: Attribute namespaces
 " TODO: Arithmetic (including strings and concatenation)
 
+syn region sassMediaQuery matchgroup=sassMedia start="@media" end="[{};]\@=\|$" contains=sassMediaOperators
+syn keyword sassMediaOperators and not only contained
+syn region sassCharset start="@charset" end=";\|$" contains=scssComment,cssStringQ,cssStringQQ,cssURL,cssUnicodeEscape,cssMediaType
 syn region sassInclude start="@import" end=";\|$" contains=scssComment,cssStringQ,cssStringQQ,cssURL,cssUnicodeEscape,cssMediaType
 syn region sassDebugLine end=";\|$" matchgroup=sassDebug start="@debug\>" contains=@sassCssAttributes,sassVariable,sassFunction
 syn region sassWarnLine end=";\|$" matchgroup=sassWarn start="@warn\>" contains=@sassCssAttributes,sassVariable,sassFunction
@@ -67,7 +70,9 @@ syn keyword sassFor from to through in contained
 syn keyword sassTodo        FIXME NOTE TODO OPTIMIZE XXX contained
 syn region  sassComment     start="^\z(\s*\)//"  end="^\%(\z1 \)\@!" contains=sassTodo,@Spell
 syn region  sassCssComment  start="^\z(\s*\)/\*" end="^\%(\z1 \)\@!" contains=sassTodo,@Spell
+syn match   sassEndOfLineComment "//.*" contains=sassComment,sassTodo,@Spell
 
+hi def link sassEndOfLineComment        sassComment
 hi def link sassCssComment              sassComment
 hi def link sassComment                 Comment
 hi def link sassDefault                 cssImportant
@@ -80,6 +85,9 @@ hi def link sassExtend                  PreProc
 hi def link sassFunctionDecl            PreProc
 hi def link sassReturn                  PreProc
 hi def link sassTodo                    Todo
+hi def link sassCharset                 PreProc
+hi def link sassMedia                   PreProc
+hi def link sassMediaOperators          PreProc
 hi def link sassInclude                 Include
 hi def link sassDebug                   sassControl
 hi def link sassWarn                    sassControl
diff --git a/runtime/syntax/sather.vim b/runtime/syntax/sather.vim
index 103cf0b8cd..bc35ba2dcf 100644
--- a/runtime/syntax/sather.vim
+++ b/runtime/syntax/sather.vim
@@ -9,11 +9,8 @@
 " Homepage: http://www.icsi.berkeley.edu/~sather
 " Sather files use .sa as suffix
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -61,44 +58,36 @@ syn match   satherComment	  "--.*" contains=satherComment2String,satherCharacter
 syn sync ccomment satherComment
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_sather_syn_inits")
-  if version < 508
-    let did_sather_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink satherBranch		satherStatement
-  HiLink satherLabel		satherStatement
-  HiLink satherConditional	satherStatement
-  HiLink satherSynchronize	satherStatement
-  HiLink satherRepeat		satherStatement
-  HiLink satherExceptions	satherStatement
-  HiLink satherStorageClass	satherDeclarative
-  HiLink satherMethodDecl	satherDeclarative
-  HiLink satherClassDecl	satherDeclarative
-  HiLink satherScopeDecl	satherDeclarative
-  HiLink satherBoolValue	satherValue
-  HiLink satherSpecial		satherValue
-  HiLink satherString		satherValue
-  HiLink satherCharacter	satherValue
-  HiLink satherSpecialCharacter satherValue
-  HiLink satherNumber		satherValue
-  HiLink satherStatement	Statement
-  HiLink satherOperator		Statement
-  HiLink satherComment		Comment
-  HiLink satherType		Type
-  HiLink satherValue		String
-  HiLink satherString		String
-  HiLink satherSpecial		String
-  HiLink satherCharacter	String
-  HiLink satherDeclarative	Type
-  HiLink satherExternal		PreCondit
-  delcommand HiLink
-endif
+HiLink satherBranch		satherStatement
+HiLink satherLabel		satherStatement
+HiLink satherConditional	satherStatement
+HiLink satherSynchronize	satherStatement
+HiLink satherRepeat		satherStatement
+HiLink satherExceptions	satherStatement
+HiLink satherStorageClass	satherDeclarative
+HiLink satherMethodDecl	satherDeclarative
+HiLink satherClassDecl	satherDeclarative
+HiLink satherScopeDecl	satherDeclarative
+HiLink satherBoolValue	satherValue
+HiLink satherSpecial		satherValue
+HiLink satherString		satherValue
+HiLink satherCharacter	satherValue
+HiLink satherSpecialCharacter satherValue
+HiLink satherNumber		satherValue
+HiLink satherStatement	Statement
+HiLink satherOperator		Statement
+HiLink satherComment		Comment
+HiLink satherType		Type
+HiLink satherValue		String
+HiLink satherString		String
+HiLink satherSpecial		String
+HiLink satherCharacter	String
+HiLink satherDeclarative	Type
+HiLink satherExternal		PreCondit
+delcommand HiLink
 
 let b:current_syntax = "sather"
 
diff --git a/runtime/syntax/scala.vim b/runtime/syntax/scala.vim
index b04af3be5b..7779c43996 100644
--- a/runtime/syntax/scala.vim
+++ b/runtime/syntax/scala.vim
@@ -7,9 +7,8 @@
 " ----------------------------------------------------------------------------
 
 if !exists('main_syntax')
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
+  " quit when a syntax file was already loaded
+  if exists("b:current_syntax")
     finish
   endif
   let main_syntax = 'scala'
diff --git a/runtime/syntax/scheme.vim b/runtime/syntax/scheme.vim
index c59e09cd17..ac50ead6ce 100644
--- a/runtime/syntax/scheme.vim
+++ b/runtime/syntax/scheme.vim
@@ -14,11 +14,8 @@
 
 " Initializing:
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -64,11 +61,7 @@ syn region schemeUnquote matchgroup=Delimiter start=",@#\[" end="\]" contains=AL
 
 " R5RS Scheme Functions and Syntax:
 
-if version < 600
-  set iskeyword=33,35-39,42-58,60-90,94,95,97-122,126,_
-else
-  setlocal iskeyword=33,35-39,42-58,60-90,94,95,97-122,126,_
-endif
+setlocal iskeyword=33,35-39,42-58,60-90,94,95,97-122,126,_
 
 syn keyword schemeSyntax lambda and or if cond case define let let* letrec
 syn keyword schemeSyntax begin do delay set! else =>
@@ -306,38 +299,30 @@ syn sync match matchPlace grouphere NONE "^[^ \t]"
 " ... i.e. synchronize on a line that starts at the left margin
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_scheme_syntax_inits")
-  if version < 508
-    let did_scheme_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink schemeSyntax		Statement
-  HiLink schemeFunc		Function
+HiLink schemeSyntax		Statement
+HiLink schemeFunc		Function
 
-  HiLink schemeString		String
-  HiLink schemeCharacter	Character
-  HiLink schemeNumber		Number
-  HiLink schemeBoolean		Boolean
+HiLink schemeString		String
+HiLink schemeCharacter	Character
+HiLink schemeNumber		Number
+HiLink schemeBoolean		Boolean
 
-  HiLink schemeDelimiter	Delimiter
-  HiLink schemeConstant		Constant
+HiLink schemeDelimiter	Delimiter
+HiLink schemeConstant		Constant
 
-  HiLink schemeComment		Comment
-  HiLink schemeMultilineComment	Comment
-  HiLink schemeError		Error
+HiLink schemeComment		Comment
+HiLink schemeMultilineComment	Comment
+HiLink schemeError		Error
 
-  HiLink schemeExtSyntax	Type
-  HiLink schemeExtFunc		PreProc
+HiLink schemeExtSyntax	Type
+HiLink schemeExtFunc		PreProc
 
-  HiLink schemeLang		PreProc
+HiLink schemeLang		PreProc
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "scheme"
 
diff --git a/runtime/syntax/scilab.vim b/runtime/syntax/scilab.vim
index 1bfc003678..bee4007f57 100644
--- a/runtime/syntax/scilab.vim
+++ b/runtime/syntax/scilab.vim
@@ -9,11 +9,8 @@
 "
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -66,49 +63,41 @@ syn match scilabOverload			"%[A-Za-z0-9?!_#$]\+_[A-Za-z0-9?!_#$]\+"
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_scilab_syntax_inits")
-	if version < 508
-		let did_scilab_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink	scilabStatement				Statement
-	HiLink	scilabFunction				Keyword
-	HiLink	scilabPredicate				Keyword
-	HiLink	scilabKeyword				Keyword
-	HiLink	scilabDebug					Debug
-	HiLink	scilabRepeat				Repeat
-	HiLink	scilabConditional			Conditional
-	HiLink	scilabMultiplex				Conditional
+HiLink	scilabStatement				Statement
+HiLink	scilabFunction				Keyword
+HiLink	scilabPredicate				Keyword
+HiLink	scilabKeyword				Keyword
+HiLink	scilabDebug					Debug
+HiLink	scilabRepeat				Repeat
+HiLink	scilabConditional			Conditional
+HiLink	scilabMultiplex				Conditional
 
-	HiLink	scilabConstant				Constant
-	HiLink	scilabBoolean				Boolean
+HiLink	scilabConstant				Constant
+HiLink	scilabBoolean				Boolean
 
-	HiLink	scilabDelimiter				Delimiter
-	HiLink	scilabMlistAccess			Delimiter
-	HiLink	scilabComparison			Operator
-	HiLink	scilabLogical				Operator
-	HiLink	scilabAssignment			Operator
-	HiLink	scilabArithmetic			Operator
-	HiLink	scilabRange					Operator
-	HiLink	scilabLineContinuation		Underlined
-	HiLink	scilabTransposition			Operator
+HiLink	scilabDelimiter				Delimiter
+HiLink	scilabMlistAccess			Delimiter
+HiLink	scilabComparison			Operator
+HiLink	scilabLogical				Operator
+HiLink	scilabAssignment			Operator
+HiLink	scilabArithmetic			Operator
+HiLink	scilabRange					Operator
+HiLink	scilabLineContinuation		Underlined
+HiLink	scilabTransposition			Operator
 
-	HiLink	scilabTodo					Todo
-	HiLink	scilabComment				Comment
+HiLink	scilabTodo					Todo
+HiLink	scilabComment				Comment
 
-	HiLink	scilabNumber				Number
-	HiLink	scilabString				String
+HiLink	scilabNumber				Number
+HiLink	scilabString				String
 
-	HiLink	scilabIdentifier			Identifier
-	HiLink	scilabOverload				Special
+HiLink	scilabIdentifier			Identifier
+HiLink	scilabOverload				Special
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "scilab"
 
diff --git a/runtime/syntax/sd.vim b/runtime/syntax/sd.vim
index 7fa0e04492..015c1f0890 100644
--- a/runtime/syntax/sd.vim
+++ b/runtime/syntax/sd.vim
@@ -5,9 +5,8 @@
 " URL: http://netstudent.polito.it/vim_syntax/
 " Last Change: 2012 Feb 03 by Thilo Six
 
-if version < 600
-        syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
         finish
 endif
 
@@ -51,29 +50,22 @@ syn keyword sdSpecial TRUE FALSE NULL
 syn keyword sdDelimiter STREAM STREAM_END
 syn match sdError /^search .\{257,}/
 
-if version >= 508 || !exists("did_config_syntax_inits")
-        if version < 508
-                let did_config_syntax_inits = 1
-                command! -nargs=+ HiLink hi link <args>
-        else
-                command! -nargs=+ HiLink hi def link <args>
-        endif
+command! -nargs=+ HiLink hi def link <args>
 
-        HiLink sdIP Number
-		  HiLink sdHostname Type
-        HiLink sdEncoding Identifier
-        HiLink sdCoding Identifier
-        HiLink sdSource Identifier
-        HiLink sdComment Comment
-        HiLink sdIPError Error
-        HiLink sdError Error
-        HiLink sdStatement Statement
-        HiLink sdIPSpecial Special
-        HiLink sdSpecial Special
-		  HiLink sdDelimiter Delimiter
+HiLink sdIP Number
+HiLink sdHostname Type
+HiLink sdEncoding Identifier
+HiLink sdCoding Identifier
+HiLink sdSource Identifier
+HiLink sdComment Comment
+HiLink sdIPError Error
+HiLink sdError Error
+HiLink sdStatement Statement
+HiLink sdIPSpecial Special
+HiLink sdSpecial Special
+HiLink sdDelimiter Delimiter
 
-        delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "sd"
 
diff --git a/runtime/syntax/sdl.vim b/runtime/syntax/sdl.vim
index b524b72266..51086dad1f 100644
--- a/runtime/syntax/sdl.vim
+++ b/runtime/syntax/sdl.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Michael Piefel <entwurf@piefel.de>
 " Last Change:	2 May 2001
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
@@ -129,38 +126,29 @@ syn keyword sdlType		STRING OBJECT IDENTIFIER NULL
 syn sync ccomment sdlComment
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_sdl_syn_inits")
-    if version < 508
-	let did_sdl_syn_inits = 1
-	command -nargs=+ HiLink hi link <args>
-	command -nargs=+ Hi     hi <args>
-    else
-	command -nargs=+ HiLink hi def link <args>
-	command -nargs=+ Hi     hi def <args>
-    endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+command -nargs=+ Hi     hi def <args>
 
-    HiLink  sdlException	Label
-    HiLink  sdlConditional	sdlStatement
-    HiLink  sdlVirtual		sdlStatement
-    HiLink  sdlExported		sdlFlag
-    HiLink  sdlCommentError	sdlError
-    HiLink  sdlOperator		Operator
-    HiLink  sdlStructure	sdlType
-    Hi	    sdlStatement	term=bold ctermfg=4 guifg=Blue
-    Hi	    sdlFlag		term=bold ctermfg=4 guifg=Blue gui=italic
-    Hi	    sdlNewState		term=italic ctermfg=2 guifg=Magenta gui=underline
-    Hi	    sdlInput		term=bold guifg=Red
-    HiLink  sdlType		Type
-    HiLink  sdlString		String
-    HiLink  sdlComment		Comment
-    HiLink  sdlSpecial		Special
-    HiLink  sdlError		Error
+HiLink  sdlException	Label
+HiLink  sdlConditional	sdlStatement
+HiLink  sdlVirtual		sdlStatement
+HiLink  sdlExported		sdlFlag
+HiLink  sdlCommentError	sdlError
+HiLink  sdlOperator		Operator
+HiLink  sdlStructure	sdlType
+Hi	    sdlStatement	term=bold ctermfg=4 guifg=Blue
+Hi	    sdlFlag		term=bold ctermfg=4 guifg=Blue gui=italic
+Hi	    sdlNewState		term=italic ctermfg=2 guifg=Magenta gui=underline
+Hi	    sdlInput		term=bold guifg=Red
+HiLink  sdlType		Type
+HiLink  sdlString		String
+HiLink  sdlComment		Comment
+HiLink  sdlSpecial		Special
+HiLink  sdlError		Error
 
-    delcommand HiLink
-    delcommand Hi
-endif
+delcommand HiLink
+delcommand Hi
 
 let b:current_syntax = "sdl"
 
diff --git a/runtime/syntax/sed.vim b/runtime/syntax/sed.vim
index f0f80300d6..63b39db81f 100644
--- a/runtime/syntax/sed.vim
+++ b/runtime/syntax/sed.vim
@@ -4,11 +4,8 @@
 " URL:		http://folk.uio.no/hakonrk/vim/syntax/sed.vim
 " Last Change:	2010 May 29
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
@@ -49,8 +46,12 @@ syn match sedReplaceMeta    "&\|\\\($\|.\)" contains=sedTab contained
 " Metacharacters: $ * . \ ^ [ ~
 " @ is used as delimiter and treated on its own below
 let __at = char2nr("@")
-let __sed_i = char2nr(" ") " ASCII: 32
-let __sed_last = 126
+let __sed_i = char2nr(" ") " ASCII: 32, EBCDIC: 64
+if has("ebcdic")
+    let __sed_last = 255
+else
+    let __sed_last = 126
+endif
 let __sed_metacharacters = '$*.\^[~'
 while __sed_i <= __sed_last
     let __sed_delimiter = escape(nr2char(__sed_i), __sed_metacharacters)
@@ -71,45 +72,36 @@ syn region sedReplacement64 matchgroup=Special start=+@\(\\\\\|\\@\)*+ skip=+[^\
 " (y) does not allow any flags.  To save memory, I ignore this problem.
 syn match sedST	"[sy]" nextgroup=sedRegexp\d\+
 
-if version >= 508 || !exists("did_sed_syntax_inits")
-    if version < 508
-	let did_sed_syntax_inits = 1
-	command -nargs=+ HiLink hi link <args>
-    else
-	command -nargs=+ HiLink hi def link <args>
-    endif
 
-    HiLink sedAddress		Macro
-    HiLink sedACI		NONE
-    HiLink sedBranch		Label
-    HiLink sedComment		Comment
-    HiLink sedDelete		Function
-    HiLink sedError		Error
-    HiLink sedFlag		Type
-    HiLink sedFlagwrite		Constant
-    HiLink sedFunction		Function
-    HiLink sedLabel		Label
-    HiLink sedLineCont		Special
-    HiLink sedPutHoldspc	Function
-    HiLink sedReplaceMeta	Special
-    HiLink sedRegexpMeta	Special
-    HiLink sedRW		Constant
-    HiLink sedSemicolon		Special
-    HiLink sedST		Function
-    HiLink sedSpecial		Special
-    HiLink sedWhitespace	NONE
-    if exists("highlight_sedtabs")
-	HiLink sedTab		Todo
-    endif
-    let __sed_i = char2nr(" ") " ASCII: 32
-    while __sed_i <= __sed_last
-	exe "HiLink sedRegexp".__sed_i		"Macro"
-	exe "HiLink sedReplacement".__sed_i	"NONE"
-	let __sed_i = __sed_i + 1
-    endwhile
-
-    delcommand HiLink
+hi def link sedAddress		Macro
+hi def link sedACI		NONE
+hi def link sedBranch		Label
+hi def link sedComment		Comment
+hi def link sedDelete		Function
+hi def link sedError		Error
+hi def link sedFlag		Type
+hi def link sedFlagwrite		Constant
+hi def link sedFunction		Function
+hi def link sedLabel		Label
+hi def link sedLineCont		Special
+hi def link sedPutHoldspc	Function
+hi def link sedReplaceMeta	Special
+hi def link sedRegexpMeta	Special
+hi def link sedRW		Constant
+hi def link sedSemicolon		Special
+hi def link sedST		Function
+hi def link sedSpecial		Special
+hi def link sedWhitespace	NONE
+if exists("highlight_sedtabs")
+hi def link sedTab		Todo
 endif
+let __sed_i = char2nr(" ") " ASCII: 32, EBCDIC: 64
+while __sed_i <= __sed_last
+exe "hi def link sedRegexp".__sed_i		"Macro"
+exe "hi def link sedReplacement".__sed_i	"NONE"
+let __sed_i = __sed_i + 1
+endwhile
+
 
 unlet __sed_i __sed_last __sed_delimiter __sed_metacharacters
 
diff --git a/runtime/syntax/sendpr.vim b/runtime/syntax/sendpr.vim
index 6cf9395fe9..2e07802047 100644
--- a/runtime/syntax/sendpr.vim
+++ b/runtime/syntax/sendpr.vim
@@ -5,11 +5,8 @@
 "
 " http://raisdorf.net/files/misc/send-pr.vim
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/sgml.vim b/runtime/syntax/sgml.vim
index c0c3643dd2..d60040c5d9 100644
--- a/runtime/syntax/sgml.vim
+++ b/runtime/syntax/sgml.vim
@@ -5,11 +5,8 @@
 " Filenames:	*.sgml,*.sgm
 " $Id: sgml.vim,v 1.1 2004/06/13 17:52:57 vimboss Exp $
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/sgmldecl.vim b/runtime/syntax/sgmldecl.vim
index 13551b21c1..1bf1b49e34 100644
--- a/runtime/syntax/sgmldecl.vim
+++ b/runtime/syntax/sgmldecl.vim
@@ -5,11 +5,8 @@
 " You can modify and maintain this file, in other case send comments
 " the maintainer email address.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 let s:keepcpo= &cpo
@@ -52,30 +49,22 @@ syn sync lines=250
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_sgmldecl_syntax_init")
-  if version < 508
-    let did_sgmldecl_syntax_init = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-      HiLink	sgmldeclDeclKeys	Keyword
-      HiLink	sgmldeclTypes		Type
-      HiLink	sgmldeclConst		Constant
-      HiLink	sgmldeclNConst		Constant
-      HiLink	sgmldeclString		String
-      HiLink	sgmldeclDeclBlock	Normal
-      HiLink	sgmldeclBool		Boolean
-      HiLink	sgmldeclSpecial		Special
-      HiLink	sgmldeclComment		Comment
-      HiLink	sgmldeclStatem		Statement
-	  HiLink	sgmldeclVariables	Type
+HiLink	sgmldeclDeclKeys	Keyword
+HiLink	sgmldeclTypes		Type
+HiLink	sgmldeclConst		Constant
+HiLink	sgmldeclNConst		Constant
+HiLink	sgmldeclString		String
+HiLink	sgmldeclDeclBlock	Normal
+HiLink	sgmldeclBool		Boolean
+HiLink	sgmldeclSpecial		Special
+HiLink	sgmldeclComment		Comment
+HiLink	sgmldeclStatem		Statement
+HiLink	sgmldeclVariables	Type
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "sgmldecl"
 
diff --git a/runtime/syntax/sgmllnx.vim b/runtime/syntax/sgmllnx.vim
index 28224f601e..7fd633d404 100644
--- a/runtime/syntax/sgmllnx.vim
+++ b/runtime/syntax/sgmllnx.vim
@@ -3,11 +3,8 @@
 " Maintainer:	SungHyun Nam <goweol@gmail.com>
 " Last Change:	2013 May 13
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -36,31 +33,23 @@ syn region sgmllnxComment start=+<!--+ end=+-->+
 syn region sgmllnxDocType start=+<!doctype+ end=+>+
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_sgmllnx_syn_inits")
-  if version < 508
-    let did_sgmllnx_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink sgmllnxTag2	    Function
-  HiLink sgmllnxTagN2	    Function
-  HiLink sgmllnxTag	    Special
-  HiLink sgmllnxEndTag	    Special
-  HiLink sgmllnxParen	    Special
-  HiLink sgmllnxEntity	    Type
-  HiLink sgmllnxDocEnt	    Type
-  HiLink sgmllnxTagName	    Statement
-  HiLink sgmllnxComment	    Comment
-  HiLink sgmllnxSpecial	    Special
-  HiLink sgmllnxDocType	    PreProc
-  HiLink sgmllnxTagError    Error
+HiLink sgmllnxTag2	    Function
+HiLink sgmllnxTagN2	    Function
+HiLink sgmllnxTag	    Special
+HiLink sgmllnxEndTag	    Special
+HiLink sgmllnxParen	    Special
+HiLink sgmllnxEntity	    Type
+HiLink sgmllnxDocEnt	    Type
+HiLink sgmllnxTagName	    Statement
+HiLink sgmllnxComment	    Comment
+HiLink sgmllnxSpecial	    Special
+HiLink sgmllnxDocType	    PreProc
+HiLink sgmllnxTagError    Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "sgmllnx"
 
diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index ef90ebea22..31c7b0534c 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -8,11 +8,8 @@
 " For options and settings, please use:      :help ft-sh-syntax
 " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr)
 
-" For version 5.x: Clear all syntax items {{{1
-" For version 6.x: Quit when a syntax file was already loaded
-if v:version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/sicad.vim b/runtime/syntax/sicad.vim
index 7e32451bed..04f870d04e 100644
--- a/runtime/syntax/sicad.vim
+++ b/runtime/syntax/sicad.vim
@@ -4,28 +4,17 @@
 " Last Change:  2003 May 11
 " URL:		http://lmark.mgx.hu:81/download/vim/sicad.vim
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " use SQL highlighting after 'sql' command
-if version >= 600
-  syn include @SQL syntax/sql.vim
-else
-  syn include @SQL <sfile>:p:h/sql.vim
-endif
+syn include @SQL syntax/sql.vim
 unlet b:current_syntax
 
 " spaces are used in (auto)indents since sicad hates tabulator characters
-if version >= 600
-  setlocal expandtab
-else
-  set expandtab
-endif
+setlocal expandtab
 
 " ignore case
 syn case ignore
@@ -369,44 +358,34 @@ syn keyword sicadStatement zparbn zparf zparfn zparfw zparfwn
 syn keyword sicadStatement zparp zparpn zwinkp zwinkpn
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_sicad_syntax_inits")
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  if version < 508
-    let did_sicad_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-
-  HiLink sicadLabel PreProc
-  HiLink sicadLabel1 sicadLabel
-  HiLink sicadLabel2 sicadLabel
-  HiLink sicadConditional Conditional
-  HiLink sicadBoolean Boolean
-  HiLink sicadNumber Number
-  HiLink sicadFloat Float
-  HiLink sicadOperator Operator
-  HiLink sicadStatement Statement
-  HiLink sicadParameter sicadStatement
-  HiLink sicadGoto sicadStatement
-  HiLink sicadLineCont sicadStatement
-  HiLink sicadString String
-  HiLink sicadComment Comment
-  HiLink sicadSpecial Special
-  HiLink sicadIdentifier Type
+HiLink sicadLabel PreProc
+HiLink sicadLabel1 sicadLabel
+HiLink sicadLabel2 sicadLabel
+HiLink sicadConditional Conditional
+HiLink sicadBoolean Boolean
+HiLink sicadNumber Number
+HiLink sicadFloat Float
+HiLink sicadOperator Operator
+HiLink sicadStatement Statement
+HiLink sicadParameter sicadStatement
+HiLink sicadGoto sicadStatement
+HiLink sicadLineCont sicadStatement
+HiLink sicadString String
+HiLink sicadComment Comment
+HiLink sicadSpecial Special
+HiLink sicadIdentifier Type
 "  HiLink sicadIdentifier Identifier
-  HiLink sicadError Error
-  HiLink sicadParenError sicadError
-  HiLink sicadApostropheError sicadError
-  HiLink sicadStringError sicadError
-  HiLink sicadCommentError sicadError
+HiLink sicadError Error
+HiLink sicadParenError sicadError
+HiLink sicadApostropheError sicadError
+HiLink sicadStringError sicadError
+HiLink sicadCommentError sicadError
 "  HiLink sqlStatement Special  " modified highlight group in sql.vim
 
-  delcommand HiLink
-
-endif
+delcommand HiLink
 
 let b:current_syntax = "sicad"
 
diff --git a/runtime/syntax/simula.vim b/runtime/syntax/simula.vim
index e952ee26c3..eb3f8a1e85 100644
--- a/runtime/syntax/simula.vim
+++ b/runtime/syntax/simula.vim
@@ -4,11 +4,8 @@
 " URL:		http://folk.uio.no/hakonrk/vim/syntax/simula.vim
 " Last Change:	2001 May 15
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
@@ -58,42 +55,35 @@ syn match	simulaReal		"-\=\<\d\+\(\.\d\+\)\=\(&&\=[+-]\=\d\+\)\=\>"
 " Real starting with a `.', optional exponent
 syn match	simulaReal		"-\=\.\d\+\(&&\=[+-]\=\d\+\)\=\>"
 
-if version >= 508 || !exists("did_simula_syntax_inits")
-    if version < 508
-	let did_simula_syntax_inits = 1
-	command -nargs=+ HiLink hi link <args>
-    else
-	command -nargs=+ HiLink hi def link <args>
-    endif
+command -nargs=+ HiLink hi def link <args>
 
-    HiLink simulaAssigned		Identifier
-    HiLink simulaBoolean		Boolean
-    HiLink simulaCharacter		Character
-    HiLink simulaCharError		Error
-    HiLink simulaComment		Comment
-    HiLink simulaCompound		Statement
-    HiLink simulaConditional		Conditional
-    HiLink simulaConstant		Constant
-    HiLink simulaFunction		Function
-    HiLink simulaNumber			Number
-    HiLink simulaOperator		Operator
-    HiLink simulaReal			Float
-    HiLink simulaReferenceType		Type
-    HiLink simulaRepeat			Repeat
-    HiLink simulaReserved		Error
-    HiLink simulaSemicolon		Statement
-    HiLink simulaSpecial		Special
-    HiLink simulaSpecialChar		SpecialChar
-    HiLink simulaSpecialCharErr		Error
-    HiLink simulaStatement		Statement
-    HiLink simulaStorageClass		StorageClass
-    HiLink simulaString			String
-    HiLink simulaStructure		Structure
-    HiLink simulaTodo			Todo
-    HiLink simulaType			Type
+HiLink simulaAssigned		Identifier
+HiLink simulaBoolean		Boolean
+HiLink simulaCharacter		Character
+HiLink simulaCharError		Error
+HiLink simulaComment		Comment
+HiLink simulaCompound		Statement
+HiLink simulaConditional		Conditional
+HiLink simulaConstant		Constant
+HiLink simulaFunction		Function
+HiLink simulaNumber			Number
+HiLink simulaOperator		Operator
+HiLink simulaReal			Float
+HiLink simulaReferenceType		Type
+HiLink simulaRepeat			Repeat
+HiLink simulaReserved		Error
+HiLink simulaSemicolon		Statement
+HiLink simulaSpecial		Special
+HiLink simulaSpecialChar		SpecialChar
+HiLink simulaSpecialCharErr		Error
+HiLink simulaStatement		Statement
+HiLink simulaStorageClass		StorageClass
+HiLink simulaString			String
+HiLink simulaStructure		Structure
+HiLink simulaTodo			Todo
+HiLink simulaType			Type
 
-    delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "simula"
 " vim: sts=4 sw=4 ts=8
diff --git a/runtime/syntax/sinda.vim b/runtime/syntax/sinda.vim
index 2bde267c2f..ef0929e07a 100644
--- a/runtime/syntax/sinda.vim
+++ b/runtime/syntax/sinda.vim
@@ -8,11 +8,8 @@
 
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -32,11 +29,7 @@ syn case ignore
 let fortran_free_source=1
 
 " Load FORTRAN syntax file
-if version < 600
-  source <sfile>:p:h/fortran.vim
-else
-  runtime! syntax/fortran.vim
-endif
+runtime! syntax/fortran.vim
 unlet b:current_syntax
 
 
@@ -106,39 +99,31 @@ endif
 
 
 " Define the default highlighting
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_sinda_syntax_inits")
-  if version < 508
-    let did_sinda_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink sindaMacro		Macro
-  HiLink sindaOptions		Special
-  HiLink sindaRoutine		Type
-  HiLink sindaControl		Special
-  HiLink sindaSubRoutine	Function
-  HiLink sindaIdentifier	Identifier
+HiLink sindaMacro		Macro
+HiLink sindaOptions		Special
+HiLink sindaRoutine		Type
+HiLink sindaControl		Special
+HiLink sindaSubRoutine	Function
+HiLink sindaIdentifier	Identifier
 
-  HiLink sindaFortran		PreProc
-  HiLink sindaMotran		PreProc
+HiLink sindaFortran		PreProc
+HiLink sindaMotran		PreProc
 
-  HiLink sindaComment		Comment
-  HiLink sindaHeader		Typedef
-  HiLink sindaIncludeFile	Type
-  HiLink sindaInteger		Number
-  HiLink sindaFloat		Float
-  HiLink sindaScientific	Float
+HiLink sindaComment		Comment
+HiLink sindaHeader		Typedef
+HiLink sindaIncludeFile	Type
+HiLink sindaInteger		Number
+HiLink sindaFloat		Float
+HiLink sindaScientific	Float
 
-  HiLink sindaEndData		Macro
+HiLink sindaEndData		Macro
 
-  HiLink sindaTodo		Todo
+HiLink sindaTodo		Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "sinda"
diff --git a/runtime/syntax/sindacmp.vim b/runtime/syntax/sindacmp.vim
index 87b483409a..28c3cdc0ea 100644
--- a/runtime/syntax/sindacmp.vim
+++ b/runtime/syntax/sindacmp.vim
@@ -8,11 +8,8 @@
 
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -45,28 +42,20 @@ syn match  sindacmpFloat       "-\=\<[0-9]*\.[0-9]*"
 
 
 " Define the default highlighting
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_sindacmp_syntax_inits")
-  if version < 508
-    let did_sindacmp_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink sindacmpTitle		     Type
-  HiLink sindacmpUnit		     PreProc
+HiLink sindacmpTitle		     Type
+HiLink sindacmpUnit		     PreProc
 
-  HiLink sindacmpLabel		     Statement
+HiLink sindacmpLabel		     Statement
 
-  HiLink sindacmpHeader		     sindaHeader
+HiLink sindacmpHeader		     sindaHeader
 
-  HiLink sindacmpInteger	     Number
-  HiLink sindacmpFloat		     Special
+HiLink sindacmpInteger	     Number
+HiLink sindacmpFloat		     Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "sindacmp"
diff --git a/runtime/syntax/sindaout.vim b/runtime/syntax/sindaout.vim
index b557e017eb..b4fb177f06 100644
--- a/runtime/syntax/sindaout.vim
+++ b/runtime/syntax/sindaout.vim
@@ -8,11 +8,8 @@
 
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -24,11 +21,7 @@ syn case match
 
 
 " Load SINDA syntax file
-if version < 600
-  source <sfile>:p:h/sinda.vim
-else
-  runtime! syntax/sinda.vim
-endif
+runtime! syntax/sinda.vim
 unlet b:current_syntax
 
 
@@ -66,33 +59,25 @@ syn match sindaoutError		"<<< Error >>>"
 
 
 " Define the default highlighting
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_sindaout_syntax_inits")
-  if version < 508
-    let did_sindaout_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  hi sindaHeaderDelim  ctermfg=Black ctermbg=Green	       guifg=Black guibg=Green
+hi sindaHeaderDelim  ctermfg=Black ctermbg=Green	       guifg=Black guibg=Green
 
-  HiLink sindaoutPos		     Statement
-  HiLink sindaoutNeg		     PreProc
-  HiLink sindaoutTitle		     Type
-  HiLink sindaoutFile		     sindaIncludeFile
-  HiLink sindaoutInteger	     sindaInteger
+HiLink sindaoutPos		     Statement
+HiLink sindaoutNeg		     PreProc
+HiLink sindaoutTitle		     Type
+HiLink sindaoutFile		     sindaIncludeFile
+HiLink sindaoutInteger	     sindaInteger
 
-  HiLink sindaoutSectionDelim	      Delimiter
-  HiLink sindaoutSectionTitle	     Exception
-  HiLink sindaoutHeaderDelim	     SpecialComment
-  HiLink sindaoutLabel		     Identifier
+HiLink sindaoutSectionDelim	      Delimiter
+HiLink sindaoutSectionTitle	     Exception
+HiLink sindaoutHeaderDelim	     SpecialComment
+HiLink sindaoutLabel		     Identifier
 
-  HiLink sindaoutError		     Error
+HiLink sindaoutError		     Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "sindaout"
diff --git a/runtime/syntax/sisu.vim b/runtime/syntax/sisu.vim
index 0e0f2dbe0a..83d2a17245 100644
--- a/runtime/syntax/sisu.vim
+++ b/runtime/syntax/sisu.vim
@@ -6,11 +6,9 @@
 "      <http://git.sisudoc.org/gitweb/?p=code/sisu.git;a=blob_plain;f=data/sisu/conf/editor-syntax-etc/vim/syntax/sisu.vim;hb=HEAD>
 "(originally looked at Ruby Vim by Mirko Nasato)
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
-else
 endif
 let s:cpo_save = &cpo
 set cpo&vim
diff --git a/runtime/syntax/skill.vim b/runtime/syntax/skill.vim
index 8b960441f6..f32d5ee3ed 100644
--- a/runtime/syntax/skill.vim
+++ b/runtime/syntax/skill.vim
@@ -9,11 +9,8 @@
 "				database. This file also defines syntax highlighting for
 "				certain Design Framework II interface functions.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -525,37 +522,29 @@ syn match skillCommentError			"\*/"
 syn sync ccomment skillComment minlines=10
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_skill_syntax_inits")
-  if version < 508
-    let did_skill_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink skillcdfFunctions	Function
-	HiLink skillgeFunctions		Function
-	HiLink skillhiFunctions		Function
-	HiLink skillleFunctions		Function
-	HiLink skilldbefFunctions	Function
-	HiLink skillddFunctions		Function
-	HiLink skillpcFunctions		Function
-	HiLink skilltechFunctions	Function
-	HiLink skillConstants		Constant
-	HiLink skillFunction		Function
-	HiLink skillKeywords		Statement
-	HiLink skillConditional		Conditional
-	HiLink skillRepeat			Repeat
-	HiLink skillString			String
-	HiLink skillTodo			Todo
-	HiLink skillNote			Todo
-	HiLink skillComment			Comment
-	HiLink skillCommentError	Error
+HiLink skillcdfFunctions	Function
+HiLink skillgeFunctions		Function
+HiLink skillhiFunctions		Function
+HiLink skillleFunctions		Function
+HiLink skilldbefFunctions	Function
+HiLink skillddFunctions		Function
+HiLink skillpcFunctions		Function
+HiLink skilltechFunctions	Function
+HiLink skillConstants		Constant
+HiLink skillFunction		Function
+HiLink skillKeywords		Statement
+HiLink skillConditional		Conditional
+HiLink skillRepeat			Repeat
+HiLink skillString			String
+HiLink skillTodo			Todo
+HiLink skillNote			Todo
+HiLink skillComment			Comment
+HiLink skillCommentError	Error
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "skill"
 
diff --git a/runtime/syntax/sl.vim b/runtime/syntax/sl.vim
index fa3bca06dd..a40d43ea6a 100644
--- a/runtime/syntax/sl.vim
+++ b/runtime/syntax/sl.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Dan Piponi <dan@tanelorn.demon.co.uk>
 " Last Change:	2001 May 09
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -75,45 +72,37 @@ syn keyword slVariable dtime dPdtime
 syn sync ccomment slComment minlines=10
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_sl_syntax_inits")
-  if version < 508
-    let did_sl_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink slLabel	Label
-  HiLink slUserLabel	Label
-  HiLink slConditional	Conditional
-  HiLink slRepeat	Repeat
-  HiLink slCharacter	Character
-  HiLink slSpecialCharacter slSpecial
-  HiLink slNumber	Number
-  HiLink slFloat	Float
-  HiLink slParenError	slError
-  HiLink slInParen	slError
-  HiLink slCommentError	slError
-  HiLink slOperator	Operator
-  HiLink slStorageClass	StorageClass
-  HiLink slError	Error
-  HiLink slStatement	Statement
-  HiLink slType		Type
-  HiLink slCommentError	slError
-  HiLink slCommentString slString
-  HiLink slComment2String slString
-  HiLink slCommentSkip	slComment
-  HiLink slString	String
-  HiLink slComment	Comment
-  HiLink slSpecial	SpecialChar
-  HiLink slTodo	Todo
-  HiLink slVariable	Identifier
-  "HiLink slIdentifier	Identifier
+HiLink slLabel	Label
+HiLink slUserLabel	Label
+HiLink slConditional	Conditional
+HiLink slRepeat	Repeat
+HiLink slCharacter	Character
+HiLink slSpecialCharacter slSpecial
+HiLink slNumber	Number
+HiLink slFloat	Float
+HiLink slParenError	slError
+HiLink slInParen	slError
+HiLink slCommentError	slError
+HiLink slOperator	Operator
+HiLink slStorageClass	StorageClass
+HiLink slError	Error
+HiLink slStatement	Statement
+HiLink slType		Type
+HiLink slCommentError	slError
+HiLink slCommentString slString
+HiLink slComment2String slString
+HiLink slCommentSkip	slComment
+HiLink slString	String
+HiLink slComment	Comment
+HiLink slSpecial	SpecialChar
+HiLink slTodo	Todo
+HiLink slVariable	Identifier
+"HiLink slIdentifier	Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "sl"
 
diff --git a/runtime/syntax/slang.vim b/runtime/syntax/slang.vim
index 9fa89b4d61..938e8d5c51 100644
--- a/runtime/syntax/slang.vim
+++ b/runtime/syntax/slang.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Jan Hlavacek <lahvak@math.ohio-state.edu>
 " Last Change:	980216
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -55,47 +52,39 @@ syn keyword slangOperator	sizeof
 syn region slangPreCondit start="^\s*#\s*\(ifdef\>\|ifndef\>\|iftrue\>\|ifnfalse\>\|iffalse\>\|ifntrue\>\|if\$\|ifn\$\|\|elif\>\|else\>\|endif\>\)" skip="\\$" end="$" contains=cComment,slangString,slangCharacter,slangNumber
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_slang_syntax_inits")
-  if version < 508
-    let did_slang_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink slangDefinition	Type
-  HiLink slangBlock		slangDefinition
-  HiLink slangLabel		Label
-  HiLink slangConditional	Conditional
-  HiLink slangRepeat		Repeat
-  HiLink slangCharacter	Character
-  HiLink slangFloat		Float
-  HiLink slangImaginary	Float
-  HiLink slangDecimal		slangNumber
-  HiLink slangOctal		slangNumber
-  HiLink slangHex		slangNumber
-  HiLink slangNumber		Number
-  HiLink slangParenError	Error
-  HiLink slangOctalError	Error
-  HiLink slangOperator		Operator
-  HiLink slangStructure	Structure
-  HiLink slangInclude		Include
-  HiLink slangPreCondit	PreCondit
-  HiLink slangError		Error
-  HiLink slangStatement	Statement
-  HiLink slangType		Type
-  HiLink slangString		String
-  HiLink slangConstant		Constant
-  HiLink slangRangeArray	slangConstant
-  HiLink slangComment		Comment
-  HiLink slangSpecial		SpecialChar
-  HiLink slangTodo		Todo
-  HiLink slangDelim		Delimiter
+HiLink slangDefinition	Type
+HiLink slangBlock		slangDefinition
+HiLink slangLabel		Label
+HiLink slangConditional	Conditional
+HiLink slangRepeat		Repeat
+HiLink slangCharacter	Character
+HiLink slangFloat		Float
+HiLink slangImaginary	Float
+HiLink slangDecimal		slangNumber
+HiLink slangOctal		slangNumber
+HiLink slangHex		slangNumber
+HiLink slangNumber		Number
+HiLink slangParenError	Error
+HiLink slangOctalError	Error
+HiLink slangOperator		Operator
+HiLink slangStructure	Structure
+HiLink slangInclude		Include
+HiLink slangPreCondit	PreCondit
+HiLink slangError		Error
+HiLink slangStatement	Statement
+HiLink slangType		Type
+HiLink slangString		String
+HiLink slangConstant		Constant
+HiLink slangRangeArray	slangConstant
+HiLink slangComment		Comment
+HiLink slangSpecial		SpecialChar
+HiLink slangTodo		Todo
+HiLink slangDelim		Delimiter
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "slang"
 
diff --git a/runtime/syntax/slice.vim b/runtime/syntax/slice.vim
index 4e2f9a8604..202aee7599 100644
--- a/runtime/syntax/slice.vim
+++ b/runtime/syntax/slice.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Morel Bodin <slice06@nym.hush.com>
 " Last Change:	2005 Dec 03
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -58,33 +55,25 @@ syn match sliceComment	"//.*"
 syn sync ccomment sliceComment
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_slice_syn_inits")
-  if version < 508
-    let did_slice_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink sliceComment	Comment
-  HiLink sliceConstruct	Keyword
-  HiLink sliceType	Type
-  HiLink sliceString	String
-  HiLink sliceIncluded	String
-  HiLink sliceQualifier	Keyword
-  HiLink sliceInclude	Include
-  HiLink sliceGuard	PreProc
-  HiLink sliceBoolean	Boolean
-  HiLink sliceFloat	Number
-  HiLink sliceNumber	Number
-  HiLink sliceOctal	Number
-  HiLink sliceOctalZero	Special
-  HiLink sliceNumberError Special
+HiLink sliceComment	Comment
+HiLink sliceConstruct	Keyword
+HiLink sliceType	Type
+HiLink sliceString	String
+HiLink sliceIncluded	String
+HiLink sliceQualifier	Keyword
+HiLink sliceInclude	Include
+HiLink sliceGuard	PreProc
+HiLink sliceBoolean	Boolean
+HiLink sliceFloat	Number
+HiLink sliceNumber	Number
+HiLink sliceOctal	Number
+HiLink sliceOctalZero	Special
+HiLink sliceNumberError Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "slice"
 
diff --git a/runtime/syntax/slrnrc.vim b/runtime/syntax/slrnrc.vim
index 038b62e166..a55439a20a 100644
--- a/runtime/syntax/slrnrc.vim
+++ b/runtime/syntax/slrnrc.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Preben 'Peppe' Guldberg <peppe-vim@wielders.org>
 " Last Change:	23 April 2006
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -150,44 +147,36 @@ syn match   slrnrcSetkey	"^\s*setkey\>" skipwhite nextgroup=slrnrcSetkeyArt,slrn
 syn match   slrnrcUnsetkey	'^\s*unsetkey\s\+\("\)\=\(article\|group\|readline\)\>\1' skipwhite nextgroup=slrnrcKey contains=slrnrcSetkeyObj\(Str\)\=
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_slrnrc_syntax_inits")
-  if version < 508
-    let did_slrnrc_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink slrnrcTodo		Todo
-  HiLink slrnrcSpaceError	Error
-  HiLink slrnrcNumber		Number
-  HiLink slrnrcSpecKey		SpecialChar
-  HiLink slrnrcKey		String
-  HiLink slrnrcSpecChar		SpecialChar
-  HiLink slrnrcString		String
-  HiLink slrnSlangPreCondit	Special
-  HiLink slrnrcComment		Comment
-  HiLink slrnrcVarInt		Identifier
-  HiLink slrnrcVarStr		Identifier
-  HiLink slrnrcCmd		slrnrcSet
-  HiLink slrnrcSet		Operator
-  HiLink slrnrcColor		Keyword
-  HiLink slrnrcColorObj		Identifier
-  HiLink slrnrcColorVal		String
-  HiLink slrnrcMono		Keyword
-  HiLink slrnrcMonoObj		Identifier
-  HiLink slrnrcMonoVal		String
-  HiLink slrnrcFunArt		Macro
-  HiLink slrnrcFunGroup		Macro
-  HiLink slrnrcFunRead		Macro
-  HiLink slrnrcSetkeyObj	Identifier
-  HiLink slrnrcSetkey		Keyword
-  HiLink slrnrcUnsetkey		slrnrcSetkey
+HiLink slrnrcTodo		Todo
+HiLink slrnrcSpaceError	Error
+HiLink slrnrcNumber		Number
+HiLink slrnrcSpecKey		SpecialChar
+HiLink slrnrcKey		String
+HiLink slrnrcSpecChar		SpecialChar
+HiLink slrnrcString		String
+HiLink slrnSlangPreCondit	Special
+HiLink slrnrcComment		Comment
+HiLink slrnrcVarInt		Identifier
+HiLink slrnrcVarStr		Identifier
+HiLink slrnrcCmd		slrnrcSet
+HiLink slrnrcSet		Operator
+HiLink slrnrcColor		Keyword
+HiLink slrnrcColorObj		Identifier
+HiLink slrnrcColorVal		String
+HiLink slrnrcMono		Keyword
+HiLink slrnrcMonoObj		Identifier
+HiLink slrnrcMonoVal		String
+HiLink slrnrcFunArt		Macro
+HiLink slrnrcFunGroup		Macro
+HiLink slrnrcFunRead		Macro
+HiLink slrnrcSetkeyObj	Identifier
+HiLink slrnrcSetkey		Keyword
+HiLink slrnrcUnsetkey		slrnrcSetkey
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "slrnrc"
 
diff --git a/runtime/syntax/slrnsc.vim b/runtime/syntax/slrnsc.vim
index 838af6ad1c..a5dfa55e54 100644
--- a/runtime/syntax/slrnsc.vim
+++ b/runtime/syntax/slrnsc.vim
@@ -3,20 +3,13 @@
 " Maintainer:	Preben 'Peppe' Guldberg <peppe@wielders.org>
 " Last Change:	8 Oct 2004
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " characters in newsgroup names
-if version < 600
-  set isk=@,48-57,.,-,_,+
-else
-  setlocal isk=@,48-57,.,-,_,+
-endif
+setlocal isk=@,48-57,.,-,_,+
 
 syn match slrnscComment		"%.*$"
 syn match slrnscSectionCom	".].*"lc=2
@@ -51,34 +44,26 @@ syn match slrnscScoreIdent	contained "%.*"
 syn match slrnScoreLine		"^\s*Score::\=\s\+=\=[-+]\=\d\+\s*\(%.*\)\=$" skipempty nextgroup=slrnscScoreItem contains=slrnscScore,slrnscDelim,slrnscOper,slrnscNumber,slrnscScoreIdent
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_slrnsc_syntax_inits")
-  if version < 508
-    let did_slrnsc_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink slrnscComment		Comment
-  HiLink slrnscSectionCom	slrnscComment
-  HiLink slrnscGroup		String
-  HiLink slrnscNumber		Number
-  HiLink slrnscDate		Special
-  HiLink slrnscDelim		Delimiter
-  HiLink slrnscComma		SpecialChar
-  HiLink slrnscOper		SpecialChar
-  HiLink slrnscEsc		String
-  HiLink slrnscSectionStd	Type
-  HiLink slrnscSectionNot	Delimiter
-  HiLink slrnscItem		Statement
-  HiLink slrnscScore		Keyword
-  HiLink slrnscScoreIdent	Identifier
-  HiLink slrnscInclude		Keyword
+HiLink slrnscComment		Comment
+HiLink slrnscSectionCom	slrnscComment
+HiLink slrnscGroup		String
+HiLink slrnscNumber		Number
+HiLink slrnscDate		Special
+HiLink slrnscDelim		Delimiter
+HiLink slrnscComma		SpecialChar
+HiLink slrnscOper		SpecialChar
+HiLink slrnscEsc		String
+HiLink slrnscSectionStd	Type
+HiLink slrnscSectionNot	Delimiter
+HiLink slrnscItem		Statement
+HiLink slrnscScore		Keyword
+HiLink slrnscScoreIdent	Identifier
+HiLink slrnscInclude		Keyword
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "slrnsc"
 
diff --git a/runtime/syntax/sm.vim b/runtime/syntax/sm.vim
index 8fdc14b71a..33a67724f1 100644
--- a/runtime/syntax/sm.vim
+++ b/runtime/syntax/sm.vim
@@ -56,36 +56,28 @@ syn match smClauseCont	contained	"^\t"
 syn region smClause	matchgroup=Delimiter start="\$?." matchgroup=Delimiter end="\$\." contains=smElse,smClause,smVar,smClauseCont
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_smil_syntax_inits")
-  if version < 508
-    let did_smil_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink smClause	Special
-  HiLink smClauseError	Error
-  HiLink smComment	Comment
-  HiLink smDefine	Statement
-  HiLink smElse		Delimiter
-  HiLink smHeader	Statement
-  HiLink smHeaderSep	String
-  HiLink smMesg		Special
-  HiLink smPrecedence	Number
-  HiLink smRewrite	Statement
-  HiLink smRewriteComment	Comment
-  HiLink smRewriteLhsToken	String
-  HiLink smRewriteLhsUser	Statement
-  HiLink smRewriteRhsToken	String
-  HiLink smRuleset	Preproc
-  HiLink smTrusted	Special
-  HiLink smVar		String
+HiLink smClause	Special
+HiLink smClauseError	Error
+HiLink smComment	Comment
+HiLink smDefine	Statement
+HiLink smElse		Delimiter
+HiLink smHeader	Statement
+HiLink smHeaderSep	String
+HiLink smMesg		Special
+HiLink smPrecedence	Number
+HiLink smRewrite	Statement
+HiLink smRewriteComment	Comment
+HiLink smRewriteLhsToken	String
+HiLink smRewriteLhsUser	Statement
+HiLink smRewriteRhsToken	String
+HiLink smRuleset	Preproc
+HiLink smTrusted	Special
+HiLink smVar		String
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "sm"
 
diff --git a/runtime/syntax/smarty.vim b/runtime/syntax/smarty.vim
index 6dda366ba2..ab8e85dced 100644
--- a/runtime/syntax/smarty.vim
+++ b/runtime/syntax/smarty.vim
@@ -8,11 +8,10 @@
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
 if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
-  finish
-endif
+  " quit when a syntax file was already loaded
+  if exists("b:current_syntax")
+    finish
+  endif
   let main_syntax = 'smarty'
 endif
 
@@ -57,25 +56,18 @@ syn region  htmlString   contained start=+'+ end=+'+ contains=htmlSpecialChar,ja
   syn region htmlLink start="<a\>\_[^>]*\<href\>" end="</a>"me=e-4 contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,javaScript,@htmlPreproc,smartyZone
 
 
-if version >= 508 || !exists("did_smarty_syn_inits")
-  if version < 508
-    let did_smarty_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink smartyTagName Identifier
-  HiLink smartyProperty Constant
-  " if you want the text inside the braces to be colored, then
-  " remove the comment in from of the next statement
-  "HiLink smartyZone Include
-  HiLink smartyInFunc Function
-  HiLink smartyBlock Constant
-  HiLink smartyDot SpecialChar
-  HiLink smartyModifier Function
-  delcommand HiLink
-endif
+HiLink smartyTagName Identifier
+HiLink smartyProperty Constant
+" if you want the text inside the braces to be colored, then
+" remove the comment in from of the next statement
+"HiLink smartyZone Include
+HiLink smartyInFunc Function
+HiLink smartyBlock Constant
+HiLink smartyDot SpecialChar
+HiLink smartyModifier Function
+delcommand HiLink
 
 let b:current_syntax = "smarty"
 
diff --git a/runtime/syntax/smcl.vim b/runtime/syntax/smcl.vim
index d9afba6de5..a5baa47e96 100644
--- a/runtime/syntax/smcl.vim
+++ b/runtime/syntax/smcl.vim
@@ -10,9 +10,8 @@
 "		check for 'b:current_syntax', removed 'did_smcl_syntax_inits'
 " 26apr2006	changed 'stata_smcl' to 'smcl'
 
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
diff --git a/runtime/syntax/smil.vim b/runtime/syntax/smil.vim
index 6b5a002868..84826323cf 100644
--- a/runtime/syntax/smil.vim
+++ b/runtime/syntax/smil.vim
@@ -7,11 +7,8 @@
 " To learn more about SMIL, please refer to http://www.w3.org/AudioVideo/
 " and to http://www.helio.org/products/smil/tutorial/
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -115,38 +112,30 @@ endif
 syn region smilComment		      start=+<!DOCTYPE+ keepend end=+>+
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_smil_syntax_inits")
-  if version < 508
-    let did_smil_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink smilTag			Function
-  HiLink smilEndTag			Identifier
-  HiLink smilArg			Type
-  HiLink smilTagName			smilStatement
-  HiLink smilSpecialTagName		Exception
-  HiLink smilValue			Value
-  HiLink smilSpecialChar		Special
+HiLink smilTag			Function
+HiLink smilEndTag			Identifier
+HiLink smilArg			Type
+HiLink smilTagName			smilStatement
+HiLink smilSpecialTagName		Exception
+HiLink smilValue			Value
+HiLink smilSpecialChar		Special
 
-  HiLink smilSpecial			Special
-  HiLink smilSpecialChar		Special
-  HiLink smilString			String
-  HiLink smilStatement			Statement
-  HiLink smilComment			Comment
-  HiLink smilCommentPart		Comment
-  HiLink smilPreProc			PreProc
-  HiLink smilValue			String
-  HiLink smilCommentError		smilError
-  HiLink smilTagError			smilError
-  HiLink smilError			Error
+HiLink smilSpecial			Special
+HiLink smilSpecialChar		Special
+HiLink smilString			String
+HiLink smilStatement			Statement
+HiLink smilComment			Comment
+HiLink smilCommentPart		Comment
+HiLink smilPreProc			PreProc
+HiLink smilValue			String
+HiLink smilCommentError		smilError
+HiLink smilTagError			smilError
+HiLink smilError			Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "smil"
 
diff --git a/runtime/syntax/smith.vim b/runtime/syntax/smith.vim
index e05ce69683..82429691c1 100644
--- a/runtime/syntax/smith.vim
+++ b/runtime/syntax/smith.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Rafal M. Sulejman <rms@poczta.onet.pl>
 " Last Change:	21.07.2000
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -28,24 +25,16 @@ syn region smithString		start=+"+  skip=+\\\\\|\\"+  end=+"+
 syn case match
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_smith_syntax_inits")
-  if version < 508
-    let did_smith_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink smithRegister	Identifier
-  HiLink smithKeyword	Keyword
-	HiLink smithComment Comment
-	HiLink smithString String
-  HiLink smithNumber	Number
+HiLink smithRegister	Identifier
+HiLink smithKeyword	Keyword
+HiLink smithComment Comment
+HiLink smithString String
+HiLink smithNumber	Number
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "smith"
 
diff --git a/runtime/syntax/sml.vim b/runtime/syntax/sml.vim
index aa7d64a33a..01d494d2be 100644
--- a/runtime/syntax/sml.vim
+++ b/runtime/syntax/sml.vim
@@ -8,11 +8,8 @@
 "               2002 Jun 02 - Fixed small typo  (MM)
 "               2001 Nov 20 - Fixed small highlighting bug with modules (MM)
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -168,62 +165,54 @@ syn sync match smlSigSync     grouphere  smlSig     "\<sig\>"
 syn sync match smlSigSync     groupthere smlSig     "\<end\>"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_sml_syntax_inits")
-  if version < 508
-    let did_sml_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink smlBraceErr	 Error
-  HiLink smlBrackErr	 Error
-  HiLink smlParenErr	 Error
+HiLink smlBraceErr	 Error
+HiLink smlBrackErr	 Error
+HiLink smlParenErr	 Error
 
-  HiLink smlCommentErr	 Error
+HiLink smlCommentErr	 Error
 
-  HiLink smlEndErr	 Error
-  HiLink smlThenErr	 Error
+HiLink smlEndErr	 Error
+HiLink smlThenErr	 Error
 
-  HiLink smlCharErr	 Error
+HiLink smlCharErr	 Error
 
-  HiLink smlComment	 Comment
+HiLink smlComment	 Comment
 
-  HiLink smlModPath	 Include
-  HiLink smlModule	 Include
-  HiLink smlModParam1	 Include
-  HiLink smlModType	 Include
-  HiLink smlMPRestr3	 Include
-  HiLink smlFullMod	 Include
-  HiLink smlModTypeRestr Include
-  HiLink smlWith	 Include
-  HiLink smlMTDef	 Include
+HiLink smlModPath	 Include
+HiLink smlModule	 Include
+HiLink smlModParam1	 Include
+HiLink smlModType	 Include
+HiLink smlMPRestr3	 Include
+HiLink smlFullMod	 Include
+HiLink smlModTypeRestr Include
+HiLink smlWith	 Include
+HiLink smlMTDef	 Include
 
-  HiLink smlConstructor  Constant
+HiLink smlConstructor  Constant
 
-  HiLink smlModPreRHS	 Keyword
-  HiLink smlMPRestr2	 Keyword
-  HiLink smlKeyword	 Keyword
-  HiLink smlFunDef	 Keyword
-  HiLink smlRefAssign	 Keyword
-  HiLink smlKeyChar	 Keyword
-  HiLink smlAnyVar	 Keyword
-  HiLink smlTopStop	 Keyword
-  HiLink smlOperator	 Keyword
+HiLink smlModPreRHS	 Keyword
+HiLink smlMPRestr2	 Keyword
+HiLink smlKeyword	 Keyword
+HiLink smlFunDef	 Keyword
+HiLink smlRefAssign	 Keyword
+HiLink smlKeyChar	 Keyword
+HiLink smlAnyVar	 Keyword
+HiLink smlTopStop	 Keyword
+HiLink smlOperator	 Keyword
 
-  HiLink smlBoolean	 Boolean
-  HiLink smlCharacter	 Character
-  HiLink smlNumber	 Number
-  HiLink smlReal	 Float
-  HiLink smlString	 String
-  HiLink smlType	 Type
-  HiLink smlTodo	 Todo
-  HiLink smlEncl	 Keyword
+HiLink smlBoolean	 Boolean
+HiLink smlCharacter	 Character
+HiLink smlNumber	 Number
+HiLink smlReal	 Float
+HiLink smlString	 String
+HiLink smlType	 Type
+HiLink smlTodo	 Todo
+HiLink smlEncl	 Keyword
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "sml"
 
diff --git a/runtime/syntax/snnsnet.vim b/runtime/syntax/snnsnet.vim
index 6b24de5634..c73891e2b8 100644
--- a/runtime/syntax/snnsnet.vim
+++ b/runtime/syntax/snnsnet.vim
@@ -8,9 +8,8 @@
 " SNNS http://www-ra.informatik.uni-tuebingen.de/SNNS/
 " is a simulator for neural networks.
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -54,23 +53,16 @@ syn match	snnsnetNumbers	"\d" contained
 syn match	snnsnetComment	"#.*$" contains=snnsnetTodo
 syn keyword	snnsnetTodo	TODO XXX FIXME contained
 
-if version >= 508 || !exists("did_snnsnet_syn_inits")
-  if version < 508
-    let did_snnsnet_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink snnsnetType		Type
-  HiLink snnsnetComment		Comment
-  HiLink snnsnetNumbers		Number
-  HiLink snnsnetSection		Statement
-  HiLink snnsnetTitle		Label
-  HiLink snnsnetTodo		Todo
+HiLink snnsnetType		Type
+HiLink snnsnetComment		Comment
+HiLink snnsnetNumbers		Number
+HiLink snnsnetSection		Statement
+HiLink snnsnetTitle		Label
+HiLink snnsnetTodo		Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "snnsnet"
 
diff --git a/runtime/syntax/snnspat.vim b/runtime/syntax/snnspat.vim
index 5bfa48e624..ffc4caea71 100644
--- a/runtime/syntax/snnspat.vim
+++ b/runtime/syntax/snnspat.vim
@@ -8,9 +8,8 @@
 " SNNS http://www-ra.informatik.uni-tuebingen.de/SNNS/
 " is a simulator for neural networks.
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -44,26 +43,19 @@ syn match	snnspatNumbers	"\d" contained
 syn match	snnspatComment	"#.*$" contains=snnspatTodo
 syn keyword	snnspatTodo	TODO XXX FIXME contained
 
-if version >= 508 || !exists("did_snnspat_syn_inits")
-  if version < 508
-    let did_snnspat_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink snnspatGen		Statement
-  HiLink snnspatHeader		Error
-  HiLink snnspatNoHeader	Define
-  HiLink snnspatNumbers		Number
-  HiLink snnspatComment		Comment
-  HiLink snnspatError		Error
-  HiLink snnspatTodo		Todo
-  HiLink snnspatAccepted	NONE
-  HiLink snnspatBrac		NONE
+HiLink snnspatGen		Statement
+HiLink snnspatHeader		Error
+HiLink snnspatNoHeader	Define
+HiLink snnspatNumbers		Number
+HiLink snnspatComment		Comment
+HiLink snnspatError		Error
+HiLink snnspatTodo		Todo
+HiLink snnspatAccepted	NONE
+HiLink snnspatBrac		NONE
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "snnspat"
 
diff --git a/runtime/syntax/snnsres.vim b/runtime/syntax/snnsres.vim
index 4c1d596009..2d2791696c 100644
--- a/runtime/syntax/snnsres.vim
+++ b/runtime/syntax/snnsres.vim
@@ -8,9 +8,8 @@
 " SNNS http://www-ra.informatik.uni-tuebingen.de/SNNS/
 " is a simulator for neural networks.
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -37,23 +36,16 @@ syn match	snnsresNumbers	"\d" contained
 syn match	snnsresComment	"#.*$" contains=snnsresTodo
 syn keyword	snnsresTodo	TODO XXX FIXME contained
 
-if version >= 508 || !exists("did_snnsres_syn_inits")
-  if version < 508
-    let did_snnsres_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink snnsresGen		Statement
-  HiLink snnsresHeader		Statement
-  HiLink snnsresNoHeader	Define
-  HiLink snnsresNumbers		Number
-  HiLink snnsresComment		Comment
-  HiLink snnsresTodo		Todo
+HiLink snnsresGen		Statement
+HiLink snnsresHeader		Statement
+HiLink snnsresNoHeader	Define
+HiLink snnsresNumbers		Number
+HiLink snnsresComment		Comment
+HiLink snnsresTodo		Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "snnsres"
 
diff --git a/runtime/syntax/snobol4.vim b/runtime/syntax/snobol4.vim
index 07eb63dec7..691acdec9a 100644
--- a/runtime/syntax/snobol4.vim
+++ b/runtime/syntax/snobol4.vim
@@ -10,11 +10,8 @@
 " - one character labels weren't displayed correctly.
 " - nonexistent Snobol4 keywords displayed as errors.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -79,47 +76,39 @@ syn match       snobol4ErrInBracket display contained "[){}]\|<%\|%>"
 " syn match       snobol4Comment      "^\#\!.*$"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_snobol4_syntax_inits")
-  if version < 508
-    let did_snobol4_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink snobol4Constant        Constant
-  HiLink snobol4Label           Label
-  HiLink snobol4Goto            Repeat
-  HiLink snobol4Conditional     Conditional
-  HiLink snobol4Repeat          Repeat
-  HiLink snobol4Number          Number
-  HiLink snobol4Error           Error
-  HiLink snobol4Statement       PreProc
-  HiLink snobol4BogusStatement  snobol4Error
-  HiLink snobol4String          String
-  HiLink snobol4Comment         Comment
-  HiLink snobol4Special         Special
-  HiLink snobol4Todo            Todo
-  HiLink snobol4Keyword         Keyword
-  HiLink snobol4Function        Function
-  HiLink snobol4MathsOperator   Operator
-  HiLink snobol4ParenError      snobol4Error
-  HiLink snobol4ErrInParen      snobol4Error
-  HiLink snobol4ErrInBracket    snobol4Error
-  HiLink snobol4SysVar          Keyword
-  HiLink snobol4BogusSysVar     snobol4Error
-  if exists("snobol4_strict_mode")
-    HiLink snobol4ExtSysVar       WarningMsg
-    HiLink snobol4ExtKeyword      WarningMsg
-  else
-    HiLink snobol4ExtSysVar       snobol4SysVar
-    HiLink snobol4ExtKeyword      snobol4Keyword
-  endif
-
-  delcommand HiLink
+HiLink snobol4Constant        Constant
+HiLink snobol4Label           Label
+HiLink snobol4Goto            Repeat
+HiLink snobol4Conditional     Conditional
+HiLink snobol4Repeat          Repeat
+HiLink snobol4Number          Number
+HiLink snobol4Error           Error
+HiLink snobol4Statement       PreProc
+HiLink snobol4BogusStatement  snobol4Error
+HiLink snobol4String          String
+HiLink snobol4Comment         Comment
+HiLink snobol4Special         Special
+HiLink snobol4Todo            Todo
+HiLink snobol4Keyword         Keyword
+HiLink snobol4Function        Function
+HiLink snobol4MathsOperator   Operator
+HiLink snobol4ParenError      snobol4Error
+HiLink snobol4ErrInParen      snobol4Error
+HiLink snobol4ErrInBracket    snobol4Error
+HiLink snobol4SysVar          Keyword
+HiLink snobol4BogusSysVar     snobol4Error
+if exists("snobol4_strict_mode")
+HiLink snobol4ExtSysVar       WarningMsg
+HiLink snobol4ExtKeyword      WarningMsg
+else
+HiLink snobol4ExtSysVar       snobol4SysVar
+HiLink snobol4ExtKeyword      snobol4Keyword
 endif
 
+delcommand HiLink
+
 let b:current_syntax = "snobol4"
 " vim: ts=8
diff --git a/runtime/syntax/spec.vim b/runtime/syntax/spec.vim
index 9952bd2548..edfdf4365c 100644
--- a/runtime/syntax/spec.vim
+++ b/runtime/syntax/spec.vim
@@ -5,11 +5,8 @@
 " Former Maintainer:  Donovan Rebbechi elflord@panix.com (until March 2014)
 " Last Change: Sat Apr 9 15:30 2016 Filip Szymański
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -159,78 +156,70 @@ syn sync match shCaseEsacSync grouphere  shCaseEsac "\<case\>"
 syn sync match shCaseEsacSync groupthere shCaseEsac "\<esac\>"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_spec_syntax_inits")
-  if version < 508
-    let did_spec_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  "main types color definitions
-  HiLink specSection			Structure
-  HiLink specSectionMacro		Macro
-  HiLink specWWWlink			PreProc
-  HiLink specOpts			Operator
+"main types color definitions
+HiLink specSection			Structure
+HiLink specSectionMacro		Macro
+HiLink specWWWlink			PreProc
+HiLink specOpts			Operator
 
-  "yes, it's ugly, but white is sooo cool
-  if &background == "dark"
-    hi def specGlobalMacro		ctermfg=white
-  else
-    HiLink specGlobalMacro		Identifier
-  endif
-
-  "sh colors
-  HiLink shComment			Comment
-  HiLink shIf				Statement
-  HiLink shOperator			Special
-  HiLink shQuote1			String
-  HiLink shQuote2			String
-  HiLink shQuoteDelim			Statement
-
-  "spec colors
-  HiLink specBlock			Function
-  HiLink specColon			Special
-  HiLink specCommand			Statement
-  HiLink specCommandOpts		specOpts
-  HiLink specCommandSpecial		Special
-  HiLink specComment			Comment
-  HiLink specConfigure			specCommand
-  HiLink specDate			String
-  HiLink specDescriptionOpts		specOpts
-  HiLink specEmail			specWWWlink
-  HiLink specError			Error
-  HiLink specFilesDirective		specSectionMacro
-  HiLink specFilesOpts			specOpts
-  HiLink specLicense			String
-  HiLink specMacroNameLocal		specGlobalMacro
-  HiLink specMacroNameOther		specGlobalMacro
-  HiLink specManpageFile		NONE
-  HiLink specMonth			specDate
-  HiLink specNoNumberHilite		NONE
-  HiLink specNumber			Number
-  HiLink specPackageOpts		specOpts
-  HiLink specPercent			Special
-  HiLink specSpecialChar		Special
-  HiLink specSpecialVariables		specGlobalMacro
-  HiLink specSpecialVariablesNames	specGlobalMacro
-  HiLink specTarCommand			specCommand
-  HiLink specURL			specWWWlink
-  HiLink specURLMacro			specWWWlink
-  HiLink specVariables			Identifier
-  HiLink specWeekday			specDate
-  HiLink specListedFilesBin		Statement
-  HiLink specListedFilesDoc		Statement
-  HiLink specListedFilesEtc		Statement
-  HiLink specListedFilesLib		Statement
-  HiLink specListedFilesPrefix		Statement
-  HiLink specListedFilesShare		Statement
-
-  delcommand HiLink
+"yes, it's ugly, but white is sooo cool
+if &background == "dark"
+hi def specGlobalMacro		ctermfg=white
+else
+HiLink specGlobalMacro		Identifier
 endif
 
+"sh colors
+HiLink shComment			Comment
+HiLink shIf				Statement
+HiLink shOperator			Special
+HiLink shQuote1			String
+HiLink shQuote2			String
+HiLink shQuoteDelim			Statement
+
+"spec colors
+HiLink specBlock			Function
+HiLink specColon			Special
+HiLink specCommand			Statement
+HiLink specCommandOpts		specOpts
+HiLink specCommandSpecial		Special
+HiLink specComment			Comment
+HiLink specConfigure			specCommand
+HiLink specDate			String
+HiLink specDescriptionOpts		specOpts
+HiLink specEmail			specWWWlink
+HiLink specError			Error
+HiLink specFilesDirective		specSectionMacro
+HiLink specFilesOpts			specOpts
+HiLink specLicense			String
+HiLink specMacroNameLocal		specGlobalMacro
+HiLink specMacroNameOther		specGlobalMacro
+HiLink specManpageFile		NONE
+HiLink specMonth			specDate
+HiLink specNoNumberHilite		NONE
+HiLink specNumber			Number
+HiLink specPackageOpts		specOpts
+HiLink specPercent			Special
+HiLink specSpecialChar		Special
+HiLink specSpecialVariables		specGlobalMacro
+HiLink specSpecialVariablesNames	specGlobalMacro
+HiLink specTarCommand			specCommand
+HiLink specURL			specWWWlink
+HiLink specURLMacro			specWWWlink
+HiLink specVariables			Identifier
+HiLink specWeekday			specDate
+HiLink specListedFilesBin		Statement
+HiLink specListedFilesDoc		Statement
+HiLink specListedFilesEtc		Statement
+HiLink specListedFilesLib		Statement
+HiLink specListedFilesPrefix		Statement
+HiLink specListedFilesShare		Statement
+
+delcommand HiLink
+
 let b:current_syntax = "spec"
 
 " vim: ts=8
diff --git a/runtime/syntax/specman.vim b/runtime/syntax/specman.vim
index 93fb4a86c6..4fa4c218d8 100644
--- a/runtime/syntax/specman.vim
+++ b/runtime/syntax/specman.vim
@@ -10,11 +10,8 @@
 "---------------------------------------------------------
 
 " Remove any old syntax stuff hanging around
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -137,46 +134,38 @@ syn region  specmanString start=+"+  end=+"+
 syn sync lines=50
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_specman_syn_inits")
-  if version < 508
-    let did_specman_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  " The default methods for highlighting.  Can be overridden later
-	HiLink	specmanConditional	Conditional
-	HiLink	specmanConstraint	Conditional
-	HiLink	specmanRepeat		Repeat
-	HiLink	specmanString		String
-	HiLink	specmanComment		Comment
-	HiLink	specmanConstant		Macro
-	HiLink	specmanNumber		Number
-	HiLink	specmanCompare		Operator
-	HiLink	specmanOperator		Operator
-	HiLink	specmanLogical		Operator
-	HiLink	specmanStatement	Statement
-	HiLink	specmanHDL		SpecialChar
-	HiLink	specmanMethod		Function
-	HiLink	specmanInclude		Include
-	HiLink	specmanStructure	Structure
-	HiLink	specmanBoolean		Boolean
-	HiLink	specmanFSM		Label
-	HiLink	specmanSpecial		Special
-	HiLink	specmanType		Type
-	HiLink	specmanTemporal		Type
-	HiLink	specmanFile		Include
-	HiLink	specmanPreCondit	Include
-	HiLink	specmanDefine		Typedef
-	HiLink	specmanLabel		Label
-	HiLink	specmanPacking		keyword
-	HiLink	specmanTodo		Todo
-	HiLink	specmanParenError	Error
-	HiLink	specmanErrInParen	Error
-	HiLink	specmanErrInBracket	Error
-	delcommand	HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+" The default methods for highlighting.  Can be overridden later
+HiLink	specmanConditional	Conditional
+HiLink	specmanConstraint	Conditional
+HiLink	specmanRepeat		Repeat
+HiLink	specmanString		String
+HiLink	specmanComment		Comment
+HiLink	specmanConstant		Macro
+HiLink	specmanNumber		Number
+HiLink	specmanCompare		Operator
+HiLink	specmanOperator		Operator
+HiLink	specmanLogical		Operator
+HiLink	specmanStatement	Statement
+HiLink	specmanHDL		SpecialChar
+HiLink	specmanMethod		Function
+HiLink	specmanInclude		Include
+HiLink	specmanStructure	Structure
+HiLink	specmanBoolean		Boolean
+HiLink	specmanFSM		Label
+HiLink	specmanSpecial		Special
+HiLink	specmanType		Type
+HiLink	specmanTemporal		Type
+HiLink	specmanFile		Include
+HiLink	specmanPreCondit	Include
+HiLink	specmanDefine		Typedef
+HiLink	specmanLabel		Label
+HiLink	specmanPacking		keyword
+HiLink	specmanTodo		Todo
+HiLink	specmanParenError	Error
+HiLink	specmanErrInParen	Error
+HiLink	specmanErrInBracket	Error
+delcommand	HiLink
 
 let b:current_syntax = "specman"
diff --git a/runtime/syntax/spice.vim b/runtime/syntax/spice.vim
index 200e1aaea4..57ff05f807 100644
--- a/runtime/syntax/spice.vim
+++ b/runtime/syntax/spice.vim
@@ -7,11 +7,8 @@
 " This is based on sh.vim by Lennart Schultz
 " but greatly simplified
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -53,28 +50,20 @@ syn match spiceParenError ")"
 syn sync minlines=50
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_spice_syntax_inits")
-  if version < 508
-    let did_spice_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink spiceTodo		Todo
-  HiLink spiceWrapLineOperator	spiceOperator
-  HiLink spiceSinglequote	spiceExpr
-  HiLink spiceExpr		Function
-  HiLink spiceParenError	Error
-  HiLink spiceStatement		Statement
-  HiLink spiceNumber		Number
-  HiLink spiceComment		Comment
-  HiLink spiceOperator		Operator
+HiLink spiceTodo		Todo
+HiLink spiceWrapLineOperator	spiceOperator
+HiLink spiceSinglequote	spiceExpr
+HiLink spiceExpr		Function
+HiLink spiceParenError	Error
+HiLink spiceStatement		Statement
+HiLink spiceNumber		Number
+HiLink spiceComment		Comment
+HiLink spiceOperator		Operator
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "spice"
 
diff --git a/runtime/syntax/splint.vim b/runtime/syntax/splint.vim
index dc09d8b9d6..14f84a8691 100644
--- a/runtime/syntax/splint.vim
+++ b/runtime/syntax/splint.vim
@@ -15,20 +15,13 @@
 "		in your vimrc file or filetype.vim
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " Read the C syntax to start with
-if version < 600
-  so <sfile>:p:h/c.vim
-else
-  runtime! syntax/c.vim
-endif
+runtime! syntax/c.vim
 
 
 " FIXME: uses and changes several clusters defined in c.vim
@@ -199,61 +192,53 @@ syn cluster	cPreProcGroup	add=@splintAllStuff
 syn cluster	cMultiGroup	add=@splintAllStuff
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_splint_syntax_inits")
-  if version < 508
-    let did_splint_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink splintShortAnn		splintAnnotation
-  HiLink splintAnnotation	Comment
-  HiLink splintAnnError		splintError
-  HiLink splintAnnError2	splintError
-  HiLink splintFlag		SpecialComment
-  HiLink splintGlobalFlag	splintError
-  HiLink splintSpecialAnnot	splintAnnKey
-  HiLink splintStateAnnot	splintAnnKey
-  HiLink splintSpecTag		splintAnnKey
-  HiLink splintModifies		splintAnnKey
-  HiLink splintRequires		splintAnnKey
-  HiLink splintGlobals		splintAnnKey
-  HiLink splintGlobitem		Constant
-  HiLink splintGlobannot	splintAnnKey
-  HiLink splintWarning		splintAnnKey
-  HiLink splintModitem		Constant
-  HiLink splintIter		splintAnnKey
-  HiLink splintConst		splintAnnKey
-  HiLink splintAlt		splintAnnKey
-  HiLink splintType		splintAnnKey
-  HiLink splintGlobalType	splintAnnKey
-  HiLink splintMemMgm		splintAnnKey
-  HiLink splintAlias		splintAnnKey
-  HiLink splintExposure		splintAnnKey
-  HiLink splintDefState		splintAnnKey
-  HiLink splintGlobState	splintAnnKey
-  HiLink splintNullState	splintAnnKey
-  HiLink splintNullPred		splintAnnKey
-  HiLink splintExit		splintAnnKey
-  HiLink splintExec		splintAnnKey
-  HiLink splintSef		splintAnnKey
-  HiLink splintDecl		splintAnnKey
-  HiLink splintCase		splintAnnKey
-  HiLink splintBreak		splintAnnKey
-  HiLink splintUnreach		splintAnnKey
-  HiLink splintSpecFunc		splintAnnKey
-  HiLink splintErrSupp		splintAnnKey
-  HiLink splintTypeAcc		splintAnnKey
-  HiLink splintMacro		splintAnnKey
-  HiLink splintSpecType		splintAnnKey
-  HiLink splintAnnKey		Type
-  HiLink splintError		Error
+HiLink splintShortAnn		splintAnnotation
+HiLink splintAnnotation	Comment
+HiLink splintAnnError		splintError
+HiLink splintAnnError2	splintError
+HiLink splintFlag		SpecialComment
+HiLink splintGlobalFlag	splintError
+HiLink splintSpecialAnnot	splintAnnKey
+HiLink splintStateAnnot	splintAnnKey
+HiLink splintSpecTag		splintAnnKey
+HiLink splintModifies		splintAnnKey
+HiLink splintRequires		splintAnnKey
+HiLink splintGlobals		splintAnnKey
+HiLink splintGlobitem		Constant
+HiLink splintGlobannot	splintAnnKey
+HiLink splintWarning		splintAnnKey
+HiLink splintModitem		Constant
+HiLink splintIter		splintAnnKey
+HiLink splintConst		splintAnnKey
+HiLink splintAlt		splintAnnKey
+HiLink splintType		splintAnnKey
+HiLink splintGlobalType	splintAnnKey
+HiLink splintMemMgm		splintAnnKey
+HiLink splintAlias		splintAnnKey
+HiLink splintExposure		splintAnnKey
+HiLink splintDefState		splintAnnKey
+HiLink splintGlobState	splintAnnKey
+HiLink splintNullState	splintAnnKey
+HiLink splintNullPred		splintAnnKey
+HiLink splintExit		splintAnnKey
+HiLink splintExec		splintAnnKey
+HiLink splintSef		splintAnnKey
+HiLink splintDecl		splintAnnKey
+HiLink splintCase		splintAnnKey
+HiLink splintBreak		splintAnnKey
+HiLink splintUnreach		splintAnnKey
+HiLink splintSpecFunc		splintAnnKey
+HiLink splintErrSupp		splintAnnKey
+HiLink splintTypeAcc		splintAnnKey
+HiLink splintMacro		splintAnnKey
+HiLink splintSpecType		splintAnnKey
+HiLink splintAnnKey		Type
+HiLink splintError		Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "splint"
 
diff --git a/runtime/syntax/spup.vim b/runtime/syntax/spup.vim
index 8d7a9e525c..96e0f58a0e 100644
--- a/runtime/syntax/spup.vim
+++ b/runtime/syntax/spup.vim
@@ -17,11 +17,8 @@
 " If you encounter problems or have questions or suggestions, mail me
 
 " Remove old syntax stuff
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
@@ -206,74 +203,66 @@ syn sync match spupSyncTitle      grouphere spupTitle      "^TITLE"
 syn sync match spupSyncUnit       grouphere spupUnit       "^UNIT"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_spup_syn_inits")
-    if version < 508
-	let did_spup_syn_inits = 1
-	command -nargs=+ HiLink hi link <args>
-    else
-	command -nargs=+ HiLink hi def link <args>
-    endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-    HiLink spupCdi	    spupSection
-    HiLink spupConditions   spupSection
-    HiLink spupDeclare	    spupSection
-    HiLink spupEstimation   spupSection
-    HiLink spupExternal	    spupSection
-    HiLink spupFlowsheet    spupSection
-    HiLink spupFunction	    spupSection
-    HiLink spupGlobal	    spupSection
-    HiLink spupHomotopy	    spupSection
-    HiLink spupMacro	    spupSection
-    HiLink spupModel	    spupSection
-    HiLink spupOperation    spupSection
-    HiLink spupOptions	    spupSection
-    HiLink spupProcedure    spupSection
-    HiLink spupProfiles	    spupSection
-    HiLink spupReport	    spupSection
-    HiLink spupTitle	    spupConstant  " this is correct, truly ;)
-    HiLink spupUnit	    spupSection
+HiLink spupCdi	    spupSection
+HiLink spupConditions   spupSection
+HiLink spupDeclare	    spupSection
+HiLink spupEstimation   spupSection
+HiLink spupExternal	    spupSection
+HiLink spupFlowsheet    spupSection
+HiLink spupFunction	    spupSection
+HiLink spupGlobal	    spupSection
+HiLink spupHomotopy	    spupSection
+HiLink spupMacro	    spupSection
+HiLink spupModel	    spupSection
+HiLink spupOperation    spupSection
+HiLink spupOptions	    spupSection
+HiLink spupProcedure    spupSection
+HiLink spupProfiles	    spupSection
+HiLink spupReport	    spupSection
+HiLink spupTitle	    spupConstant  " this is correct, truly ;)
+HiLink spupUnit	    spupSection
 
-    HiLink spupCdiSubs	      spupSubs
-    HiLink spupConditionsSubs spupSubs
-    HiLink spupDeclareSubs    spupSubs
-    HiLink spupEstimationSubs spupSubs
-    HiLink spupExternalSubs   spupSubs
-    HiLink spupFlowsheetSubs  spupSubs
-    HiLink spupFunctionSubs   spupSubs
-    HiLink spupHomotopySubs   spupSubs
-    HiLink spupMacroSubs      spupSubs
-    HiLink spupModelSubs      spupSubs
-    HiLink spupOperationSubs  spupSubs
-    HiLink spupOptionsSubs    spupSubs
-    HiLink spupProcedureSubs  spupSubs
-    HiLink spupReportSubs     spupSubs
-    HiLink spupUnitSubs	      spupSubs
+HiLink spupCdiSubs	      spupSubs
+HiLink spupConditionsSubs spupSubs
+HiLink spupDeclareSubs    spupSubs
+HiLink spupEstimationSubs spupSubs
+HiLink spupExternalSubs   spupSubs
+HiLink spupFlowsheetSubs  spupSubs
+HiLink spupFunctionSubs   spupSubs
+HiLink spupHomotopySubs   spupSubs
+HiLink spupMacroSubs      spupSubs
+HiLink spupModelSubs      spupSubs
+HiLink spupOperationSubs  spupSubs
+HiLink spupOptionsSubs    spupSubs
+HiLink spupProcedureSubs  spupSubs
+HiLink spupReportSubs     spupSubs
+HiLink spupUnitSubs	      spupSubs
 
-    HiLink spupCode	       Normal
-    HiLink spupComment	       Comment
-    HiLink spupComment2	       spupComment
-    HiLink spupConditional     Statement
-    HiLink spupConstant	       Constant
-    HiLink spupError	       Error
-    HiLink spupHelp	       Normal
-    HiLink spupIdentifier      Identifier
-    HiLink spupNumber	       Constant
-    HiLink spupOperator	       Special
-    HiLink spupOpenBrace       spupError
-    HiLink spupSection	       Statement
-    HiLink spupSpecial	       spupTextprocGeneric
-    HiLink spupStreams	       Type
-    HiLink spupString	       Constant
-    HiLink spupSubs	       Statement
-    HiLink spupSymbol	       Special
-    HiLink spupTextprocError   Normal
-    HiLink spupTextprocGeneric PreProc
-    HiLink spupTypes	       Type
+HiLink spupCode	       Normal
+HiLink spupComment	       Comment
+HiLink spupComment2	       spupComment
+HiLink spupConditional     Statement
+HiLink spupConstant	       Constant
+HiLink spupError	       Error
+HiLink spupHelp	       Normal
+HiLink spupIdentifier      Identifier
+HiLink spupNumber	       Constant
+HiLink spupOperator	       Special
+HiLink spupOpenBrace       spupError
+HiLink spupSection	       Statement
+HiLink spupSpecial	       spupTextprocGeneric
+HiLink spupStreams	       Type
+HiLink spupString	       Constant
+HiLink spupSubs	       Statement
+HiLink spupSymbol	       Special
+HiLink spupTextprocError   Normal
+HiLink spupTextprocGeneric PreProc
+HiLink spupTypes	       Type
 
-    delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "spup"
 
diff --git a/runtime/syntax/spyce.vim b/runtime/syntax/spyce.vim
index e76cb1a1a2..169de199dc 100644
--- a/runtime/syntax/spyce.vim
+++ b/runtime/syntax/spyce.vim
@@ -4,11 +4,8 @@
 " URL:		     http://spyce.sourceforge.net
 " Last Change: 2009 Nov 11
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -20,13 +17,9 @@ endif
 " Read the HTML syntax to start with
 let b:did_indent = 1	     " don't perform HTML indentation!
 let html_no_rendering = 1    " do not render <b>,<i>, etc...
-if version < 600
-  so <sfile>:p:h/html.vim
-else
-  runtime! syntax/html.vim
-  unlet b:current_syntax
-  syntax spell default  " added by Bram
-endif
+runtime! syntax/html.vim
+unlet b:current_syntax
+syntax spell default  " added by Bram
 
 " include python
 syn include @Python <sfile>:p:h/python.vim
diff --git a/runtime/syntax/sql.vim b/runtime/syntax/sql.vim
index 7ba20f3446..6de3f4a5c0 100644
--- a/runtime/syntax/sql.vim
+++ b/runtime/syntax/sql.vim
@@ -10,11 +10,8 @@
 "              If the above exist, it will source the type specified.
 "              If none exist, it will source the default sql.vim file.
 "
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
diff --git a/runtime/syntax/sqlanywhere.vim b/runtime/syntax/sqlanywhere.vim
index 05b05c9f4f..e91a99de65 100644
--- a/runtime/syntax/sqlanywhere.vim
+++ b/runtime/syntax/sqlanywhere.vim
@@ -12,11 +12,8 @@
 "              Updated to Adaptive Server Anywhere  9.0.1
 "              Updated to Adaptive Server Anywhere  9.0.0
 "
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
diff --git a/runtime/syntax/sqlforms.vim b/runtime/syntax/sqlforms.vim
index 055b2ae870..358349c463 100644
--- a/runtime/syntax/sqlforms.vim
+++ b/runtime/syntax/sqlforms.vim
@@ -7,21 +7,14 @@
 "
 " TODO Find a new maintainer who knows SQL*Forms.
 
-    " For version 5.x, clear all syntax items.
-    " For version 6.x, quit when a syntax file was already loaded.
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
 syntax case ignore
 
-if version >= 600
-  setlocal iskeyword=a-z,A-Z,48-57,_,.,-,>
-else
-  set iskeyword=a-z,A-Z,48-57,_,.,-,>
-endif
+setlocal iskeyword=a-z,A-Z,48-57,_,.,-,>
 
 
     " The SQL reserved words, defined as keywords.
@@ -138,30 +131,23 @@ syntax match sqlNumber  "-\=\<[0-9]*\.\=[0-9_]\>"
 
 syntax sync ccomment sqlComment
 
-if version >= 508 || !exists("did_sqlforms_syn_inits")
-    if version < 508
-	let did_sqlforms_syn_inits = 1
-	command -nargs=+ HiLink hi link <args>
-    else
-	command -nargs=+ HiLink hi def link <args>
-    endif
+command -nargs=+ HiLink hi def link <args>
 
-    HiLink sqlComment Comment
-    HiLink sqlKeyword Statement
-    HiLink sqlNumber Number
-    HiLink sqlOperator Statement
-    HiLink sqlProcedure Statement
-    HiLink sqlFunction Statement
-    HiLink sqlSystem Identifier
-    HiLink sqlSpecial Special
-    HiLink sqlStatement Statement
-    HiLink sqlString String
-    HiLink sqlType Type
-    HiLink sqlCodes Identifier
-    HiLink sqlTriggers PreProc
+HiLink sqlComment Comment
+HiLink sqlKeyword Statement
+HiLink sqlNumber Number
+HiLink sqlOperator Statement
+HiLink sqlProcedure Statement
+HiLink sqlFunction Statement
+HiLink sqlSystem Identifier
+HiLink sqlSpecial Special
+HiLink sqlStatement Statement
+HiLink sqlString String
+HiLink sqlType Type
+HiLink sqlCodes Identifier
+HiLink sqlTriggers PreProc
 
-    delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "sqlforms"
 
diff --git a/runtime/syntax/sqlhana.vim b/runtime/syntax/sqlhana.vim
index 1410e99eb4..2e334bb56e 100644
--- a/runtime/syntax/sqlhana.vim
+++ b/runtime/syntax/sqlhana.vim
@@ -7,11 +7,8 @@
 
 " Description: Updated to SAP HANA SP4
 "
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
diff --git a/runtime/syntax/sqlinformix.vim b/runtime/syntax/sqlinformix.vim
index b4d023600c..20a88acf4b 100644
--- a/runtime/syntax/sqlinformix.vim
+++ b/runtime/syntax/sqlinformix.vim
@@ -4,11 +4,8 @@
 " Maintainer:	Dean Hill <dhill@hotmail.com>
 " Last Change:	2004 Aug 30
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -154,43 +151,35 @@ syn keyword sqlTodo TODO FIXME XXX DEBUG NOTE
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_sql_syn_inits")
-  if version < 508
-    let did_sql_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
 
-  " === Comment syntax group ===
-  HiLink sqlComment	Comment
+" === Comment syntax group ===
+HiLink sqlComment	Comment
 
-  " === Constant syntax group ===
-  HiLink sqlNumber	Number
-  HiLink sqlBoolean	Boolean
-  HiLink sqlString	String
+" === Constant syntax group ===
+HiLink sqlNumber	Number
+HiLink sqlBoolean	Boolean
+HiLink sqlString	String
 
-  " === Statment syntax group ===
-  HiLink sqlStatement	Statement
-  HiLink sqlConditional	Conditional
-  HiLink sqlRepeat		Repeat
-  HiLink sqlKeyword		Keyword
-  HiLink sqlOperator	Operator
-  HiLink sqlException	Exception
+" === Statment syntax group ===
+HiLink sqlStatement	Statement
+HiLink sqlConditional	Conditional
+HiLink sqlRepeat		Repeat
+HiLink sqlKeyword		Keyword
+HiLink sqlOperator	Operator
+HiLink sqlException	Exception
 
-  " === Identifier syntax group ===
-  HiLink sqlFunction	Function
+" === Identifier syntax group ===
+HiLink sqlFunction	Function
 
-  " === Type syntax group ===
-  HiLink sqlType	Type
+" === Type syntax group ===
+HiLink sqlType	Type
 
-  " === Todo syntax group ===
-  HiLink sqlTodo	Todo
+" === Todo syntax group ===
+HiLink sqlTodo	Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "sqlinformix"
diff --git a/runtime/syntax/sqlj.vim b/runtime/syntax/sqlj.vim
index 51398ef9c2..ea8d7ecb6c 100644
--- a/runtime/syntax/sqlj.vim
+++ b/runtime/syntax/sqlj.vim
@@ -8,10 +8,8 @@
 
 " au BufNewFile,BufRead *.sqlj so $VIM/syntax/sqlj.vim
 
-" Remove any old syntax stuff hanging around
-if version < 600
-   syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
    finish
 endif
 
@@ -76,27 +74,20 @@ syn match sqlComment	"--.*"
 
 syn sync ccomment sqljComment
 
-if version >= 508 || !exists("did_sqlj_syn_inits")
-  if version < 508
-    let did_sqlj_syn_inits = 1
-    command! -nargs=+ HiLink hi link <args>
-  else
-    command! -nargs=+ HiLink hi def link <args>
-  endif
+command! -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting. Can be overridden later.
-  HiLink sqljComment	Comment
-  HiLink sqljKeyword	sqljSpecial
-  HiLink sqljNumber	Number
-  HiLink sqljOperator	sqljStatement
-  HiLink sqljSpecial	Special
-  HiLink sqljStatement	Statement
-  HiLink sqljString	String
-  HiLink sqljType	Type
-  HiLink sqljPre	PreProc
+" The default methods for highlighting. Can be overridden later.
+HiLink sqljComment	Comment
+HiLink sqljKeyword	sqljSpecial
+HiLink sqljNumber	Number
+HiLink sqljOperator	sqljStatement
+HiLink sqljSpecial	Special
+HiLink sqljStatement	Statement
+HiLink sqljString	String
+HiLink sqljType	Type
+HiLink sqljPre	PreProc
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "sqlj"
 
diff --git a/runtime/syntax/sqr.vim b/runtime/syntax/sqr.vim
index 8c9e7b49e4..7e73443571 100644
--- a/runtime/syntax/sqr.vim
+++ b/runtime/syntax/sqr.vim
@@ -16,19 +16,12 @@
 "    http://lanzarotta.tripod.com/vim.html
 "    jefflanzarotta at yahoo dot com
 
-" For version 5.x, clear all syntax items.
-" For version 6.x, quit when a syntax file was already loaded.
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
-if version >= 600
-  setlocal iskeyword=@,48-57,_,-,#,$,{,}
-else
-  set iskeyword=@,48-57,_,-,#,$,{,}
-endif
+setlocal iskeyword=@,48-57,_,-,#,$,{,}
 
 syn case ignore
 
@@ -220,75 +213,51 @@ syn match	  sqrNumber	/-\=\<\d*\.\=[0-9_]\>/
 syn keyword	sqrTodo		TODO FIXME XXX DEBUG NOTE ###
 syn match	sqrTodo		/???/
 
-if version >= 600
-  " See also the sqrString section above for handling of ! characters
-  " inside of strings.  (Those patterns override the ones below.)
-  syn match	sqrComment	/!\@<!!\([^!=].*\|$\)/ contains=sqrTodo
-  "				  the ! can't be preceded by another !,
-  "				  and must be followed by at least one
-  "				  character other than ! or =, or immediately
-  "				  by the end-of-line
-  syn match	sqrComment	/^!=.*/ contains=sqrTodo
-  syn match	sqrComment	/^!!.*/ contains=sqrTodo
-  syn match	sqrError	/^\s\+\zs!=.*/
-  "				  it's an error to have "!=" preceded by
-  "				  just whitespace on the line ("!="
-  "				  preceded by non-whitespace is treated
-  "				  as neither a comment nor an error, since
-  "				  it is often correct, i.e.
-  "				    if #count != 7
-  syn match	sqrError	/.\+\zs!!.*/
-  "				  a "!!" anywhere but at the beginning of
-  "				  the line is always an error
-else "For versions before 6.0, same idea as above but we are limited
-     "to simple patterns only.  Also, the sqrString patterns above
-     "don't seem to take precedence in v5 as they do in v6, so
-     "we split the last rule to ignore comments found inside of
-     "string literals.
-  syn match	sqrComment	/!\([^!=].*\|$\)/ contains=sqrTodo
-  syn match	sqrComment	/^!=.*/ contains=sqrTodo
-  syn match	sqrComment	/^!!.*/ contains=sqrTodo
-  syn match	sqrError	/^\s\+!=.*/
-  syn match	sqrError	/^[^'!]\+!!/
-  "				flag !! on lines that don't have ! or '
-  syn match	sqrError	/^\([^!']*'[^']*'[^!']*\)\+!!/
-  "				flag !! found after matched ' ' chars
-  "				(that aren't also commented)
-endif
+" See also the sqrString section above for handling of ! characters
+" inside of strings.  (Those patterns override the ones below.)
+syn match	sqrComment	/!\@<!!\([^!=].*\|$\)/ contains=sqrTodo
+"				  the ! can't be preceded by another !,
+"				  and must be followed by at least one
+"				  character other than ! or =, or immediately
+"				  by the end-of-line
+syn match	sqrComment	/^!=.*/ contains=sqrTodo
+syn match	sqrComment	/^!!.*/ contains=sqrTodo
+syn match	sqrError	/^\s\+\zs!=.*/
+"				  it's an error to have "!=" preceded by
+"				  just whitespace on the line ("!="
+"				  preceded by non-whitespace is treated
+"				  as neither a comment nor an error, since
+"				  it is often correct, i.e.
+"				    if #count != 7
+syn match	sqrError	/.\+\zs!!.*/
+"				  a "!!" anywhere but at the beginning of
+"				  the line is always an error
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier, only when not done already.
-" For version 5.8 and later, only when an item doesn't have highlighting yet.
-if version >= 508 || !exists("did_sqr_syn_inits")
-  if version < 508
-    let did_sqr_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet.
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink sqrSection Statement
-  HiLink sqrParagraph Statement
-  HiLink sqrReserved Statement
-  HiLink sqrParameter Statement
-  HiLink sqrPreProc PreProc
-  HiLink sqrSubstVar PreProc
-  HiLink sqrCommand Statement
-  HiLink sqrParam Type
-  HiLink sqrFunction Special
+HiLink sqrSection Statement
+HiLink sqrParagraph Statement
+HiLink sqrReserved Statement
+HiLink sqrParameter Statement
+HiLink sqrPreProc PreProc
+HiLink sqrSubstVar PreProc
+HiLink sqrCommand Statement
+HiLink sqrParam Type
+HiLink sqrFunction Special
 
-  HiLink sqrString String
-  HiLink sqrStrOpen Todo
-  HiLink sqrNumber Number
-  HiLink sqrVariable Identifier
+HiLink sqrString String
+HiLink sqrStrOpen Todo
+HiLink sqrNumber Number
+HiLink sqrVariable Identifier
 
-  HiLink sqrComment Comment
-  HiLink sqrTodo Todo
-  HiLink sqrError Error
+HiLink sqrComment Comment
+HiLink sqrTodo Todo
+HiLink sqrError Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "sqr"
 
diff --git a/runtime/syntax/squid.vim b/runtime/syntax/squid.vim
index a8462bbdce..ee2b854ad4 100644
--- a/runtime/syntax/squid.vim
+++ b/runtime/syntax/squid.vim
@@ -7,11 +7,8 @@
 "               Michael Dotzler <Michael.Dotzler@leoni.com>
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -123,30 +120,22 @@ syn match	squidRegexOpt	contained "\(^\s*acl\s\+\S\+\s\+\S\+\(_regex\|_mime_type
 syn sync minlines=3
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_squid_syntax_inits")
-  if version < 508
-    let did_squid_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink squidTodo	Todo
-  HiLink squidComment	Comment
-  HiLink squidTag	Special
-  HiLink squidConf	Keyword
-  HiLink squidOpt	Constant
-  HiLink squidAction	String
-  HiLink squidNumber	Number
-  HiLink squidIP	Number
-  HiLink squidAcl	Keyword
-  HiLink squidStr	String
-  HiLink squidRegexOpt	Special
+HiLink squidTodo	Todo
+HiLink squidComment	Comment
+HiLink squidTag	Special
+HiLink squidConf	Keyword
+HiLink squidOpt	Constant
+HiLink squidAction	String
+HiLink squidNumber	Number
+HiLink squidIP	Number
+HiLink squidAcl	Keyword
+HiLink squidStr	String
+HiLink squidRegexOpt	Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "squid"
 
diff --git a/runtime/syntax/srec.vim b/runtime/syntax/srec.vim
index 19b6d97426..834cec7baa 100644
--- a/runtime/syntax/srec.vim
+++ b/runtime/syntax/srec.vim
@@ -24,11 +24,8 @@
 " States in parentheses in the upper format description indicate that they
 " should not appear in a valid file.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -63,33 +60,25 @@ syn match srecDataUnexpected "[0-9a-fA-F]\{2}" contained nextgroup=srecDataUnexp
 syn match srecChecksum "[0-9a-fA-F]\{2}$" contained
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_srec_syntax_inits")
-  if version < 508
-    let did_srec_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting. Can be overridden later
-  HiLink srecRecStart            srecRecType
-  HiLink srecRecTypeUnknown      srecRecType
-  HiLink srecRecType             WarningMsg
-  HiLink srecByteCount           Constant
-  hi def srecAddressFieldUnknown term=italic cterm=italic gui=italic
-  HiLink srecNoAddress           DiffAdd
-  HiLink srecDataAddress         Comment
-  HiLink srecRecCount            srecNoAddress
-  HiLink srecStartAddress        srecDataAddress
-  hi def srecDataOdd             term=bold cterm=bold gui=bold
-  hi def srecDataEven            term=NONE cterm=NONE gui=NONE
-  HiLink srecDataUnexpected      Error
-  HiLink srecChecksum            DiffChange
+" The default methods for highlighting. Can be overridden later
+HiLink srecRecStart            srecRecType
+HiLink srecRecTypeUnknown      srecRecType
+HiLink srecRecType             WarningMsg
+HiLink srecByteCount           Constant
+hi def srecAddressFieldUnknown term=italic cterm=italic gui=italic
+HiLink srecNoAddress           DiffAdd
+HiLink srecDataAddress         Comment
+HiLink srecRecCount            srecNoAddress
+HiLink srecStartAddress        srecDataAddress
+hi def srecDataOdd             term=bold cterm=bold gui=bold
+hi def srecDataEven            term=NONE cterm=NONE gui=NONE
+HiLink srecDataUnexpected      Error
+HiLink srecChecksum            DiffChange
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "srec"
 
diff --git a/runtime/syntax/sshconfig.vim b/runtime/syntax/sshconfig.vim
index 302d073f1e..051b2f9a8a 100644
--- a/runtime/syntax/sshconfig.vim
+++ b/runtime/syntax/sshconfig.vim
@@ -10,19 +10,12 @@
 "
 
 " Setup
-if version >= 600
-  if exists("b:current_syntax")
-    finish
-  endif
-else
-  syntax clear
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
 endif
 
-if version >= 600
-  setlocal iskeyword=_,-,a-z,A-Z,48-57
-else
-  set iskeyword=_,-,a-z,A-Z,48-57
-endif
+setlocal iskeyword=_,-,a-z,A-Z,48-57
 
 
 " case on
@@ -233,40 +226,33 @@ syn keyword sshconfigKeyword VisualHostKey
 syn keyword sshconfigKeyword XAuthLocation
 
 " Define the default highlighting
-if version >= 508 || !exists("did_sshconfig_syntax_inits")
-  if version < 508
-    let did_sshconfig_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink sshconfigComment        Comment
-  HiLink sshconfigTodo           Todo
-  HiLink sshconfigHostPort       sshconfigConstant
-  HiLink sshconfigNumber         sshconfigConstant
-  HiLink sshconfigConstant       Constant
-  HiLink sshconfigYesNo          sshconfigEnum
-  HiLink sshconfigCipher         sshconfigEnum
-  HiLink sshconfigCiphers	 sshconfigEnum
-  HiLink sshconfigMAC            sshconfigEnum
-  HiLink sshconfigHostKeyAlgo    sshconfigEnum
-  HiLink sshconfigLogLevel       sshconfigEnum
-  HiLink sshconfigSysLogFacility sshconfigEnum
-  HiLink sshconfigAddressFamily  sshconfigEnum
-  HiLink sshconfigIPQoS		 sshconfigEnum
-  HiLink sshconfigKbdInteractive sshconfigEnum
-  HiLink sshconfigKexAlgo	 sshconfigEnum
-  HiLink sshconfigTunnel	 sshconfigEnum
-  HiLink sshconfigPreferredAuth  sshconfigEnum
-  HiLink sshconfigVar            sshconfigEnum
-  HiLink sshconfigEnum           Identifier
-  HiLink sshconfigSpecial        Special
-  HiLink sshconfigKeyword        Keyword
-  HiLink sshconfigHostSect       Type
-  HiLink sshconfigMatch          Type
-  delcommand HiLink
-endif
+HiLink sshconfigComment        Comment
+HiLink sshconfigTodo           Todo
+HiLink sshconfigHostPort       sshconfigConstant
+HiLink sshconfigNumber         sshconfigConstant
+HiLink sshconfigConstant       Constant
+HiLink sshconfigYesNo          sshconfigEnum
+HiLink sshconfigCipher         sshconfigEnum
+HiLink sshconfigCiphers	 sshconfigEnum
+HiLink sshconfigMAC            sshconfigEnum
+HiLink sshconfigHostKeyAlgo    sshconfigEnum
+HiLink sshconfigLogLevel       sshconfigEnum
+HiLink sshconfigSysLogFacility sshconfigEnum
+HiLink sshconfigAddressFamily  sshconfigEnum
+HiLink sshconfigIPQoS		 sshconfigEnum
+HiLink sshconfigKbdInteractive sshconfigEnum
+HiLink sshconfigKexAlgo	 sshconfigEnum
+HiLink sshconfigTunnel	 sshconfigEnum
+HiLink sshconfigPreferredAuth  sshconfigEnum
+HiLink sshconfigVar            sshconfigEnum
+HiLink sshconfigEnum           Identifier
+HiLink sshconfigSpecial        Special
+HiLink sshconfigKeyword        Keyword
+HiLink sshconfigHostSect       Type
+HiLink sshconfigMatch          Type
+delcommand HiLink
 
 let b:current_syntax = "sshconfig"
 
diff --git a/runtime/syntax/sshdconfig.vim b/runtime/syntax/sshdconfig.vim
index 6b7b98d893..28b8acaf60 100644
--- a/runtime/syntax/sshdconfig.vim
+++ b/runtime/syntax/sshdconfig.vim
@@ -11,19 +11,12 @@
 "
 
 " Setup
-if version >= 600
-  if exists("b:current_syntax")
-    finish
-  endif
-else
-  syntax clear
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
 endif
 
-if version >= 600
-  setlocal iskeyword=_,-,a-z,A-Z,48-57
-else
-  set iskeyword=_,-,a-z,A-Z,48-57
-endif
+setlocal iskeyword=_,-,a-z,A-Z,48-57
 
 
 " case on
@@ -239,43 +232,36 @@ syn keyword sshdconfigKeyword XAuthLocation
 
 
 " Define the default highlighting
-if version >= 508 || !exists("did_sshdconfig_syntax_inits")
-  if version < 508
-    let did_sshdconfig_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink sshdconfigComment              Comment
-  HiLink sshdconfigTodo                 Todo
-  HiLink sshdconfigHostPort             sshdconfigConstant
-  HiLink sshdconfigTime                 sshdconfigConstant
-  HiLink sshdconfigNumber               sshdconfigConstant
-  HiLink sshdconfigConstant             Constant
-  HiLink sshdconfigYesNo                sshdconfigEnum
-  HiLink sshdconfigAddressFamily        sshdconfigEnum
-  HiLink sshdconfigPrivilegeSeparation  sshdconfigEnum
-  HiLink sshdconfigTcpForwarding        sshdconfigEnum
-  HiLink sshdconfigRootLogin            sshdconfigEnum
-  HiLink sshdconfigCiphers              sshdconfigEnum
-  HiLink sshdconfigMAC                  sshdconfigEnum
-  HiLink sshdconfigHostKeyAlgo          sshdconfigEnum
-  HiLink sshdconfigRootLogin            sshdconfigEnum
-  HiLink sshdconfigLogLevel             sshdconfigEnum
-  HiLink sshdconfigSysLogFacility       sshdconfigEnum
-  HiLink sshdconfigVar                  sshdconfigEnum
-  HiLink sshdconfigCompression          sshdconfigEnum
-  HiLink sshdconfigIPQoS                sshdconfigEnum
-  HiLink sshdconfigKexAlgo              sshdconfigEnum
-  HiLink sshdconfigTunnel               sshdconfigEnum
-  HiLink sshdconfigSubsystem            sshdconfigEnum
-  HiLink sshdconfigEnum                 Function
-  HiLink sshdconfigSpecial              Special
-  HiLink sshdconfigKeyword              Keyword
-  HiLink sshdconfigMatch                Type
-  delcommand HiLink
-endif
+HiLink sshdconfigComment              Comment
+HiLink sshdconfigTodo                 Todo
+HiLink sshdconfigHostPort             sshdconfigConstant
+HiLink sshdconfigTime                 sshdconfigConstant
+HiLink sshdconfigNumber               sshdconfigConstant
+HiLink sshdconfigConstant             Constant
+HiLink sshdconfigYesNo                sshdconfigEnum
+HiLink sshdconfigAddressFamily        sshdconfigEnum
+HiLink sshdconfigPrivilegeSeparation  sshdconfigEnum
+HiLink sshdconfigTcpForwarding        sshdconfigEnum
+HiLink sshdconfigRootLogin            sshdconfigEnum
+HiLink sshdconfigCiphers              sshdconfigEnum
+HiLink sshdconfigMAC                  sshdconfigEnum
+HiLink sshdconfigHostKeyAlgo          sshdconfigEnum
+HiLink sshdconfigRootLogin            sshdconfigEnum
+HiLink sshdconfigLogLevel             sshdconfigEnum
+HiLink sshdconfigSysLogFacility       sshdconfigEnum
+HiLink sshdconfigVar                  sshdconfigEnum
+HiLink sshdconfigCompression          sshdconfigEnum
+HiLink sshdconfigIPQoS                sshdconfigEnum
+HiLink sshdconfigKexAlgo              sshdconfigEnum
+HiLink sshdconfigTunnel               sshdconfigEnum
+HiLink sshdconfigSubsystem            sshdconfigEnum
+HiLink sshdconfigEnum                 Function
+HiLink sshdconfigSpecial              Special
+HiLink sshdconfigKeyword              Keyword
+HiLink sshdconfigMatch                Type
+delcommand HiLink
 
 let b:current_syntax = "sshdconfig"
 
diff --git a/runtime/syntax/st.vim b/runtime/syntax/st.vim
index 47aa07de5d..1071caa7b1 100644
--- a/runtime/syntax/st.vim
+++ b/runtime/syntax/st.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Arndt Hesse <hesse@self.de>
 " Last Change:	2012 Feb 12 by Thilo Six
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -77,30 +74,22 @@ hi link stBlockError stError
 syn sync minlines=50
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_st_syntax_inits")
-  if version < 508
-    let did_st_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink stKeyword		Statement
-  HiLink stMethod		Statement
-  HiLink stComment		Comment
-  HiLink stCharacter		Constant
-  HiLink stString		Constant
-  HiLink stSymbol		Special
-  HiLink stNumber		Type
-  HiLink stFloat		Type
-  HiLink stError		Error
-  HiLink stLocalVariables	Identifier
-  HiLink stBlockVariable	Identifier
+HiLink stKeyword		Statement
+HiLink stMethod		Statement
+HiLink stComment		Comment
+HiLink stCharacter		Constant
+HiLink stString		Constant
+HiLink stSymbol		Special
+HiLink stNumber		Type
+HiLink stFloat		Type
+HiLink stError		Error
+HiLink stLocalVariables	Identifier
+HiLink stBlockVariable	Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "st"
 
diff --git a/runtime/syntax/stata.vim b/runtime/syntax/stata.vim
index e1f19c84fc..29f5052ebe 100644
--- a/runtime/syntax/stata.vim
+++ b/runtime/syntax/stata.vim
@@ -12,9 +12,8 @@
 " 26apr2006	fixed brace confusion in stataErrInParen and stataErrInBracket
 "		fixed paren/bracket confusion in stataFuncGroup
 
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
diff --git a/runtime/syntax/stp.vim b/runtime/syntax/stp.vim
index f4f0f3b615..fbd659682d 100644
--- a/runtime/syntax/stp.vim
+++ b/runtime/syntax/stp.vim
@@ -4,11 +4,8 @@
 "	  URL: http://lanzarotta.tripod.com/vim/syntax/stp.vim.zip
 " Last Change: March 05, 2002
 
-" For version 5.x, clear all syntax items.
-" For version 6.x, quit when a syntax file was already loaded.
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -131,36 +128,28 @@ syn match  stpParenError ")"
 syn sync minlines=10 maxlines=100
 
 " Define the default highlighting.
-" For version 5.x and earlier, only when not done already.
-" For version 5.8 and later, only when and item doesn't have highlighting yet.
-if version >= 508 || !exists("did_stp_syn_inits")
-  if version < 508
-    let did_stp_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when and item doesn't have highlighting yet.
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink stpConditional Conditional
-  HiLink stpComment Comment
-  HiLink stpKeyword Keyword
-  HiLink stpNumber Number
-  HiLink stpOperator Operator
-  HiLink stpSpecial Special
-  HiLink stpStatement Statement
-  HiLink stpString String
-  HiLink stpStringError Error
-  HiLink stpType Type
-  HiLink stpTodo Todo
-  HiLink stpFunction Function
-  HiLink stpGlobals Macro
-  HiLink stpParen Normal
-  HiLink stpParenError Error
-  HiLink stpSQLKeyword Function
-  HiLink stpRepeat Repeat
+HiLink stpConditional Conditional
+HiLink stpComment Comment
+HiLink stpKeyword Keyword
+HiLink stpNumber Number
+HiLink stpOperator Operator
+HiLink stpSpecial Special
+HiLink stpStatement Statement
+HiLink stpString String
+HiLink stpStringError Error
+HiLink stpType Type
+HiLink stpTodo Todo
+HiLink stpFunction Function
+HiLink stpGlobals Macro
+HiLink stpParen Normal
+HiLink stpParenError Error
+HiLink stpSQLKeyword Function
+HiLink stpRepeat Repeat
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "stp"
 
diff --git a/runtime/syntax/strace.vim b/runtime/syntax/strace.vim
index 0f686fd808..45b70071a0 100644
--- a/runtime/syntax/strace.vim
+++ b/runtime/syntax/strace.vim
@@ -5,12 +5,9 @@
 " Last Change: 2015-01-16
 
 " Setup
-if version >= 600
-	if exists("b:current_syntax")
-		finish
-	endif
-else
-	syntax clear
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
 endif
 
 syn case match
@@ -35,31 +32,24 @@ syn match straceOperator "[-+=*/!%&|:,]"
 syn region straceComment start="/\*" end="\*/" oneline
 
 " Define the default highlighting
-if version >= 508 || !exists("did_strace_syntax_inits")
-	if version < 508
-		let did_strace_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink straceComment Comment
-	HiLink straceVerbosed Comment
-	HiLink stracePID PreProc
-	HiLink straceNumber Number
-	HiLink straceNumberRHS Type
-	HiLink straceOtherRHS Type
-	HiLink straceString String
-	HiLink straceConstant Function
-	HiLink straceEquals Type
-	HiLink straceSysCallEmbed straceSysCall
-	HiLink straceSysCall Statement
-	HiLink straceParenthesis Statement
-	HiLink straceOperator Normal
-	HiLink straceSpecialChar Special
-	HiLink straceOtherPID PreProc
+HiLink straceComment Comment
+HiLink straceVerbosed Comment
+HiLink stracePID PreProc
+HiLink straceNumber Number
+HiLink straceNumberRHS Type
+HiLink straceOtherRHS Type
+HiLink straceString String
+HiLink straceConstant Function
+HiLink straceEquals Type
+HiLink straceSysCallEmbed straceSysCall
+HiLink straceSysCall Statement
+HiLink straceParenthesis Statement
+HiLink straceOperator Normal
+HiLink straceSpecialChar Special
+HiLink straceOtherPID PreProc
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "strace"
diff --git a/runtime/syntax/svn.vim b/runtime/syntax/svn.vim
index 6536d6d11c..8b83753896 100644
--- a/runtime/syntax/svn.vim
+++ b/runtime/syntax/svn.vim
@@ -15,11 +15,8 @@
 "   Myk Taylor
 "   Stefano Zacchiroli
 
-" For version 5.x: Clear all syntax items.
-" For version 6.x: Quit when a syntax file was already loaded.
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded.
+if exists("b:current_syntax")
   finish
 endif
 
@@ -42,28 +39,20 @@ syn sync clear
 syn sync match svnSync  grouphere svnRegion "^--.*--$"me=s-1
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already.
-" For version 5.8 and later: only when an item doesn't have highlighting yet.
-if version >= 508 || !exists("did_svn_syn_inits")
-  if version <= 508
-    let did_svn_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet.
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink svnSummary     Keyword
-  HiLink svnBlank       Error
+HiLink svnSummary     Keyword
+HiLink svnBlank       Error
 
-  HiLink svnRegion      Comment
-  HiLink svnDelimiter   NonText
-  HiLink svnRemoved     Constant
-  HiLink svnAdded       Identifier
-  HiLink svnModified    Special
-  HiLink svnProperty    Special
-  HiLink svnRenamed     Special
+HiLink svnRegion      Comment
+HiLink svnDelimiter   NonText
+HiLink svnRemoved     Constant
+HiLink svnAdded       Identifier
+HiLink svnModified    Special
+HiLink svnProperty    Special
+HiLink svnRenamed     Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "svn"
diff --git a/runtime/syntax/systemverilog.vim b/runtime/syntax/systemverilog.vim
index 5bf2935078..94074bd083 100644
--- a/runtime/syntax/systemverilog.vim
+++ b/runtime/syntax/systemverilog.vim
@@ -3,21 +3,14 @@
 " Maintainer:  kocha <kocha.lsifrontend@gmail.com>
 " Last Change: 12-Aug-2013. 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-    syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
     finish
 endif
 
 " Read in Verilog syntax files
-if version < 600
-    so <sfile>:p:h/verilog.vim
-else
-    runtime! syntax/verilog.vim
-    unlet b:current_syntax
-endif
+runtime! syntax/verilog.vim
+unlet b:current_syntax
 
 " IEEE1800-2005
 syn keyword systemverilogStatement   always_comb always_ff always_latch
@@ -76,25 +69,18 @@ syn keyword systemverilogStatement   implements
 syn keyword systemverilogStatement   interconnect soft nettype
 
 " Define the default highlighting.
-if version >= 508 || !exists("did_systemverilog_syn_inits")
-   if version < 508
-      let did_systemverilog_syn_inits = 1
-      command -nargs=+ HiLink hi link <args>
-   else
-      command -nargs=+ HiLink hi def link <args>
-   endif
+command -nargs=+ HiLink hi def link <args>
 
-   " The default highlighting.
-   HiLink systemverilogStatement       Statement
-   HiLink systemverilogTypeDef         TypeDef
-   HiLink systemverilogConditional     Conditional
-   HiLink systemverilogRepeat          Repeat
-   HiLink systemverilogLabel           Label
-   HiLink systemverilogGlobal          Define
-   HiLink systemverilogNumber          Number
+" The default highlighting.
+HiLink systemverilogStatement       Statement
+HiLink systemverilogTypeDef         TypeDef
+HiLink systemverilogConditional     Conditional
+HiLink systemverilogRepeat          Repeat
+HiLink systemverilogLabel           Label
+HiLink systemverilogGlobal          Define
+HiLink systemverilogNumber          Number
 
-   delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "systemverilog"
 
diff --git a/runtime/syntax/tads.vim b/runtime/syntax/tads.vim
index 260ff360f7..0f63bea2fe 100644
--- a/runtime/syntax/tads.vim
+++ b/runtime/syntax/tads.vim
@@ -13,11 +13,8 @@
 " Actually, should cvtstr etc. be functions?! (change tadsFunction)
 " Make global etc. into Identifiers, since we don't have regular variables?
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -122,57 +119,49 @@ endif
 execute "syn sync maxlines=" . tads_sync_dist
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_tads_syn_inits")
-  if version < 508
-    let did_tads_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting.  Can be overridden later
-  HiLink tadsFunctionDef Function
-  HiLink tadsFunction  Structure
-  HiLink tadsClass     Structure
-  HiLink tadsClassDef  Identifier
-  HiLink tadsObjectDef Identifier
+" The default methods for highlighting.  Can be overridden later
+HiLink tadsFunctionDef Function
+HiLink tadsFunction  Structure
+HiLink tadsClass     Structure
+HiLink tadsClassDef  Identifier
+HiLink tadsObjectDef Identifier
 " no highlight for tadsEmbedded, so it prints as normal text w/in the string
 
-  HiLink tadsOperator	Operator
-  HiLink tadsStructure	Structure
-  HiLink tadsTodo	Todo
-  HiLink tadsLabel	Label
-  HiLink tadsConditional	Conditional
-  HiLink tadsRepeat	Repeat
-  HiLink tadsException	Exception
-  HiLink tadsStatement	Statement
-  HiLink tadsStorageClass	StorageClass
-  HiLink tadsKeyWord   Keyword
-  HiLink tadsSpecial	SpecialChar
-  HiLink tadsNumber	Number
-  HiLink tadsBoolean	Boolean
-  HiLink tadsDoubleString	tadsString
-  HiLink tadsSingleString	tadsString
+HiLink tadsOperator	Operator
+HiLink tadsStructure	Structure
+HiLink tadsTodo	Todo
+HiLink tadsLabel	Label
+HiLink tadsConditional	Conditional
+HiLink tadsRepeat	Repeat
+HiLink tadsException	Exception
+HiLink tadsStatement	Statement
+HiLink tadsStorageClass	StorageClass
+HiLink tadsKeyWord   Keyword
+HiLink tadsSpecial	SpecialChar
+HiLink tadsNumber	Number
+HiLink tadsBoolean	Boolean
+HiLink tadsDoubleString	tadsString
+HiLink tadsSingleString	tadsString
 
-  HiLink tadsOctalError	tadsError
-  HiLink tadsCommentError	tadsError
-  HiLink tadsBraceError	tadsError
-  HiLink tadsInBrace	tadsError
-  HiLink tadsError	Error
+HiLink tadsOctalError	tadsError
+HiLink tadsCommentError	tadsError
+HiLink tadsBraceError	tadsError
+HiLink tadsInBrace	tadsError
+HiLink tadsError	Error
 
-  HiLink tadsInclude	Include
-  HiLink tadsPreProc	PreProc
-  HiLink tadsDefine	Macro
-  HiLink tadsIncluded	tadsString
-  HiLink tadsPreCondit	PreCondit
+HiLink tadsInclude	Include
+HiLink tadsPreProc	PreProc
+HiLink tadsDefine	Macro
+HiLink tadsIncluded	tadsString
+HiLink tadsPreCondit	PreCondit
 
-  HiLink tadsString	String
-  HiLink tadsComment	Comment
+HiLink tadsString	String
+HiLink tadsComment	Comment
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "tads"
diff --git a/runtime/syntax/tags.vim b/runtime/syntax/tags.vim
index c86f17a618..a7044c04ec 100644
--- a/runtime/syntax/tags.vim
+++ b/runtime/syntax/tags.vim
@@ -4,11 +4,8 @@
 " Version:		4
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TAGS
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -22,25 +19,17 @@ syn match	tagComment	"^!_TAG_.*$"
 syn match	tagField	contained "[a-z]*:"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_drchip_tags_inits")
-  if version < 508
-    let did_drchip_tags_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink tagBaseFile	PreProc
-  HiLink tagComment	Comment
-  HiLink tagDelim	Delimiter
-  HiLink tagField	Number
-  HiLink tagName	Identifier
-  HiLink tagPath	PreProc
+HiLink tagBaseFile	PreProc
+HiLink tagComment	Comment
+HiLink tagDelim	Delimiter
+HiLink tagField	Number
+HiLink tagName	Identifier
+HiLink tagPath	PreProc
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "tags"
 
diff --git a/runtime/syntax/tak.vim b/runtime/syntax/tak.vim
index 20186db143..b363ea33c6 100644
--- a/runtime/syntax/tak.vim
+++ b/runtime/syntax/tak.vim
@@ -8,11 +8,8 @@
 
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -32,11 +29,7 @@ syn case ignore
 let fortran_free_source=1
 
 " Load FORTRAN syntax file
-if version < 600
-  source <sfile>:p:h/fortran.vim
-else
-  runtime! syntax/fortran.vim
-endif
+runtime! syntax/fortran.vim
 unlet b:current_syntax
 
 
@@ -95,40 +88,32 @@ endif
 
 
 " Define the default highlighting
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_tak_syntax_inits")
-  if version < 508
-    let did_tak_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink takMacro		Macro
-  HiLink takOptions		Special
-  HiLink takRoutine		Type
-  HiLink takControl		Special
-  HiLink takSolids		Special
-  HiLink takSolidsArg		Statement
-  HiLink takIdentifier		Identifier
+HiLink takMacro		Macro
+HiLink takOptions		Special
+HiLink takRoutine		Type
+HiLink takControl		Special
+HiLink takSolids		Special
+HiLink takSolidsArg		Statement
+HiLink takIdentifier		Identifier
 
-  HiLink takFortran		PreProc
-  HiLink takMotran		PreProc
+HiLink takFortran		PreProc
+HiLink takMotran		PreProc
 
-  HiLink takComment		Comment
-  HiLink takHeader		Typedef
-  HiLink takIncludeFile		Type
-  HiLink takInteger		Number
-  HiLink takFloat		Float
-  HiLink takScientific		Float
+HiLink takComment		Comment
+HiLink takHeader		Typedef
+HiLink takIncludeFile		Type
+HiLink takInteger		Number
+HiLink takFloat		Float
+HiLink takScientific		Float
 
-  HiLink takEndData		Macro
+HiLink takEndData		Macro
 
-  HiLink takTodo		Todo
+HiLink takTodo		Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "tak"
diff --git a/runtime/syntax/takcmp.vim b/runtime/syntax/takcmp.vim
index a94609b325..6faddc2642 100644
--- a/runtime/syntax/takcmp.vim
+++ b/runtime/syntax/takcmp.vim
@@ -8,11 +8,8 @@
 
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -51,30 +48,22 @@ syn case ignore
 
 
 " Define the default highlighting
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_takcmp_syntax_inits")
-  if version < 508
-    let did_takcmp_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink takcmpTitle		   Type
-  HiLink takcmpUnit		   PreProc
+HiLink takcmpTitle		   Type
+HiLink takcmpUnit		   PreProc
 
-  HiLink takcmpLabel		   Statement
+HiLink takcmpLabel		   Statement
 
-  HiLink takcmpHeader		   takHeader
+HiLink takcmpHeader		   takHeader
 
-  HiLink takcmpDate		   Identifier
-  HiLink takcmpTime		   Identifier
-  HiLink takcmpInteger		   Number
-  HiLink takcmpFloat		   Special
+HiLink takcmpDate		   Identifier
+HiLink takcmpTime		   Identifier
+HiLink takcmpInteger		   Number
+HiLink takcmpFloat		   Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "takcmp"
diff --git a/runtime/syntax/takout.vim b/runtime/syntax/takout.vim
index 774353942a..ed69ff0a21 100644
--- a/runtime/syntax/takout.vim
+++ b/runtime/syntax/takout.vim
@@ -8,11 +8,8 @@
 
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -24,11 +21,7 @@ syn case match
 
 
 " Load TAK syntax file
-if version < 600
-  source <sfile>:p:h/tak.vim
-else
-  runtime! syntax/tak.vim
-endif
+runtime! syntax/tak.vim
 unlet b:current_syntax
 
 
@@ -70,31 +63,23 @@ syn match takoutError	     "<<< Error >>>"
 
 
 " Define the default highlighting
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_takout_syntax_inits")
-  if version < 508
-    let did_takout_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink takoutPos		   Statement
-  HiLink takoutNeg		   PreProc
-  HiLink takoutTitle		   Type
-  HiLink takoutFile		   takIncludeFile
-  HiLink takoutInteger		   takInteger
+HiLink takoutPos		   Statement
+HiLink takoutNeg		   PreProc
+HiLink takoutTitle		   Type
+HiLink takoutFile		   takIncludeFile
+HiLink takoutInteger		   takInteger
 
-  HiLink takoutSectionDelim	    Delimiter
-  HiLink takoutSectionTitle	   Exception
-  HiLink takoutHeaderDelim	   SpecialComment
-  HiLink takoutLabel		   Identifier
+HiLink takoutSectionDelim	    Delimiter
+HiLink takoutSectionTitle	   Exception
+HiLink takoutHeaderDelim	   SpecialComment
+HiLink takoutLabel		   Identifier
 
-  HiLink takoutError		   Error
+HiLink takoutError		   Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "takout"
diff --git a/runtime/syntax/taskdata.vim b/runtime/syntax/taskdata.vim
index b37c70cc1f..63a8284adf 100644
--- a/runtime/syntax/taskdata.vim
+++ b/runtime/syntax/taskdata.vim
@@ -4,11 +4,8 @@
 " Updated:	Wed Jul  8 19:46:20 EDT 2009
 
 
-" For version 5.x: Clear all syntax items.
-" For version 6.x: Quit when a syntax file was already loaded.
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded.
+if exists("b:current_syntax")
   finish
 endif
 let s:keepcpo= &cpo
diff --git a/runtime/syntax/taskedit.vim b/runtime/syntax/taskedit.vim
index 170153c0ee..d33ca78650 100644
--- a/runtime/syntax/taskedit.vim
+++ b/runtime/syntax/taskedit.vim
@@ -4,11 +4,8 @@
 " Updated:	Wed Jul  8 19:46:32 EDT 2009
 
 
-" For version 5.x: Clear all syntax items.
-" For version 6.x: Quit when a syntax file was already loaded.
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded.
+if exists("b:current_syntax")
   finish
 endif
 let s:keepcpo= &cpo
diff --git a/runtime/syntax/tasm.vim b/runtime/syntax/tasm.vim
index 2f8559610e..995e8b49d4 100644
--- a/runtime/syntax/tasm.vim
+++ b/runtime/syntax/tasm.vim
@@ -3,11 +3,8 @@
 " Maintaner: FooLman of United Force <foolman@bigfoot.com>
 " Last Change: 2012 Feb 03 by Thilo Six
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -95,32 +92,24 @@ syn match tasmOct "\<[0-7]\+O\>"
 syn match tasmBin "\<[01]\+B\>"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_tasm_syntax_inits")
-  if version < 508
-    let did_tasm_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink tasmString String
-  HiLink tasmDec Number
-  HiLink tasmHex Number
-  HiLink tasmOct Number
-  HiLink tasmBin Number
-  HiLink tasmInstruction Keyword
-  HiLink tasmCoprocInstr Keyword
-  HiLink tasmMMXInst	Keyword
-  HiLink tasmDirective PreProc
-  HiLink tasmRegister Identifier
-  HiLink tasmProctype PreProc
-  HiLink tasmComment Comment
-  HiLink tasmLabel Label
+HiLink tasmString String
+HiLink tasmDec Number
+HiLink tasmHex Number
+HiLink tasmOct Number
+HiLink tasmBin Number
+HiLink tasmInstruction Keyword
+HiLink tasmCoprocInstr Keyword
+HiLink tasmMMXInst	Keyword
+HiLink tasmDirective PreProc
+HiLink tasmRegister Identifier
+HiLink tasmProctype PreProc
+HiLink tasmComment Comment
+HiLink tasmLabel Label
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:curret_syntax = "tasm"
 
diff --git a/runtime/syntax/tcl.vim b/runtime/syntax/tcl.vim
index 06629d077f..ff51c140e5 100644
--- a/runtime/syntax/tcl.vim
+++ b/runtime/syntax/tcl.vim
@@ -10,11 +10,8 @@
 " Version:	1.14
 " URL:		http://bitbucket.org/taylor_venable/metasyntax/src/tip/Config/vim/syntax/tcl.vim
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -238,49 +235,41 @@ syn region  tclComment		start=/;\s*\#/hs=s+1 skip="\\$" end="$" contains=tclTodo
 "syn sync ccomment tclComment
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_tcl_syntax_inits")
-  if version < 508
-    let did_tcl_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink tcltkSwitch		Special
-  HiLink tclExpand		Special
-  HiLink tclLabel		Label
-  HiLink tclConditional		Conditional
-  HiLink tclRepeat		Repeat
-  HiLink tclNumber		Number
-  HiLink tclError		Error
-  HiLink tclCommand		Statement
-  HiLink tclProcCommand		Type
-  HiLink tclString		String
-  HiLink tclComment		Comment
-  HiLink tclSpecial		Special
-  HiLink tclTodo		Todo
-  " Below here are the commands and their options.
-  HiLink tcltkCommandColor	Statement
-  HiLink tcltkWidgetColor	Structure
-  HiLink tclLineContinue	WarningMsg
+HiLink tcltkSwitch		Special
+HiLink tclExpand		Special
+HiLink tclLabel		Label
+HiLink tclConditional		Conditional
+HiLink tclRepeat		Repeat
+HiLink tclNumber		Number
+HiLink tclError		Error
+HiLink tclCommand		Statement
+HiLink tclProcCommand		Type
+HiLink tclString		String
+HiLink tclComment		Comment
+HiLink tclSpecial		Special
+HiLink tclTodo		Todo
+" Below here are the commands and their options.
+HiLink tcltkCommandColor	Statement
+HiLink tcltkWidgetColor	Structure
+HiLink tclLineContinue	WarningMsg
 if exists('g:tcl_warn_continuation')
-  HiLink tclNotLineContinue	ErrorMsg
+HiLink tclNotLineContinue	ErrorMsg
 endif
-  HiLink tcltkStringSwitch	Special
-  HiLink tcltkArraySwitch	Special
-  HiLink tcltkLsortSwitch	Special
-  HiLink tcltkPackSwitch	Special
-  HiLink tcltkPackConfSwitch	Special
-  HiLink tcltkMaths		Special
-  HiLink tcltkNamespaceSwitch	Special
-  HiLink tcltkWidgetSwitch	Special
-  HiLink tcltkPackConfColor	Identifier
-  HiLink tclVarRef		Identifier
+HiLink tcltkStringSwitch	Special
+HiLink tcltkArraySwitch	Special
+HiLink tcltkLsortSwitch	Special
+HiLink tcltkPackSwitch	Special
+HiLink tcltkPackConfSwitch	Special
+HiLink tcltkMaths		Special
+HiLink tcltkNamespaceSwitch	Special
+HiLink tcltkWidgetSwitch	Special
+HiLink tcltkPackConfColor	Identifier
+HiLink tclVarRef		Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "tcl"
 
diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim
index c0982d84da..6cb27ea4ba 100644
--- a/runtime/syntax/tex.vim
+++ b/runtime/syntax/tex.vim
@@ -40,11 +40,8 @@
 "      using conceal mode       :help tex-conceal
 
 " Version Clears: {{{1
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 let s:keepcpo= &cpo
@@ -54,14 +51,8 @@ scriptencoding utf-8
 " Define the default highlighting. {{{1
 " For version 5.7 and earlier: only when not done already
 " For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_tex_syntax_inits")
- let did_tex_syntax_inits = 1
- if version < 508
-  command -nargs=+ HiLink hi link <args>
- else
-  command -nargs=+ HiLink hi def link <args>
- endif
-endif
+let did_tex_syntax_inits = 1
+command -nargs=+ HiLink hi def link <args>
 
 " by default, enable all region-based highlighting
 let s:tex_fast= "bcmMprsSvV"
@@ -598,27 +589,17 @@ if s:tex_fast =~# 'v'
    syn region texZone		start="\\begin{[vV]erbatim}"		end="\\end{[vV]erbatim}\|%stopzone\>"	contains=@Spell
    " listings package:
    syn region texZone		start="\\begin{lstlisting}"		end="\\end{lstlisting}\|%stopzone\>"	contains=@Spell
-   if version < 600
-    syn region texZone		start="\\verb\*\=`"			end="`\|%stopzone\>"			contains=@Spell
-    syn region texZone		start="\\verb\*\=#"			end="#\|%stopzone\>"			contains=@Spell
+   if b:tex_stylish
+    syn region texZone		start="\\verb\*\=\z([^\ta-zA-Z@]\)"	end="\z1\|%stopzone\>"			contains=@Spell
    else
-     if b:tex_stylish
-      syn region texZone		start="\\verb\*\=\z([^\ta-zA-Z@]\)"	end="\z1\|%stopzone\>"			contains=@Spell
-     else
-      syn region texZone		start="\\verb\*\=\z([^\ta-zA-Z]\)"	end="\z1\|%stopzone\>"			contains=@Spell
-     endif
+    syn region texZone		start="\\verb\*\=\z([^\ta-zA-Z]\)"	end="\z1\|%stopzone\>"			contains=@Spell
    endif
   else
    syn region texZone		start="\\begin{[vV]erbatim}"		end="\\end{[vV]erbatim}\|%stopzone\>"
-   if version < 600
-    syn region texZone		start="\\verb\*\=`"			end="`\|%stopzone\>"
-    syn region texZone		start="\\verb\*\=#"			end="#\|%stopzone\>"
+   if b:tex_stylish
+     syn region texZone		start="\\verb\*\=\z([^\ta-zA-Z@]\)"	end="\z1\|%stopzone\>"
    else
-     if b:tex_stylish
-       syn region texZone		start="\\verb\*\=\z([^\ta-zA-Z@]\)"	end="\z1\|%stopzone\>"
-     else
-       syn region texZone		start="\\verb\*\=\z([^\ta-zA-Z]\)"	end="\z1\|%stopzone\>"
-     endif
+     syn region texZone		start="\\verb\*\=\z([^\ta-zA-Z]\)"	end="\z1\|%stopzone\>"
    endif
   endif
 endif
diff --git a/runtime/syntax/texinfo.vim b/runtime/syntax/texinfo.vim
index 134fc6763c..ec353bb140 100644
--- a/runtime/syntax/texinfo.vim
+++ b/runtime/syntax/texinfo.vim
@@ -9,10 +9,8 @@
 " since @ can have special meanings, everything is 'match'-ed and 'region'-ed
 " (including @ in 'iskeyword' option has unexpected effects)
 
-" Remove any old syntax stuff hanging around, if needed
-if version < 600
-  syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -356,48 +354,39 @@ syn cluster texinfoReducedAll contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
 "==============================================================================
 " highlighting
 
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_texinfo_syn_inits")
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  if version < 508
-    let did_texinfo_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+HiLink texinfoSpecialChar	Special
+HiLink texinfoHFSpecialChar	Special
 
-  HiLink texinfoSpecialChar	Special
-  HiLink texinfoHFSpecialChar	Special
-
-  HiLink texinfoError		Error
-  HiLink texinfoIdent		Identifier
-  HiLink texinfoAssignment	Identifier
-  HiLink texinfoSinglePar	Identifier
-  HiLink texinfoIndexPar	Identifier
-  HiLink texinfoSIPar		Identifier
-  HiLink texinfoDIEPar		Identifier
-  HiLink texinfoTexCmd		PreProc
+HiLink texinfoError		Error
+HiLink texinfoIdent		Identifier
+HiLink texinfoAssignment	Identifier
+HiLink texinfoSinglePar	Identifier
+HiLink texinfoIndexPar	Identifier
+HiLink texinfoSIPar		Identifier
+HiLink texinfoDIEPar		Identifier
+HiLink texinfoTexCmd		PreProc
 
 
-  HiLink texinfoAtCmd		Statement	"@-command
-  HiLink texinfoPrmAtCmd	String		"@-command in one line with unknown nr. of parameters
-						"is String because is found as a region and is 'matchgroup'-ed
-						"to texinfoAtCmd
-  HiLink texinfoBrcPrmAtCmd	String		"@-command with parameter(s) in braces ({})
-						"is String because is found as a region and is 'matchgroup'-ed to texinfoAtCmd
-  HiLink texinfoMltlnAtCmdFLine  texinfoAtCmd	"repeated embedded First lines in @-commands
-  HiLink texinfoMltlnAtCmd	String		"@-command in multiple lines
-						"is String because is found as a region and is 'matchgroup'-ed to texinfoAtCmd
-  HiLink texinfoMltln2AtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
-  HiLink texinfoMltlnDMAtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors; used for @detailmenu, which can be included in @menu)
-  HiLink texinfoMltlnNAtCmd	Normal		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
-  HiLink texinfoThisAtCmd	Statement	"@-command used in headers and footers (@this... series)
+HiLink texinfoAtCmd		Statement	"@-command
+HiLink texinfoPrmAtCmd	String		"@-command in one line with unknown nr. of parameters
+					      "is String because is found as a region and is 'matchgroup'-ed
+					      "to texinfoAtCmd
+HiLink texinfoBrcPrmAtCmd	String		"@-command with parameter(s) in braces ({})
+					      "is String because is found as a region and is 'matchgroup'-ed to texinfoAtCmd
+HiLink texinfoMltlnAtCmdFLine  texinfoAtCmd	"repeated embedded First lines in @-commands
+HiLink texinfoMltlnAtCmd	String		"@-command in multiple lines
+					      "is String because is found as a region and is 'matchgroup'-ed to texinfoAtCmd
+HiLink texinfoMltln2AtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
+HiLink texinfoMltlnDMAtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors; used for @detailmenu, which can be included in @menu)
+HiLink texinfoMltlnNAtCmd	Normal		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
+HiLink texinfoThisAtCmd	Statement	"@-command used in headers and footers (@this... series)
 
-  HiLink texinfoComment	Comment
+HiLink texinfoComment	Comment
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "texinfo"
diff --git a/runtime/syntax/texmf.vim b/runtime/syntax/texmf.vim
index 7b91168f08..4c3ccf8f45 100644
--- a/runtime/syntax/texmf.vim
+++ b/runtime/syntax/texmf.vim
@@ -6,12 +6,9 @@
 " URL: http://physics.muni.cz/~yeti/download/syntax/texmf.vim
 
 " Setup
-if version >= 600
-  if exists("b:current_syntax")
-    finish
-  endif
-else
-  syntax clear
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+  finish
 endif
 
 syn case match
@@ -45,42 +42,35 @@ syn region texmfBrace matchgroup=texmfBraceBrace start="{" end="}" contains=ALLB
 syn match texmfBraceError "}"
 
 " Define the default highlighting
-if version >= 508 || !exists("did_texmf_syntax_inits")
-  if version < 508
-    let did_texmf_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink texmfComment Comment
-  HiLink texmfTodo Todo
+HiLink texmfComment Comment
+HiLink texmfTodo Todo
 
-  HiLink texmfPassedParameter texmfVariable
-  HiLink texmfVariable Identifier
+HiLink texmfPassedParameter texmfVariable
+HiLink texmfVariable Identifier
 
-  HiLink texmfNumber Number
-  HiLink texmfString String
+HiLink texmfNumber Number
+HiLink texmfString String
 
-  HiLink texmfLHSStart texmfLHS
-  HiLink texmfLHSVariable texmfLHS
-  HiLink texmfLHSDot texmfLHS
-  HiLink texmfLHS Type
+HiLink texmfLHSStart texmfLHS
+HiLink texmfLHSVariable texmfLHS
+HiLink texmfLHSDot texmfLHS
+HiLink texmfLHS Type
 
-  HiLink texmfEquals Normal
+HiLink texmfEquals Normal
 
-  HiLink texmfBraceBrace texmfDelimiter
-  HiLink texmfComma texmfDelimiter
-  HiLink texmfColons texmfDelimiter
-  HiLink texmfDelimiter Preproc
+HiLink texmfBraceBrace texmfDelimiter
+HiLink texmfComma texmfDelimiter
+HiLink texmfColons texmfDelimiter
+HiLink texmfDelimiter Preproc
 
-  HiLink texmfDoubleExclam Statement
-  HiLink texmfSpecial Special
+HiLink texmfDoubleExclam Statement
+HiLink texmfSpecial Special
 
-  HiLink texmfBraceError texmfError
-  HiLink texmfError Error
+HiLink texmfBraceError texmfError
+HiLink texmfError Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "texmf"
diff --git a/runtime/syntax/tf.vim b/runtime/syntax/tf.vim
index 2a9a999883..9de93dae23 100644
--- a/runtime/syntax/tf.vim
+++ b/runtime/syntax/tf.vim
@@ -9,11 +9,8 @@
 
 " Remove any old syntax stuff hanging around
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -161,44 +158,36 @@ else
 endif
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_tf_syn_inits")
-  if version < 508
-    let did_tf_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink tfComment		Comment
-  HiLink tfString		String
-  HiLink tfNumber		Number
-  HiLink tfFloat		Float
-  HiLink tfIdentifier		Identifier
-  HiLink tfVar			Identifier
-  HiLink tfWorld		Identifier
-  HiLink tfReadonly		Identifier
-  HiLink tfHook		Identifier
-  HiLink tfFunctions		Function
-  HiLink tfRepeat		Repeat
-  HiLink tfConditional		Conditional
-  HiLink tfLabel		Label
-  HiLink tfStatement		Statement
-  HiLink tfType		Type
-  HiLink tfInclude		Include
-  HiLink tfDefine		Define
-  HiLink tfSpecialChar		SpecialChar
-  HiLink tfSpecialCharEsc	SpecialChar
-  HiLink tfParentError		Error
-  HiLink tfTodo		Todo
-  HiLink tfEndCommand		Delimiter
-  HiLink tfJoinLines		Delimiter
-  HiLink tfOperator		Operator
-  HiLink tfRelation		Operator
+HiLink tfComment		Comment
+HiLink tfString		String
+HiLink tfNumber		Number
+HiLink tfFloat		Float
+HiLink tfIdentifier		Identifier
+HiLink tfVar			Identifier
+HiLink tfWorld		Identifier
+HiLink tfReadonly		Identifier
+HiLink tfHook		Identifier
+HiLink tfFunctions		Function
+HiLink tfRepeat		Repeat
+HiLink tfConditional		Conditional
+HiLink tfLabel		Label
+HiLink tfStatement		Statement
+HiLink tfType		Type
+HiLink tfInclude		Include
+HiLink tfDefine		Define
+HiLink tfSpecialChar		SpecialChar
+HiLink tfSpecialCharEsc	SpecialChar
+HiLink tfParentError		Error
+HiLink tfTodo		Todo
+HiLink tfEndCommand		Delimiter
+HiLink tfJoinLines		Delimiter
+HiLink tfOperator		Operator
+HiLink tfRelation		Operator
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "tf"
 
diff --git a/runtime/syntax/tli.vim b/runtime/syntax/tli.vim
index 5685a6cbf2..e0e19ab98f 100644
--- a/runtime/syntax/tli.vim
+++ b/runtime/syntax/tli.vim
@@ -4,11 +4,8 @@
 " Last Change:	2001 May 10
 " Version:      1.0
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -44,27 +41,19 @@ syn match tliComment	"#.*"
 syn case match
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_tli_syntax_inits")
-  if version < 508
-    let did_tli_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink tliNumber	Number
-  HiLink tliString	String
-  HiLink tliComment	Comment
-  HiLink tliSpecial	SpecialChar
-  HiLink tliIdentifier Identifier
-  HiLink tliObject     Statement
-  HiLink tliField      Type
-  HiLink tliStyle      PreProc
+HiLink tliNumber	Number
+HiLink tliString	String
+HiLink tliComment	Comment
+HiLink tliSpecial	SpecialChar
+HiLink tliIdentifier Identifier
+HiLink tliObject     Statement
+HiLink tliField      Type
+HiLink tliStyle      PreProc
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "tli"
 
diff --git a/runtime/syntax/tpp.vim b/runtime/syntax/tpp.vim
index 050a2ba78d..b1ea35f041 100644
--- a/runtime/syntax/tpp.vim
+++ b/runtime/syntax/tpp.vim
@@ -17,11 +17,8 @@
 " the latest version of this file.
 " SPAM is _NOT_ welcome - be ready to be reported!
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -51,11 +48,7 @@ syn region tppAbstractOption start="^--\%(author\|title\|date\|footer\)" end="$"
 
 if main_syntax != 'sh'
   " shell command
-  if version < 600
-    syn include @tppShExec <sfile>:p:h/sh.vim
-  else
-    syn include @tppShExec syntax/sh.vim
-  endif
+  syn include @tppShExec syntax/sh.vim
   unlet b:current_syntax
 
   syn region shExec matchgroup=tppPageLocalOptionKey start='^--exec *' keepend end='$' contains=@tppShExec
@@ -65,35 +58,27 @@ endif
 syn match tppComment "^--##.*$"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_tpp_syn_inits")
-  if version < 508
-    let did_tpp_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink tppAbstractOptionKey		Special
-  HiLink tppPageLocalOptionKey		Keyword
-  HiLink tppPageLocalSwitchKey		Keyword
-  HiLink tppColorOptionKey		Keyword
-  HiLink tppTimeOptionKey		Comment
-  HiLink tppNewPageOptionKey		PreProc
-  HiLink tppString			String
-  HiLink tppColor			String
-  HiLink tppTime			Number
-  HiLink tppComment			Comment
-  HiLink tppAbstractOption		Error
-  HiLink tppPageLocalOption		Error
-  HiLink tppPageLocalSwitch		Error
-  HiLink tppColorOption			Error
-  HiLink tppNewPageOption		Error
-  HiLink tppTimeOption			Error
+HiLink tppAbstractOptionKey		Special
+HiLink tppPageLocalOptionKey		Keyword
+HiLink tppPageLocalSwitchKey		Keyword
+HiLink tppColorOptionKey		Keyword
+HiLink tppTimeOptionKey		Comment
+HiLink tppNewPageOptionKey		PreProc
+HiLink tppString			String
+HiLink tppColor			String
+HiLink tppTime			Number
+HiLink tppComment			Comment
+HiLink tppAbstractOption		Error
+HiLink tppPageLocalOption		Error
+HiLink tppPageLocalSwitch		Error
+HiLink tppColorOption			Error
+HiLink tppNewPageOption		Error
+HiLink tppTimeOption			Error
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "tpp"
 
diff --git a/runtime/syntax/trasys.vim b/runtime/syntax/trasys.vim
index cfecc1c1fd..1e7f75c357 100644
--- a/runtime/syntax/trasys.vim
+++ b/runtime/syntax/trasys.vim
@@ -8,11 +8,8 @@
 
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -21,11 +18,7 @@ endif
 let fortran_free_source=1
 
 " Load FORTRAN syntax file
-if version < 600
-  source <sfile>:p:h/fortran.vim
-else
-  runtime! syntax/fortran.vim
-endif
+runtime! syntax/fortran.vim
 unlet b:current_syntax
 
 
@@ -136,40 +129,32 @@ syn sync match trasysSync grouphere trasysComment "^HEADER DOCUMENTATION DATA"
 
 
 " Define the default highlighting
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_trasys_syntax_inits")
-  if version < 508
-    let did_trasys_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink trasysOptions		Special
-  HiLink trasysSurface		Special
-  HiLink trasysSurfaceType	Constant
-  HiLink trasysSurfaceArgs	Constant
-  HiLink trasysArgs		Constant
-  HiLink trasysOperations	Statement
-  HiLink trasysSubRoutine	Statement
-  HiLink trassyPrcsrSegm	PreProc
-  HiLink trasysIdentifier	Identifier
-  HiLink trasysComment		Comment
-  HiLink trasysHeader		Typedef
-  HiLink trasysMacro		Macro
-  HiLink trasysInteger		Number
-  HiLink trasysFloat		Float
-  HiLink trasysScientific	Float
+HiLink trasysOptions		Special
+HiLink trasysSurface		Special
+HiLink trasysSurfaceType	Constant
+HiLink trasysSurfaceArgs	Constant
+HiLink trasysArgs		Constant
+HiLink trasysOperations	Statement
+HiLink trasysSubRoutine	Statement
+HiLink trassyPrcsrSegm	PreProc
+HiLink trasysIdentifier	Identifier
+HiLink trasysComment		Comment
+HiLink trasysHeader		Typedef
+HiLink trasysMacro		Macro
+HiLink trasysInteger		Number
+HiLink trasysFloat		Float
+HiLink trasysScientific	Float
 
-  HiLink trasysBlank		SpecialChar
+HiLink trasysBlank		SpecialChar
 
-  HiLink trasysEndData		Macro
+HiLink trasysEndData		Macro
 
-  HiLink trasysTodo		Todo
+HiLink trasysTodo		Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "trasys"
diff --git a/runtime/syntax/trustees.vim b/runtime/syntax/trustees.vim
index 4bc8874772..6c58d3983d 100644
--- a/runtime/syntax/trustees.vim
+++ b/runtime/syntax/trustees.vim
@@ -3,9 +3,8 @@
 " Maintainer:   Nima Talebi <nima@it.net.au>
 " Last Change:  2005-10-12
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
diff --git a/runtime/syntax/tsalt.vim b/runtime/syntax/tsalt.vim
index 887d6b75e7..7bccde0e52 100644
--- a/runtime/syntax/tsalt.vim
+++ b/runtime/syntax/tsalt.vim
@@ -4,11 +4,8 @@
 " Last Change:	2012 Feb 03 by Thilo Six
 " Version Info: @(#)tsalt.vim	1.5	97/12/16 08:11:15
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -171,46 +168,38 @@ syn sync ccomment tsaltComment
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_tsalt_syntax_inits")
-  if version < 508
-    let did_tsalt_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink tsaltFunction		Statement
-	HiLink tsaltSysVar		Type
-	"HiLink tsaltLibFunc		UserDefFunc
-	"HiLink tsaltConstants		Type
-	"HiLink tsaltFuncArg		Type
-	"HiLink tsaltOperator		Operator
-	"HiLink tsaltLabel		Label
-	"HiLink tsaltUserLabel		Label
-	HiLink tsaltConditional		Conditional
-	HiLink tsaltRepeat		Repeat
-	HiLink tsaltCharacter		SpecialChar
-	HiLink tsaltSpecialCharacter	SpecialChar
-	HiLink tsaltNumber		Number
-	HiLink tsaltFloat		Float
-	HiLink tsaltCommentError	tsaltError
-	HiLink tsaltInclude		Include
-	HiLink tsaltPreProc		PreProc
-	HiLink tsaltDefine		Macro
-	HiLink tsaltIncluded		tsaltString
-	HiLink tsaltError		Error
-	HiLink tsaltStatement		Statement
-	HiLink tsaltPreCondit		PreCondit
-	HiLink tsaltType		Type
-	HiLink tsaltString		String
-	HiLink tsaltComment		Comment
-	HiLink tsaltSpecial		Special
-	HiLink tsaltTodo		Todo
+HiLink tsaltFunction		Statement
+HiLink tsaltSysVar		Type
+"HiLink tsaltLibFunc		UserDefFunc
+"HiLink tsaltConstants		Type
+"HiLink tsaltFuncArg		Type
+"HiLink tsaltOperator		Operator
+"HiLink tsaltLabel		Label
+"HiLink tsaltUserLabel		Label
+HiLink tsaltConditional		Conditional
+HiLink tsaltRepeat		Repeat
+HiLink tsaltCharacter		SpecialChar
+HiLink tsaltSpecialCharacter	SpecialChar
+HiLink tsaltNumber		Number
+HiLink tsaltFloat		Float
+HiLink tsaltCommentError	tsaltError
+HiLink tsaltInclude		Include
+HiLink tsaltPreProc		PreProc
+HiLink tsaltDefine		Macro
+HiLink tsaltIncluded		tsaltString
+HiLink tsaltError		Error
+HiLink tsaltStatement		Statement
+HiLink tsaltPreCondit		PreCondit
+HiLink tsaltType		Type
+HiLink tsaltString		String
+HiLink tsaltComment		Comment
+HiLink tsaltSpecial		Special
+HiLink tsaltTodo		Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "tsalt"
 
diff --git a/runtime/syntax/tsscl.vim b/runtime/syntax/tsscl.vim
index 3fc18c6847..32ca8d4359 100644
--- a/runtime/syntax/tsscl.vim
+++ b/runtime/syntax/tsscl.vim
@@ -8,11 +8,8 @@
 
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -179,37 +176,29 @@ syn match  tssclScientific  "-\=\<[0-9]*\.[0-9]*E[-+]\=[0-9]\+\>"
 
 
 " Define the default highlighting
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_tsscl_syntax_inits")
-  if version < 508
-    let did_tsscl_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink tssclCommand		Statement
-  HiLink tssclKeyword		Special
-  HiLink tssclEnd		Macro
-  HiLink tssclUnits		Special
+HiLink tssclCommand		Statement
+HiLink tssclKeyword		Special
+HiLink tssclEnd		Macro
+HiLink tssclUnits		Special
 
-  HiLink tssclComment		Comment
-  HiLink tssclDirective		Statement
-  HiLink tssclConditional	Conditional
-  HiLink tssclContChar		Macro
-  HiLink tssclQualifier		Typedef
-  HiLink tssclSymbol		Identifier
-  HiLink tssclSymbol2		Symbol
-  HiLink tssclString		String
-  HiLink tssclOper		Operator
+HiLink tssclComment		Comment
+HiLink tssclDirective		Statement
+HiLink tssclConditional	Conditional
+HiLink tssclContChar		Macro
+HiLink tssclQualifier		Typedef
+HiLink tssclSymbol		Identifier
+HiLink tssclSymbol2		Symbol
+HiLink tssclString		String
+HiLink tssclOper		Operator
 
-  HiLink tssclInteger		Number
-  HiLink tssclFloat		Number
-  HiLink tssclScientific	Number
+HiLink tssclInteger		Number
+HiLink tssclFloat		Number
+HiLink tssclScientific	Number
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "tsscl"
diff --git a/runtime/syntax/tssgm.vim b/runtime/syntax/tssgm.vim
index b8182d48ea..c575347c60 100644
--- a/runtime/syntax/tssgm.vim
+++ b/runtime/syntax/tssgm.vim
@@ -8,11 +8,8 @@
 
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -75,35 +72,27 @@ syn match  tssgmScientific  "-\=\<[0-9]*\.[0-9]*E[-+]\=[0-9]\+\>"
 
 
 " Define the default highlighting
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_tssgm_syntax_inits")
-  if version < 508
-    let did_tssgm_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink tssgmParam		Statement
-  HiLink tssgmSurfType		Type
-  HiLink tssgmArgs		Special
-  HiLink tssgmDelim		Typedef
-  HiLink tssgmEnd		Macro
-  HiLink tssgmUnits		Special
+HiLink tssgmParam		Statement
+HiLink tssgmSurfType		Type
+HiLink tssgmArgs		Special
+HiLink tssgmDelim		Typedef
+HiLink tssgmEnd		Macro
+HiLink tssgmUnits		Special
 
-  HiLink tssgmDefault		SpecialComment
-  HiLink tssgmComment		Statement
-  HiLink tssgmCommentString	Comment
-  HiLink tssgmSurfIdent		Identifier
-  HiLink tssgmString		Delimiter
+HiLink tssgmDefault		SpecialComment
+HiLink tssgmComment		Statement
+HiLink tssgmCommentString	Comment
+HiLink tssgmSurfIdent		Identifier
+HiLink tssgmString		Delimiter
 
-  HiLink tssgmInteger		Number
-  HiLink tssgmFloat		Float
-  HiLink tssgmScientific	Float
+HiLink tssgmInteger		Number
+HiLink tssgmFloat		Float
+HiLink tssgmScientific	Float
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "tssgm"
diff --git a/runtime/syntax/tssop.vim b/runtime/syntax/tssop.vim
index d416df054c..f8fadab330 100644
--- a/runtime/syntax/tssop.vim
+++ b/runtime/syntax/tssop.vim
@@ -8,11 +8,8 @@
 
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -56,30 +53,22 @@ syn match  tssopScientific  "-\=\<[0-9]*\.[0-9]*E[-+]\=[0-9]\+\>"
 
 
 " Define the default highlighting
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_tssop_syntax_inits")
-  if version < 508
-    let did_tssop_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink tssopParam		Statement
-  HiLink tssopProp		Identifier
-  HiLink tssopArgs		Special
+HiLink tssopParam		Statement
+HiLink tssopProp		Identifier
+HiLink tssopArgs		Special
 
-  HiLink tssopComment		Statement
-  HiLink tssopCommentString	Comment
-  HiLink tssopPropName		Typedef
+HiLink tssopComment		Statement
+HiLink tssopCommentString	Comment
+HiLink tssopPropName		Typedef
 
-  HiLink tssopInteger		Number
-  HiLink tssopFloat		Float
-  HiLink tssopScientific	Float
+HiLink tssopInteger		Number
+HiLink tssopFloat		Float
+HiLink tssopScientific	Float
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "tssop"
diff --git a/runtime/syntax/uc.vim b/runtime/syntax/uc.vim
index 7eab1d48ae..e128cbf82c 100644
--- a/runtime/syntax/uc.vim
+++ b/runtime/syntax/uc.vim
@@ -7,11 +7,8 @@
 
 " Please check :help uc.vim for comments on some of the options available.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -110,64 +107,56 @@ endif
 exec "syn sync ccomment ucComment minlines=" . uc_minlines
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_uc_syntax_inits")
-  if version < 508
-    let did_uc_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink ucFuncDef			Conditional
-  HiLink ucEventDef			Conditional
-  HiLink ucBraces			Function
-  HiLink ucBranch			Conditional
-  HiLink ucLabel			Label
-  HiLink ucUserLabel			Label
-  HiLink ucConditional			Conditional
-  HiLink ucRepeat			Repeat
-  HiLink ucStorageClass			StorageClass
-  HiLink ucMethodDecl			ucStorageClass
-  HiLink ucClassDecl			ucStorageClass
-  HiLink ucScopeDecl			ucStorageClass
-  HiLink ucBoolean			Boolean
-  HiLink ucSpecial			Special
-  HiLink ucSpecialError			Error
-  HiLink ucSpecialCharError		Error
-  HiLink ucString			String
-  HiLink ucCharacter			Character
-  HiLink ucSpecialChar			SpecialChar
-  HiLink ucNumber			Number
-  HiLink ucError			Error
-  HiLink ucStringError			Error
-  HiLink ucStatement			Statement
-  HiLink ucOperator			Operator
-  HiLink ucOverLoaded			Operator
-  HiLink ucComment			Comment
-  HiLink ucDocComment			Comment
-  HiLink ucLineComment			Comment
-  HiLink ucConstant			ucBoolean
-  HiLink ucTypedef			Typedef
-  HiLink ucTodo				Todo
+HiLink ucFuncDef			Conditional
+HiLink ucEventDef			Conditional
+HiLink ucBraces			Function
+HiLink ucBranch			Conditional
+HiLink ucLabel			Label
+HiLink ucUserLabel			Label
+HiLink ucConditional			Conditional
+HiLink ucRepeat			Repeat
+HiLink ucStorageClass			StorageClass
+HiLink ucMethodDecl			ucStorageClass
+HiLink ucClassDecl			ucStorageClass
+HiLink ucScopeDecl			ucStorageClass
+HiLink ucBoolean			Boolean
+HiLink ucSpecial			Special
+HiLink ucSpecialError			Error
+HiLink ucSpecialCharError		Error
+HiLink ucString			String
+HiLink ucCharacter			Character
+HiLink ucSpecialChar			SpecialChar
+HiLink ucNumber			Number
+HiLink ucError			Error
+HiLink ucStringError			Error
+HiLink ucStatement			Statement
+HiLink ucOperator			Operator
+HiLink ucOverLoaded			Operator
+HiLink ucComment			Comment
+HiLink ucDocComment			Comment
+HiLink ucLineComment			Comment
+HiLink ucConstant			ucBoolean
+HiLink ucTypedef			Typedef
+HiLink ucTodo				Todo
 
-  HiLink ucCommentTitle			SpecialComment
-  HiLink ucDocTags			Special
-  HiLink ucDocParam			Function
-  HiLink ucCommentStar			ucComment
+HiLink ucCommentTitle			SpecialComment
+HiLink ucDocTags			Special
+HiLink ucDocParam			Function
+HiLink ucCommentStar			ucComment
 
-  HiLink ucType				Type
-  HiLink ucExternal			Include
+HiLink ucType				Type
+HiLink ucExternal			Include
 
-  HiLink ucClassKeys			Conditional
-  HiLink ucClassLabel			Conditional
+HiLink ucClassKeys			Conditional
+HiLink ucClassLabel			Conditional
 
-  HiLink htmlComment			Special
-  HiLink htmlCommentPart		Special
+HiLink htmlComment			Special
+HiLink htmlCommentPart		Special
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "uc"
 
diff --git a/runtime/syntax/uil.vim b/runtime/syntax/uil.vim
index b5421bcfdb..689b187a25 100644
--- a/runtime/syntax/uil.vim
+++ b/runtime/syntax/uil.vim
@@ -4,10 +4,8 @@
 " Last Change:	2013 May 23
 " URL:		http://gott-gehabt.de/800_wer_wir_sind/thomas/Homepage/Computer/vim/syntax/uil.vim
 
-" Quit when a syntax file was already loaded
-if version < 600
-   syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -47,37 +45,29 @@ syn region uilDefine		start="^#\s*\(define\>\|undef\>\)" end="$" contains=uilLin
 syn sync ccomment uilComment
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_uil_syn_inits")
-  if version < 508
-    let did_uil_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default highlighting.
-  HiLink uilCharacter		uilString
-  HiLink uilSpecialCharacter	uilSpecial
-  HiLink uilNumber		uilString
-  HiLink uilCommentError	uilError
-  HiLink uilInclude		uilPreCondit
-  HiLink uilDefine		uilPreCondit
-  HiLink uilIncluded		uilString
-  HiLink uilSpecialFunction	uilRessource
-  HiLink uilRessource		Identifier
-  HiLink uilSpecialStatement	Keyword
-  HiLink uilError		Error
-  HiLink uilPreCondit		PreCondit
-  HiLink uilType		Type
-  HiLink uilString		String
-  HiLink uilComment		Comment
-  HiLink uilSpecial		Special
-  HiLink uilTodo		Todo
+" The default highlighting.
+HiLink uilCharacter		uilString
+HiLink uilSpecialCharacter	uilSpecial
+HiLink uilNumber		uilString
+HiLink uilCommentError	uilError
+HiLink uilInclude		uilPreCondit
+HiLink uilDefine		uilPreCondit
+HiLink uilIncluded		uilString
+HiLink uilSpecialFunction	uilRessource
+HiLink uilRessource		Identifier
+HiLink uilSpecialStatement	Keyword
+HiLink uilError		Error
+HiLink uilPreCondit		PreCondit
+HiLink uilType		Type
+HiLink uilString		String
+HiLink uilComment		Comment
+HiLink uilSpecial		Special
+HiLink uilTodo		Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 
 let b:current_syntax = "uil"
diff --git a/runtime/syntax/upstart.vim b/runtime/syntax/upstart.vim
index b3f2b9e637..140cd174e0 100644
--- a/runtime/syntax/upstart.vim
+++ b/runtime/syntax/upstart.vim
@@ -10,9 +10,8 @@
 " It is inspired by the initng syntax file and includes sh.vim to do the
 " highlighting of script blocks.
 
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
diff --git a/runtime/syntax/vb.vim b/runtime/syntax/vb.vim
index 0c05b35fbd..24c94fd5ba 100644
--- a/runtime/syntax/vb.vim
+++ b/runtime/syntax/vb.vim
@@ -11,11 +11,8 @@
 " VIM and VIM-DEV mailing lists.  It is by no means complete.
 " Send comments, suggestions and requests to the maintainer.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-	syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
@@ -338,40 +335,32 @@ syn match   vbTypeSpecifier  "[a-zA-Z0-9][\$%&!#]"ms=s+1
 syn match   vbTypeSpecifier  "#[a-zA-Z0-9]"me=e-1
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_vb_syntax_inits")
-	if version < 508
-		let did_vb_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink vbBoolean		Boolean
-	HiLink vbLineNumber		Comment
-	HiLink vbComment		Comment
-	HiLink vbConditional	Conditional
-	HiLink vbConst			Constant
-	HiLink vbDefine			Constant
-	HiLink vbError			Error
-	HiLink vbFunction		Identifier
-	HiLink vbIdentifier		Identifier
-	HiLink vbNumber			Number
-	HiLink vbFloat			Float
-	HiLink vbMethods		PreProc
-	HiLink vbOperator		Operator
-	HiLink vbRepeat			Repeat
-	HiLink vbString			String
-	HiLink vbStatement		Statement
-	HiLink vbKeyword		Statement
-	HiLink vbEvents			Special
-	HiLink vbTodo			Todo
-	HiLink vbTypes			Type
-	HiLink vbTypeSpecifier	Type
+HiLink vbBoolean		Boolean
+HiLink vbLineNumber		Comment
+HiLink vbComment		Comment
+HiLink vbConditional	Conditional
+HiLink vbConst			Constant
+HiLink vbDefine			Constant
+HiLink vbError			Error
+HiLink vbFunction		Identifier
+HiLink vbIdentifier		Identifier
+HiLink vbNumber			Number
+HiLink vbFloat			Float
+HiLink vbMethods		PreProc
+HiLink vbOperator		Operator
+HiLink vbRepeat			Repeat
+HiLink vbString			String
+HiLink vbStatement		Statement
+HiLink vbKeyword		Statement
+HiLink vbEvents			Special
+HiLink vbTodo			Todo
+HiLink vbTypes			Type
+HiLink vbTypeSpecifier	Type
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "vb"
 
diff --git a/runtime/syntax/vera.vim b/runtime/syntax/vera.vim
index b8e25cf346..7952c94290 100644
--- a/runtime/syntax/vera.vim
+++ b/runtime/syntax/vera.vim
@@ -10,11 +10,8 @@
 
 " (change the value for guibg to any color you like)
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -287,74 +284,66 @@ endif
 exec "syn sync ccomment veraComment minlines=" . b:vera_minlines
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_vera_syn_inits")
-  if version < 508
-    let did_vera_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink veraClass		Identifier
-  HiLink veraObject		Identifier
-  HiLink veraUserMethod		Function
-  HiLink veraTask		Keyword
-  HiLink veraModifier		Tag
-  HiLink veraDeprecated		veraError
-  HiLink veraMethods		Statement
-  " HiLink veraInterface		Label
-  HiLink veraInterface		Function
+HiLink veraClass		Identifier
+HiLink veraObject		Identifier
+HiLink veraUserMethod		Function
+HiLink veraTask		Keyword
+HiLink veraModifier		Tag
+HiLink veraDeprecated		veraError
+HiLink veraMethods		Statement
+" HiLink veraInterface		Label
+HiLink veraInterface		Function
 
-  HiLink veraFormat		veraSpecial
-  HiLink veraCppString		veraString
-  HiLink veraCommentL		veraComment
-  HiLink veraCommentStart		veraComment
-  HiLink veraLabel			Label
-  HiLink veraUserLabel		Label
-  HiLink veraConditional		Conditional
-  HiLink veraRepeat		Repeat
-  HiLink veraCharacter		Character
-  HiLink veraSpecialCharacter	veraSpecial
-  HiLink veraNumber		Number
-  HiLink veraOctal			Number
-  HiLink veraOctalZero		PreProc	 " link this to Error if you want
-  HiLink veraFloat			Float
-  HiLink veraOctalError		veraError
-  HiLink veraParenError		veraError
-  HiLink veraErrInParen		veraError
-  HiLink veraErrInBracket		veraError
-  HiLink veraCommentError		veraError
-  HiLink veraCommentStartError	veraError
-  HiLink veraSpaceError         SpaceError
-  HiLink veraSpecialError		veraError
-  HiLink veraOperator		Operator
-  HiLink veraStructure		Structure
-  HiLink veraInclude		Include
-  HiLink veraPreProc		PreProc
-  HiLink veraDefine		Macro
-  HiLink veraIncluded		veraString
-  HiLink veraError			Error
-  HiLink veraStatement		Statement
-  HiLink veraPreCondit		PreCondit
-  HiLink veraType			Type
-  " HiLink veraConstant		Constant
-  HiLink veraConstant		Keyword
-  HiLink veraUserConstant		Constant
-  HiLink veraCommentString		veraString
-  HiLink veraComment2String	veraString
-  HiLink veraCommentSkip		veraComment
-  HiLink veraString		String
-  HiLink veraComment		Comment
-  HiLink veraSpecial		SpecialChar
-  HiLink veraTodo			Todo
-  HiLink veraCppSkip		veraCppOut
-  HiLink veraCppOut2		veraCppOut
-  HiLink veraCppOut		Comment
+HiLink veraFormat		veraSpecial
+HiLink veraCppString		veraString
+HiLink veraCommentL		veraComment
+HiLink veraCommentStart		veraComment
+HiLink veraLabel			Label
+HiLink veraUserLabel		Label
+HiLink veraConditional		Conditional
+HiLink veraRepeat		Repeat
+HiLink veraCharacter		Character
+HiLink veraSpecialCharacter	veraSpecial
+HiLink veraNumber		Number
+HiLink veraOctal			Number
+HiLink veraOctalZero		PreProc	 " link this to Error if you want
+HiLink veraFloat			Float
+HiLink veraOctalError		veraError
+HiLink veraParenError		veraError
+HiLink veraErrInParen		veraError
+HiLink veraErrInBracket		veraError
+HiLink veraCommentError		veraError
+HiLink veraCommentStartError	veraError
+HiLink veraSpaceError         SpaceError
+HiLink veraSpecialError		veraError
+HiLink veraOperator		Operator
+HiLink veraStructure		Structure
+HiLink veraInclude		Include
+HiLink veraPreProc		PreProc
+HiLink veraDefine		Macro
+HiLink veraIncluded		veraString
+HiLink veraError			Error
+HiLink veraStatement		Statement
+HiLink veraPreCondit		PreCondit
+HiLink veraType			Type
+" HiLink veraConstant		Constant
+HiLink veraConstant		Keyword
+HiLink veraUserConstant		Constant
+HiLink veraCommentString		veraString
+HiLink veraComment2String	veraString
+HiLink veraCommentSkip		veraComment
+HiLink veraString		String
+HiLink veraComment		Comment
+HiLink veraSpecial		SpecialChar
+HiLink veraTodo			Todo
+HiLink veraCppSkip		veraCppOut
+HiLink veraCppOut2		veraCppOut
+HiLink veraCppOut		Comment
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "vera"
 
diff --git a/runtime/syntax/verilog.vim b/runtime/syntax/verilog.vim
index f4d21d0739..4b7570a13d 100644
--- a/runtime/syntax/verilog.vim
+++ b/runtime/syntax/verilog.vim
@@ -3,22 +3,15 @@
 " Maintainer:	Mun Johl <Mun.Johl@emulex.com>
 " Last Update:  Wed Jul 20 16:04:19 PDT 2011
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-   syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
    finish
 endif
 
 " Set the local value of the 'iskeyword' option.
 " NOTE: '?' was added so that verilogNumber would be processed correctly when
 "       '?' is the last character of the number.
-if version >= 600
-   setlocal iskeyword=@,48-57,63,_,192-255
-else
-   set iskeyword=@,48-57,63,_,192-255
-endif
+setlocal iskeyword=@,48-57,63,_,192-255
 
 " A bunch of useful Verilog keywords
 
@@ -102,34 +95,26 @@ syn region  verilogDirective   start="//\s*\$s dc_script_begin\>" end="//\s*\$s
 syn sync minlines=50
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_verilog_syn_inits")
-   if version < 508
-      let did_verilog_syn_inits = 1
-      command -nargs=+ HiLink hi link <args>
-   else
-      command -nargs=+ HiLink hi def link <args>
-   endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-   " The default highlighting.
-   HiLink verilogCharacter       Character
-   HiLink verilogConditional     Conditional
-   HiLink verilogRepeat          Repeat
-   HiLink verilogString          String
-   HiLink verilogTodo            Todo
-   HiLink verilogComment         Comment
-   HiLink verilogConstant        Constant
-   HiLink verilogLabel           Label
-   HiLink verilogNumber          Number
-   HiLink verilogOperator        Special
-   HiLink verilogStatement       Statement
-   HiLink verilogGlobal          Define
-   HiLink verilogDirective       SpecialComment
-   HiLink verilogEscape		 Special
+" The default highlighting.
+HiLink verilogCharacter       Character
+HiLink verilogConditional     Conditional
+HiLink verilogRepeat          Repeat
+HiLink verilogString          String
+HiLink verilogTodo            Todo
+HiLink verilogComment         Comment
+HiLink verilogConstant        Constant
+HiLink verilogLabel           Label
+HiLink verilogNumber          Number
+HiLink verilogOperator        Special
+HiLink verilogStatement       Statement
+HiLink verilogGlobal          Define
+HiLink verilogDirective       SpecialComment
+HiLink verilogEscape		 Special
 
-   delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "verilog"
 
diff --git a/runtime/syntax/verilogams.vim b/runtime/syntax/verilogams.vim
index d16e4bffb4..3e236099f5 100644
--- a/runtime/syntax/verilogams.vim
+++ b/runtime/syntax/verilogams.vim
@@ -9,20 +9,13 @@
 "              Minor reserved keyword updates.
 " Last Update: Thursday September 15 15:36:03 CST 2005 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-   syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
    finish
 endif
 
 " Set the local value of the 'iskeyword' option
-if version >= 600
-   setlocal iskeyword=@,48-57,_,192-255
-else
-   set iskeyword=@,48-57,_,192-255
-endif
+setlocal iskeyword=@,48-57,_,192-255
 
 " Annex B.1 'All keywords'
 syn keyword verilogamsStatement above abs absdelay acos acosh ac_stim
@@ -113,36 +106,28 @@ syn match   verilogamsEscape "\\\o\o\=\o\=" contained
 syn sync lines=50
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_verilogams_syn_inits")
-   if version < 508
-      let did_verilogams_syn_inits = 1
-      command -nargs=+ HiLink hi link <args>
-   else
-      command -nargs=+ HiLink hi def link <args>
-   endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-   " The default highlighting.
-   HiLink verilogamsCharacter    Character
-   HiLink verilogamsConditional  Conditional
-   HiLink verilogamsRepeat       Repeat
-   HiLink verilogamsString       String
-   HiLink verilogamsTodo         Todo
-   HiLink verilogamsComment      Comment
-   HiLink verilogamsConstant     Constant
-   HiLink verilogamsLabel        Label
-   HiLink verilogamsNumber       Number
-   HiLink verilogamsOperator     Special
-   HiLink verilogamsStatement    Statement
-   HiLink verilogamsGlobal       Define
-   HiLink verilogamsDirective    SpecialComment
-   HiLink verilogamsEscape       Special
-   HiLink verilogamsType         Type
-   HiLink verilogamsSystask      Function
+" The default highlighting.
+HiLink verilogamsCharacter    Character
+HiLink verilogamsConditional  Conditional
+HiLink verilogamsRepeat       Repeat
+HiLink verilogamsString       String
+HiLink verilogamsTodo         Todo
+HiLink verilogamsComment      Comment
+HiLink verilogamsConstant     Constant
+HiLink verilogamsLabel        Label
+HiLink verilogamsNumber       Number
+HiLink verilogamsOperator     Special
+HiLink verilogamsStatement    Statement
+HiLink verilogamsGlobal       Define
+HiLink verilogamsDirective    SpecialComment
+HiLink verilogamsEscape       Special
+HiLink verilogamsType         Type
+HiLink verilogamsSystask      Function
 
-   delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "verilogams"
 
diff --git a/runtime/syntax/vhdl.vim b/runtime/syntax/vhdl.vim
index 32503823ee..4a54216083 100644
--- a/runtime/syntax/vhdl.vim
+++ b/runtime/syntax/vhdl.vim
@@ -5,9 +5,8 @@
 " Credits:		Stephan Hegel <stephan.hegel@snc.siemens.com.cn>
 " Last Changed:		2016 Mar 05 by Daniel Kho
 
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -234,35 +233,27 @@ syn match	vhdlPreProc	"\(^\|\s\)--\s*synopsys\s\+translate_\(on\|off\)\s*"
 syn sync	minlines=600
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_vhdl_syntax_inits")
-    if version < 508
-	let did_vhdl_syntax_inits = 1
-	command -nargs=+ HiLink hi link <args>
-    else
-	command -nargs=+ HiLink hi def link <args>
-    endif
-    
-    HiLink	vhdlSpecial	Special
-    HiLink	vhdlStatement   Statement
-    HiLink	vhdlCharacter   Character
-    HiLink	vhdlString	String
-    HiLink	vhdlVector	Number
-    HiLink	vhdlBoolean	Number
-    HiLink	vhdlTodo	Todo
-    HiLink	vhdlFixme	Fixme
-    HiLink	vhdlComment	Comment
-    HiLink	vhdlNumber	Number
-    HiLink	vhdlTime	Number
-    HiLink	vhdlType	Type
-    HiLink	vhdlOperator    Operator
-    HiLink	vhdlError	Error
-    HiLink	vhdlAttribute   Special
-    HiLink	vhdlPreProc	PreProc
-    
-    delcommand HiLink
-endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+
+HiLink	vhdlSpecial	Special
+HiLink	vhdlStatement   Statement
+HiLink	vhdlCharacter   Character
+HiLink	vhdlString	String
+HiLink	vhdlVector	Number
+HiLink	vhdlBoolean	Number
+HiLink	vhdlTodo	Todo
+HiLink	vhdlFixme	Fixme
+HiLink	vhdlComment	Comment
+HiLink	vhdlNumber	Number
+HiLink	vhdlTime	Number
+HiLink	vhdlType	Type
+HiLink	vhdlOperator    Operator
+HiLink	vhdlError	Error
+HiLink	vhdlAttribute   Special
+HiLink	vhdlPreProc	PreProc
+
+delcommand HiLink
 
 let b:current_syntax = "vhdl"
 
diff --git a/runtime/syntax/virata.vim b/runtime/syntax/virata.vim
index e597b8e31c..3023f13a91 100644
--- a/runtime/syntax/virata.vim
+++ b/runtime/syntax/virata.vim
@@ -13,10 +13,8 @@
 
 
 " Setup Syntax:
-if version < 600
-  "  Clear old syntax settings
-  syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 "  Virata syntax is case insensitive (mostly)
@@ -156,63 +154,55 @@ syn sync minlines=50		"for multiple region nesting
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later  : only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_virata_syntax_inits")
-  if version < 508
-    let did_virata_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " Sub Links:
-  HiLink virataDefSubstError	virataPreProcError
-  HiLink virataDefSubst		virataPreProc
-  HiLink virataInAlter		virataOperator
-  HiLink virataInExec		virataOperator
-  HiLink virataInExport		virataOperator
-  HiLink virataInImport		virataOperator
-  HiLink virataInInstance	virataOperator
-  HiLink virataInMake		virataOperator
-  HiLink virataInModule		virataOperator
-  HiLink virataInProcess	virataOperator
-  HiLink virataInMacAddr	virataHexNumber
+" Sub Links:
+HiLink virataDefSubstError	virataPreProcError
+HiLink virataDefSubst		virataPreProc
+HiLink virataInAlter		virataOperator
+HiLink virataInExec		virataOperator
+HiLink virataInExport		virataOperator
+HiLink virataInImport		virataOperator
+HiLink virataInInstance	virataOperator
+HiLink virataInMake		virataOperator
+HiLink virataInModule		virataOperator
+HiLink virataInProcess	virataOperator
+HiLink virataInMacAddr	virataHexNumber
 
-  " Comment Group:
-  HiLink virataComment		Comment
-  HiLink virataSpclComment	SpecialComment
-  HiLink virataInCommentTodo	Todo
+" Comment Group:
+HiLink virataComment		Comment
+HiLink virataSpclComment	SpecialComment
+HiLink virataInCommentTodo	Todo
 
-  " Constant Group:
-  HiLink virataString		String
-  HiLink virataStringError	Error
-  HiLink virataCharacter	Character
-  HiLink virataSpclChar		Special
-  HiLink virataDecNumber	Number
-  HiLink virataHexNumber	Number
-  HiLink virataSizeNumber	Number
-  HiLink virataNumberError	Error
+" Constant Group:
+HiLink virataString		String
+HiLink virataStringError	Error
+HiLink virataCharacter	Character
+HiLink virataSpclChar		Special
+HiLink virataDecNumber	Number
+HiLink virataHexNumber	Number
+HiLink virataSizeNumber	Number
+HiLink virataNumberError	Error
 
-  " Identifier Group:
-  HiLink virataIdentError	Error
+" Identifier Group:
+HiLink virataIdentError	Error
 
-  " PreProc Group:
-  HiLink virataPreProc		PreProc
-  HiLink virataDefine		Define
-  HiLink virataInclude		Include
-  HiLink virataPreCondit	PreCondit
-  HiLink virataPreProcError	Error
-  HiLink virataPreProcWarn	Todo
+" PreProc Group:
+HiLink virataPreProc		PreProc
+HiLink virataDefine		Define
+HiLink virataInclude		Include
+HiLink virataPreCondit	PreCondit
+HiLink virataPreProcError	Error
+HiLink virataPreProcWarn	Todo
 
-  " Directive Group:
-  HiLink virataStatement	Statement
-  HiLink virataCfgStatement	Statement
-  HiLink virataOperator		Operator
-  HiLink virataDirective	Keyword
+" Directive Group:
+HiLink virataStatement	Statement
+HiLink virataCfgStatement	Statement
+HiLink virataOperator		Operator
+HiLink virataDirective	Keyword
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "virata"
 
diff --git a/runtime/syntax/vmasm.vim b/runtime/syntax/vmasm.vim
index 85d0441258..a4b71229ec 100644
--- a/runtime/syntax/vmasm.vim
+++ b/runtime/syntax/vmasm.vim
@@ -6,11 +6,8 @@
 " This is incomplete. Feel free to contribute...
 "
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -196,55 +193,47 @@ syn match vmasmDirective	"\.\(signed_\)\=word\>"
 syn case match
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_macro_syntax_inits")
-  if version < 508
-    let did_macro_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  " The default methods for highlighting.  Can be overridden later
-  " Comment Constant Error Identifier PreProc Special Statement Todo Type
-  "
-  " Constant		Boolean Character Number String
-  " Identifier		Function
-  " PreProc		Define Include Macro PreCondit
-  " Special		Debug Delimiter SpecialChar SpecialComment Tag
-  " Statement		Conditional Exception Keyword Label Operator Repeat
-  " Type		StorageClass Structure Typedef
+" The default methods for highlighting.  Can be overridden later
+" Comment Constant Error Identifier PreProc Special Statement Todo Type
+"
+" Constant		Boolean Character Number String
+" Identifier		Function
+" PreProc		Define Include Macro PreCondit
+" Special		Debug Delimiter SpecialChar SpecialComment Tag
+" Statement		Conditional Exception Keyword Label Operator Repeat
+" Type		StorageClass Structure Typedef
 
-  HiLink vmasmComment		Comment
-  HiLink vmasmTodo		Todo
+HiLink vmasmComment		Comment
+HiLink vmasmTodo		Todo
 
-  HiLink vmasmhexNumber		Number		" Constant
-  HiLink vmasmoctNumber		Number		" Constant
-  HiLink vmasmbinNumber		Number		" Constant
-  HiLink vmasmdecNumber		Number		" Constant
-  HiLink vmasmfloatNumber	Number		" Constant
+HiLink vmasmhexNumber		Number		" Constant
+HiLink vmasmoctNumber		Number		" Constant
+HiLink vmasmbinNumber		Number		" Constant
+HiLink vmasmdecNumber		Number		" Constant
+HiLink vmasmfloatNumber	Number		" Constant
 
 "  HiLink vmasmString		String		" Constant
 
-  HiLink vmasmReg		Identifier
-  HiLink vmasmOperator		Identifier
+HiLink vmasmReg		Identifier
+HiLink vmasmOperator		Identifier
 
-  HiLink vmasmInclude		Include		" PreProc
-  HiLink vmasmMacro		Macro		" PreProc
-  " HiLink vmasmMacroParam	Keyword		" Statement
+HiLink vmasmInclude		Include		" PreProc
+HiLink vmasmMacro		Macro		" PreProc
+" HiLink vmasmMacroParam	Keyword		" Statement
 
-  HiLink vmasmDirective		Special
-  HiLink vmasmPreCond		Special
+HiLink vmasmDirective		Special
+HiLink vmasmPreCond		Special
 
 
-  HiLink vmasmOpcode		Statement
-  HiLink vmasmCond		Conditional	" Statement
-  HiLink vmasmRepeat		Repeat		" Statement
+HiLink vmasmOpcode		Statement
+HiLink vmasmCond		Conditional	" Statement
+HiLink vmasmRepeat		Repeat		" Statement
 
-  HiLink vmasmLabel		Type
-  delcommand HiLink
-endif
+HiLink vmasmLabel		Type
+delcommand HiLink
 
 let b:current_syntax = "vmasm"
 
diff --git a/runtime/syntax/vrml.vim b/runtime/syntax/vrml.vim
index 44814aad86..530becb55a 100644
--- a/runtime/syntax/vrml.vim
+++ b/runtime/syntax/vrml.vim
@@ -5,11 +5,8 @@
 " Former Maintainer:    Gregory Seidman <gsslist+vim@anthropohedron.net>
 " Last change:	   2006 May 03
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -168,11 +165,9 @@ syn keyword VRMLProtos	       contained EXTERNPROTO PROTO IS
 
 syn keyword VRMLRoutes	       contained ROUTE TO
 
-if version >= 502
 "containment!
-  syn include @jscript $VIMRUNTIME/syntax/javascript.vim
-  syn region VRMLjScriptString contained start=+"\(\(javascript\)\|\(vrmlscript\)\|\(ecmascript\)\):+ms=e+1 skip=+\\\\\|\\"+ end=+"+me=e-1 contains=@jscript
-endif
+syn include @jscript $VIMRUNTIME/syntax/javascript.vim
+syn region VRMLjScriptString contained start=+"\(\(javascript\)\|\(vrmlscript\)\|\(ecmascript\)\):+ms=e+1 skip=+\\\\\|\\"+ end=+"+me=e-1 contains=@jscript
 
 " match definitions.
 syn match   VRMLSpecial		  contained "\\[0-9][0-9][0-9]\|\\."
@@ -192,47 +187,37 @@ syn region  VRMLInstName	  start="USE\>"hs=e+1 skip="USE\(,\|\s\)*" end="[A-Za-z
 syn keyword VRMLInstances      contained DEF USE
 syn sync minlines=1
 
-if version >= 600
 "FOLDS!
-  syn sync fromstart
-  "setlocal foldmethod=syntax
-  syn region braceFold start="{" end="}" transparent fold contains=TOP
-  syn region bracketFold start="\[" end="]" transparent fold contains=TOP
-  syn region VRMLString start=+"+ skip=+\\\\\|\\"+ end=+"+ fold contains=VRMLSpecial,VRMLjScriptString
-endif
+syn sync fromstart
+"setlocal foldmethod=syntax
+syn region braceFold start="{" end="}" transparent fold contains=TOP
+syn region bracketFold start="\[" end="]" transparent fold contains=TOP
+syn region VRMLString start=+"+ skip=+\\\\\|\\"+ end=+"+ fold contains=VRMLSpecial,VRMLjScriptString
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_VRML_syntax_inits")
-  if version < 508
-    let did_VRML_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink VRMLCharacter  VRMLString
-  HiLink VRMLSpecialCharacter VRMLSpecial
-  HiLink VRMLNumber     VRMLString
-  HiLink VRMLValues     VRMLString
-  HiLink VRMLString     String
-  HiLink VRMLSpecial    Special
-  HiLink VRMLComment    Comment
-  HiLink VRMLNodes      Statement
-  HiLink VRMLFields     Type
-  HiLink VRMLEvents     Type
-  HiLink VRMLfTypes     LineNr
+HiLink VRMLCharacter  VRMLString
+HiLink VRMLSpecialCharacter VRMLSpecial
+HiLink VRMLNumber     VRMLString
+HiLink VRMLValues     VRMLString
+HiLink VRMLString     String
+HiLink VRMLSpecial    Special
+HiLink VRMLComment    Comment
+HiLink VRMLNodes      Statement
+HiLink VRMLFields     Type
+HiLink VRMLEvents     Type
+HiLink VRMLfTypes     LineNr
 "  hi     VRMLfTypes     ctermfg=6 guifg=Brown
-  HiLink VRMLInstances  PreCondit
-  HiLink VRMLRoutes     PreCondit
-  HiLink VRMLProtos     PreProc
-  HiLink VRMLRouteNode  Identifier
-  HiLink VRMLInstName   Identifier
-  HiLink VRMLTypes      Identifier
+HiLink VRMLInstances  PreCondit
+HiLink VRMLRoutes     PreCondit
+HiLink VRMLProtos     PreProc
+HiLink VRMLRouteNode  Identifier
+HiLink VRMLInstName   Identifier
+HiLink VRMLTypes      Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "vrml"
 
diff --git a/runtime/syntax/vroom.vim b/runtime/syntax/vroom.vim
index 0cd6ccce1d..0509e30b17 100644
--- a/runtime/syntax/vroom.vim
+++ b/runtime/syntax/vroom.vim
@@ -3,11 +3,8 @@
 " Maintainer:	David Barnett (https://github.com/google/vim-ft-vroom)
 " Last Change:	2014 Jul 23
 
-" For version 5.x: Clear all syntax items.
-" For version 6.x and later: Quit when a syntax file was already loaded.
-if v:version < 600
-  syntax clear
-elseif exists('b:current_syntax')
+" quit when a syntax file was already loaded
+if exists('b:current_syntax')
   finish
 endif
 
diff --git a/runtime/syntax/vsejcl.vim b/runtime/syntax/vsejcl.vim
index f4f00c65ea..5a106c2ef8 100644
--- a/runtime/syntax/vsejcl.vim
+++ b/runtime/syntax/vsejcl.vim
@@ -4,11 +4,8 @@
 " URL:
 " Last change: 2001 May 10
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -23,26 +20,18 @@ syn match vsejclString /'.\{-}'/
 syn match vsejclParms /(.\{-})/ contained
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_vsejcl_syntax")
-  if version < 508
-    let did_vsejcl_syntax = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink vsejclComment		Comment
-  HiLink vsejclField		Type
-  HiLink vsejclKeyword		Statement
-  HiLink vsejclObject		Constant
-  HiLink vsejclString		Constant
-  HiLink vsejclMisc			Special
-  HiLink vsejclParms		Constant
+HiLink vsejclComment		Comment
+HiLink vsejclField		Type
+HiLink vsejclKeyword		Statement
+HiLink vsejclObject		Constant
+HiLink vsejclString		Constant
+HiLink vsejclMisc			Special
+HiLink vsejclParms		Constant
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "vsejcl"
 
diff --git a/runtime/syntax/wdiff.vim b/runtime/syntax/wdiff.vim
index 9cd0611819..bdc7be7131 100644
--- a/runtime/syntax/wdiff.vim
+++ b/runtime/syntax/wdiff.vim
@@ -9,11 +9,8 @@
 " SPAM is _NOT_ welcome - be ready to be reported!
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -23,21 +20,12 @@ syn region wdiffNew start="{+" end="+}"
 
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_wdiff_syn_inits")
-  let did_wdiff_syn_inits = 1
-  if version < 508
-    let did_wdiff_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink wdiffOld       Special
-  HiLink wdiffNew       Identifier
+HiLink wdiffOld       Special
+HiLink wdiffNew       Identifier
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "wdiff"
diff --git a/runtime/syntax/web.vim b/runtime/syntax/web.vim
index f7a7fdfdc2..54eebda399 100644
--- a/runtime/syntax/web.vim
+++ b/runtime/syntax/web.vim
@@ -8,11 +8,8 @@
 " the standard WEB distribution, available for anonymous ftp at
 " ftp://labrea.stanford.edu/pub/tex/web/.
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -20,12 +17,8 @@ endif
 " we base this syntax file on the modern superset, CWEB.  Note: This shortcut
 " may introduce some illegal constructs, e.g., CWEB's "@c" does _not_ start a
 " code section in WEB.  Anyway, I'm not a WEB programmer.
-if version < 600
-  source <sfile>:p:h/cweb.vim
-else
-  runtime! syntax/cweb.vim
-  unlet b:current_syntax
-endif
+runtime! syntax/cweb.vim
+unlet b:current_syntax
 
 " Replace C/C++ syntax by Pascal syntax.
 syntax include @webIncludedC <sfile>:p:h/pascal.vim
diff --git a/runtime/syntax/webmacro.vim b/runtime/syntax/webmacro.vim
index 3b863f7c37..2c32f537d8 100644
--- a/runtime/syntax/webmacro.vim
+++ b/runtime/syntax/webmacro.vim
@@ -11,21 +11,16 @@
 " For version 5.x: Clear all syntax items
 " For version 6.x: Quit when a syntax file was already loaded
 if !exists("main_syntax")
-  if version < 600
-    syntax clear
-  elseif exists("b:current_syntax")
+  " quit when a syntax file was already loaded
+  if exists("b:current_syntax")
     finish
   endif
   let main_syntax = 'webmacro'
 endif
 
 
-if version < 600
-  source <sfile>:p:h/html.vim
-else
-  runtime! syntax/html.vim
-  unlet b:current_syntax
-endif
+runtime! syntax/html.vim
+unlet b:current_syntax
 
 syn cluster htmlPreProc add=webmacroIf,webmacroUse,webmacroBraces,webmacroParse,webmacroInclude,webmacroSet,webmacroForeach,webmacroComment
 
@@ -49,31 +44,23 @@ syn match webmacroComment "##.*$"
 syn match webmacroHash "[#{}\$]" contained
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_webmacro_syn_inits")
-  if version < 508
-    let did_webmacro_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink webmacroComment CommentTitle
-  HiLink webmacroVariable PreProc
-  HiLink webmacroIf webmacroStatement
-  HiLink webmacroForeach webmacroStatement
-  HiLink webmacroSet webmacroStatement
-  HiLink webmacroInclude webmacroStatement
-  HiLink webmacroParse webmacroStatement
-  HiLink webmacroStatement Function
-  HiLink webmacroNumber Number
-  HiLink webmacroBoolean Boolean
-  HiLink webmacroSpecial Special
-  HiLink webmacroString String
-  HiLink webmacroBracesError Error
-  delcommand HiLink
-endif
+HiLink webmacroComment CommentTitle
+HiLink webmacroVariable PreProc
+HiLink webmacroIf webmacroStatement
+HiLink webmacroForeach webmacroStatement
+HiLink webmacroSet webmacroStatement
+HiLink webmacroInclude webmacroStatement
+HiLink webmacroParse webmacroStatement
+HiLink webmacroStatement Function
+HiLink webmacroNumber Number
+HiLink webmacroBoolean Boolean
+HiLink webmacroSpecial Special
+HiLink webmacroString String
+HiLink webmacroBracesError Error
+delcommand HiLink
 
 let b:current_syntax = "webmacro"
 
diff --git a/runtime/syntax/winbatch.vim b/runtime/syntax/winbatch.vim
index aea2cdebcb..e787a5d09f 100644
--- a/runtime/syntax/winbatch.vim
+++ b/runtime/syntax/winbatch.vim
@@ -4,11 +4,8 @@
 " URL:		http://www.mggen.com/vim/syntax/winbatch.zip
 " Last change:	2001 May 10
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -158,29 +155,21 @@ syn keyword winbatchImplicit xgetchildhwnd xgetelapsed xhex xmemcompact xmessage
 syn keyword winbatchImplicit xsendmessage xverifyccard yield
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_winbatch_syntax_inits")
-  if version < 508
-    let did_winbatch_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink winbatchLabel		PreProc
-  HiLink winbatchCtl		Operator
-  HiLink winbatchStatement	Statement
-  HiLink winbatchTodo		Todo
-  HiLink winbatchString		String
-  HiLink winbatchVar		Type
-  HiLink winbatchComment	Comment
-  HiLink winbatchImplicit	Special
-  HiLink winbatchNumber		Number
-  HiLink winbatchConstant	StorageClass
+HiLink winbatchLabel		PreProc
+HiLink winbatchCtl		Operator
+HiLink winbatchStatement	Statement
+HiLink winbatchTodo		Todo
+HiLink winbatchString		String
+HiLink winbatchVar		Type
+HiLink winbatchComment	Comment
+HiLink winbatchImplicit	Special
+HiLink winbatchNumber		Number
+HiLink winbatchConstant	StorageClass
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "winbatch"
 
diff --git a/runtime/syntax/wml.vim b/runtime/syntax/wml.vim
index 5957930c8e..b9169d003b 100644
--- a/runtime/syntax/wml.vim
+++ b/runtime/syntax/wml.vim
@@ -16,21 +16,14 @@
 "  vim-package around your corner :)
 
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syn clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 
 " A lot of the web stuff looks like HTML so we load that first
-if version < 600
-  so <sfile>:p:h/html.vim
-else
-  runtime! syntax/html.vim
-endif
+runtime! syntax/html.vim
 unlet b:current_syntax
 
 if !exists("main_syntax")
@@ -108,11 +101,7 @@ syn region  htmlTagName    start="\<\(define-tag\|define-region\)" end="\>" cont
 " The perl include stuff
 if main_syntax != 'perl'
   " Perl script
-  if version < 600
-    syn include @wmlPerlScript <sfile>:p:h/perl.vim
-  else
-    syn include @wmlPerlScript syntax/perl.vim
-  endif
+  syn include @wmlPerlScript syntax/perl.vim
   unlet b:current_syntax
 
   syn region perlScript   start=+<perl>+ keepend end=+</perl>+ contains=@wmlPerlScript,wmlPerlTag
@@ -140,33 +129,24 @@ if main_syntax == "html"
 endif
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_wml_syn_inits")
-  let did_wml_syn_inits = 1
-  if version < 508
-    let did_wml_syn_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink wmlNextLine	Special
-  HiLink wmlUse		Include
-  HiLink wmlUsed	String
-  HiLink wmlBody	Special
-  HiLink wmlDiverted	Label
-  HiLink wmlDivert	Delimiter
-  HiLink wmlDivertEnd	Delimiter
-  HiLink wmlLocationId	Label
-  HiLink wmlLocation	Delimiter
+HiLink wmlNextLine	Special
+HiLink wmlUse		Include
+HiLink wmlUsed	String
+HiLink wmlBody	Special
+HiLink wmlDiverted	Label
+HiLink wmlDivert	Delimiter
+HiLink wmlDivertEnd	Delimiter
+HiLink wmlLocationId	Label
+HiLink wmlLocation	Delimiter
 " HiLink wmlLocationed	Delimiter
-  HiLink wmlDefineName	String
-  HiLink wmlComment	Comment
-  HiLink wmlInclude	Include
-  HiLink wmlSharpBang	PreProc
+HiLink wmlDefineName	String
+HiLink wmlComment	Comment
+HiLink wmlInclude	Include
+HiLink wmlSharpBang	PreProc
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "wml"
diff --git a/runtime/syntax/wsml.vim b/runtime/syntax/wsml.vim
index 2a92a0d548..f2fbbf25c1 100644
--- a/runtime/syntax/wsml.vim
+++ b/runtime/syntax/wsml.vim
@@ -4,10 +4,8 @@
 " URL:		none
 " Last Change:  2006 Apr 30
 
-" Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -78,45 +76,37 @@ syn match   wsmlSpecial "\\u\d\{4\}"
 syn cluster wsmlTop add=wsmlString,wsmlCharacter,wsmlNumber,wsmlSpecial,wsmlStringError
 
 " Define the default highlighting.
-" " For version 5.7 and earlier: only when not done already
-" " For version 5.8 and later: only when an item doesn't have highlighting yet
- if version >= 508 || !exists("did_wsml_syn_inits")
-   if version < 508
-       let did_wsml_syn_inits = 1
-       command -nargs=+ HiLink hi link <args>
-   else
-       command -nargs=+ HiLink hi def link <args>
-   endif              
-   HiLink wsmlHeader			TypeDef
-   HiLink wsmlNamespace			TypeDef
-   HiLink wsmlOntology			Statement
-   HiLink wsmlAxiom			TypeDef
-   HiLink wsmlService			TypeDef
-   HiLink wsmlNFP			TypeDef
-   HiLink wsmlTopLevel			TypeDef
-   HiLink wsmlMediation			TypeDef 
-   HiLink wsmlBehavioral		TypeDef
-   HiLink wsmlChoreographyPri		TypeDef
-   HiLink wsmlChoreographySec		Operator
-   HiLink wsmlChoreographyTer		Special
-   HiLink wsmlString			String
-   HiLink wsmlIdentifier		Normal 
-   HiLink wsmlSqName                     Normal
-   HiLink wsmlVariable			Define
-   HiLink wsmlKeywordsInsideLEs		Operator
-   HiLink wsmlOperator			Operator
-   HiLink wsmlBrace			Operator
-   HiLink wsmlCharacter			Character
-   HiLink wsmlNumber			Number
-   HiLink wsmlDataTypes			Special
-   HiLink wsmlComment			Comment
-   HiLink wsmlDocComment		Comment
-   HiLink wsmlLineComment		Comment
-   HiLink wsmlTodo			Todo
-   HiLink wsmlFixMe			Error
-   HiLink wsmlCommentTitle		SpecialComment
-   HiLink wsmlCommentStar		wsmlComment
- endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+HiLink wsmlHeader			TypeDef
+HiLink wsmlNamespace			TypeDef
+HiLink wsmlOntology			Statement
+HiLink wsmlAxiom			TypeDef
+HiLink wsmlService			TypeDef
+HiLink wsmlNFP			TypeDef
+HiLink wsmlTopLevel			TypeDef
+HiLink wsmlMediation			TypeDef 
+HiLink wsmlBehavioral		TypeDef
+HiLink wsmlChoreographyPri		TypeDef
+HiLink wsmlChoreographySec		Operator
+HiLink wsmlChoreographyTer		Special
+HiLink wsmlString			String
+HiLink wsmlIdentifier		Normal 
+HiLink wsmlSqName                     Normal
+HiLink wsmlVariable			Define
+HiLink wsmlKeywordsInsideLEs		Operator
+HiLink wsmlOperator			Operator
+HiLink wsmlBrace			Operator
+HiLink wsmlCharacter			Character
+HiLink wsmlNumber			Number
+HiLink wsmlDataTypes			Special
+HiLink wsmlComment			Comment
+HiLink wsmlDocComment		Comment
+HiLink wsmlLineComment		Comment
+HiLink wsmlTodo			Todo
+HiLink wsmlFixMe			Error
+HiLink wsmlCommentTitle		SpecialComment
+HiLink wsmlCommentStar		wsmlComment
 
 delcommand HiLink
 
diff --git a/runtime/syntax/xdefaults.vim b/runtime/syntax/xdefaults.vim
index 5e38952a75..1dfcc34ae5 100644
--- a/runtime/syntax/xdefaults.vim
+++ b/runtime/syntax/xdefaults.vim
@@ -10,11 +10,8 @@
 "   xrdb manual page
 "   xrdb source: ftp://ftp.x.org/pub/R6.4/xc/programs/xrdb/xrdb.c
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -109,36 +106,28 @@ syn keyword xdefaultsSymbol contained X_RESOLUTION
 syn keyword xdefaultsSymbol contained Y_RESOLUTION
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_xdefaults_syntax_inits")
-  if version < 508
-    let did_xdefaults_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  HiLink xdefaultsLabel		Type
-  HiLink xdefaultsValue		Constant
-  HiLink xdefaultsComment	Comment
-  HiLink xdefaultsCommentH	xdefaultsComment
-  HiLink xdefaultsPreProc	PreProc
-  HiLink xdefaultsInclude	xdefaultsPreProc
-  HiLink xdefaultsCppSkip	xdefaultsCppOut
-  HiLink xdefaultsCppOut2	xdefaultsCppOut
-  HiLink xdefaultsCppOut	Comment
-  HiLink xdefaultsIncluded	String
-  HiLink xdefaultsDefine	Macro
-  HiLink xdefaultsSymbol	Statement
-  HiLink xdefaultsSpecial	Statement
-  HiLink xdefaultsErrorLine	Error
-  HiLink xdefaultsCommentError	Error
-  HiLink xdefaultsPunct		Normal
-  HiLink xdefaultsLineEnd	Special
-  HiLink xdefaultsTodo		Todo
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
+HiLink xdefaultsLabel		Type
+HiLink xdefaultsValue		Constant
+HiLink xdefaultsComment	Comment
+HiLink xdefaultsCommentH	xdefaultsComment
+HiLink xdefaultsPreProc	PreProc
+HiLink xdefaultsInclude	xdefaultsPreProc
+HiLink xdefaultsCppSkip	xdefaultsCppOut
+HiLink xdefaultsCppOut2	xdefaultsCppOut
+HiLink xdefaultsCppOut	Comment
+HiLink xdefaultsIncluded	String
+HiLink xdefaultsDefine	Macro
+HiLink xdefaultsSymbol	Statement
+HiLink xdefaultsSpecial	Statement
+HiLink xdefaultsErrorLine	Error
+HiLink xdefaultsCommentError	Error
+HiLink xdefaultsPunct		Normal
+HiLink xdefaultsLineEnd	Special
+HiLink xdefaultsTodo		Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "xdefaults"
 
diff --git a/runtime/syntax/xf86conf.vim b/runtime/syntax/xf86conf.vim
index 62784d2285..545eda7db0 100644
--- a/runtime/syntax/xf86conf.vim
+++ b/runtime/syntax/xf86conf.vim
@@ -10,12 +10,8 @@
 "							 to force XFree86 3.x or 4.x XF86Config syntax
 
 " Setup
-if version >= 600
-	if exists("b:current_syntax")
-		finish
-	endif
-else
-	echo "Sorry, but this syntax file relies on Vim 6 features.	 Either upgrade Vim or usea version of " . expand("<sfile>:t:r") . " syntax file appropriate for Vim " . version/100 . "." . version %100 . "."
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
 	finish
 endif
 
diff --git a/runtime/syntax/xkb.vim b/runtime/syntax/xkb.vim
index ff9bfd0dae..efb7d66c0c 100644
--- a/runtime/syntax/xkb.vim
+++ b/runtime/syntax/xkb.vim
@@ -6,12 +6,9 @@
 " URL: http://trific.ath.cx/Ftp/vim/syntax/xkb.vim
 
 " Setup
-if version >= 600
-	if exists("b:current_syntax")
-		finish
-	endif
-else
-	syntax clear
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
+	finish
 endif
 
 syn case match
@@ -50,42 +47,35 @@ syn keyword xkbTModif default hidden partial virtual
 syn keyword xkbSect alphanumeric_keys alternate_group function_keys keypad_keys modifier_keys xkb_compatibility xkb_geometry xkb_keycodes xkb_keymap xkb_semantics xkb_symbols xkb_types
 
 " Define the default highlighting
-if version >= 508 || !exists("did_xkb_syntax_inits")
-	if version < 508
-		let did_xkb_syntax_inits = 1
-		command -nargs=+ HiLink hi link <args>
-	else
-		command -nargs=+ HiLink hi def link <args>
-	endif
+command -nargs=+ HiLink hi def link <args>
 
-	HiLink xkbModif xkbPreproc
-	HiLink xkbTModif xkbPreproc
-	HiLink xkbPreproc Preproc
+HiLink xkbModif xkbPreproc
+HiLink xkbTModif xkbPreproc
+HiLink xkbPreproc Preproc
 
-	HiLink xkbIdentifier Keyword
-	HiLink xkbFunction Function
-	HiLink xkbSect Type
-	HiLink xkbPhysicalKey Identifier
-	HiLink xkbKeyword Keyword
+HiLink xkbIdentifier Keyword
+HiLink xkbFunction Function
+HiLink xkbSect Type
+HiLink xkbPhysicalKey Identifier
+HiLink xkbKeyword Keyword
 
-	HiLink xkbComment Comment
-	HiLink xkbTodo Todo
+HiLink xkbComment Comment
+HiLink xkbTodo Todo
 
-	HiLink xkbConstant Constant
-	HiLink xkbString String
+HiLink xkbConstant Constant
+HiLink xkbString String
 
-	HiLink xkbSpecialChar xkbSpecial
-	HiLink xkbSpecial Special
+HiLink xkbSpecialChar xkbSpecial
+HiLink xkbSpecial Special
 
-	HiLink xkbParenError xkbBalancingError
-	HiLink xkbBraceError xkbBalancingError
-	HiLink xkbBraketError xkbBalancingError
-	HiLink xkbBalancingError xkbError
-	HiLink xkbCommentStartError xkbCommentError
-	HiLink xkbCommentError xkbError
-	HiLink xkbError Error
+HiLink xkbParenError xkbBalancingError
+HiLink xkbBraceError xkbBalancingError
+HiLink xkbBraketError xkbBalancingError
+HiLink xkbBalancingError xkbError
+HiLink xkbCommentStartError xkbCommentError
+HiLink xkbCommentError xkbError
+HiLink xkbError Error
 
-	delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "xkb"
diff --git a/runtime/syntax/xmath.vim b/runtime/syntax/xmath.vim
index 5434f928c7..a81adf53cc 100644
--- a/runtime/syntax/xmath.vim
+++ b/runtime/syntax/xmath.vim
@@ -5,11 +5,8 @@
 " Version:	7
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_XMATH
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -194,42 +191,34 @@ syn sync match xmathSyncComment	grouphere xmathCommentBlock "#{"
 syn sync match xmathSyncComment	groupthere NONE "}#"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_xmath_syntax_inits")
-  if version < 508
-    let did_xmath_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink xmathBraceError	xmathError
-  HiLink xmathCmd	xmathStatement
-  HiLink xmathCommentBlock	xmathComment
-  HiLink xmathCurlyError	xmathError
-  HiLink xmathFuncCmd	xmathStatement
-  HiLink xmathParenError	xmathError
+HiLink xmathBraceError	xmathError
+HiLink xmathCmd	xmathStatement
+HiLink xmathCommentBlock	xmathComment
+HiLink xmathCurlyError	xmathError
+HiLink xmathFuncCmd	xmathStatement
+HiLink xmathParenError	xmathError
 
-  " The default methods for highlighting.  Can be overridden later
-  HiLink xmathCharacter	Character
-  HiLink xmathComma	Delimiter
-  HiLink xmathComment	Comment
-  HiLink xmathCommentBlock	Comment
-  HiLink xmathConditional	Conditional
-  HiLink xmathError	Error
-  HiLink xmathFunc	Function
-  HiLink xmathLabel	PreProc
-  HiLink xmathNumber	Number
-  HiLink xmathRepeat	Repeat
-  HiLink xmathSpecial	Type
-  HiLink xmathSpecialChar	SpecialChar
-  HiLink xmathStatement	Statement
-  HiLink xmathString	String
-  HiLink xmathTodo	Todo
+" The default methods for highlighting.  Can be overridden later
+HiLink xmathCharacter	Character
+HiLink xmathComma	Delimiter
+HiLink xmathComment	Comment
+HiLink xmathCommentBlock	Comment
+HiLink xmathConditional	Conditional
+HiLink xmathError	Error
+HiLink xmathFunc	Function
+HiLink xmathLabel	PreProc
+HiLink xmathNumber	Number
+HiLink xmathRepeat	Repeat
+HiLink xmathSpecial	Type
+HiLink xmathSpecialChar	SpecialChar
+HiLink xmathStatement	Statement
+HiLink xmathString	String
+HiLink xmathTodo	Todo
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "xmath"
 
diff --git a/runtime/syntax/xpm.vim b/runtime/syntax/xpm.vim
index 3cbc1b54fd..8cc92a1189 100644
--- a/runtime/syntax/xpm.vim
+++ b/runtime/syntax/xpm.vim
@@ -4,11 +4,8 @@
 " Last Change:	2008 May 28
 " Version:	5.4n.1
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -126,24 +123,16 @@ unlet color chars colors cpp n i s
 endif		" has("gui_running")
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_xpm_syntax_inits")
-  if version < 508
-    let did_xpm_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink xpmType		Type
-  HiLink xpmStorageClass	StorageClass
-  HiLink xpmTodo		Todo
-  HiLink xpmComment		Comment
-  HiLink xpmPixelString	String
+HiLink xpmType		Type
+HiLink xpmStorageClass	StorageClass
+HiLink xpmTodo		Todo
+HiLink xpmComment		Comment
+HiLink xpmPixelString	String
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "xpm"
 
diff --git a/runtime/syntax/xpm2.vim b/runtime/syntax/xpm2.vim
index 74b3c66af2..908f3914e5 100644
--- a/runtime/syntax/xpm2.vim
+++ b/runtime/syntax/xpm2.vim
@@ -7,11 +7,8 @@
 "
 " Made from xpm.vim by Ronald Schild <rs@scutum.de>
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -23,13 +20,8 @@ syn keyword xpm2Todo		TODO FIXME XXX  contained
 syn match   xpm2Comment		"\!.*$"  contains=@Spell,xpm2Todo
 
 
-if version < 508
-  command -nargs=+ HiLink hi link <args>
-  command -nargs=+ Hi hi <args>
-else
-  command -nargs=+ HiLink hi def link <args>
-  command -nargs=+ Hi hi def <args>
-endif
+command -nargs=+ HiLink hi def link <args>
+command -nargs=+ Hi hi def <args>
 
 if has("gui_running")
 
@@ -144,20 +136,14 @@ if has("gui_running")
 endif		" has("gui_running")
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_xpm2_syntax_inits")
-  if version < 508
-    let did_xpm2_syntax_inits = 1
-  endif
+" Only when an item doesn't have highlighting yet
+" The default highlighting.
+HiLink xpm2Type		Type
+HiLink xpm2StorageClass	StorageClass
+HiLink xpm2Todo		Todo
+HiLink xpm2Comment		Comment
+HiLink xpm2PixelString	String
 
-  " The default highlighting.
-  HiLink xpm2Type		Type
-  HiLink xpm2StorageClass	StorageClass
-  HiLink xpm2Todo		Todo
-  HiLink xpm2Comment		Comment
-  HiLink xpm2PixelString	String
-endif
 delcommand HiLink
 delcommand Hi
 
diff --git a/runtime/syntax/xs.vim b/runtime/syntax/xs.vim
index 6fd0a468f9..9a9140fdd0 100644
--- a/runtime/syntax/xs.vim
+++ b/runtime/syntax/xs.vim
@@ -5,20 +5,13 @@
 " Previous:    Vincent Pit <perl@profvince.com>
 " Last Change: 2013-05-12
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
 " Read the C syntax to start with
-if version < 600
-  source <sfile>:p:h/c.vim
-else
-  runtime! syntax/c.vim
-endif
+runtime! syntax/c.vim
 
 let xs_superseded = 1 " mark C functions superseded by Perl replacements
 let xs_not_core   = 1 " mark private core functions
@@ -3249,29 +3242,21 @@ syn keyword xsMacro what_len_TRICKYFOLD_safe whichsig write xio_any xio_dirp
 syn keyword xsMacro xiv_iv xuv_uv yystype
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_xs_syntax_inits")
-  if version < 508
-    let did_xs_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink xsPrivate    Error
-  HiLink xsSuperseded Error
-  HiLink xsType       Type
-  HiLink xsString     String
-  HiLink xsConstant   Constant
-  HiLink xsException  Exception
-  HiLink xsKeyword    Keyword
-  HiLink xsFunction   Function
-  HiLink xsVariable   Identifier
-  HiLink xsMacro      Macro
+HiLink xsPrivate    Error
+HiLink xsSuperseded Error
+HiLink xsType       Type
+HiLink xsString     String
+HiLink xsConstant   Constant
+HiLink xsException  Exception
+HiLink xsKeyword    Keyword
+HiLink xsFunction   Function
+HiLink xsVariable   Identifier
+HiLink xsMacro      Macro
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "xs"
 
diff --git a/runtime/syntax/xxd.vim b/runtime/syntax/xxd.vim
index b2b1e44603..1145ebccf2 100644
--- a/runtime/syntax/xxd.vim
+++ b/runtime/syntax/xxd.vim
@@ -6,11 +6,8 @@
 " Notes:		use :help xxd   to see how to invoke it
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_XXD
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -20,22 +17,14 @@ syn match xxdAscii				"  .\{,16\}\r\=$"hs=s+2	contains=xxdDot
 syn match xxdDot	contained	"[.\r]"
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_xxd_syntax_inits")
-  if version < 508
-    let did_xxd_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
- HiLink xxdAddress	Constant
- HiLink xxdSep		Identifier
- HiLink xxdAscii	Statement
+HiLink xxdAddress	Constant
+HiLink xxdSep		Identifier
+HiLink xxdAscii	Statement
 
- delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "xxd"
 
diff --git a/runtime/syntax/yacc.vim b/runtime/syntax/yacc.vim
index 977ffa75e4..634c12ee5e 100644
--- a/runtime/syntax/yacc.vim
+++ b/runtime/syntax/yacc.vim
@@ -10,9 +10,6 @@
 
 " ---------------------------------------------------------------------
 " this version of syntax/yacc.vim requires 6.0 or later
-if version < 600
- finish
-endif
 if exists("b:current_syntax")
  syntax clear
 endif
diff --git a/runtime/syntax/z8a.vim b/runtime/syntax/z8a.vim
index a3a8a2bbdf..054f6390e6 100644
--- a/runtime/syntax/z8a.vim
+++ b/runtime/syntax/z8a.vim
@@ -3,11 +3,8 @@
 " Maintainer:	Milan Pikula <www@fornax.elf.stuba.sk>
 " Last Change:	2003 May 11
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -85,30 +82,22 @@ syn match z8aComment		";.*"
 syn case match
 
 " Define the default highlighting.
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-if version >= 508 || !exists("did_z8a_syntax_inits")
-  if version < 508
-    let did_z8a_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
+" Only when an item doesn't have highlighting yet
+command -nargs=+ HiLink hi def link <args>
 
-  HiLink z8aSection		Special
-  HiLink z8aLabel		Label
-  HiLink z8aSpecialLabel	Label
-  HiLink z8aComment		Comment
-  HiLink z8aInstruction	Statement
-  HiLink z8aSpecInst		Statement
-  HiLink z8aInclude		Include
-  HiLink z8aPreCondit		PreCondit
-  HiLink z8aPreProc		PreProc
-  HiLink z8aNumber		Number
-  HiLink z8aString		String
+HiLink z8aSection		Special
+HiLink z8aLabel		Label
+HiLink z8aSpecialLabel	Label
+HiLink z8aComment		Comment
+HiLink z8aInstruction	Statement
+HiLink z8aSpecInst		Statement
+HiLink z8aInclude		Include
+HiLink z8aPreCondit		PreCondit
+HiLink z8aPreProc		PreProc
+HiLink z8aNumber		Number
+HiLink z8aString		String
 
-  delcommand HiLink
-endif
+delcommand HiLink
 
 let b:current_syntax = "z8a"
 " vim: ts=8

From 86b596dc7a49f1b148ef82a356b972b93ed0f6d4 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 21:14:34 +0200
Subject: [PATCH 182/257] vim-patch:f37506f60f87

Updated runtime files.  Remove HiLink commands.

https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
---
 runtime/doc/eval.txt             |    2 +-
 runtime/syntax/a65.vim           |   26 +-
 runtime/syntax/abap.vim          |   40 +-
 runtime/syntax/abaqus.vim        |   12 +-
 runtime/syntax/abc.vim           |   20 +-
 runtime/syntax/abel.vim          |   58 +-
 runtime/syntax/acedb.vim         |   34 +-
 runtime/syntax/aflex.vim         |   26 +-
 runtime/syntax/ahdl.vim          |   20 +-
 runtime/syntax/amiga.vim         |   30 +-
 runtime/syntax/aml.vim           |   36 +-
 runtime/syntax/ampl.vim          |   32 +-
 runtime/syntax/antlr.vim         |    6 +-
 runtime/syntax/apache.vim        |   44 +-
 runtime/syntax/apachestyle.vim   |   14 +-
 runtime/syntax/asm.vim           |   30 +-
 runtime/syntax/asm68k.vim        |   54 +-
 runtime/syntax/asmh8300.vim      |    6 +-
 runtime/syntax/asn.vim           |   36 +-
 runtime/syntax/aspvbs.vim        |   26 +-
 runtime/syntax/asterisk.vim      |   50 +-
 runtime/syntax/asteriskvm.vim    |   20 +-
 runtime/syntax/atlas.vim         |   38 +-
 runtime/syntax/automake.vim      |   32 +-
 runtime/syntax/ave.vim           |   24 +-
 runtime/syntax/ayacc.vim         |   30 +-
 runtime/syntax/b.vim             |   76 +-
 runtime/syntax/baan.vim          |   44 +-
 runtime/syntax/basic.vim         |   30 +-
 runtime/syntax/bc.vim            |   18 +-
 runtime/syntax/bib.vim           |   18 +-
 runtime/syntax/bindzone.vim      |   34 +-
 runtime/syntax/blank.vim         |    8 +-
 runtime/syntax/bst.vim           |   20 +-
 runtime/syntax/btm.vim           |   50 +-
 runtime/syntax/bzr.vim           |   14 +-
 runtime/syntax/cabal.vim         |   20 +-
 runtime/syntax/cf.vim            |   91 +-
 runtime/syntax/cfg.vim           |   18 +-
 runtime/syntax/ch.vim            |   12 +-
 runtime/syntax/change.vim        |    6 +-
 runtime/syntax/changelog.vim     |   24 +-
 runtime/syntax/cheetah.vim       |   14 +-
 runtime/syntax/chill.vim         |   96 +-
 runtime/syntax/cl.vim            |   44 +-
 runtime/syntax/clean.vim         |   44 +-
 runtime/syntax/clipper.vim       |   28 +-
 runtime/syntax/cmake.vim         |   28 +-
 runtime/syntax/cobol.vim         |   62 +-
 runtime/syntax/config.vim        |   20 +-
 runtime/syntax/cpp.vim           |   30 +-
 runtime/syntax/crontab.vim       |   34 +-
 runtime/syntax/csc.vim           |   44 +-
 runtime/syntax/csh.vim           |   73 +-
 runtime/syntax/csp.vim           |   48 +-
 runtime/syntax/css.vim           |  238 +-
 runtime/syntax/cterm.vim         |   46 +-
 runtime/syntax/cupl.vim          |   40 +-
 runtime/syntax/cuplsim.vim       |   16 +-
 runtime/syntax/cvs.vim           |   14 +-
 runtime/syntax/cweb.vim          |    4 +-
 runtime/syntax/cynlib.vim        |   12 +-
 runtime/syntax/cynpp.vim         |    6 +-
 runtime/syntax/dcd.vim           |   16 +-
 runtime/syntax/dcl.vim           |   69 +-
 runtime/syntax/debchangelog.vim  |   28 +-
 runtime/syntax/debcontrol.vim    |   48 +-
 runtime/syntax/debsources.vim    |    6 +-
 runtime/syntax/def.vim           |   14 +-
 runtime/syntax/desc.vim          |   30 +-
 runtime/syntax/desktop.vim       |   36 +-
 runtime/syntax/diva.vim          |   22 +-
 runtime/syntax/django.vim        |   24 +-
 runtime/syntax/docbk.vim         |   12 +-
 runtime/syntax/dosbatch.vim      |   48 +-
 runtime/syntax/dosini.vim        |   10 +-
 runtime/syntax/dot.vim           |   28 +-
 runtime/syntax/dracula.vim       |   12 +-
 runtime/syntax/dtd.vim           |   40 +-
 runtime/syntax/dtml.vim          |   14 +-
 runtime/syntax/dylan.vim         |   48 +-
 runtime/syntax/dylanintr.vim     |   16 +-
 runtime/syntax/dylanlid.vim      |    6 +-
 runtime/syntax/ecd.vim           |   16 +-
 runtime/syntax/edif.vim          |   14 +-
 runtime/syntax/eiffel.vim        |   78 +-
 runtime/syntax/elf.vim           |   26 +-
 runtime/syntax/elmfilt.vim       |   37 +-
 runtime/syntax/erlang.vim        |  120 +-
 runtime/syntax/esqlc.vim         |   12 +-
 runtime/syntax/esterel.vim       |   22 +-
 runtime/syntax/eviews.vim        |   38 +-
 runtime/syntax/exim.vim          |   24 +-
 runtime/syntax/expect.vim        |   30 +-
 runtime/syntax/exports.vim       |   31 +-
 runtime/syntax/falcon.vim        |   52 +-
 runtime/syntax/fdcc.vim          |   68 +-
 runtime/syntax/fgl.vim           |   20 +-
 runtime/syntax/focexec.vim       |   28 +-
 runtime/syntax/form.vim          |   30 +-
 runtime/syntax/forth.vim         |   74 +-
 runtime/syntax/foxpro.vim        |   40 +-
 runtime/syntax/fstab.vim         |   78 +-
 runtime/syntax/gdb.vim           |   22 +-
 runtime/syntax/gdmo.vim          |   28 +-
 runtime/syntax/gedcom.vim        |   18 +-
 runtime/syntax/gkrellmrc.vim     |   36 +-
 runtime/syntax/gnuplot.vim       |   38 +-
 runtime/syntax/godoc.vim         |    4 +-
 runtime/syntax/gp.vim            |   34 +-
 runtime/syntax/grads.vim         |   24 +-
 runtime/syntax/gretl.vim         |   36 +-
 runtime/syntax/groovy.vim        |  143 +-
 runtime/syntax/gtkrc.vim         |   70 +-
 runtime/syntax/hamster.vim       |   12 +-
 runtime/syntax/haskell.vim       |   90 +-
 runtime/syntax/hb.vim            |   20 +-
 runtime/syntax/hercules.vim      |   26 +-
 runtime/syntax/hex.vim           |   22 +-
 runtime/syntax/html.vim          |  105 +-
 runtime/syntax/htmlos.vim        |   46 +-
 runtime/syntax/ia64.vim          |   44 +-
 runtime/syntax/icon.vim          |   66 +-
 runtime/syntax/idl.vim           |  154 +-
 runtime/syntax/idlang.vim        |   34 +-
 runtime/syntax/inform.vim        |   80 +-
 runtime/syntax/inittab.vim       |   28 +-
 runtime/syntax/ishd.vim          |   34 +-
 runtime/syntax/iss.vim           |   48 +-
 runtime/syntax/ist.vim           |   20 +-
 runtime/syntax/jal.vim           |  108 +-
 runtime/syntax/jam.vim           |  140 +-
 runtime/syntax/jargon.vim        |   10 +-
 runtime/syntax/java.vim          |  161 +-
 runtime/syntax/javacc.vim        |   12 +-
 runtime/syntax/javascript.vim    |   66 +-
 runtime/syntax/jess.vim          |   34 +-
 runtime/syntax/jgraph.vim        |   10 +-
 runtime/syntax/jproperties.vim   |   20 +-
 runtime/syntax/json.vim          |   40 +-
 runtime/syntax/jsp.vim           |   22 +-
 runtime/syntax/kix.vim           |   64 +-
 runtime/syntax/kscript.vim       |   30 +-
 runtime/syntax/kwt.vim           |   18 +-
 runtime/syntax/lace.vim          |   52 +-
 runtime/syntax/latte.vim         |   18 +-
 runtime/syntax/ldif.vim          |   16 +-
 runtime/syntax/lex.vim           |   40 +-
 runtime/syntax/lhaskell.vim      |    8 +-
 runtime/syntax/lifelines.vim     |   50 +-
 runtime/syntax/lilo.vim          |   90 +-
 runtime/syntax/lisp.vim          |   95 +-
 runtime/syntax/lite.vim          |   42 +-
 runtime/syntax/logtalk.vim       |   52 +-
 runtime/syntax/lotos.vim         |   16 +-
 runtime/syntax/lout.vim          |   39 +-
 runtime/syntax/lpc.vim           |  126 +-
 runtime/syntax/lprolog.vim       |   36 +-
 runtime/syntax/lscript.vim       |   28 +-
 runtime/syntax/lua.vim           |   44 +-
 runtime/syntax/m4.vim            |   28 +-
 runtime/syntax/make.vim          |   42 +-
 runtime/syntax/maple.vim         |  132 +-
 runtime/syntax/master.vim        |    8 +-
 runtime/syntax/matlab.vim        |   56 +-
 runtime/syntax/maxima.vim        |   44 +-
 runtime/syntax/mel.vim           |   56 +-
 runtime/syntax/mf.vim            |   44 +-
 runtime/syntax/mgl.vim           |   50 +-
 runtime/syntax/mgp.vim           |   26 +-
 runtime/syntax/mma.vim           |   50 +-
 runtime/syntax/mmix.vim          |   32 +-
 runtime/syntax/modsim3.vim       |   24 +-
 runtime/syntax/modula2.vim       |   24 +-
 runtime/syntax/modula3.vim       |   10 +-
 runtime/syntax/monk.vim          |   22 +-
 runtime/syntax/mp.vim            |   12 +-
 runtime/syntax/msidl.vim         |   38 +-
 runtime/syntax/msql.vim          |   42 +-
 runtime/syntax/mupad.vim         |   26 +-
 runtime/syntax/mush.vim          |   40 +-
 runtime/syntax/muttrc.vim        |  282 +-
 runtime/syntax/mysql.vim         |   22 +-
 runtime/syntax/named.vim         |   56 +-
 runtime/syntax/nasm.vim          |  122 +-
 runtime/syntax/nastran.vim       |   44 +-
 runtime/syntax/natural.vim       |   81 +-
 runtime/syntax/ncf.vim           |   50 +-
 runtime/syntax/nqc.vim           |   66 +-
 runtime/syntax/nroff.vim         |   72 +-
 runtime/syntax/nsis.vim          |   54 +-
 runtime/syntax/obj.vim           |   28 +-
 runtime/syntax/ocaml.vim         |   92 +-
 runtime/syntax/occam.vim         |   50 +-
 runtime/syntax/omnimark.vim      |   16 +-
 runtime/syntax/openroad.vim      |   28 +-
 runtime/syntax/opl.vim           |   14 +-
 runtime/syntax/ora.vim           |   28 +-
 runtime/syntax/pascal.vim        |   68 +-
 runtime/syntax/pcap.vim          |    8 +-
 runtime/syntax/pccts.vim         |   32 +-
 runtime/syntax/perl.vim          |  192 +-
 runtime/syntax/perl6.vim         |  310 +-
 runtime/syntax/pfmain.vim        |   30 +-
 runtime/syntax/php.vim           |  106 +-
 runtime/syntax/pic.vim           |   30 +-
 runtime/syntax/pike.vim          |   66 +-
 runtime/syntax/pilrc.vim         |   26 +-
 runtime/syntax/pine.vim          |    8 +-
 runtime/syntax/pli.vim           |   78 +-
 runtime/syntax/plm.vim           |   48 +-
 runtime/syntax/plsql.vim         |   72 +-
 runtime/syntax/po.vim            |   76 +-
 runtime/syntax/pod.vim           |   20 +-
 runtime/syntax/postscr.vim       |   78 +-
 runtime/syntax/ppd.vim           |   16 +-
 runtime/syntax/ppwiz.vim         |   30 +-
 runtime/syntax/prescribe.vim     |   14 +-
 runtime/syntax/procmail.vim      |   26 +-
 runtime/syntax/progress.vim      |   50 +-
 runtime/syntax/prolog.vim        |   36 +-
 runtime/syntax/psf.vim           |   16 +-
 runtime/syntax/ptcap.vim         |   30 +-
 runtime/syntax/purifylog.vim     |   80 +-
 runtime/syntax/pyrex.vim         |   16 +-
 runtime/syntax/python.vim        |   48 +-
 runtime/syntax/radiance.vim      |   26 +-
 runtime/syntax/ratpoison.vim     |   30 +-
 runtime/syntax/rc.vim            |   52 +-
 runtime/syntax/rcs.vim           |   16 +-
 runtime/syntax/rcslog.vim        |    8 +-
 runtime/syntax/rebol.vim         |   76 +-
 runtime/syntax/registry.vim      |   24 +-
 runtime/syntax/remind.vim        |   38 +-
 runtime/syntax/resolv.vim        |   38 +-
 runtime/syntax/rexx.vim          |  100 +-
 runtime/syntax/rib.vim           |   16 +-
 runtime/syntax/robots.vim        |   20 +-
 runtime/syntax/rpcgen.vim        |   29 +-
 runtime/syntax/rpl.vim           |  102 +-
 runtime/syntax/rtf.vim           |   20 +-
 runtime/syntax/samba.vim         |   16 +-
 runtime/syntax/sas.vim           |   36 +-
 runtime/syntax/sather.vim        |   54 +-
 runtime/syntax/scheme.vim        |   30 +-
 runtime/syntax/scilab.vim        |   52 +-
 runtime/syntax/sd.vim            |   26 +-
 runtime/syntax/sdl.vim           |   26 +-
 runtime/syntax/sgmldecl.vim      |   24 +-
 runtime/syntax/sgmllnx.vim       |   26 +-
 runtime/syntax/sh.vim            |  256 +-
 runtime/syntax/sicad.vim         |   48 +-
 runtime/syntax/simula.vim        |   52 +-
 runtime/syntax/sinda.vim         |   34 +-
 runtime/syntax/sindacmp.vim      |   14 +-
 runtime/syntax/sindaout.vim      |   22 +-
 runtime/syntax/skill.vim         |   38 +-
 runtime/syntax/sl.vim            |   54 +-
 runtime/syntax/slang.vim         |   58 +-
 runtime/syntax/slice.vim         |   30 +-
 runtime/syntax/slrnrc.vim        |   52 +-
 runtime/syntax/slrnsc.vim        |   32 +-
 runtime/syntax/sm.vim            |   36 +-
 runtime/syntax/smarty.vim        |   16 +-
 runtime/syntax/smil.vim          |   38 +-
 runtime/syntax/smith.vim         |   12 +-
 runtime/syntax/sml.vim           |   72 +-
 runtime/syntax/snnsnet.vim       |   14 +-
 runtime/syntax/snnspat.vim       |   20 +-
 runtime/syntax/snnsres.vim       |   14 +-
 runtime/syntax/snobol4.vim       |   52 +-
 runtime/syntax/spec.vim          |   96 +-
 runtime/syntax/specman.vim       |   60 +-
 runtime/syntax/spice.vim         |   20 +-
 runtime/syntax/splint.vim        |   86 +-
 runtime/syntax/spup.vim          |  108 +-
 runtime/syntax/sqlforms.vim      |   28 +-
 runtime/syntax/sqlinformix.vim   |   28 +-
 runtime/syntax/sqlj.vim          |   20 +-
 runtime/syntax/sqloracle.vim     |   24 +-
 runtime/syntax/sqr.vim           |   34 +-
 runtime/syntax/squid.vim         |   24 +-
 runtime/syntax/srec.vim          |   22 +-
 runtime/syntax/sshconfig.vim     |   50 +-
 runtime/syntax/sshdconfig.vim    |   56 +-
 runtime/syntax/st.vim            |   24 +-
 runtime/syntax/stp.vim           |   36 +-
 runtime/syntax/strace.vim        |   32 +-
 runtime/syntax/svn.vim           |   20 +-
 runtime/syntax/systemverilog.vim |   16 +-
 runtime/syntax/tads.vim          |   66 +-
 runtime/syntax/tags.vim          |   21 +-
 runtime/syntax/tak.vim           |   36 +-
 runtime/syntax/takcmp.vim        |   18 +-
 runtime/syntax/takout.vim        |   22 +-
 runtime/syntax/tasm.vim          |   28 +-
 runtime/syntax/tcl.vim           |   56 +-
 runtime/syntax/tex.vim           |  139 +-
 runtime/syntax/texinfo.vim       |   42 +-
 runtime/syntax/texmf.vim         |   40 +-
 runtime/syntax/tf.vim            |   52 +-
 runtime/syntax/tli.vim           |   18 +-
 runtime/syntax/tpp.vim           |   34 +-
 runtime/syntax/trasys.vim        |   38 +-
 runtime/syntax/tsalt.vim         |   56 +-
 runtime/syntax/tsscl.vim         |   34 +-
 runtime/syntax/tssgm.vim         |   30 +-
 runtime/syntax/tssop.vim         |   20 +-
 runtime/syntax/uc.vim            |   84 +-
 runtime/syntax/uil.vim           |   36 +-
 runtime/syntax/vb.vim            |   44 +-
 runtime/syntax/vera.vim          |  110 +-
 runtime/syntax/verilog.vim       |   30 +-
 runtime/syntax/verilogams.vim    |   34 +-
 runtime/syntax/vhdl.vim          |   34 +-
 runtime/syntax/vim.vim           |  330 +-
 runtime/syntax/virata.vim        |   68 +-
 runtime/syntax/vmasm.vim         |   40 +-
 runtime/syntax/vrml.vim          |   36 +-
 runtime/syntax/vsejcl.vim        |   16 +-
 runtime/syntax/wdiff.vim         |    6 +-
 runtime/syntax/webmacro.vim      |   28 +-
 runtime/syntax/winbatch.vim      |   22 +-
 runtime/syntax/wml.vim           |   30 +-
 runtime/syntax/wsml.vim          |   60 +-
 runtime/syntax/xdefaults.vim     |   38 +-
 runtime/syntax/xkb.vim           |   44 +-
 runtime/syntax/xmath.vim         |   56 +-
 runtime/syntax/xpm.vim           |   12 +-
 runtime/syntax/xpm2.vim          |   18 +-
 runtime/syntax/xs.vim            |   22 +-
 runtime/syntax/xxd.vim           |   15 +-
 runtime/syntax/yacc.vim          |    8 +-
 runtime/syntax/z8a.vim           |   24 +-
 src/nvim/po/eo.po                | 4682 +++++++++++-----------
 src/nvim/po/fr.po                | 5123 ++++++++++++------------
 src/nvim/po/ja.euc-jp.po         | 6285 ++++++++++++------------------
 src/nvim/po/ja.po                | 6282 ++++++++++++-----------------
 338 files changed, 16903 insertions(+), 19922 deletions(-)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index b40f91ff35..ffcd373ada 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -7589,7 +7589,7 @@ timer_start({time}, {callback} [, {options}])
 		busy or Vim is not waiting for input the time will be longer.
 
 		{callback} is the function to call.  It can be the name of a
-		function or a Funcref.  It is called with one argument, which
+		function or a |Funcref|.  It is called with one argument, which
 		is the timer ID.  The callback is only invoked when Vim is
 		waiting for input.
 
diff --git a/runtime/syntax/a65.vim b/runtime/syntax/a65.vim
index 5ade809a1f..b232e826cd 100644
--- a/runtime/syntax/a65.vim
+++ b/runtime/syntax/a65.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	xa 6502 cross assembler
 " Maintainer:	Clemens Kirchgatterer <clemens@1541.org>
-" Last Change:	2014 Jan 05
+" Last Change:	2016 Aug 31
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -136,20 +136,18 @@ syn match  a65Continue	"\\$" contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink a65Section	Special
-HiLink a65Address	Special
-HiLink a65Comment	Comment
-HiLink a65PreProc	PreProc
-HiLink a65Number	Number
-HiLink a65String	String
-HiLink a65Type	Statement
-HiLink a65Opcode	Type
-HiLink a65PC		Error
-HiLink a65Todo	Todo
-HiLink a65HiLo	Number
+hi def link a65Section	Special
+hi def link a65Address	Special
+hi def link a65Comment	Comment
+hi def link a65PreProc	PreProc
+hi def link a65Number	Number
+hi def link a65String	String
+hi def link a65Type	Statement
+hi def link a65Opcode	Type
+hi def link a65PC		Error
+hi def link a65Todo	Todo
+hi def link a65HiLo	Number
 
-delcommand HiLink
 
 let b:current_syntax = "a65"
diff --git a/runtime/syntax/abap.vim b/runtime/syntax/abap.vim
index ac5504a952..c2857a5f30 100644
--- a/runtime/syntax/abap.vim
+++ b/runtime/syntax/abap.vim
@@ -169,29 +169,27 @@ syn match   abapTodo     "\#EC\W\+\w\+"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink abapError          Error
-HiLink abapComment        Comment
-HiLink abapInclude        Include
-HiLink abapStatement      Statement
-HiLink abapComplexStatement      Statement
-HiLink abapSpecial        Special
-HiLink abapNamespace      Special
-HiLink abapSpecialTables  Special
-HiLink abapSymbolOperator abapOperator
-HiLink abapOperator       Operator
-HiLink abapCharString     String
-HiLink abapString         String
-HiLink abapFloat          Float
-HiLink abapTypes          Type
-HiLink abapSymbol         Structure
-HiLink abapStructure      Structure
-HiLink abapField          Variable
-HiLink abapNumber         Number
-HiLink abapHex            Number
+hi def link abapError          Error
+hi def link abapComment        Comment
+hi def link abapInclude        Include
+hi def link abapStatement      Statement
+hi def link abapComplexStatement      Statement
+hi def link abapSpecial        Special
+hi def link abapNamespace      Special
+hi def link abapSpecialTables  Special
+hi def link abapSymbolOperator abapOperator
+hi def link abapOperator       Operator
+hi def link abapCharString     String
+hi def link abapString         String
+hi def link abapFloat          Float
+hi def link abapTypes          Type
+hi def link abapSymbol         Structure
+hi def link abapStructure      Structure
+hi def link abapField          Variable
+hi def link abapNumber         Number
+hi def link abapHex            Number
 
-delcommand HiLink
 
 let b:current_syntax = "abap"
 
diff --git a/runtime/syntax/abaqus.vim b/runtime/syntax/abaqus.vim
index ddf0255845..db2717f818 100644
--- a/runtime/syntax/abaqus.vim
+++ b/runtime/syntax/abaqus.vim
@@ -23,15 +23,13 @@ syn match abaqusBadLine	"^\s\+\*.*" display
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink abaqusComment	Comment
-HiLink abaqusKeyword	Statement
-HiLink abaqusParameter	Identifier
-HiLink abaqusValue	Constant
-HiLink abaqusBadLine    Error
+hi def link abaqusComment	Comment
+hi def link abaqusKeyword	Statement
+hi def link abaqusParameter	Identifier
+hi def link abaqusValue	Constant
+hi def link abaqusBadLine    Error
 
-delcommand HiLink
 
 let b:current_syntax = "abaqus"
diff --git a/runtime/syntax/abc.vim b/runtime/syntax/abc.vim
index 68f0cf16ff..1a7b3bf4be 100644
--- a/runtime/syntax/abc.vim
+++ b/runtime/syntax/abc.vim
@@ -34,19 +34,17 @@ syn match abcComment "%.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink abcComment		Comment
-HiLink abcHeadField		Type
-HiLink abcBodyField		Special
-HiLink abcBar			Statement
-HiLink abcTuple			Statement
-HiLink abcBroken			Statement
-HiLink abcTie			Statement
-HiLink abcGuitarChord	Identifier
-HiLink abcNote			Constant
+hi def link abcComment		Comment
+hi def link abcHeadField		Type
+hi def link abcBodyField		Special
+hi def link abcBar			Statement
+hi def link abcTuple			Statement
+hi def link abcBroken			Statement
+hi def link abcTie			Statement
+hi def link abcGuitarChord	Identifier
+hi def link abcNote			Constant
 
-delcommand HiLink
 
 let b:current_syntax = "abc"
 
diff --git a/runtime/syntax/abel.vim b/runtime/syntax/abel.vim
index dfa872f422..67d7e4f786 100644
--- a/runtime/syntax/abel.vim
+++ b/runtime/syntax/abel.vim
@@ -121,39 +121,37 @@ syn sync minlines=1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink abelHeader		abelStatement
-HiLink abelSection		abelStatement
-HiLink abelDeclaration	abelStatement
-HiLink abelLogicalOperator	abelOperator
-HiLink abelRangeOperator	abelOperator
-HiLink abelAlternateOperator	abelOperator
-HiLink abelArithmeticOperator	abelOperator
-HiLink abelRelationalOperator	abelOperator
-HiLink abelAssignmentOperator	abelOperator
-HiLink abelTruthTableOperator	abelOperator
-HiLink abelSpecifier		abelStatement
-HiLink abelOperator		abelStatement
-HiLink abelStatement		Statement
-HiLink abelIdentifier		Identifier
-HiLink abelTypeId		abelType
-HiLink abelTypeIdChar		abelType
-HiLink abelType		Type
-HiLink abelNumber		abelString
-HiLink abelString		String
-HiLink abelConstant		Constant
-HiLink abelComment		Comment
-HiLink abelExtension		abelSpecial
-HiLink abelSpecialChar	abelSpecial
-HiLink abelTypeIdEnd		abelSpecial
-HiLink abelSpecial		Special
-HiLink abelDirective		PreProc
-HiLink abelTodo		Todo
-HiLink abelError		Error
+hi def link abelHeader		abelStatement
+hi def link abelSection		abelStatement
+hi def link abelDeclaration	abelStatement
+hi def link abelLogicalOperator	abelOperator
+hi def link abelRangeOperator	abelOperator
+hi def link abelAlternateOperator	abelOperator
+hi def link abelArithmeticOperator	abelOperator
+hi def link abelRelationalOperator	abelOperator
+hi def link abelAssignmentOperator	abelOperator
+hi def link abelTruthTableOperator	abelOperator
+hi def link abelSpecifier		abelStatement
+hi def link abelOperator		abelStatement
+hi def link abelStatement		Statement
+hi def link abelIdentifier		Identifier
+hi def link abelTypeId		abelType
+hi def link abelTypeIdChar		abelType
+hi def link abelType		Type
+hi def link abelNumber		abelString
+hi def link abelString		String
+hi def link abelConstant		Constant
+hi def link abelComment		Comment
+hi def link abelExtension		abelSpecial
+hi def link abelSpecialChar	abelSpecial
+hi def link abelTypeIdEnd		abelSpecial
+hi def link abelSpecial		Special
+hi def link abelDirective		PreProc
+hi def link abelTodo		Todo
+hi def link abelError		Error
 
-delcommand HiLink
 
 let b:current_syntax = "abel"
 
diff --git a/runtime/syntax/acedb.vim b/runtime/syntax/acedb.vim
index 43cec3ac29..2c2cd701b7 100644
--- a/runtime/syntax/acedb.vim
+++ b/runtime/syntax/acedb.vim
@@ -84,26 +84,24 @@ syn region	acedbString	start=/"/ end=/"/ skip=/\\"/ oneline
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink acedbMagic	Special
-HiLink acedbHyb	Special
-HiLink acedbType	Type
-HiLink acedbOption	Type
-HiLink acedbSubclass	Type
-HiLink acedbSubtag	Include
-HiLink acedbFlag	Include
-HiLink acedbTag	Include
-HiLink acedbClass	Todo
-HiLink acedbHelp	Todo
-HiLink acedbXref	Identifier
-HiLink acedbModifier	Label
-HiLink acedbComment	Comment
-HiLink acedbBlock	ModeMsg
-HiLink acedbNumber	Number
-HiLink acedbString	String
+hi def link acedbMagic	Special
+hi def link acedbHyb	Special
+hi def link acedbType	Type
+hi def link acedbOption	Type
+hi def link acedbSubclass	Type
+hi def link acedbSubtag	Include
+hi def link acedbFlag	Include
+hi def link acedbTag	Include
+hi def link acedbClass	Todo
+hi def link acedbHelp	Todo
+hi def link acedbXref	Identifier
+hi def link acedbModifier	Label
+hi def link acedbComment	Comment
+hi def link acedbBlock	ModeMsg
+hi def link acedbNumber	Number
+hi def link acedbString	String
 
-delcommand HiLink
 
 let b:current_syntax = "acedb"
 
diff --git a/runtime/syntax/aflex.vim b/runtime/syntax/aflex.vim
index 21b78d0d85..aa8b5f84fe 100644
--- a/runtime/syntax/aflex.vim
+++ b/runtime/syntax/aflex.vim
@@ -63,21 +63,19 @@ syn sync match aflexSyncPat	groupthere aflexPatBlock	"^%%$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink	aflexSlashQuote	aflexPat
-HiLink	aflexBrace		aflexPat
-HiLink aflexAbbrvComment	aflexPatComment
+hi def link aflexSlashQuote	aflexPat
+hi def link aflexBrace		aflexPat
+hi def link aflexAbbrvComment	aflexPatComment
 
-HiLink	aflexAbbrv		SpecialChar
-HiLink	aflexAbbrvRegExp	Macro
-HiLink	aflexCFunctions	Function
-HiLink	aflexMorePat	SpecialChar
-HiLink	aflexPat		Function
-HiLink	aflexPatComment	Comment
-HiLink	aflexPatString	Function
-HiLink	aflexPatTag		Special
-HiLink	aflexSep		Delimiter
-delcommand HiLink
+hi def link aflexAbbrv		SpecialChar
+hi def link aflexAbbrvRegExp	Macro
+hi def link aflexCFunctions	Function
+hi def link aflexMorePat	SpecialChar
+hi def link aflexPat		Function
+hi def link aflexPatComment	Comment
+hi def link aflexPatString	Function
+hi def link aflexPatTag		Special
+hi def link aflexSep		Delimiter
 
 let b:current_syntax = "aflex"
 
diff --git a/runtime/syntax/ahdl.vim b/runtime/syntax/ahdl.vim
index 82f3918de8..664bd3837d 100644
--- a/runtime/syntax/ahdl.vim
+++ b/runtime/syntax/ahdl.vim
@@ -64,20 +64,18 @@ syn sync minlines=1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink ahdlNumber		ahdlString
-HiLink ahdlMegafunction	ahdlIdentifier
-HiLink ahdlSpecialChar	SpecialChar
-HiLink ahdlKeyword		Statement
-HiLink ahdlString		String
-HiLink ahdlComment		Comment
-HiLink ahdlIdentifier		Identifier
-HiLink ahdlOperator		Operator
-HiLink ahdlTodo		Todo
+hi def link ahdlNumber		ahdlString
+hi def link ahdlMegafunction	ahdlIdentifier
+hi def link ahdlSpecialChar	SpecialChar
+hi def link ahdlKeyword		Statement
+hi def link ahdlString		String
+hi def link ahdlComment		Comment
+hi def link ahdlIdentifier		Identifier
+hi def link ahdlOperator		Operator
+hi def link ahdlTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "ahdl"
 " vim:ts=8
diff --git a/runtime/syntax/amiga.vim b/runtime/syntax/amiga.vim
index e094cfc744..eab9f66169 100644
--- a/runtime/syntax/amiga.vim
+++ b/runtime/syntax/amiga.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	AmigaDos
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:     7
+" Last Change:	Aug 31, 2016
+" Version:     9
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_AMIGA
 
 " quit when a syntax file was already loaded
@@ -69,22 +69,20 @@ syn match	amiComment	";.*$" contains=amiCommentGroup
 syn sync lines=50
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_amiga_syntax_inits")
 
-HiLink amiAlias	Type
-HiLink amiComment	Comment
-HiLink amiDev	Type
-HiLink amiEcho	String
-HiLink amiElse	Statement
-HiLink amiError	Error
-HiLink amiKey	Statement
-HiLink amiNumber	Number
-HiLink amiString	String
-HiLink amiTest	Special
-
-delcommand HiLink
+  hi def link amiAlias	Type
+  hi def link amiComment	Comment
+  hi def link amiDev	Type
+  hi def link amiEcho	String
+  hi def link amiElse	Statement
+  hi def link amiError	Error
+  hi def link amiKey	Statement
+  hi def link amiNumber	Number
+  hi def link amiString	String
+  hi def link amiTest	Special
 
+endif
 let b:current_syntax = "amiga"
 
 " vim:ts=15
diff --git a/runtime/syntax/aml.vim b/runtime/syntax/aml.vim
index 1b975ccabe..46621edbe9 100644
--- a/runtime/syntax/aml.vim
+++ b/runtime/syntax/aml.vim
@@ -121,26 +121,24 @@ syn region amlSkip matchgroup=amlOutput start="&type" end="$" contains=amlVar
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink amlComment	Comment
-HiLink amlNumber	Number
-HiLink amlQuote	String
-HiLink amlVar	Identifier
-HiLink amlVar2	Identifier
-HiLink amlFunction	PreProc
-HiLink amlDir	Statement
-HiLink amlDir2	Statement
-HiLink amlDirSym	Statement
-HiLink amlOutput	Statement
-HiLink amlArcCmd	ModeMsg
-HiLink amlFormedCmd	amlArcCmd
-HiLink amlTabCmd	amlArcCmd
-HiLink amlInfoCmd	amlArcCmd
-HiLink amlVtrCmd	amlArcCmd
-HiLink amlFormed	amlArcCmd
-HiLink amlTab	amlArcCmd
+hi def link amlComment	Comment
+hi def link amlNumber	Number
+hi def link amlQuote	String
+hi def link amlVar	Identifier
+hi def link amlVar2	Identifier
+hi def link amlFunction	PreProc
+hi def link amlDir	Statement
+hi def link amlDir2	Statement
+hi def link amlDirSym	Statement
+hi def link amlOutput	Statement
+hi def link amlArcCmd	ModeMsg
+hi def link amlFormedCmd	amlArcCmd
+hi def link amlTabCmd	amlArcCmd
+hi def link amlInfoCmd	amlArcCmd
+hi def link amlVtrCmd	amlArcCmd
+hi def link amlFormed	amlArcCmd
+hi def link amlTab	amlArcCmd
 
-delcommand HiLink
 
 let b:current_syntax = "aml"
diff --git a/runtime/syntax/ampl.vim b/runtime/syntax/ampl.vim
index 99a683a0f4..ad78f7d729 100644
--- a/runtime/syntax/ampl.vim
+++ b/runtime/syntax/ampl.vim
@@ -114,26 +114,24 @@ syn keyword amplTodo contained	 TODO FIXME XXX
 
 
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later.
-HiLink amplEntityKeyword	Keyword
-HiLink amplType		Type
-HiLink amplStatement		Statement
-HiLink amplOperators		Operator
-HiLink amplBasicOperators	Operator
-HiLink amplConditional	Conditional
-HiLink amplRepeat		Repeat
-HiLink amplStrings		String
-HiLink amplNumerics		Number
-HiLink amplSetFunction	Function
-HiLink amplBuiltInFunction	Function
-HiLink amplRandomGenerator	Function
-HiLink amplComment		Comment
-HiLink amplDotSuffix		Special
-HiLink amplPiecewise		Special
+hi def link amplEntityKeyword	Keyword
+hi def link amplType		Type
+hi def link amplStatement		Statement
+hi def link amplOperators		Operator
+hi def link amplBasicOperators	Operator
+hi def link amplConditional	Conditional
+hi def link amplRepeat		Repeat
+hi def link amplStrings		String
+hi def link amplNumerics		Number
+hi def link amplSetFunction	Function
+hi def link amplBuiltInFunction	Function
+hi def link amplRandomGenerator	Function
+hi def link amplComment		Comment
+hi def link amplDotSuffix		Special
+hi def link amplPiecewise		Special
 
-delcommand HiLink
 
 let b:current_syntax = "ampl"
 
diff --git a/runtime/syntax/antlr.vim b/runtime/syntax/antlr.vim
index 2ac38d7747..9b0b061ae1 100644
--- a/runtime/syntax/antlr.vim
+++ b/runtime/syntax/antlr.vim
@@ -46,10 +46,8 @@ syn match antlrSep "[|:]\|\.\."
 syn keyword antlrActionToken TOKEN SKIP MORE SPECIAL_TOKEN
 syn keyword antlrError DEBUG IGNORE_IN_BNF
 
-command -nargs=+ HiLink hi def link <args>
-HiLink antlrSep Statement
-HiLink antlrPackages Statement
-delcommand HiLink
+hi def link antlrSep Statement
+hi def link antlrPackages Statement
 
 let b:current_syntax = "antlr"
 
diff --git a/runtime/syntax/apache.vim b/runtime/syntax/apache.vim
index b556fa350d..e2315db0d7 100644
--- a/runtime/syntax/apache.vim
+++ b/runtime/syntax/apache.vim
@@ -174,30 +174,28 @@ syn match apacheSection "<\/\=\(<IfVersion\)[^>]*>" contains=apacheAnything
 syn keyword apacheDeclaration VirtualDocumentRoot VirtualDocumentRootIP VirtualScriptAlias VirtualScriptAliasIP
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink apacheAllowOverride apacheDeclaration
-HiLink apacheAllowOverrideValue apacheOption
-HiLink apacheAuthType apacheDeclaration
-HiLink apacheAuthTypeValue apacheOption
-HiLink apacheOptionOption apacheOption
-HiLink apacheDeclaration Function
-HiLink apacheAnything apacheOption
-HiLink apacheOption Number
-HiLink apacheComment Comment
-HiLink apacheFixme Todo
-HiLink apacheLimitSectionKeyword apacheLimitSection
-HiLink apacheLimitSection apacheSection
-HiLink apacheSection Label
-HiLink apacheMethodOption Type
-HiLink apacheAllowDeny Include
-HiLink apacheAllowDenyValue Identifier
-HiLink apacheOrder Special
-HiLink apacheOrderValue String
-HiLink apacheString String
-HiLink apacheError Error
-HiLink apacheUserID Number
+hi def link apacheAllowOverride apacheDeclaration
+hi def link apacheAllowOverrideValue apacheOption
+hi def link apacheAuthType apacheDeclaration
+hi def link apacheAuthTypeValue apacheOption
+hi def link apacheOptionOption apacheOption
+hi def link apacheDeclaration Function
+hi def link apacheAnything apacheOption
+hi def link apacheOption Number
+hi def link apacheComment Comment
+hi def link apacheFixme Todo
+hi def link apacheLimitSectionKeyword apacheLimitSection
+hi def link apacheLimitSection apacheSection
+hi def link apacheSection Label
+hi def link apacheMethodOption Type
+hi def link apacheAllowDeny Include
+hi def link apacheAllowDenyValue Identifier
+hi def link apacheOrder Special
+hi def link apacheOrderValue String
+hi def link apacheString String
+hi def link apacheError Error
+hi def link apacheUserID Number
 
-delcommand HiLink
 
 let b:current_syntax = "apache"
diff --git a/runtime/syntax/apachestyle.vim b/runtime/syntax/apachestyle.vim
index 53d5907b9e..3695a11421 100644
--- a/runtime/syntax/apachestyle.vim
+++ b/runtime/syntax/apachestyle.vim
@@ -39,16 +39,14 @@ syn match  apTagError	contained /[^>]</ms=s+1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink apComment	Comment
-HiLink apOption	Keyword
-"HiLink apLastValue	Identifier		ugly?
-HiLink apTag		Special
-HiLink apTagOption	Identifier
-HiLink apTagError	Error
+hi def link apComment	Comment
+hi def link apOption	Keyword
+"hi def link apLastValue	Identifier		ugly?
+hi def link apTag		Special
+hi def link apTagOption	Identifier
+hi def link apTagError	Error
 
-delcommand HiLink
 
 let b:current_syntax = "apachestyle"
 " vim: ts=8
diff --git a/runtime/syntax/asm.vim b/runtime/syntax/asm.vim
index 501f5f0872..492e3e8e92 100644
--- a/runtime/syntax/asm.vim
+++ b/runtime/syntax/asm.vim
@@ -101,28 +101,26 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink asmSection	Special
-HiLink asmLabel	Label
-HiLink asmComment	Comment
-HiLink asmTodo	Todo
-HiLink asmDirective	Statement
+hi def link asmSection	Special
+hi def link asmLabel	Label
+hi def link asmComment	Comment
+hi def link asmTodo	Todo
+hi def link asmDirective	Statement
 
-HiLink asmInclude	Include
-HiLink asmCond	PreCondit
-HiLink asmMacro	Macro
+hi def link asmInclude	Include
+hi def link asmCond	PreCondit
+hi def link asmMacro	Macro
 
-HiLink hexNumber	Number
-HiLink decNumber	Number
-HiLink octNumber	Number
-HiLink binNumber	Number
+hi def link hexNumber	Number
+hi def link decNumber	Number
+hi def link octNumber	Number
+hi def link binNumber	Number
 
-HiLink asmIdentifier	Identifier
-HiLink asmType	Type
+hi def link asmIdentifier	Identifier
+hi def link asmType	Type
 
-delcommand HiLink
 
 let b:current_syntax = "asm"
 
diff --git a/runtime/syntax/asm68k.vim b/runtime/syntax/asm68k.vim
index ace56c854e..1607507909 100644
--- a/runtime/syntax/asm68k.vim
+++ b/runtime/syntax/asm68k.vim
@@ -326,7 +326,6 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
 " Comment Constant Error Identifier PreProc Special Statement Todo Type
@@ -338,42 +337,41 @@ command -nargs=+ HiLink hi def link <args>
 " Statement		Conditional Exception Keyword Label Operator Repeat
 " Type		StorageClass Structure Typedef
 
-HiLink asm68kComment		Comment
-HiLink asm68kTodo		Todo
+hi def link asm68kComment		Comment
+hi def link asm68kTodo		Todo
 
-HiLink hexNumber		Number		" Constant
-HiLink octNumber		Number		" Constant
-HiLink binNumber		Number		" Constant
-HiLink decNumber		Number		" Constant
-HiLink floatNumber		Number		" Constant
-HiLink floatExponent		Number		" Constant
-HiLink floatE			SpecialChar	" Statement
-"HiLink floatE		Number		" Constant
+hi def link hexNumber		Number		" Constant
+hi def link octNumber		Number		" Constant
+hi def link binNumber		Number		" Constant
+hi def link decNumber		Number		" Constant
+hi def link floatNumber		Number		" Constant
+hi def link floatExponent		Number		" Constant
+hi def link floatE			SpecialChar	" Statement
+"hi def link floatE		Number		" Constant
 
-HiLink asm68kImmediate	SpecialChar	" Statement
-"HiLink asm68kSymbol		Constant
+hi def link asm68kImmediate	SpecialChar	" Statement
+"hi def link asm68kSymbol		Constant
 
-HiLink asm68kString		String		" Constant
-HiLink asm68kCharError	Error
-HiLink asm68kStringError	Error
+hi def link asm68kString		String		" Constant
+hi def link asm68kCharError	Error
+hi def link asm68kStringError	Error
 
-HiLink asm68kReg		Identifier
-HiLink asm68kOperator		Identifier
+hi def link asm68kReg		Identifier
+hi def link asm68kOperator		Identifier
 
-HiLink asm68kInclude		Include		" PreProc
-HiLink asm68kMacro		Macro		" PreProc
-HiLink asm68kMacroParam	Keyword		" Statement
+hi def link asm68kInclude		Include		" PreProc
+hi def link asm68kMacro		Macro		" PreProc
+hi def link asm68kMacroParam	Keyword		" Statement
 
-HiLink asm68kDirective	Special
-HiLink asm68kPreCond		Special
+hi def link asm68kDirective	Special
+hi def link asm68kPreCond		Special
 
 
-HiLink asm68kOpcode		Statement
-HiLink asm68kCond		Conditional	" Statement
-HiLink asm68kRepeat		Repeat		" Statement
+hi def link asm68kOpcode		Statement
+hi def link asm68kCond		Conditional	" Statement
+hi def link asm68kRepeat		Repeat		" Statement
 
-HiLink asm68kLabel		Type
-delcommand HiLink
+hi def link asm68kLabel		Type
 
 let b:current_syntax = "asm68k"
 
diff --git a/runtime/syntax/asmh8300.vim b/runtime/syntax/asmh8300.vim
index 5134c512e7..8560fb7ae4 100644
--- a/runtime/syntax/asmh8300.vim
+++ b/runtime/syntax/asmh8300.vim
@@ -54,16 +54,14 @@ runtime! syntax/asm.vim
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink asmOpcode  Statement
-HiLink asmRegister  Identifier
+hi def link asmOpcode  Statement
+hi def link asmRegister  Identifier
 
 " My default-color overrides:
 "hi asmOpcode ctermfg=yellow
 "hi asmReg	ctermfg=lightmagenta
 
-delcommand HiLink
 
 let b:current_syntax = "asmh8300"
 
diff --git a/runtime/syntax/asn.vim b/runtime/syntax/asn.vim
index 8b553e884c..e90c7e079c 100644
--- a/runtime/syntax/asn.vim
+++ b/runtime/syntax/asn.vim
@@ -48,25 +48,23 @@ syn sync ccomment asnComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink asnDefinition	Function
-HiLink asnBraces		Function
-HiLink asnStructure	Statement
-HiLink asnBoolValue	Boolean
-HiLink asnSpecial		Special
-HiLink asnString		String
-HiLink asnCharacter	Character
-HiLink asnSpecialCharacter	asnSpecial
-HiLink asnNumber		asnValue
-HiLink asnComment		Comment
-HiLink asnLineComment	asnComment
-HiLink asnType		Type
-HiLink asnTypeInfo		PreProc
-HiLink asnValue		Number
-HiLink asnExternal		Include
-HiLink asnTagModifier	Function
-HiLink asnFieldOption	Type
-delcommand HiLink
+hi def link asnDefinition	Function
+hi def link asnBraces		Function
+hi def link asnStructure	Statement
+hi def link asnBoolValue	Boolean
+hi def link asnSpecial		Special
+hi def link asnString		String
+hi def link asnCharacter	Character
+hi def link asnSpecialCharacter	asnSpecial
+hi def link asnNumber		asnValue
+hi def link asnComment		Comment
+hi def link asnLineComment	asnComment
+hi def link asnType		Type
+hi def link asnTypeInfo		PreProc
+hi def link asnValue		Number
+hi def link asnExternal		Include
+hi def link asnTagModifier	Function
+hi def link asnFieldOption	Type
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/syntax/aspvbs.vim b/runtime/syntax/aspvbs.vim
index 07273e190b..f0861d8b5a 100644
--- a/runtime/syntax/aspvbs.vim
+++ b/runtime/syntax/aspvbs.vim
@@ -158,22 +158,20 @@ syn sync match htmlHighlight grouphere htmlTag "%>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-"HiLink AspVBScript		Special
-HiLink AspVBSLineNumber	Comment
-HiLink AspVBSNumber		Number
-HiLink AspVBSError		Error
-HiLink AspVBSStatement	Statement
-HiLink AspVBSString		String
-HiLink AspVBSComment		Comment
-HiLink AspVBSTodo		Todo
-HiLink AspVBSFunction		Identifier
-HiLink AspVBSMethods		PreProc
-HiLink AspVBSEvents		Special
-HiLink AspVBSTypeSpecifier	Type
+"hi def link AspVBScript		Special
+hi def link AspVBSLineNumber	Comment
+hi def link AspVBSNumber		Number
+hi def link AspVBSError		Error
+hi def link AspVBSStatement	Statement
+hi def link AspVBSString		String
+hi def link AspVBSComment		Comment
+hi def link AspVBSTodo		Todo
+hi def link AspVBSFunction		Identifier
+hi def link AspVBSMethods		PreProc
+hi def link AspVBSEvents		Special
+hi def link AspVBSTypeSpecifier	Type
 
-delcommand HiLink
 
 let b:current_syntax = "aspvbs"
 
diff --git a/runtime/syntax/asterisk.vim b/runtime/syntax/asterisk.vim
index c562b85575..4a922d3f11 100644
--- a/runtime/syntax/asterisk.vim
+++ b/runtime/syntax/asterisk.vim
@@ -57,33 +57,31 @@ syn match       asteriskSetting         "^host\s*=\s*\(dynamic\|\(\d\{1,3}\.\d\{
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink        asteriskComment		Comment
-HiLink        asteriskExten		String
-HiLink        asteriskContext         Preproc
-HiLink        asteriskPattern         Type
-HiLink        asteriskApp             Statement
-HiLink        asteriskInclude         Preproc
-HiLink        asteriskIncludeBad	Error
-HiLink        asteriskPriority        Preproc
-HiLink        asteriskLabel           Type
-HiLink        asteriskVar             String
-HiLink        asteriskVarLen          Function
-HiLink        asteriskExp             Type
-HiLink        asteriskCodecsPermit    Preproc
-HiLink        asteriskCodecs          String
-HiLink        asteriskType            Statement
-HiLink        asteriskTypeType        Type
-HiLink        asteriskAuth            String
-HiLink        asteriskAuthType        Type
-HiLink        asteriskIPRange         Identifier
-HiLink        asteriskIP              Identifier
-HiLink        asteriskPort            Identifier
-HiLink        asteriskHostname        Identifier
-HiLink        asteriskSetting         Statement
-HiLink        asteriskError           Error
-delcommand HiLink
+hi def link        asteriskComment		Comment
+hi def link        asteriskExten		String
+hi def link        asteriskContext         Preproc
+hi def link        asteriskPattern         Type
+hi def link        asteriskApp             Statement
+hi def link        asteriskInclude         Preproc
+hi def link        asteriskIncludeBad	Error
+hi def link        asteriskPriority        Preproc
+hi def link        asteriskLabel           Type
+hi def link        asteriskVar             String
+hi def link        asteriskVarLen          Function
+hi def link        asteriskExp             Type
+hi def link        asteriskCodecsPermit    Preproc
+hi def link        asteriskCodecs          String
+hi def link        asteriskType            Statement
+hi def link        asteriskTypeType        Type
+hi def link        asteriskAuth            String
+hi def link        asteriskAuthType        Type
+hi def link        asteriskIPRange         Identifier
+hi def link        asteriskIP              Identifier
+hi def link        asteriskPort            Identifier
+hi def link        asteriskHostname        Identifier
+hi def link        asteriskSetting         Statement
+hi def link        asteriskError           Error
 
 let b:current_syntax = "asterisk" 
 " vim: ts=8 sw=2
diff --git a/runtime/syntax/asteriskvm.vim b/runtime/syntax/asteriskvm.vim
index 357b29936f..fa55af5451 100644
--- a/runtime/syntax/asteriskvm.vim
+++ b/runtime/syntax/asteriskvm.vim
@@ -33,19 +33,17 @@ syn match       comma                   "[,|]" contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink        asteriskvmComment Comment
-HiLink        asteriskvmContext         Identifier
-HiLink        asteriskvmZone            Type
-HiLink        zoneName                String
-HiLink        zoneDef                 String
-HiLink        asteriskvmSetting         Type
-HiLink        asteriskvmSettingBool     Type
+hi def link        asteriskvmComment Comment
+hi def link        asteriskvmContext         Identifier
+hi def link        asteriskvmZone            Type
+hi def link        zoneName                String
+hi def link        zoneDef                 String
+hi def link        asteriskvmSetting         Type
+hi def link        asteriskvmSettingBool     Type
 
-HiLink        asteriskvmMailbox         Statement
-HiLink        mailboxEmail            String
-delcommand HiLink
+hi def link        asteriskvmMailbox         Statement
+hi def link        mailboxEmail            String
 
 let b:current_syntax = "asteriskvm"
 
diff --git a/runtime/syntax/atlas.vim b/runtime/syntax/atlas.vim
index 30e136941f..1cdceab4ce 100644
--- a/runtime/syntax/atlas.vim
+++ b/runtime/syntax/atlas.vim
@@ -59,28 +59,26 @@ syn sync maxlines=100
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink atlasConditional	Conditional
-HiLink atlasRepeat		Repeat
-HiLink atlasStatement	Statement
-HiLink atlasNumber		Number
-HiLink atlasHexNumber	Number
-HiLink atlasOctalNumber	Number
-HiLink atlasBinNumber	Number
-HiLink atlasDecimalNumber	Float
-HiLink atlasFormatString	String
-HiLink atlasString		String
-HiLink atlasComment		Comment
-HiLink atlasComment2		Comment
-HiLink atlasInclude		Include
-HiLink atlasDefine		Macro
-HiLink atlasReserved		PreCondit
-HiLink atlasStorageClass	StorageClass
-HiLink atlasIdentifier	NONE
-HiLink atlasSpecial		Special
+hi def link atlasConditional	Conditional
+hi def link atlasRepeat		Repeat
+hi def link atlasStatement	Statement
+hi def link atlasNumber		Number
+hi def link atlasHexNumber	Number
+hi def link atlasOctalNumber	Number
+hi def link atlasBinNumber	Number
+hi def link atlasDecimalNumber	Float
+hi def link atlasFormatString	String
+hi def link atlasString		String
+hi def link atlasComment		Comment
+hi def link atlasComment2		Comment
+hi def link atlasInclude		Include
+hi def link atlasDefine		Macro
+hi def link atlasReserved		PreCondit
+hi def link atlasStorageClass	StorageClass
+hi def link atlasIdentifier	NONE
+hi def link atlasSpecial		Special
 
-delcommand HiLink
 
 let b:current_syntax = "atlas"
 
diff --git a/runtime/syntax/automake.vim b/runtime/syntax/automake.vim
index b34f7516b2..2a215a9e04 100644
--- a/runtime/syntax/automake.vim
+++ b/runtime/syntax/automake.vim
@@ -54,25 +54,23 @@ syn region  automakeMakeBString start=+`+  skip=+\\`+  end=+`+  contains=makeIde
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink automakePrimary     Statement
-HiLink automakeSecondary   Type
-HiLink automakeExtra       Special
-HiLink automakeOptions     Special
-HiLink automakeClean       Special
-HiLink automakeSubdirs     Statement
-HiLink automakeConditional PreProc
-HiLink automakeSubst       PreProc
-HiLink automakeComment1    makeComment
-HiLink automakeComment2    makeComment
-HiLink automakeMakeError   makeError
-HiLink automakeBadSubst    makeError
-HiLink automakeMakeDString makeDString
-HiLink automakeMakeSString makeSString
-HiLink automakeMakeBString makeBString
+hi def link automakePrimary     Statement
+hi def link automakeSecondary   Type
+hi def link automakeExtra       Special
+hi def link automakeOptions     Special
+hi def link automakeClean       Special
+hi def link automakeSubdirs     Statement
+hi def link automakeConditional PreProc
+hi def link automakeSubst       PreProc
+hi def link automakeComment1    makeComment
+hi def link automakeComment2    makeComment
+hi def link automakeMakeError   makeError
+hi def link automakeBadSubst    makeError
+hi def link automakeMakeDString makeDString
+hi def link automakeMakeSString makeSString
+hi def link automakeMakeBString makeBString
 
-delcommand HiLink
 
 let b:current_syntax = "automake"
 
diff --git a/runtime/syntax/ave.vim b/runtime/syntax/ave.vim
index ae36939364..3e82a8bc9b 100644
--- a/runtime/syntax/ave.vim
+++ b/runtime/syntax/ave.vim
@@ -57,25 +57,23 @@ syn match aveTypos	"!="
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting+yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink aveStatement		Statement
+hi def link aveStatement		Statement
 
-HiLink aveString		String
-HiLink aveNumber		Number
+hi def link aveString		String
+hi def link aveNumber		Number
 
-HiLink aveFixVariables	Special
-HiLink aveVariables		Identifier
-HiLink globalVariables	Special
-HiLink aveConst		Special
+hi def link aveFixVariables	Special
+hi def link aveVariables		Identifier
+hi def link globalVariables	Special
+hi def link aveConst		Special
 
-HiLink aveClassMethods	Function
+hi def link aveClassMethods	Function
 
-HiLink aveOperator		Operator
-HiLink aveComment		Comment
+hi def link aveOperator		Operator
+hi def link aveComment		Comment
 
-HiLink aveTypos		Error
+hi def link aveTypos		Error
 
-delcommand HiLink
 
 let b:current_syntax = "ave"
diff --git a/runtime/syntax/ayacc.vim b/runtime/syntax/ayacc.vim
index 9f5ec566ee..6fb6aec85d 100644
--- a/runtime/syntax/ayacc.vim
+++ b/runtime/syntax/ayacc.vim
@@ -47,28 +47,26 @@ syn match	ayaccSep	"^[ \t]*%}"
 syn match	ayaccCurlyError	"[{}]"
 syn region	ayaccAction	matchgroup=ayaccCurly start="{" end="}" contains=ALLBUT,@ayaccActionGroup
 
-command -nargs=+ HiLink hi def link <args>
 
 " Internal ayacc highlighting links
-HiLink ayaccBrkt	ayaccStmt
-HiLink ayaccKey	ayaccStmt
-HiLink ayaccOper	ayaccStmt
-HiLink ayaccUnionStart	ayaccKey
+hi def link ayaccBrkt	ayaccStmt
+hi def link ayaccKey	ayaccStmt
+hi def link ayaccOper	ayaccStmt
+hi def link ayaccUnionStart	ayaccKey
 
 " External ayacc highlighting links
-HiLink ayaccCurly	Delimiter
-HiLink ayaccCurlyError	Error
-HiLink ayaccDefinition	Function
-HiLink ayaccDelim	Function
-HiLink ayaccKeyActn	Special
-HiLink ayaccSectionSep	Todo
-HiLink ayaccSep	Delimiter
-HiLink ayaccStmt	Statement
-HiLink ayaccType	Type
+hi def link ayaccCurly	Delimiter
+hi def link ayaccCurlyError	Error
+hi def link ayaccDefinition	Function
+hi def link ayaccDelim	Function
+hi def link ayaccKeyActn	Special
+hi def link ayaccSectionSep	Todo
+hi def link ayaccSep	Delimiter
+hi def link ayaccStmt	Statement
+hi def link ayaccType	Type
 
 " since Bram doesn't like my Delimiter :|
-HiLink Delimiter	Type
-delcommand HiLink
+hi def link Delimiter	Type
 
 let b:current_syntax = "ayacc"
 
diff --git a/runtime/syntax/b.vim b/runtime/syntax/b.vim
index 95f5ad7275..01532be75d 100644
--- a/runtime/syntax/b.vim
+++ b/runtime/syntax/b.vim
@@ -68,48 +68,46 @@ syn sync ccomment bComment minlines=10
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink bLabel	Label
-HiLink bUserLabel	Label
-HiLink bConditional	Conditional
-HiLink bRepeat	Repeat
-HiLink bLogic	Special
-HiLink bCharacter	Character
-HiLink bSpecialCharacter bSpecial
-HiLink bNumber	Number
-HiLink bFloat	Float
-HiLink bOctalError	bError
-HiLink bParenError	bError
-" HiLink bInParen	bError
-HiLink bCommentError	bError
-HiLink bBoolean	Identifier
-HiLink bConstant	Identifier
-HiLink bGuard	Identifier
-HiLink bOperator	Operator
-HiLink bKeywords	Operator
-HiLink bOps		Identifier
-HiLink bStructure	Structure
-HiLink bStorageClass	StorageClass
-HiLink bInclude	Include
-HiLink bPreProc	PreProc
-HiLink bDefine	Macro
-HiLink bIncluded	bString
-HiLink bError	Error
-HiLink bStatement	Statement
-HiLink bPreCondit	PreCondit
-HiLink bType		Type
-HiLink bCommentError	bError
-HiLink bCommentString bString
-HiLink bComment2String bString
-HiLink bCommentSkip	bComment
-HiLink bString	String
-HiLink bComment	Comment
-HiLink bSpecial	SpecialChar
-HiLink bTodo		Todo
+hi def link bLabel	Label
+hi def link bUserLabel	Label
+hi def link bConditional	Conditional
+hi def link bRepeat	Repeat
+hi def link bLogic	Special
+hi def link bCharacter	Character
+hi def link bSpecialCharacter bSpecial
+hi def link bNumber	Number
+hi def link bFloat	Float
+hi def link bOctalError	bError
+hi def link bParenError	bError
+" hi def link bInParen	bError
+hi def link bCommentError	bError
+hi def link bBoolean	Identifier
+hi def link bConstant	Identifier
+hi def link bGuard	Identifier
+hi def link bOperator	Operator
+hi def link bKeywords	Operator
+hi def link bOps		Identifier
+hi def link bStructure	Structure
+hi def link bStorageClass	StorageClass
+hi def link bInclude	Include
+hi def link bPreProc	PreProc
+hi def link bDefine	Macro
+hi def link bIncluded	bString
+hi def link bError	Error
+hi def link bStatement	Statement
+hi def link bPreCondit	PreCondit
+hi def link bType		Type
+hi def link bCommentError	bError
+hi def link bCommentString bString
+hi def link bComment2String bString
+hi def link bCommentSkip	bComment
+hi def link bString	String
+hi def link bComment	Comment
+hi def link bSpecial	SpecialChar
+hi def link bTodo		Todo
 "hi link bIdentifier	Identifier
-delcommand HiLink
 
 let b:current_syntax = "b"
 
diff --git a/runtime/syntax/baan.vim b/runtime/syntax/baan.vim
index 917562bcf7..9a42a43918 100644
--- a/runtime/syntax/baan.vim
+++ b/runtime/syntax/baan.vim
@@ -1888,31 +1888,29 @@ syn keyword baanBshell bclm.set.desktop
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink baanConditional	Conditional
-HiLink baan3gl		Statement
-HiLink baan3glpre		PreProc
-HiLink baan4gl		Statement
-HiLink baan4glh		Statement
-HiLink baansql		Statement
-HiLink baansqlh		Statement
-HiLink baanDalHook		Statement
-HiLink baanNumber		Number
-HiLink baanString		String
-HiLink baanOpenStringError	Error
-HiLink baanConstant		Constant
-HiLink baanComment		Comment
-HiLink baanCommenth		Comment
-HiLink baanUncommented	Comment
-HiLink baanDLLUsage		Comment
-HiLink baanFunUsage		Comment
-HiLink baanIdentifier		Normal
-HiLink baanBshell		Function
-HiLink baanType		Type
-HiLink baanStorageClass	StorageClass
+hi def link baanConditional	Conditional
+hi def link baan3gl		Statement
+hi def link baan3glpre		PreProc
+hi def link baan4gl		Statement
+hi def link baan4glh		Statement
+hi def link baansql		Statement
+hi def link baansqlh		Statement
+hi def link baanDalHook		Statement
+hi def link baanNumber		Number
+hi def link baanString		String
+hi def link baanOpenStringError	Error
+hi def link baanConstant		Constant
+hi def link baanComment		Comment
+hi def link baanCommenth		Comment
+hi def link baanUncommented	Comment
+hi def link baanDLLUsage		Comment
+hi def link baanFunUsage		Comment
+hi def link baanIdentifier		Normal
+hi def link baanBshell		Function
+hi def link baanType		Type
+hi def link baanStorageClass	StorageClass
 
-delcommand HiLink
 
 let b:current_syntax = "baan"
 
diff --git a/runtime/syntax/basic.vim b/runtime/syntax/basic.vim
index 6384913e39..488ddc0ec4 100644
--- a/runtime/syntax/basic.vim
+++ b/runtime/syntax/basic.vim
@@ -141,25 +141,23 @@ syn match   basicMathsOperator   "-\|=\|[:<>+\*^/\\]\|AND\|OR"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink basicLabel		Label
-HiLink basicConditional	Conditional
-HiLink basicRepeat		Repeat
-HiLink basicLineNumber	Comment
-HiLink basicNumber		Number
-HiLink basicError		Error
-HiLink basicStatement	Statement
-HiLink basicString		String
-HiLink basicComment		Comment
-HiLink basicSpecial		Special
-HiLink basicTodo		Todo
-HiLink basicFunction		Identifier
-HiLink basicTypeSpecifier Type
-HiLink basicFilenumber basicTypeSpecifier
+hi def link basicLabel		Label
+hi def link basicConditional	Conditional
+hi def link basicRepeat		Repeat
+hi def link basicLineNumber	Comment
+hi def link basicNumber		Number
+hi def link basicError		Error
+hi def link basicStatement	Statement
+hi def link basicString		String
+hi def link basicComment		Comment
+hi def link basicSpecial		Special
+hi def link basicTodo		Todo
+hi def link basicFunction		Identifier
+hi def link basicTypeSpecifier Type
+hi def link basicFilenumber basicTypeSpecifier
 "hi basicMathsOperator term=bold cterm=bold gui=bold
 
-delcommand HiLink
 
 let b:current_syntax = "basic"
 
diff --git a/runtime/syntax/bc.vim b/runtime/syntax/bc.vim
index bf4a62afc9..4cd9d6388a 100644
--- a/runtime/syntax/bc.vim
+++ b/runtime/syntax/bc.vim
@@ -51,18 +51,16 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink bcKeyword		Statement
-HiLink bcType		Type
-HiLink bcConstant		Constant
-HiLink bcNumber		Number
-HiLink bcComment		Comment
-HiLink bcString		String
-HiLink bcSpecialChar		SpecialChar
-HiLink bcParenError		Error
+hi def link bcKeyword		Statement
+hi def link bcType		Type
+hi def link bcConstant		Constant
+hi def link bcNumber		Number
+hi def link bcComment		Comment
+hi def link bcString		String
+hi def link bcSpecialChar		SpecialChar
+hi def link bcParenError		Error
 
-delcommand HiLink
 
 let b:current_syntax = "bc"
 " vim: ts=8
diff --git a/runtime/syntax/bib.vim b/runtime/syntax/bib.vim
index 24b80b51b7..f96553ec8d 100644
--- a/runtime/syntax/bib.vim
+++ b/runtime/syntax/bib.vim
@@ -101,17 +101,15 @@ syn sync minlines=50
 " =====================
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink bibType	Identifier
-HiLink bibEntryKw	Statement
-HiLink bibNSEntryKw	PreProc
-HiLink bibKey		Special
-HiLink bibVariable	Constant
-HiLink bibUnescapedSpecial	Error
-HiLink bibComment	Comment
-HiLink bibComment2	Comment
-delcommand HiLink
+hi def link bibType	Identifier
+hi def link bibEntryKw	Statement
+hi def link bibNSEntryKw	PreProc
+hi def link bibKey		Special
+hi def link bibVariable	Constant
+hi def link bibUnescapedSpecial	Error
+hi def link bibComment	Comment
+hi def link bibComment2	Comment
 
 let b:current_syntax = "bib"
 
diff --git a/runtime/syntax/bindzone.vim b/runtime/syntax/bindzone.vim
index f2372556b1..df3c789d98 100644
--- a/runtime/syntax/bindzone.vim
+++ b/runtime/syntax/bindzone.vim
@@ -68,31 +68,29 @@ syn match       zoneComment     /;.*/
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink zoneDirective    Macro
+hi def link zoneDirective    Macro
 
-HiLink zoneUnknown      Error
+hi def link zoneUnknown      Error
 
-HiLink zoneOrigin       Statement
-HiLink zoneOwnerName    Statement
-HiLink zoneDomain       Identifier
+hi def link zoneOrigin       Statement
+hi def link zoneOwnerName    Statement
+hi def link zoneDomain       Identifier
 
-HiLink zoneSpecial      Special
-HiLink zoneTTL          Constant
-HiLink zoneClass        Include
-HiLink zoneRRType       Type
+hi def link zoneSpecial      Special
+hi def link zoneTTL          Constant
+hi def link zoneClass        Include
+hi def link zoneRRType       Type
 
-HiLink zoneIPAddr       Number
-HiLink zoneIP6Addr      Number
-HiLink zoneText         String
-HiLink zoneNumber       Number
-HiLink zoneSerial       Special
+hi def link zoneIPAddr       Number
+hi def link zoneIP6Addr      Number
+hi def link zoneText         String
+hi def link zoneNumber       Number
+hi def link zoneSerial       Special
 
-HiLink zoneErrParen     Error
-HiLink zoneComment      Comment
+hi def link zoneErrParen     Error
+hi def link zoneComment      Comment
 
-delcommand HiLink
 
 let b:current_syntax = "bindzone"
 
diff --git a/runtime/syntax/blank.vim b/runtime/syntax/blank.vim
index 53ef556a9f..6d2e3fd7bd 100644
--- a/runtime/syntax/blank.vim
+++ b/runtime/syntax/blank.vim
@@ -26,13 +26,11 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink blankInstruction      Statement
-HiLink blankNumber	       Number
-HiLink blankString	       String
+hi def link blankInstruction      Statement
+hi def link blankNumber	       Number
+hi def link blankString	       String
 
-delcommand HiLink
 
 let b:current_syntax = "blank"
 
diff --git a/runtime/syntax/bst.vim b/runtime/syntax/bst.vim
index 995f1da464..5ebef16460 100644
--- a/runtime/syntax/bst.vim
+++ b/runtime/syntax/bst.vim
@@ -54,18 +54,16 @@ syn keyword bstField          volume year
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink bstComment           Comment
-HiLink bstString            String
-HiLink bstCommand           PreProc
-HiLink bstBuiltIn           Statement
-HiLink bstField             Special
-HiLink bstNumber            Number
-HiLink bstType              Type
-HiLink bstIdentifier        Identifier
-HiLink bstError             Error
-delcommand HiLink
+hi def link bstComment           Comment
+hi def link bstString            String
+hi def link bstCommand           PreProc
+hi def link bstBuiltIn           Statement
+hi def link bstField             Special
+hi def link bstNumber            Number
+hi def link bstType              Type
+hi def link bstIdentifier        Identifier
+hi def link bstError             Error
 
 let b:current_syntax = "bst"
 
diff --git a/runtime/syntax/btm.vim b/runtime/syntax/btm.vim
index 133a51b127..4f9253ff9f 100644
--- a/runtime/syntax/btm.vim
+++ b/runtime/syntax/btm.vim
@@ -182,36 +182,34 @@ syn keyword btmCommand	vscrput y
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink btmLabel		Special
-HiLink btmLabelMark		Special
-HiLink btmCmdDivider		Special
-HiLink btmConditional		btmStatement
-HiLink btmDotBoolOp		btmStatement
-HiLink btmRepeat		btmStatement
-HiLink btmEchoCommand	btmStatement
-HiLink btmEchoParam		btmStatement
-HiLink btmStatement		Statement
-HiLink btmTodo		Todo
-HiLink btmString		String
-HiLink btmNumber		Number
-HiLink btmComment		Comment
-HiLink btmArgument		Identifier
-HiLink btmVariable		Identifier
-HiLink btmEcho		String
-HiLink btmBIFMatch		btmStatement
-HiLink btmBuiltInFunc		btmStatement
-HiLink btmBuiltInVar		btmStatement
-HiLink btmSpecialVar		btmStatement
-HiLink btmCommand		btmStatement
+hi def link btmLabel		Special
+hi def link btmLabelMark		Special
+hi def link btmCmdDivider		Special
+hi def link btmConditional		btmStatement
+hi def link btmDotBoolOp		btmStatement
+hi def link btmRepeat		btmStatement
+hi def link btmEchoCommand	btmStatement
+hi def link btmEchoParam		btmStatement
+hi def link btmStatement		Statement
+hi def link btmTodo		Todo
+hi def link btmString		String
+hi def link btmNumber		Number
+hi def link btmComment		Comment
+hi def link btmArgument		Identifier
+hi def link btmVariable		Identifier
+hi def link btmEcho		String
+hi def link btmBIFMatch		btmStatement
+hi def link btmBuiltInFunc		btmStatement
+hi def link btmBuiltInVar		btmStatement
+hi def link btmSpecialVar		btmStatement
+hi def link btmCommand		btmStatement
 
 "optional highlighting
-"HiLink btmShowTab		Error
-"HiLink btmShowTabc		Error
-"hiLink btmIdentifier		Identifier
+"hi def link btmShowTab		Error
+"hi def link btmShowTabc		Error
+"hi def link btmIdentifier		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "btm"
 
diff --git a/runtime/syntax/bzr.vim b/runtime/syntax/bzr.vim
index 11450ba996..43178b8a1a 100644
--- a/runtime/syntax/bzr.vim
+++ b/runtime/syntax/bzr.vim
@@ -38,15 +38,13 @@ syn sync match bzrSync  grouphere bzrRegion "^-\{14} This line and the following
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink bzrRemoved    Constant
-HiLink bzrAdded      Identifier
-HiLink bzrModified   Special
-HiLink bzrRenamed    Special
-HiLink bzrUnchanged  Special
-HiLink bzrUnknown    Special
+hi def link bzrRemoved    Constant
+hi def link bzrAdded      Identifier
+hi def link bzrModified   Special
+hi def link bzrRenamed    Special
+hi def link bzrUnchanged  Special
+hi def link bzrUnknown    Special
 
-delcommand HiLink
 
 let b:current_syntax = "bzr"
diff --git a/runtime/syntax/cabal.vim b/runtime/syntax/cabal.vim
index 0ba2704eba..6641294a31 100644
--- a/runtime/syntax/cabal.vim
+++ b/runtime/syntax/cabal.vim
@@ -103,18 +103,16 @@ syn match	cabalStatement	"\cversion"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cabalVersion       Number
-HiLink cabalTruth         Boolean
-HiLink cabalComment       Comment
-HiLink cabalStatement     Statement
-HiLink cabalCategory      Type
-HiLink cabalFunction      Function
-HiLink cabalConditional   Conditional
-HiLink cabalOperator      Operator
-HiLink cabalCompiler      Constant
-delcommand HiLink
+hi def link cabalVersion       Number
+hi def link cabalTruth         Boolean
+hi def link cabalComment       Comment
+hi def link cabalStatement     Statement
+hi def link cabalCategory      Type
+hi def link cabalFunction      Function
+hi def link cabalConditional   Conditional
+hi def link cabalOperator      Operator
+hi def link cabalCompiler      Constant
 
 let b:current_syntax = "cabal"
 
diff --git a/runtime/syntax/cf.vim b/runtime/syntax/cf.vim
index 63d976d9ce..6310bc3bde 100644
--- a/runtime/syntax/cf.vim
+++ b/runtime/syntax/cf.vim
@@ -379,61 +379,58 @@ syn region	cfqueryTag	contained start=+<cfquery+ end=+>+ keepend contains=cfTagN
 syn region	cfSqlregion	start=+<cfquery\_[^>]*>+ keepend end=+</cfquery>+me=s-1 matchgroup=NONE contains=@cfSql,cfComment,@htmlTagNameCluster,cfqueryTag,cfHashRegion
 
 " Define the highlighting.
-command -nargs=+ CfHiLink hi def link <args>
 
 if exists("d_noinclude_html")
   " The default html-style highlighting copied from html.vim.
-  CfHiLink htmlTag		Function
-  CfHiLink htmlEndTag		Identifier
-  CfHiLink htmlArg		Type
-  CfHiLink htmlTagName		htmlStatement
-  CfHiLink htmlValue		String
-  CfHiLink htmlPreProc		PreProc
-  CfHiLink htmlString		String
-  CfHiLink htmlStatement	Statement
-  CfHiLink htmlValue		String
-  CfHiLink htmlTagError		htmlError
-  CfHiLink htmlError		Error
+  hi def link htmlTag		Function
+  hi def link htmlEndTag		Identifier
+  hi def link htmlArg		Type
+  hi def link htmlTagName		htmlStatement
+  hi def link htmlValue		String
+  hi def link htmlPreProc		PreProc
+  hi def link htmlString		String
+  hi def link htmlStatement	Statement
+  hi def link htmlValue		String
+  hi def link htmlTagError		htmlError
+  hi def link htmlError		Error
 endif
 
-CfHiLink cfTagName		Statement
-CfHiLink cfCustomTagName	Statement
-CfHiLink cfArg			Type
-CfHiLink cfFunctionName		Function
-CfHiLink cfHashRegion		PreProc
-CfHiLink cfComment		Comment
-CfHiLink cfCommentTodo		Todo
-CfHiLink cfOperator		Operator
-CfHiLink cfOperatorMatch	Operator
-CfHiLink cfScope		Title
-CfHiLink cfBool			Constant
+hi def link cfTagName		Statement
+hi def link cfCustomTagName	Statement
+hi def link cfArg			Type
+hi def link cfFunctionName		Function
+hi def link cfHashRegion		PreProc
+hi def link cfComment		Comment
+hi def link cfCommentTodo		Todo
+hi def link cfOperator		Operator
+hi def link cfOperatorMatch	Operator
+hi def link cfScope		Title
+hi def link cfBool			Constant
 
-CfHiLink cfscriptBlock		Special
-CfHiLink cfscriptTag		htmlTag
-CfHiLink cfSetRegion		PreProc
-CfHiLink cfSetLHSRegion		htmlTag
-CfHiLink cfSetTagEnd		htmlTag
+hi def link cfscriptBlock		Special
+hi def link cfscriptTag		htmlTag
+hi def link cfSetRegion		PreProc
+hi def link cfSetLHSRegion		htmlTag
+hi def link cfSetTagEnd		htmlTag
 
-CfHiLink cfScriptLineComment	Comment
-CfHiLink cfScriptComment	Comment
-CfHiLink cfScriptStringS	String
-CfHiLink cfScriptStringD	String
-CfHiLink cfScriptNumber		cfScriptValue
-CfHiLink cfScriptConditional	Conditional
-CfHiLink cfScriptRepeat		Repeat
-CfHiLink cfScriptBranch		Conditional
-CfHiLink cfScriptSpecial	Type
-CfHiLink cfScriptStatement	Statement
-CfHiLink cfScriptBraces		Function
-CfHiLink cfScriptKeyword	Function
-CfHiLink cfScriptError		Error
-CfHiLink cfDeprecatedTag	Error
-CfHiLink cfDeprecatedFunction	Error
-CfHiLink cfScrParenError	cfScriptError
+hi def link cfScriptLineComment	Comment
+hi def link cfScriptComment	Comment
+hi def link cfScriptStringS	String
+hi def link cfScriptStringD	String
+hi def link cfScriptNumber		cfScriptValue
+hi def link cfScriptConditional	Conditional
+hi def link cfScriptRepeat		Repeat
+hi def link cfScriptBranch		Conditional
+hi def link cfScriptSpecial	Type
+hi def link cfScriptStatement	Statement
+hi def link cfScriptBraces		Function
+hi def link cfScriptKeyword	Function
+hi def link cfScriptError		Error
+hi def link cfDeprecatedTag	Error
+hi def link cfDeprecatedFunction	Error
+hi def link cfScrParenError	cfScriptError
 
-CfHiLink cfqueryTag		htmlTag
-
-delcommand CfHiLink
+hi def link cfqueryTag		htmlTag
 
 let b:current_syntax = "cf"
 
diff --git a/runtime/syntax/cfg.vim b/runtime/syntax/cfg.vim
index c57b6f8711..a50297d418 100644
--- a/runtime/syntax/cfg.vim
+++ b/runtime/syntax/cfg.vim
@@ -34,17 +34,15 @@ syn match  CfgComment	"\/\/.*"
 
 " Define the default hightlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink CfgOnOff     Label
-HiLink CfgComment	Comment
-HiLink CfgSection	Type
-HiLink CfgString	String
-HiLink CfgParams    Keyword
-HiLink CfgValues    Constant
-HiLink CfgDirectory Directory
-HiLink UncPath      Directory
+hi def link CfgOnOff     Label
+hi def link CfgComment	Comment
+hi def link CfgSection	Type
+hi def link CfgString	String
+hi def link CfgParams    Keyword
+hi def link CfgValues    Constant
+hi def link CfgDirectory Directory
+hi def link UncPath      Directory
 
-delcommand HiLink
 
 let b:current_syntax = "cfg"
 " vim:ts=8
diff --git a/runtime/syntax/ch.vim b/runtime/syntax/ch.vim
index 05a1fcbdd6..61f475bc99 100644
--- a/runtime/syntax/ch.vim
+++ b/runtime/syntax/ch.vim
@@ -26,14 +26,12 @@ syn keyword	chStructure	class
 syn keyword	chType		string_t array
 
 " Default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink chAccess		chStatement
-HiLink chExceptions		Exception
-HiLink chStatement		Statement
-HiLink chType			Type
-HiLink chStructure		Structure
-delcommand HiLink
+hi def link chAccess		chStatement
+hi def link chExceptions		Exception
+hi def link chStatement		Statement
+hi def link chType			Type
+hi def link chStructure		Structure
 
 let b:current_syntax = "ch"
 
diff --git a/runtime/syntax/change.vim b/runtime/syntax/change.vim
index ae90f348bf..a92767e903 100644
--- a/runtime/syntax/change.vim
+++ b/runtime/syntax/change.vim
@@ -19,12 +19,10 @@ syn region changeToMaterial start="^@y.*$"ms=e+1 end="^@z.*$"me=s-1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink changeFromMaterial String
-HiLink changeToMaterial Statement
+hi def link changeFromMaterial String
+hi def link changeToMaterial Statement
 
-delcommand HiLink
 
 let b:current_syntax = "change"
 
diff --git a/runtime/syntax/changelog.vim b/runtime/syntax/changelog.vim
index fc55fb528f..cf9021ef05 100644
--- a/runtime/syntax/changelog.vim
+++ b/runtime/syntax/changelog.vim
@@ -39,21 +39,19 @@ syn match	changelogNumber	contained "[.-]*[0-9]\+"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink changelogText		Normal
-HiLink changelogBullet	Type
-HiLink changelogColon		Type
-HiLink changelogFiles		Comment
-HiLink changelogFuncs	Comment
-HiLink changelogHeader	Statement
-HiLink changelogMail		Special
-HiLink changelogNumber	Number
-HiLink changelogMonth		Number
-HiLink changelogDay		Number
-HiLink changelogError		Folded
+hi def link changelogText		Normal
+hi def link changelogBullet	Type
+hi def link changelogColon		Type
+hi def link changelogFiles		Comment
+hi def link changelogFuncs	Comment
+hi def link changelogHeader	Statement
+hi def link changelogMail		Special
+hi def link changelogNumber	Number
+hi def link changelogMonth		Number
+hi def link changelogDay		Number
+hi def link changelogError		Folded
 
-delcommand HiLink
 
 let b:current_syntax = "changelog"
 
diff --git a/runtime/syntax/cheetah.vim b/runtime/syntax/cheetah.vim
index c1860def3c..9567ecbbca 100644
--- a/runtime/syntax/cheetah.vim
+++ b/runtime/syntax/cheetah.vim
@@ -34,16 +34,14 @@ syn region  cheetahMultiLineComment start="#\*" end="\*#"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cheetahPlaceHolder Identifier
-HiLink cheetahDirective PreCondit
-HiLink cheetahKeyword Define
-HiLink cheetahContinuation Special
-HiLink cheetahComment Comment
-HiLink cheetahMultiLineComment Comment
+hi def link cheetahPlaceHolder Identifier
+hi def link cheetahDirective PreCondit
+hi def link cheetahKeyword Define
+hi def link cheetahContinuation Special
+hi def link cheetahComment Comment
+hi def link cheetahMultiLineComment Comment
 
-delcommand HiLink
 
 let b:current_syntax = "cheetah"
 
diff --git a/runtime/syntax/chill.vim b/runtime/syntax/chill.vim
index 6ccb32c4c3..b95df68bc8 100644
--- a/runtime/syntax/chill.vim
+++ b/runtime/syntax/chill.vim
@@ -122,58 +122,56 @@ exec "syn sync ccomment chillComment minlines=" . chill_minlines
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink chillLabel	Label
-HiLink chillUserLabel	Label
-HiLink chillConditional	Conditional
-" hi chillConditional	term=bold ctermfg=red guifg=red gui=bold
+hi def link chillLabel	Label
+hi def link chillUserLabel	Label
+hi def link chillConditional	Conditional
+" hi def link chillConditional	term=bold ctermfg=red guifg=red gui=bold
 
-HiLink chillRepeat	Repeat
-HiLink chillProcess	Repeat
-HiLink chillSignal	Repeat
-HiLink chillCharacter	Character
-HiLink chillSpecialCharacter chillSpecial
-HiLink chillNumber	Number
-HiLink chillFloat	Float
-HiLink chillOctalError	chillError
-HiLink chillParenError	chillError
-HiLink chillInParen	chillError
-HiLink chillCommentError	chillError
-HiLink chillSpaceError	chillError
-HiLink chillOperator	Operator
-HiLink chillStructure	Structure
-HiLink chillBlock	Operator
-HiLink chillScope	Operator
-"hi chillEDML     term=underline ctermfg=DarkRed guifg=Red
-HiLink chillEDML	PreProc
-"hi chillBoolConst	term=bold ctermfg=brown guifg=brown
-HiLink chillBoolConst	Constant
-"hi chillLogical	term=bold ctermfg=brown guifg=brown
-HiLink chillLogical	Constant
-HiLink chillStorageClass	StorageClass
-HiLink chillInclude	Include
-HiLink chillPreProc	PreProc
-HiLink chillDefine	Macro
-HiLink chillIncluded	chillString
-HiLink chillError	Error
-HiLink chillStatement	Statement
-HiLink chillPreCondit	PreCondit
-HiLink chillType	Type
-HiLink chillCommentError	chillError
-HiLink chillCommentString chillString
-HiLink chillComment2String chillString
-HiLink chillCommentSkip	chillComment
-HiLink chillString	String
-HiLink chillComment	Comment
-" hi chillComment	term=None ctermfg=lightblue guifg=lightblue
-HiLink chillSpecial	SpecialChar
-HiLink chillTodo	Todo
-HiLink chillBlock	Statement
-"HiLink chillIdentifier	Identifier
-HiLink chillBracket	Delimiter
+hi def link chillRepeat	Repeat
+hi def link chillProcess	Repeat
+hi def link chillSignal	Repeat
+hi def link chillCharacter	Character
+hi def link chillSpecialCharacter chillSpecial
+hi def link chillNumber	Number
+hi def link chillFloat	Float
+hi def link chillOctalError	chillError
+hi def link chillParenError	chillError
+hi def link chillInParen	chillError
+hi def link chillCommentError	chillError
+hi def link chillSpaceError	chillError
+hi def link chillOperator	Operator
+hi def link chillStructure	Structure
+hi def link chillBlock	Operator
+hi def link chillScope	Operator
+"hi def link chillEDML     term=underline ctermfg=DarkRed guifg=Red
+hi def link chillEDML	PreProc
+"hi def link chillBoolConst	term=bold ctermfg=brown guifg=brown
+hi def link chillBoolConst	Constant
+"hi def link chillLogical	term=bold ctermfg=brown guifg=brown
+hi def link chillLogical	Constant
+hi def link chillStorageClass	StorageClass
+hi def link chillInclude	Include
+hi def link chillPreProc	PreProc
+hi def link chillDefine	Macro
+hi def link chillIncluded	chillString
+hi def link chillError	Error
+hi def link chillStatement	Statement
+hi def link chillPreCondit	PreCondit
+hi def link chillType	Type
+hi def link chillCommentError	chillError
+hi def link chillCommentString chillString
+hi def link chillComment2String chillString
+hi def link chillCommentSkip	chillComment
+hi def link chillString	String
+hi def link chillComment	Comment
+" hi def link chillComment	term=None ctermfg=lightblue guifg=lightblue
+hi def link chillSpecial	SpecialChar
+hi def link chillTodo	Todo
+hi def link chillBlock	Statement
+"hi def link chillIdentifier	Identifier
+hi def link chillBracket	Delimiter
 
-delcommand HiLink
 
 let b:current_syntax = "chill"
 
diff --git a/runtime/syntax/cl.vim b/runtime/syntax/cl.vim
index 057d005cae..b765682547 100644
--- a/runtime/syntax/cl.vim
+++ b/runtime/syntax/cl.vim
@@ -69,31 +69,29 @@ syn keyword	clStatement	clear clear_eol clear_eos close copy create unique with
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink clifError	Error
-HiLink clSpaceError	Error
-HiLink clWhile		Repeat
-HiLink clConditional	Conditional
-HiLink clDebug		Debug
-HiLink clNeedsWork	Todo
-HiLink clTodo		Todo
-HiLink clComment	Comment
-HiLink clProcedure	Procedure
-HiLink clBreak		Procedure
-HiLink clInclude	Include
-HiLink clSetOption	Statement
-HiLink clSet		Identifier
-HiLink clPreProc	PreProc
-HiLink clOperator	Operator
-HiLink clNumber		Number
-HiLink clString		String
-HiLink clQuote		Delimiter
-HiLink clReserved	Identifier
-HiLink clFunction	Function
-HiLink clStatement	Statement
+hi def link clifError	Error
+hi def link clSpaceError	Error
+hi def link clWhile		Repeat
+hi def link clConditional	Conditional
+hi def link clDebug		Debug
+hi def link clNeedsWork	Todo
+hi def link clTodo		Todo
+hi def link clComment	Comment
+hi def link clProcedure	Procedure
+hi def link clBreak		Procedure
+hi def link clInclude	Include
+hi def link clSetOption	Statement
+hi def link clSet		Identifier
+hi def link clPreProc	PreProc
+hi def link clOperator	Operator
+hi def link clNumber		Number
+hi def link clString		String
+hi def link clQuote		Delimiter
+hi def link clReserved	Identifier
+hi def link clFunction	Function
+hi def link clStatement	Statement
 
-delcommand HiLink
 
 let b:current_syntax = "cl"
 
diff --git a/runtime/syntax/clean.vim b/runtime/syntax/clean.vim
index 13ddfaba3c..70bf654fb7 100644
--- a/runtime/syntax/clean.vim
+++ b/runtime/syntax/clean.vim
@@ -50,40 +50,38 @@ syn match cleanFuncTypeDef "\([a-zA-Z].*\|(\=[-~@#$%^?!+*<>\/|&=:]\+)\=\)\s*\(in
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
  " Comments
- HiLink cleanComment      Comment
+ hi def link cleanComment      Comment
  " Constants and denotations
- HiLink cleanStringDenot  String
- HiLink cleanCharDenot    Character
- HiLink cleanIntegerDenot Number
- HiLink cleanBoolDenot    Boolean
- HiLink cleanRealDenot    Float
+ hi def link cleanStringDenot  String
+ hi def link cleanCharDenot    Character
+ hi def link cleanIntegerDenot Number
+ hi def link cleanBoolDenot    Boolean
+ hi def link cleanRealDenot    Float
  " Identifiers
  " Statements
- HiLink cleanTypeClass    Keyword
- HiLink cleanConditional  Conditional
- HiLink cleanLabel		Label
- HiLink cleanKeyword      Keyword
+ hi def link cleanTypeClass    Keyword
+ hi def link cleanConditional  Conditional
+ hi def link cleanLabel		Label
+ hi def link cleanKeyword      Keyword
  " Generic Preprocessing
- HiLink cleanIncludeKeyword      Include
- HiLink cleanModuleSystem PreProc
+ hi def link cleanIncludeKeyword      Include
+ hi def link cleanModuleSystem PreProc
  " Type
- HiLink cleanBasicType    Type
- HiLink cleanSpecialType  Type
- HiLink cleanFuncTypeDef  Typedef
+ hi def link cleanBasicType    Type
+ hi def link cleanSpecialType  Type
+ hi def link cleanFuncTypeDef  Typedef
  " Special
- HiLink cleanSpecial      Special
- HiLink cleanList			Special
- HiLink cleanArray		Special
- HiLink cleanRecord		Special
- HiLink cleanTuple		Special
+ hi def link cleanSpecial      Special
+ hi def link cleanList			Special
+ hi def link cleanArray		Special
+ hi def link cleanRecord		Special
+ hi def link cleanTuple		Special
  " Error
  " Todo
- HiLink cleanTodo         Todo
+ hi def link cleanTodo         Todo
 
-delcommand HiLink
 
 let b:current_syntax = "clean"
 
diff --git a/runtime/syntax/clipper.vim b/runtime/syntax/clipper.vim
index 4eb7db2f7a..38ba9a4fe9 100644
--- a/runtime/syntax/clipper.vim
+++ b/runtime/syntax/clipper.vim
@@ -112,23 +112,21 @@ syntax match clipperComment		"^\*.*"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink clipperConditional		Conditional
-HiLink clipperRepeat			Repeat
-HiLink clipperNumber			Number
-HiLink clipperInclude		Include
-HiLink clipperComment		Comment
-HiLink clipperOperator		Operator
-HiLink clipperStorageClass		StorageClass
-HiLink clipperStatement		Statement
-HiLink clipperString			String
-HiLink clipperFunction		Function
-HiLink clipperLineContinuation	Special
-HiLink clipperDelimiters		Delimiter
-HiLink clipperUserVariable		Identifier
+hi def link clipperConditional		Conditional
+hi def link clipperRepeat			Repeat
+hi def link clipperNumber			Number
+hi def link clipperInclude		Include
+hi def link clipperComment		Comment
+hi def link clipperOperator		Operator
+hi def link clipperStorageClass		StorageClass
+hi def link clipperStatement		Statement
+hi def link clipperString			String
+hi def link clipperFunction		Function
+hi def link clipperLineContinuation	Special
+hi def link clipperDelimiters		Delimiter
+hi def link clipperUserVariable		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "clipper"
 
diff --git a/runtime/syntax/cmake.vim b/runtime/syntax/cmake.vim
index 8e73e329e0..4cc21da8fe 100644
--- a/runtime/syntax/cmake.vim
+++ b/runtime/syntax/cmake.vim
@@ -50,23 +50,21 @@ syn keyword cmakeTodo
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cmakeStatement Statement
-HiLink cmakeComment Comment
-HiLink cmakeString String
-HiLink cmakeVariableValue Type
-HiLink cmakeRegistry Underlined
-HiLink cmakeArguments Identifier
-HiLink cmakeArgument Constant
-HiLink cmakeEnvironment Special
-HiLink cmakeOperators Operator
-HiLink cmakeMacro PreProc
-HiLink cmakeError Error
-HiLink cmakeTodo TODO
-HiLink cmakeEscaped Special
+hi def link cmakeStatement Statement
+hi def link cmakeComment Comment
+hi def link cmakeString String
+hi def link cmakeVariableValue Type
+hi def link cmakeRegistry Underlined
+hi def link cmakeArguments Identifier
+hi def link cmakeArgument Constant
+hi def link cmakeEnvironment Special
+hi def link cmakeOperators Operator
+hi def link cmakeMacro PreProc
+hi def link cmakeError Error
+hi def link cmakeTodo TODO
+hi def link cmakeEscaped Special
 
-delcommand HiLink
 
 let b:current_syntax = "cmake"
 
diff --git a/runtime/syntax/cobol.vim b/runtime/syntax/cobol.vim
index a63e8b3873..2d481bba0b 100644
--- a/runtime/syntax/cobol.vim
+++ b/runtime/syntax/cobol.vim
@@ -151,43 +151,41 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cobolBAD      Error
-HiLink cobolBadID    Error
-HiLink cobolBadLine  Error
+hi def link cobolBAD      Error
+hi def link cobolBadID    Error
+hi def link cobolBadLine  Error
 if exists("g:cobol_legacy_code")
-    HiLink cobolMarker   Comment
+    hi def link cobolMarker   Comment
 else
-    HiLink cobolMarker   Error
+    hi def link cobolMarker   Error
 endif
-HiLink cobolCALLs    Function
-HiLink cobolComment  Comment
-HiLink cobolKeys     Comment
-HiLink cobolAreaB    Special
-HiLink cobolCompiler PreProc
-HiLink cobolCondFlow Special
-HiLink cobolCopy     PreProc
-HiLink cobolDeclA    cobolDecl
-HiLink cobolDecl     Type
-HiLink cobolExtras   Special
-HiLink cobolGoTo     Special
-HiLink cobolConstant Constant
-HiLink cobolNumber   Constant
-HiLink cobolPic      Constant
-HiLink cobolReserved Statement
-HiLink cobolDivision Label
-HiLink cobolSection  Label
-HiLink cobolParagraph Label
-HiLink cobolDivisionName  Keyword
-HiLink cobolSectionName   Keyword
-HiLink cobolParagraphName Keyword
-HiLink cobolString   Constant
-HiLink cobolTodo     Todo
-HiLink cobolWatch    Special
-HiLink cobolIndicator Special
+hi def link cobolCALLs    Function
+hi def link cobolComment  Comment
+hi def link cobolKeys     Comment
+hi def link cobolAreaB    Special
+hi def link cobolCompiler PreProc
+hi def link cobolCondFlow Special
+hi def link cobolCopy     PreProc
+hi def link cobolDeclA    cobolDecl
+hi def link cobolDecl     Type
+hi def link cobolExtras   Special
+hi def link cobolGoTo     Special
+hi def link cobolConstant Constant
+hi def link cobolNumber   Constant
+hi def link cobolPic      Constant
+hi def link cobolReserved Statement
+hi def link cobolDivision Label
+hi def link cobolSection  Label
+hi def link cobolParagraph Label
+hi def link cobolDivisionName  Keyword
+hi def link cobolSectionName   Keyword
+hi def link cobolParagraphName Keyword
+hi def link cobolString   Constant
+hi def link cobolTodo     Todo
+hi def link cobolWatch    Special
+hi def link cobolIndicator Special
 
-delcommand HiLink
 
 let b:current_syntax = "cobol"
 
diff --git a/runtime/syntax/config.vim b/runtime/syntax/config.vim
index 1bb5c2f3e9..c6d4e6b363 100644
--- a/runtime/syntax/config.vim
+++ b/runtime/syntax/config.vim
@@ -35,19 +35,17 @@ syn region  configstring matchgroup=configfunction start="AC_MSG_[A-Z]*\ze([^[]"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink configdelimiter Delimiter
-HiLink configoperator  Operator
-HiLink configcomment   Comment
-HiLink configDnl  	 Comment
-HiLink configfunction  Function
-HiLink confignumber    Number
-HiLink configkeyword   Keyword
-HiLink configspecial   Special
-HiLink configstring    String
+hi def link configdelimiter Delimiter
+hi def link configoperator  Operator
+hi def link configcomment   Comment
+hi def link configDnl  	 Comment
+hi def link configfunction  Function
+hi def link confignumber    Number
+hi def link configkeyword   Keyword
+hi def link configspecial   Special
+hi def link configstring    String
 
-delcommand HiLink
 
 let b:current_syntax = "config"
 
diff --git a/runtime/syntax/cpp.vim b/runtime/syntax/cpp.vim
index be7381ea6a..d669206b3e 100644
--- a/runtime/syntax/cpp.vim
+++ b/runtime/syntax/cpp.vim
@@ -53,22 +53,20 @@ endif
 syn match cppMinMax "[<>]?"
 
 " Default highlighting
-command -nargs=+ HiLink hi def link <args>
-HiLink cppAccess		cppStatement
-HiLink cppCast		cppStatement
-HiLink cppExceptions		Exception
-HiLink cppOperator		Operator
-HiLink cppStatement		Statement
-HiLink cppModifier		Type
-HiLink cppType		Type
-HiLink cppStorageClass	StorageClass
-HiLink cppStructure		Structure
-HiLink cppBoolean		Boolean
-HiLink cppConstant		Constant
-HiLink cppRawStringDelimiter	Delimiter
-HiLink cppRawString		String
-HiLink cppNumber		Number
-delcommand HiLink
+hi def link cppAccess		cppStatement
+hi def link cppCast		cppStatement
+hi def link cppExceptions		Exception
+hi def link cppOperator		Operator
+hi def link cppStatement		Statement
+hi def link cppModifier		Type
+hi def link cppType		Type
+hi def link cppStorageClass	StorageClass
+hi def link cppStructure		Structure
+hi def link cppBoolean		Boolean
+hi def link cppConstant		Constant
+hi def link cppRawStringDelimiter	Delimiter
+hi def link cppRawString		String
+hi def link cppNumber		Number
 
 let b:current_syntax = "cpp"
 
diff --git a/runtime/syntax/crontab.vim b/runtime/syntax/crontab.vim
index ed20254925..5e38ffaafe 100644
--- a/runtime/syntax/crontab.vim
+++ b/runtime/syntax/crontab.vim
@@ -37,32 +37,30 @@ syntax match crontabPercent "[^\\]%.*"lc=1 contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink crontabMin		Number
-HiLink crontabHr		PreProc
-HiLink crontabDay		Type
+hi def link crontabMin		Number
+hi def link crontabHr		PreProc
+hi def link crontabDay		Type
 
-HiLink crontabMnth		Number
-HiLink crontabMnth12		Number
-HiLink crontabMnthS		Number
-HiLink crontabMnthN		Number
+hi def link crontabMnth		Number
+hi def link crontabMnth12		Number
+hi def link crontabMnthS		Number
+hi def link crontabMnthN		Number
 
-HiLink crontabDow		PreProc
-HiLink crontabDow7		PreProc
-HiLink crontabDowS		PreProc
-HiLink crontabDowN		PreProc
+hi def link crontabDow		PreProc
+hi def link crontabDow7		PreProc
+hi def link crontabDowS		PreProc
+hi def link crontabDowN		PreProc
 
-HiLink crontabNick		Special
-HiLink crontabVar		Identifier
-HiLink crontabPercent		Special
+hi def link crontabNick		Special
+hi def link crontabVar		Identifier
+hi def link crontabPercent		Special
 
 " comment out next line for to suppress unix commands coloring.
-HiLink crontabCmd		Statement
+hi def link crontabCmd		Statement
 
-HiLink crontabCmnt		Comment
+hi def link crontabCmnt		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "crontab"
 
diff --git a/runtime/syntax/csc.vim b/runtime/syntax/csc.vim
index f4ce62c876..6e5d8b9f37 100644
--- a/runtime/syntax/csc.vim
+++ b/runtime/syntax/csc.vim
@@ -156,35 +156,33 @@ exec "sy sync ccomment cscComment minlines=" . csc_minlines
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 hi cscVarName term=bold ctermfg=9 gui=bold guifg=blue
 
-HiLink	cscNumber	Number
-HiLink	cscOctal	Number
-HiLink	cscFloat	Float
-HiLink	cscParenE	Error
-HiLink	cscCommentE	Error
-HiLink	cscSpaceE	Error
-HiLink	cscError	Error
-HiLink	cscString	String
-HiLink	cscComment	Comment
-HiLink	cscTodo		Todo
-HiLink	cscStatement	Statement
-HiLink	cscIfError	Error
-HiLink	cscEqError	Error
-HiLink	cscFunction	Statement
-HiLink	cscCondition	Statement
-HiLink	cscWarn		WarningMsg
+hi def link cscNumber	Number
+hi def link cscOctal	Number
+hi def link cscFloat	Float
+hi def link cscParenE	Error
+hi def link cscCommentE	Error
+hi def link cscSpaceE	Error
+hi def link cscError	Error
+hi def link cscString	String
+hi def link cscComment	Comment
+hi def link cscTodo		Todo
+hi def link cscStatement	Statement
+hi def link cscIfError	Error
+hi def link cscEqError	Error
+hi def link cscFunction	Statement
+hi def link cscCondition	Statement
+hi def link cscWarn		WarningMsg
 
-HiLink	cscComE	Error
-HiLink	cscCom	Statement
-HiLink	cscComW	WarningMsg
+hi def link cscComE	Error
+hi def link cscCom	Statement
+hi def link cscComW	WarningMsg
 
-HiLink	cscBPMacro	Identifier
-HiLink	cscBPW		WarningMsg
+hi def link cscBPMacro	Identifier
+hi def link cscBPW		WarningMsg
 
-delcommand HiLink
 
 let b:current_syntax = "csc"
 
diff --git a/runtime/syntax/csh.vim b/runtime/syntax/csh.vim
index 973a3550dc..c134aa7ef3 100644
--- a/runtime/syntax/csh.vim
+++ b/runtime/syntax/csh.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	C-shell (csh)
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:	11
+" Last Change:	Aug 31, 2016
+" Version:	13
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_CSH
 
 " quit when a syntax file was already loaded
@@ -100,44 +100,43 @@ syn match cshNumber	"-\=\<\d\+\>"
 syn region cshHereDoc matchgroup=cshRedir start="<<-\=\s*\**\z(\h\w*\)\**" matchgroup=cshRedir end="^\z1$"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_csh_syntax_inits")
 
-HiLink cshArgv		cshVariables
-HiLink cshBckQuote	cshCommand
-HiLink cshDblQuote	cshString
-HiLink cshExtVar	cshVariables
-HiLink cshHereDoc	cshString
-HiLink cshNoEndlineBQ	cshNoEndline
-HiLink cshNoEndlineDQ	cshNoEndline
-HiLink cshNoEndlineSQ	cshNoEndline
-HiLink cshQtyWord	cshVariables
-HiLink cshRedir		cshOperator
-HiLink cshSelector	cshVariables
-HiLink cshSetStmt	cshStatement
-HiLink cshSetVariables	cshVariables
-HiLink cshSnglQuote	cshString
-HiLink cshSubst		cshVariables
+  hi def link cshArgv		cshVariables
+  hi def link cshBckQuote	cshCommand
+  hi def link cshDblQuote	cshString
+  hi def link cshExtVar	cshVariables
+  hi def link cshHereDoc	cshString
+  hi def link cshNoEndlineBQ	cshNoEndline
+  hi def link cshNoEndlineDQ	cshNoEndline
+  hi def link cshNoEndlineSQ	cshNoEndline
+  hi def link cshQtyWord	cshVariables
+  hi def link cshRedir		cshOperator
+  hi def link cshSelector	cshVariables
+  hi def link cshSetStmt	cshStatement
+  hi def link cshSetVariables	cshVariables
+  hi def link cshSnglQuote	cshString
+  hi def link cshSubst		cshVariables
 
-HiLink cshCommand	Statement
-HiLink cshComment	Comment
-HiLink cshConditional	Conditional
-HiLink cshIdentifier	Error
-HiLink cshModifier	Special
-HiLink cshNoEndline	Error
-HiLink cshNumber	Number
-HiLink cshOperator	Operator
-HiLink cshRedir		Statement
-HiLink cshRepeat	Repeat
-HiLink cshShellVariables	Special
-HiLink cshSpecial	Special
-HiLink cshStatement	Statement
-HiLink cshString	String
-HiLink cshSubstError	Error
-HiLink cshTodo		Todo
-HiLink cshVariables	Type
+  hi def link cshCommand	Statement
+  hi def link cshComment	Comment
+  hi def link cshConditional	Conditional
+  hi def link cshIdentifier	Error
+  hi def link cshModifier	Special
+  hi def link cshNoEndline	Error
+  hi def link cshNumber	Number
+  hi def link cshOperator	Operator
+  hi def link cshRedir		Statement
+  hi def link cshRepeat	Repeat
+  hi def link cshShellVariables	Special
+  hi def link cshSpecial	Special
+  hi def link cshStatement	Statement
+  hi def link cshString	String
+  hi def link cshSubstError	Error
+  hi def link cshTodo		Todo
+  hi def link cshVariables	Type
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "csh"
 
diff --git a/runtime/syntax/csp.vim b/runtime/syntax/csp.vim
index a5460cddbb..8001b1fe7e 100644
--- a/runtime/syntax/csp.vim
+++ b/runtime/syntax/csp.vim
@@ -147,37 +147,35 @@ syn sync lines=250
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
 " (For vim version <=5.7, the command groups are defined in
 " $VIMRUNTIME/syntax/synload.vim )
-HiLink cspComment			Comment
-HiLink cspNumber			Number
-HiLink cspConditional			Conditional
-HiLink cspOperator			Delimiter
-HiLink cspKeyword			Keyword
-HiLink cspReserved			SpecialChar
-HiLink cspInclude			Error
-HiLink cspIncludeKeyword		Include
-HiLink cspIncludeArg			Include
-HiLink cspAssert			PreCondit
-HiLink cspType			Type
-HiLink cspProcess			Function
-HiLink cspTodo			Todo
-HiLink cspOldRttComment		Define
-HiLink cspRttPragmaKeyword		Define
-HiLink cspSdlRttComment		Define
-HiLink cspRttPragmaArg		Define
-HiLink cspRttPragmaSdlArg		Define
-HiLink cspRttPragmaSdlName		Default
-HiLink cspRttPragmaSdlTailArg		Define
-HiLink cspRttPragmaSdlTransName	Default
-HiLink cspRttPragmaSdlTransTailArg	Define
-HiLink cspReservedIdentifier	Error
+hi def link cspComment			Comment
+hi def link cspNumber			Number
+hi def link cspConditional			Conditional
+hi def link cspOperator			Delimiter
+hi def link cspKeyword			Keyword
+hi def link cspReserved			SpecialChar
+hi def link cspInclude			Error
+hi def link cspIncludeKeyword		Include
+hi def link cspIncludeArg			Include
+hi def link cspAssert			PreCondit
+hi def link cspType			Type
+hi def link cspProcess			Function
+hi def link cspTodo			Todo
+hi def link cspOldRttComment		Define
+hi def link cspRttPragmaKeyword		Define
+hi def link cspSdlRttComment		Define
+hi def link cspRttPragmaArg		Define
+hi def link cspRttPragmaSdlArg		Define
+hi def link cspRttPragmaSdlName		Default
+hi def link cspRttPragmaSdlTailArg		Define
+hi def link cspRttPragmaSdlTransName	Default
+hi def link cspRttPragmaSdlTransTailArg	Define
+hi def link cspReservedIdentifier	Error
 " (Currently unused vim method: Debug)
 
-delcommand HiLink
 
 let b:current_syntax = "csp"
 
diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim
index e8c2c85318..3dc3f5c2d6 100644
--- a/runtime/syntax/css.vim
+++ b/runtime/syntax/css.vim
@@ -514,130 +514,128 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cssComment Comment
-HiLink cssVendor Comment
-HiLink cssHacks Comment
-HiLink cssTagName Statement
-HiLink cssDeprecated Error
-HiLink cssSelectorOp Special
-HiLink cssSelectorOp2 Special
-HiLink cssAttrComma Special
+hi def link cssComment Comment
+hi def link cssVendor Comment
+hi def link cssHacks Comment
+hi def link cssTagName Statement
+hi def link cssDeprecated Error
+hi def link cssSelectorOp Special
+hi def link cssSelectorOp2 Special
+hi def link cssAttrComma Special
 
-HiLink cssAnimationProp cssProp
-HiLink cssBackgroundProp cssProp
-HiLink cssBorderProp cssProp
-HiLink cssBoxProp cssProp
-HiLink cssColorProp cssProp
-HiLink cssContentForPagedMediaProp cssProp
-HiLink cssDimensionProp cssProp
-HiLink cssFlexibleBoxProp cssProp
-HiLink cssFontProp cssProp
-HiLink cssGeneratedContentProp cssProp
-HiLink cssGridProp cssProp
-HiLink cssHyerlinkProp cssProp
-HiLink cssLineboxProp cssProp
-HiLink cssListProp cssProp
-HiLink cssMarqueeProp cssProp
-HiLink cssMultiColumnProp cssProp
-HiLink cssPagedMediaProp cssProp
-HiLink cssPositioningProp cssProp
-HiLink cssPrintProp cssProp
-HiLink cssRubyProp cssProp
-HiLink cssSpeechProp cssProp
-HiLink cssTableProp cssProp
-HiLink cssTextProp cssProp
-HiLink cssTransformProp cssProp
-HiLink cssTransitionProp cssProp
-HiLink cssUIProp cssProp
-HiLink cssIEUIProp cssProp
-HiLink cssAuralProp cssProp
-HiLink cssRenderProp cssProp
-HiLink cssMobileTextProp cssProp
+hi def link cssAnimationProp cssProp
+hi def link cssBackgroundProp cssProp
+hi def link cssBorderProp cssProp
+hi def link cssBoxProp cssProp
+hi def link cssColorProp cssProp
+hi def link cssContentForPagedMediaProp cssProp
+hi def link cssDimensionProp cssProp
+hi def link cssFlexibleBoxProp cssProp
+hi def link cssFontProp cssProp
+hi def link cssGeneratedContentProp cssProp
+hi def link cssGridProp cssProp
+hi def link cssHyerlinkProp cssProp
+hi def link cssLineboxProp cssProp
+hi def link cssListProp cssProp
+hi def link cssMarqueeProp cssProp
+hi def link cssMultiColumnProp cssProp
+hi def link cssPagedMediaProp cssProp
+hi def link cssPositioningProp cssProp
+hi def link cssPrintProp cssProp
+hi def link cssRubyProp cssProp
+hi def link cssSpeechProp cssProp
+hi def link cssTableProp cssProp
+hi def link cssTextProp cssProp
+hi def link cssTransformProp cssProp
+hi def link cssTransitionProp cssProp
+hi def link cssUIProp cssProp
+hi def link cssIEUIProp cssProp
+hi def link cssAuralProp cssProp
+hi def link cssRenderProp cssProp
+hi def link cssMobileTextProp cssProp
 
-HiLink cssAnimationAttr cssAttr
-HiLink cssBackgroundAttr cssAttr
-HiLink cssBorderAttr cssAttr
-HiLink cssBoxAttr cssAttr
-HiLink cssContentForPagedMediaAttr cssAttr
-HiLink cssDimensionAttr cssAttr
-HiLink cssFlexibleBoxAttr cssAttr
-HiLink cssFontAttr cssAttr
-HiLink cssGeneratedContentAttr cssAttr
-HiLink cssGridAttr cssAttr
-HiLink cssHyerlinkAttr cssAttr
-HiLink cssLineboxAttr cssAttr
-HiLink cssListAttr cssAttr
-HiLink cssMarginAttr cssAttr
-HiLink cssMarqueeAttr cssAttr
-HiLink cssMultiColumnAttr cssAttr
-HiLink cssPaddingAttr cssAttr
-HiLink cssPagedMediaAttr cssAttr
-HiLink cssPositioningAttr cssAttr
-HiLink cssGradientAttr cssAttr
-HiLink cssPrintAttr cssAttr
-HiLink cssRubyAttr cssAttr
-HiLink cssSpeechAttr cssAttr
-HiLink cssTableAttr cssAttr
-HiLink cssTextAttr cssAttr
-HiLink cssTransformAttr cssAttr
-HiLink cssTransitionAttr cssAttr
-HiLink cssUIAttr cssAttr
-HiLink cssIEUIAttr cssAttr
-HiLink cssAuralAttr cssAttr
-HiLink cssRenderAttr cssAttr
-HiLink cssCommonAttr cssAttr
+hi def link cssAnimationAttr cssAttr
+hi def link cssBackgroundAttr cssAttr
+hi def link cssBorderAttr cssAttr
+hi def link cssBoxAttr cssAttr
+hi def link cssContentForPagedMediaAttr cssAttr
+hi def link cssDimensionAttr cssAttr
+hi def link cssFlexibleBoxAttr cssAttr
+hi def link cssFontAttr cssAttr
+hi def link cssGeneratedContentAttr cssAttr
+hi def link cssGridAttr cssAttr
+hi def link cssHyerlinkAttr cssAttr
+hi def link cssLineboxAttr cssAttr
+hi def link cssListAttr cssAttr
+hi def link cssMarginAttr cssAttr
+hi def link cssMarqueeAttr cssAttr
+hi def link cssMultiColumnAttr cssAttr
+hi def link cssPaddingAttr cssAttr
+hi def link cssPagedMediaAttr cssAttr
+hi def link cssPositioningAttr cssAttr
+hi def link cssGradientAttr cssAttr
+hi def link cssPrintAttr cssAttr
+hi def link cssRubyAttr cssAttr
+hi def link cssSpeechAttr cssAttr
+hi def link cssTableAttr cssAttr
+hi def link cssTextAttr cssAttr
+hi def link cssTransformAttr cssAttr
+hi def link cssTransitionAttr cssAttr
+hi def link cssUIAttr cssAttr
+hi def link cssIEUIAttr cssAttr
+hi def link cssAuralAttr cssAttr
+hi def link cssRenderAttr cssAttr
+hi def link cssCommonAttr cssAttr
 
-HiLink cssPseudoClassId PreProc
-HiLink cssPseudoClassLang Constant
-HiLink cssValueLength Number
-HiLink cssValueInteger Number
-HiLink cssValueNumber Number
-HiLink cssValueAngle Number
-HiLink cssValueTime Number
-HiLink cssValueFrequency Number
-HiLink cssFunction Constant
-HiLink cssURL String
-HiLink cssFunctionName Function
-HiLink cssFunctionComma Function
-HiLink cssColor Constant
-HiLink cssIdentifier Function
-HiLink cssInclude Include
-HiLink cssIncludeKeyword atKeyword
-HiLink cssImportant Special
-HiLink cssBraces Function
-HiLink cssBraceError Error
-HiLink cssError Error
-HiLink cssUnicodeEscape Special
-HiLink cssStringQQ String
-HiLink cssStringQ String
-HiLink cssAttributeSelector String
-HiLink cssMedia atKeyword
-HiLink cssMediaType Special
-HiLink cssMediaComma Normal
-HiLink cssMediaKeyword Statement
-HiLink cssMediaProp cssProp
-HiLink cssMediaAttr cssAttr
-HiLink cssPage atKeyword
-HiLink cssPagePseudo PreProc
-HiLink cssPageMargin atKeyword
-HiLink cssPageProp cssProp
-HiLink cssKeyFrame atKeyword
-HiLink cssKeyFrameSelector Constant
-HiLink cssFontDescriptor Special
-HiLink cssFontDescriptorFunction Constant
-HiLink cssFontDescriptorProp cssProp
-HiLink cssFontDescriptorAttr cssAttr
-HiLink cssUnicodeRange Constant
-HiLink cssClassName Function
-HiLink cssClassNameDot Function
-HiLink cssProp StorageClass
-HiLink cssAttr Constant
-HiLink cssUnitDecorators Number
-HiLink cssNoise Noise
-HiLink atKeyword PreProc
-delcommand HiLink
+hi def link cssPseudoClassId PreProc
+hi def link cssPseudoClassLang Constant
+hi def link cssValueLength Number
+hi def link cssValueInteger Number
+hi def link cssValueNumber Number
+hi def link cssValueAngle Number
+hi def link cssValueTime Number
+hi def link cssValueFrequency Number
+hi def link cssFunction Constant
+hi def link cssURL String
+hi def link cssFunctionName Function
+hi def link cssFunctionComma Function
+hi def link cssColor Constant
+hi def link cssIdentifier Function
+hi def link cssInclude Include
+hi def link cssIncludeKeyword atKeyword
+hi def link cssImportant Special
+hi def link cssBraces Function
+hi def link cssBraceError Error
+hi def link cssError Error
+hi def link cssUnicodeEscape Special
+hi def link cssStringQQ String
+hi def link cssStringQ String
+hi def link cssAttributeSelector String
+hi def link cssMedia atKeyword
+hi def link cssMediaType Special
+hi def link cssMediaComma Normal
+hi def link cssMediaKeyword Statement
+hi def link cssMediaProp cssProp
+hi def link cssMediaAttr cssAttr
+hi def link cssPage atKeyword
+hi def link cssPagePseudo PreProc
+hi def link cssPageMargin atKeyword
+hi def link cssPageProp cssProp
+hi def link cssKeyFrame atKeyword
+hi def link cssKeyFrameSelector Constant
+hi def link cssFontDescriptor Special
+hi def link cssFontDescriptorFunction Constant
+hi def link cssFontDescriptorProp cssProp
+hi def link cssFontDescriptorAttr cssAttr
+hi def link cssUnicodeRange Constant
+hi def link cssClassName Function
+hi def link cssClassNameDot Function
+hi def link cssProp StorageClass
+hi def link cssAttr Constant
+hi def link cssUnitDecorators Number
+hi def link cssNoise Noise
+hi def link atKeyword PreProc
 
 let b:current_syntax = "css"
 
diff --git a/runtime/syntax/cterm.vim b/runtime/syntax/cterm.vim
index 8510f62cc7..1b6cb2893f 100644
--- a/runtime/syntax/cterm.vim
+++ b/runtime/syntax/cterm.vim
@@ -140,39 +140,37 @@ syn match   ctermSpecialCharacter	"'\\.'"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ctermStatement		Statement
-HiLink ctermFunction		Statement
-HiLink ctermStrFunction	Statement
-HiLink ctermIntFunction	Statement
-HiLink ctermLabel		Statement
-HiLink ctermConditional	Statement
-HiLink ctermRepeat		Statement
-HiLink ctermLibFunc		UserDefFunc
-HiLink ctermType		Type
-HiLink ctermFuncArg		PreCondit
+hi def link ctermStatement		Statement
+hi def link ctermFunction		Statement
+hi def link ctermStrFunction	Statement
+hi def link ctermIntFunction	Statement
+hi def link ctermLabel		Statement
+hi def link ctermConditional	Statement
+hi def link ctermRepeat		Statement
+hi def link ctermLibFunc		UserDefFunc
+hi def link ctermType		Type
+hi def link ctermFuncArg		PreCondit
 
-HiLink ctermPreVarRO		PreCondit
-HiLink ctermPreVarRW		PreConditBold
-HiLink ctermVar		Type
+hi def link ctermPreVarRO		PreCondit
+hi def link ctermPreVarRW		PreConditBold
+hi def link ctermVar		Type
 
-HiLink ctermComment		Comment
+hi def link ctermComment		Comment
 
-HiLink ctermCharacter		SpecialChar
-HiLink ctermSpecial		Special
-HiLink ctermSpecialCharacter	SpecialChar
-HiLink ctermSymbols		Special
-HiLink ctermString		String
-HiLink ctermTodo		Todo
-HiLink ctermOperator		Statement
-HiLink ctermNumber		Number
+hi def link ctermCharacter		SpecialChar
+hi def link ctermSpecial		Special
+hi def link ctermSpecialCharacter	SpecialChar
+hi def link ctermSymbols		Special
+hi def link ctermString		String
+hi def link ctermTodo		Todo
+hi def link ctermOperator		Statement
+hi def link ctermNumber		Number
 
 " redefine the colors
 "hi PreConditBold	term=bold ctermfg=1 cterm=bold guifg=Purple gui=bold
 "hi Special	term=bold ctermfg=6 guifg=SlateBlue gui=underline
 
-delcommand HiLink
 
 let b:current_syntax = "cterm"
 
diff --git a/runtime/syntax/cupl.vim b/runtime/syntax/cupl.vim
index 58540b63d4..5b93b0db93 100644
--- a/runtime/syntax/cupl.vim
+++ b/runtime/syntax/cupl.vim
@@ -93,30 +93,28 @@ syn sync minlines=1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink cuplHeader	cuplStatement
-HiLink cuplLogicalOperator	 cuplOperator
-HiLink cuplRangeOperator	 cuplOperator
-HiLink cuplArithmeticOperator cuplOperator
-HiLink cuplAssignmentOperator cuplOperator
-HiLink cuplEqualityOperator	 cuplOperator
-HiLink cuplTruthTableOperator cuplOperator
-HiLink cuplOperator	cuplStatement
-HiLink cuplFunction	cuplStatement
-HiLink cuplStatement Statement
-HiLink cuplNumberRange cuplNumber
-HiLink cuplNumber	  cuplString
-HiLink cuplString	String
-HiLink cuplComment	Comment
-HiLink cuplExtension   cuplSpecial
-HiLink cuplSpecialChar cuplSpecial
-HiLink cuplSpecial	Special
-HiLink cuplDirective PreProc
-HiLink cuplTodo	Todo
+hi def link cuplHeader	cuplStatement
+hi def link cuplLogicalOperator	 cuplOperator
+hi def link cuplRangeOperator	 cuplOperator
+hi def link cuplArithmeticOperator cuplOperator
+hi def link cuplAssignmentOperator cuplOperator
+hi def link cuplEqualityOperator	 cuplOperator
+hi def link cuplTruthTableOperator cuplOperator
+hi def link cuplOperator	cuplStatement
+hi def link cuplFunction	cuplStatement
+hi def link cuplStatement Statement
+hi def link cuplNumberRange cuplNumber
+hi def link cuplNumber	  cuplString
+hi def link cuplString	String
+hi def link cuplComment	Comment
+hi def link cuplExtension   cuplSpecial
+hi def link cuplSpecialChar cuplSpecial
+hi def link cuplSpecial	Special
+hi def link cuplDirective PreProc
+hi def link cuplTodo	Todo
 
-delcommand HiLink
 
 let b:current_syntax = "cupl"
 
diff --git a/runtime/syntax/cuplsim.vim b/runtime/syntax/cuplsim.vim
index d0c9ec34f5..36eb4c3555 100644
--- a/runtime/syntax/cuplsim.vim
+++ b/runtime/syntax/cuplsim.vim
@@ -47,19 +47,17 @@ syn sync minlines=1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " append to the highlighting links in cupl.vim
 " The default highlighting.
-HiLink cuplsimOrder		cuplStatement
-HiLink cuplsimBase		cuplStatement
-HiLink cuplsimBaseType	cuplStatement
-HiLink cuplsimVectors		cuplStatement
-HiLink cuplsimStimulus	cuplNumber
-HiLink cuplsimOutput		cuplNumber
-HiLink cuplsimOrderFormat	cuplNumber
+hi def link cuplsimOrder		cuplStatement
+hi def link cuplsimBase		cuplStatement
+hi def link cuplsimBaseType	cuplStatement
+hi def link cuplsimVectors		cuplStatement
+hi def link cuplsimStimulus	cuplNumber
+hi def link cuplsimOutput		cuplNumber
+hi def link cuplsimOrderFormat	cuplNumber
 
-delcommand HiLink
 
 let b:current_syntax = "cuplsim"
 " vim:ts=8
diff --git a/runtime/syntax/cvs.vim b/runtime/syntax/cvs.vim
index 4a01c2b8a8..3eac191637 100644
--- a/runtime/syntax/cvs.vim
+++ b/runtime/syntax/cvs.vim
@@ -18,15 +18,13 @@ syn match cvsDir   contained "\S\+$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cvsLine		Comment
-HiLink cvsDir		cvsFile
-HiLink cvsFile		Constant
-HiLink cvsFiles		cvsCom
-HiLink cvsTag		cvsCom
-HiLink cvsCom		Statement
+hi def link cvsLine		Comment
+hi def link cvsDir		cvsFile
+hi def link cvsFile		Constant
+hi def link cvsFiles		cvsCom
+hi def link cvsTag		cvsCom
+hi def link cvsCom		Statement
 
-delcommand HiLink
 
 let b:current_syntax = "cvs"
diff --git a/runtime/syntax/cweb.vim b/runtime/syntax/cweb.vim
index 1d6e0fdec6..4e06b3646d 100644
--- a/runtime/syntax/cweb.vim
+++ b/runtime/syntax/cweb.vim
@@ -57,11 +57,9 @@ syntax match webIgnoredStuff "@@"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink webRestrictedTeX String
+hi def link webRestrictedTeX String
 
-delcommand HiLink
 
 let b:current_syntax = "cweb"
 
diff --git a/runtime/syntax/cynlib.vim b/runtime/syntax/cynlib.vim
index 5338c613d9..24ad2a2e31 100644
--- a/runtime/syntax/cynlib.vim
+++ b/runtime/syntax/cynlib.vim
@@ -63,14 +63,12 @@ syn keyword	cynlibType	   In Out InST OutST Int Uint Const Cynclock
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cynlibOperator   Operator
-HiLink cynlibMacro      Statement
-HiLink cynlibFunction   Statement
-HiLink cynlibppMacro      Statement
-HiLink cynlibType       Type
+hi def link cynlibOperator   Operator
+hi def link cynlibMacro      Statement
+hi def link cynlibFunction   Statement
+hi def link cynlibppMacro      Statement
+hi def link cynlibType       Type
 
-delcommand HiLink
 
 let b:current_syntax = "cynlib"
diff --git a/runtime/syntax/cynpp.vim b/runtime/syntax/cynpp.vim
index ee54eb6a44..3064b11a63 100644
--- a/runtime/syntax/cynpp.vim
+++ b/runtime/syntax/cynpp.vim
@@ -42,11 +42,9 @@ syn keyword     cynppMacro      Instantiate
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink cLabel		Label
-HiLink cynppMacro  Statement
+hi def link cLabel		Label
+hi def link cynppMacro  Statement
 
-delcommand HiLink
 
 let b:current_syntax = "cynpp"
diff --git a/runtime/syntax/dcd.vim b/runtime/syntax/dcd.vim
index bde1d3d95e..058d272375 100644
--- a/runtime/syntax/dcd.vim
+++ b/runtime/syntax/dcd.vim
@@ -38,16 +38,14 @@ syn region  dcdComment		start="\*" end="\;"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dcdFunction		Identifier
-HiLink dcdLabel		Constant
-HiLink dcdConditional		Conditional
-HiLink dcdDisplay		Type
-HiLink dcdStatement		Statement
-HiLink dcdSpecial		Special
-HiLink dcdComment		Comment
+hi def link dcdFunction		Identifier
+hi def link dcdLabel		Constant
+hi def link dcdConditional		Conditional
+hi def link dcdDisplay		Type
+hi def link dcdStatement		Statement
+hi def link dcdSpecial		Special
+hi def link dcdComment		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "dcd"
diff --git a/runtime/syntax/dcl.vim b/runtime/syntax/dcl.vim
index 621c70f470..b973db3434 100644
--- a/runtime/syntax/dcl.vim
+++ b/runtime/syntax/dcl.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	DCL (Digital Command Language - vms)
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	May 02, 2016
-" Version:	9
+" Last Change:	Aug 31, 2016
+" Version:	11
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_DCL
 
 " quit when a syntax file was already loaded
@@ -108,42 +108,41 @@ syn region  dclFuncList	matchgroup=Delimiter start="(" matchgroup=Delimiter end=
 syn match   dclError	")"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_dcl_syntax_inits")
 
-HiLink dclLogOper	dclError
-HiLink dclLogical	dclOper
-HiLink dclLogSep	dclSep
+ hi def link dclLogOper	dclError
+ hi def link dclLogical	dclOper
+ hi def link dclLogSep	dclSep
 
-HiLink dclAssign	Operator
-HiLink dclCmdProc	Special
-HiLink dclCmdProcStart	Operator
-HiLink dclComment	Comment
-HiLink dclContinue	Statement
-HiLink dclDevice	Identifier
-HiLink dclDirPath	Identifier
-HiLink dclDirPath	Identifier
-HiLink dclDirSep	Delimiter
-HiLink dclError	Error
-HiLink dclExe		Statement
-HiLink dclFilename	NONE
-HiLink dclGotoLabel	Label
-HiLink dclInstr	Statement
-HiLink dclLexical	Function
-HiLink dclMdfy	Type
-HiLink dclMdfyBrkt	Delimiter
-HiLink dclMdfySep	Delimiter
-HiLink dclMdfySet	Type
-HiLink dclMdfySetString	String
-HiLink dclNumber	Number
-HiLink dclOper	Operator
-HiLink dclParam	Special
-HiLink dclSep		Delimiter
-HiLink dclStart	Delimiter
-HiLink dclString	String
-HiLink dclTodo	Todo
+ hi def link dclAssign	Operator
+ hi def link dclCmdProc	Special
+ hi def link dclCmdProcStart	Operator
+ hi def link dclComment	Comment
+ hi def link dclContinue	Statement
+ hi def link dclDevice	Identifier
+ hi def link dclDirPath	Identifier
+ hi def link dclDirPath	Identifier
+ hi def link dclDirSep	Delimiter
+ hi def link dclError	Error
+ hi def link dclExe		Statement
+ hi def link dclFilename	NONE
+ hi def link dclGotoLabel	Label
+ hi def link dclInstr	Statement
+ hi def link dclLexical	Function
+ hi def link dclMdfy	Type
+ hi def link dclMdfyBrkt	Delimiter
+ hi def link dclMdfySep	Delimiter
+ hi def link dclMdfySet	Type
+ hi def link dclMdfySetString	String
+ hi def link dclNumber	Number
+ hi def link dclOper	Operator
+ hi def link dclParam	Special
+ hi def link dclSep		Delimiter
+ hi def link dclStart	Delimiter
+ hi def link dclString	String
+ hi def link dclTodo	Todo
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "dcl"
 
diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim
index 3668ea531f..a10e4ad342 100644
--- a/runtime/syntax/debchangelog.vim
+++ b/runtime/syntax/debchangelog.vim
@@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2016 Apr 24
+" Last Change: 2016 Aug 30
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debchangelog.vim
 
 " Standard syntax initialization
@@ -34,21 +34,17 @@ syn region debchangelogFooter start="^ [^ ]" end="$" contains=debchangelogEmail
 syn region debchangelogEntry start="^  " end="$" contains=debchangelogCloses,debchangelogLP oneline
 
 " Associate our matches and regions with pretty colours
-command -nargs=+ HiLink hi def link <args>
-
-HiLink debchangelogHeader		Error
-HiLink debchangelogFooter		Identifier
-HiLink debchangelogEntry		Normal
-HiLink debchangelogCloses		Statement
-HiLink debchangelogLP			Statement
-HiLink debchangelogFirstKV		Identifier
-HiLink debchangelogOtherKV		Identifier
-HiLink debchangelogName		Comment
-HiLink debchangelogVersion		Identifier
-HiLink debchangelogTarget		Identifier
-HiLink debchangelogEmail		Special
-
-delcommand HiLink
+hi def link debchangelogHeader  Error
+hi def link debchangelogFooter  Identifier
+hi def link debchangelogEntry   Normal
+hi def link debchangelogCloses  Statement
+hi def link debchangelogLP      Statement
+hi def link debchangelogFirstKV Identifier
+hi def link debchangelogOtherKV Identifier
+hi def link debchangelogName    Comment
+hi def link debchangelogVersion Identifier
+hi def link debchangelogTarget  Identifier
+hi def link debchangelogEmail   Special
 
 let b:current_syntax = "debchangelog"
 
diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
index 4d354c4bd2..b52c496c95 100644
--- a/runtime/syntax/debcontrol.vim
+++ b/runtime/syntax/debcontrol.vim
@@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2015 Oct 24
+" Last Change: 2016 Aug 30
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debcontrol.vim
 
 " Standard syntax initialization
@@ -26,7 +26,7 @@ syn match debControlSpace " "
 
 let s:kernels = '\%(linux\|hurd\|kfreebsd\|knetbsd\|kopensolaris\|netbsd\)'
 let s:archs = '\%(alpha\|amd64\|armeb\|armel\|armhf\|arm64\|avr32\|hppa\|i386'
-      \ . '\|ia64\|lpia\|m32r\|m68k\|mipsel\|mips\|powerpcspe\|powerpc\|ppc64el'
+      \ . '\|ia64\|lpia\|m32r\|m68k\|mipsel\|mips64el\|mips\|powerpcspe\|powerpc\|ppc64el'
       \ . '\|ppc64\|s390x\|s390\|sh3eb\|sh3\|sh4eb\|sh4\|sh\|sparc64\|sparc\|x32\)'
 let s:pairs = 'hurd-i386\|kfreebsd-i386\|kfreebsd-amd64\|knetbsd-i386\|kopensolaris-i386\|netbsd-alpha\|netbsd-i386'
 
@@ -84,30 +84,26 @@ syn region debcontrolMultiField start="^\%(Build-\%(Conflicts\|Depends\)\%(-Inde
 syn region debcontrolMultiFieldSpell start="^\%(Description\):" skip="^ " end="^$"me=s-1 end="^[^ #]"me=s-1 contains=debcontrolKey,debcontrolEmail,debcontrolVariable,debcontrolComment,@Spell
 
 " Associate our matches and regions with pretty colours
-command -nargs=+ HiLink hi def link <args>
-
-HiLink debcontrolKey		Keyword
-HiLink debcontrolField	Normal
-HiLink debcontrolStrictField	Error
-HiLink debcontrolDeprecatedKey	Error
-HiLink debcontrolMultiField	Normal
-HiLink debcontrolArchitecture	Normal
-HiLink debcontrolMultiArch	Normal
-HiLink debcontrolName		Normal
-HiLink debcontrolPriority	Normal
-HiLink debcontrolSection	Normal
-HiLink debcontrolPackageType	Normal
-HiLink debcontrolVariable	Identifier
-HiLink debcontrolEmail	Identifier
-HiLink debcontrolVcsSvn	Identifier
-HiLink debcontrolVcsCvs	Identifier
-HiLink debcontrolVcsGit	Identifier
-HiLink debcontrolHTTPUrl	Identifier
-HiLink debcontrolDmUpload	Identifier
-HiLink debcontrolComment	Comment
-HiLink debcontrolElse		Special
-
-delcommand HiLink
+hi def link debcontrolKey           Keyword
+hi def link debcontrolField         Normal
+hi def link debcontrolStrictField   Error
+hi def link debcontrolDeprecatedKey Error
+hi def link debcontrolMultiField    Normal
+hi def link debcontrolArchitecture  Normal
+hi def link debcontrolMultiArch     Normal
+hi def link debcontrolName          Normal
+hi def link debcontrolPriority      Normal
+hi def link debcontrolSection       Normal
+hi def link debcontrolPackageType   Normal
+hi def link debcontrolVariable      Identifier
+hi def link debcontrolEmail         Identifier
+hi def link debcontrolVcsSvn        Identifier
+hi def link debcontrolVcsCvs        Identifier
+hi def link debcontrolVcsGit        Identifier
+hi def link debcontrolHTTPUrl       Identifier
+hi def link debcontrolDmUpload      Identifier
+hi def link debcontrolComment       Comment
+hi def link debcontrolElse          Special
 
 let b:current_syntax = "debcontrol"
 
diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
index 5383602ef4..232e727e81 100644
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,7 +2,7 @@
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2016 Apr 24
+" Last Change: 2016 Aug 30
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debsources.vim
 
 " Standard syntax initialization
@@ -25,7 +25,7 @@ let s:supported = [
       \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
       \ 'squeeze', 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy',
       \
-      \ 'precise', 'trusty', 'wily', 'xenial', 'yakkety', 'devel'
+      \ 'precise', 'trusty', 'xenial', 'yakkety', 'devel'
       \ ]
 let s:unsupported = [
       \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',
@@ -34,7 +34,7 @@ let s:unsupported = [
       \ 'warty', 'hoary', 'breezy', 'dapper', 'edgy', 'feisty',
       \ 'gutsy', 'hardy', 'intrepid', 'jaunty', 'karmic', 'lucid',
       \ 'maverick', 'natty', 'oneiric', 'quantal', 'raring', 'saucy',
-      \ 'utopic', 'vivid'
+      \ 'utopic', 'vivid', 'wily'
       \ ]
 let &cpo=s:cpo
 
diff --git a/runtime/syntax/def.vim b/runtime/syntax/def.vim
index cfae2112e9..a17714c41e 100644
--- a/runtime/syntax/def.vim
+++ b/runtime/syntax/def.vim
@@ -30,16 +30,14 @@ syn match   defNumber	"0x\x\+"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink defComment	Comment
-HiLink defKeyword	Keyword
-HiLink defStorage	StorageClass
-HiLink defString	String
-HiLink defNumber	Number
-HiLink defOrdinal	Operator
+hi def link defComment	Comment
+hi def link defKeyword	Keyword
+hi def link defStorage	StorageClass
+hi def link defString	String
+hi def link defNumber	Number
+hi def link defOrdinal	Operator
 
-delcommand HiLink
 
 let b:current_syntax = "def"
 
diff --git a/runtime/syntax/desc.vim b/runtime/syntax/desc.vim
index fa0189a3dc..84b9cd0f34 100644
--- a/runtime/syntax/desc.vim
+++ b/runtime/syntax/desc.vim
@@ -61,30 +61,28 @@ syn region descTagRegion start=/^\[\(F\|FLAG\)\]/ end=/$/ contains=descTag,descF
 syn region descTagRegion start=/^\[\(L\|LICENSE\)\]/ end=/$/ contains=descTag,descLicense
 
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink descFlag		Identifier
-HiLink descLicense		Identifier
-HiLink descCategory		Identifier
+hi def link descFlag		Identifier
+hi def link descLicense		Identifier
+hi def link descCategory		Identifier
 
-HiLink descTag		Type
-HiLink descUrl		Underlined
-HiLink descEmail		Underlined
+hi def link descTag		Type
+hi def link descUrl		Underlined
+hi def link descEmail		Underlined
 
 " priority tag colors
-HiLink descInstallX		Boolean
-HiLink descInstallO		Type
-HiLink descDash		Operator
-HiLink descDigit		Number
-HiLink descCompilePriority	Number
+hi def link descInstallX		Boolean
+hi def link descInstallO		Type
+hi def link descDash		Operator
+hi def link descDigit		Number
+hi def link descCompilePriority	Number
 
 " download tag colors
-HiLink descSum		Number
-HiLink descTarball		Underlined
+hi def link descSum		Number
+hi def link descTarball		Underlined
 
 " tag region colors
-HiLink descText		Comment
+hi def link descText		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "desc"
diff --git a/runtime/syntax/desktop.vim b/runtime/syntax/desktop.vim
index efab6d5f6f..915107887a 100644
--- a/runtime/syntax/desktop.vim
+++ b/runtime/syntax/desktop.vim
@@ -77,32 +77,30 @@ syn match   dtALocale /\[.\{-}\]\s*=\@=/ containedin=ALL
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dtGroup		 Special
-HiLink dtComment	 Comment
-HiLink dtDelim		 String
+hi def link dtGroup		 Special
+hi def link dtComment	 Comment
+hi def link dtDelim		 String
 
-HiLink dtLocaleKey	 Type
-HiLink dtLocaleName	 Identifier
-HiLink dtXLocale	 Identifier
-HiLink dtALocale	 Identifier
+hi def link dtLocaleKey	 Type
+hi def link dtLocaleName	 Identifier
+hi def link dtXLocale	 Identifier
+hi def link dtALocale	 Identifier
 
-HiLink dtNumericKey	 Type
+hi def link dtNumericKey	 Type
 
-HiLink dtBooleanKey	 Type
-HiLink dtBooleanValue	 Constant
+hi def link dtBooleanKey	 Type
+hi def link dtBooleanValue	 Constant
 
-HiLink dtStringKey	 Type
+hi def link dtStringKey	 Type
 
-HiLink dtExecKey	 Type
-HiLink dtExecParam	 Special
-HiLink dtTypeKey	 Type
-HiLink dtTypeValue	 Constant
-HiLink dtNotStLabel	 Type
-HiLink dtXAddKey	 Type
+hi def link dtExecKey	 Type
+hi def link dtExecParam	 Special
+hi def link dtTypeKey	 Type
+hi def link dtTypeValue	 Constant
+hi def link dtNotStLabel	 Type
+hi def link dtXAddKey	 Type
 
-delcommand HiLink
 
 let b:current_syntax = "desktop"
 
diff --git a/runtime/syntax/diva.vim b/runtime/syntax/diva.vim
index 02fc46dcbb..127a0b4663 100644
--- a/runtime/syntax/diva.vim
+++ b/runtime/syntax/diva.vim
@@ -78,20 +78,18 @@ syn match divaGeomFunctions		"\<geom\u\a\+\(45\|90\)\=("he=e-1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink divaDRCKeywords		Statement
-HiLink divaMeasKeywords		Statement
-HiLink divaCtrlFunctions	Conditional
-HiLink divaExtFunctions		Function
-HiLink divaDRCFunctions		Function
-HiLink divaFunctions		Function
-HiLink divaLayerFunctions	Function
-HiLink divaChkFunctions		Function
-HiLink divaLVSFunctions		Function
-HiLink divaGeomFunctions	Function
+hi def link divaDRCKeywords		Statement
+hi def link divaMeasKeywords		Statement
+hi def link divaCtrlFunctions	Conditional
+hi def link divaExtFunctions		Function
+hi def link divaDRCFunctions		Function
+hi def link divaFunctions		Function
+hi def link divaLayerFunctions	Function
+hi def link divaChkFunctions		Function
+hi def link divaLVSFunctions		Function
+hi def link divaGeomFunctions	Function
 
-delcommand HiLink
 
 let b:current_syntax = "diva"
 
diff --git a/runtime/syntax/django.vim b/runtime/syntax/django.vim
index a7104d37ec..d3ca4de0e2 100644
--- a/runtime/syntax/django.vim
+++ b/runtime/syntax/django.vim
@@ -66,20 +66,18 @@ syn region djangoComBlock start="{#" end="#}" contains=djangoTodo
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink djangoTagBlock PreProc
-HiLink djangoVarBlock PreProc
-HiLink djangoStatement Statement
-HiLink djangoFilter Identifier
-HiLink djangoArgument Constant
-HiLink djangoTagError Error
-HiLink djangoVarError Error
-HiLink djangoError Error
-HiLink djangoComment Comment
-HiLink djangoComBlock Comment
-HiLink djangoTodo Todo
+hi def link djangoTagBlock PreProc
+hi def link djangoVarBlock PreProc
+hi def link djangoStatement Statement
+hi def link djangoFilter Identifier
+hi def link djangoArgument Constant
+hi def link djangoTagError Error
+hi def link djangoVarError Error
+hi def link djangoError Error
+hi def link djangoComment Comment
+hi def link djangoComBlock Comment
+hi def link djangoTodo Todo
 
-delcommand HiLink
 
 let b:current_syntax = "django"
diff --git a/runtime/syntax/docbk.vim b/runtime/syntax/docbk.vim
index 3bc8049565..809f2894e6 100644
--- a/runtime/syntax/docbk.vim
+++ b/runtime/syntax/docbk.vim
@@ -172,16 +172,14 @@ syn region docbkCite   start="<citation>"lc=10 end="</citation>"me=e-11 contains
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 hi def DocbkBold term=bold cterm=bold gui=bold
 
-HiLink docbkKeyword	Statement
-HiLink docbkRegion	DocbkBold
-HiLink docbkTitle	Title
-HiLink docbkRemark	Comment
-HiLink docbkCite	Constant
+hi def link docbkKeyword	Statement
+hi def link docbkRegion	DocbkBold
+hi def link docbkTitle	Title
+hi def link docbkRemark	Comment
+hi def link docbkCite	Constant
 
-delcommand HiLink
 
 let b:current_syntax = "docbk"
 
diff --git a/runtime/syntax/dosbatch.vim b/runtime/syntax/dosbatch.vim
index b7f49ca4e9..249e6f7c46 100644
--- a/runtime/syntax/dosbatch.vim
+++ b/runtime/syntax/dosbatch.vim
@@ -109,40 +109,38 @@ syn keyword dosbatchImplicit    vol xcopy
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dosbatchTodo		Todo
+hi def link dosbatchTodo		Todo
 
-HiLink dosbatchStatement	Statement
-HiLink dosbatchCommands	dosbatchStatement
-HiLink dosbatchLabel		Label
-HiLink dosbatchConditional	Conditional
-HiLink dosbatchRepeat		Repeat
+hi def link dosbatchStatement	Statement
+hi def link dosbatchCommands	dosbatchStatement
+hi def link dosbatchLabel		Label
+hi def link dosbatchConditional	Conditional
+hi def link dosbatchRepeat		Repeat
 
-HiLink dosbatchOperator       Operator
-HiLink dosbatchEchoOperator   dosbatchOperator
-HiLink dosbatchIfOperator     dosbatchOperator
+hi def link dosbatchOperator       Operator
+hi def link dosbatchEchoOperator   dosbatchOperator
+hi def link dosbatchIfOperator     dosbatchOperator
 
-HiLink dosbatchArgument	Identifier
-HiLink dosbatchIdentifier     Identifier
-HiLink dosbatchVariable	dosbatchIdentifier
+hi def link dosbatchArgument	Identifier
+hi def link dosbatchIdentifier     Identifier
+hi def link dosbatchVariable	dosbatchIdentifier
 
-HiLink dosbatchSpecialChar	SpecialChar
-HiLink dosbatchString		String
-HiLink dosbatchNumber		Number
-HiLink dosbatchInteger	dosbatchNumber
-HiLink dosbatchHex		dosbatchNumber
-HiLink dosbatchBinary		dosbatchNumber
-HiLink dosbatchOctal		dosbatchNumber
+hi def link dosbatchSpecialChar	SpecialChar
+hi def link dosbatchString		String
+hi def link dosbatchNumber		Number
+hi def link dosbatchInteger	dosbatchNumber
+hi def link dosbatchHex		dosbatchNumber
+hi def link dosbatchBinary		dosbatchNumber
+hi def link dosbatchOctal		dosbatchNumber
 
-HiLink dosbatchComment	Comment
-HiLink dosbatchImplicit	Function
+hi def link dosbatchComment	Comment
+hi def link dosbatchImplicit	Function
 
-HiLink dosbatchSwitch		Special
+hi def link dosbatchSwitch		Special
 
-HiLink dosbatchCmd		PreProc
+hi def link dosbatchCmd		PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "dosbatch"
 
diff --git a/runtime/syntax/dosini.vim b/runtime/syntax/dosini.vim
index 2d8086b2d1..ccc5e86f1b 100644
--- a/runtime/syntax/dosini.vim
+++ b/runtime/syntax/dosini.vim
@@ -26,14 +26,12 @@ syn match  dosiniComment  "^[#;].*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dosiniNumber   Number
-HiLink dosiniHeader   Special
-HiLink dosiniComment  Comment
-HiLink dosiniLabel    Type
+hi def link dosiniNumber   Number
+hi def link dosiniHeader   Special
+hi def link dosiniComment  Comment
+hi def link dosiniLabel    Type
 
-delcommand HiLink
 
 let b:current_syntax = "dosini"
 
diff --git a/runtime/syntax/dot.vim b/runtime/syntax/dot.vim
index e6a5d9a109..0fdd6ea080 100644
--- a/runtime/syntax/dot.vim
+++ b/runtime/syntax/dot.vim
@@ -72,27 +72,25 @@ syn sync maxlines=500
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dotParErr	 Error
-HiLink dotBraceErr	 Error
-HiLink dotBrackErr	 Error
+hi def link dotParErr	 Error
+hi def link dotBraceErr	 Error
+hi def link dotBrackErr	 Error
 
-HiLink dotComment	 Comment
-HiLink dotTodo	 Todo
+hi def link dotComment	 Comment
+hi def link dotTodo	 Todo
 
-HiLink dotParEncl	 Keyword
-HiLink dotBrackEncl	 Keyword
-HiLink dotBraceEncl	 Keyword
+hi def link dotParEncl	 Keyword
+hi def link dotBrackEncl	 Keyword
+hi def link dotBraceEncl	 Keyword
 
-HiLink dotKeyword	 Keyword
-HiLink dotType	 Type
-HiLink dotKeyChar	 Keyword
+hi def link dotKeyword	 Keyword
+hi def link dotType	 Type
+hi def link dotKeyChar	 Keyword
 
-HiLink dotString	 String
-HiLink dotIdentifier	 Identifier
+hi def link dotString	 String
+hi def link dotIdentifier	 Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "dot"
 
diff --git a/runtime/syntax/dracula.vim b/runtime/syntax/dracula.vim
index b60e4846ed..a373dc200c 100644
--- a/runtime/syntax/dracula.vim
+++ b/runtime/syntax/dracula.vim
@@ -59,15 +59,13 @@ syn sync lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink draculaIdentifier Identifier
-HiLink draculaStatement  Statement
-HiLink draculaType       Type
-HiLink draculaComment    Comment
-HiLink draculaPreProc    PreProc
+hi def link draculaIdentifier Identifier
+hi def link draculaStatement  Statement
+hi def link draculaType       Type
+hi def link draculaComment    Comment
+hi def link draculaPreProc    PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "dracula"
 
diff --git a/runtime/syntax/dtd.vim b/runtime/syntax/dtd.vim
index e00c70d115..ae0bd1288e 100644
--- a/runtime/syntax/dtd.vim
+++ b/runtime/syntax/dtd.vim
@@ -127,32 +127,30 @@ syn sync lines=250
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink dtdFunction		Function
-HiLink dtdTag		Normal
-HiLink dtdType		Type
-HiLink dtdAttrType		dtdType
-HiLink dtdAttrDef		dtdType
-HiLink dtdConstant		Constant
-HiLink dtdString		dtdConstant
-HiLink dtdEnum		dtdConstant
-HiLink dtdCard		dtdFunction
+hi def link dtdFunction		Function
+hi def link dtdTag		Normal
+hi def link dtdType		Type
+hi def link dtdAttrType		dtdType
+hi def link dtdAttrDef		dtdType
+hi def link dtdConstant		Constant
+hi def link dtdString		dtdConstant
+hi def link dtdEnum		dtdConstant
+hi def link dtdCard		dtdFunction
 
-HiLink dtdEntity		Statement
-HiLink dtdEntityPunct	dtdType
-HiLink dtdParamEntityInst	dtdConstant
-HiLink dtdParamEntityPunct	dtdType
-HiLink dtdParamEntityDecl	dtdType
-HiLink dtdParamEntityDPunct dtdComment
+hi def link dtdEntity		Statement
+hi def link dtdEntityPunct	dtdType
+hi def link dtdParamEntityInst	dtdConstant
+hi def link dtdParamEntityPunct	dtdType
+hi def link dtdParamEntityDecl	dtdType
+hi def link dtdParamEntityDPunct dtdComment
 
-HiLink dtdComment		Comment
-HiLink dtdTagName		Statement
-HiLink dtdError		Error
-HiLink dtdTodo		Todo
+hi def link dtdComment		Comment
+hi def link dtdTagName		Statement
+hi def link dtdError		Error
+hi def link dtdTodo		Todo
 
-delcommand HiLink
 
 let &cpo = s:dtd_cpo_save
 unlet s:dtd_cpo_save
diff --git a/runtime/syntax/dtml.vim b/runtime/syntax/dtml.vim
index 0cc2729f79..cb09de8091 100644
--- a/runtime/syntax/dtml.vim
+++ b/runtime/syntax/dtml.vim
@@ -190,16 +190,14 @@ syn match   htmlTagN     contained +</\s*[-a-zA-Z0-9]\++hs=s+2 contains=htmlTagN
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dtmlIsTag			PreProc
-HiLink dtmlAttribute		Identifier
-HiLink dtmlMethod			Function
-HiLink dtmlComment		Comment
-HiLink dtmlTODO			Todo
-HiLink dtmlSpecialChar    Special
+hi def link dtmlIsTag			PreProc
+hi def link dtmlAttribute		Identifier
+hi def link dtmlMethod			Function
+hi def link dtmlComment		Comment
+hi def link dtmlTODO			Todo
+hi def link dtmlSpecialChar    Special
 
-delcommand HiLink
 
 let b:current_syntax = "dtml"
 
diff --git a/runtime/syntax/dylan.vim b/runtime/syntax/dylan.vim
index 95684e5016..345e932e60 100644
--- a/runtime/syntax/dylan.vim
+++ b/runtime/syntax/dylan.vim
@@ -61,33 +61,31 @@ syn region	dylanHeader	start="^[Mm]odule:" end="^$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dylanBlock		PreProc
-HiLink dylanBoolean		Boolean
-HiLink dylanCharacter		Character
-HiLink dylanClass		Structure
-HiLink dylanClassMods		StorageClass
-HiLink dylanComment		Comment
-HiLink dylanConditional	Conditional
-HiLink dylanConstant		Constant
-HiLink dylanException		Exception
-HiLink dylanHeader		Macro
-HiLink dylanImport		Include
-HiLink dylanLabel		Label
-HiLink dylanMiscMods		StorageClass
-HiLink dylanNumber		Number
-HiLink dylanOther		Keyword
-HiLink dylanOperator		Operator
-HiLink dylanParamDefs		Keyword
-HiLink dylanPrecondit		PreCondit
-HiLink dylanRepeat		Repeat
-HiLink dylanSimpleDefs	Keyword
-HiLink dylanStatement		Macro
-HiLink dylanString		String
-HiLink dylanVariable		Identifier
+hi def link dylanBlock		PreProc
+hi def link dylanBoolean		Boolean
+hi def link dylanCharacter		Character
+hi def link dylanClass		Structure
+hi def link dylanClassMods		StorageClass
+hi def link dylanComment		Comment
+hi def link dylanConditional	Conditional
+hi def link dylanConstant		Constant
+hi def link dylanException		Exception
+hi def link dylanHeader		Macro
+hi def link dylanImport		Include
+hi def link dylanLabel		Label
+hi def link dylanMiscMods		StorageClass
+hi def link dylanNumber		Number
+hi def link dylanOther		Keyword
+hi def link dylanOperator		Operator
+hi def link dylanParamDefs		Keyword
+hi def link dylanPrecondit		PreCondit
+hi def link dylanRepeat		Repeat
+hi def link dylanSimpleDefs	Keyword
+hi def link dylanStatement		Macro
+hi def link dylanString		String
+hi def link dylanVariable		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "dylan"
 
diff --git a/runtime/syntax/dylanintr.vim b/runtime/syntax/dylanintr.vim
index aaf2d740f0..692db34985 100644
--- a/runtime/syntax/dylanintr.vim
+++ b/runtime/syntax/dylanintr.vim
@@ -24,17 +24,15 @@ syn match	dylanintrInclude	"^\s*#\s*include\>\s*["<]" contains=intrIncluded
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dylanintrInfo		Special
-HiLink dylanintrInterface	Operator
-HiLink dylanintrMods		Type
-HiLink dylanintrClass		StorageClass
-HiLink dylanintrType		Type
-HiLink dylanintrIncluded	String
-HiLink dylanintrInclude	Include
+hi def link dylanintrInfo		Special
+hi def link dylanintrInterface	Operator
+hi def link dylanintrMods		Type
+hi def link dylanintrClass		StorageClass
+hi def link dylanintrType		Type
+hi def link dylanintrIncluded	String
+hi def link dylanintrInclude	Include
 
-delcommand HiLink
 
 let b:current_syntax = "dylanintr"
 
diff --git a/runtime/syntax/dylanlid.vim b/runtime/syntax/dylanlid.vim
index c7d2664005..dae0bf94b1 100644
--- a/runtime/syntax/dylanlid.vim
+++ b/runtime/syntax/dylanlid.vim
@@ -19,12 +19,10 @@ syn sync	lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink dylanlidInfo		Type
-HiLink dylanlidEntry		String
+hi def link dylanlidInfo		Type
+hi def link dylanlidEntry		String
 
-delcommand HiLink
 
 let b:current_syntax = "dylanlid"
 
diff --git a/runtime/syntax/ecd.vim b/runtime/syntax/ecd.vim
index 728cf28116..1276f2bd9d 100644
--- a/runtime/syntax/ecd.vim
+++ b/runtime/syntax/ecd.vim
@@ -30,17 +30,15 @@ syn match  ecdTagError	contained "[^>]<"ms=s+1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ecdComment	Comment
-HiLink ecdAttr	Type
-HiLink ecdAttrN	Statement
-HiLink ecdAttrV	Value
-HiLink ecdTag		Function
-HiLink ecdTagN	Statement
-HiLink ecdTagError	Error
+hi def link ecdComment	Comment
+hi def link ecdAttr	Type
+hi def link ecdAttrN	Statement
+hi def link ecdAttrV	Value
+hi def link ecdTag		Function
+hi def link ecdTagN	Statement
+hi def link ecdTagError	Error
 
-delcommand HiLink
 
 let b:current_syntax = "ecd"
 " vim: ts=8
diff --git a/runtime/syntax/edif.vim b/runtime/syntax/edif.vim
index 21c7ec7a03..002c9f89e1 100644
--- a/runtime/syntax/edif.vim
+++ b/runtime/syntax/edif.vim
@@ -34,14 +34,12 @@ syn match       edifError       ")"
 syntax sync fromstart
 
 " Define the default highlighting.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink edifInString		SpecialChar
-HiLink edifKeyword		Keyword
-HiLink edifNumber		Number
-HiLink edifInStringError	edifError
-HiLink edifError		Error
-HiLink edifString		String
-delcommand HiLink
+hi def link edifInString		SpecialChar
+hi def link edifKeyword		Keyword
+hi def link edifNumber		Number
+hi def link edifInStringError	edifError
+hi def link edifError		Error
+hi def link edifString		String
 
 let b:current_syntax = "edif"
diff --git a/runtime/syntax/eiffel.vim b/runtime/syntax/eiffel.vim
index 0ee5ea091f..c6634871cc 100644
--- a/runtime/syntax/eiffel.vim
+++ b/runtime/syntax/eiffel.vim
@@ -139,59 +139,57 @@ syn sync lines=40
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink eiffelKeyword		Statement
-HiLink eiffelProperty		Statement
-HiLink eiffelInheritClause	Statement
-HiLink eiffelStatement	Statement
-HiLink eiffelDeclaration	Statement
-HiLink eiffelAssertion	Statement
-HiLink eiffelDebug		Statement
-HiLink eiffelException	Statement
-HiLink eiffelGenericCreate	Statement
+hi def link eiffelKeyword		Statement
+hi def link eiffelProperty		Statement
+hi def link eiffelInheritClause	Statement
+hi def link eiffelStatement	Statement
+hi def link eiffelDeclaration	Statement
+hi def link eiffelAssertion	Statement
+hi def link eiffelDebug		Statement
+hi def link eiffelException	Statement
+hi def link eiffelGenericCreate	Statement
 
-HiLink eiffelAgent		Statement
-HiLink eiffelConvert		Statement
+hi def link eiffelAgent		Statement
+hi def link eiffelConvert		Statement
 
-HiLink eiffelTopStruct	PreProc
+hi def link eiffelTopStruct	PreProc
 
-HiLink eiffelAll		Special
-HiLink eiffelAnchored		Special
-HiLink eiffelBitType		Special
+hi def link eiffelAll		Special
+hi def link eiffelAnchored		Special
+hi def link eiffelBitType		Special
 
 
-HiLink eiffelBool		Boolean
-HiLink eiffelString		String
-HiLink eiffelCharacter	Character
-HiLink eiffelClassName	Type
-HiLink eiffelNumber		Number
+hi def link eiffelBool		Boolean
+hi def link eiffelString		String
+hi def link eiffelCharacter	Character
+hi def link eiffelClassName	Type
+hi def link eiffelNumber		Number
 
-HiLink eiffelStringEscape	Special
+hi def link eiffelStringEscape	Special
 
-HiLink eiffelOperator		Special
-HiLink eiffelArray		Special
-HiLink eiffelExport		Special
-HiLink eiffelCreation		Special
-HiLink eiffelBrackets		Special
-HiLink eiffelGeneric		Special
-HiLink eiffelGenericDecl	Special
-HiLink eiffelConstraint	Special
-HiLink eiffelCreate		Special
+hi def link eiffelOperator		Special
+hi def link eiffelArray		Special
+hi def link eiffelExport		Special
+hi def link eiffelCreation		Special
+hi def link eiffelBrackets		Special
+hi def link eiffelGeneric		Special
+hi def link eiffelGenericDecl	Special
+hi def link eiffelConstraint	Special
+hi def link eiffelCreate		Special
 
-HiLink eiffelPredefined	Constant
+hi def link eiffelPredefined	Constant
 
-HiLink eiffelComment		Comment
+hi def link eiffelComment		Comment
 
-HiLink eiffelError		Error
-HiLink eiffelBadConstant	Error
-HiLink eiffelStringError	Error
-HiLink eiffelParenError	Error
-HiLink eiffelBracketError	Error
+hi def link eiffelError		Error
+hi def link eiffelBadConstant	Error
+hi def link eiffelStringError	Error
+hi def link eiffelParenError	Error
+hi def link eiffelBracketError	Error
 
-HiLink eiffelTodo		Todo
+hi def link eiffelTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "eiffel"
 
diff --git a/runtime/syntax/elf.vim b/runtime/syntax/elf.vim
index 7835f550fc..e695dbc79a 100644
--- a/runtime/syntax/elf.vim
+++ b/runtime/syntax/elf.vim
@@ -61,23 +61,21 @@ syn match elfPunct "[,;]"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later.
-HiLink elfComment Comment
-HiLink elfPPCom Include
-HiLink elfKeyword Keyword
-HiLink elfSpecial Special
-HiLink elfEnvironment Special
-HiLink elfBraceError Error
-HiLink elfConditional Conditional
-HiLink elfMacro Function
-HiLink elfNumber Number
-HiLink elfString String
-HiLink elfParens Delimiter
-HiLink elfPunct Delimiter
+hi def link elfComment Comment
+hi def link elfPPCom Include
+hi def link elfKeyword Keyword
+hi def link elfSpecial Special
+hi def link elfEnvironment Special
+hi def link elfBraceError Error
+hi def link elfConditional Conditional
+hi def link elfMacro Function
+hi def link elfNumber Number
+hi def link elfString String
+hi def link elfParens Delimiter
+hi def link elfPunct Delimiter
 
-delcommand HiLink
 
 let b:current_syntax = "elf"
 
diff --git a/runtime/syntax/elmfilt.vim b/runtime/syntax/elmfilt.vim
index 5858946648..ec97af038d 100644
--- a/runtime/syntax/elmfilt.vim
+++ b/runtime/syntax/elmfilt.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	Elm Filter rules
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:	6
+" Last Change:	Aug 31, 2016
+" Version:	8
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_ELMFILT
 
 " quit when a syntax file was already loaded
@@ -35,25 +35,24 @@ syn region	elmfiltString	contained	start="'" skip="'\(\\\\\)*\\['%]" end="'"	con
 syn match	elmfiltSpaceError	contained	"\s.*$"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_elmfilt_syntax_inits")
 
-HiLink elmfiltAction	Statement
-HiLink elmfiltArg	Special
-HiLink elmfiltComment	Comment
-HiLink elmfiltCond	Statement
-HiLink elmfiltIf	Statement
-HiLink elmfiltMatch	Special
-HiLink elmfiltMatchError	Error
-HiLink elmfiltNumber	Number
-HiLink elmfiltOper	Operator
-HiLink elmfiltOperKey	Type
-HiLink elmfiltParenError	Error
-HiLink elmfiltSpaceError	Error
-HiLink elmfiltString	String
-HiLink elmfiltThenError	Error
+  hi def link elmfiltAction	Statement
+  hi def link elmfiltArg	Special
+  hi def link elmfiltComment	Comment
+  hi def link elmfiltCond	Statement
+  hi def link elmfiltIf	Statement
+  hi def link elmfiltMatch	Special
+  hi def link elmfiltMatchError	Error
+  hi def link elmfiltNumber	Number
+  hi def link elmfiltOper	Operator
+  hi def link elmfiltOperKey	Type
+  hi def link elmfiltParenError	Error
+  hi def link elmfiltSpaceError	Error
+  hi def link elmfiltString	String
+  hi def link elmfiltThenError	Error
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "elmfilt"
 " vim: ts=9
diff --git a/runtime/syntax/erlang.vim b/runtime/syntax/erlang.vim
index a49f24ed14..11b763409b 100644
--- a/runtime/syntax/erlang.vim
+++ b/runtime/syntax/erlang.vim
@@ -143,106 +143,104 @@ let s:old_style = (exists("g:erlang_old_style_highlight") &&
                   \g:erlang_old_style_highlight == 1)
 
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " Comments
-HiLink erlangComment Comment
-HiLink erlangCommentAnnotation Special
-HiLink erlangTodo Todo
-HiLink erlangShebang Comment
+hi def link erlangComment Comment
+hi def link erlangCommentAnnotation Special
+hi def link erlangTodo Todo
+hi def link erlangShebang Comment
 
 " Numbers
-HiLink erlangNumberInteger Number
-HiLink erlangNumberFloat Float
+hi def link erlangNumberInteger Number
+hi def link erlangNumberFloat Float
 
 " Strings, atoms, characters
-HiLink erlangString String
+hi def link erlangString String
 
 if s:old_style
-HiLink erlangQuotedAtom Type
+hi def link erlangQuotedAtom Type
 else
-HiLink erlangQuotedAtom String
+hi def link erlangQuotedAtom String
 endif
 
-HiLink erlangStringModifier Special
-HiLink erlangQuotedAtomModifier Special
-HiLink erlangModifier Special
+hi def link erlangStringModifier Special
+hi def link erlangQuotedAtomModifier Special
+hi def link erlangModifier Special
 
 " Operators, separators
-HiLink erlangOperator Operator
-HiLink erlangRightArrow Operator
+hi def link erlangOperator Operator
+hi def link erlangRightArrow Operator
 if s:old_style
-HiLink erlangBracket Normal
-HiLink erlangPipe Normal
+hi def link erlangBracket Normal
+hi def link erlangPipe Normal
 else
-HiLink erlangBracket Delimiter
-HiLink erlangPipe Delimiter
+hi def link erlangBracket Delimiter
+hi def link erlangPipe Delimiter
 endif
 
 " Atoms, functions, variables, macros
 if s:old_style
-HiLink erlangAtom Normal
-HiLink erlangLocalFuncCall Normal
-HiLink erlangLocalFuncRef Normal
-HiLink erlangGlobalFuncCall Function
-HiLink erlangGlobalFuncRef Function
-HiLink erlangVariable Normal
-HiLink erlangMacro Normal
-HiLink erlangRecord Normal
+hi def link erlangAtom Normal
+hi def link erlangLocalFuncCall Normal
+hi def link erlangLocalFuncRef Normal
+hi def link erlangGlobalFuncCall Function
+hi def link erlangGlobalFuncRef Function
+hi def link erlangVariable Normal
+hi def link erlangMacro Normal
+hi def link erlangRecord Normal
 else
-HiLink erlangAtom String
-HiLink erlangLocalFuncCall Normal
-HiLink erlangLocalFuncRef Normal
-HiLink erlangGlobalFuncCall Normal
-HiLink erlangGlobalFuncRef Normal
-HiLink erlangVariable Identifier
-HiLink erlangMacro Macro
-HiLink erlangRecord Structure
+hi def link erlangAtom String
+hi def link erlangLocalFuncCall Normal
+hi def link erlangLocalFuncRef Normal
+hi def link erlangGlobalFuncCall Normal
+hi def link erlangGlobalFuncRef Normal
+hi def link erlangVariable Identifier
+hi def link erlangMacro Macro
+hi def link erlangRecord Structure
 endif
 
 " Bitstrings
 if !s:old_style
-HiLink erlangBitType Type
+hi def link erlangBitType Type
 endif
 
 " Constants and Directives
 if s:old_style
-HiLink erlangAttribute Type
-HiLink erlangMacroDef Type
-HiLink erlangUnknownAttribute Normal
-HiLink erlangInclude Type
-HiLink erlangRecordDef Type
-HiLink erlangDefine Type
-HiLink erlangPreCondit Type
-HiLink erlangType Type
+hi def link erlangAttribute Type
+hi def link erlangMacroDef Type
+hi def link erlangUnknownAttribute Normal
+hi def link erlangInclude Type
+hi def link erlangRecordDef Type
+hi def link erlangDefine Type
+hi def link erlangPreCondit Type
+hi def link erlangType Type
 else
-HiLink erlangAttribute Keyword
-HiLink erlangMacroDef Macro
-HiLink erlangUnknownAttribute Normal
-HiLink erlangInclude Include
-HiLink erlangRecordDef Keyword
-HiLink erlangDefine Define
-HiLink erlangPreCondit PreCondit
-HiLink erlangType Type
+hi def link erlangAttribute Keyword
+hi def link erlangMacroDef Macro
+hi def link erlangUnknownAttribute Normal
+hi def link erlangInclude Include
+hi def link erlangRecordDef Keyword
+hi def link erlangDefine Define
+hi def link erlangPreCondit PreCondit
+hi def link erlangType Type
 endif
 
 " Keywords
-HiLink erlangKeyword Keyword
+hi def link erlangKeyword Keyword
 
 " Build-in-functions (BIFs)
-HiLink erlangBIF Function
+hi def link erlangBIF Function
 
 if s:old_style
-HiLink erlangBoolean Statement
-HiLink erlangExtra Statement
-HiLink erlangSignal Statement
+hi def link erlangBoolean Statement
+hi def link erlangExtra Statement
+hi def link erlangSignal Statement
 else
-HiLink erlangBoolean Boolean
-HiLink erlangExtra Statement
-HiLink erlangSignal Statement
+hi def link erlangBoolean Boolean
+hi def link erlangExtra Statement
+hi def link erlangSignal Statement
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "erlang"
 
diff --git a/runtime/syntax/esqlc.vim b/runtime/syntax/esqlc.vim
index ea36d66e1a..792e5d37f3 100644
--- a/runtime/syntax/esqlc.vim
+++ b/runtime/syntax/esqlc.vim
@@ -46,15 +46,13 @@ syntax keyword esqlcStatement	truncate update
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink esqlcOperator	Operator
-HiLink esqlcStatement	Statement
-HiLink esqlcKeyword	esqlcSpecial
-HiLink esqlcSpecial	Special
-HiLink esqlcPreProc	PreProc
+hi def link esqlcOperator	Operator
+hi def link esqlcStatement	Statement
+hi def link esqlcKeyword	esqlcSpecial
+hi def link esqlcSpecial	Special
+hi def link esqlcPreProc	PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "esqlc"
 
diff --git a/runtime/syntax/esterel.vim b/runtime/syntax/esterel.vim
index 0540843cd8..b0105216d7 100644
--- a/runtime/syntax/esterel.vim
+++ b/runtime/syntax/esterel.vim
@@ -62,19 +62,17 @@ syn match esterelNone			"\<else\s\+if\>$"
 syn match esterelNone			"\<else\s\+if\>\s"
 
 " Class Linking
-command -nargs=+ HiLink hi def link <args>
 
-HiLink esterelStatement		Statement
-HiLink esterelType			Type
-HiLink esterelComment		Comment
-HiLink esterelBoolean		Number
-HiLink esterelExpressions	Number
-HiLink esterelIO			String
-HiLink esterelOperator		Type
-HiLink esterelSysCall		Type
-HiLink esterelFunctions		Type
-HiLink esterelSpecial		Special
+hi def link esterelStatement		Statement
+hi def link esterelType			Type
+hi def link esterelComment		Comment
+hi def link esterelBoolean		Number
+hi def link esterelExpressions	Number
+hi def link esterelIO			String
+hi def link esterelOperator		Type
+hi def link esterelSysCall		Type
+hi def link esterelFunctions		Type
+hi def link esterelSpecial		Special
 
-delcommand HiLink
 
 let b:current_syntax = "esterel"
diff --git a/runtime/syntax/eviews.vim b/runtime/syntax/eviews.vim
index 7d039c2122..03cfb25e60 100644
--- a/runtime/syntax/eviews.vim
+++ b/runtime/syntax/eviews.vim
@@ -63,26 +63,24 @@ syn match eParenError /[\]}]/ contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink eComment     Comment
-HiLink eConstant    Identifier
-HiLink eStringId    Identifier
-HiLink eCommand     Type
-HiLink eString      String
-HiLink eNumber      Number
-HiLink eBoolean     Boolean
-HiLink eFloat       Float
-HiLink eConditional Conditional
-HiLink eProgLang    Statement
-HiLink eOVP	      Statement
-HiLink eStdCmd      Statement
-HiLink eIdentifier  Normal
-HiLink eDelimiter   Delimiter
-HiLink eError       Error
-HiLink eBraceError  Error
-HiLink eCurlyError  Error
-HiLink eParenError  Error
-delcommand HiLink
+hi def link eComment     Comment
+hi def link eConstant    Identifier
+hi def link eStringId    Identifier
+hi def link eCommand     Type
+hi def link eString      String
+hi def link eNumber      Number
+hi def link eBoolean     Boolean
+hi def link eFloat       Float
+hi def link eConditional Conditional
+hi def link eProgLang    Statement
+hi def link eOVP	      Statement
+hi def link eStdCmd      Statement
+hi def link eIdentifier  Normal
+hi def link eDelimiter   Delimiter
+hi def link eError       Error
+hi def link eBraceError  Error
+hi def link eCurlyError  Error
+hi def link eParenError  Error
 
 let b:current_syntax="eviews"
 
diff --git a/runtime/syntax/exim.vim b/runtime/syntax/exim.vim
index f9017acb1e..4edc0d7948 100644
--- a/runtime/syntax/exim.vim
+++ b/runtime/syntax/exim.vim
@@ -88,20 +88,18 @@ syn keyword eximKeyword server_prompts server_condition client_send
 syn keyword eximKeyword server_secret client_name client_secret
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink eximComment Comment
-HiLink eximFixme Todo
-HiLink eximEnd Keyword
-HiLink eximNumber Number
-HiLink eximDriverName Constant
-HiLink eximConstant Constant
-HiLink eximTime Constant
-HiLink eximKeyword Type
-HiLink eximSpecialChar Special
-HiLink eximMacroName Preproc
-HiLink eximTransport Identifier
+hi def link eximComment Comment
+hi def link eximFixme Todo
+hi def link eximEnd Keyword
+hi def link eximNumber Number
+hi def link eximDriverName Constant
+hi def link eximConstant Constant
+hi def link eximTime Constant
+hi def link eximKeyword Type
+hi def link eximSpecialChar Special
+hi def link eximMacroName Preproc
+hi def link eximTransport Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "exim"
diff --git a/runtime/syntax/expect.vim b/runtime/syntax/expect.vim
index 4f05259fc1..75cbd3eddf 100644
--- a/runtime/syntax/expect.vim
+++ b/runtime/syntax/expect.vim
@@ -79,26 +79,24 @@ syn match   expectSharpBang	"\%^#!.*"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink expectSharpBang	PreProc
-HiLink expectVariables	Special
-HiLink expectCommand		Function
-HiLink expectStatement	Statement
-HiLink expectConditional	Conditional
-HiLink expectRepeat		Repeat
-HiLink expectExpectOpts	Keyword
-HiLink expectOutVar		Special
-HiLink expectSpecial		Special
-HiLink expectNumber		Number
+hi def link expectSharpBang	PreProc
+hi def link expectVariables	Special
+hi def link expectCommand		Function
+hi def link expectStatement	Statement
+hi def link expectConditional	Conditional
+hi def link expectRepeat		Repeat
+hi def link expectExpectOpts	Keyword
+hi def link expectOutVar		Special
+hi def link expectSpecial		Special
+hi def link expectNumber		Number
 
-HiLink expectString		String
+hi def link expectString		String
 
-HiLink expectComment		Comment
-HiLink expectTodo		Todo
-"HiLink expectIdentifier	Identifier
+hi def link expectComment		Comment
+hi def link expectTodo		Todo
+"hi def link expectIdentifier	Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "expect"
 
diff --git a/runtime/syntax/exports.vim b/runtime/syntax/exports.vim
index aa6b76a5b0..55efbb1e50 100644
--- a/runtime/syntax/exports.vim
+++ b/runtime/syntax/exports.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	exports
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:	5
+" Last Change:	Aug 31, 2016
+" Version:	7
 " Notes:		This file includes both SysV and BSD 'isms
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_EXPORTS
 
@@ -36,24 +36,23 @@ syn match exportsSeparator	"[,:]"
 syn match exportsComment	"^\s*#.*$"	contains=@Spell
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_exports_syntax_inits")
 
-HiLink exportsKeyOptSet	exportsKeySettings
-HiLink exportsOptSet	exportsSettings
+  hi def link exportsKeyOptSet	exportsKeySettings
+  hi def link exportsOptSet	exportsSettings
 
-HiLink exportsComment	Comment
-HiLink exportsKeyOptions	Type
-HiLink exportsKeySettings	Keyword
-HiLink exportsOptions	Constant
-HiLink exportsSeparator	Constant
-HiLink exportsSettings	Constant
+  hi def link exportsComment	Comment
+  hi def link exportsKeyOptions	Type
+  hi def link exportsKeySettings	Keyword
+  hi def link exportsOptions	Constant
+  hi def link exportsSeparator	Constant
+  hi def link exportsSettings	Constant
 
-HiLink exportsOptError	Error
-HiLink exportsOptSetError	Error
-HiLink exportsSetError	Error
+  hi def link exportsOptError	Error
+  hi def link exportsOptSetError	Error
+  hi def link exportsSetError	Error
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "exports"
 " vim: ts=10
diff --git a/runtime/syntax/falcon.vim b/runtime/syntax/falcon.vim
index 1f6fefa9ff..e022c7a54a 100644
--- a/runtime/syntax/falcon.vim
+++ b/runtime/syntax/falcon.vim
@@ -163,34 +163,32 @@ syn sync minlines=10 maxlines=100
 
 " Define the default highlighting
 if !exists("did_falcon_syn_inits")
-    command -nargs=+ HiLink hi def link <args>
 
-    HiLink falconKeyword          Keyword
-    HiLink falconCommentString    String
-    HiLink falconTodo             Todo
-    HiLink falconConditional      Keyword
-    HiLink falconRepeat           Repeat
-    HiLink falconcommentSkip      Comment
-    HiLink falconComment          Comment
-    HiLink falconCommentL         Comment
-    HiLink falconConst            Constant
-    HiLink falconConstants        Constant
-    HiLink falconOperator         Operator
-    HiLink falconSymbol           Normal
-    HiLink falconSpaceError       Error
-    HiLink falconHexadecimal      Number
-    HiLink falconOctal            Number
-    HiLink falconIntLiteral       Number
-    HiLink falconFloatLiteral     Float
-    HiLink falconStringEscape     Special
-    HiLink falconStringDelimiter  Delimiter
-    HiLink falconString           String
-    HiLink falconBool             Constant
-    HiLink falconSharpBang        PreProc
-    HiLink falconInclude          Include
-    HiLink falconSymbol           Constant
-    HiLink falconSymbolOther      Delimiter
-    delcommand HiLink
+    hi def link falconKeyword          Keyword
+    hi def link falconCommentString    String
+    hi def link falconTodo             Todo
+    hi def link falconConditional      Keyword
+    hi def link falconRepeat           Repeat
+    hi def link falconcommentSkip      Comment
+    hi def link falconComment          Comment
+    hi def link falconCommentL         Comment
+    hi def link falconConst            Constant
+    hi def link falconConstants        Constant
+    hi def link falconOperator         Operator
+    hi def link falconSymbol           Normal
+    hi def link falconSpaceError       Error
+    hi def link falconHexadecimal      Number
+    hi def link falconOctal            Number
+    hi def link falconIntLiteral       Number
+    hi def link falconFloatLiteral     Float
+    hi def link falconStringEscape     Special
+    hi def link falconStringDelimiter  Delimiter
+    hi def link falconString           String
+    hi def link falconBool             Constant
+    hi def link falconSharpBang        PreProc
+    hi def link falconInclude          Include
+    hi def link falconSymbol           Constant
+    hi def link falconSymbolOther      Delimiter
 endif
 
 let b:current_syntax = "falcon"
diff --git a/runtime/syntax/fdcc.vim b/runtime/syntax/fdcc.vim
index 422fd31dae..f7b296b9c6 100644
--- a/runtime/syntax/fdcc.vim
+++ b/runtime/syntax/fdcc.vim
@@ -56,47 +56,45 @@ syn region fdccBlank matchgroup=fdccLCAddress start=/^LC_ADDRESS$/ end=/^END LC_
 
 
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink fdccBlank		 Blank
+hi def link fdccBlank		 Blank
 
-HiLink fdccTodo		 Todo
-HiLink fdccComment		 Comment
-HiLink fdccVariable		 Type
+hi def link fdccTodo		 Todo
+hi def link fdccComment		 Comment
+hi def link fdccVariable		 Type
 
-HiLink fdccLCIdentification	 Statement
-HiLink fdccLCCtype		 Statement
-HiLink fdccLCCollate		 Statement
-HiLink fdccLCMonetary		 Statement
-HiLink fdccLCNumeric		 Statement
-HiLink fdccLCTime		 Statement
-HiLink fdccLCMessages		 Statement
-HiLink fdccLCPaper		 Statement
-HiLink fdccLCTelephone	 Statement
-HiLink fdccLCMeasurement	 Statement
-HiLink fdccLCName		 Statement
-HiLink fdccLCAddress		 Statement
+hi def link fdccLCIdentification	 Statement
+hi def link fdccLCCtype		 Statement
+hi def link fdccLCCollate		 Statement
+hi def link fdccLCMonetary		 Statement
+hi def link fdccLCNumeric		 Statement
+hi def link fdccLCTime		 Statement
+hi def link fdccLCMessages		 Statement
+hi def link fdccLCPaper		 Statement
+hi def link fdccLCTelephone	 Statement
+hi def link fdccLCMeasurement	 Statement
+hi def link fdccLCName		 Statement
+hi def link fdccLCAddress		 Statement
 
-HiLink fdccUnicodeInValid	 Error
-HiLink fdccUnicodeValid	 String
-HiLink fdccString		 String
-HiLink fdccNumber		 Blank
+hi def link fdccUnicodeInValid	 Error
+hi def link fdccUnicodeValid	 String
+hi def link fdccString		 String
+hi def link fdccNumber		 Blank
 
-HiLink fdccKeywordIdentification fdccKeyword
-HiLink fdccKeywordCtype	   fdccKeyword
-HiLink fdccKeywordCollate	   fdccKeyword
-HiLink fdccKeywordMonetary	   fdccKeyword
-HiLink fdccKeywordNumeric	   fdccKeyword
-HiLink fdccKeywordTime	   fdccKeyword
-HiLink fdccKeywordMessages	   fdccKeyword
-HiLink fdccKeywordPaper	   fdccKeyword
-HiLink fdccKeywordTelephone	   fdccKeyword
-HiLink fdccKeywordMeasurement    fdccKeyword
-HiLink fdccKeywordName	   fdccKeyword
-HiLink fdccKeywordAddress	   fdccKeyword
-HiLink fdccKeyword		   Identifier
+hi def link fdccKeywordIdentification fdccKeyword
+hi def link fdccKeywordCtype	   fdccKeyword
+hi def link fdccKeywordCollate	   fdccKeyword
+hi def link fdccKeywordMonetary	   fdccKeyword
+hi def link fdccKeywordNumeric	   fdccKeyword
+hi def link fdccKeywordTime	   fdccKeyword
+hi def link fdccKeywordMessages	   fdccKeyword
+hi def link fdccKeywordPaper	   fdccKeyword
+hi def link fdccKeywordTelephone	   fdccKeyword
+hi def link fdccKeywordMeasurement    fdccKeyword
+hi def link fdccKeywordName	   fdccKeyword
+hi def link fdccKeywordAddress	   fdccKeyword
+hi def link fdccKeyword		   Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "fdcc"
 
diff --git a/runtime/syntax/fgl.vim b/runtime/syntax/fgl.vim
index e45e31c395..1b75d137b6 100644
--- a/runtime/syntax/fgl.vim
+++ b/runtime/syntax/fgl.vim
@@ -117,19 +117,17 @@ syn sync ccomment fglComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink fglComment	Comment
-"HiLink fglKeyword	fglSpecial
-HiLink fglKeyword	fglStatement
-HiLink fglNumber	Number
-HiLink fglOperator	fglStatement
-HiLink fglSpecial	Special
-HiLink fglStatement	Statement
-HiLink fglString	String
-HiLink fglType	Type
+hi def link fglComment	Comment
+"hi def link fglKeyword	fglSpecial
+hi def link fglKeyword	fglStatement
+hi def link fglNumber	Number
+hi def link fglOperator	fglStatement
+hi def link fglSpecial	Special
+hi def link fglStatement	Statement
+hi def link fglString	String
+hi def link fglType	Type
 
-delcommand HiLink
 
 let b:current_syntax = "fgl"
 
diff --git a/runtime/syntax/focexec.vim b/runtime/syntax/focexec.vim
index 54f4c0d55a..a75aed47cb 100644
--- a/runtime/syntax/focexec.vim
+++ b/runtime/syntax/focexec.vim
@@ -67,23 +67,21 @@ syn match   focexecComment	"-\*.*"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink focexecString1		String
-HiLink focexecString2		String
-HiLink focexecNumber		Number
-HiLink focexecComment		Comment
-HiLink focexecTable		Keyword
-HiLink focexecModify		Keyword
-HiLink focexecNormal		Keyword
-HiLink focexecSet		Keyword
-HiLink focexecDash		Keyword
-HiLink focexecFileDef		Keyword
-HiLink focexecJoin		Keyword
-HiLink focexecAmperVar	Identifier
-HiLink focexecFuse		Function
+hi def link focexecString1		String
+hi def link focexecString2		String
+hi def link focexecNumber		Number
+hi def link focexecComment		Comment
+hi def link focexecTable		Keyword
+hi def link focexecModify		Keyword
+hi def link focexecNormal		Keyword
+hi def link focexecSet		Keyword
+hi def link focexecDash		Keyword
+hi def link focexecFileDef		Keyword
+hi def link focexecJoin		Keyword
+hi def link focexecAmperVar	Identifier
+hi def link focexecFuse		Function
 
-delcommand HiLink
 
 let b:current_syntax = "focexec"
 
diff --git a/runtime/syntax/form.vim b/runtime/syntax/form.vim
index abd1c489dd..b8cb87c905 100644
--- a/runtime/syntax/form.vim
+++ b/runtime/syntax/form.vim
@@ -107,26 +107,25 @@ syn sync ccomment formComment minlines=10
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink formConditional	Conditional
-HiLink formNumber		Number
-HiLink formStatement		Statement
-HiLink formComment		Comment
-HiLink formPreProc		PreProc
-HiLink formDirective		PreProc
-HiLink formType		Type
-HiLink formString		String
-HiLink formNestedString	String
-HiLink formReserved           Error
-HiLink formTodo               Todo
-HiLink formSpecial            SpecialChar
+hi def link formConditional	Conditional
+hi def link formNumber		Number
+hi def link formStatement		Statement
+hi def link formComment		Comment
+hi def link formPreProc		PreProc
+hi def link formDirective		PreProc
+hi def link formType		Type
+hi def link formString		String
+hi def link formNestedString	String
+hi def link formReserved           Error
+hi def link formTodo               Todo
+hi def link formSpecial            SpecialChar
 
 if !exists("form_enhanced_color")
-HiLink formHeaderStatement	Statement
+hi def link formHeaderStatement	Statement
 else
 " enhanced color mode
-HiLink formHeaderStatement	HeaderStatement
+hi def link formHeaderStatement	HeaderStatement
 " dark and a light background for local types
 if &background == "dark"
 hi HeaderStatement term=underline ctermfg=LightGreen guifg=LightGreen gui=bold
@@ -140,7 +139,6 @@ hi Statement guifg=LightYellow
 endif
 endif
 
-delcommand HiLink
 
   let b:current_syntax = "form"
 
diff --git a/runtime/syntax/forth.vim b/runtime/syntax/forth.vim
index 2559779f54..35fafd4349 100644
--- a/runtime/syntax/forth.vim
+++ b/runtime/syntax/forth.vim
@@ -283,47 +283,45 @@ syn region forthDeprecated start='locals|' end='|'
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later.
-HiLink forthTodo Todo
-HiLink forthOperators Operator
-HiLink forthMath Number
-HiLink forthInteger Number
-HiLink forthFloat Float
-HiLink forthStack Special
-HiLink forthRstack Special
-HiLink forthFStack Special
-HiLink forthSP Special
-HiLink forthMemory Function
-HiLink forthAdrArith Function
-HiLink forthMemBlks Function
-HiLink forthCond Conditional
-HiLink forthLoop Repeat
-HiLink forthColonDef Define
-HiLink forthEndOfColonDef Define
-HiLink forthDefine Define
-HiLink forthDebug Debug
-HiLink forthAssembler Include
-HiLink forthCharOps Character
-HiLink forthConversion String
-HiLink forthForth Statement
-HiLink forthVocs Statement
-HiLink forthString String
-HiLink forthComment Comment
-HiLink forthClassDef Define
-HiLink forthEndOfClassDef Define
-HiLink forthObjectDef Define
-HiLink forthEndOfObjectDef Define
-HiLink forthInclude Include
-HiLink forthLocals Type " nothing else uses type and locals must stand out
-HiLink forthDeprecated Error " if you must, change to Type
-HiLink forthFileMode Function
-HiLink forthFileWords Statement
-HiLink forthBlocks Statement
-HiLink forthSpaceError Error
+hi def link forthTodo Todo
+hi def link forthOperators Operator
+hi def link forthMath Number
+hi def link forthInteger Number
+hi def link forthFloat Float
+hi def link forthStack Special
+hi def link forthRstack Special
+hi def link forthFStack Special
+hi def link forthSP Special
+hi def link forthMemory Function
+hi def link forthAdrArith Function
+hi def link forthMemBlks Function
+hi def link forthCond Conditional
+hi def link forthLoop Repeat
+hi def link forthColonDef Define
+hi def link forthEndOfColonDef Define
+hi def link forthDefine Define
+hi def link forthDebug Debug
+hi def link forthAssembler Include
+hi def link forthCharOps Character
+hi def link forthConversion String
+hi def link forthForth Statement
+hi def link forthVocs Statement
+hi def link forthString String
+hi def link forthComment Comment
+hi def link forthClassDef Define
+hi def link forthEndOfClassDef Define
+hi def link forthObjectDef Define
+hi def link forthEndOfObjectDef Define
+hi def link forthInclude Include
+hi def link forthLocals Type " nothing else uses type and locals must stand out
+hi def link forthDeprecated Error " if you must, change to Type
+hi def link forthFileMode Function
+hi def link forthFileWords Statement
+hi def link forthBlocks Statement
+hi def link forthSpaceError Error
 
-delcommand HiLink
 
 let b:current_syntax = "forth"
 
diff --git a/runtime/syntax/foxpro.vim b/runtime/syntax/foxpro.vim
index b329368b34..795859eac9 100644
--- a/runtime/syntax/foxpro.vim
+++ b/runtime/syntax/foxpro.vim
@@ -691,28 +691,26 @@ syn sync minlines=1 maxlines=3
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink foxproSpecial  Special
-HiLink foxproAtSymbol Special
-HiLink foxproAtCmd    Statement
-HiLink foxproPreProc  PreProc
-HiLink foxproFunc     Identifier
-HiLink foxproCmd      Statement
-HiLink foxproEnBlk    Type
-HiLink foxproSysVar   String
-HiLink foxproString   String
-HiLink foxproConst    Constant
-HiLink foxproNumber   Number
-HiLink foxproFloat    Float
-HiLink foxproComment  Comment
-HiLink foxproParenErr Error
-HiLink foxproCBConst  PreProc
-HiLink foxproCBField  Special
-HiLink foxproCBVar    Identifier
-HiLink foxproCBWin    Special
-HiLink foxproCBObject Identifier
+hi def link foxproSpecial  Special
+hi def link foxproAtSymbol Special
+hi def link foxproAtCmd    Statement
+hi def link foxproPreProc  PreProc
+hi def link foxproFunc     Identifier
+hi def link foxproCmd      Statement
+hi def link foxproEnBlk    Type
+hi def link foxproSysVar   String
+hi def link foxproString   String
+hi def link foxproConst    Constant
+hi def link foxproNumber   Number
+hi def link foxproFloat    Float
+hi def link foxproComment  Comment
+hi def link foxproParenErr Error
+hi def link foxproCBConst  PreProc
+hi def link foxproCBField  Special
+hi def link foxproCBVar    Identifier
+hi def link foxproCBWin    Special
+hi def link foxproCBObject Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "foxpro"
diff --git a/runtime/syntax/fstab.vim b/runtime/syntax/fstab.vim
index a17fc809a5..39c1a00b39 100644
--- a/runtime/syntax/fstab.vim
+++ b/runtime/syntax/fstab.vim
@@ -228,58 +228,56 @@ syn match fsFreqPass /\s\+.\{-}$/ contains=@fsFreqPassCluster,@fsGeneralCluster
 " Whole line comments
 syn match fsCommentLine /^#.*$/ contains=@Spell
 
-command! -nargs=+ HiLink hi def link <args>
 
-HiLink fsOperator Operator
-HiLink fsComment Comment
-HiLink fsCommentLine Comment
+hi def link fsOperator Operator
+hi def link fsComment Comment
+hi def link fsCommentLine Comment
 
-HiLink fsTypeKeyword Type
-HiLink fsDeviceKeyword Identifier
-HiLink fsDeviceLabel String
-HiLink fsDeviceUUID String
-HiLink fsDeviceSshfs String
-HiLink fsFreqPassNumber Number
+hi def link fsTypeKeyword Type
+hi def link fsDeviceKeyword Identifier
+hi def link fsDeviceLabel String
+hi def link fsDeviceUUID String
+hi def link fsDeviceSshfs String
+hi def link fsFreqPassNumber Number
 
 if exists('fstab_unknown_fs_errors') && fstab_unknown_fs_errors == 1
-HiLink fsTypeUnknown Error
+hi def link fsTypeUnknown Error
 endif
 
 if !exists('fstab_unknown_device_errors') || fstab_unknown_device_errors == 1
-HiLink fsDeviceError Error
+hi def link fsDeviceError Error
 endif
 
-HiLink fsMountPointError Error
-HiLink fsMountPointKeyword Keyword
-HiLink fsFreqPassError Error
+hi def link fsMountPointError Error
+hi def link fsMountPointKeyword Keyword
+hi def link fsFreqPassError Error
 
-HiLink fsOptionsGeneral Type
-HiLink fsOptionsKeywords Keyword
-HiLink fsOptionsNumber Number
-HiLink fsOptionsNumberOctal Number
-HiLink fsOptionsString String
-HiLink fsOptionsSize Number
-HiLink fsOptionsExt2Check String
-HiLink fsOptionsExt2Errors String
-HiLink fsOptionsExt3Journal String
-HiLink fsOptionsExt3Data String
-HiLink fsOptionsExt4Journal String
-HiLink fsOptionsExt4Data String
-HiLink fsOptionsExt4Barrier Number
-HiLink fsOptionsFatCheck String
-HiLink fsOptionsConv String
-HiLink fsOptionsFatType Number
-HiLink fsOptionsYesNo String
-HiLink fsOptionsHpfsCase String
-HiLink fsOptionsIsoMap String
-HiLink fsOptionsReiserHash String
-HiLink fsOptionsSshYesNoAsk String
-HiLink fsOptionsUfsType String
-HiLink fsOptionsUfsError String
+hi def link fsOptionsGeneral Type
+hi def link fsOptionsKeywords Keyword
+hi def link fsOptionsNumber Number
+hi def link fsOptionsNumberOctal Number
+hi def link fsOptionsString String
+hi def link fsOptionsSize Number
+hi def link fsOptionsExt2Check String
+hi def link fsOptionsExt2Errors String
+hi def link fsOptionsExt3Journal String
+hi def link fsOptionsExt3Data String
+hi def link fsOptionsExt4Journal String
+hi def link fsOptionsExt4Data String
+hi def link fsOptionsExt4Barrier Number
+hi def link fsOptionsFatCheck String
+hi def link fsOptionsConv String
+hi def link fsOptionsFatType Number
+hi def link fsOptionsYesNo String
+hi def link fsOptionsHpfsCase String
+hi def link fsOptionsIsoMap String
+hi def link fsOptionsReiserHash String
+hi def link fsOptionsSshYesNoAsk String
+hi def link fsOptionsUfsType String
+hi def link fsOptionsUfsError String
 
-HiLink fsOptionsVfatShortname String
+hi def link fsOptionsVfatShortname String
 
-delcommand HiLink
 
 let b:current_syntax = "fstab"
 
diff --git a/runtime/syntax/gdb.vim b/runtime/syntax/gdb.vim
index 677f948172..25a21d184e 100644
--- a/runtime/syntax/gdb.vim
+++ b/runtime/syntax/gdb.vim
@@ -85,18 +85,16 @@ exec "syn sync ccomment gdbComment minlines=" . gdb_minlines
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink gdbFuncDef	Function
-HiLink gdbComment	Comment
-HiLink gdbStatement	Statement
-HiLink gdbString	String
-HiLink gdbCharacter	Character
-HiLink gdbVariable	Identifier
-HiLink gdbSet		Constant
-HiLink gdbInfo	Type
-HiLink gdbDocument	Special
-HiLink gdbNumber	Number
-delcommand HiLink
+hi def link gdbFuncDef	Function
+hi def link gdbComment	Comment
+hi def link gdbStatement	Statement
+hi def link gdbString	String
+hi def link gdbCharacter	Character
+hi def link gdbVariable	Identifier
+hi def link gdbSet		Constant
+hi def link gdbInfo	Type
+hi def link gdbDocument	Special
+hi def link gdbNumber	Number
 
 let b:current_syntax = "gdb"
 
diff --git a/runtime/syntax/gdmo.vim b/runtime/syntax/gdmo.vim
index d9cebae1de..009f402ffa 100644
--- a/runtime/syntax/gdmo.vim
+++ b/runtime/syntax/gdmo.vim
@@ -62,23 +62,21 @@ syn sync ccomment gdmoComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink gdmoCategory	      Structure
-HiLink gdmoRelationship     Macro
-HiLink gdmoDefinition       Statement
-HiLink gdmoReference	      Type
-HiLink gdmoExtension	      Operator
-HiLink gdmoBraces	      Function
-HiLink gdmoSpecial	      Special
-HiLink gdmoString	      String
-HiLink gdmoCharacter	      Character
-HiLink gdmoSpecialCharacter gdmoSpecial
-HiLink gdmoComment	      Comment
-HiLink gdmoLineComment      gdmoComment
-HiLink gdmoType	      Type
+hi def link gdmoCategory	      Structure
+hi def link gdmoRelationship     Macro
+hi def link gdmoDefinition       Statement
+hi def link gdmoReference	      Type
+hi def link gdmoExtension	      Operator
+hi def link gdmoBraces	      Function
+hi def link gdmoSpecial	      Special
+hi def link gdmoString	      String
+hi def link gdmoCharacter	      Character
+hi def link gdmoSpecialCharacter gdmoSpecial
+hi def link gdmoComment	      Comment
+hi def link gdmoLineComment      gdmoComment
+hi def link gdmoType	      Type
 
-delcommand HiLink
 
 let b:current_syntax = "gdmo"
 
diff --git a/runtime/syntax/gedcom.vim b/runtime/syntax/gedcom.vim
index 40a17863f8..cd09e0fa22 100644
--- a/runtime/syntax/gedcom.vim
+++ b/runtime/syntax/gedcom.vim
@@ -39,17 +39,15 @@ syntax match gedcom_date ".*" contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink gedcom_record Statement
-HiLink gedcom_id Comment
-HiLink gedcom_ii PreProc
-HiLink gedcom_in Type
-HiLink gedcom_name PreProc
-HiLink gedcom_cname Type
-HiLink gedcom_surname Identifier
-HiLink gedcom_date Constant
+hi def link gedcom_record Statement
+hi def link gedcom_id Comment
+hi def link gedcom_ii PreProc
+hi def link gedcom_in Type
+hi def link gedcom_name PreProc
+hi def link gedcom_cname Type
+hi def link gedcom_surname Identifier
+hi def link gedcom_date Constant
 
-delcommand HiLink
 
 let b:current_syntax = "gedcom"
diff --git a/runtime/syntax/gkrellmrc.vim b/runtime/syntax/gkrellmrc.vim
index 9840a90346..f005ca2dc8 100644
--- a/runtime/syntax/gkrellmrc.vim
+++ b/runtime/syntax/gkrellmrc.vim
@@ -48,30 +48,28 @@ syn keyword gkrellmrcStyleCmd StyleMeter StyleChart StylePanel
 syn keyword gkrellmrcStyleItem textcolor alt_textcolor font alt_font transparency border label_position margin margins left_margin right_margin top_margin bottom_margin krell_depth krell_yoff krell_x_hot krell_expand krell_left_margin krell_right_margin
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink gkrellmrcComment Comment
-HiLink gkrellmrcFixme Todo
+hi def link gkrellmrcComment Comment
+hi def link gkrellmrcFixme Todo
 
-HiLink gkrellmrcString gkrellmrcConstant
-HiLink gkrellmrcNumber gkrellmrcConstant
-HiLink gkrellmrcRGBColor gkrellmrcConstant
-HiLink gkrellmrcExpandMode gkrellmrcConstant
-HiLink gkrellmrcConstant Constant
+hi def link gkrellmrcString gkrellmrcConstant
+hi def link gkrellmrcNumber gkrellmrcConstant
+hi def link gkrellmrcRGBColor gkrellmrcConstant
+hi def link gkrellmrcExpandMode gkrellmrcConstant
+hi def link gkrellmrcConstant Constant
 
-HiLink gkrellmrcMeterName gkrellmrcClass
-HiLink gkrellmrcChartName gkrellmrcClass
-HiLink gkrellmrcSpecialClassName gkrellmrcClass
-HiLink gkrellmrcClass Type
+hi def link gkrellmrcMeterName gkrellmrcClass
+hi def link gkrellmrcChartName gkrellmrcClass
+hi def link gkrellmrcSpecialClassName gkrellmrcClass
+hi def link gkrellmrcClass Type
 
-HiLink gkrellmrcGlobal gkrellmrcItem
-HiLink gkrellmrcBuiltinExt gkrellmrcItem
-HiLink gkrellmrcStyleItem gkrellmrcItem
-HiLink gkrellmrcItem Function
+hi def link gkrellmrcGlobal gkrellmrcItem
+hi def link gkrellmrcBuiltinExt gkrellmrcItem
+hi def link gkrellmrcStyleItem gkrellmrcItem
+hi def link gkrellmrcItem Function
 
-HiLink gkrellmrcSetCmd Special
-HiLink gkrellmrcStyleCmd Statement
+hi def link gkrellmrcSetCmd Special
+hi def link gkrellmrcStyleCmd Statement
 
-delcommand HiLink
 
 let b:current_syntax = "gkrellmrc"
diff --git a/runtime/syntax/gnuplot.vim b/runtime/syntax/gnuplot.vim
index 38aadffa28..7777cc9e46 100644
--- a/runtime/syntax/gnuplot.vim
+++ b/runtime/syntax/gnuplot.vim
@@ -501,45 +501,43 @@ syn keyword gnuplotStatement	unset update
 
 " ---- Define the default highlighting ---- "
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " ---- Comments ---- "
-HiLink gnuplotComment		Comment
+hi def link gnuplotComment		Comment
 
 " ---- Constants ---- "
-HiLink gnuplotString		String
-HiLink gnuplotNumber		Number
-HiLink gnuplotFloat		Float
+hi def link gnuplotString		String
+hi def link gnuplotNumber		Number
+hi def link gnuplotFloat		Float
 
 " ---- Identifiers ---- "
-HiLink gnuplotIdentifier	Identifier
+hi def link gnuplotIdentifier	Identifier
 
 " ---- Statements ---- "
-HiLink gnuplotConditional	Conditional
-HiLink gnuplotRepeat		Repeat
-HiLink gnuplotKeyword		Keyword
-HiLink gnuplotOperator	Operator
+hi def link gnuplotConditional	Conditional
+hi def link gnuplotRepeat		Repeat
+hi def link gnuplotKeyword		Keyword
+hi def link gnuplotOperator	Operator
 
 " ---- PreProcs ---- "
-HiLink gnuplotMacro		Macro
+hi def link gnuplotMacro		Macro
 
 " ---- Types ---- "
-HiLink gnuplotStatement	Type
-HiLink gnuplotFunc		Identifier
+hi def link gnuplotStatement	Type
+hi def link gnuplotFunc		Identifier
 
 " ---- Specials ---- "
-HiLink gnuplotSpecial		Special
-HiLink gnuplotUnit		Special
-HiLink gnuplotExternal	Special
+hi def link gnuplotSpecial		Special
+hi def link gnuplotUnit		Special
+hi def link gnuplotExternal	Special
 
 " ---- Errors ---- "
-HiLink gnuplotError		Error
-HiLink gnuplotOctalError	Error
+hi def link gnuplotError		Error
+hi def link gnuplotOctalError	Error
 
 " ---- Todos ---- "
-HiLink gnuplotTodo		Todo
+hi def link gnuplotTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "gnuplot"
 
diff --git a/runtime/syntax/godoc.vim b/runtime/syntax/godoc.vim
index 3a07903a77..0603f51c83 100644
--- a/runtime/syntax/godoc.vim
+++ b/runtime/syntax/godoc.vim
@@ -10,11 +10,9 @@ endif
 syn case match
 syn match godocTitle "^\([A-Z][A-Z ]*\)$"
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink godocTitle Title
+hi def link godocTitle Title
 
-delcommand HiLink
 
 let b:current_syntax = 'godoc'
 
diff --git a/runtime/syntax/gp.vim b/runtime/syntax/gp.vim
index 2e898dad5d..aecf7df48b 100644
--- a/runtime/syntax/gp.vim
+++ b/runtime/syntax/gp.vim
@@ -58,26 +58,24 @@ syntax region gpParen		transparent start='(' end=')' contains=ALLBUT,gpParenErro
 syntax match gpParenError	")"
 syntax match gpInParen contained "[{}]"
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink gpConditional		Conditional
-HiLink gpRepeat		Repeat
-HiLink gpError		Error
-HiLink gpParenError		gpError
-HiLink gpInParen		gpError
-HiLink gpStatement		Statement
-HiLink gpString		String
-HiLink gpComment		Comment
-HiLink gpInterface		Type
-HiLink gpInput		Type
-HiLink gpInterfaceKey		Statement
-HiLink gpFunction		Function
-HiLink gpScope		Type
+hi def link gpConditional		Conditional
+hi def link gpRepeat		Repeat
+hi def link gpError		Error
+hi def link gpParenError		gpError
+hi def link gpInParen		gpError
+hi def link gpStatement		Statement
+hi def link gpString		String
+hi def link gpComment		Comment
+hi def link gpInterface		Type
+hi def link gpInput		Type
+hi def link gpInterfaceKey		Statement
+hi def link gpFunction		Function
+hi def link gpScope		Type
 " contained ones
-HiLink gpSpecial		Special
-HiLink gpTodo			Todo
-HiLink gpArgs			Type
-delcommand HiLink
+hi def link gpSpecial		Special
+hi def link gpTodo			Todo
+hi def link gpArgs			Type
 
 let b:current_syntax = "gp"
 let &cpo = s:cpo_save
diff --git a/runtime/syntax/grads.vim b/runtime/syntax/grads.vim
index 0f09483fed..50be14bb22 100644
--- a/runtime/syntax/grads.vim
+++ b/runtime/syntax/grads.vim
@@ -51,25 +51,23 @@ syn match gradsComment	"\*.*"
 
 " Define the default highlighting.
 " Only when an item doesn't hgs highlighting+yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink gradsStatement		Statement
+hi def link gradsStatement		Statement
 
-HiLink gradsString		String
-HiLink gradsNumber		Number
+hi def link gradsString		String
+hi def link gradsNumber		Number
 
-HiLink gradsFixVariables	Special
-HiLink gradsVariables		Identifier
-HiLink gradsglobalVariables	Special
-HiLink gradsConst		Special
+hi def link gradsFixVariables	Special
+hi def link gradsVariables		Identifier
+hi def link gradsglobalVariables	Special
+hi def link gradsConst		Special
 
-HiLink gradsClassMethods	Function
+hi def link gradsClassMethods	Function
 
-HiLink gradsOperator		Operator
-HiLink gradsComment		Comment
+hi def link gradsOperator		Operator
+hi def link gradsComment		Comment
 
-HiLink gradsTypos		Error
+hi def link gradsTypos		Error
 
-delcommand HiLink
 
 let b:current_syntax = "grads"
diff --git a/runtime/syntax/gretl.vim b/runtime/syntax/gretl.vim
index 40eb544610..671142a9ea 100644
--- a/runtime/syntax/gretl.vim
+++ b/runtime/syntax/gretl.vim
@@ -62,25 +62,23 @@ syn region gBlockComment matchgroup=gCommentStart start="(\*" end="\*)"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink gComment      Comment
-HiLink gCommentStart Comment
-HiLink gBlockComment Comment
-HiLink gString       String
-HiLink gNumber       Number
-HiLink gBoolean      Boolean
-HiLink gFloat        Float
-HiLink gCommands     Repeat	
-HiLink gGenrFunc     Type
-HiLink gDelimiter    Delimiter
-HiLink gError        Error
-HiLink gBraceError   Error
-HiLink gCurlyError   Error
-HiLink gParenError   Error
-HiLink gIdentifier   Normal
-HiLink gVariable     Identifier
-HiLink gArrow	       Repeat
-delcommand HiLink
+hi def link gComment      Comment
+hi def link gCommentStart Comment
+hi def link gBlockComment Comment
+hi def link gString       String
+hi def link gNumber       Number
+hi def link gBoolean      Boolean
+hi def link gFloat        Float
+hi def link gCommands     Repeat	
+hi def link gGenrFunc     Type
+hi def link gDelimiter    Delimiter
+hi def link gError        Error
+hi def link gBraceError   Error
+hi def link gCurlyError   Error
+hi def link gParenError   Error
+hi def link gIdentifier   Normal
+hi def link gVariable     Identifier
+hi def link gArrow	       Repeat
 
 let b:current_syntax="gretl"
 
diff --git a/runtime/syntax/groovy.vim b/runtime/syntax/groovy.vim
index 84e3779e75..2245b79d04 100644
--- a/runtime/syntax/groovy.vim
+++ b/runtime/syntax/groovy.vim
@@ -56,9 +56,6 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-" don't use standard HiLink, it will not work with included syntax files
-command! -nargs=+ GroovyHiLink hi def link <args>
-
 " ##########################
 " Java stuff taken from java.vim
 " some characters that cannot be in a groovy program (outside a string)
@@ -138,9 +135,9 @@ if exists("groovy_highlight_groovy_lang_ids") || exists("groovy_highlight_groovy
   syn keyword groovyJavaLangObject clone equals finalize getClass hashCode
   syn keyword groovyJavaLangObject notify notifyAll toString wait
 
-  GroovyHiLink groovyLangClass                   groovyConstant
-  GroovyHiLink groovyJavaLangClass               groovyExternal
-  GroovyHiLink groovyJavaLangObject              groovyConstant
+  hi def link groovyLangClass                   groovyConstant
+  hi def link groovyJavaLangClass               groovyExternal
+  hi def link groovyJavaLangObject              groovyConstant
   syn cluster groovyTop add=groovyJavaLangObject,groovyJavaLangClass,groovyLangClass
   syn cluster groovyClasses add=groovyJavaLangClass,groovyLangClass
 endif
@@ -214,9 +211,9 @@ syn region  groovyComment          start="/\*"  end="\*/" contains=@groovyCommen
 syn match   groovyCommentStar      contained "^\s*\*[^/]"me=e-1
 syn match   groovyCommentStar      contained "^\s*\*$"
 syn match   groovyLineComment      "//.*" contains=@groovyCommentSpecial2,groovyTodo,@Spell
-GroovyHiLink groovyCommentString groovyString
-GroovyHiLink groovyComment2String groovyString
-GroovyHiLink groovyCommentCharacter groovyCharacter
+hi def link groovyCommentString groovyString
+hi def link groovyComment2String groovyString
+hi def link groovyCommentCharacter groovyCharacter
 
 syn cluster groovyTop add=groovyComment,groovyLineComment
 
@@ -257,12 +254,12 @@ endif
 " syn region groovyELExpr start=+${+ end=+}+ keepend contained
 syn match groovyELExpr /\${.\{-}}/ contained
 syn match groovyELExpr /\$[a-zA-Z_][a-zA-Z0-9_.]*/ contained
-GroovyHiLink groovyELExpr Identifier
+hi def link groovyELExpr Identifier
 
 " TODO: better matching. I am waiting to understand how it really works in groovy
 " syn region  groovyClosureParamsBraces          start=+|+ end=+|+ contains=groovyClosureParams
 " syn match groovyClosureParams	"[ a-zA-Z0-9_*]\+" contained
-" GroovyHiLink groovyClosureParams Identifier
+" hi def link groovyClosureParams Identifier
 
 " next line disabled, it can cause a crash for a long line
 "syn match   groovyStringError      +"\([^"\\]\|\\.\)*$+
@@ -323,21 +320,21 @@ if exists("groovy_highlight_debug")
 
   syn cluster groovyTop add=groovyDebug
 
-  GroovyHiLink groovyDebug                 Debug
-  GroovyHiLink groovyDebugString           DebugString
-  GroovyHiLink groovyDebugStringError      groovyError
-  GroovyHiLink groovyDebugType             DebugType
-  GroovyHiLink groovyDebugBoolean          DebugBoolean
-  GroovyHiLink groovyDebugNumber           Debug
-  GroovyHiLink groovyDebugSpecial          DebugSpecial
-  GroovyHiLink groovyDebugSpecialCharacter DebugSpecial
-  GroovyHiLink groovyDebugCharacter        DebugString
-  GroovyHiLink groovyDebugParen            Debug
+  hi def link groovyDebug                 Debug
+  hi def link groovyDebugString           DebugString
+  hi def link groovyDebugStringError      groovyError
+  hi def link groovyDebugType             DebugType
+  hi def link groovyDebugBoolean          DebugBoolean
+  hi def link groovyDebugNumber           Debug
+  hi def link groovyDebugSpecial          DebugSpecial
+  hi def link groovyDebugSpecialCharacter DebugSpecial
+  hi def link groovyDebugCharacter        DebugString
+  hi def link groovyDebugParen            Debug
 
-  GroovyHiLink DebugString               String
-  GroovyHiLink DebugSpecial              Special
-  GroovyHiLink DebugBoolean              Boolean
-  GroovyHiLink DebugType                 Type
+  hi def link DebugString               String
+  hi def link DebugSpecial              Special
+  hi def link DebugBoolean              Boolean
+  hi def link DebugType                 Type
 endif
 
 " Match all Exception classes
@@ -371,7 +368,7 @@ exec "syn sync ccomment groovyComment minlines=" . groovy_minlines
 
 if exists("groovy_mark_braces_in_parens_as_errors")
   syn match groovyInParen          contained "[{}]"
-  GroovyHiLink groovyInParen        groovyError
+  hi def link groovyInParen        groovyError
   syn cluster groovyTop add=groovyInParen
 endif
 
@@ -380,7 +377,7 @@ syn region  groovyParenT  transparent matchgroup=groovyParen  start="("  end=")"
 syn region  groovyParenT1 transparent matchgroup=groovyParen1 start="(" end=")" contains=@groovyTop,groovyParenT2 contained
 syn region  groovyParenT2 transparent matchgroup=groovyParen2 start="(" end=")" contains=@groovyTop,groovyParenT  contained
 syn match   groovyParenError       ")"
-GroovyHiLink groovyParenError       groovyError
+hi def link groovyParenError       groovyError
 
 " catch errors caused by wrong square parenthesis
 syn region  groovyParenT  transparent matchgroup=groovyParen  start="\["  end="\]" contains=@groovyTop,groovyParenT1
@@ -390,56 +387,54 @@ syn match   groovyParenError       "\]"
 
 " ###############################
 " java.vim default highlighting
-GroovyHiLink groovyFuncDef		Function
-GroovyHiLink groovyBraces		Function
-GroovyHiLink groovyBranch		Conditional
-GroovyHiLink groovyUserLabelRef	groovyUserLabel
-GroovyHiLink groovyLabel		Label
-GroovyHiLink groovyUserLabel		Label
-GroovyHiLink groovyConditional	Conditional
-GroovyHiLink groovyRepeat		Repeat
-GroovyHiLink groovyExceptions		Exception
-GroovyHiLink groovyAssert 		Statement
-GroovyHiLink groovyStorageClass	StorageClass
-GroovyHiLink groovyMethodDecl		groovyStorageClass
-GroovyHiLink groovyClassDecl		groovyStorageClass
-GroovyHiLink groovyScopeDecl		groovyStorageClass
-GroovyHiLink groovyBoolean		Boolean
-GroovyHiLink groovySpecial		Special
-GroovyHiLink groovySpecialError	Error
-GroovyHiLink groovySpecialCharError	Error
-GroovyHiLink groovyString		String
-GroovyHiLink groovyRegexChar		String
-GroovyHiLink groovyCharacter		Character
-GroovyHiLink groovySpecialChar	SpecialChar
-GroovyHiLink groovyNumber		Number
-GroovyHiLink groovyError		Error
-GroovyHiLink groovyStringError	Error
-GroovyHiLink groovyStatement		Statement
-GroovyHiLink groovyOperator		Operator
-GroovyHiLink groovyComment		Comment
-GroovyHiLink groovyDocComment		Comment
-GroovyHiLink groovyLineComment	Comment
-GroovyHiLink groovyConstant		Constant
-GroovyHiLink groovyTypedef		Typedef
-GroovyHiLink groovyTodo		Todo
+hi def link groovyFuncDef		Function
+hi def link groovyBraces		Function
+hi def link groovyBranch		Conditional
+hi def link groovyUserLabelRef	groovyUserLabel
+hi def link groovyLabel		Label
+hi def link groovyUserLabel		Label
+hi def link groovyConditional	Conditional
+hi def link groovyRepeat		Repeat
+hi def link groovyExceptions		Exception
+hi def link groovyAssert 		Statement
+hi def link groovyStorageClass	StorageClass
+hi def link groovyMethodDecl		groovyStorageClass
+hi def link groovyClassDecl		groovyStorageClass
+hi def link groovyScopeDecl		groovyStorageClass
+hi def link groovyBoolean		Boolean
+hi def link groovySpecial		Special
+hi def link groovySpecialError	Error
+hi def link groovySpecialCharError	Error
+hi def link groovyString		String
+hi def link groovyRegexChar		String
+hi def link groovyCharacter		Character
+hi def link groovySpecialChar	SpecialChar
+hi def link groovyNumber		Number
+hi def link groovyError		Error
+hi def link groovyStringError	Error
+hi def link groovyStatement		Statement
+hi def link groovyOperator		Operator
+hi def link groovyComment		Comment
+hi def link groovyDocComment		Comment
+hi def link groovyLineComment	Comment
+hi def link groovyConstant		Constant
+hi def link groovyTypedef		Typedef
+hi def link groovyTodo		Todo
 
-GroovyHiLink groovyCommentTitle	SpecialComment
-GroovyHiLink groovyDocTags		Special
-GroovyHiLink groovyDocParam		Function
-GroovyHiLink groovyCommentStar	groovyComment
+hi def link groovyCommentTitle	SpecialComment
+hi def link groovyDocTags		Special
+hi def link groovyDocParam		Function
+hi def link groovyCommentStar	groovyComment
 
-GroovyHiLink groovyType		Type
-GroovyHiLink groovyExternal		Include
+hi def link groovyType		Type
+hi def link groovyExternal		Include
 
-GroovyHiLink htmlComment		Special
-GroovyHiLink htmlCommentPart		Special
-GroovyHiLink groovySpaceError		Error
-GroovyHiLink groovyJDKBuiltin         Special
-GroovyHiLink groovyJDKOperOverl       Operator
-GroovyHiLink groovyJDKMethods         Function
-
-delcommand GroovyHiLink
+hi def link htmlComment		Special
+hi def link htmlCommentPart		Special
+hi def link groovySpaceError		Error
+hi def link groovyJDKBuiltin         Special
+hi def link groovyJDKOperOverl       Operator
+hi def link groovyJDKMethods         Function
 
 
 let b:current_syntax = "groovy"
diff --git a/runtime/syntax/gtkrc.vim b/runtime/syntax/gtkrc.vim
index e3a555006b..9c1bc2abb8 100644
--- a/runtime/syntax/gtkrc.vim
+++ b/runtime/syntax/gtkrc.vim
@@ -79,50 +79,48 @@ syn sync minlines=50
 syn sync match gtkrcSyncClass groupthere NONE "^\s*class\>"
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink gtkrcComment Comment
-HiLink gtkrcFixme Todo
+hi def link gtkrcComment Comment
+hi def link gtkrcFixme Todo
 
-HiLink gtkrcInclude Preproc
+hi def link gtkrcInclude Preproc
 
-HiLink gtkrcACString gtkrcString
-HiLink gtkrcBString gtkrcString
-HiLink gtkrcString String
-HiLink gtkrcNumber Number
-HiLink gtkrcStateName gtkrcConstant
-HiLink gtkrcPriorityName gtkrcConstant
-HiLink gtkrcTextDirName gtkrcConstant
-HiLink gtkrcSettingsName Function
-HiLink gtkrcStockName Function
-HiLink gtkrcConstant Constant
+hi def link gtkrcACString gtkrcString
+hi def link gtkrcBString gtkrcString
+hi def link gtkrcString String
+hi def link gtkrcNumber Number
+hi def link gtkrcStateName gtkrcConstant
+hi def link gtkrcPriorityName gtkrcConstant
+hi def link gtkrcTextDirName gtkrcConstant
+hi def link gtkrcSettingsName Function
+hi def link gtkrcStockName Function
+hi def link gtkrcConstant Constant
 
-HiLink gtkrcPathSpecial gtkrcSpecial
-HiLink gtkrcWPathSpecial gtkrcSpecial
-HiLink gtkrcRGBColor gtkrcSpecial
-HiLink gtkrcKeyMod gtkrcSpecial
-HiLink gtkrcSpecial Special
+hi def link gtkrcPathSpecial gtkrcSpecial
+hi def link gtkrcWPathSpecial gtkrcSpecial
+hi def link gtkrcRGBColor gtkrcSpecial
+hi def link gtkrcKeyMod gtkrcSpecial
+hi def link gtkrcSpecial Special
 
-HiLink gtkrcTop gtkrcKeyword
-HiLink gtkrcPathSet gtkrcKeyword
-HiLink gtkrcStyleKeyword gtkrcKeyword
-HiLink gtkrcFunction gtkrcKeyword
-HiLink gtkrcBind gtkrcKeyword
-HiLink gtkrcKeyword Keyword
+hi def link gtkrcTop gtkrcKeyword
+hi def link gtkrcPathSet gtkrcKeyword
+hi def link gtkrcStyleKeyword gtkrcKeyword
+hi def link gtkrcFunction gtkrcKeyword
+hi def link gtkrcBind gtkrcKeyword
+hi def link gtkrcKeyword Keyword
 
-HiLink gtkrcClassNameGnome gtkrcGtkClass
-HiLink gtkrcClassName gtkrcGtkClass
-HiLink gtkrcFunctionName gtkrcGtkClass
-HiLink gtkrcGtkClass Type
+hi def link gtkrcClassNameGnome gtkrcGtkClass
+hi def link gtkrcClassName gtkrcGtkClass
+hi def link gtkrcFunctionName gtkrcGtkClass
+hi def link gtkrcGtkClass Type
 
-HiLink gtkrcImage gtkrcOtherword
-HiLink gtkrcOtherword Function
+hi def link gtkrcImage gtkrcOtherword
+hi def link gtkrcOtherword Function
 
-HiLink gtkrcParenError gtkrcError
-HiLink gtkrcBraceError gtkrcError
-HiLink gtkrcBracketError gtkrcError
-HiLink gtkrcError Error
+hi def link gtkrcParenError gtkrcError
+hi def link gtkrcBraceError gtkrcError
+hi def link gtkrcBracketError gtkrcError
+hi def link gtkrcError Error
 
-delcommand HiLink
 
 let b:current_syntax = "gtkrc"
diff --git a/runtime/syntax/hamster.vim b/runtime/syntax/hamster.vim
index f9aada251f..64d9598a71 100644
--- a/runtime/syntax/hamster.vim
+++ b/runtime/syntax/hamster.vim
@@ -357,15 +357,13 @@ syn sync ccomment hamsterHashComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink hamsterHashComment	Comment
-HiLink hamsterSpecial	Special
-HiLink hamsterStatement	Statement
-HiLink hamsterString	String
-HiLink hamsterFunction	Function
+hi def link hamsterHashComment	Comment
+hi def link hamsterSpecial	Special
+hi def link hamsterStatement	Statement
+hi def link hamsterString	String
+hi def link hamsterFunction	Function
 
-delcommand HiLink
 
 let b:current_syntax = "hamster"
 
diff --git a/runtime/syntax/haskell.vim b/runtime/syntax/haskell.vim
index 86d554ba36..11f4c35a58 100644
--- a/runtime/syntax/haskell.vim
+++ b/runtime/syntax/haskell.vim
@@ -126,58 +126,56 @@ syn region	cCppString	start=+L\="+ skip=+\\\\\|\\"\|\\$+ excludenl end=+"+ end='
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink hsModule			  hsStructure
-HiLink hsImport			  Include
-HiLink hsImportMod			  hsImport
-HiLink hsInfix			  PreProc
-HiLink hsStructure			  Structure
-HiLink hsStatement			  Statement
-HiLink hsConditional			  Conditional
-HiLink hsSpecialChar			  SpecialChar
-HiLink hsTypedef			  Typedef
-HiLink hsVarSym			  hsOperator
-HiLink hsConSym			  hsOperator
-HiLink hsOperator			  Operator
+hi def link hsModule			  hsStructure
+hi def link hsImport			  Include
+hi def link hsImportMod			  hsImport
+hi def link hsInfix			  PreProc
+hi def link hsStructure			  Structure
+hi def link hsStatement			  Statement
+hi def link hsConditional			  Conditional
+hi def link hsSpecialChar			  SpecialChar
+hi def link hsTypedef			  Typedef
+hi def link hsVarSym			  hsOperator
+hi def link hsConSym			  hsOperator
+hi def link hsOperator			  Operator
 if exists("hs_highlight_delimiters")
 " Some people find this highlighting distracting.
-HiLink hsDelimiter			  Delimiter
+hi def link hsDelimiter			  Delimiter
 endif
-HiLink hsSpecialCharError		  Error
-HiLink hsString			  String
-HiLink hsCharacter			  Character
-HiLink hsNumber			  Number
-HiLink hsFloat			  Float
-HiLink hsConditional			  Conditional
-HiLink hsLiterateComment		  hsComment
-HiLink hsBlockComment		  hsComment
-HiLink hsLineComment			  hsComment
-HiLink hsComment			  Comment
-HiLink hsPragma			  SpecialComment
-HiLink hsBoolean			  Boolean
-HiLink hsType			  Type
-HiLink hsMaybe			  hsEnumConst
-HiLink hsOrdering			  hsEnumConst
-HiLink hsEnumConst			  Constant
-HiLink hsDebug			  Debug
+hi def link hsSpecialCharError		  Error
+hi def link hsString			  String
+hi def link hsCharacter			  Character
+hi def link hsNumber			  Number
+hi def link hsFloat			  Float
+hi def link hsConditional			  Conditional
+hi def link hsLiterateComment		  hsComment
+hi def link hsBlockComment		  hsComment
+hi def link hsLineComment			  hsComment
+hi def link hsComment			  Comment
+hi def link hsPragma			  SpecialComment
+hi def link hsBoolean			  Boolean
+hi def link hsType			  Type
+hi def link hsMaybe			  hsEnumConst
+hi def link hsOrdering			  hsEnumConst
+hi def link hsEnumConst			  Constant
+hi def link hsDebug			  Debug
 
-HiLink cCppString		hsString
-HiLink cCommentStart		hsComment
-HiLink cCommentError		hsError
-HiLink cCommentStartError	hsError
-HiLink cInclude		Include
-HiLink cPreProc		PreProc
-HiLink cDefine		Macro
-HiLink cIncluded		hsString
-HiLink cError			Error
-HiLink cPreCondit		PreCondit
-HiLink cComment		Comment
-HiLink cCppSkip		cCppOut
-HiLink cCppOut2		cCppOut
-HiLink cCppOut		Comment
+hi def link cCppString		hsString
+hi def link cCommentStart		hsComment
+hi def link cCommentError		hsError
+hi def link cCommentStartError	hsError
+hi def link cInclude		Include
+hi def link cPreProc		PreProc
+hi def link cDefine		Macro
+hi def link cIncluded		hsString
+hi def link cError			Error
+hi def link cPreCondit		PreCondit
+hi def link cComment		Comment
+hi def link cCppSkip		cCppOut
+hi def link cCppOut2		cCppOut
+hi def link cCppOut		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "haskell"
 
diff --git a/runtime/syntax/hb.vim b/runtime/syntax/hb.vim
index ab2fb7fbad..7bff1df9fb 100644
--- a/runtime/syntax/hb.vim
+++ b/runtime/syntax/hb.vim
@@ -61,22 +61,20 @@ syn match HBComment "^#.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink HBhtmlString			 String
-HiLink HBhtmlTagN			 Function
-HiLink htmlSpecialChar		 String
+hi def link HBhtmlString			 String
+hi def link HBhtmlTagN			 Function
+hi def link htmlSpecialChar		 String
 
-HiLink HBInvalidLine Error
-HiLink HBFoobar Comment
+hi def link HBInvalidLine Error
+hi def link HBFoobar Comment
 hi HBFileName guibg=lightgray guifg=black
-HiLink HBDirectiveError Error
-HiLink HBDirectiveBlockEnd HBDirectiveKeyword
+hi def link HBDirectiveError Error
+hi def link HBDirectiveBlockEnd HBDirectiveKeyword
 hi HBDirectiveKeyword guibg=lightgray guifg=darkgreen
-HiLink HBComment Comment
-HiLink HBhtmlTagSk Statement
+hi def link HBComment Comment
+hi def link HBhtmlTagSk Statement
 
-delcommand HiLink
 
 syn sync match Normal grouphere NONE "^:\s*$"
 syn sync match Normal grouphere NONE "^:\s*lib\s\+[^ \t]\+$"
diff --git a/runtime/syntax/hercules.vim b/runtime/syntax/hercules.vim
index 2a786768dc..d305707662 100644
--- a/runtime/syntax/hercules.vim
+++ b/runtime/syntax/hercules.vim
@@ -99,22 +99,20 @@ syn sync      lines=100
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink herculesStatement  Statement
-HiLink herculesType       Type
-HiLink herculesComment    Comment
-HiLink herculesPreProc    PreProc
-HiLink herculesTodo       Todo
-HiLink herculesOutput     Include
-HiLink herculesCmdCmnt    Identifier
-HiLink herculesNumber     Number
-HiLink herculesBraceError herculesError
-HiLink herculesCurlyError herculesError
-HiLink herculesParenError herculesError
-HiLink herculesError      Error
+hi def link herculesStatement  Statement
+hi def link herculesType       Type
+hi def link herculesComment    Comment
+hi def link herculesPreProc    PreProc
+hi def link herculesTodo       Todo
+hi def link herculesOutput     Include
+hi def link herculesCmdCmnt    Identifier
+hi def link herculesNumber     Number
+hi def link herculesBraceError herculesError
+hi def link herculesCurlyError herculesError
+hi def link herculesParenError herculesError
+hi def link herculesError      Error
 
-delcommand HiLink
 
 let b:current_syntax = "hercules"
 
diff --git a/runtime/syntax/hex.vim b/runtime/syntax/hex.vim
index d2637eaaea..35edf08e9f 100644
--- a/runtime/syntax/hex.vim
+++ b/runtime/syntax/hex.vim
@@ -66,25 +66,23 @@ syn region hexExtAdrBlock start="^:[0-9a-fA-F]\{7}[24]" skip="^:[0-9a-fA-F]\{7}0
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later
-HiLink hexRecStart            hexRecType
-HiLink hexDataByteCount       Constant
+hi def link hexRecStart            hexRecType
+hi def link hexDataByteCount       Constant
 hi def hexAddressFieldUnknown term=italic cterm=italic gui=italic
-HiLink hexDataAddress         Comment
-HiLink hexNoAddress           DiffAdd
-HiLink hexRecTypeUnknown      hexRecType
-HiLink hexRecType             WarningMsg
+hi def link hexDataAddress         Comment
+hi def link hexNoAddress           DiffAdd
+hi def link hexRecTypeUnknown      hexRecType
+hi def link hexRecType             WarningMsg
 hi def hexDataFieldUnknown    term=italic cterm=italic gui=italic
 hi def hexDataOdd             term=bold cterm=bold gui=bold
 hi def hexDataEven            term=NONE cterm=NONE gui=NONE
-HiLink hexDataUnexpected      Error
-HiLink hexExtendedAddress     hexDataAddress
-HiLink hexStartAddress        hexDataAddress
-HiLink hexChecksum            DiffChange
+hi def link hexDataUnexpected      Error
+hi def link hexExtendedAddress     hexDataAddress
+hi def link hexStartAddress        hexDataAddress
+hi def link hexChecksum            DiffChange
 
-delcommand HiLink
 
 let b:current_syntax = "hex"
 
diff --git a/runtime/syntax/html.vim b/runtime/syntax/html.vim
index ac31e4848d..336d8c9f44 100644
--- a/runtime/syntax/html.vim
+++ b/runtime/syntax/html.vim
@@ -18,9 +18,6 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-" don't use standard HiLink, it will not work with included syntax files
-command! -nargs=+ HtmlHiLink hi def link <args>
-
 syntax spell toplevel
 
 syn case ignore
@@ -164,7 +161,7 @@ if main_syntax != 'java' || exists("java_javascript")
   unlet b:current_syntax
   syn region  javaScript start=+<script\_[^>]*>+ keepend end=+</script\_[^>]*>+me=s-1 contains=@htmlJavaScript,htmlCssStyleComment,htmlScriptTag,@htmlPreproc
   syn region  htmlScriptTag     contained start=+<script+ end=+>+ fold contains=htmlTagN,htmlString,htmlArg,htmlValue,htmlTagError,htmlEvent
-  HtmlHiLink htmlScriptTag htmlTag
+  hi def link htmlScriptTag htmlTag
 
   " html events (i.e. arguments that include javascript commands)
   if exists("html_extended_events")
@@ -176,8 +173,8 @@ if main_syntax != 'java' || exists("java_javascript")
   endif
   syn region htmlEventSQ        contained start=+'+ms=s+1 end=+'+me=s-1 contains=@htmlJavaScript
   syn region htmlEventDQ        contained start=+"+ms=s+1 end=+"+me=s-1 contains=@htmlJavaScript
-  HtmlHiLink htmlEventSQ htmlEvent
-  HtmlHiLink htmlEventDQ htmlEvent
+  hi def link htmlEventSQ htmlEvent
+  hi def link htmlEventDQ htmlEvent
 
   " a javascript expression is used as an arg value
   syn region  javaScriptExpression contained start=+&{+ keepend end=+};+ contains=@htmlJavaScript,@htmlPreproc
@@ -200,7 +197,7 @@ if main_syntax != 'java' || exists("java_css")
   syn region cssStyle start=+<style+ keepend end=+</style>+ contains=@htmlCss,htmlTag,htmlEndTag,htmlCssStyleComment,@htmlPreproc
   syn match htmlCssStyleComment contained "\(<!--\|-->\)"
   syn region htmlCssDefinition matchgroup=htmlArg start='style="' keepend matchgroup=htmlString end='"' contains=css.*Attr,css.*Prop,cssComment,cssLength,cssColor,cssURL,cssImportant,cssError,cssString,@htmlPreproc
-  HtmlHiLink htmlStyleArg htmlString
+  hi def link htmlStyleArg htmlString
 endif
 
 if main_syntax == "html"
@@ -214,33 +211,33 @@ if main_syntax == "html"
 endif
 
 " The default highlighting.
-HtmlHiLink htmlTag                     Function
-HtmlHiLink htmlEndTag                  Identifier
-HtmlHiLink htmlArg                     Type
-HtmlHiLink htmlTagName                 htmlStatement
-HtmlHiLink htmlSpecialTagName          Exception
-HtmlHiLink htmlValue                     String
-HtmlHiLink htmlSpecialChar             Special
+hi def link htmlTag                     Function
+hi def link htmlEndTag                  Identifier
+hi def link htmlArg                     Type
+hi def link htmlTagName                 htmlStatement
+hi def link htmlSpecialTagName          Exception
+hi def link htmlValue                     String
+hi def link htmlSpecialChar             Special
 
 if !exists("html_no_rendering")
-  HtmlHiLink htmlH1                      Title
-  HtmlHiLink htmlH2                      htmlH1
-  HtmlHiLink htmlH3                      htmlH2
-  HtmlHiLink htmlH4                      htmlH3
-  HtmlHiLink htmlH5                      htmlH4
-  HtmlHiLink htmlH6                      htmlH5
-  HtmlHiLink htmlHead                    PreProc
-  HtmlHiLink htmlTitle                   Title
-  HtmlHiLink htmlBoldItalicUnderline     htmlBoldUnderlineItalic
-  HtmlHiLink htmlUnderlineBold           htmlBoldUnderline
-  HtmlHiLink htmlUnderlineItalicBold     htmlBoldUnderlineItalic
-  HtmlHiLink htmlUnderlineBoldItalic     htmlBoldUnderlineItalic
-  HtmlHiLink htmlItalicUnderline         htmlUnderlineItalic
-  HtmlHiLink htmlItalicBold              htmlBoldItalic
-  HtmlHiLink htmlItalicBoldUnderline     htmlBoldUnderlineItalic
-  HtmlHiLink htmlItalicUnderlineBold     htmlBoldUnderlineItalic
-  HtmlHiLink htmlLink                    Underlined
-  HtmlHiLink htmlLeadingSpace            None
+  hi def link htmlH1                      Title
+  hi def link htmlH2                      htmlH1
+  hi def link htmlH3                      htmlH2
+  hi def link htmlH4                      htmlH3
+  hi def link htmlH5                      htmlH4
+  hi def link htmlH6                      htmlH5
+  hi def link htmlHead                    PreProc
+  hi def link htmlTitle                   Title
+  hi def link htmlBoldItalicUnderline     htmlBoldUnderlineItalic
+  hi def link htmlUnderlineBold           htmlBoldUnderline
+  hi def link htmlUnderlineItalicBold     htmlBoldUnderlineItalic
+  hi def link htmlUnderlineBoldItalic     htmlBoldUnderlineItalic
+  hi def link htmlItalicUnderline         htmlUnderlineItalic
+  hi def link htmlItalicBold              htmlBoldItalic
+  hi def link htmlItalicBoldUnderline     htmlBoldUnderlineItalic
+  hi def link htmlItalicUnderlineBold     htmlBoldUnderlineItalic
+  hi def link htmlLink                    Underlined
+  hi def link htmlLeadingSpace            None
   if !exists("html_my_rendering")
     hi def htmlBold                term=bold cterm=bold gui=bold
     hi def htmlBoldUnderline       term=bold,underline cterm=bold,underline gui=bold,underline
@@ -252,30 +249,28 @@ if !exists("html_no_rendering")
   endif
 endif
 
-HtmlHiLink htmlPreStmt            PreProc
-HtmlHiLink htmlPreError           Error
-HtmlHiLink htmlPreProc            PreProc
-HtmlHiLink htmlPreAttr            String
-HtmlHiLink htmlPreProcAttrName    PreProc
-HtmlHiLink htmlPreProcAttrError   Error
-HtmlHiLink htmlSpecial            Special
-HtmlHiLink htmlSpecialChar        Special
-HtmlHiLink htmlString             String
-HtmlHiLink htmlStatement          Statement
-HtmlHiLink htmlComment            Comment
-HtmlHiLink htmlCommentPart        Comment
-HtmlHiLink htmlValue              String
-HtmlHiLink htmlCommentError       htmlError
-HtmlHiLink htmlTagError           htmlError
-HtmlHiLink htmlEvent              javaScript
-HtmlHiLink htmlError              Error
+hi def link htmlPreStmt            PreProc
+hi def link htmlPreError           Error
+hi def link htmlPreProc            PreProc
+hi def link htmlPreAttr            String
+hi def link htmlPreProcAttrName    PreProc
+hi def link htmlPreProcAttrError   Error
+hi def link htmlSpecial            Special
+hi def link htmlSpecialChar        Special
+hi def link htmlString             String
+hi def link htmlStatement          Statement
+hi def link htmlComment            Comment
+hi def link htmlCommentPart        Comment
+hi def link htmlValue              String
+hi def link htmlCommentError       htmlError
+hi def link htmlTagError           htmlError
+hi def link htmlEvent              javaScript
+hi def link htmlError              Error
 
-HtmlHiLink javaScript             Special
-HtmlHiLink javaScriptExpression   javaScript
-HtmlHiLink htmlCssStyleComment    Comment
-HtmlHiLink htmlCssDefinition      Special
-
-delcommand HtmlHiLink
+hi def link javaScript             Special
+hi def link javaScriptExpression   javaScript
+hi def link htmlCssStyleComment    Comment
+hi def link htmlCssDefinition      Special
 
 let b:current_syntax = "html"
 
diff --git a/runtime/syntax/htmlos.vim b/runtime/syntax/htmlos.vim
index 530c046bac..b54ca7a921 100644
--- a/runtime/syntax/htmlos.vim
+++ b/runtime/syntax/htmlos.vim
@@ -115,33 +115,31 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink	 htmlosSpecialIdentifier	Operator
-HiLink	 htmlosIdentifier	Identifier
-HiLink	 htmlosStorageClass	StorageClass
-HiLink	 htmlosComment	Comment
-HiLink	 htmlosBoolean	Boolean
-HiLink	 htmlosStringSingle	String
-HiLink	 htmlosStringDouble	String
-HiLink	 htmlosNumber	Number
-HiLink	 htmlosFloat	Float
-HiLink	 htmlosFunctions	Function
-HiLink	 htmlosRepeat	Repeat
-HiLink	 htmlosConditional	Conditional
-HiLink	 htmlosLabel	Label
-HiLink	 htmlosStatement	Statement
-HiLink	 htmlosKeyword	Statement
-HiLink	 htmlosType	Type
-HiLink	 htmlosDefine	Define
-HiLink	 htmlosParent	Delimiter
-HiLink	 htmlosError	Error
-HiLink	 htmlosTodo	Todo
-HiLink	htmlosOperator	Operator
-HiLink	htmlosRelation	Operator
+hi def link htmlosSpecialIdentifier	Operator
+hi def link htmlosIdentifier	Identifier
+hi def link htmlosStorageClass	StorageClass
+hi def link htmlosComment	Comment
+hi def link htmlosBoolean	Boolean
+hi def link htmlosStringSingle	String
+hi def link htmlosStringDouble	String
+hi def link htmlosNumber	Number
+hi def link htmlosFloat	Float
+hi def link htmlosFunctions	Function
+hi def link htmlosRepeat	Repeat
+hi def link htmlosConditional	Conditional
+hi def link htmlosLabel	Label
+hi def link htmlosStatement	Statement
+hi def link htmlosKeyword	Statement
+hi def link htmlosType	Type
+hi def link htmlosDefine	Define
+hi def link htmlosParent	Delimiter
+hi def link htmlosError	Error
+hi def link htmlosTodo	Todo
+hi def link htmlosOperator	Operator
+hi def link htmlosRelation	Operator
 
-delcommand HiLink
 let b:current_syntax = "htmlos"
 
 if main_syntax == 'htmlos'
diff --git a/runtime/syntax/ia64.vim b/runtime/syntax/ia64.vim
index 10d069de3f..544fcd402c 100644
--- a/runtime/syntax/ia64.vim
+++ b/runtime/syntax/ia64.vim
@@ -262,34 +262,32 @@ syn match ia64data "stringz\=\(\(\(\.ua\)\=\(\.msb\|\.lsb\)\=\)\|\(\(\.msb\|\.ls
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 "put masm groups with our groups
-HiLink masmOperator	ia64operator
-HiLink masmDirective	ia64Directive
-HiLink masmOpcode	ia64Opcode
-HiLink masmIdentifier	ia64Identifier
-HiLink masmFloat	ia64Float
+hi def link masmOperator	ia64operator
+hi def link masmDirective	ia64Directive
+hi def link masmOpcode	ia64Opcode
+hi def link masmIdentifier	ia64Identifier
+hi def link masmFloat	ia64Float
 
 "ia64 specific stuff
-HiLink ia64Label	Define
-HiLink ia64Comment	Comment
-HiLink ia64Directive	Type
-HiLink ia64opcode	Statement
-HiLink ia64registers	Operator
-HiLink ia64string	String
-HiLink ia64Hex		Number
-HiLink ia64Binary	Number
-HiLink ia64Octal	Number
-HiLink ia64Float	Float
-HiLink ia64Decimal	Number
-HiLink ia64Identifier	Identifier
-HiLink ia64data		Type
-HiLink ia64delimiter	Delimiter
-HiLink ia64operator	Operator
-HiLink ia64Todo		Todo
+hi def link ia64Label	Define
+hi def link ia64Comment	Comment
+hi def link ia64Directive	Type
+hi def link ia64opcode	Statement
+hi def link ia64registers	Operator
+hi def link ia64string	String
+hi def link ia64Hex		Number
+hi def link ia64Binary	Number
+hi def link ia64Octal	Number
+hi def link ia64Float	Float
+hi def link ia64Decimal	Number
+hi def link ia64Identifier	Identifier
+hi def link ia64data		Type
+hi def link ia64delimiter	Delimiter
+hi def link ia64operator	Operator
+hi def link ia64Todo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "ia64"
 
diff --git a/runtime/syntax/icon.vim b/runtime/syntax/icon.vim
index 1bd12d3220..179d75cd28 100644
--- a/runtime/syntax/icon.vim
+++ b/runtime/syntax/icon.vim
@@ -155,47 +155,45 @@ exec "syn sync ccomment iconComment minlines=" . icon_minlines
 " Define the default highlighting.
 
 " Only when an item doesn't have highlighting
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
 
-" HiLink iconSpecialCharacter	iconSpecial
+" hi def link iconSpecialCharacter	iconSpecial
 
-HiLink iconOctalError		iconError
-HiLink iconParenError		iconError
-HiLink iconInParen		iconError
-HiLink iconCommentError	iconError
-HiLink iconSpaceError		iconError
-HiLink iconCommentError	iconError
-HiLink iconIncluded		iconString
-HiLink iconCommentString	iconString
-HiLink iconComment2String	iconString
-HiLink iconCommentSkip	iconComment
+hi def link iconOctalError		iconError
+hi def link iconParenError		iconError
+hi def link iconInParen		iconError
+hi def link iconCommentError	iconError
+hi def link iconSpaceError		iconError
+hi def link iconCommentError	iconError
+hi def link iconIncluded		iconString
+hi def link iconCommentString	iconString
+hi def link iconComment2String	iconString
+hi def link iconCommentSkip	iconComment
 
-HiLink iconUserLabel		Label
-HiLink iconCharacter		Character
-HiLink iconNumber			Number
-HiLink iconRadix			Number
-HiLink iconFloat			Float
-HiLink iconInclude		Include
-HiLink iconPreProc		PreProc
-HiLink iconDefine			Macro
-HiLink iconError			Error
-HiLink iconStatement		Statement
-HiLink iconPreCondit		PreCondit
-HiLink iconString			String
-HiLink iconCset			String
-HiLink iconComment		Comment
-HiLink iconSpecial		SpecialChar
-HiLink iconTodo			Todo
-HiLink iconStorageClass	StorageClass
-HiLink iconFunction		Statement
-HiLink iconReserved		Label
-HiLink iconKeyword		Operator
+hi def link iconUserLabel		Label
+hi def link iconCharacter		Character
+hi def link iconNumber			Number
+hi def link iconRadix			Number
+hi def link iconFloat			Float
+hi def link iconInclude		Include
+hi def link iconPreProc		PreProc
+hi def link iconDefine			Macro
+hi def link iconError			Error
+hi def link iconStatement		Statement
+hi def link iconPreCondit		PreCondit
+hi def link iconString			String
+hi def link iconCset			String
+hi def link iconComment		Comment
+hi def link iconSpecial		SpecialChar
+hi def link iconTodo			Todo
+hi def link iconStorageClass	StorageClass
+hi def link iconFunction		Statement
+hi def link iconReserved		Label
+hi def link iconKeyword		Operator
 
-"HiLink iconIdentifier	Identifier
+"hi def link iconIdentifier	Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "icon"
 
diff --git a/runtime/syntax/idl.vim b/runtime/syntax/idl.vim
index c51850b13a..6a4ce7e087 100644
--- a/runtime/syntax/idl.vim
+++ b/runtime/syntax/idl.vim
@@ -222,100 +222,98 @@ try
   if !exists("did_idl_syntax_inits")
     let did_idl_syntax_inits = 1
     " The default methods for highlighting.  Can be overridden later
-    command -nargs=+ HiLink hi def link <args>
 
-    HiLink idlInclude             Include
-    HiLink idlPreProc             PreProc
-    HiLink idlPreCondit           PreCondit
-    HiLink idlDefine              Macro
-    HiLink idlIncluded            String
-    HiLink idlString              String
-    HiLink idlComment             Comment
-    HiLink idlTodo                Todo
-    HiLink idlLiteral             Number
-    HiLink idlUuid                Number
-    HiLink idlType                Type
-    HiLink idlVariantType         idlType
+    hi def link idlInclude             Include
+    hi def link idlPreProc             PreProc
+    hi def link idlPreCondit           PreCondit
+    hi def link idlDefine              Macro
+    hi def link idlIncluded            String
+    hi def link idlString              String
+    hi def link idlComment             Comment
+    hi def link idlTodo                Todo
+    hi def link idlLiteral             Number
+    hi def link idlUuid                Number
+    hi def link idlType                Type
+    hi def link idlVariantType         idlType
 
-    HiLink idlModule              Keyword
-    HiLink idlInterface           Keyword
-    HiLink idlEnum                Keyword
-    HiLink idlStruct              Keyword
-    HiLink idlUnion               Keyword
-    HiLink idlTypedef             Keyword
-    HiLink idlException           Keyword
-    HiLink idlTypedefOtherTypeQualifier keyword
+    hi def link idlModule              Keyword
+    hi def link idlInterface           Keyword
+    hi def link idlEnum                Keyword
+    hi def link idlStruct              Keyword
+    hi def link idlUnion               Keyword
+    hi def link idlTypedef             Keyword
+    hi def link idlException           Keyword
+    hi def link idlTypedefOtherTypeQualifier keyword
 
-    HiLink idlModuleName          Typedef
-    HiLink idlInterfaceName       Typedef
-    HiLink idlEnumName            Typedef
-    HiLink idlStructName          Typedef
-    HiLink idlUnionName           Typedef
+    hi def link idlModuleName          Typedef
+    hi def link idlInterfaceName       Typedef
+    hi def link idlEnumName            Typedef
+    hi def link idlStructName          Typedef
+    hi def link idlUnionName           Typedef
 
-    HiLink idlBaseTypeInt         idlType
-    HiLink idlBaseType            idlType
-    HiLink idlSeqType             idlType
-    HiLink idlD1                  Paren
-    HiLink idlD2                  Paren
-    HiLink idlD3                  Paren
-    HiLink idlD4                  Paren
-    "HiLink idlArraySize          Paren
-    "HiLink idlArraySize1         Paren
-    HiLink idlModuleContent       Paren
-    HiLink idlUnionContent        Paren
-    HiLink idlStructContent       Paren
-    HiLink idlEnumContents        Paren
-    HiLink idlInterfaceContent    Paren
+    hi def link idlBaseTypeInt         idlType
+    hi def link idlBaseType            idlType
+    hi def link idlSeqType             idlType
+    hi def link idlD1                  Paren
+    hi def link idlD2                  Paren
+    hi def link idlD3                  Paren
+    hi def link idlD4                  Paren
+    "hi def link idlArraySize          Paren
+    "hi def link idlArraySize1         Paren
+    hi def link idlModuleContent       Paren
+    hi def link idlUnionContent        Paren
+    hi def link idlStructContent       Paren
+    hi def link idlEnumContents        Paren
+    hi def link idlInterfaceContent    Paren
 
-    HiLink idlSimpDecl            Identifier
-    HiLink idlROAttr              StorageClass
-    HiLink idlAttr                Keyword
-    HiLink idlConst               StorageClass
+    hi def link idlSimpDecl            Identifier
+    hi def link idlROAttr              StorageClass
+    hi def link idlAttr                Keyword
+    hi def link idlConst               StorageClass
 
-    HiLink idlOneWayOp            StorageClass
-    HiLink idlOp                  idlType
-    HiLink idlParmType            idlType
-    HiLink idlOpName              Function
-    HiLink idlOpParms             SpecialComment
-    HiLink idlParmName            Identifier
-    HiLink idlInheritFrom         Identifier
-    HiLink idlAttribute           SpecialComment
+    hi def link idlOneWayOp            StorageClass
+    hi def link idlOp                  idlType
+    hi def link idlParmType            idlType
+    hi def link idlOpName              Function
+    hi def link idlOpParms             SpecialComment
+    hi def link idlParmName            Identifier
+    hi def link idlInheritFrom         Identifier
+    hi def link idlAttribute           SpecialComment
 
-    HiLink idlId                  Constant
-    "HiLink idlCase               Keyword
-    HiLink idlCaseLabel           Constant
+    hi def link idlId                  Constant
+    "hi def link idlCase               Keyword
+    hi def link idlCaseLabel           Constant
 
-    HiLink idlErrorBracket        Error
-    HiLink idlErrorBrace          Error
-    HiLink idlErrorSquareBracket  Error
+    hi def link idlErrorBracket        Error
+    hi def link idlErrorBrace          Error
+    hi def link idlErrorSquareBracket  Error
 
-    HiLink idlImport              Keyword
-    HiLink idlImportString        idlString
-    HiLink idlCoclassAttribute    StorageClass
-    HiLink idlLibrary             Keyword
-    HiLink idlImportlib           Keyword
-    HiLink idlCoclass             Keyword
-    HiLink idlLibraryName         Typedef
-    HiLink idlCoclassName         Typedef
-    " hi idlLibraryContent guifg=red
-    HiLink idlTypedefDecl         Typedef
-    HiLink idlDefEnum             Keyword
-    HiLink idlDefv1Enum           Keyword
-    HiLink idlDefEnumName         Typedef
-    HiLink idlDefEnumContents     Paren
-    HiLink idlDefBaseTypeInt      idlType
-    HiLink idlDefBaseType         idlType
-    HiLink idlDefSeqType          idlType
-    HiLink idlInterfaceSections   Label
+    hi def link idlImport              Keyword
+    hi def link idlImportString        idlString
+    hi def link idlCoclassAttribute    StorageClass
+    hi def link idlLibrary             Keyword
+    hi def link idlImportlib           Keyword
+    hi def link idlCoclass             Keyword
+    hi def link idlLibraryName         Typedef
+    hi def link idlCoclassName         Typedef
+    " hi def link idlLibraryContent guifg=red
+    hi def link idlTypedefDecl         Typedef
+    hi def link idlDefEnum             Keyword
+    hi def link idlDefv1Enum           Keyword
+    hi def link idlDefEnumName         Typedef
+    hi def link idlDefEnumContents     Paren
+    hi def link idlDefBaseTypeInt      idlType
+    hi def link idlDefBaseType         idlType
+    hi def link idlDefSeqType          idlType
+    hi def link idlInterfaceSections   Label
 
     if exists("idlsyntax_showerror")
       if exists("idlsyntax_showerror_soft")
         hi default idlError guibg=#d0ffd0
       else
-        HiLink idlError Error
+        hi def link idlError Error
       endif
     endif
-    delcommand HiLink
   endif
 
   let b:current_syntax = "idl"
diff --git a/runtime/syntax/idlang.vim b/runtime/syntax/idlang.vim
index 6d639c9fa4..14e976ce05 100644
--- a/runtime/syntax/idlang.vim
+++ b/runtime/syntax/idlang.vim
@@ -217,26 +217,24 @@ syn keyword idlangRoutine XVOLUME_WRITE_IMAGE XYOUTS ZOOM ZOOM_24
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink idlangConditional	Conditional
-HiLink idlangRoutine	Type
-HiLink idlangStatement	Statement
-HiLink idlangContinueLine	Todo
-HiLink idlangRealNumber	Float
-HiLink idlangNumber	Number
-HiLink idlangString	String
-HiLink idlangOperator	Operator
-HiLink idlangComment	Comment
-HiLink idlangTodo	Todo
-HiLink idlangPreCondit	Identifier
-HiLink idlangDblCommaError	Error
-HiLink idlangStop	Error
-HiLink idlangStrucvar	PreProc
-HiLink idlangSystem	Identifier
-HiLink idlangKeyword	Special
+hi def link idlangConditional	Conditional
+hi def link idlangRoutine	Type
+hi def link idlangStatement	Statement
+hi def link idlangContinueLine	Todo
+hi def link idlangRealNumber	Float
+hi def link idlangNumber	Number
+hi def link idlangString	String
+hi def link idlangOperator	Operator
+hi def link idlangComment	Comment
+hi def link idlangTodo	Todo
+hi def link idlangPreCondit	Identifier
+hi def link idlangDblCommaError	Error
+hi def link idlangStop	Error
+hi def link idlangStrucvar	PreProc
+hi def link idlangSystem	Identifier
+hi def link idlangKeyword	Special
 
-delcommand HiLink
 
 let b:current_syntax = "idlang"
 " vim: ts=18
diff --git a/runtime/syntax/inform.vim b/runtime/syntax/inform.vim
index 4d833c7df2..e3e1b3e1f0 100644
--- a/runtime/syntax/inform.vim
+++ b/runtime/syntax/inform.vim
@@ -340,54 +340,52 @@ syn sync maxlines=500
 delcommand SynDisplay
 
 " The default highlighting.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink informDefine		Define
-HiLink informType		Type
-HiLink informInclude		Include
-HiLink informPreCondit	PreCondit
-HiLink informPreProc		PreProc
-HiLink informGramPreProc	PreProc
-HiLink informAsm		Special
+hi def link informDefine		Define
+hi def link informType		Type
+hi def link informInclude		Include
+hi def link informPreCondit	PreCondit
+hi def link informPreProc		PreProc
+hi def link informGramPreProc	PreProc
+hi def link informAsm		Special
 if !exists("inform_suppress_obsolete")
-HiLink informAsmObsolete		informError
-HiLink informKeywordObsolete	informError
+hi def link informAsmObsolete		informError
+hi def link informKeywordObsolete	informError
 else
-HiLink informAsmObsolete		Special
-HiLink informKeywordObsolete	Keyword
+hi def link informAsmObsolete		Special
+hi def link informKeywordObsolete	Keyword
 endif
-HiLink informPredicate	Operator
-HiLink informSysFunc		Identifier
-HiLink informSysConst		Identifier
-HiLink informConditional	Conditional
-HiLink informRepeat		Repeat
-HiLink informStatement	Statement
-HiLink informOperator		Operator
-HiLink informKeyword		Keyword
-HiLink informGrammar		Keyword
-HiLink informDictString	String
-HiLink informNumber		Number
-HiLink informError		Error
-HiLink informString		String
-HiLink informComment		Comment
-HiLink informAccent		Special
-HiLink informStringUnicode	Special
-HiLink informStringCode	Special
-HiLink informTodo		Todo
+hi def link informPredicate	Operator
+hi def link informSysFunc		Identifier
+hi def link informSysConst		Identifier
+hi def link informConditional	Conditional
+hi def link informRepeat		Repeat
+hi def link informStatement	Statement
+hi def link informOperator		Operator
+hi def link informKeyword		Keyword
+hi def link informGrammar		Keyword
+hi def link informDictString	String
+hi def link informNumber		Number
+hi def link informError		Error
+hi def link informString		String
+hi def link informComment		Comment
+hi def link informAccent		Special
+hi def link informStringUnicode	Special
+hi def link informStringCode	Special
+hi def link informTodo		Todo
 if !exists("inform_highlight_simple")
-HiLink informLibAttrib	Identifier
-HiLink informLibProp	Identifier
-HiLink informLibObj		Identifier
-HiLink informLibRoutine	Identifier
-HiLink informLibVariable	Identifier
-HiLink informLibConst	Identifier
-HiLink informLibAction	Identifier
+hi def link informLibAttrib	Identifier
+hi def link informLibProp	Identifier
+hi def link informLibObj		Identifier
+hi def link informLibRoutine	Identifier
+hi def link informLibVariable	Identifier
+hi def link informLibConst	Identifier
+hi def link informLibAction	Identifier
 endif
-HiLink informBadDictString	informError
-HiLink informBadAccent	informError
-HiLink informBadStrUnicode	informError
+hi def link informBadDictString	informError
+hi def link informBadAccent	informError
+hi def link informBadStrUnicode	informError
 
-delcommand HiLink
 
 let b:current_syntax = "inform"
 
diff --git a/runtime/syntax/inittab.vim b/runtime/syntax/inittab.vim
index a743c82f82..82bf660105 100644
--- a/runtime/syntax/inittab.vim
+++ b/runtime/syntax/inittab.vim
@@ -42,24 +42,22 @@ syn match inittabProcessPlus "+" contained nextgroup=inittabProcess,inittabError
 syn region inittabProcess start="/" end="$" transparent oneline contained contains=@inittabSh,inittabComment
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink inittabComment Comment
-HiLink inittabFixme Todo
-HiLink inittabActionName Type
-HiLink inittabError Error
-HiLink inittabId Identifier
-HiLink inittabRunLevels Special
+hi def link inittabComment Comment
+hi def link inittabFixme Todo
+hi def link inittabActionName Type
+hi def link inittabError Error
+hi def link inittabId Identifier
+hi def link inittabRunLevels Special
 
-HiLink inittabColonProcess inittabColon
-HiLink inittabColonAction inittabColon
-HiLink inittabColonRunLevels inittabColon
-HiLink inittabColon PreProc
+hi def link inittabColonProcess inittabColon
+hi def link inittabColonAction inittabColon
+hi def link inittabColonRunLevels inittabColon
+hi def link inittabColon PreProc
 
-HiLink inittabShString String
-HiLink inittabShOption Special
-HiLink inittabShCommand Statement
+hi def link inittabShString String
+hi def link inittabShOption Special
+hi def link inittabShCommand Statement
 
-delcommand HiLink
 
 let b:current_syntax = "inittab"
diff --git a/runtime/syntax/ishd.vim b/runtime/syntax/ishd.vim
index 78d88b9c17..3c468e361f 100644
--- a/runtime/syntax/ishd.vim
+++ b/runtime/syntax/ishd.vim
@@ -385,26 +385,24 @@ syn region	ishdDefine		start="^\s*#\s*\(define\|undef\)\>" end="$" contains=ALLB
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ishdNumber	    Number
-HiLink ishdError	    Error
-HiLink ishdStatement	    Statement
-HiLink ishdString	    String
-HiLink ishdComment	    Comment
-HiLink ishdTodo	    Todo
-HiLink ishdFunction	    Identifier
-HiLink ishdConstant	    PreProc
-HiLink ishdType	    Type
-HiLink ishdInclude	    Include
-HiLink ishdDefine	    Macro
-HiLink ishdIncluded	    String
-HiLink ishdPreCondit	    PreCondit
-HiLink ishdHashIf0Skip   ishdHashIf0
-HiLink ishdHashIf0End    ishdHashIf0
-HiLink ishdHashIf0	    Comment
+hi def link ishdNumber	    Number
+hi def link ishdError	    Error
+hi def link ishdStatement	    Statement
+hi def link ishdString	    String
+hi def link ishdComment	    Comment
+hi def link ishdTodo	    Todo
+hi def link ishdFunction	    Identifier
+hi def link ishdConstant	    PreProc
+hi def link ishdType	    Type
+hi def link ishdInclude	    Include
+hi def link ishdDefine	    Macro
+hi def link ishdIncluded	    String
+hi def link ishdPreCondit	    PreCondit
+hi def link ishdHashIf0Skip   ishdHashIf0
+hi def link ishdHashIf0End    ishdHashIf0
+hi def link ishdHashIf0	    Comment
 
-delcommand HiLink
 
 let b:current_syntax = "ishd"
 
diff --git a/runtime/syntax/iss.vim b/runtime/syntax/iss.vim
index 63a453adac..e58c618b7f 100644
--- a/runtime/syntax/iss.vim
+++ b/runtime/syntax/iss.vim
@@ -103,35 +103,33 @@ syn keyword issTasksFlags checkedonce dontinheritcheck exclusive restart uncheck
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink issSection	Special
-HiLink issComment	Comment
-HiLink issDirective	Type
-HiLink issParam	Type
-HiLink issFolder	Special
-HiLink issString	String
-HiLink issURL	Include
-HiLink issPreProc	PreProc 
+hi def link issSection	Special
+hi def link issComment	Comment
+hi def link issDirective	Type
+hi def link issParam	Type
+hi def link issFolder	Special
+hi def link issString	String
+hi def link issURL	Include
+hi def link issPreProc	PreProc 
 
-HiLink issDirsFlags		Keyword
-HiLink issFilesCopyMode	Keyword
-HiLink issFilesAttribs	Keyword
-HiLink issFilesPermissions	Keyword
-HiLink issFilesFlags		Keyword
-HiLink issIconsFlags		Keyword
-HiLink issINIFlags		Keyword
-HiLink issRegRootKey		Keyword
-HiLink issRegValueType	Keyword
-HiLink issRegFlags		Keyword
-HiLink issRunFlags		Keyword
-HiLink issTypesFlags		Keyword
-HiLink issComponentsFlags	Keyword
-HiLink issInstallDeleteType	Keyword
-HiLink issTasksFlags		Keyword
+hi def link issDirsFlags		Keyword
+hi def link issFilesCopyMode	Keyword
+hi def link issFilesAttribs	Keyword
+hi def link issFilesPermissions	Keyword
+hi def link issFilesFlags		Keyword
+hi def link issIconsFlags		Keyword
+hi def link issINIFlags		Keyword
+hi def link issRegRootKey		Keyword
+hi def link issRegValueType	Keyword
+hi def link issRegFlags		Keyword
+hi def link issRunFlags		Keyword
+hi def link issTypesFlags		Keyword
+hi def link issComponentsFlags	Keyword
+hi def link issInstallDeleteType	Keyword
+hi def link issTasksFlags		Keyword
 
-delcommand HiLink
 
 let b:current_syntax = "iss"
 
diff --git a/runtime/syntax/ist.vim b/runtime/syntax/ist.vim
index f3f005bf00..e34edac272 100644
--- a/runtime/syntax/ist.vim
+++ b/runtime/syntax/ist.vim
@@ -39,19 +39,17 @@ syn match   IstTodo	   "DEBUG\|TODO"	 contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink IstInpSpec	Type
-HiLink IstOutSpec	Identifier
-HiLink IstString	String
-HiLink IstNumber	Number
-HiLink IstComment	Comment
-HiLink IstTodo	Todo
-HiLink IstSpecial	Special
-HiLink IstDoubleQuote	Label
-HiLink IstCharacter	Label
+hi def link IstInpSpec	Type
+hi def link IstOutSpec	Identifier
+hi def link IstString	String
+hi def link IstNumber	Number
+hi def link IstComment	Comment
+hi def link IstTodo	Todo
+hi def link IstSpecial	Special
+hi def link IstDoubleQuote	Label
+hi def link IstCharacter	Label
 
-delcommand HiLink
 
 let b:current_syntax = "ist"
 
diff --git a/runtime/syntax/jal.vim b/runtime/syntax/jal.vim
index ded2ecd3d1..460bc01752 100644
--- a/runtime/syntax/jal.vim
+++ b/runtime/syntax/jal.vim
@@ -169,68 +169,66 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink jalAcces		jalStatement
-HiLink jalBoolean		Boolean
-HiLink jalBit			Boolean
-HiLink jalComment		Comment
-HiLink jalConditional		Conditional
-HiLink jalConstant		Constant
-HiLink jalDelimiter		Identifier
-HiLink jalDirective		PreProc
-HiLink jalException		Exception
-HiLink jalFloat		Float
-HiLink jalFunction		Function
-HiLink jalPsudoVarsKey	Function
-HiLink jalLabel		Label
-HiLink jalMatrixDelimiter	Identifier
-HiLink jalModifier		Type
-HiLink jalNumber		Number
-HiLink jalBinNumber		Number
-HiLink jalHexNumber		Number
-HiLink jalOperator		Operator
-HiLink jalPredefined		Constant
-HiLink jalPreProc		PreProc
-HiLink jalRepeat		Repeat
-HiLink jalStatement		Statement
-HiLink jalString		String
-HiLink jalStringEscape	Special
-HiLink jalStringEscapeGPC	Special
-HiLink jalStringError		Error
-HiLink jalStruct		jalStatement
-HiLink jalSymbolOperator	jalOperator
-HiLink jalTodo		Todo
-HiLink jalType		Type
-HiLink jalUnclassified	Statement
-HiLink jalAsm			Assembler
-HiLink jalError		Error
-HiLink jalAsmKey		Statement
-HiLink jalPIC			Statement
+hi def link jalAcces		jalStatement
+hi def link jalBoolean		Boolean
+hi def link jalBit			Boolean
+hi def link jalComment		Comment
+hi def link jalConditional		Conditional
+hi def link jalConstant		Constant
+hi def link jalDelimiter		Identifier
+hi def link jalDirective		PreProc
+hi def link jalException		Exception
+hi def link jalFloat		Float
+hi def link jalFunction		Function
+hi def link jalPsudoVarsKey	Function
+hi def link jalLabel		Label
+hi def link jalMatrixDelimiter	Identifier
+hi def link jalModifier		Type
+hi def link jalNumber		Number
+hi def link jalBinNumber		Number
+hi def link jalHexNumber		Number
+hi def link jalOperator		Operator
+hi def link jalPredefined		Constant
+hi def link jalPreProc		PreProc
+hi def link jalRepeat		Repeat
+hi def link jalStatement		Statement
+hi def link jalString		String
+hi def link jalStringEscape	Special
+hi def link jalStringEscapeGPC	Special
+hi def link jalStringError		Error
+hi def link jalStruct		jalStatement
+hi def link jalSymbolOperator	jalOperator
+hi def link jalTodo		Todo
+hi def link jalType		Type
+hi def link jalUnclassified	Statement
+hi def link jalAsm			Assembler
+hi def link jalError		Error
+hi def link jalAsmKey		Statement
+hi def link jalPIC			Statement
 
-HiLink jalShowTab		Error
+hi def link jalShowTab		Error
 
-HiLink picTodo		Todo
-HiLink picComment		Comment
-HiLink picDirective		Statement
-HiLink picLabel		Label
-HiLink picString		String
+hi def link picTodo		Todo
+hi def link picComment		Comment
+hi def link picDirective		Statement
+hi def link picLabel		Label
+hi def link picString		String
 
-HiLink picOpcode		Keyword
-HiLink picRegister		Structure
-HiLink picRegisterPart	Special
-HiLink picPinDir		SPecial
-HiLink picPortDir		SPecial
+hi def link picOpcode		Keyword
+hi def link picRegister		Structure
+hi def link picRegisterPart	Special
+hi def link picPinDir		SPecial
+hi def link picPortDir		SPecial
 
-HiLink picASCII		String
-HiLink picBinary		Number
-HiLink picDecimal		Number
-HiLink picHexadecimal		Number
-HiLink picOctal		Number
+hi def link picASCII		String
+hi def link picBinary		Number
+hi def link picDecimal		Number
+hi def link picHexadecimal		Number
+hi def link picOctal		Number
 
-HiLink picIdentifier		Identifier
+hi def link picIdentifier		Identifier
 
-delcommand HiLink
 
 
 let b:current_syntax = "jal"
diff --git a/runtime/syntax/jam.vim b/runtime/syntax/jam.vim
index f165a78eff..fc7f49d1f0 100644
--- a/runtime/syntax/jam.vim
+++ b/runtime/syntax/jam.vim
@@ -161,79 +161,77 @@ syntax match    jamOperator3Error   "*/"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink jamCommentL		jamComment
-HiLink jamCommentL2		jamComment
-HiLink jamOperator3Error	jamError
-HiLink jamConditional	Conditional
-HiLink jamRepeat		Repeat
-HiLink jamCharacter		Character
-HiLink jamSpecialCharacter	jamSpecial
-HiLink jamNumber		Number
-HiLink jamParenError	jamError
-HiLink jamErrInParen	jamError
-HiLink jamErrInBracket	jamError
-HiLink jamCommentError	jamError
-HiLink jamSpaceError	jamError
-HiLink jamSpecialError	jamError
-HiLink jamOperator1		jamOperator
-HiLink jamOperator2		jamOperator
-HiLink jamOperator3		jamOperator
-HiLink jamOperator4		jamOperator
-HiLink jamOperator5		jamOperator
-HiLink jamOperator6		jamOperator
-HiLink jamOperator7		jamOperator
-HiLink jamOperator8		jamOperator
-HiLink jamOperator9		jamOperator
-HiLink jamOperator10	jamOperator
-HiLink jamOperator11	jamOperator
-HiLink jamOperator12	jamOperator
-HiLink jamOperator13	jamOperator
-HiLink jamOperator14	jamOperator
-HiLink jamError		Error
-HiLink jamStatement		Statement
-HiLink jamPreCondit		PreCondit
-HiLink jamCommentError	jamError
-HiLink jamCommentString	jamString
-HiLink jamComment2String	jamString
-HiLink jamCommentSkip	jamComment
-HiLink jamString		String
-HiLink jamComment		Comment
-HiLink jamSpecial		SpecialChar
-HiLink jamTodo		Todo
-HiLink jamCppSkip		jamCppOut
-HiLink jamCppOut2		jamCppOut
-HiLink jamCppOut		Comment
-HiLink jamDBState1		Identifier
-HiLink jamDBState2		Identifier
-HiLink jamSQLState1		jamSQL
-HiLink jamSQLState2		jamSQL
-HiLink jamLibFunc1		jamLibFunc
-HiLink jamLibFunc2		jamLibFunc
-HiLink jamLibFunc3		jamLibFunc
-HiLink jamLibFunc4		jamLibFunc
-HiLink jamLibFunc5		jamLibFunc
-HiLink jamLibFunc6		jamLibFunc
-HiLink jamLibFunc7		jamLibFunc
-HiLink jamLibFunc8		jamLibFunc
-HiLink jamLibFunc9		jamLibFunc
-HiLink jamVariable1		jamVariablen
-HiLink jamVariable2		jamVariablen
-HiLink jamVariable3		jamVariablen
-HiLink jamVariable4		jamVariablen
-HiLink jamVariable5		jamVariablen
-HiLink jamVariable6		jamVariablen
-HiLink jamVariable7		jamVariablen
-HiLink jamVariable8		jamVariablen
-HiLink jamVariable9		jamVariablen
-HiLink jamVariable10	jamVariablen
-HiLink jamVariablen		Constant
-HiLink jamSQL		Type
-HiLink jamLibFunc		PreProc
-HiLink jamOperator		Special
+hi def link jamCommentL		jamComment
+hi def link jamCommentL2		jamComment
+hi def link jamOperator3Error	jamError
+hi def link jamConditional	Conditional
+hi def link jamRepeat		Repeat
+hi def link jamCharacter		Character
+hi def link jamSpecialCharacter	jamSpecial
+hi def link jamNumber		Number
+hi def link jamParenError	jamError
+hi def link jamErrInParen	jamError
+hi def link jamErrInBracket	jamError
+hi def link jamCommentError	jamError
+hi def link jamSpaceError	jamError
+hi def link jamSpecialError	jamError
+hi def link jamOperator1		jamOperator
+hi def link jamOperator2		jamOperator
+hi def link jamOperator3		jamOperator
+hi def link jamOperator4		jamOperator
+hi def link jamOperator5		jamOperator
+hi def link jamOperator6		jamOperator
+hi def link jamOperator7		jamOperator
+hi def link jamOperator8		jamOperator
+hi def link jamOperator9		jamOperator
+hi def link jamOperator10	jamOperator
+hi def link jamOperator11	jamOperator
+hi def link jamOperator12	jamOperator
+hi def link jamOperator13	jamOperator
+hi def link jamOperator14	jamOperator
+hi def link jamError		Error
+hi def link jamStatement		Statement
+hi def link jamPreCondit		PreCondit
+hi def link jamCommentError	jamError
+hi def link jamCommentString	jamString
+hi def link jamComment2String	jamString
+hi def link jamCommentSkip	jamComment
+hi def link jamString		String
+hi def link jamComment		Comment
+hi def link jamSpecial		SpecialChar
+hi def link jamTodo		Todo
+hi def link jamCppSkip		jamCppOut
+hi def link jamCppOut2		jamCppOut
+hi def link jamCppOut		Comment
+hi def link jamDBState1		Identifier
+hi def link jamDBState2		Identifier
+hi def link jamSQLState1		jamSQL
+hi def link jamSQLState2		jamSQL
+hi def link jamLibFunc1		jamLibFunc
+hi def link jamLibFunc2		jamLibFunc
+hi def link jamLibFunc3		jamLibFunc
+hi def link jamLibFunc4		jamLibFunc
+hi def link jamLibFunc5		jamLibFunc
+hi def link jamLibFunc6		jamLibFunc
+hi def link jamLibFunc7		jamLibFunc
+hi def link jamLibFunc8		jamLibFunc
+hi def link jamLibFunc9		jamLibFunc
+hi def link jamVariable1		jamVariablen
+hi def link jamVariable2		jamVariablen
+hi def link jamVariable3		jamVariablen
+hi def link jamVariable4		jamVariablen
+hi def link jamVariable5		jamVariablen
+hi def link jamVariable6		jamVariablen
+hi def link jamVariable7		jamVariablen
+hi def link jamVariable8		jamVariablen
+hi def link jamVariable9		jamVariablen
+hi def link jamVariable10	jamVariablen
+hi def link jamVariablen		Constant
+hi def link jamSQL		Type
+hi def link jamLibFunc		PreProc
+hi def link jamOperator		Special
 
-delcommand HiLink
 
 let b:current_syntax = "jam"
 
diff --git a/runtime/syntax/jargon.vim b/runtime/syntax/jargon.vim
index 97b03c3478..415f2bc972 100644
--- a/runtime/syntax/jargon.vim
+++ b/runtime/syntax/jargon.vim
@@ -15,11 +15,9 @@ syn match jargonMark	/{[^}]*}/
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink jargonChaptTitle	Title
-HiLink jargonEmailAddr	 Comment
-HiLink jargonUrl	 Comment
-HiLink jargonMark	Label
-delcommand HiLink
+hi def link jargonChaptTitle	Title
+hi def link jargonEmailAddr	 Comment
+hi def link jargonUrl	 Comment
+hi def link jargonMark	Label
 
 let b:current_syntax = "jargon"
diff --git a/runtime/syntax/java.vim b/runtime/syntax/java.vim
index c22c67bba3..89320597f1 100644
--- a/runtime/syntax/java.vim
+++ b/runtime/syntax/java.vim
@@ -19,9 +19,6 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
-" don't use standard HiLink, it will not work with included syntax files
-command! -nargs=+ JavaHiLink hi def link <args>
-
 " some characters that cannot be in a java program (outside a string)
 syn match javaError "[\\@`]"
 syn match javaError "<<<\|\.\.\|=>\|||=\|&&=\|\*\/"
@@ -30,7 +27,7 @@ syn match javaOK "\.\.\."
 
 " use separate name so that it can be deleted in javacc.vim
 syn match   javaError2 "#\|=<"
-JavaHiLink javaError2 javaError
+hi def link javaError2 javaError
 
 
 
@@ -73,32 +70,32 @@ if exists("java_highlight_all")  || exists("java_highlight_java")  || exists("ja
   syn keyword javaR_JavaLang NegativeArraySizeException ArrayStoreException IllegalStateException RuntimeException IndexOutOfBoundsException UnsupportedOperationException ArrayIndexOutOfBoundsException ArithmeticException ClassCastException EnumConstantNotPresentException StringIndexOutOfBoundsException IllegalArgumentException IllegalMonitorStateException IllegalThreadStateException NumberFormatException NullPointerException TypeNotPresentException SecurityException
   syn cluster javaTop add=javaR_JavaLang
   syn cluster javaClasses add=javaR_JavaLang
-  JavaHiLink javaR_JavaLang javaR_Java
+  hi def link javaR_JavaLang javaR_Java
   syn keyword javaC_JavaLang Process RuntimePermission StringKeySet CharacterData01 Class ThreadLocal ThreadLocalMap CharacterData0E Package Character StringCoding Long ProcessImpl ProcessEnvironment Short AssertionStatusDirectives 1PackageInfoProxy UnicodeBlock InheritableThreadLocal AbstractStringBuilder StringEnvironment ClassLoader ConditionalSpecialCasing CharacterDataPrivateUse StringBuffer StringDecoder Entry StringEntry WrappedHook StringBuilder StrictMath State ThreadGroup Runtime CharacterData02 MethodArray Object CharacterDataUndefined Integer Gate Boolean Enum Variable Subset StringEncoder Void Terminator CharsetSD IntegerCache CharacterCache Byte CharsetSE Thread SystemClassLoaderAction CharacterDataLatin1 StringValues StackTraceElement Shutdown ShortCache String ConverterSD ByteCache Lock EnclosingMethodInfo Math Float Value Double SecurityManager LongCache ProcessBuilder StringEntrySet Compiler Number UNIXProcess ConverterSE ExternalData CaseInsensitiveComparator CharacterData00 NativeLibrary
   syn cluster javaTop add=javaC_JavaLang
   syn cluster javaClasses add=javaC_JavaLang
-  JavaHiLink javaC_JavaLang javaC_Java
+  hi def link javaC_JavaLang javaC_Java
   syn keyword javaE_JavaLang IncompatibleClassChangeError InternalError UnknownError ClassCircularityError AssertionError ThreadDeath IllegalAccessError NoClassDefFoundError ClassFormatError UnsupportedClassVersionError NoSuchFieldError VerifyError ExceptionInInitializerError InstantiationError LinkageError NoSuchMethodError Error UnsatisfiedLinkError StackOverflowError AbstractMethodError VirtualMachineError OutOfMemoryError
   syn cluster javaTop add=javaE_JavaLang
   syn cluster javaClasses add=javaE_JavaLang
-  JavaHiLink javaE_JavaLang javaE_Java
+  hi def link javaE_JavaLang javaE_Java
   syn keyword javaX_JavaLang CloneNotSupportedException Exception NoSuchMethodException IllegalAccessException NoSuchFieldException Throwable InterruptedException ClassNotFoundException InstantiationException
   syn cluster javaTop add=javaX_JavaLang
   syn cluster javaClasses add=javaX_JavaLang
-  JavaHiLink javaX_JavaLang javaX_Java
+  hi def link javaX_JavaLang javaX_Java
 
-  JavaHiLink javaR_Java javaR_
-  JavaHiLink javaC_Java javaC_
-  JavaHiLink javaE_Java javaE_
-  JavaHiLink javaX_Java javaX_
-  JavaHiLink javaX_		     javaExceptions
-  JavaHiLink javaR_		     javaExceptions
-  JavaHiLink javaE_		     javaExceptions
-  JavaHiLink javaC_		     javaConstant
+  hi def link javaR_Java javaR_
+  hi def link javaC_Java javaC_
+  hi def link javaE_Java javaE_
+  hi def link javaX_Java javaX_
+  hi def link javaX_		     javaExceptions
+  hi def link javaR_		     javaExceptions
+  hi def link javaE_		     javaExceptions
+  hi def link javaC_		     javaConstant
 
   syn keyword javaLangObject clone equals finalize getClass hashCode
   syn keyword javaLangObject notify notifyAll toString wait
-  JavaHiLink javaLangObject		     javaConstant
+  hi def link javaLangObject		     javaConstant
   syn cluster javaTop add=javaLangObject
 endif
 
@@ -141,9 +138,9 @@ syn region  javaComment		 start="/\*"  end="\*/" contains=@javaCommentSpecial,ja
 syn match   javaCommentStar	 contained "^\s*\*[^/]"me=e-1
 syn match   javaCommentStar	 contained "^\s*\*$"
 syn match   javaLineComment	 "//.*" contains=@javaCommentSpecial2,javaTodo,@Spell
-JavaHiLink javaCommentString javaString
-JavaHiLink javaComment2String javaString
-JavaHiLink javaCommentCharacter javaCharacter
+hi def link javaCommentString javaString
+hi def link javaComment2String javaString
+hi def link javaCommentCharacter javaCharacter
 
 syn cluster javaTop add=javaComment,javaLineComment
 
@@ -236,26 +233,26 @@ if exists("java_highlight_debug")
 
   syn cluster javaTop add=javaDebug
 
-  JavaHiLink javaDebug		 Debug
-  JavaHiLink javaDebugString		 DebugString
-  JavaHiLink javaDebugStringError	 javaError
-  JavaHiLink javaDebugType		 DebugType
-  JavaHiLink javaDebugBoolean		 DebugBoolean
-  JavaHiLink javaDebugNumber		 Debug
-  JavaHiLink javaDebugSpecial		 DebugSpecial
-  JavaHiLink javaDebugSpecialCharacter DebugSpecial
-  JavaHiLink javaDebugCharacter	 DebugString
-  JavaHiLink javaDebugParen		 Debug
+  hi def link javaDebug		 Debug
+  hi def link javaDebugString		 DebugString
+  hi def link javaDebugStringError	 javaError
+  hi def link javaDebugType		 DebugType
+  hi def link javaDebugBoolean		 DebugBoolean
+  hi def link javaDebugNumber		 Debug
+  hi def link javaDebugSpecial		 DebugSpecial
+  hi def link javaDebugSpecialCharacter DebugSpecial
+  hi def link javaDebugCharacter	 DebugString
+  hi def link javaDebugParen		 Debug
 
-  JavaHiLink DebugString		 String
-  JavaHiLink DebugSpecial		 Special
-  JavaHiLink DebugBoolean		 Boolean
-  JavaHiLink DebugType		 Type
+  hi def link DebugString		 String
+  hi def link DebugSpecial		 Special
+  hi def link DebugBoolean		 Boolean
+  hi def link DebugType		 Type
 endif
 
 if exists("java_mark_braces_in_parens_as_errors")
   syn match javaInParen		 contained "[{}]"
-  JavaHiLink javaInParen	javaError
+  hi def link javaInParen	javaError
   syn cluster javaTop add=javaInParen
 endif
 
@@ -270,7 +267,7 @@ syn region  javaParenT1 transparent matchgroup=javaParen1 start="\[" end="\]" co
 syn region  javaParenT2 transparent matchgroup=javaParen2 start="\[" end="\]" contains=@javaTop,javaParenT  contained
 syn match   javaParenError	 "\]"
 
-JavaHiLink javaParenError	javaError
+hi def link javaParenError	javaError
 
 if exists("java_highlight_functions")
    syn match javaLambdaDef "([a-zA-Z0-9_<>\[\], \t]*)\s*->"
@@ -283,56 +280,54 @@ endif
 exec "syn sync ccomment javaComment minlines=" . java_minlines
 
 " The default highlighting.
-JavaHiLink javaLambdaDef		Function
-JavaHiLink javaFuncDef		Function
-JavaHiLink javaVarArg			Function
-JavaHiLink javaBraces			Function
-JavaHiLink javaBranch			Conditional
-JavaHiLink javaUserLabelRef		javaUserLabel
-JavaHiLink javaLabel			Label
-JavaHiLink javaUserLabel		Label
-JavaHiLink javaConditional		Conditional
-JavaHiLink javaRepeat			Repeat
-JavaHiLink javaExceptions		Exception
-JavaHiLink javaAssert			Statement
-JavaHiLink javaStorageClass		StorageClass
-JavaHiLink javaMethodDecl		javaStorageClass
-JavaHiLink javaClassDecl		javaStorageClass
-JavaHiLink javaScopeDecl		javaStorageClass
-JavaHiLink javaBoolean		Boolean
-JavaHiLink javaSpecial		Special
-JavaHiLink javaSpecialError		Error
-JavaHiLink javaSpecialCharError	Error
-JavaHiLink javaString			String
-JavaHiLink javaCharacter		Character
-JavaHiLink javaSpecialChar		SpecialChar
-JavaHiLink javaNumber			Number
-JavaHiLink javaError			Error
-JavaHiLink javaStringError		Error
-JavaHiLink javaStatement		Statement
-JavaHiLink javaOperator		Operator
-JavaHiLink javaComment		Comment
-JavaHiLink javaDocComment		Comment
-JavaHiLink javaLineComment		Comment
-JavaHiLink javaConstant		Constant
-JavaHiLink javaTypedef		Typedef
-JavaHiLink javaTodo			Todo
-JavaHiLink javaAnnotation		PreProc
+hi def link javaLambdaDef		Function
+hi def link javaFuncDef		Function
+hi def link javaVarArg			Function
+hi def link javaBraces			Function
+hi def link javaBranch			Conditional
+hi def link javaUserLabelRef		javaUserLabel
+hi def link javaLabel			Label
+hi def link javaUserLabel		Label
+hi def link javaConditional		Conditional
+hi def link javaRepeat			Repeat
+hi def link javaExceptions		Exception
+hi def link javaAssert			Statement
+hi def link javaStorageClass		StorageClass
+hi def link javaMethodDecl		javaStorageClass
+hi def link javaClassDecl		javaStorageClass
+hi def link javaScopeDecl		javaStorageClass
+hi def link javaBoolean		Boolean
+hi def link javaSpecial		Special
+hi def link javaSpecialError		Error
+hi def link javaSpecialCharError	Error
+hi def link javaString			String
+hi def link javaCharacter		Character
+hi def link javaSpecialChar		SpecialChar
+hi def link javaNumber			Number
+hi def link javaError			Error
+hi def link javaStringError		Error
+hi def link javaStatement		Statement
+hi def link javaOperator		Operator
+hi def link javaComment		Comment
+hi def link javaDocComment		Comment
+hi def link javaLineComment		Comment
+hi def link javaConstant		Constant
+hi def link javaTypedef		Typedef
+hi def link javaTodo			Todo
+hi def link javaAnnotation		PreProc
 
-JavaHiLink javaCommentTitle		SpecialComment
-JavaHiLink javaDocTags		Special
-JavaHiLink javaDocParam		Function
-JavaHiLink javaDocSeeTagParam		Function
-JavaHiLink javaCommentStar		javaComment
+hi def link javaCommentTitle		SpecialComment
+hi def link javaDocTags		Special
+hi def link javaDocParam		Function
+hi def link javaDocSeeTagParam		Function
+hi def link javaCommentStar		javaComment
 
-JavaHiLink javaType			Type
-JavaHiLink javaExternal		Include
+hi def link javaType			Type
+hi def link javaExternal		Include
 
-JavaHiLink htmlComment		Special
-JavaHiLink htmlCommentPart		Special
-JavaHiLink javaSpaceError		Error
-
-delcommand JavaHiLink
+hi def link htmlComment		Special
+hi def link htmlCommentPart		Special
+hi def link javaSpaceError		Error
 
 let b:current_syntax = "java"
 
diff --git a/runtime/syntax/javacc.vim b/runtime/syntax/javacc.vim
index 93d174097e..a80572d510 100644
--- a/runtime/syntax/javacc.vim
+++ b/runtime/syntax/javacc.vim
@@ -52,13 +52,11 @@ syn keyword javaccError DEBUG IGNORE_IN_BNF
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink javaccSpecToken Statement
-HiLink javaccActionToken Type
-HiLink javaccPackages javaScopeDecl
-HiLink javaccToken String
-HiLink javaccError Error
-delcommand HiLink
+hi def link javaccSpecToken Statement
+hi def link javaccActionToken Type
+hi def link javaccPackages javaScopeDecl
+hi def link javaccToken String
+hi def link javaccError Error
 
 let b:current_syntax = "javacc"
 let &cpo = s:cpo_save
diff --git a/runtime/syntax/javascript.vim b/runtime/syntax/javascript.vim
index e3e8262d39..9589b1938f 100644
--- a/runtime/syntax/javascript.vim
+++ b/runtime/syntax/javascript.vim
@@ -80,42 +80,40 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink javaScriptComment		Comment
-HiLink javaScriptLineComment		Comment
-HiLink javaScriptCommentTodo		Todo
-HiLink javaScriptSpecial		Special
-HiLink javaScriptStringS		String
-HiLink javaScriptStringD		String
-HiLink javaScriptCharacter		Character
-HiLink javaScriptSpecialCharacter	javaScriptSpecial
-HiLink javaScriptNumber		javaScriptValue
-HiLink javaScriptConditional		Conditional
-HiLink javaScriptRepeat		Repeat
-HiLink javaScriptBranch		Conditional
-HiLink javaScriptOperator		Operator
-HiLink javaScriptType			Type
-HiLink javaScriptStatement		Statement
-HiLink javaScriptFunction		Function
-HiLink javaScriptBraces		Function
-HiLink javaScriptError		Error
-HiLink javaScrParenError		javaScriptError
-HiLink javaScriptNull			Keyword
-HiLink javaScriptBoolean		Boolean
-HiLink javaScriptRegexpString		String
+hi def link javaScriptComment		Comment
+hi def link javaScriptLineComment		Comment
+hi def link javaScriptCommentTodo		Todo
+hi def link javaScriptSpecial		Special
+hi def link javaScriptStringS		String
+hi def link javaScriptStringD		String
+hi def link javaScriptCharacter		Character
+hi def link javaScriptSpecialCharacter	javaScriptSpecial
+hi def link javaScriptNumber		javaScriptValue
+hi def link javaScriptConditional		Conditional
+hi def link javaScriptRepeat		Repeat
+hi def link javaScriptBranch		Conditional
+hi def link javaScriptOperator		Operator
+hi def link javaScriptType			Type
+hi def link javaScriptStatement		Statement
+hi def link javaScriptFunction		Function
+hi def link javaScriptBraces		Function
+hi def link javaScriptError		Error
+hi def link javaScrParenError		javaScriptError
+hi def link javaScriptNull			Keyword
+hi def link javaScriptBoolean		Boolean
+hi def link javaScriptRegexpString		String
 
-HiLink javaScriptIdentifier		Identifier
-HiLink javaScriptLabel		Label
-HiLink javaScriptException		Exception
-HiLink javaScriptMessage		Keyword
-HiLink javaScriptGlobal		Keyword
-HiLink javaScriptMember		Keyword
-HiLink javaScriptDeprecated		Exception 
-HiLink javaScriptReserved		Keyword
-HiLink javaScriptDebug		Debug
-HiLink javaScriptConstant		Label
+hi def link javaScriptIdentifier		Identifier
+hi def link javaScriptLabel		Label
+hi def link javaScriptException		Exception
+hi def link javaScriptMessage		Keyword
+hi def link javaScriptGlobal		Keyword
+hi def link javaScriptMember		Keyword
+hi def link javaScriptDeprecated		Exception 
+hi def link javaScriptReserved		Keyword
+hi def link javaScriptDebug		Debug
+hi def link javaScriptConstant		Label
 
-delcommand HiLink
 
 let b:current_syntax = "javascript"
 if main_syntax == 'javascript'
diff --git a/runtime/syntax/jess.vim b/runtime/syntax/jess.vim
index ad625ac73f..67d3715a30 100644
--- a/runtime/syntax/jess.vim
+++ b/runtime/syntax/jess.vim
@@ -119,27 +119,25 @@ syn sync lines=100
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink jessAtomNmbr	jessNumber
-HiLink jessAtomMark	jessMark
+hi def link jessAtomNmbr	jessNumber
+hi def link jessAtomMark	jessMark
 
-HiLink jessAtom		Identifier
-HiLink jessAtomBarSymbol	Special
-HiLink jessBarSymbol	Special
-HiLink jessComment	Comment
-HiLink jessConcat	Statement
-HiLink jessDeclaration	Statement
-HiLink jessFunc		Statement
-HiLink jessKey		Type
-HiLink jessMark		Delimiter
-HiLink jessNumber	Number
-HiLink jessParenError	Error
-HiLink jessSpecial	Type
-HiLink jessString	String
-HiLink jessVar		Identifier
+hi def link jessAtom		Identifier
+hi def link jessAtomBarSymbol	Special
+hi def link jessBarSymbol	Special
+hi def link jessComment	Comment
+hi def link jessConcat	Statement
+hi def link jessDeclaration	Statement
+hi def link jessFunc		Statement
+hi def link jessKey		Type
+hi def link jessMark		Delimiter
+hi def link jessNumber	Number
+hi def link jessParenError	Error
+hi def link jessSpecial	Type
+hi def link jessString	String
+hi def link jessVar		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "jess"
 
diff --git a/runtime/syntax/jgraph.vim b/runtime/syntax/jgraph.vim
index 43fc4275de..a29a21a73b 100644
--- a/runtime/syntax/jgraph.vim
+++ b/runtime/syntax/jgraph.vim
@@ -34,14 +34,12 @@ syn match  jgraphNumber		 "\-\=\.\d\+\>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink jgraphComment	Comment
-HiLink jgraphCmd	Identifier
-HiLink jgraphType	Type
-HiLink jgraphNumber	Number
+hi def link jgraphComment	Comment
+hi def link jgraphCmd	Identifier
+hi def link jgraphType	Type
+hi def link jgraphNumber	Number
 
-delcommand HiLink
 
 
 let b:current_syntax = "jgraph"
diff --git a/runtime/syntax/jproperties.vim b/runtime/syntax/jproperties.vim
index bde160b24d..628c03097f 100644
--- a/runtime/syntax/jproperties.vim
+++ b/runtime/syntax/jproperties.vim
@@ -118,19 +118,17 @@ syn keyword jpropertiesTodo		TODO FIXME XXX contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink jpropertiesComment	Comment
-HiLink jpropertiesTodo		Todo
-HiLink jpropertiesIdentifier	Identifier
-HiLink jpropertiesString	String
-HiLink jpropertiesExtendString	String
-HiLink jpropertiesCharacter	Character
-HiLink jpropertiesSpecial	Special
-HiLink jpropertiesSpecialChar	SpecialChar
-HiLink jpropertiesError	Error
+hi def link jpropertiesComment	Comment
+hi def link jpropertiesTodo		Todo
+hi def link jpropertiesIdentifier	Identifier
+hi def link jpropertiesString	String
+hi def link jpropertiesExtendString	String
+hi def link jpropertiesCharacter	Character
+hi def link jpropertiesSpecial	Special
+hi def link jpropertiesSpecialChar	SpecialChar
+hi def link jpropertiesError	Error
 
-delcommand HiLink
 
 let b:current_syntax = "jproperties"
 
diff --git a/runtime/syntax/json.vim b/runtime/syntax/json.vim
index 34c26d37d8..d80af84312 100644
--- a/runtime/syntax/json.vim
+++ b/runtime/syntax/json.vim
@@ -93,30 +93,28 @@ syn region  jsonFold matchgroup=jsonBraces start="\[" end=/]\(\_s\+\ze"\)\@!/ tr
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink jsonPadding         Operator
-HiLink jsonString          String
-HiLink jsonTest          Label
-HiLink jsonEscape          Special
-HiLink jsonNumber          Number
-HiLink jsonBraces          Delimiter
-HiLink jsonNull            Function
-HiLink jsonBoolean         Boolean
-HiLink jsonKeyword         Label
+hi def link jsonPadding         Operator
+hi def link jsonString          String
+hi def link jsonTest          Label
+hi def link jsonEscape          Special
+hi def link jsonNumber          Number
+hi def link jsonBraces          Delimiter
+hi def link jsonNull            Function
+hi def link jsonBoolean         Boolean
+hi def link jsonKeyword         Label
 
 if (!exists("g:vim_json_warnings") || g:vim_json_warnings==1)
-HiLink jsonNumError        Error
-HiLink jsonCommentError    Error
-HiLink jsonSemicolonError  Error
-HiLink jsonTrailingCommaError     Error
-HiLink jsonMissingCommaError      Error
-HiLink jsonStringSQError        	Error
-HiLink jsonNoQuotesError        	Error
-HiLink jsonTripleQuotesError     	Error
+hi def link jsonNumError        Error
+hi def link jsonCommentError    Error
+hi def link jsonSemicolonError  Error
+hi def link jsonTrailingCommaError     Error
+hi def link jsonMissingCommaError      Error
+hi def link jsonStringSQError        	Error
+hi def link jsonNoQuotesError        	Error
+hi def link jsonTripleQuotesError     	Error
 endif
-HiLink jsonQuote           Quote
-HiLink jsonNoise           Noise
-delcommand HiLink
+hi def link jsonQuote           Quote
+hi def link jsonNoise           Noise
 
 let b:current_syntax = "json"
 if main_syntax == 'json'
diff --git a/runtime/syntax/jsp.vim b/runtime/syntax/jsp.vim
index 812a81465b..1c3cc35a31 100644
--- a/runtime/syntax/jsp.vim
+++ b/runtime/syntax/jsp.vim
@@ -46,20 +46,18 @@ syn region htmlTag start=+<[^/%]+ end=+>+ contains=htmlTagN,htmlString,htmlArg,h
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 " java.vim has redefined htmlComment highlighting
-HiLink htmlComment	 Comment
-HiLink htmlCommentPart Comment
+hi def link htmlComment	 Comment
+hi def link htmlCommentPart Comment
 " Be consistent with html highlight settings
-HiLink jspComment	 htmlComment
-HiLink jspTag		 htmlTag
-HiLink jspDirective	 jspTag
-HiLink jspDirName	 htmlTagName
-HiLink jspDirArg	 htmlArg
-HiLink jspCommand	 jspTag
-HiLink jspCommandName  htmlTagName
-HiLink jspCommandArg	 htmlArg
-delcommand HiLink
+hi def link jspComment	 htmlComment
+hi def link jspTag		 htmlTag
+hi def link jspDirective	 jspTag
+hi def link jspDirName	 htmlTagName
+hi def link jspDirArg	 htmlArg
+hi def link jspCommand	 jspTag
+hi def link jspCommandName  htmlTagName
+hi def link jspCommandArg	 htmlArg
 
 if main_syntax == 'jsp'
   unlet main_syntax
diff --git a/runtime/syntax/kix.vim b/runtime/syntax/kix.vim
index cbc837c4d1..8efe02baee 100644
--- a/runtime/syntax/kix.vim
+++ b/runtime/syntax/kix.vim
@@ -129,43 +129,41 @@ syn match   kixExpression	"<\|>\|<=\|>=\|<>"
 
 " Default highlighting.
 " Set default highlight only if it doesn't already have a value.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink kixDoubleString		String
-HiLink kixSingleString		String
-HiLink kixStatement		Statement
-HiLink kixRepeat		Repeat
-HiLink kixComment		Comment
-HiLink kixBuiltin		Function
-HiLink kixLocalVar		Special
-HiLink kixMacro			Special
-HiLink kixEnvVar		Special
-HiLink kixLabel			Type
-HiLink kixFunction		Function
-HiLink kixInteger		Number
-HiLink kixHex			Number
-HiLink kixFloat			Number
-HiLink kixOperator		Operator
-HiLink kixExpression		Operator
+hi def link kixDoubleString		String
+hi def link kixSingleString		String
+hi def link kixStatement		Statement
+hi def link kixRepeat		Repeat
+hi def link kixComment		Comment
+hi def link kixBuiltin		Function
+hi def link kixLocalVar		Special
+hi def link kixMacro			Special
+hi def link kixEnvVar		Special
+hi def link kixLabel			Type
+hi def link kixFunction		Function
+hi def link kixInteger		Number
+hi def link kixHex			Number
+hi def link kixFloat			Number
+hi def link kixOperator		Operator
+hi def link kixExpression		Operator
 
-HiLink kixParenCloseError	Error
-HiLink kixBrackCloseError	Error
-HiLink kixStringError		Error
+hi def link kixParenCloseError	Error
+hi def link kixBrackCloseError	Error
+hi def link kixStringError		Error
 
-HiLink kixWhileError		Error
-HiLink kixWhileOK		Conditional
-HiLink kixDoError		Error
-HiLink kixDoOK			Conditional
-HiLink kixIfError		Error
-HiLink kixIfOK			Conditional
-HiLink kixSelectError		Error
-HiLink kixSelectOK		Conditional
-HiLink kixForNextError		Error
-HiLink kixForNextOK		Conditional
-HiLink kixForEachError		Error
-HiLink kixForEachOK		Conditional
+hi def link kixWhileError		Error
+hi def link kixWhileOK		Conditional
+hi def link kixDoError		Error
+hi def link kixDoOK			Conditional
+hi def link kixIfError		Error
+hi def link kixIfOK			Conditional
+hi def link kixSelectError		Error
+hi def link kixSelectOK		Conditional
+hi def link kixForNextError		Error
+hi def link kixForNextOK		Conditional
+hi def link kixForEachError		Error
+hi def link kixForEachOK		Conditional
 
-delcommand HiLink
 
 let b:current_syntax = "kix"
 
diff --git a/runtime/syntax/kscript.vim b/runtime/syntax/kscript.vim
index e06b49d880..e6776208d4 100644
--- a/runtime/syntax/kscript.vim
+++ b/runtime/syntax/kscript.vim
@@ -35,24 +35,22 @@ syn region	kscriptString		start=+'''+  end=+'''+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink kscriptConditional		Conditional
-HiLink kscriptRepeat			Repeat
-HiLink kscriptExceptions		Statement
-HiLink kscriptFunction		Function
-HiLink kscriptConst			Constant
-HiLink kscriptStatement		Statement
-HiLink kscriptLabel			Label
-HiLink kscriptStorageClass		StorageClass
-HiLink kscriptType			Type
-HiLink kscriptTodo			Todo
-HiLink kscriptComment		Comment
-HiLink kscriptString			String
-HiLink kscriptPreCondit		PreCondit
-HiLink kscriptHardCoded		Statement
+hi def link kscriptConditional		Conditional
+hi def link kscriptRepeat			Repeat
+hi def link kscriptExceptions		Statement
+hi def link kscriptFunction		Function
+hi def link kscriptConst			Constant
+hi def link kscriptStatement		Statement
+hi def link kscriptLabel			Label
+hi def link kscriptStorageClass		StorageClass
+hi def link kscriptType			Type
+hi def link kscriptTodo			Todo
+hi def link kscriptComment		Comment
+hi def link kscriptString			String
+hi def link kscriptPreCondit		PreCondit
+hi def link kscriptHardCoded		Statement
 
-delcommand HiLink
 
 let b:current_syntax = "kscript"
 
diff --git a/runtime/syntax/kwt.vim b/runtime/syntax/kwt.vim
index b711663c46..ecda5bb985 100644
--- a/runtime/syntax/kwt.vim
+++ b/runtime/syntax/kwt.vim
@@ -52,18 +52,16 @@ syn region kwtRewBody		transparent keepend extend fold start="->\s*<" start="^\s
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink kwtStatement	cppStatement
-HiLink kwtDecl	cppStatement
-HiLink kwtCast	cppStatement
-HiLink kwtSep	Delimiter
-HiLink kwtViews	Label
-HiLink kwtPhylum	Type
-HiLink kwtOption	PreProc
-"HiLink cText	Comment
+hi def link kwtStatement	cppStatement
+hi def link kwtDecl	cppStatement
+hi def link kwtCast	cppStatement
+hi def link kwtSep	Delimiter
+hi def link kwtViews	Label
+hi def link kwtPhylum	Type
+hi def link kwtOption	PreProc
+"hi def link cText	Comment
 
-delcommand HiLink
 
 syn sync lines=300
 
diff --git a/runtime/syntax/lace.vim b/runtime/syntax/lace.vim
index dbdaf8bec8..9a83851f2b 100644
--- a/runtime/syntax/lace.vim
+++ b/runtime/syntax/lace.vim
@@ -83,41 +83,39 @@ syn sync lines=40
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink laceTopStruct			PreProc
+hi def link laceTopStruct			PreProc
 
-HiLink laceOptionClause		Statement
-HiLink laceOptionMark			Constant
-HiLink laceClusterProp		Label
-HiLink laceAdaptClassName		Label
-HiLink laceExternal			Statement
-HiLink laceCluster			ModeMsg
+hi def link laceOptionClause		Statement
+hi def link laceOptionMark			Constant
+hi def link laceClusterProp		Label
+hi def link laceAdaptClassName		Label
+hi def link laceExternal			Statement
+hi def link laceCluster			ModeMsg
 
-HiLink laceEscape				Special
+hi def link laceEscape				Special
 
-HiLink laceBool				Boolean
-HiLink laceString				String
-HiLink laceCharacter			Character
-HiLink laceClassName			Type
-HiLink laceNumber				Number
+hi def link laceBool				Boolean
+hi def link laceString				String
+hi def link laceCharacter			Character
+hi def link laceClassName			Type
+hi def link laceNumber				Number
 
-HiLink laceOperator			Special
-HiLink laceArray				Special
-HiLink laceExport				Special
-HiLink laceCreation			Special
-HiLink laceBrackets			Special
-HiLink laceConstraint			Special
+hi def link laceOperator			Special
+hi def link laceArray				Special
+hi def link laceExport				Special
+hi def link laceCreation			Special
+hi def link laceBrackets			Special
+hi def link laceConstraint			Special
 
-HiLink laceComment			Comment
+hi def link laceComment			Comment
 
-HiLink laceError				Error
-HiLink laceStringError		Error
-HiLink laceParenError			Error
-HiLink laceBracketError		Error
-HiLink laceTodo				Todo
+hi def link laceError				Error
+hi def link laceStringError		Error
+hi def link laceParenError			Error
+hi def link laceBracketError		Error
+hi def link laceTodo				Todo
 
-delcommand HiLink
 
 let b:current_syntax = "lace"
 
diff --git a/runtime/syntax/latte.vim b/runtime/syntax/latte.vim
index f95c7b5c73..e30ae42e38 100644
--- a/runtime/syntax/latte.vim
+++ b/runtime/syntax/latte.vim
@@ -64,20 +64,18 @@ syn sync match matchPlace grouphere NONE "^[^ \t]"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink latteSyntax		Statement
-HiLink latteVar			Function
+hi def link latteSyntax		Statement
+hi def link latteVar			Function
 
-HiLink latteString		String
-HiLink latteQuote			String
+hi def link latteString		String
+hi def link latteQuote			String
 
-HiLink latteDelimiter		Delimiter
-HiLink latteOperator		Operator
+hi def link latteDelimiter		Delimiter
+hi def link latteOperator		Operator
 
-HiLink latteComment		Comment
-HiLink latteError			Error
+hi def link latteComment		Comment
+hi def link latteError			Error
 
-delcommand HiLink
 
 let b:current_syntax = "latte"
diff --git a/runtime/syntax/ldif.vim b/runtime/syntax/ldif.vim
index 704a590ec5..576e4c023d 100644
--- a/runtime/syntax/ldif.vim
+++ b/runtime/syntax/ldif.vim
@@ -20,16 +20,14 @@ syn region ldifFileValue   matchgroup=ldifPunctuation start=/:< / end=/\_$/ skip
 
 syn region ldifComment start=/^#/ end=/\_$/ skip=/\n /
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ldifAttribute		Type
-HiLink ldifOption		Identifier
-HiLink ldifPunctuation	Normal
-HiLink ldifStringValue	String
-HiLink ldifBase64Value	Special
-HiLink ldifFileValue		Special
-HiLink ldifComment		Comment
+hi def link ldifAttribute		Type
+hi def link ldifOption		Identifier
+hi def link ldifPunctuation	Normal
+hi def link ldifStringValue	String
+hi def link ldifBase64Value	Special
+hi def link ldifFileValue		Special
+hi def link ldifComment		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "ldif"
diff --git a/runtime/syntax/lex.vim b/runtime/syntax/lex.vim
index 83eb212f2f..560aa44be3 100644
--- a/runtime/syntax/lex.vim
+++ b/runtime/syntax/lex.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
 " Language:	Lex
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Nov 14, 2012
-" Version:	14
-" URL:	http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
+" Last Change:	Aug 31, 2016
+" Version:	16
+" URL:	http://mysite.verizon.net/astronaut/vim/index.html#SYNTAX_LEX
 "
 " Option:
 "   lex_uses_cpp : if this variable exists, then C++ is loaded rather than C
@@ -119,22 +119,24 @@ syn sync match lexSyncPat	groupthere lexPatBlock	"^<$"
 syn sync match lexSyncPat	groupthere lexPatBlock	"^%%$"
 
 " The default highlighting.
-hi def link lexAbbrvComment	lexPatComment
-hi def link lexAbbrvRegExp	Macro
-hi def link lexAbbrv	SpecialChar
-hi def link lexBrace	lexPat
-hi def link lexCFunctions	Function
-hi def link lexCstruct	cStructure
-hi def link lexMorePat	SpecialChar
-hi def link lexOptions	PreProc
-hi def link lexPatComment	Comment
-hi def link lexPat		Function
-hi def link lexPatString	Function
-hi def link lexPatTag	Special
-hi def link lexPatTagZone	lexPatTag
-hi def link lexSep		Delimiter
-hi def link lexSlashQuote	lexPat
-hi def link lexStartState	Statement
+if !exists("skip_lex_syntax_inits")
+ hi def link lexAbbrvComment	lexPatComment
+ hi def link lexAbbrvRegExp	Macro
+ hi def link lexAbbrv	SpecialChar
+ hi def link lexBrace	lexPat
+ hi def link lexCFunctions	Function
+ hi def link lexCstruct	cStructure
+ hi def link lexMorePat	SpecialChar
+ hi def link lexOptions	PreProc
+ hi def link lexPatComment	Comment
+ hi def link lexPat		Function
+ hi def link lexPatString	Function
+ hi def link lexPatTag	Special
+ hi def link lexPatTagZone	lexPatTag
+ hi def link lexSep		Delimiter
+ hi def link lexSlashQuote	lexPat
+ hi def link lexStartState	Statement
+endif
 
 let b:current_syntax = "lex"
 
diff --git a/runtime/syntax/lhaskell.vim b/runtime/syntax/lhaskell.vim
index 78207812f0..0a8a076ff4 100644
--- a/runtime/syntax/lhaskell.vim
+++ b/runtime/syntax/lhaskell.vim
@@ -104,14 +104,12 @@ syntax region beginCodeCode  matchgroup=texDelimiter start="{" end="}"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink lhsBirdTrack Comment
+hi def link lhsBirdTrack Comment
 
-HiLink beginCodeBegin	      texCmdName
-HiLink beginCodeCode	      texSection
+hi def link beginCodeBegin	      texCmdName
+hi def link beginCodeCode	      texSection
 
-delcommand HiLink
 
 " Restore cursor to original position, as it may have been disturbed
 " by the searches in our guessing code
diff --git a/runtime/syntax/lifelines.vim b/runtime/syntax/lifelines.vim
index 041c50963d..ff4692888e 100644
--- a/runtime/syntax/lifelines.vim
+++ b/runtime/syntax/lifelines.vim
@@ -122,34 +122,32 @@ syn match	lifelinesErrInParen	contained "[{}]"
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink lifelinesConditional	Conditional
-HiLink lifelinesArithm	Operator
-HiLink lifelinesLogical	Conditional
-HiLink lifelinesInclude	Include
-HiLink lifelinesComment	Comment
-HiLink lifelinesStatement	Statement
-HiLink lifelinesUser		Statement
-HiLink lifelinesFunct		Statement
-HiLink lifelinesTable		Statement
-HiLink lifelinesGedcom	Statement
-HiLink lifelinesList		Statement
-HiLink lifelinesRepeat	Repeat
-HiLink lifelinesFam		Statement
-HiLink lifelinesIndi		Statement
-HiLink lifelinesProc		Statement
-HiLink lifelinesDef		Statement
-HiLink lifelinesString	String
-HiLink lifelinesSpecial	Special
-HiLink lifelinesNumber	Number
-HiLink lifelinesParenError	Error
-HiLink lifelinesErrInParen	Error
-HiLink lifelinesError		Error
-HiLink lifelinesTodo		Todo
-HiLink lifelinesDecl		PreProc
+hi def link lifelinesConditional	Conditional
+hi def link lifelinesArithm	Operator
+hi def link lifelinesLogical	Conditional
+hi def link lifelinesInclude	Include
+hi def link lifelinesComment	Comment
+hi def link lifelinesStatement	Statement
+hi def link lifelinesUser		Statement
+hi def link lifelinesFunct		Statement
+hi def link lifelinesTable		Statement
+hi def link lifelinesGedcom	Statement
+hi def link lifelinesList		Statement
+hi def link lifelinesRepeat	Repeat
+hi def link lifelinesFam		Statement
+hi def link lifelinesIndi		Statement
+hi def link lifelinesProc		Statement
+hi def link lifelinesDef		Statement
+hi def link lifelinesString	String
+hi def link lifelinesSpecial	Special
+hi def link lifelinesNumber	Number
+hi def link lifelinesParenError	Error
+hi def link lifelinesErrInParen	Error
+hi def link lifelinesError		Error
+hi def link lifelinesTodo		Todo
+hi def link lifelinesDecl		PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "lifelines"
 
diff --git a/runtime/syntax/lilo.vim b/runtime/syntax/lilo.vim
index f58e34061c..a87dafb734 100644
--- a/runtime/syntax/lilo.vim
+++ b/runtime/syntax/lilo.vim
@@ -119,58 +119,56 @@ syn match liloDecNumberPListComment "#.*$" contained nextgroup=liloDecNumberPLis
 syn match liloAnythingComment "#.*$" contained nextgroup=liloAnything,liloAnythingComment,liloError skipwhite skipempty
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink liloEqPath             liloEquals
-HiLink liloEqWord             liloEquals
-HiLink liloEqVga              liloEquals
-HiLink liloEqDecNumber        liloEquals
-HiLink liloEqHexNumber        liloEquals
-HiLink liloEqNumber           liloEquals
-HiLink liloEqString           liloEquals
-HiLink liloEqAnything         liloEquals
-HiLink liloEquals             Special
+hi def link liloEqPath             liloEquals
+hi def link liloEqWord             liloEquals
+hi def link liloEqVga              liloEquals
+hi def link liloEqDecNumber        liloEquals
+hi def link liloEqHexNumber        liloEquals
+hi def link liloEqNumber           liloEquals
+hi def link liloEqString           liloEquals
+hi def link liloEqAnything         liloEquals
+hi def link liloEquals             Special
 
-HiLink liloError              Error
+hi def link liloError              Error
 
-HiLink liloEqPathComment      liloComment
-HiLink liloEqVgaComment       liloComment
-HiLink liloEqDecNumberComment liloComment
-HiLink liloEqHexNumberComment liloComment
-HiLink liloEqStringComment    liloComment
-HiLink liloEqAnythingComment  liloComment
-HiLink liloPathComment        liloComment
-HiLink liloVgaComment         liloComment
-HiLink liloDecNumberComment   liloComment
-HiLink liloHexNumberComment   liloComment
-HiLink liloNumberComment      liloComment
-HiLink liloStringComment      liloComment
-HiLink liloAnythingComment    liloComment
-HiLink liloComment            Comment
+hi def link liloEqPathComment      liloComment
+hi def link liloEqVgaComment       liloComment
+hi def link liloEqDecNumberComment liloComment
+hi def link liloEqHexNumberComment liloComment
+hi def link liloEqStringComment    liloComment
+hi def link liloEqAnythingComment  liloComment
+hi def link liloPathComment        liloComment
+hi def link liloVgaComment         liloComment
+hi def link liloDecNumberComment   liloComment
+hi def link liloHexNumberComment   liloComment
+hi def link liloNumberComment      liloComment
+hi def link liloStringComment      liloComment
+hi def link liloAnythingComment    liloComment
+hi def link liloComment            Comment
 
-HiLink liloDiskOpt            liloOption
-HiLink liloKernelOpt          liloOption
-HiLink liloImageOpt           liloOption
-HiLink liloOption             Keyword
+hi def link liloDiskOpt            liloOption
+hi def link liloKernelOpt          liloOption
+hi def link liloImageOpt           liloOption
+hi def link liloOption             Keyword
 
-HiLink liloDecNumber          liloNumber
-HiLink liloHexNumber          liloNumber
-HiLink liloDecNumberP         liloNumber
-HiLink liloNumber             Number
-HiLink liloString             String
-HiLink liloPath               Constant
+hi def link liloDecNumber          liloNumber
+hi def link liloHexNumber          liloNumber
+hi def link liloDecNumberP         liloNumber
+hi def link liloNumber             Number
+hi def link liloString             String
+hi def link liloPath               Constant
 
-HiLink liloSpecial            Special
-HiLink liloLabel              Title
-HiLink liloDecNumberList      Special
-HiLink liloDecNumberPList     Special
-HiLink liloAnything           Normal
-HiLink liloEnviron            Identifier
-HiLink liloVgaKeyword         Identifier
-HiLink liloImage              Type
-HiLink liloChRules            Preproc
-HiLink liloDisk               Preproc
+hi def link liloSpecial            Special
+hi def link liloLabel              Title
+hi def link liloDecNumberList      Special
+hi def link liloDecNumberPList     Special
+hi def link liloAnything           Normal
+hi def link liloEnviron            Identifier
+hi def link liloVgaKeyword         Identifier
+hi def link liloImage              Type
+hi def link liloChRules            Preproc
+hi def link liloDisk               Preproc
 
-delcommand HiLink
 
 let b:current_syntax = "lilo"
diff --git a/runtime/syntax/lisp.vim b/runtime/syntax/lisp.vim
index f555070032..b02eb09d0a 100644
--- a/runtime/syntax/lisp.vim
+++ b/runtime/syntax/lisp.vim
@@ -2,7 +2,7 @@
 " Language:    Lisp
 " Maintainer:  Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
 " Last Change: May 02, 2016
-" Version:     25
+" Version:     26
 " URL:	       http://www.drchip.org/astronaut/vim/index.html#SYNTAX_LISP
 "
 "  Thanks to F Xavier Noria for a list of 978 Common Lisp symbols taken from HyperSpec
@@ -561,58 +561,57 @@ syn sync lines=100
 
 " ---------------------------------------------------------------------
 " Define Highlighting: {{{1
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_lisp_syntax_inits")
 
-HiLink lispCommentRegion	lispComment
-HiLink lispAtomNmbr		lispNumber
-HiLink lispAtomMark		lispMark
-HiLink lispInStringString	lispString
+  hi def link lispCommentRegion	lispComment
+  hi def link lispAtomNmbr		lispNumber
+  hi def link lispAtomMark		lispMark
+  hi def link lispInStringString	lispString
 
-HiLink lispAtom		Identifier
-HiLink lispAtomBarSymbol	Special
-HiLink lispBarSymbol		Special
-HiLink lispComment		Comment
-HiLink lispConcat		Statement
-HiLink lispDecl		Statement
-HiLink lispFunc		Statement
-HiLink lispKey		Type
-HiLink lispMark		Delimiter
-HiLink lispNumber		Number
-HiLink lispParenError		Error
-HiLink lispEscapeSpecial	Type
-HiLink lispString		String
-HiLink lispTodo		Todo
-HiLink lispVar		Statement
+  hi def link lispAtom		Identifier
+  hi def link lispAtomBarSymbol	Special
+  hi def link lispBarSymbol		Special
+  hi def link lispComment		Comment
+  hi def link lispConcat		Statement
+  hi def link lispDecl		Statement
+  hi def link lispFunc		Statement
+  hi def link lispKey		Type
+  hi def link lispMark		Delimiter
+  hi def link lispNumber		Number
+  hi def link lispParenError		Error
+  hi def link lispEscapeSpecial	Type
+  hi def link lispString		String
+  hi def link lispTodo		Todo
+  hi def link lispVar		Statement
+
+  if exists("g:lisp_rainbow") && g:lisp_rainbow != 0
+   if &bg == "dark"
+    hi def hlLevel0 ctermfg=red         guifg=red1
+    hi def hlLevel1 ctermfg=yellow      guifg=orange1
+    hi def hlLevel2 ctermfg=green       guifg=yellow1
+    hi def hlLevel3 ctermfg=cyan        guifg=greenyellow
+    hi def hlLevel4 ctermfg=magenta     guifg=green1
+    hi def hlLevel5 ctermfg=red         guifg=springgreen1
+    hi def hlLevel6 ctermfg=yellow      guifg=cyan1
+    hi def hlLevel7 ctermfg=green       guifg=slateblue1
+    hi def hlLevel8 ctermfg=cyan        guifg=magenta1
+    hi def hlLevel9 ctermfg=magenta     guifg=purple1
+   else
+    hi def hlLevel0 ctermfg=red         guifg=red3
+    hi def hlLevel1 ctermfg=darkyellow  guifg=orangered3
+    hi def hlLevel2 ctermfg=darkgreen   guifg=orange2
+    hi def hlLevel3 ctermfg=blue        guifg=yellow3
+    hi def hlLevel4 ctermfg=darkmagenta guifg=olivedrab4
+    hi def hlLevel5 ctermfg=red         guifg=green4
+    hi def hlLevel6 ctermfg=darkyellow  guifg=paleturquoise3
+    hi def hlLevel7 ctermfg=darkgreen   guifg=deepskyblue4
+    hi def hlLevel8 ctermfg=blue        guifg=darkslateblue
+    hi def hlLevel9 ctermfg=darkmagenta guifg=darkviolet
+   endif
+  endif
 
-if exists("g:lisp_rainbow") && g:lisp_rainbow != 0
- if &bg == "dark"
-  hi def hlLevel0 ctermfg=red         guifg=red1
-  hi def hlLevel1 ctermfg=yellow      guifg=orange1
-  hi def hlLevel2 ctermfg=green       guifg=yellow1
-  hi def hlLevel3 ctermfg=cyan        guifg=greenyellow
-  hi def hlLevel4 ctermfg=magenta     guifg=green1
-  hi def hlLevel5 ctermfg=red         guifg=springgreen1
-  hi def hlLevel6 ctermfg=yellow      guifg=cyan1
-  hi def hlLevel7 ctermfg=green       guifg=slateblue1
-  hi def hlLevel8 ctermfg=cyan        guifg=magenta1
-  hi def hlLevel9 ctermfg=magenta     guifg=purple1
- else
-  hi def hlLevel0 ctermfg=red         guifg=red3
-  hi def hlLevel1 ctermfg=darkyellow  guifg=orangered3
-  hi def hlLevel2 ctermfg=darkgreen   guifg=orange2
-  hi def hlLevel3 ctermfg=blue        guifg=yellow3
-  hi def hlLevel4 ctermfg=darkmagenta guifg=olivedrab4
-  hi def hlLevel5 ctermfg=red         guifg=green4
-  hi def hlLevel6 ctermfg=darkyellow  guifg=paleturquoise3
-  hi def hlLevel7 ctermfg=darkgreen   guifg=deepskyblue4
-  hi def hlLevel8 ctermfg=blue        guifg=darkslateblue
-  hi def hlLevel9 ctermfg=darkmagenta guifg=darkviolet
- endif
 endif
 
-delcommand HiLink
-
 let b:current_syntax = "lisp"
 
 " ---------------------------------------------------------------------
diff --git a/runtime/syntax/lite.vim b/runtime/syntax/lite.vim
index 1a76e6c7f5..a8d26892d4 100644
--- a/runtime/syntax/lite.vim
+++ b/runtime/syntax/lite.vim
@@ -136,30 +136,28 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink liteComment		Comment
-HiLink liteString		String
-HiLink liteNumber		Number
-HiLink liteFloat		Float
-HiLink liteIdentifier	Identifier
-HiLink liteGlobalIdentifier	Identifier
-HiLink liteIntVar		Identifier
-HiLink liteFunctions		Function
-HiLink liteRepeat		Repeat
-HiLink liteConditional	Conditional
-HiLink liteStatement		Statement
-HiLink liteType		Type
-HiLink liteInclude		Include
-HiLink liteDefine		Define
-HiLink liteSpecialChar	SpecialChar
-HiLink liteParentError	liteError
-HiLink liteError		Error
-HiLink liteTodo		Todo
-HiLink liteOperator		Operator
-HiLink liteRelation		Operator
+hi def link liteComment		Comment
+hi def link liteString		String
+hi def link liteNumber		Number
+hi def link liteFloat		Float
+hi def link liteIdentifier	Identifier
+hi def link liteGlobalIdentifier	Identifier
+hi def link liteIntVar		Identifier
+hi def link liteFunctions		Function
+hi def link liteRepeat		Repeat
+hi def link liteConditional	Conditional
+hi def link liteStatement		Statement
+hi def link liteType		Type
+hi def link liteInclude		Include
+hi def link liteDefine		Define
+hi def link liteSpecialChar	SpecialChar
+hi def link liteParentError	liteError
+hi def link liteError		Error
+hi def link liteTodo		Todo
+hi def link liteOperator		Operator
+hi def link liteRelation		Operator
 
-delcommand HiLink
 
 let b:current_syntax = "lite"
 
diff --git a/runtime/syntax/logtalk.vim b/runtime/syntax/logtalk.vim
index e4decf2ef9..532f83d3bf 100644
--- a/runtime/syntax/logtalk.vim
+++ b/runtime/syntax/logtalk.vim
@@ -387,48 +387,46 @@ syn sync ccomment logtalkBlockComment maxlines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink	logtalkBlockComment	Comment
-HiLink	logtalkLineComment	Comment
+hi def link logtalkBlockComment	Comment
+hi def link logtalkLineComment	Comment
 
-HiLink	logtalkOpenEntityDir	Normal
-HiLink	logtalkOpenEntityDirTag	PreProc
+hi def link logtalkOpenEntityDir	Normal
+hi def link logtalkOpenEntityDirTag	PreProc
 
-HiLink	logtalkIfContainer	PreProc
-HiLink	logtalkIf		PreProc
-HiLink	logtalkElseIf		PreProc
-HiLink	logtalkElse		PreProc
+hi def link logtalkIfContainer	PreProc
+hi def link logtalkIf		PreProc
+hi def link logtalkElseIf		PreProc
+hi def link logtalkElse		PreProc
 
-HiLink	logtalkEntity		Normal
+hi def link logtalkEntity		Normal
 
-HiLink	logtalkEntityRel	Normal
-HiLink	logtalkEntityRelTag	PreProc
+hi def link logtalkEntityRel	Normal
+hi def link logtalkEntityRelTag	PreProc
 
-HiLink	logtalkCloseEntityDir	PreProc
+hi def link logtalkCloseEntityDir	PreProc
 
-HiLink	logtalkDir		Normal
-HiLink	logtalkDirTag		PreProc
+hi def link logtalkDir		Normal
+hi def link logtalkDirTag		PreProc
 
-HiLink	logtalkAtom		String
-HiLink	logtalkString		String
-HiLink	logtalkEscapeSequence	SpecialChar
+hi def link logtalkAtom		String
+hi def link logtalkString		String
+hi def link logtalkEscapeSequence	SpecialChar
 
-HiLink	logtalkNumber		Number
+hi def link logtalkNumber		Number
 
-HiLink	logtalkKeyword		Keyword
+hi def link logtalkKeyword		Keyword
 
-HiLink	logtalkBuiltIn		Keyword
-HiLink	logtalkBuiltInMethod	Keyword
+hi def link logtalkBuiltIn		Keyword
+hi def link logtalkBuiltInMethod	Keyword
 
-HiLink	logtalkOperator		Operator
+hi def link logtalkOperator		Operator
 
-HiLink	logtalkExtCall		Normal
-HiLink	logtalkExtCallTag	Operator
+hi def link logtalkExtCall		Normal
+hi def link logtalkExtCallTag	Operator
 
-HiLink	logtalkVariable		Identifier
+hi def link logtalkVariable		Identifier
 
-delcommand HiLink
 
 
 let b:current_syntax = "logtalk"
diff --git a/runtime/syntax/lotos.vim b/runtime/syntax/lotos.vim
index e617bdb086..8262e1d9ef 100644
--- a/runtime/syntax/lotos.vim
+++ b/runtime/syntax/lotos.vim
@@ -54,17 +54,15 @@ syn sync lines=250
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink lotosStatement		Statement
-HiLink lotosProcess		Label
-HiLink lotosOperator		Operator
-HiLink lotosSort		Function
-HiLink lotosType		Type
-HiLink lotosComment		Comment
-HiLink lotosDelimiter		String
+hi def link lotosStatement		Statement
+hi def link lotosProcess		Label
+hi def link lotosOperator		Operator
+hi def link lotosSort		Function
+hi def link lotosType		Type
+hi def link lotosComment		Comment
+hi def link lotosDelimiter		String
 
-delcommand HiLink
 
 let b:current_syntax = "lotos"
 
diff --git a/runtime/syntax/lout.vim b/runtime/syntax/lout.vim
index e7a1e15627..30c87fce51 100644
--- a/runtime/syntax/lout.vim
+++ b/runtime/syntax/lout.vim
@@ -100,35 +100,32 @@ syn region loutHeadings matchgroup=loutHeads start='@\(\(Title\)\|\(Caption\)\)\
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overrriden later.
-HiLink loutTodo Todo
-HiLink loutDefine Define
-HiLink loutEOmlDef Define
-HiLink loutFunction Function
-HiLink loutBraceError Error
-HiLink loutNULL Special
-HiLink loutComment Comment
-HiLink loutSpecial Special
-HiLink loutSymbols Character
-HiLink loutInclude Include
-HiLink loutKeyword Keyword
-HiLink loutTag Tag
-HiLink loutMath Number
+hi def link loutTodo Todo
+hi def link loutDefine Define
+hi def link loutEOmlDef Define
+hi def link loutFunction Function
+hi def link loutBraceError Error
+hi def link loutNULL Special
+hi def link loutComment Comment
+hi def link loutSpecial Special
+hi def link loutSymbols Character
+hi def link loutInclude Include
+hi def link loutKeyword Keyword
+hi def link loutTag Tag
+hi def link loutMath Number
 
-" HiLink Not really needed here, but I think it is more consistent.
-HiLink loutMBraces loutMath
+hi def link loutMBraces loutMath
 hi loutItalic term=italic cterm=italic gui=italic
-HiLink loutIBraces loutItalic
+hi def link loutIBraces loutItalic
 hi loutBold term=bold cterm=bold gui=bold
-HiLink loutBBraces loutBold
+hi def link loutBBraces loutBold
 hi loutBoldItalic term=bold,italic cterm=bold,italic gui=bold,italic
-HiLink loutBIBraces loutBoldItalic
+hi def link loutBIBraces loutBoldItalic
 hi loutHeadings term=bold cterm=bold guifg=indianred
-HiLink loutHeads loutHeadings
+hi def link loutHeads loutHeadings
 
-delcommand HiLink
 
 let b:current_syntax = "lout"
 
diff --git a/runtime/syntax/lpc.vim b/runtime/syntax/lpc.vim
index 45aba92159..7d85fce8e2 100644
--- a/runtime/syntax/lpc.vim
+++ b/runtime/syntax/lpc.vim
@@ -2,7 +2,7 @@
 " Language:	LPC
 " Maintainer:	Shizhu Pan <poet@mudbuilder.net>
 " URL:		http://poet.tomud.com/pub/lpc.vim.bz2
-" Last Change:	2011 Dec 10 by Thilo Six
+" Last Change:	2016 Aug 31
 " Comments:	If you are using Vim 6.2 or later, see :h lpc.vim for
 "		file type recognizing, if not, you had to use modeline.
 
@@ -358,85 +358,83 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink lpcModifier		lpcStorageClass
+hi def link lpcModifier		lpcStorageClass
 
-HiLink lpcQuotedFmt		lpcFormat
-HiLink lpcFormat		lpcSpecial
-HiLink lpcCppString		lpcString	" Cpp means
+hi def link lpcQuotedFmt		lpcFormat
+hi def link lpcFormat		lpcSpecial
+hi def link lpcCppString		lpcString	" Cpp means
 					      " C Pre-Processor
-HiLink lpcCommentL		lpcComment
-HiLink lpcCommentStart	lpcComment
-HiLink lpcUserLabel		lpcLabel
-HiLink lpcSpecialCharacter	lpcSpecial
-HiLink lpcOctal		lpcPreProc
-HiLink lpcOctalZero		lpcSpecial  " LPC will treat octal numbers
+hi def link lpcCommentL		lpcComment
+hi def link lpcCommentStart	lpcComment
+hi def link lpcUserLabel		lpcLabel
+hi def link lpcSpecialCharacter	lpcSpecial
+hi def link lpcOctal		lpcPreProc
+hi def link lpcOctalZero		lpcSpecial  " LPC will treat octal numbers
 					  " as decimals, programmers should
 					  " be aware of that.
-HiLink lpcEfunError		lpcError
-HiLink lpcKeywdError		lpcError
-HiLink lpcOctalError		lpcError
-HiLink lpcParenError		lpcError
-HiLink lpcErrInParen		lpcError
-HiLink lpcErrInBracket	lpcError
-HiLink lpcCommentError	lpcError
-HiLink lpcCommentStartError	lpcError
-HiLink lpcSpaceError		lpcError
-HiLink lpcSpecialError	lpcError
-HiLink lpcErrFunc		lpcError
+hi def link lpcEfunError		lpcError
+hi def link lpcKeywdError		lpcError
+hi def link lpcOctalError		lpcError
+hi def link lpcParenError		lpcError
+hi def link lpcErrInParen		lpcError
+hi def link lpcErrInBracket	lpcError
+hi def link lpcCommentError	lpcError
+hi def link lpcCommentStartError	lpcError
+hi def link lpcSpaceError		lpcError
+hi def link lpcSpecialError	lpcError
+hi def link lpcErrFunc		lpcError
 
 if exists("lpc_pre_v22")
-    HiLink lpcOldEfuns	lpc_efuns
-    HiLink lpcNewEfuns	lpcError
+    hi def link lpcOldEfuns	lpc_efuns
+    hi def link lpcNewEfuns	lpcError
 else
-    HiLink lpcOldEfuns	lpcReserved
-    HiLink lpcNewEfuns	lpc_efuns
+    hi def link lpcOldEfuns	lpcReserved
+    hi def link lpcNewEfuns	lpc_efuns
 endif
-HiLink lpc_efuns		lpcFunction
+hi def link lpc_efuns		lpcFunction
 
-HiLink lpcReserved		lpcPreProc
-HiLink lpcTextString		lpcString   " This should be preprocessors, but
-HiLink lpcArrayString		lpcPreProc  " let's make some difference
+hi def link lpcReserved		lpcPreProc
+hi def link lpcTextString		lpcString   " This should be preprocessors, but
+hi def link lpcArrayString		lpcPreProc  " let's make some difference
 					  " between text and array
 
-HiLink lpcIncluded		lpcString
-HiLink lpcCommentString	lpcString
-HiLink lpcComment2String	lpcString
-HiLink lpcCommentSkip		lpcComment
-HiLink lpcCommentFunc		lpcComment
+hi def link lpcIncluded		lpcString
+hi def link lpcCommentString	lpcString
+hi def link lpcComment2String	lpcString
+hi def link lpcCommentSkip		lpcComment
+hi def link lpcCommentFunc		lpcComment
 
-HiLink lpcCppSkip		lpcCppOut
-HiLink lpcCppOut2		lpcCppOut
-HiLink lpcCppOut		lpcComment
+hi def link lpcCppSkip		lpcCppOut
+hi def link lpcCppOut2		lpcCppOut
+hi def link lpcCppOut		lpcComment
 
 " Standard type below
-HiLink lpcApplies		Special
-HiLink lpcCharacter		Character
-HiLink lpcComment		Comment
-HiLink lpcConditional		Conditional
-HiLink lpcConstant		Constant
-HiLink lpcDefine		Macro
-HiLink lpcError		Error
-HiLink lpcFloat		Float
-HiLink lpcFunction		Function
-HiLink lpcIdentifier		Identifier
-HiLink lpcInclude		Include
-HiLink lpcLabel		Label
-HiLink lpcNumber		Number
-HiLink lpcOperator		Operator
-HiLink lpcPreCondit		PreCondit
-HiLink lpcPreProc		PreProc
-HiLink lpcRepeat		Repeat
-HiLink lpcStatement		Statement
-HiLink lpcStorageClass	StorageClass
-HiLink lpcString		String
-HiLink lpcStructure		Structure
-HiLink lpcSpecial		LineNr
-HiLink lpcTodo		Todo
-HiLink lpcType		Type
+hi def link lpcApplies		Special
+hi def link lpcCharacter		Character
+hi def link lpcComment		Comment
+hi def link lpcConditional		Conditional
+hi def link lpcConstant		Constant
+hi def link lpcDefine		Macro
+hi def link lpcError		Error
+hi def link lpcFloat		Float
+hi def link lpcFunction		Function
+hi def link lpcIdentifier		Identifier
+hi def link lpcInclude		Include
+hi def link lpcLabel		Label
+hi def link lpcNumber		Number
+hi def link lpcOperator		Operator
+hi def link lpcPreCondit		PreCondit
+hi def link lpcPreProc		PreProc
+hi def link lpcRepeat		Repeat
+hi def link lpcStatement		Statement
+hi def link lpcStorageClass	StorageClass
+hi def link lpcString		String
+hi def link lpcStructure		Structure
+hi def link lpcSpecial		LineNr
+hi def link lpcTodo		Todo
+hi def link lpcType		Type
 
-delcommand HiLink
 
 " Nodule: This is the end nodule. {{{1
 
diff --git a/runtime/syntax/lprolog.vim b/runtime/syntax/lprolog.vim
index 1256758049..85c3537fed 100644
--- a/runtime/syntax/lprolog.vim
+++ b/runtime/syntax/lprolog.vim
@@ -94,32 +94,30 @@ syn sync maxlines=500
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink lprologComment     Comment
-HiLink lprologTodo	    Todo
+hi def link lprologComment     Comment
+hi def link lprologTodo	    Todo
 
-HiLink lprologKeyword     Keyword
-HiLink lprologSpecial     Special
-HiLink lprologOperator    Operator
-HiLink lprologIdentifier  Normal
+hi def link lprologKeyword     Keyword
+hi def link lprologSpecial     Special
+hi def link lprologOperator    Operator
+hi def link lprologIdentifier  Normal
 
-HiLink lprologInteger     Number
-HiLink lprologReal	    Number
-HiLink lprologString	    String
+hi def link lprologInteger     Number
+hi def link lprologReal	    Number
+hi def link lprologString	    String
 
-HiLink lprologCommentErr  Error
-HiLink lprologBrackErr    Error
-HiLink lprologParenErr    Error
+hi def link lprologCommentErr  Error
+hi def link lprologBrackErr    Error
+hi def link lprologParenErr    Error
 
-HiLink lprologModuleName  Special
-HiLink lprologTypeName    Identifier
+hi def link lprologModuleName  Special
+hi def link lprologTypeName    Identifier
 
-HiLink lprologVariable    Keyword
-HiLink lprologAtom	    Normal
-HiLink lprologClause	    Type
+hi def link lprologVariable    Keyword
+hi def link lprologAtom	    Normal
+hi def link lprologClause	    Type
 
-delcommand HiLink
 
 let b:current_syntax = "lprolog"
 
diff --git a/runtime/syntax/lscript.vim b/runtime/syntax/lscript.vim
index 2dbd33ddba..3c4a0fffda 100644
--- a/runtime/syntax/lscript.vim
+++ b/runtime/syntax/lscript.vim
@@ -177,25 +177,23 @@ syn match   lscriptTypeSpecifier	"[a-zA-Z0-9][\$%&!#]"ms=s+1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 hi lscriptNotesType	term=underline ctermfg=DarkGreen guifg=SeaGreen gui=bold
 
-HiLink lscriptNotesConst	lscriptNotesType
-HiLink lscriptLineNumber	Comment
-HiLink lscriptDatatype	Type
-HiLink lscriptNumber		Number
-HiLink lscriptError		Error
-HiLink lscriptStatement	Statement
-HiLink lscriptString		String
-HiLink lscriptComment		Comment
-HiLink lscriptTodo		Todo
-HiLink lscriptFunction	Identifier
-HiLink lscriptMethods		PreProc
-HiLink lscriptEvents		Special
-HiLink lscriptTypeSpecifier	Type
+hi def link lscriptNotesConst	lscriptNotesType
+hi def link lscriptLineNumber	Comment
+hi def link lscriptDatatype	Type
+hi def link lscriptNumber		Number
+hi def link lscriptError		Error
+hi def link lscriptStatement	Statement
+hi def link lscriptString		String
+hi def link lscriptComment		Comment
+hi def link lscriptTodo		Todo
+hi def link lscriptFunction	Identifier
+hi def link lscriptMethods		PreProc
+hi def link lscriptEvents		Special
+hi def link lscriptTypeSpecifier	Type
 
-delcommand HiLink
 
 let b:current_syntax = "lscript"
 
diff --git a/runtime/syntax/lua.vim b/runtime/syntax/lua.vim
index 5ef771bb75..f313c14e7a 100644
--- a/runtime/syntax/lua.vim
+++ b/runtime/syntax/lua.vim
@@ -323,31 +323,29 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink luaStatement		Statement
-HiLink luaRepeat		Repeat
-HiLink luaFor			Repeat
-HiLink luaString		String
-HiLink luaString2		String
-HiLink luaNumber		Number
-HiLink luaOperator		Operator
-HiLink luaIn			Operator
-HiLink luaConstant		Constant
-HiLink luaCond		Conditional
-HiLink luaElse		Conditional
-HiLink luaFunction		Function
-HiLink luaComment		Comment
-HiLink luaTodo		Todo
-HiLink luaTable		Structure
-HiLink luaError		Error
-HiLink luaParenError		Error
-HiLink luaBraceError		Error
-HiLink luaSpecial		SpecialChar
-HiLink luaFunc		Identifier
-HiLink luaLabel		Label
+hi def link luaStatement		Statement
+hi def link luaRepeat		Repeat
+hi def link luaFor			Repeat
+hi def link luaString		String
+hi def link luaString2		String
+hi def link luaNumber		Number
+hi def link luaOperator		Operator
+hi def link luaIn			Operator
+hi def link luaConstant		Constant
+hi def link luaCond		Conditional
+hi def link luaElse		Conditional
+hi def link luaFunction		Function
+hi def link luaComment		Comment
+hi def link luaTodo		Todo
+hi def link luaTable		Structure
+hi def link luaError		Error
+hi def link luaParenError		Error
+hi def link luaBraceError		Error
+hi def link luaSpecial		SpecialChar
+hi def link luaFunc		Identifier
+hi def link luaLabel		Label
 
-delcommand HiLink
 
 let b:current_syntax = "lua"
 
diff --git a/runtime/syntax/m4.vim b/runtime/syntax/m4.vim
index 8325405261..6f229ea1ab 100644
--- a/runtime/syntax/m4.vim
+++ b/runtime/syntax/m4.vim
@@ -37,21 +37,19 @@ syn cluster m4Top     contains=m4Comment,m4Constants,m4Special,m4Variable,m4Stri
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink m4Delimiter Delimiter
-HiLink m4Comment   Comment
-HiLink m4Function  Function
-HiLink m4Keyword   Keyword
-HiLink m4Special   Special
-HiLink m4String    String
-HiLink m4Statement Statement
-HiLink m4Preproc   PreProc
-HiLink m4Type      Type
-HiLink m4Special   Special
-HiLink m4Variable  Special
-HiLink m4Constants Constant
-HiLink m4Builtin   Statement
-delcommand HiLink
+hi def link m4Delimiter Delimiter
+hi def link m4Comment   Comment
+hi def link m4Function  Function
+hi def link m4Keyword   Keyword
+hi def link m4Special   Special
+hi def link m4String    String
+hi def link m4Statement Statement
+hi def link m4Preproc   PreProc
+hi def link m4Type      Type
+hi def link m4Special   Special
+hi def link m4Variable  Special
+hi def link m4Constants Constant
+hi def link m4Builtin   Statement
 
 let b:current_syntax = "m4"
 
diff --git a/runtime/syntax/make.vim b/runtime/syntax/make.vim
index f022a4e9ac..7072bab988 100644
--- a/runtime/syntax/make.vim
+++ b/runtime/syntax/make.vim
@@ -99,31 +99,29 @@ syn sync match makeCommandSync groupthere makeCommands "^[A-Za-z0-9_./$()%-][A-Z
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink makeNextLine		makeSpecial
-HiLink makeCmdNextLine	makeSpecial
-HiLink makeSpecTarget		Statement
+hi def link makeNextLine		makeSpecial
+hi def link makeCmdNextLine	makeSpecial
+hi def link makeSpecTarget		Statement
 if !exists("make_no_commands")
-HiLink makeCommands		Number
+hi def link makeCommands		Number
 endif
-HiLink makeImplicit		Function
-HiLink makeTarget		Function
-HiLink makeInclude		Include
-HiLink makePreCondit		PreCondit
-HiLink makeStatement		Statement
-HiLink makeIdent		Identifier
-HiLink makeSpecial		Special
-HiLink makeComment		Comment
-HiLink makeDString		String
-HiLink makeSString		String
-HiLink makeBString		Function
-HiLink makeError		Error
-HiLink makeTodo		Todo
-HiLink makeDefine		Define
-HiLink makeCommandError	Error
-HiLink makeConfig		PreCondit
-delcommand HiLink
+hi def link makeImplicit		Function
+hi def link makeTarget		Function
+hi def link makeInclude		Include
+hi def link makePreCondit		PreCondit
+hi def link makeStatement		Statement
+hi def link makeIdent		Identifier
+hi def link makeSpecial		Special
+hi def link makeComment		Comment
+hi def link makeDString		String
+hi def link makeSString		String
+hi def link makeBString		Function
+hi def link makeError		Error
+hi def link makeTodo		Todo
+hi def link makeDefine		Define
+hi def link makeCommandError	Error
+hi def link makeConfig		PreCondit
 
 let b:current_syntax = "make"
 
diff --git a/runtime/syntax/maple.vim b/runtime/syntax/maple.vim
index ad94053b39..1261ff5a47 100644
--- a/runtime/syntax/maple.vim
+++ b/runtime/syntax/maple.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	Maple V (based on release 4)
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	May 02, 2016
-" Version:	13
+" Last Change:	Aug 31, 2016
+" Version:	15
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_MAPLE
 "
 " Package Function Selection: {{{1
@@ -549,73 +549,73 @@ endif
 
 " Highlighting: Define the default highlighting. {{{1
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_maplev_syntax_inits")
 
-" Maple->Maple Links {{{2
-HiLink mvBraceError	mvError
-HiLink mvCurlyError	mvError
-HiLink mvDebug		mvTodo
-HiLink mvParenError	mvError
-HiLink mvPkg_DEtools	mvPkgFunc
-HiLink mvPkg_Galois	mvPkgFunc
-HiLink mvPkg_GaussInt	mvPkgFunc
-HiLink mvPkg_LREtools	mvPkgFunc
-HiLink mvPkg_combinat	mvPkgFunc
-HiLink mvPkg_combstruct	mvPkgFunc
-HiLink mvPkg_difforms	mvPkgFunc
-HiLink mvPkg_finance	mvPkgFunc
-HiLink mvPkg_genfunc	mvPkgFunc
-HiLink mvPkg_geometry	mvPkgFunc
-HiLink mvPkg_grobner	mvPkgFunc
-HiLink mvPkg_group	mvPkgFunc
-HiLink mvPkg_inttrans	mvPkgFunc
-HiLink mvPkg_liesymm	mvPkgFunc
-HiLink mvPkg_linalg	mvPkgFunc
-HiLink mvPkg_logic	mvPkgFunc
-HiLink mvPkg_networks	mvPkgFunc
-HiLink mvPkg_numapprox	mvPkgFunc
-HiLink mvPkg_numtheory	mvPkgFunc
-HiLink mvPkg_orthopoly	mvPkgFunc
-HiLink mvPkg_padic	mvPkgFunc
-HiLink mvPkg_plots	mvPkgFunc
-HiLink mvPkg_plottools	mvPkgFunc
-HiLink mvPkg_powseries	mvPkgFunc
-HiLink mvPkg_process	mvPkgFunc
-HiLink mvPkg_simplex	mvPkgFunc
-HiLink mvPkg_stats	mvPkgFunc
-HiLink mvPkg_student	mvPkgFunc
-HiLink mvPkg_sumtools	mvPkgFunc
-HiLink mvPkg_tensor	mvPkgFunc
-HiLink mvPkg_totorder	mvPkgFunc
-HiLink mvRange		mvOper
-HiLink mvSemiError	mvError
-HiLink mvDelim		Delimiter
+  " Maple->Maple Links {{{2
+  hi def link mvBraceError	mvError
+  hi def link mvCurlyError	mvError
+  hi def link mvDebug		mvTodo
+  hi def link mvParenError	mvError
+  hi def link mvPkg_DEtools	mvPkgFunc
+  hi def link mvPkg_Galois	mvPkgFunc
+  hi def link mvPkg_GaussInt	mvPkgFunc
+  hi def link mvPkg_LREtools	mvPkgFunc
+  hi def link mvPkg_combinat	mvPkgFunc
+  hi def link mvPkg_combstruct	mvPkgFunc
+  hi def link mvPkg_difforms	mvPkgFunc
+  hi def link mvPkg_finance	mvPkgFunc
+  hi def link mvPkg_genfunc	mvPkgFunc
+  hi def link mvPkg_geometry	mvPkgFunc
+  hi def link mvPkg_grobner	mvPkgFunc
+  hi def link mvPkg_group	mvPkgFunc
+  hi def link mvPkg_inttrans	mvPkgFunc
+  hi def link mvPkg_liesymm	mvPkgFunc
+  hi def link mvPkg_linalg	mvPkgFunc
+  hi def link mvPkg_logic	mvPkgFunc
+  hi def link mvPkg_networks	mvPkgFunc
+  hi def link mvPkg_numapprox	mvPkgFunc
+  hi def link mvPkg_numtheory	mvPkgFunc
+  hi def link mvPkg_orthopoly	mvPkgFunc
+  hi def link mvPkg_padic	mvPkgFunc
+  hi def link mvPkg_plots	mvPkgFunc
+  hi def link mvPkg_plottools	mvPkgFunc
+  hi def link mvPkg_powseries	mvPkgFunc
+  hi def link mvPkg_process	mvPkgFunc
+  hi def link mvPkg_simplex	mvPkgFunc
+  hi def link mvPkg_stats	mvPkgFunc
+  hi def link mvPkg_student	mvPkgFunc
+  hi def link mvPkg_sumtools	mvPkgFunc
+  hi def link mvPkg_tensor	mvPkgFunc
+  hi def link mvPkg_totorder	mvPkgFunc
+  hi def link mvRange		mvOper
+  hi def link mvSemiError	mvError
+  hi def link mvDelim		Delimiter
 
-" Maple->Standard Links {{{2
-HiLink mvAssign		Delimiter
-HiLink mvBool		Boolean
-HiLink mvComma		Delimiter
-HiLink mvComment		Comment
-HiLink mvCond		Conditional
-HiLink mvConstant		Number
-HiLink mvDelayEval	Label
-HiLink mvDcolon		Delimiter
-HiLink mvError		Error
-HiLink mvLibrary		Statement
-HiLink mvNumber		Number
-HiLink mvOper		Operator
-HiLink mvAssign		Delimiter
-HiLink mvPackage		Type
-HiLink mvPkgFunc		Function
-HiLink mvPktOption	Special
-HiLink mvRepeat		Repeat
-HiLink mvSpecial		Special
-HiLink mvStatement	Statement
-HiLink mvName		String
-HiLink mvString		String
-HiLink mvTodo		Todo
+  " Maple->Standard Links {{{2
+  hi def link mvAssign		Delimiter
+  hi def link mvBool		Boolean
+  hi def link mvComma		Delimiter
+  hi def link mvComment		Comment
+  hi def link mvCond		Conditional
+  hi def link mvConstant		Number
+  hi def link mvDelayEval	Label
+  hi def link mvDcolon		Delimiter
+  hi def link mvError		Error
+  hi def link mvLibrary		Statement
+  hi def link mvNumber		Number
+  hi def link mvOper		Operator
+  hi def link mvAssign		Delimiter
+  hi def link mvPackage		Type
+  hi def link mvPkgFunc		Function
+  hi def link mvPktOption	Special
+  hi def link mvRepeat		Repeat
+  hi def link mvSpecial		Special
+  hi def link mvStatement	Statement
+  hi def link mvName		String
+  hi def link mvString		String
+  hi def link mvTodo		Todo
 
-delcommand HiLink
+endif
 
 " Current Syntax: {{{1
 let b:current_syntax = "maple"
diff --git a/runtime/syntax/master.vim b/runtime/syntax/master.vim
index 14440ee13d..f89c5b2f1c 100644
--- a/runtime/syntax/master.vim
+++ b/runtime/syntax/master.vim
@@ -26,13 +26,11 @@ syn match   masterComment	"\$.*"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink masterKeyword Keyword
-HiLink masterComment Comment
-HiLink masterString  String
+hi def link masterKeyword Keyword
+hi def link masterComment Comment
+hi def link masterString  String
 
-delcommand HiLink
 
 let b:current_syntax = "master"
 
diff --git a/runtime/syntax/matlab.vim b/runtime/syntax/matlab.vim
index 9cc2be877c..92ffbbc1ed 100644
--- a/runtime/syntax/matlab.vim
+++ b/runtime/syntax/matlab.vim
@@ -74,40 +74,38 @@ syn match matlabError	"-\=\<\d\+\.\d\+[eEdD][-+]\=\d\+\.\([^*/\\^]\)"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink matlabTransposeOperator	matlabOperator
-HiLink matlabOperator			Operator
-HiLink matlabLineContinuation		Special
-HiLink matlabLabel			Label
-HiLink matlabConditional		Conditional
-HiLink matlabExceptions		Conditional
-HiLink matlabRepeat			Repeat
-HiLink matlabTodo			Todo
-HiLink matlabString			String
-HiLink matlabDelimiter		Identifier
-HiLink matlabTransposeOther		Identifier
-HiLink matlabNumber			Number
-HiLink matlabFloat			Float
-HiLink matlabFunction			Function
-HiLink matlabError			Error
-HiLink matlabImplicit			matlabStatement
-HiLink matlabStatement		Statement
-HiLink matlabOO			Statement
-HiLink matlabSemicolon		SpecialChar
-HiLink matlabComment			Comment
-HiLink matlabMultilineComment		Comment
-HiLink matlabScope			Type
+hi def link matlabTransposeOperator	matlabOperator
+hi def link matlabOperator			Operator
+hi def link matlabLineContinuation		Special
+hi def link matlabLabel			Label
+hi def link matlabConditional		Conditional
+hi def link matlabExceptions		Conditional
+hi def link matlabRepeat			Repeat
+hi def link matlabTodo			Todo
+hi def link matlabString			String
+hi def link matlabDelimiter		Identifier
+hi def link matlabTransposeOther		Identifier
+hi def link matlabNumber			Number
+hi def link matlabFloat			Float
+hi def link matlabFunction			Function
+hi def link matlabError			Error
+hi def link matlabImplicit			matlabStatement
+hi def link matlabStatement		Statement
+hi def link matlabOO			Statement
+hi def link matlabSemicolon		SpecialChar
+hi def link matlabComment			Comment
+hi def link matlabMultilineComment		Comment
+hi def link matlabScope			Type
 
-HiLink matlabArithmeticOperator	matlabOperator
-HiLink matlabRelationalOperator	matlabOperator
-HiLink matlabLogicalOperator		matlabOperator
+hi def link matlabArithmeticOperator	matlabOperator
+hi def link matlabRelationalOperator	matlabOperator
+hi def link matlabLogicalOperator		matlabOperator
 
 "optional highlighting
-"HiLink matlabIdentifier		Identifier
-"HiLink matlabTab			Error
+"hi def link matlabIdentifier		Identifier
+"hi def link matlabTab			Error
 
-delcommand HiLink
 
 let b:current_syntax = "matlab"
 
diff --git a/runtime/syntax/maxima.vim b/runtime/syntax/maxima.vim
index be13b0ef25..46e1e4ff84 100644
--- a/runtime/syntax/maxima.vim
+++ b/runtime/syntax/maxima.vim
@@ -232,32 +232,30 @@ syn sync match maximaSyncComment	groupthere NONE "*/"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink maximaBraceError	maximaError
-HiLink maximaCmd	maximaStatement
-HiLink maximaCurlyError	maximaError
-HiLink maximaFuncCmd	maximaStatement
-HiLink maximaParenError	maximaError
+hi def link maximaBraceError	maximaError
+hi def link maximaCmd	maximaStatement
+hi def link maximaCurlyError	maximaError
+hi def link maximaFuncCmd	maximaStatement
+hi def link maximaParenError	maximaError
 
 " The default methods for highlighting.  Can be overridden later
-HiLink maximaCharacter	Character
-HiLink maximaComma	Function
-HiLink maximaCommentBlock	Comment
-HiLink maximaConditional	Conditional
-HiLink maximaError	Error
-HiLink maximaFunc	Delimiter
-HiLink maximaOp                 Delimiter
-HiLink maximaLabel	PreProc
-HiLink maximaNumber	Number
-HiLink maximaFloat	Float
-HiLink maximaRepeat	Repeat
-HiLink maximaSpecial	Type
-HiLink maximaSpecialChar	SpecialChar
-HiLink maximaStatement	Statement
-HiLink maximaString	String
-HiLink maximaTodo	Todo
+hi def link maximaCharacter	Character
+hi def link maximaComma	Function
+hi def link maximaCommentBlock	Comment
+hi def link maximaConditional	Conditional
+hi def link maximaError	Error
+hi def link maximaFunc	Delimiter
+hi def link maximaOp                 Delimiter
+hi def link maximaLabel	PreProc
+hi def link maximaNumber	Number
+hi def link maximaFloat	Float
+hi def link maximaRepeat	Repeat
+hi def link maximaSpecial	Type
+hi def link maximaSpecialChar	SpecialChar
+hi def link maximaStatement	Statement
+hi def link maximaString	String
+hi def link maximaTodo	Todo
 
-delcommand HiLink
 
 let b:current_syntax = "maxima"
diff --git a/runtime/syntax/mel.vim b/runtime/syntax/mel.vim
index 3d89f72a57..ea6e75fa22 100644
--- a/runtime/syntax/mel.vim
+++ b/runtime/syntax/mel.vim
@@ -75,36 +75,34 @@ exec "sy sync ccomment melComment minlines=" . mel_minlines
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink melBoolean	Boolean
-HiLink melFunction	Function
-HiLink melIdentifier	Identifier
-HiLink melStatement	Statement
-HiLink melConditional Conditional
-HiLink melRepeat	Repeat
-HiLink melLabel	Label
-HiLink melOperator	Operator
-HiLink melKeyword	Keyword
-HiLink melException	Exception
-HiLink melInclude	Include
-HiLink melType	Type
-HiLink melStorageClass StorageClass
-HiLink melDebug	Debug
-HiLink melTodo	Todo
-HiLink melCharSpecial SpecialChar
-HiLink melString	String
-HiLink melInteger	Number
-HiLink melFloat	Float
-HiLink melMatrixVector Float
-HiLink melComment	Comment
-HiLink melError	Error
-HiLink melSpaceError	melError
-HiLink melCharError	melError
-HiLink melParenError	melError
-HiLink melInParen	melError
-HiLink melCommentError melError
+hi def link melBoolean	Boolean
+hi def link melFunction	Function
+hi def link melIdentifier	Identifier
+hi def link melStatement	Statement
+hi def link melConditional Conditional
+hi def link melRepeat	Repeat
+hi def link melLabel	Label
+hi def link melOperator	Operator
+hi def link melKeyword	Keyword
+hi def link melException	Exception
+hi def link melInclude	Include
+hi def link melType	Type
+hi def link melStorageClass StorageClass
+hi def link melDebug	Debug
+hi def link melTodo	Todo
+hi def link melCharSpecial SpecialChar
+hi def link melString	String
+hi def link melInteger	Number
+hi def link melFloat	Float
+hi def link melMatrixVector Float
+hi def link melComment	Comment
+hi def link melError	Error
+hi def link melSpaceError	melError
+hi def link melCharError	melError
+hi def link melParenError	melError
+hi def link melInParen	melError
+hi def link melCommentError melError
 
-delcommand HiLink
 
 let b:current_syntax = "mel"
diff --git a/runtime/syntax/mf.vim b/runtime/syntax/mf.vim
index e277c2d6c0..5f600e2ebe 100644
--- a/runtime/syntax/mf.vim
+++ b/runtime/syntax/mf.vim
@@ -155,31 +155,29 @@ syn sync maxlines=50
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink mfBoolExp	Statement
-HiLink mfNumExp	Statement
-HiLink mfInternal	Identifier
-HiLink mfPairExp	Statement
-HiLink mfPathExp	Statement
-HiLink mfPenExp	Statement
-HiLink mfPicExp	Statement
-HiLink mfStringExp	Statement
-HiLink mfCommand	Statement
-HiLink mfType	Type
-HiLink mfStatement	Statement
-HiLink mfDefinition	Statement
-HiLink mfCondition	Conditional
-HiLink mfPrimitive	Statement
-HiLink mfMacro	Macro
-HiLink mfCoord	Identifier
-HiLink mfPoint	Identifier
-HiLink mfNumeric	Number
-HiLink mfLength	Number
-HiLink mfComment	Comment
-HiLink mfString	String
+hi def link mfBoolExp	Statement
+hi def link mfNumExp	Statement
+hi def link mfInternal	Identifier
+hi def link mfPairExp	Statement
+hi def link mfPathExp	Statement
+hi def link mfPenExp	Statement
+hi def link mfPicExp	Statement
+hi def link mfStringExp	Statement
+hi def link mfCommand	Statement
+hi def link mfType	Type
+hi def link mfStatement	Statement
+hi def link mfDefinition	Statement
+hi def link mfCondition	Conditional
+hi def link mfPrimitive	Statement
+hi def link mfMacro	Macro
+hi def link mfCoord	Identifier
+hi def link mfPoint	Identifier
+hi def link mfNumeric	Number
+hi def link mfLength	Number
+hi def link mfComment	Comment
+hi def link mfString	String
 
-delcommand HiLink
 
 let b:current_syntax = "mf"
 
diff --git a/runtime/syntax/mgl.vim b/runtime/syntax/mgl.vim
index 4fd718e05b..f7bc617f5a 100644
--- a/runtime/syntax/mgl.vim
+++ b/runtime/syntax/mgl.vim
@@ -84,34 +84,32 @@ syn keyword mglPredefined	exception
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink mglBoolean		Boolean
-HiLink mglComment		Comment
-HiLink mglConditional		Conditional
-HiLink mglConstant		Constant
-HiLink mglException		Exception
-HiLink mglFunction		Function
-HiLink mglLabel		Label
-HiLink mglMatrixDelimiter	Identifier
-HiLink mglNumber		Number
-HiLink mglHexNumber		Number
-HiLink mglCharacter		Number
-HiLink mglIpAddr		Number
-HiLink mglOperator		Operator
-HiLink mglPredefined		mglFunction
-HiLink mglPreProc		PreProc
-HiLink mglRepeat		Repeat
-HiLink mglStatement		Statement
-HiLink mglString		String
-HiLink mglStringEscape	Special
-HiLink mglStringEscapeGPC	Special
-HiLink mglStringError		Error
-HiLink mglStruct		mglStatement
-HiLink mglSymbolOperator	mglOperator
-HiLink mglType		Type
+hi def link mglBoolean		Boolean
+hi def link mglComment		Comment
+hi def link mglConditional		Conditional
+hi def link mglConstant		Constant
+hi def link mglException		Exception
+hi def link mglFunction		Function
+hi def link mglLabel		Label
+hi def link mglMatrixDelimiter	Identifier
+hi def link mglNumber		Number
+hi def link mglHexNumber		Number
+hi def link mglCharacter		Number
+hi def link mglIpAddr		Number
+hi def link mglOperator		Operator
+hi def link mglPredefined		mglFunction
+hi def link mglPreProc		PreProc
+hi def link mglRepeat		Repeat
+hi def link mglStatement		Statement
+hi def link mglString		String
+hi def link mglStringEscape	Special
+hi def link mglStringEscapeGPC	Special
+hi def link mglStringError		Error
+hi def link mglStruct		mglStatement
+hi def link mglSymbolOperator	mglOperator
+hi def link mglType		Type
 
-delcommand HiLink
 
 
 let b:current_syntax = "mgl"
diff --git a/runtime/syntax/mgp.vim b/runtime/syntax/mgp.vim
index a5c6186c43..7227804550 100644
--- a/runtime/syntax/mgp.vim
+++ b/runtime/syntax/mgp.vim
@@ -46,26 +46,24 @@ syn match mgpNoDefault +^%nodefault$+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink mgpLineSkip	Special
+hi def link mgpLineSkip	Special
 
-HiLink mgpHash	mgpComment
-HiLink mgpPercent	mgpComment
-HiLink mgpComment	Comment
+hi def link mgpHash	mgpComment
+hi def link mgpPercent	mgpComment
+hi def link mgpComment	Comment
 
-HiLink mgpCommand	Identifier
+hi def link mgpCommand	Identifier
 
-HiLink mgpLine	Type
+hi def link mgpLine	Type
 
-HiLink mgpFile	String
-HiLink mgpSize	Number
-HiLink mgpValue	Number
+hi def link mgpFile	String
+hi def link mgpSize	Number
+hi def link mgpValue	Number
 
-HiLink mgpPage	mgpDefine
-HiLink mgpNoDefault	mgpDefine
-HiLink mgpDefine	Define
+hi def link mgpPage	mgpDefine
+hi def link mgpNoDefault	mgpDefine
+hi def link mgpDefine	Define
 
-delcommand HiLink
 
 let b:current_syntax = "mgp"
diff --git a/runtime/syntax/mma.vim b/runtime/syntax/mma.vim
index 9bdb7019b7..0683adc573 100644
--- a/runtime/syntax/mma.vim
+++ b/runtime/syntax/mma.vim
@@ -282,7 +282,6 @@ syntax sync fromstart
 "set foldnestmax=1
 "set foldminlines=15
 
-command -nargs=+ HiLink hi def link <args>
 
 " NOTE - the following links are not guaranteed to
 " look good under all colorschemes.  You might need to
@@ -290,32 +289,31 @@ command -nargs=+ HiLink hi def link <args>
 " look good in yours
 
 
-HiLink mmaComment           Comment
-HiLink mmaCommentStar       Comment
-HiLink mmaFunctionComment   Comment
-HiLink mmaLooseQuote        Comment
-HiLink mmaGenericFunction   Function
-HiLink mmaVariable          Identifier
-"    HiLink mmaSymbol            Identifier
-HiLink mmaOperator          Operator
-HiLink mmaPatternOp         Operator
-HiLink mmaPureFunction      Operator
-HiLink mmaString            String
-HiLink mmaCommentString     String
-HiLink mmaUnicode           String
-HiLink mmaMessage           Type
-HiLink mmaNumber            Type
-HiLink mmaPattern           Type
-HiLink mmaError             Error
-HiLink mmaFixme             Error
-HiLink mmaPatternError      Error
-HiLink mmaTodo              Todo
-HiLink mmaemPHAsis          Special
-HiLink mmaFunctionTitle     Special
-HiLink mmaMessageType       Special
-HiLink mmaItem              Preproc
+hi def link mmaComment           Comment
+hi def link mmaCommentStar       Comment
+hi def link mmaFunctionComment   Comment
+hi def link mmaLooseQuote        Comment
+hi def link mmaGenericFunction   Function
+hi def link mmaVariable          Identifier
+"    hi def link mmaSymbol            Identifier
+hi def link mmaOperator          Operator
+hi def link mmaPatternOp         Operator
+hi def link mmaPureFunction      Operator
+hi def link mmaString            String
+hi def link mmaCommentString     String
+hi def link mmaUnicode           String
+hi def link mmaMessage           Type
+hi def link mmaNumber            Type
+hi def link mmaPattern           Type
+hi def link mmaError             Error
+hi def link mmaFixme             Error
+hi def link mmaPatternError      Error
+hi def link mmaTodo              Todo
+hi def link mmaemPHAsis          Special
+hi def link mmaFunctionTitle     Special
+hi def link mmaMessageType       Special
+hi def link mmaItem              Preproc
 
-delcommand HiLink
 
 let b:current_syntax = "mma"
 
diff --git a/runtime/syntax/mmix.vim b/runtime/syntax/mmix.vim
index 724bdd35e4..39e209336e 100644
--- a/runtime/syntax/mmix.vim
+++ b/runtime/syntax/mmix.vim
@@ -119,35 +119,33 @@ syn keyword mmixRegister	rBB rTT rWW rXX rYY rZZ
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink mmixAt		Type
-HiLink mmixPseudo	Type
-HiLink mmixRegister	Special
-HiLink mmixSegments	Type
+hi def link mmixAt		Type
+hi def link mmixPseudo	Type
+hi def link mmixRegister	Special
+hi def link mmixSegments	Type
 
-HiLink mmixLabel	Special
-HiLink mmixComment	Comment
-HiLink mmixOpcode	Keyword
+hi def link mmixLabel	Special
+hi def link mmixComment	Comment
+hi def link mmixOpcode	Keyword
 
-HiLink hexNumber	Number
-HiLink decNumber	Number
-HiLink octNumber	Number
+hi def link hexNumber	Number
+hi def link decNumber	Number
+hi def link octNumber	Number
 
-HiLink mmixString	String
-HiLink mmixChar	String
+hi def link mmixString	String
+hi def link mmixChar	String
 
-HiLink mmixType	Type
-HiLink mmixIdentifier	Normal
-HiLink mmixSpecialComment Comment
+hi def link mmixType	Type
+hi def link mmixIdentifier	Normal
+hi def link mmixSpecialComment Comment
 
 " My default color overrides:
 " hi mmixSpecialComment ctermfg=red
 "hi mmixLabel ctermfg=lightcyan
 " hi mmixType ctermbg=black ctermfg=brown
 
-delcommand HiLink
 
 let b:current_syntax = "mmix"
 
diff --git a/runtime/syntax/modsim3.vim b/runtime/syntax/modsim3.vim
index ba1963b695..ce35033402 100644
--- a/runtime/syntax/modsim3.vim
+++ b/runtime/syntax/modsim3.vim
@@ -76,22 +76,20 @@ syn match modsim3Literal "'[^']'\|''''"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink modsim3Keyword	Statement
-HiLink modsim3Block		Statement
-HiLink modsim3Comment1	Comment
-HiLink modsim3Comment2	Comment
-HiLink modsim3String		String
-HiLink modsim3Literal	Character
-HiLink modsim3Include	Statement
-HiLink modsim3Type		Type
-HiLink modsim3ParenError	Error
-HiLink modsim3Builtin	Function
-HiLink modsim3BuiltinNoParen	Function
+hi def link modsim3Keyword	Statement
+hi def link modsim3Block		Statement
+hi def link modsim3Comment1	Comment
+hi def link modsim3Comment2	Comment
+hi def link modsim3String		String
+hi def link modsim3Literal	Character
+hi def link modsim3Include	Statement
+hi def link modsim3Type		Type
+hi def link modsim3ParenError	Error
+hi def link modsim3Builtin	Function
+hi def link modsim3BuiltinNoParen	Function
 
-delcommand HiLink
 
 let b:current_syntax = "modsim3"
 
diff --git a/runtime/syntax/modula2.vim b/runtime/syntax/modula2.vim
index 9873201cda..4a14cf1f6f 100644
--- a/runtime/syntax/modula2.vim
+++ b/runtime/syntax/modula2.vim
@@ -52,23 +52,21 @@ syn region modula2Set start="{" end="}"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink modula2Ident		Identifier
-HiLink modula2StdConst	Boolean
-HiLink modula2Type		Identifier
-HiLink modula2StdFunc		Identifier
-HiLink modula2Header		Type
-HiLink modula2Keyword		Statement
-HiLink modula2AttKeyword	PreProc
-HiLink modula2Comment		Comment
+hi def link modula2Ident		Identifier
+hi def link modula2StdConst	Boolean
+hi def link modula2Type		Identifier
+hi def link modula2StdFunc		Identifier
+hi def link modula2Header		Type
+hi def link modula2Keyword		Statement
+hi def link modula2AttKeyword	PreProc
+hi def link modula2Comment		Comment
 " The following is just a matter of taste (you want to try this instead):
 " hi modula2Comment term=bold ctermfg=DarkBlue guifg=Blue gui=bold
-HiLink modula2Todo		Todo
-HiLink modula2String		String
-HiLink modula2Set		String
+hi def link modula2Todo		Todo
+hi def link modula2String		String
+hi def link modula2Set		String
 
-delcommand HiLink
 
 let b:current_syntax = "modula2"
 
diff --git a/runtime/syntax/modula3.vim b/runtime/syntax/modula3.vim
index 5f00efb76b..d9b89ca7ce 100644
--- a/runtime/syntax/modula3.vim
+++ b/runtime/syntax/modula3.vim
@@ -44,15 +44,13 @@ syn region modula3String start=+'+ end=+'+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink modula3Keyword	Statement
-HiLink modula3Block		PreProc
-HiLink modula3Comment	Comment
-HiLink modula3String		String
+hi def link modula3Keyword	Statement
+hi def link modula3Block		PreProc
+hi def link modula3Comment	Comment
+hi def link modula3String		String
 
-delcommand HiLink
 
 let b:current_syntax = "modula3"
 
diff --git a/runtime/syntax/monk.vim b/runtime/syntax/monk.vim
index 851560a3a9..3af810173a 100644
--- a/runtime/syntax/monk.vim
+++ b/runtime/syntax/monk.vim
@@ -195,23 +195,21 @@ syn sync match matchPlace grouphere NONE "^[^ \t]"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink monkSyntax		Statement
-HiLink monkFunc		Function
+hi def link monkSyntax		Statement
+hi def link monkFunc		Function
 
-HiLink monkString		String
-HiLink monkChar		Character
-HiLink monkNumber		Number
-HiLink monkBoolean		Boolean
+hi def link monkString		String
+hi def link monkChar		Character
+hi def link monkNumber		Number
+hi def link monkBoolean		Boolean
 
-HiLink monkDelimiter	Delimiter
-HiLink monkConstant	Constant
+hi def link monkDelimiter	Delimiter
+hi def link monkConstant	Constant
 
-HiLink monkComment		Comment
-HiLink monkError		Error
+hi def link monkComment		Comment
+hi def link monkError		Error
 
-delcommand HiLink
 
 let b:current_syntax = "monk"
 
diff --git a/runtime/syntax/mp.vim b/runtime/syntax/mp.vim
index 480db2a1b1..3966b69a03 100644
--- a/runtime/syntax/mp.vim
+++ b/runtime/syntax/mp.vim
@@ -102,15 +102,13 @@ endif
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink mpTeXinsert	String
-HiLink mpTeXbegin	Statement
-HiLink mpTeXend	Statement
-HiLink mpInternal	mfInternal
-HiLink mpMacro	Macro
+hi def link mpTeXinsert	String
+hi def link mpTeXbegin	Statement
+hi def link mpTeXend	Statement
+hi def link mpInternal	mfInternal
+hi def link mpMacro	Macro
 
-delcommand HiLink
 
 let b:current_syntax = "mp"
 
diff --git a/runtime/syntax/msidl.vim b/runtime/syntax/msidl.vim
index 3bf5940a81..57eaecaa4f 100644
--- a/runtime/syntax/msidl.vim
+++ b/runtime/syntax/msidl.vim
@@ -54,30 +54,28 @@ syn sync lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink msidlInclude		Include
-HiLink msidlPreProc		PreProc
-HiLink msidlPreCondit		PreCondit
-HiLink msidlDefine		Macro
-HiLink msidlIncluded		String
-HiLink msidlString		String
-HiLink msidlComment		Comment
-HiLink msidlTodo		Todo
-HiLink msidlSpecial		SpecialChar
-HiLink msidlLiteral		Number
-HiLink msidlUUID		Number
+hi def link msidlInclude		Include
+hi def link msidlPreProc		PreProc
+hi def link msidlPreCondit		PreCondit
+hi def link msidlDefine		Macro
+hi def link msidlIncluded		String
+hi def link msidlString		String
+hi def link msidlComment		Comment
+hi def link msidlTodo		Todo
+hi def link msidlSpecial		SpecialChar
+hi def link msidlLiteral		Number
+hi def link msidlUUID		Number
 
-HiLink msidlImport		Include
-HiLink msidlEnum		StorageClass
-HiLink msidlStruct		Structure
-HiLink msidlTypedef		Typedef
-HiLink msidlAttribute		StorageClass
+hi def link msidlImport		Include
+hi def link msidlEnum		StorageClass
+hi def link msidlStruct		Structure
+hi def link msidlTypedef		Typedef
+hi def link msidlAttribute		StorageClass
 
-HiLink msidlStandardType	Type
-HiLink msidlSafeArray		Type
+hi def link msidlStandardType	Type
+hi def link msidlSafeArray		Type
 
-delcommand HiLink
 
 let b:current_syntax = "msidl"
 
diff --git a/runtime/syntax/msql.vim b/runtime/syntax/msql.vim
index 6195786260..60e75a7ef6 100644
--- a/runtime/syntax/msql.vim
+++ b/runtime/syntax/msql.vim
@@ -51,30 +51,28 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink msqlComment		Comment
-HiLink msqlString		String
-HiLink msqlNumber		Number
-HiLink msqlFloat		Float
-HiLink msqlIdentifier	Identifier
-HiLink msqlGlobalIdentifier	Identifier
-HiLink msqlIntVar		Identifier
-HiLink msqlEnvVar		Identifier
-HiLink msqlFunctions		Function
-HiLink msqlRepeat		Repeat
-HiLink msqlConditional	Conditional
-HiLink msqlStatement		Statement
-HiLink msqlType		Type
-HiLink msqlInclude		Include
-HiLink msqlDefine		Define
-HiLink msqlSpecialChar	SpecialChar
-HiLink msqlParentError	Error
-HiLink msqlTodo		Todo
-HiLink msqlOperator		Operator
-HiLink msqlRelation		Operator
+hi def link msqlComment		Comment
+hi def link msqlString		String
+hi def link msqlNumber		Number
+hi def link msqlFloat		Float
+hi def link msqlIdentifier	Identifier
+hi def link msqlGlobalIdentifier	Identifier
+hi def link msqlIntVar		Identifier
+hi def link msqlEnvVar		Identifier
+hi def link msqlFunctions		Function
+hi def link msqlRepeat		Repeat
+hi def link msqlConditional	Conditional
+hi def link msqlStatement		Statement
+hi def link msqlType		Type
+hi def link msqlInclude		Include
+hi def link msqlDefine		Define
+hi def link msqlSpecialChar	SpecialChar
+hi def link msqlParentError	Error
+hi def link msqlTodo		Todo
+hi def link msqlOperator		Operator
+hi def link msqlRelation		Operator
 
-delcommand HiLink
 
 let b:current_syntax = "msql"
 
diff --git a/runtime/syntax/mupad.vim b/runtime/syntax/mupad.vim
index 7f981f0b7a..55ea9c4e43 100644
--- a/runtime/syntax/mupad.vim
+++ b/runtime/syntax/mupad.vim
@@ -265,21 +265,19 @@ syn keyword mupadIdentifier	Tubular
 " graphics  meta-documentation Attributes
 syn keyword mupadIdentifier	objectGroupsListed
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink mupadComment		Comment
-HiLink mupadString		String
-HiLink mupadOperator		Operator
-HiLink mupadSpecial		Special
-HiLink mupadStatement		Statement
-HiLink mupadUnderlined	Underlined
-HiLink mupadConditional	Conditional
-HiLink mupadRepeat		Repeat
-HiLink mupadFunction		Function
-HiLink mupadType		Type
-HiLink mupadDefine		Define
-HiLink mupadIdentifier	Identifier
+hi def link mupadComment		Comment
+hi def link mupadString		String
+hi def link mupadOperator		Operator
+hi def link mupadSpecial		Special
+hi def link mupadStatement		Statement
+hi def link mupadUnderlined	Underlined
+hi def link mupadConditional	Conditional
+hi def link mupadRepeat		Repeat
+hi def link mupadFunction		Function
+hi def link mupadType		Type
+hi def link mupadDefine		Define
+hi def link mupadIdentifier	Identifier
 
-delcommand HiLink
 
 " TODO  More comprehensive listing.
diff --git a/runtime/syntax/mush.vim b/runtime/syntax/mush.vim
index cf95d2a9e9..efaae50ae3 100644
--- a/runtime/syntax/mush.vim
+++ b/runtime/syntax/mush.vim
@@ -182,35 +182,33 @@ syntax keyword mushAttribute use va vb vc vd ve vf vg vh vi vj vk vl vm vn
 syntax keyword mushAttribute vo vp vq vr vs vt vu vv vw vx vy vz
 
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink mushAttribute  Constant
-HiLink mushCommand    Function
-HiLink mushNumber     Number
-HiLink mushSetting    PreProc
-HiLink mushFunction   Statement
-HiLink mushVariable   Identifier
-HiLink mushSpecial    Special
-HiLink mushTodo       Todo
-HiLink mushFlag       Special
-HiLink mushIdentifier Identifier
-HiLink mushDefine     Macro
-HiLink mushPreProc    PreProc
-HiLink mushPreProcGroup PreProc 
-HiLink mushPreCondit PreCondit
-HiLink mushIncluded cString
-HiLink  mushInclude Include
+hi def link mushAttribute  Constant
+hi def link mushCommand    Function
+hi def link mushNumber     Number
+hi def link mushSetting    PreProc
+hi def link mushFunction   Statement
+hi def link mushVariable   Identifier
+hi def link mushSpecial    Special
+hi def link mushTodo       Todo
+hi def link mushFlag       Special
+hi def link mushIdentifier Identifier
+hi def link mushDefine     Macro
+hi def link mushPreProc    PreProc
+hi def link mushPreProcGroup PreProc 
+hi def link mushPreCondit PreCondit
+hi def link mushIncluded cString
+hi def link mushInclude Include
 
 
 
 " Comments
-HiLink mushCommentStart mushComment
-HiLink mushComment    Comment
-HiLink mushCommentString mushString
+hi def link mushCommentStart mushComment
+hi def link mushComment    Comment
+hi def link mushCommentString mushString
 
 
-delcommand HiLink
 
 let b:current_syntax = "mush"
 
diff --git a/runtime/syntax/muttrc.vim b/runtime/syntax/muttrc.vim
index 4e073b887e..e4395fdf59 100644
--- a/runtime/syntax/muttrc.vim
+++ b/runtime/syntax/muttrc.vim
@@ -630,151 +630,149 @@ syn match   muttrcMonoLine	"^\s*mono\s\+\S\+"	skipwhite nextgroup=muttrcMonoAttr
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink muttrcComment		Comment
-HiLink muttrcEscape		SpecialChar
-HiLink muttrcRXChars		SpecialChar
-HiLink muttrcString		String
-HiLink muttrcRXString		String
-HiLink muttrcRXString2	String
-HiLink muttrcSpecial		Special
-HiLink muttrcHooks		Type
-HiLink muttrcGroupFlag	Type
-HiLink muttrcGroupDef		Macro
-HiLink muttrcAddrDef		muttrcGroupFlag
-HiLink muttrcRXDef		muttrcGroupFlag
-HiLink muttrcRXPat		String
-HiLink muttrcAliasGroupName	Macro
-HiLink muttrcAliasKey	        Identifier
-HiLink muttrcUnAliasKey	Identifier
-HiLink muttrcAliasEncEmail	Identifier
-HiLink muttrcAliasParens	Type
-HiLink muttrcSetNumAssignment	Number
-HiLink muttrcSetBoolAssignment	Boolean
-HiLink muttrcSetQuadAssignment	Boolean
-HiLink muttrcSetStrAssignment	String
-HiLink muttrcEmail		Special
-HiLink muttrcVariableInner	Special
-HiLink muttrcEscapedVariable	String
-HiLink muttrcHeader		Type
-HiLink muttrcKeySpecial	SpecialChar
-HiLink muttrcKey		Type
-HiLink muttrcKeyName		SpecialChar
-HiLink muttrcVarBool		Identifier
-HiLink muttrcVarQuad		Identifier
-HiLink muttrcVarNum		Identifier
-HiLink muttrcVarStr		Identifier
-HiLink muttrcMenu		Identifier
-HiLink muttrcCommand		Keyword
-HiLink muttrcMacroDescr	String
-HiLink muttrcAction		Macro
-HiLink muttrcBadAction	Error
-HiLink muttrcBindFunction	Error
-HiLink muttrcBindMenuList	Error
-HiLink muttrcFunction		Macro
-HiLink muttrcGroupKeyword	muttrcCommand
-HiLink muttrcGroupLine	Error
-HiLink muttrcSubscribeKeyword	muttrcCommand
-HiLink muttrcSubscribeLine	Error
-HiLink muttrcListsKeyword	muttrcCommand
-HiLink muttrcListsLine	Error
-HiLink muttrcAlternateKeyword	muttrcCommand
-HiLink muttrcAlternatesLine	Error
-HiLink muttrcAttachmentsLine	muttrcCommand
-HiLink muttrcAttachmentsFlag	Type
-HiLink muttrcAttachmentsMimeType	String
-HiLink muttrcColorLine	Error
-HiLink muttrcColorContext	Error
-HiLink muttrcColorContextI	Identifier
-HiLink muttrcColorContextH	Identifier
-HiLink muttrcColorKeyword	muttrcCommand
-HiLink muttrcColorKeywordI	muttrcColorKeyword
-HiLink muttrcColorKeywordH	muttrcColorKeyword
-HiLink muttrcColorField	Identifier
-HiLink muttrcColor		Type
-HiLink muttrcColorFG		Error
-HiLink muttrcColorFGI		Error
-HiLink muttrcColorFGH		Error
-HiLink muttrcColorBG		Error
-HiLink muttrcColorBGI		Error
-HiLink muttrcColorBGH		Error
-HiLink muttrcMonoAttrib	muttrcColor
-HiLink muttrcMono		muttrcCommand
-HiLink muttrcSimplePat	Identifier
-HiLink muttrcSimplePatString	Macro
-HiLink muttrcSimplePatMetas	Special
-HiLink muttrcPattern		Error
-HiLink muttrcUnColorLine	Error
-HiLink muttrcUnColorKeyword	muttrcCommand
-HiLink muttrcUnColorIndex	Identifier
-HiLink muttrcShellString	muttrcEscape
-HiLink muttrcRXHooks		muttrcCommand
-HiLink muttrcRXHookNot	Type
-HiLink muttrcPatHooks		muttrcCommand
-HiLink muttrcPatHookNot	Type
-HiLink muttrcFormatConditionals2 Type
-HiLink muttrcIndexFormatStr	muttrcString
-HiLink muttrcIndexFormatEscapes muttrcEscape
-HiLink muttrcIndexFormatConditionals muttrcFormatConditionals2
-HiLink muttrcAliasFormatStr	muttrcString
-HiLink muttrcAliasFormatEscapes muttrcEscape
-HiLink muttrcAttachFormatStr	muttrcString
-HiLink muttrcAttachFormatEscapes muttrcEscape
-HiLink muttrcAttachFormatConditionals muttrcFormatConditionals2
-HiLink muttrcComposeFormatStr	muttrcString
-HiLink muttrcComposeFormatEscapes muttrcEscape
-HiLink muttrcFolderFormatStr	muttrcString
-HiLink muttrcFolderFormatEscapes muttrcEscape
-HiLink muttrcFolderFormatConditionals muttrcFormatConditionals2
-HiLink muttrcMixFormatStr	muttrcString
-HiLink muttrcMixFormatEscapes muttrcEscape
-HiLink muttrcMixFormatConditionals muttrcFormatConditionals2
-HiLink muttrcPGPFormatStr	muttrcString
-HiLink muttrcPGPFormatEscapes muttrcEscape
-HiLink muttrcPGPFormatConditionals muttrcFormatConditionals2
-HiLink muttrcPGPCmdFormatStr	muttrcString
-HiLink muttrcPGPCmdFormatEscapes muttrcEscape
-HiLink muttrcPGPCmdFormatConditionals muttrcFormatConditionals2
-HiLink muttrcStatusFormatStr	muttrcString
-HiLink muttrcStatusFormatEscapes muttrcEscape
-HiLink muttrcStatusFormatConditionals muttrcFormatConditionals2
-HiLink muttrcPGPGetKeysFormatStr	muttrcString
-HiLink muttrcPGPGetKeysFormatEscapes muttrcEscape
-HiLink muttrcSmimeFormatStr	muttrcString
-HiLink muttrcSmimeFormatEscapes muttrcEscape
-HiLink muttrcSmimeFormatConditionals muttrcFormatConditionals2
-HiLink muttrcTimeEscapes	muttrcEscape
-HiLink muttrcPGPTimeEscapes	muttrcEscape
-HiLink muttrcStrftimeEscapes	Type
-HiLink muttrcStrftimeFormatStr muttrcString
-HiLink muttrcFormatErrors Error
+hi def link muttrcComment		Comment
+hi def link muttrcEscape		SpecialChar
+hi def link muttrcRXChars		SpecialChar
+hi def link muttrcString		String
+hi def link muttrcRXString		String
+hi def link muttrcRXString2	String
+hi def link muttrcSpecial		Special
+hi def link muttrcHooks		Type
+hi def link muttrcGroupFlag	Type
+hi def link muttrcGroupDef		Macro
+hi def link muttrcAddrDef		muttrcGroupFlag
+hi def link muttrcRXDef		muttrcGroupFlag
+hi def link muttrcRXPat		String
+hi def link muttrcAliasGroupName	Macro
+hi def link muttrcAliasKey	        Identifier
+hi def link muttrcUnAliasKey	Identifier
+hi def link muttrcAliasEncEmail	Identifier
+hi def link muttrcAliasParens	Type
+hi def link muttrcSetNumAssignment	Number
+hi def link muttrcSetBoolAssignment	Boolean
+hi def link muttrcSetQuadAssignment	Boolean
+hi def link muttrcSetStrAssignment	String
+hi def link muttrcEmail		Special
+hi def link muttrcVariableInner	Special
+hi def link muttrcEscapedVariable	String
+hi def link muttrcHeader		Type
+hi def link muttrcKeySpecial	SpecialChar
+hi def link muttrcKey		Type
+hi def link muttrcKeyName		SpecialChar
+hi def link muttrcVarBool		Identifier
+hi def link muttrcVarQuad		Identifier
+hi def link muttrcVarNum		Identifier
+hi def link muttrcVarStr		Identifier
+hi def link muttrcMenu		Identifier
+hi def link muttrcCommand		Keyword
+hi def link muttrcMacroDescr	String
+hi def link muttrcAction		Macro
+hi def link muttrcBadAction	Error
+hi def link muttrcBindFunction	Error
+hi def link muttrcBindMenuList	Error
+hi def link muttrcFunction		Macro
+hi def link muttrcGroupKeyword	muttrcCommand
+hi def link muttrcGroupLine	Error
+hi def link muttrcSubscribeKeyword	muttrcCommand
+hi def link muttrcSubscribeLine	Error
+hi def link muttrcListsKeyword	muttrcCommand
+hi def link muttrcListsLine	Error
+hi def link muttrcAlternateKeyword	muttrcCommand
+hi def link muttrcAlternatesLine	Error
+hi def link muttrcAttachmentsLine	muttrcCommand
+hi def link muttrcAttachmentsFlag	Type
+hi def link muttrcAttachmentsMimeType	String
+hi def link muttrcColorLine	Error
+hi def link muttrcColorContext	Error
+hi def link muttrcColorContextI	Identifier
+hi def link muttrcColorContextH	Identifier
+hi def link muttrcColorKeyword	muttrcCommand
+hi def link muttrcColorKeywordI	muttrcColorKeyword
+hi def link muttrcColorKeywordH	muttrcColorKeyword
+hi def link muttrcColorField	Identifier
+hi def link muttrcColor		Type
+hi def link muttrcColorFG		Error
+hi def link muttrcColorFGI		Error
+hi def link muttrcColorFGH		Error
+hi def link muttrcColorBG		Error
+hi def link muttrcColorBGI		Error
+hi def link muttrcColorBGH		Error
+hi def link muttrcMonoAttrib	muttrcColor
+hi def link muttrcMono		muttrcCommand
+hi def link muttrcSimplePat	Identifier
+hi def link muttrcSimplePatString	Macro
+hi def link muttrcSimplePatMetas	Special
+hi def link muttrcPattern		Error
+hi def link muttrcUnColorLine	Error
+hi def link muttrcUnColorKeyword	muttrcCommand
+hi def link muttrcUnColorIndex	Identifier
+hi def link muttrcShellString	muttrcEscape
+hi def link muttrcRXHooks		muttrcCommand
+hi def link muttrcRXHookNot	Type
+hi def link muttrcPatHooks		muttrcCommand
+hi def link muttrcPatHookNot	Type
+hi def link muttrcFormatConditionals2 Type
+hi def link muttrcIndexFormatStr	muttrcString
+hi def link muttrcIndexFormatEscapes muttrcEscape
+hi def link muttrcIndexFormatConditionals muttrcFormatConditionals2
+hi def link muttrcAliasFormatStr	muttrcString
+hi def link muttrcAliasFormatEscapes muttrcEscape
+hi def link muttrcAttachFormatStr	muttrcString
+hi def link muttrcAttachFormatEscapes muttrcEscape
+hi def link muttrcAttachFormatConditionals muttrcFormatConditionals2
+hi def link muttrcComposeFormatStr	muttrcString
+hi def link muttrcComposeFormatEscapes muttrcEscape
+hi def link muttrcFolderFormatStr	muttrcString
+hi def link muttrcFolderFormatEscapes muttrcEscape
+hi def link muttrcFolderFormatConditionals muttrcFormatConditionals2
+hi def link muttrcMixFormatStr	muttrcString
+hi def link muttrcMixFormatEscapes muttrcEscape
+hi def link muttrcMixFormatConditionals muttrcFormatConditionals2
+hi def link muttrcPGPFormatStr	muttrcString
+hi def link muttrcPGPFormatEscapes muttrcEscape
+hi def link muttrcPGPFormatConditionals muttrcFormatConditionals2
+hi def link muttrcPGPCmdFormatStr	muttrcString
+hi def link muttrcPGPCmdFormatEscapes muttrcEscape
+hi def link muttrcPGPCmdFormatConditionals muttrcFormatConditionals2
+hi def link muttrcStatusFormatStr	muttrcString
+hi def link muttrcStatusFormatEscapes muttrcEscape
+hi def link muttrcStatusFormatConditionals muttrcFormatConditionals2
+hi def link muttrcPGPGetKeysFormatStr	muttrcString
+hi def link muttrcPGPGetKeysFormatEscapes muttrcEscape
+hi def link muttrcSmimeFormatStr	muttrcString
+hi def link muttrcSmimeFormatEscapes muttrcEscape
+hi def link muttrcSmimeFormatConditionals muttrcFormatConditionals2
+hi def link muttrcTimeEscapes	muttrcEscape
+hi def link muttrcPGPTimeEscapes	muttrcEscape
+hi def link muttrcStrftimeEscapes	Type
+hi def link muttrcStrftimeFormatStr muttrcString
+hi def link muttrcFormatErrors Error
 
-HiLink muttrcBindFunctionNL	SpecialChar
-HiLink muttrcBindKeyNL	SpecialChar
-HiLink muttrcBindMenuListNL	SpecialChar
-HiLink muttrcMacroDescrNL	SpecialChar
-HiLink muttrcMacroBodyNL	SpecialChar
-HiLink muttrcMacroKeyNL	SpecialChar
-HiLink muttrcMacroMenuListNL	SpecialChar
-HiLink muttrcColorMatchCountNL SpecialChar
-HiLink muttrcColorNL		SpecialChar
-HiLink muttrcColorRXNL	SpecialChar
-HiLink muttrcColorBGNL	SpecialChar
-HiLink muttrcColorFGNL	SpecialChar
-HiLink muttrcAliasNameNL	SpecialChar
-HiLink muttrcAliasENNL	SpecialChar
-HiLink muttrcAliasNL		SpecialChar
-HiLink muttrcUnAliasNL	SpecialChar
-HiLink muttrcAliasGroupDefNL	SpecialChar
-HiLink muttrcAliasEncEmailNL	SpecialChar
-HiLink muttrcPatternNL	SpecialChar
-HiLink muttrcUnColorPatNL	SpecialChar
-HiLink muttrcUnColorAPNL	SpecialChar
-HiLink muttrcUnColorIndexNL	SpecialChar
-HiLink muttrcStringNL		SpecialChar
+hi def link muttrcBindFunctionNL	SpecialChar
+hi def link muttrcBindKeyNL	SpecialChar
+hi def link muttrcBindMenuListNL	SpecialChar
+hi def link muttrcMacroDescrNL	SpecialChar
+hi def link muttrcMacroBodyNL	SpecialChar
+hi def link muttrcMacroKeyNL	SpecialChar
+hi def link muttrcMacroMenuListNL	SpecialChar
+hi def link muttrcColorMatchCountNL SpecialChar
+hi def link muttrcColorNL		SpecialChar
+hi def link muttrcColorRXNL	SpecialChar
+hi def link muttrcColorBGNL	SpecialChar
+hi def link muttrcColorFGNL	SpecialChar
+hi def link muttrcAliasNameNL	SpecialChar
+hi def link muttrcAliasENNL	SpecialChar
+hi def link muttrcAliasNL		SpecialChar
+hi def link muttrcUnAliasNL	SpecialChar
+hi def link muttrcAliasGroupDefNL	SpecialChar
+hi def link muttrcAliasEncEmailNL	SpecialChar
+hi def link muttrcPatternNL	SpecialChar
+hi def link muttrcUnColorPatNL	SpecialChar
+hi def link muttrcUnColorAPNL	SpecialChar
+hi def link muttrcUnColorIndexNL	SpecialChar
+hi def link muttrcStringNL		SpecialChar
 
-delcommand HiLink
 
 let b:current_syntax = "muttrc"
 
diff --git a/runtime/syntax/mysql.vim b/runtime/syntax/mysql.vim
index 8d0361c220..8bd7b6459a 100644
--- a/runtime/syntax/mysql.vim
+++ b/runtime/syntax/mysql.vim
@@ -271,20 +271,18 @@ syn region mysqlFunction         start="yearweek(" end=")" contains=ALL
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink mysqlKeyword            Statement
-HiLink mysqlSpecial            Special
-HiLink mysqlString             String
-HiLink mysqlNumber             Number
-HiLink mysqlVariable           Identifier
-HiLink mysqlComment            Comment
-HiLink mysqlType               Type
-HiLink mysqlOperator           Statement
-HiLink mysqlFlow               Statement
-HiLink mysqlFunction           Function
+hi def link mysqlKeyword            Statement
+hi def link mysqlSpecial            Special
+hi def link mysqlString             String
+hi def link mysqlNumber             Number
+hi def link mysqlVariable           Identifier
+hi def link mysqlComment            Comment
+hi def link mysqlType               Type
+hi def link mysqlOperator           Statement
+hi def link mysqlFlow               Statement
+hi def link mysqlFunction           Function
 
-delcommand HiLink
 
 let b:current_syntax = "mysql"
 
diff --git a/runtime/syntax/named.vim b/runtime/syntax/named.vim
index 6d6cbd484d..a5757d5eb9 100644
--- a/runtime/syntax/named.vim
+++ b/runtime/syntax/named.vim
@@ -189,39 +189,37 @@ syn match	namedParenError	+}\([^;]\|$\)+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink namedComment	Comment
-HiLink namedInclude	Include
-HiLink namedKeyword	Keyword
-HiLink namedIntKeyword	Keyword
-HiLink namedIdentifier	Identifier
-HiLink namedIntIdent	Identifier
+hi def link namedComment	Comment
+hi def link namedInclude	Include
+hi def link namedKeyword	Keyword
+hi def link namedIntKeyword	Keyword
+hi def link namedIdentifier	Identifier
+hi def link namedIntIdent	Identifier
 
-HiLink namedString	String
-HiLink namedBool	Type
-HiLink namedNotBool	Error
-HiLink namedNumber	Number
-HiLink namedNotNumber	Error
+hi def link namedString	String
+hi def link namedBool	Type
+hi def link namedNotBool	Error
+hi def link namedNumber	Number
+hi def link namedNotNumber	Error
 
-HiLink namedOption	namedKeyword
-HiLink namedLogOption	namedKeyword
-HiLink namedCNOption	namedKeyword
-HiLink namedQSKeywords	Type
-HiLink namedCNKeywords	Type
-HiLink namedLogCategory	Type
-HiLink namedIPaddr	Number
-HiLink namedDomain	Identifier
-HiLink namedZoneOpt	namedKeyword
-HiLink namedZoneType	Type
-HiLink namedParenError	Error
-HiLink namedEParenError	Error
-HiLink namedIllegalDom	Error
-HiLink namedIPerror	Error
-HiLink namedSpareDot	Error
-HiLink namedError	Error
+hi def link namedOption	namedKeyword
+hi def link namedLogOption	namedKeyword
+hi def link namedCNOption	namedKeyword
+hi def link namedQSKeywords	Type
+hi def link namedCNKeywords	Type
+hi def link namedLogCategory	Type
+hi def link namedIPaddr	Number
+hi def link namedDomain	Identifier
+hi def link namedZoneOpt	namedKeyword
+hi def link namedZoneType	Type
+hi def link namedParenError	Error
+hi def link namedEParenError	Error
+hi def link namedIllegalDom	Error
+hi def link namedIPerror	Error
+hi def link namedSpareDot	Error
+hi def link namedError	Error
 
-delcommand HiLink
 
 let &cpo = s:save_cpo
 unlet s:save_cpo
diff --git a/runtime/syntax/nasm.vim b/runtime/syntax/nasm.vim
index 0f81ceb5a9..d6485080ee 100644
--- a/runtime/syntax/nasm.vim
+++ b/runtime/syntax/nasm.vim
@@ -422,87 +422,85 @@ syn sync match	nasmSync	grouphere NONE	       "^\s*%endmacro\>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " Sub Links:
-HiLink nasmInMacDirective	nasmDirective
-HiLink nasmInMacLabel		nasmLocalLabel
-HiLink nasmInMacLblWarn	nasmLabelWarn
-HiLink nasmInMacMacro		nasmMacro
-HiLink nasmInMacParam		nasmMacro
-HiLink nasmInMacParamNum	nasmDecNumber
-HiLink nasmInMacPreCondit	nasmPreCondit
-HiLink nasmInMacPreProc	nasmPreProc
-HiLink nasmInPreCondit	nasmPreCondit
-HiLink nasmInStructure	nasmStructure
-HiLink nasmStructureLabel	nasmStructure
+hi def link nasmInMacDirective	nasmDirective
+hi def link nasmInMacLabel		nasmLocalLabel
+hi def link nasmInMacLblWarn	nasmLabelWarn
+hi def link nasmInMacMacro		nasmMacro
+hi def link nasmInMacParam		nasmMacro
+hi def link nasmInMacParamNum	nasmDecNumber
+hi def link nasmInMacPreCondit	nasmPreCondit
+hi def link nasmInMacPreProc	nasmPreProc
+hi def link nasmInPreCondit	nasmPreCondit
+hi def link nasmInStructure	nasmStructure
+hi def link nasmStructureLabel	nasmStructure
 
 " Comment Group:
-HiLink nasmComment		Comment
-HiLink nasmSpecialComment	SpecialComment
-HiLink nasmInCommentTodo	Todo
+hi def link nasmComment		Comment
+hi def link nasmSpecialComment	SpecialComment
+hi def link nasmInCommentTodo	Todo
 
 " Constant Group:
-HiLink nasmString		String
-HiLink nasmStringError	Error
-HiLink nasmBinNumber		Number
-HiLink nasmOctNumber		Number
-HiLink nasmDecNumber		Number
-HiLink nasmHexNumber		Number
-HiLink nasmFltNumber		Float
-HiLink nasmNumberError	Error
+hi def link nasmString		String
+hi def link nasmStringError	Error
+hi def link nasmBinNumber		Number
+hi def link nasmOctNumber		Number
+hi def link nasmDecNumber		Number
+hi def link nasmHexNumber		Number
+hi def link nasmFltNumber		Float
+hi def link nasmNumberError	Error
 
 " Identifier Group:
-HiLink nasmLabel		Identifier
-HiLink nasmLocalLabel		Identifier
-HiLink nasmSpecialLabel	Special
-HiLink nasmLabelError		Error
-HiLink nasmLabelWarn		Todo
+hi def link nasmLabel		Identifier
+hi def link nasmLocalLabel		Identifier
+hi def link nasmSpecialLabel	Special
+hi def link nasmLabelError		Error
+hi def link nasmLabelWarn		Todo
 
 " PreProc Group:
-HiLink nasmPreProc		PreProc
-HiLink nasmDefine		Define
-HiLink nasmInclude		Include
-HiLink nasmMacro		Macro
-HiLink nasmPreCondit		PreCondit
-HiLink nasmPreProcError	Error
-HiLink nasmPreProcWarn	Todo
+hi def link nasmPreProc		PreProc
+hi def link nasmDefine		Define
+hi def link nasmInclude		Include
+hi def link nasmMacro		Macro
+hi def link nasmPreCondit		PreCondit
+hi def link nasmPreProcError	Error
+hi def link nasmPreProcWarn	Todo
 
 " Type Group:
-HiLink nasmType		Type
-HiLink nasmStorage		StorageClass
-HiLink nasmStructure		Structure
-HiLink nasmTypeError		Error
+hi def link nasmType		Type
+hi def link nasmStorage		StorageClass
+hi def link nasmStructure		Structure
+hi def link nasmTypeError		Error
 
 " Directive Group:
-HiLink nasmConstant		Constant
-HiLink nasmInstrModifier	Operator
-HiLink nasmRepeat		Repeat
-HiLink nasmDirective		Keyword
-HiLink nasmStdDirective	Operator
-HiLink nasmFmtDirective	Keyword
+hi def link nasmConstant		Constant
+hi def link nasmInstrModifier	Operator
+hi def link nasmRepeat		Repeat
+hi def link nasmDirective		Keyword
+hi def link nasmStdDirective	Operator
+hi def link nasmFmtDirective	Keyword
 
 " Register Group:
-HiLink nasmCtrlRegister	Special
-HiLink nasmDebugRegister	Debug
-HiLink nasmTestRegister	Special
-HiLink nasmRegisterError	Error
-HiLink nasmMemRefError	Error
+hi def link nasmCtrlRegister	Special
+hi def link nasmDebugRegister	Debug
+hi def link nasmTestRegister	Special
+hi def link nasmRegisterError	Error
+hi def link nasmMemRefError	Error
 
 " Instruction Group:
-HiLink nasmStdInstruction	Statement
-HiLink nasmSysInstruction	Statement
-HiLink nasmDbgInstruction	Debug
-HiLink nasmFpuInstruction	Statement
-HiLink nasmMmxInstruction	Statement
-HiLink nasmSseInstruction	Statement
-HiLink nasmNowInstruction	Statement
-HiLink nasmAmdInstruction	Special
-HiLink nasmCrxInstruction	Special
-HiLink nasmUndInstruction	Todo
-HiLink nasmInstructnError	Error
+hi def link nasmStdInstruction	Statement
+hi def link nasmSysInstruction	Statement
+hi def link nasmDbgInstruction	Debug
+hi def link nasmFpuInstruction	Statement
+hi def link nasmMmxInstruction	Statement
+hi def link nasmSseInstruction	Statement
+hi def link nasmNowInstruction	Statement
+hi def link nasmAmdInstruction	Special
+hi def link nasmCrxInstruction	Special
+hi def link nasmUndInstruction	Todo
+hi def link nasmInstructnError	Error
 
-delcommand HiLink
 
 let b:current_syntax = "nasm"
 
diff --git a/runtime/syntax/nastran.vim b/runtime/syntax/nastran.vim
index 34ad1bf378..239fd6e49d 100644
--- a/runtime/syntax/nastran.vim
+++ b/runtime/syntax/nastran.vim
@@ -153,30 +153,28 @@ syn region nastranBulkData start=+ *[Bb][Uu][Ll][Kk] *$+ end=+^ [Ee][Nn][Dd] *[D
 syn keyword nastranUtilCard ECHOON ECHOOFF INCLUDE PARAM
 
 
-command -nargs=+ HiLink hi link <args>
 " The default methods for highlighting.  Can be overridden later
-HiLink nastranDmapexecmod	     Statement
-HiLink nastranDmapType	     Type
-HiLink nastranDmapPreCondit	     Error
-HiLink nastranDmapUtilmod	     PreProc
-HiLink nastranDmapMatmod	     nastranDmapUtilmod
-HiLink nastranDmapString	     String
-HiLink nastranDmapNumber	     Constant
-HiLink nastranDmapFloat	     nastranDmapNumber
-HiLink nastranDmapInitTab	     nastranDmapNumber
-HiLink nastranDmapTab		     nastranDmapNumber
-HiLink nastranDmapLogical	     nastranDmapExecmod
-HiLink nastranDmapImplicit	     Identifier
-HiLink nastranDmapComment	     Comment
-HiLink nastranDmapRepeat	     nastranDmapexecmod
-HiLink nastranNastranCard	     nastranDmapPreCondit
-HiLink nastranECSCard		     nastranDmapUtilmod
-HiLink nastranFMSCard		     nastranNastranCard
-HiLink nastranCC		     nastranDmapexecmod
-HiLink nastranDelimiter	     Special
-HiLink nastranBulkData	     nastranDmapType
-HiLink nastranUtilCard	     nastranDmapexecmod
-delcommand HiLink
+hi def link nastranDmapexecmod	     Statement
+hi def link nastranDmapType	     Type
+hi def link nastranDmapPreCondit	     Error
+hi def link nastranDmapUtilmod	     PreProc
+hi def link nastranDmapMatmod	     nastranDmapUtilmod
+hi def link nastranDmapString	     String
+hi def link nastranDmapNumber	     Constant
+hi def link nastranDmapFloat	     nastranDmapNumber
+hi def link nastranDmapInitTab	     nastranDmapNumber
+hi def link nastranDmapTab		     nastranDmapNumber
+hi def link nastranDmapLogical	     nastranDmapExecmod
+hi def link nastranDmapImplicit	     Identifier
+hi def link nastranDmapComment	     Comment
+hi def link nastranDmapRepeat	     nastranDmapexecmod
+hi def link nastranNastranCard	     nastranDmapPreCondit
+hi def link nastranECSCard		     nastranDmapUtilmod
+hi def link nastranFMSCard		     nastranNastranCard
+hi def link nastranCC		     nastranDmapexecmod
+hi def link nastranDelimiter	     Special
+hi def link nastranBulkData	     nastranDmapType
+hi def link nastranUtilCard	     nastranDmapexecmod
 
 let b:current_syntax = "nastran"
 
diff --git a/runtime/syntax/natural.vim b/runtime/syntax/natural.vim
index c94231d9f2..be529f2d85 100644
--- a/runtime/syntax/natural.vim
+++ b/runtime/syntax/natural.vim
@@ -148,59 +148,50 @@ if v:version >= 600
 endif
 
 
-if v:version >= 508 || !exists("did_natural_syntax_inits")
-  if v:version < 508
-    let did_natural_syntax_inits = 1
-    command -nargs=+ HiLink hi link <args>
-  else
-    command -nargs=+ HiLink hi def link <args>
-  endif
-  " The default methods for highlighting.  Can be overridden later
+" The default methods for highlighting.  Can be overridden later
 
-  " Constants
-  HiLink naturalFormat		Constant
-  HiLink naturalAttribute	Constant
-  HiLink naturalNumber		Number
-  HiLink naturalString		String
-  HiLink naturalBoolean		Boolean
+" Constants
+hi def link naturalFormat		Constant
+hi def link naturalAttribute	Constant
+hi def link naturalNumber		Number
+hi def link naturalString		String
+hi def link naturalBoolean		Boolean
 
-  " All kinds of keywords
-  HiLink naturalConditional	Conditional
-  HiLink naturalRepeat		Repeat
-  HiLink naturalLoop		Repeat
-  HiLink naturalFlow		Keyword
-  HiLink naturalError		Keyword
-  HiLink naturalKeyword		Keyword
-  HiLink naturalOperator	Operator
-  HiLink naturalParGui		Operator
+" All kinds of keywords
+hi def link naturalConditional	Conditional
+hi def link naturalRepeat		Repeat
+hi def link naturalLoop		Repeat
+hi def link naturalFlow		Keyword
+hi def link naturalError		Keyword
+hi def link naturalKeyword		Keyword
+hi def link naturalOperator	Operator
+hi def link naturalParGui		Operator
 
-  " Labels
-  HiLink naturalLabel		Label
-  HiLink naturalRefLabel	Label
+" Labels
+hi def link naturalLabel		Label
+hi def link naturalRefLabel	Label
 
-  " Comments
-  HiLink naturalPComment	Comment
-  HiLink naturalComment		Comment
-  HiLink naturalTodo		Todo
-  HiLink naturalCommentMark	PreProc
+" Comments
+hi def link naturalPComment	Comment
+hi def link naturalComment		Comment
+hi def link naturalTodo		Todo
+hi def link naturalCommentMark	PreProc
 
-  HiLink naturalInclude		Include
-  HiLink naturalSysVar		Identifier
-  HiLink naturalLineNo		LineNr
-  HiLink naturalLineRef		Error
-  HiLink naturalSpecial		Special
-  HiLink naturalComKey		Todo
+hi def link naturalInclude		Include
+hi def link naturalSysVar		Identifier
+hi def link naturalLineNo		LineNr
+hi def link naturalLineRef		Error
+hi def link naturalSpecial		Special
+hi def link naturalComKey		Todo
 
-  " illegal things
-  HiLink naturalRMKeyword	Error
-  HiLink naturalLegalIdent	Error
+" illegal things
+hi def link naturalRMKeyword	Error
+hi def link naturalLegalIdent	Error
 
-  HiLink naturalType		Type
-  HiLink naturalFunction	Function
-  HiLink naturalObjName		PreProc
+hi def link naturalType		Type
+hi def link naturalFunction	Function
+hi def link naturalObjName		PreProc
 
-  delcommand HiLink
-endif
 
 let b:current_syntax = "natural"
 
diff --git a/runtime/syntax/ncf.vim b/runtime/syntax/ncf.vim
index b458e630f2..0027fd4ef8 100644
--- a/runtime/syntax/ncf.vim
+++ b/runtime/syntax/ncf.vim
@@ -215,35 +215,33 @@ if exists("ncf_highlight_unknowns")
     syn match Error "[^ \t]*" contains=ALL
 endif
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink ncfCommands		Statement
-HiLink ncfSetCommands	ncfCommands
-HiLink ncfLogins		ncfCommands
-HiLink ncfString		String
-HiLink ncfContString	ncfString
-HiLink ncfComment		Comment
-HiLink ncfImplicit		Type
-HiLink ncfBoolean		Boolean
-HiLink ncfScript		Identifier
-HiLink ncfNumber		Number
-HiLink ncfIPAddr		ncfNumber
-HiLink ncfHexNumber		ncfNumber
-HiLink ncfTime		ncfNumber
-HiLink ncfDSTTime		ncfNumber
-HiLink ncfPath		Constant
-HiLink ncfServerName	Special
-HiLink ncfIPXNet		ncfServerName
-HiLink ncfTimeTypes		Constant
-HiLink ncfSetCommandsNum	   ncfSetCommands
-HiLink ncfSetCommandsBool	   ncfSetCommands
-HiLink ncfSetCommandsStr	   ncfSetCommands
-HiLink ncfSetCommandsTime	   ncfSetCommands
-HiLink ncfSetCommandsTimeDate  ncfSetCommands
-HiLink ncfSetCommandsBindCon   ncfSetCommands
+hi def link ncfCommands		Statement
+hi def link ncfSetCommands	ncfCommands
+hi def link ncfLogins		ncfCommands
+hi def link ncfString		String
+hi def link ncfContString	ncfString
+hi def link ncfComment		Comment
+hi def link ncfImplicit		Type
+hi def link ncfBoolean		Boolean
+hi def link ncfScript		Identifier
+hi def link ncfNumber		Number
+hi def link ncfIPAddr		ncfNumber
+hi def link ncfHexNumber		ncfNumber
+hi def link ncfTime		ncfNumber
+hi def link ncfDSTTime		ncfNumber
+hi def link ncfPath		Constant
+hi def link ncfServerName	Special
+hi def link ncfIPXNet		ncfServerName
+hi def link ncfTimeTypes		Constant
+hi def link ncfSetCommandsNum	   ncfSetCommands
+hi def link ncfSetCommandsBool	   ncfSetCommands
+hi def link ncfSetCommandsStr	   ncfSetCommands
+hi def link ncfSetCommandsTime	   ncfSetCommands
+hi def link ncfSetCommandsTimeDate  ncfSetCommands
+hi def link ncfSetCommandsBindCon   ncfSetCommands
 
-delcommand HiLink
 
 
 let b:current_syntax = "ncf"
diff --git a/runtime/syntax/nqc.vim b/runtime/syntax/nqc.vim
index 9105705241..d09c106f98 100644
--- a/runtime/syntax/nqc.vim
+++ b/runtime/syntax/nqc.vim
@@ -324,43 +324,41 @@ exec "syn sync ccomment nqcComment minlines=" . nqc_minlines
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink nqcLabel		Label
-HiLink nqcConditional		Conditional
-HiLink nqcRepeat		Repeat
-HiLink nqcCharacter		Character
-HiLink nqcNumber		Number
-HiLink nqcFloat		Float
-HiLink nqcFunction		Function
-HiLink nqcParenError		nqcError
-HiLink nqcErrInParen		nqcError
-HiLink nqcErrInBracket	nqcError
-HiLink nqcCommentL		nqcComment
-HiLink nqcCommentStart	nqcComment
-HiLink nqcCommentError	nqcError
-HiLink nqcCommentStartError	nqcError
-HiLink nqcSpaceError		nqcError
-HiLink nqcStorageClass	StorageClass
-HiLink nqcInclude		Include
-HiLink nqcPreProc		PreProc
-HiLink nqcDefine		Macro
-HiLink nqcIncluded		String
-HiLink nqcError		Error
-HiLink nqcStatement		Statement
-HiLink nqcEvents		Statement
-HiLink nqcPreCondit		PreCondit
-HiLink nqcType		Type
-HiLink nqcConstant		Constant
-HiLink nqcCommentSkip		nqcComment
-HiLink nqcComment		Comment
-HiLink nqcTodo		Todo
-HiLink nqcCppSkip		nqcCppOut
-HiLink nqcCppOut2		nqcCppOut
-HiLink nqcCppOut		Comment
+hi def link nqcLabel		Label
+hi def link nqcConditional		Conditional
+hi def link nqcRepeat		Repeat
+hi def link nqcCharacter		Character
+hi def link nqcNumber		Number
+hi def link nqcFloat		Float
+hi def link nqcFunction		Function
+hi def link nqcParenError		nqcError
+hi def link nqcErrInParen		nqcError
+hi def link nqcErrInBracket	nqcError
+hi def link nqcCommentL		nqcComment
+hi def link nqcCommentStart	nqcComment
+hi def link nqcCommentError	nqcError
+hi def link nqcCommentStartError	nqcError
+hi def link nqcSpaceError		nqcError
+hi def link nqcStorageClass	StorageClass
+hi def link nqcInclude		Include
+hi def link nqcPreProc		PreProc
+hi def link nqcDefine		Macro
+hi def link nqcIncluded		String
+hi def link nqcError		Error
+hi def link nqcStatement		Statement
+hi def link nqcEvents		Statement
+hi def link nqcPreCondit		PreCondit
+hi def link nqcType		Type
+hi def link nqcConstant		Constant
+hi def link nqcCommentSkip		nqcComment
+hi def link nqcComment		Comment
+hi def link nqcTodo		Todo
+hi def link nqcCppSkip		nqcCppOut
+hi def link nqcCppOut2		nqcCppOut
+hi def link nqcCppOut		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "nqc"
 
diff --git a/runtime/syntax/nroff.vim b/runtime/syntax/nroff.vim
index 2619d02c44..3a8cf95856 100644
--- a/runtime/syntax/nroff.vim
+++ b/runtime/syntax/nroff.vim
@@ -196,53 +196,51 @@ syn keyword nroffTodo TODO XXX FIXME contained
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 "
-command -nargs=+ HiLink hi def link <args>
 
-HiLink nroffEscChar nroffSpecialChar
-HiLink nroffEscCharAr nroffSpecialChar
-HiLink nroffSpecialChar SpecialChar
-HiLink nroffSpace Delimiter
+hi def link nroffEscChar nroffSpecialChar
+hi def link nroffEscCharAr nroffSpecialChar
+hi def link nroffSpecialChar SpecialChar
+hi def link nroffSpace Delimiter
 
-HiLink nroffEscRegArg2 nroffEscRegArg
-HiLink nroffEscRegArg nroffIdent
+hi def link nroffEscRegArg2 nroffEscRegArg
+hi def link nroffEscRegArg nroffIdent
 
-HiLink nroffEscArg2 nroffEscArg
-HiLink nroffEscPar nroffEscape
+hi def link nroffEscArg2 nroffEscArg
+hi def link nroffEscPar nroffEscape
 
-HiLink nroffEscRegPar nroffEscape
-HiLink nroffEscArg nroffEscape
-HiLink nroffSize nroffEscape
-HiLink nroffEscape Preproc
+hi def link nroffEscRegPar nroffEscape
+hi def link nroffEscArg nroffEscape
+hi def link nroffSize nroffEscape
+hi def link nroffEscape Preproc
 
-HiLink nroffIgnore Comment
-HiLink nroffComment Comment
-HiLink nroffTodo Todo
+hi def link nroffIgnore Comment
+hi def link nroffComment Comment
+hi def link nroffTodo Todo
 
-HiLink nroffReqLeader nroffRequest
-HiLink nroffReqName nroffRequest
-HiLink nroffRequest Statement
-HiLink nroffCond PreCondit
-HiLink nroffDefIdent nroffIdent
-HiLink nroffIdent Identifier
+hi def link nroffReqLeader nroffRequest
+hi def link nroffReqName nroffRequest
+hi def link nroffRequest Statement
+hi def link nroffCond PreCondit
+hi def link nroffDefIdent nroffIdent
+hi def link nroffIdent Identifier
 
-HiLink nroffEquation PreProc
-HiLink nroffTable PreProc
-HiLink nroffPicture PreProc
-HiLink nroffRefer PreProc
-HiLink nroffGrap PreProc
-HiLink nroffGremlin PreProc
+hi def link nroffEquation PreProc
+hi def link nroffTable PreProc
+hi def link nroffPicture PreProc
+hi def link nroffRefer PreProc
+hi def link nroffGrap PreProc
+hi def link nroffGremlin PreProc
 
-HiLink nroffNumber Number
-HiLink nroffBadChar nroffError
-HiLink nroffSpaceError nroffError
-HiLink nroffError Error
+hi def link nroffNumber Number
+hi def link nroffBadChar nroffError
+hi def link nroffSpaceError nroffError
+hi def link nroffError Error
 
-HiLink nroffPreserve String
-HiLink nroffString String
-HiLink nroffDefinition String
-HiLink nroffDefSpecial Special
+hi def link nroffPreserve String
+hi def link nroffString String
+hi def link nroffDefinition String
+hi def link nroffDefSpecial Special
 
-delcommand HiLink
 
 let b:current_syntax = "nroff"
 
diff --git a/runtime/syntax/nsis.vim b/runtime/syntax/nsis.vim
index 8f3aa2507a..3a343dd430 100644
--- a/runtime/syntax/nsis.vim
+++ b/runtime/syntax/nsis.vim
@@ -222,37 +222,35 @@ syn keyword nsisError		UninstallExeName
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink nsisInstruction		Function
-HiLink nsisComment			Comment
-HiLink nsisLocalLabel			Label
-HiLink nsisGlobalLabel		Label
-HiLink nsisStatement			Statement
-HiLink nsisString			String
-HiLink nsisBoolean			Boolean
-HiLink nsisAttribOptions		Constant
-HiLink nsisExecShell			Constant
-HiLink nsisFileAttrib			Constant
-HiLink nsisMessageBox			Constant
-HiLink nsisRegistry			Identifier
-HiLink nsisNumber			Number
-HiLink nsisError			Error
-HiLink nsisUserVar			Identifier
-HiLink nsisSysVar			Identifier
-HiLink nsisAttribute			Type
-HiLink nsisCompiler			Type
-HiLink nsisTodo			Todo
-HiLink nsisCallback			Operator
+hi def link nsisInstruction		Function
+hi def link nsisComment			Comment
+hi def link nsisLocalLabel			Label
+hi def link nsisGlobalLabel		Label
+hi def link nsisStatement			Statement
+hi def link nsisString			String
+hi def link nsisBoolean			Boolean
+hi def link nsisAttribOptions		Constant
+hi def link nsisExecShell			Constant
+hi def link nsisFileAttrib			Constant
+hi def link nsisMessageBox			Constant
+hi def link nsisRegistry			Identifier
+hi def link nsisNumber			Number
+hi def link nsisError			Error
+hi def link nsisUserVar			Identifier
+hi def link nsisSysVar			Identifier
+hi def link nsisAttribute			Type
+hi def link nsisCompiler			Type
+hi def link nsisTodo			Todo
+hi def link nsisCallback			Operator
 " preprocessor commands
-HiLink nsisPreprocSubst		PreProc
-HiLink nsisDefine			Define
-HiLink nsisMacro			Macro
-HiLink nsisPreCondit			PreCondit
-HiLink nsisInclude			Include
-HiLink nsisSystem			PreProc
+hi def link nsisPreprocSubst		PreProc
+hi def link nsisDefine			Define
+hi def link nsisMacro			Macro
+hi def link nsisPreCondit			PreCondit
+hi def link nsisInclude			Include
+hi def link nsisSystem			PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "nsis"
 
diff --git a/runtime/syntax/obj.vim b/runtime/syntax/obj.vim
index f2cd8a47a9..df4dbca5d7 100644
--- a/runtime/syntax/obj.vim
+++ b/runtime/syntax/obj.vim
@@ -60,25 +60,23 @@ syn match       objIndex        "\d\+\/\d*\/\d*"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink objError           Error
-HiLink objComment         Comment
-HiLink objInclude         PreProc
-HiLink objFloat           Float
-HiLink objInt             Number
-HiLink objGroup           Structure
-HiLink objIndex           Constant
-HiLink objMaterial        Label
+hi def link objError           Error
+hi def link objComment         Comment
+hi def link objInclude         PreProc
+hi def link objFloat           Float
+hi def link objInt             Number
+hi def link objGroup           Structure
+hi def link objIndex           Constant
+hi def link objMaterial        Label
 
-HiLink objVertex          Keyword
-HiLink objNormale         Keyword
-HiLink objVertice         Keyword
-HiLink objFace            Keyword
-HiLink objKeywords        Keyword
+hi def link objVertex          Keyword
+hi def link objNormale         Keyword
+hi def link objVertice         Keyword
+hi def link objFace            Keyword
+hi def link objKeywords        Keyword
 
 
-delcommand HiLink
 
 let b:current_syntax = "obj"
 
diff --git a/runtime/syntax/ocaml.vim b/runtime/syntax/ocaml.vim
index 1884c31823..68c1feddae 100644
--- a/runtime/syntax/ocaml.vim
+++ b/runtime/syntax/ocaml.vim
@@ -251,69 +251,67 @@ syn sync match ocamlSigSync     groupthere ocamlSig     "\<end\>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ocamlBraceErr	   Error
-HiLink ocamlBrackErr	   Error
-HiLink ocamlParenErr	   Error
-HiLink ocamlArrErr	   Error
+hi def link ocamlBraceErr	   Error
+hi def link ocamlBrackErr	   Error
+hi def link ocamlParenErr	   Error
+hi def link ocamlArrErr	   Error
 
-HiLink ocamlCommentErr   Error
+hi def link ocamlCommentErr   Error
 
-HiLink ocamlCountErr	   Error
-HiLink ocamlDoErr	   Error
-HiLink ocamlDoneErr	   Error
-HiLink ocamlEndErr	   Error
-HiLink ocamlThenErr	   Error
+hi def link ocamlCountErr	   Error
+hi def link ocamlDoErr	   Error
+hi def link ocamlDoneErr	   Error
+hi def link ocamlEndErr	   Error
+hi def link ocamlThenErr	   Error
 
-HiLink ocamlCharErr	   Error
+hi def link ocamlCharErr	   Error
 
-HiLink ocamlErr	   Error
+hi def link ocamlErr	   Error
 
-HiLink ocamlComment	   Comment
+hi def link ocamlComment	   Comment
 
-HiLink ocamlModPath	   Include
-HiLink ocamlObject	   Include
-HiLink ocamlModule	   Include
-HiLink ocamlModParam1    Include
-HiLink ocamlModType	   Include
-HiLink ocamlMPRestr3	   Include
-HiLink ocamlFullMod	   Include
-HiLink ocamlModTypeRestr Include
-HiLink ocamlWith	   Include
-HiLink ocamlMTDef	   Include
+hi def link ocamlModPath	   Include
+hi def link ocamlObject	   Include
+hi def link ocamlModule	   Include
+hi def link ocamlModParam1    Include
+hi def link ocamlModType	   Include
+hi def link ocamlMPRestr3	   Include
+hi def link ocamlFullMod	   Include
+hi def link ocamlModTypeRestr Include
+hi def link ocamlWith	   Include
+hi def link ocamlMTDef	   Include
 
-HiLink ocamlScript	   Include
+hi def link ocamlScript	   Include
 
-HiLink ocamlConstructor  Constant
+hi def link ocamlConstructor  Constant
 
-HiLink ocamlVal          Keyword
-HiLink ocamlModPreRHS    Keyword
-HiLink ocamlMPRestr2	   Keyword
-HiLink ocamlKeyword	   Keyword
-HiLink ocamlMethod	   Include
-HiLink ocamlFunDef	   Keyword
-HiLink ocamlRefAssign    Keyword
-HiLink ocamlKeyChar	   Keyword
-HiLink ocamlAnyVar	   Keyword
-HiLink ocamlTopStop	   Keyword
-HiLink ocamlOperator	   Keyword
+hi def link ocamlVal          Keyword
+hi def link ocamlModPreRHS    Keyword
+hi def link ocamlMPRestr2	   Keyword
+hi def link ocamlKeyword	   Keyword
+hi def link ocamlMethod	   Include
+hi def link ocamlFunDef	   Keyword
+hi def link ocamlRefAssign    Keyword
+hi def link ocamlKeyChar	   Keyword
+hi def link ocamlAnyVar	   Keyword
+hi def link ocamlTopStop	   Keyword
+hi def link ocamlOperator	   Keyword
 
-HiLink ocamlBoolean	   Boolean
-HiLink ocamlCharacter    Character
-HiLink ocamlNumber	   Number
-HiLink ocamlFloat	   Float
-HiLink ocamlString	   String
+hi def link ocamlBoolean	   Boolean
+hi def link ocamlCharacter    Character
+hi def link ocamlNumber	   Number
+hi def link ocamlFloat	   Float
+hi def link ocamlString	   String
 
-HiLink ocamlLabel	   Identifier
+hi def link ocamlLabel	   Identifier
 
-HiLink ocamlType	   Type
+hi def link ocamlType	   Type
 
-HiLink ocamlTodo	   Todo
+hi def link ocamlTodo	   Todo
 
-HiLink ocamlEncl	   Keyword
+hi def link ocamlEncl	   Keyword
 
-delcommand HiLink
 
 let b:current_syntax = "ocaml"
 
diff --git a/runtime/syntax/occam.vim b/runtime/syntax/occam.vim
index bab84f2e18..01d139bd09 100644
--- a/runtime/syntax/occam.vim
+++ b/runtime/syntax/occam.vim
@@ -85,34 +85,32 @@ syn match occamCDString		/<\|>\|=\|(\|)/ contained
 
 syn region occamCDirective	start=/#\(USE\|INCLUDE\|PRAGMA\|DEFINE\|UNDEFINE\|UNDEF\|IF\|ELIF\|ELSE\|ENDIF\|WARNING\|ERROR\|RELAX\)\>/ end=/$/ contains=occamString,occamComment,occamCDString
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink occamType Type
-HiLink occamKeyword Keyword
-HiLink occamComment Comment
-HiLink occamCommentTitle PreProc
-HiLink occamTodo Todo
-HiLink occamNote Todo
-HiLink occamString String
-HiLink occamCharString String
-HiLink occamNumber Number
-HiLink occamCDirective PreProc
-HiLink occamCDString String
-HiLink occamPPIdentifier PreProc
-HiLink occamBoolean Boolean
-HiLink occamSpecialChar SpecialChar
-HiLink occamChar Character
-HiLink occamStructure Structure
-HiLink occamIdentifier Identifier
-HiLink occamConstant Constant
-HiLink occamOperator Operator
-HiLink occamFunction Ignore
-HiLink occamRepeat Repeat
-HiLink occamConditional Conditional
-HiLink occamBrackets Type
-HiLink occamParantheses Delimiter
+hi def link occamType Type
+hi def link occamKeyword Keyword
+hi def link occamComment Comment
+hi def link occamCommentTitle PreProc
+hi def link occamTodo Todo
+hi def link occamNote Todo
+hi def link occamString String
+hi def link occamCharString String
+hi def link occamNumber Number
+hi def link occamCDirective PreProc
+hi def link occamCDString String
+hi def link occamPPIdentifier PreProc
+hi def link occamBoolean Boolean
+hi def link occamSpecialChar SpecialChar
+hi def link occamChar Character
+hi def link occamStructure Structure
+hi def link occamIdentifier Identifier
+hi def link occamConstant Constant
+hi def link occamOperator Operator
+hi def link occamFunction Ignore
+hi def link occamRepeat Repeat
+hi def link occamConditional Conditional
+hi def link occamBrackets Type
+hi def link occamParantheses Delimiter
 
-delcommand HiLink
 
 let b:current_syntax = "occam"
 
diff --git a/runtime/syntax/omnimark.vim b/runtime/syntax/omnimark.vim
index 9887352a68..6294945ffb 100644
--- a/runtime/syntax/omnimark.vim
+++ b/runtime/syntax/omnimark.vim
@@ -90,17 +90,15 @@ syn sync minlines=2000
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink omnimarkCommands		Statement
-HiLink omnimarkKeywords		Identifier
-HiLink omnimarkString		String
-HiLink omnimarkPatterns		Macro
-"  HiLink omnimarkNumber			Number
-HiLink omnimarkComment		Comment
-HiLink omnimarkEscape		Special
+hi def link omnimarkCommands		Statement
+hi def link omnimarkKeywords		Identifier
+hi def link omnimarkString		String
+hi def link omnimarkPatterns		Macro
+"  hi def link omnimarkNumber			Number
+hi def link omnimarkComment		Comment
+hi def link omnimarkEscape		Special
 
-delcommand HiLink
 
 let b:current_syntax = "omnimark"
 
diff --git a/runtime/syntax/openroad.vim b/runtime/syntax/openroad.vim
index 6d2affca9b..e09f233647 100644
--- a/runtime/syntax/openroad.vim
+++ b/runtime/syntax/openroad.vim
@@ -233,22 +233,20 @@ endif
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 "
-command -nargs=+ HiLink hi def link <args>
 
-HiLink openroadKeyword	Statement
-HiLink openroadNumber	Number
-HiLink openroadString	String
-HiLink openroadComment	Comment
-HiLink openroadOperator	Operator
-HiLink openroadType		Type
-HiLink openroadFunc		Special
-HiLink openroadClass	Type
-HiLink openroadEvent	Statement
-HiLink openroadConst	Constant
-HiLink openroadVar		Identifier
-HiLink openroadIdent	Identifier
-HiLink openroadTodo		Todo
+hi def link openroadKeyword	Statement
+hi def link openroadNumber	Number
+hi def link openroadString	String
+hi def link openroadComment	Comment
+hi def link openroadOperator	Operator
+hi def link openroadType		Type
+hi def link openroadFunc		Special
+hi def link openroadClass	Type
+hi def link openroadEvent	Statement
+hi def link openroadConst	Constant
+hi def link openroadVar		Identifier
+hi def link openroadIdent	Identifier
+hi def link openroadTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "openroad"
diff --git a/runtime/syntax/opl.vim b/runtime/syntax/opl.vim
index 8959cf6d6f..8b66a5b345 100644
--- a/runtime/syntax/opl.vim
+++ b/runtime/syntax/opl.vim
@@ -73,16 +73,14 @@ syn match   OPLMathsOperator    "-\|=\|[:<>+\*^/\\]"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink OPLStatement		Statement
-HiLink OPLNumber		Number
-HiLink OPLString		String
-HiLink OPLComment		Comment
-HiLink OPLMathsOperator	Conditional
-"  HiLink OPLError		Error
+hi def link OPLStatement		Statement
+hi def link OPLNumber		Number
+hi def link OPLString		String
+hi def link OPLComment		Comment
+hi def link OPLMathsOperator	Conditional
+"  hi def link OPLError		Error
 
-delcommand HiLink
 
 let b:current_syntax = "opl"
 
diff --git a/runtime/syntax/ora.vim b/runtime/syntax/ora.vim
index e84299a53b..99034793f2 100644
--- a/runtime/syntax/ora.vim
+++ b/runtime/syntax/ora.vim
@@ -436,25 +436,23 @@ syn cluster oraAll add=oraValue,oraModifier,oraString,oraSpecial,oraComment
 " highlighting
 
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink oraKeyword	  Statement		"usual keywords
-HiLink oraKeywordGroup  Type			"keywords which group other keywords
-HiLink oraKeywordPref   oraKeywordGroup	"keywords which act as prefixes
-HiLink oraKeywordObs	  Todo			"obsolete keywords
-HiLink oraKeywordUnd	  PreProc		"undocumented keywords
-HiLink oraKeywordUndObs oraKeywordObs		"undocumented obsolete keywords
-HiLink oraValue	  Identifier		"values, like true or false
-HiLink oraModifier	  oraValue		"modifies values
-HiLink oraString	  String		"strings
+hi def link oraKeyword	  Statement		"usual keywords
+hi def link oraKeywordGroup  Type			"keywords which group other keywords
+hi def link oraKeywordPref   oraKeywordGroup	"keywords which act as prefixes
+hi def link oraKeywordObs	  Todo			"obsolete keywords
+hi def link oraKeywordUnd	  PreProc		"undocumented keywords
+hi def link oraKeywordUndObs oraKeywordObs		"undocumented obsolete keywords
+hi def link oraValue	  Identifier		"values, like true or false
+hi def link oraModifier	  oraValue		"modifies values
+hi def link oraString	  String		"strings
 
-HiLink oraSpecial	  Special		"special characters
-HiLink oraError	  Error			"errors
-HiLink oraParenError	  oraError		"errors caused by mismatching parantheses
+hi def link oraSpecial	  Special		"special characters
+hi def link oraError	  Error			"errors
+hi def link oraParenError	  oraError		"errors caused by mismatching parantheses
 
-HiLink oraComment	  Comment		"comments
+hi def link oraComment	  Comment		"comments
 
-delcommand HiLink
 
 
 let b:current_syntax = "ora"
diff --git a/runtime/syntax/pascal.vim b/runtime/syntax/pascal.vim
index 4a290f059d..2a58ee43f6 100644
--- a/runtime/syntax/pascal.vim
+++ b/runtime/syntax/pascal.vim
@@ -318,43 +318,41 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pascalAcces		pascalStatement
-HiLink pascalBoolean		Boolean
-HiLink pascalComment		Comment
-HiLink pascalConditional	Conditional
-HiLink pascalConstant		Constant
-HiLink pascalDelimiter	Identifier
-HiLink pascalDirective	pascalStatement
-HiLink pascalException	Exception
-HiLink pascalFloat		Float
-HiLink pascalFunction		Function
-HiLink pascalLabel		Label
-HiLink pascalMatrixDelimiter	Identifier
-HiLink pascalModifier		Type
-HiLink pascalNumber		Number
-HiLink pascalOperator		Operator
-HiLink pascalPredefined	pascalStatement
-HiLink pascalPreProc		PreProc
-HiLink pascalRepeat		Repeat
-HiLink pascalSpaceError	Error
-HiLink pascalStatement	Statement
-HiLink pascalString		String
-HiLink pascalStringEscape	Special
-HiLink pascalStringEscapeGPC	Special
-HiLink pascalStringError	Error
-HiLink pascalStruct		pascalStatement
-HiLink pascalSymbolOperator	pascalOperator
-HiLink pascalTodo		Todo
-HiLink pascalType		Type
-HiLink pascalUnclassified	pascalStatement
-"  HiLink pascalAsm		Assembler
-HiLink pascalError		Error
-HiLink pascalAsmKey		pascalStatement
-HiLink pascalShowTab		Error
+hi def link pascalAcces		pascalStatement
+hi def link pascalBoolean		Boolean
+hi def link pascalComment		Comment
+hi def link pascalConditional	Conditional
+hi def link pascalConstant		Constant
+hi def link pascalDelimiter	Identifier
+hi def link pascalDirective	pascalStatement
+hi def link pascalException	Exception
+hi def link pascalFloat		Float
+hi def link pascalFunction		Function
+hi def link pascalLabel		Label
+hi def link pascalMatrixDelimiter	Identifier
+hi def link pascalModifier		Type
+hi def link pascalNumber		Number
+hi def link pascalOperator		Operator
+hi def link pascalPredefined	pascalStatement
+hi def link pascalPreProc		PreProc
+hi def link pascalRepeat		Repeat
+hi def link pascalSpaceError	Error
+hi def link pascalStatement	Statement
+hi def link pascalString		String
+hi def link pascalStringEscape	Special
+hi def link pascalStringEscapeGPC	Special
+hi def link pascalStringError	Error
+hi def link pascalStruct		pascalStatement
+hi def link pascalSymbolOperator	pascalOperator
+hi def link pascalTodo		Todo
+hi def link pascalType		Type
+hi def link pascalUnclassified	pascalStatement
+"  hi def link pascalAsm		Assembler
+hi def link pascalError		Error
+hi def link pascalAsmKey		pascalStatement
+hi def link pascalShowTab		Error
 
-delcommand HiLink
 
 
 let b:current_syntax = "pascal"
diff --git a/runtime/syntax/pcap.vim b/runtime/syntax/pcap.vim
index 7c97738520..e0eed633c1 100644
--- a/runtime/syntax/pcap.vim
+++ b/runtime/syntax/pcap.vim
@@ -37,13 +37,11 @@ syn sync minlines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pcapBad WarningMsg
-HiLink pcapBadword WarningMsg
-HiLink pcapComment Comment
+hi def link pcapBad WarningMsg
+hi def link pcapBadword WarningMsg
+hi def link pcapComment Comment
 
-delcommand HiLink
 
 let b:current_syntax = "pcap"
 
diff --git a/runtime/syntax/pccts.vim b/runtime/syntax/pccts.vim
index 5ddc570bbe..780035798b 100644
--- a/runtime/syntax/pccts.vim
+++ b/runtime/syntax/pccts.vim
@@ -66,25 +66,23 @@ syn sync match pcctsSyncRule grouphere pcctsRule "\<[a-z][A-Za-z0-9_]*\>\(\s*\[[
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pcctsDelim		Special
-HiLink pcctsTokenName		Identifier
-HiLink pcctsRuleName		Statement
-HiLink pcctsLabelHack		Label
-HiLink pcctsDirective		PreProc
-HiLink pcctsString		String
-HiLink pcctsComment		Comment
-HiLink pcctsClass		Statement
-HiLink pcctsClassName		Identifier
-HiLink pcctsException		Statement
-HiLink pcctsExceptionHandler	Keyword
-HiLink pcctsExceptionRuleRef	pcctsDelim
-HiLink pcctsExceptionID	Identifier
-HiLink pcctsRuleRef		Identifier
-HiLink pcctsSpecialChar	SpecialChar
+hi def link pcctsDelim		Special
+hi def link pcctsTokenName		Identifier
+hi def link pcctsRuleName		Statement
+hi def link pcctsLabelHack		Label
+hi def link pcctsDirective		PreProc
+hi def link pcctsString		String
+hi def link pcctsComment		Comment
+hi def link pcctsClass		Statement
+hi def link pcctsClassName		Identifier
+hi def link pcctsException		Statement
+hi def link pcctsExceptionHandler	Keyword
+hi def link pcctsExceptionRuleRef	pcctsDelim
+hi def link pcctsExceptionID	Identifier
+hi def link pcctsRuleRef		Identifier
+hi def link pcctsSpecialChar	SpecialChar
 
-delcommand HiLink
 
 let b:current_syntax = "pccts"
 
diff --git a/runtime/syntax/perl.vim b/runtime/syntax/perl.vim
index c09373a5cd..6ab6cd83a2 100644
--- a/runtime/syntax/perl.vim
+++ b/runtime/syntax/perl.vim
@@ -435,121 +435,119 @@ else
   syn sync minlines=0
 endif
 
-command -nargs=+ HiLink hi def link <args>
 
 " NOTE: If you're linking new highlight groups to perlString, please also put
 "       them into b:match_skip in ftplugin/perl.vim.
 
 " The default highlighting.
-HiLink perlSharpBang		PreProc
-HiLink perlControl		PreProc
-HiLink perlInclude		Include
-HiLink perlSpecial		Special
-HiLink perlString		String
-HiLink perlCharacter		Character
-HiLink perlNumber		Number
-HiLink perlFloat		Float
-HiLink perlType			Type
-HiLink perlIdentifier		Identifier
-HiLink perlLabel		Label
-HiLink perlStatement		Statement
-HiLink perlConditional		Conditional
-HiLink perlRepeat		Repeat
-HiLink perlOperator		Operator
-HiLink perlFunction		Keyword
-HiLink perlSubName		Function
-HiLink perlSubPrototype		Type
-HiLink perlSubAttributes	PreProc
-HiLink perlSubAttributesCont	perlSubAttributes
-HiLink perlComment		Comment
-HiLink perlTodo			Todo
+hi def link perlSharpBang		PreProc
+hi def link perlControl		PreProc
+hi def link perlInclude		Include
+hi def link perlSpecial		Special
+hi def link perlString		String
+hi def link perlCharacter		Character
+hi def link perlNumber		Number
+hi def link perlFloat		Float
+hi def link perlType			Type
+hi def link perlIdentifier		Identifier
+hi def link perlLabel		Label
+hi def link perlStatement		Statement
+hi def link perlConditional		Conditional
+hi def link perlRepeat		Repeat
+hi def link perlOperator		Operator
+hi def link perlFunction		Keyword
+hi def link perlSubName		Function
+hi def link perlSubPrototype		Type
+hi def link perlSubAttributes	PreProc
+hi def link perlSubAttributesCont	perlSubAttributes
+hi def link perlComment		Comment
+hi def link perlTodo			Todo
 if exists("perl_string_as_statement")
-  HiLink perlStringStartEnd	perlStatement
+  hi def link perlStringStartEnd	perlStatement
 else
-  HiLink perlStringStartEnd	perlString
+  hi def link perlStringStartEnd	perlString
 endif
-HiLink perlVStringV		perlStringStartEnd
-HiLink perlList			perlStatement
-HiLink perlMisc			perlStatement
-HiLink perlVarPlain		perlIdentifier
-HiLink perlVarPlain2		perlIdentifier
-HiLink perlArrow		perlIdentifier
-HiLink perlFiledescRead		perlIdentifier
-HiLink perlFiledescStatement	perlIdentifier
-HiLink perlVarSimpleMember	perlIdentifier
-HiLink perlVarSimpleMemberName 	perlString
-HiLink perlVarNotInMatches	perlIdentifier
-HiLink perlVarSlash		perlIdentifier
-HiLink perlQQ			perlString
-HiLink perlHereDoc		perlString
-HiLink perlStringUnexpanded	perlString
-HiLink perlSubstitutionSQ	perlString
-HiLink perlSubstitutionGQQ	perlString
-HiLink perlTranslationGQ	perlString
-HiLink perlMatch		perlString
-HiLink perlMatchStartEnd	perlStatement
-HiLink perlFormatName		perlIdentifier
-HiLink perlFormatField		perlString
-HiLink perlPackageDecl		perlType
-HiLink perlStorageClass		perlType
-HiLink perlPackageRef		perlType
-HiLink perlStatementPackage	perlStatement
-HiLink perlStatementStorage	perlStatement
-HiLink perlStatementControl	perlStatement
-HiLink perlStatementScalar	perlStatement
-HiLink perlStatementRegexp	perlStatement
-HiLink perlStatementNumeric	perlStatement
-HiLink perlStatementList	perlStatement
-HiLink perlStatementHash	perlStatement
-HiLink perlStatementIOfunc	perlStatement
-HiLink perlStatementFiledesc	perlStatement
-HiLink perlStatementVector	perlStatement
-HiLink perlStatementFiles	perlStatement
-HiLink perlStatementFlow	perlStatement
-HiLink perlStatementInclude	perlStatement
-HiLink perlStatementProc	perlStatement
-HiLink perlStatementSocket	perlStatement
-HiLink perlStatementIPC		perlStatement
-HiLink perlStatementNetwork	perlStatement
-HiLink perlStatementPword	perlStatement
-HiLink perlStatementTime	perlStatement
-HiLink perlStatementMisc	perlStatement
-HiLink perlStatementIndirObj	perlStatement
-HiLink perlFunctionName		perlIdentifier
-HiLink perlMethod		perlIdentifier
-HiLink perlFunctionPRef		perlType
-HiLink perlPOD			perlComment
-HiLink perlShellCommand		perlString
-HiLink perlSpecialAscii		perlSpecial
-HiLink perlSpecialDollar	perlSpecial
-HiLink perlSpecialString	perlSpecial
-HiLink perlSpecialStringU	perlSpecial
-HiLink perlSpecialMatch		perlSpecial
-HiLink perlDATA			perlComment
+hi def link perlVStringV		perlStringStartEnd
+hi def link perlList			perlStatement
+hi def link perlMisc			perlStatement
+hi def link perlVarPlain		perlIdentifier
+hi def link perlVarPlain2		perlIdentifier
+hi def link perlArrow		perlIdentifier
+hi def link perlFiledescRead		perlIdentifier
+hi def link perlFiledescStatement	perlIdentifier
+hi def link perlVarSimpleMember	perlIdentifier
+hi def link perlVarSimpleMemberName 	perlString
+hi def link perlVarNotInMatches	perlIdentifier
+hi def link perlVarSlash		perlIdentifier
+hi def link perlQQ			perlString
+hi def link perlHereDoc		perlString
+hi def link perlStringUnexpanded	perlString
+hi def link perlSubstitutionSQ	perlString
+hi def link perlSubstitutionGQQ	perlString
+hi def link perlTranslationGQ	perlString
+hi def link perlMatch		perlString
+hi def link perlMatchStartEnd	perlStatement
+hi def link perlFormatName		perlIdentifier
+hi def link perlFormatField		perlString
+hi def link perlPackageDecl		perlType
+hi def link perlStorageClass		perlType
+hi def link perlPackageRef		perlType
+hi def link perlStatementPackage	perlStatement
+hi def link perlStatementStorage	perlStatement
+hi def link perlStatementControl	perlStatement
+hi def link perlStatementScalar	perlStatement
+hi def link perlStatementRegexp	perlStatement
+hi def link perlStatementNumeric	perlStatement
+hi def link perlStatementList	perlStatement
+hi def link perlStatementHash	perlStatement
+hi def link perlStatementIOfunc	perlStatement
+hi def link perlStatementFiledesc	perlStatement
+hi def link perlStatementVector	perlStatement
+hi def link perlStatementFiles	perlStatement
+hi def link perlStatementFlow	perlStatement
+hi def link perlStatementInclude	perlStatement
+hi def link perlStatementProc	perlStatement
+hi def link perlStatementSocket	perlStatement
+hi def link perlStatementIPC		perlStatement
+hi def link perlStatementNetwork	perlStatement
+hi def link perlStatementPword	perlStatement
+hi def link perlStatementTime	perlStatement
+hi def link perlStatementMisc	perlStatement
+hi def link perlStatementIndirObj	perlStatement
+hi def link perlFunctionName		perlIdentifier
+hi def link perlMethod		perlIdentifier
+hi def link perlFunctionPRef		perlType
+hi def link perlPOD			perlComment
+hi def link perlShellCommand		perlString
+hi def link perlSpecialAscii		perlSpecial
+hi def link perlSpecialDollar	perlSpecial
+hi def link perlSpecialString	perlSpecial
+hi def link perlSpecialStringU	perlSpecial
+hi def link perlSpecialMatch		perlSpecial
+hi def link perlDATA			perlComment
 
 " NOTE: Due to a bug in Vim (or more likely, a misunderstanding on my part),
 "       I had to remove the transparent property from the following regions
 "       in order to get them to highlight correctly.  Feel free to remove
 "       these and reinstate the transparent property if you know how.
-HiLink perlParensSQ		perlString
-HiLink perlBracketsSQ		perlString
-HiLink perlBracesSQ		perlString
-HiLink perlAnglesSQ		perlString
+hi def link perlParensSQ		perlString
+hi def link perlBracketsSQ		perlString
+hi def link perlBracesSQ		perlString
+hi def link perlAnglesSQ		perlString
 
-HiLink perlParensDQ		perlString
-HiLink perlBracketsDQ		perlString
-HiLink perlBracesDQ		perlString
-HiLink perlAnglesDQ		perlString
+hi def link perlParensDQ		perlString
+hi def link perlBracketsDQ		perlString
+hi def link perlBracesDQ		perlString
+hi def link perlAnglesDQ		perlString
 
-HiLink perlSpecialStringU2	perlString
+hi def link perlSpecialStringU2	perlString
 
 " Possible errors
-HiLink perlNotEmptyLine		Error
-HiLink perlElseIfError		Error
-HiLink perlSubPrototypeError	Error
-HiLink perlSubError		Error
+hi def link perlNotEmptyLine		Error
+hi def link perlElseIfError		Error
+hi def link perlSubPrototypeError	Error
+hi def link perlSubError		Error
 
-delcommand HiLink
 
 " Syncing to speed up processing
 "
diff --git a/runtime/syntax/perl6.vim b/runtime/syntax/perl6.vim
index f40a040a45..3bcd9ff0e9 100644
--- a/runtime/syntax/perl6.vim
+++ b/runtime/syntax/perl6.vim
@@ -2061,167 +2061,165 @@ syn region p6PodFormatFrench
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink p6EscOctOld       p6Error
-HiLink p6PackageTwigil   p6Twigil
-HiLink p6StringAngle     p6String
-HiLink p6StringFrench    p6String
-HiLink p6StringAngles    p6String
-HiLink p6StringSQ        p6String
-HiLink p6StringDQ        p6String
-HiLink p6StringQ         p6String
-HiLink p6RxStringSQ      p6String
-HiLink p6RxStringDQ      p6String
-HiLink p6Substitution    p6String
-HiLink p6Transliteration p6String
-HiLink p6StringAuto      p6String
-HiLink p6StringP5Auto    p6String
-HiLink p6Key             p6String
-HiLink p6Match           p6String
-HiLink p6RegexBlock      p6String
-HiLink p6RxP5CharClass   p6String
-HiLink p6RxP5QuoteMeta   p6String
-HiLink p6RxCharClass     p6String
-HiLink p6RxQuoteWords    p6String
-HiLink p6ReduceOp        p6Operator
-HiLink p6ReverseCrossOp  p6Operator
-HiLink p6HyperOp         p6Operator
-HiLink p6QuoteQ          p6Operator
-HiLink p6RxRange         p6StringSpecial
-HiLink p6RxAnchor        p6StringSpecial
-HiLink p6RxP5Anchor      p6StringSpecial
-HiLink p6CodePoint       p6StringSpecial
-HiLink p6RxMeta          p6StringSpecial
-HiLink p6RxP5Range       p6StringSpecial
-HiLink p6RxP5CPId        p6StringSpecial
-HiLink p6RxP5Posix       p6StringSpecial
-HiLink p6RxP5Mod         p6StringSpecial
-HiLink p6RxP5HexSeq      p6StringSpecial
-HiLink p6RxP5OctSeq      p6StringSpecial
-HiLink p6RxP5WriteRefId  p6StringSpecial
-HiLink p6HexSequence     p6StringSpecial
-HiLink p6OctSequence     p6StringSpecial
-HiLink p6RxP5Named       p6StringSpecial
-HiLink p6RxP5PropId      p6StringSpecial
-HiLink p6RxP5Quantifier  p6StringSpecial
-HiLink p6RxP5CountId     p6StringSpecial
-HiLink p6RxP5Verb        p6StringSpecial
-HiLink p6Escape          p6StringSpecial2
-HiLink p6EscNull         p6StringSpecial2
-HiLink p6EscHash         p6StringSpecial2
-HiLink p6EscQQ           p6StringSpecial2
-HiLink p6EscQuote        p6StringSpecial2
-HiLink p6EscDoubleQuote  p6StringSpecial2
-HiLink p6EscBackTick     p6StringSpecial2
-HiLink p6EscForwardSlash p6StringSpecial2
-HiLink p6EscVerticalBar  p6StringSpecial2
-HiLink p6EscExclamation  p6StringSpecial2
-HiLink p6EscDollar       p6StringSpecial2
-HiLink p6EscOpenCurly    p6StringSpecial2
-HiLink p6EscCloseCurly   p6StringSpecial2
-HiLink p6EscCloseBracket p6StringSpecial2
-HiLink p6EscCloseAngle   p6StringSpecial2
-HiLink p6EscCloseFrench  p6StringSpecial2
-HiLink p6EscBackSlash    p6StringSpecial2
-HiLink p6RxEscape        p6StringSpecial2
-HiLink p6RxCapture       p6StringSpecial2
-HiLink p6RxAlternation   p6StringSpecial2
-HiLink p6RxP5            p6StringSpecial2
-HiLink p6RxP5ReadRef     p6StringSpecial2
-HiLink p6RxP5Oct         p6StringSpecial2
-HiLink p6RxP5Hex         p6StringSpecial2
-HiLink p6RxP5EscMeta     p6StringSpecial2
-HiLink p6RxP5Meta        p6StringSpecial2
-HiLink p6RxP5Escape      p6StringSpecial2
-HiLink p6RxP5CodePoint   p6StringSpecial2
-HiLink p6RxP5WriteRef    p6StringSpecial2
-HiLink p6RxP5Prop        p6StringSpecial2
+hi def link p6EscOctOld       p6Error
+hi def link p6PackageTwigil   p6Twigil
+hi def link p6StringAngle     p6String
+hi def link p6StringFrench    p6String
+hi def link p6StringAngles    p6String
+hi def link p6StringSQ        p6String
+hi def link p6StringDQ        p6String
+hi def link p6StringQ         p6String
+hi def link p6RxStringSQ      p6String
+hi def link p6RxStringDQ      p6String
+hi def link p6Substitution    p6String
+hi def link p6Transliteration p6String
+hi def link p6StringAuto      p6String
+hi def link p6StringP5Auto    p6String
+hi def link p6Key             p6String
+hi def link p6Match           p6String
+hi def link p6RegexBlock      p6String
+hi def link p6RxP5CharClass   p6String
+hi def link p6RxP5QuoteMeta   p6String
+hi def link p6RxCharClass     p6String
+hi def link p6RxQuoteWords    p6String
+hi def link p6ReduceOp        p6Operator
+hi def link p6ReverseCrossOp  p6Operator
+hi def link p6HyperOp         p6Operator
+hi def link p6QuoteQ          p6Operator
+hi def link p6RxRange         p6StringSpecial
+hi def link p6RxAnchor        p6StringSpecial
+hi def link p6RxP5Anchor      p6StringSpecial
+hi def link p6CodePoint       p6StringSpecial
+hi def link p6RxMeta          p6StringSpecial
+hi def link p6RxP5Range       p6StringSpecial
+hi def link p6RxP5CPId        p6StringSpecial
+hi def link p6RxP5Posix       p6StringSpecial
+hi def link p6RxP5Mod         p6StringSpecial
+hi def link p6RxP5HexSeq      p6StringSpecial
+hi def link p6RxP5OctSeq      p6StringSpecial
+hi def link p6RxP5WriteRefId  p6StringSpecial
+hi def link p6HexSequence     p6StringSpecial
+hi def link p6OctSequence     p6StringSpecial
+hi def link p6RxP5Named       p6StringSpecial
+hi def link p6RxP5PropId      p6StringSpecial
+hi def link p6RxP5Quantifier  p6StringSpecial
+hi def link p6RxP5CountId     p6StringSpecial
+hi def link p6RxP5Verb        p6StringSpecial
+hi def link p6Escape          p6StringSpecial2
+hi def link p6EscNull         p6StringSpecial2
+hi def link p6EscHash         p6StringSpecial2
+hi def link p6EscQQ           p6StringSpecial2
+hi def link p6EscQuote        p6StringSpecial2
+hi def link p6EscDoubleQuote  p6StringSpecial2
+hi def link p6EscBackTick     p6StringSpecial2
+hi def link p6EscForwardSlash p6StringSpecial2
+hi def link p6EscVerticalBar  p6StringSpecial2
+hi def link p6EscExclamation  p6StringSpecial2
+hi def link p6EscDollar       p6StringSpecial2
+hi def link p6EscOpenCurly    p6StringSpecial2
+hi def link p6EscCloseCurly   p6StringSpecial2
+hi def link p6EscCloseBracket p6StringSpecial2
+hi def link p6EscCloseAngle   p6StringSpecial2
+hi def link p6EscCloseFrench  p6StringSpecial2
+hi def link p6EscBackSlash    p6StringSpecial2
+hi def link p6RxEscape        p6StringSpecial2
+hi def link p6RxCapture       p6StringSpecial2
+hi def link p6RxAlternation   p6StringSpecial2
+hi def link p6RxP5            p6StringSpecial2
+hi def link p6RxP5ReadRef     p6StringSpecial2
+hi def link p6RxP5Oct         p6StringSpecial2
+hi def link p6RxP5Hex         p6StringSpecial2
+hi def link p6RxP5EscMeta     p6StringSpecial2
+hi def link p6RxP5Meta        p6StringSpecial2
+hi def link p6RxP5Escape      p6StringSpecial2
+hi def link p6RxP5CodePoint   p6StringSpecial2
+hi def link p6RxP5WriteRef    p6StringSpecial2
+hi def link p6RxP5Prop        p6StringSpecial2
 
-HiLink p6Property       Tag
-HiLink p6Attention      Todo
-HiLink p6Type           Type
-HiLink p6Error          Error
-HiLink p6BlockLabel     Label
-HiLink p6Float          Float
-HiLink p6Normal         Normal
-HiLink p6Package        Normal
-HiLink p6PackageScope   Normal
-HiLink p6Number         Number
-HiLink p6VersionNum     Number
-HiLink p6String         String
-HiLink p6Repeat         Repeat
-HiLink p6Keyword        Keyword
-HiLink p6Pragma         Keyword
-HiLink p6Module         Keyword
-HiLink p6DeclareRoutine Keyword
-HiLink p6VarStorage     Special
-HiLink p6FlowControl    Special
-HiLink p6NumberBase     Special
-HiLink p6Twigil         Special
-HiLink p6StringSpecial2 Special
-HiLink p6VersionDot     Special
-HiLink p6Comment        Comment
-HiLink p6Include        Include
-HiLink p6Shebang        PreProc
-HiLink p6ClosureTrait   PreProc
-HiLink p6Routine        Function
-HiLink p6Operator       Operator
-HiLink p6Version        Operator
-HiLink p6Context        Operator
-HiLink p6Quote          Delimiter
-HiLink p6TypeConstraint PreCondit
-HiLink p6Exception      Exception
-HiLink p6Placeholder    Identifier
-HiLink p6Variable       Identifier
-HiLink p6VarSlash       Identifier
-HiLink p6VarNum         Identifier
-HiLink p6VarExclam      Identifier
-HiLink p6VarMatch       Identifier
-HiLink p6VarName        Identifier
-HiLink p6MatchVar       Identifier
-HiLink p6RxP5ReadRefId  Identifier
-HiLink p6RxP5ModDef     Identifier
-HiLink p6RxP5ModName    Identifier
-HiLink p6Conditional    Conditional
-HiLink p6StringSpecial  SpecialChar
+hi def link p6Property       Tag
+hi def link p6Attention      Todo
+hi def link p6Type           Type
+hi def link p6Error          Error
+hi def link p6BlockLabel     Label
+hi def link p6Float          Float
+hi def link p6Normal         Normal
+hi def link p6Package        Normal
+hi def link p6PackageScope   Normal
+hi def link p6Number         Number
+hi def link p6VersionNum     Number
+hi def link p6String         String
+hi def link p6Repeat         Repeat
+hi def link p6Keyword        Keyword
+hi def link p6Pragma         Keyword
+hi def link p6Module         Keyword
+hi def link p6DeclareRoutine Keyword
+hi def link p6VarStorage     Special
+hi def link p6FlowControl    Special
+hi def link p6NumberBase     Special
+hi def link p6Twigil         Special
+hi def link p6StringSpecial2 Special
+hi def link p6VersionDot     Special
+hi def link p6Comment        Comment
+hi def link p6Include        Include
+hi def link p6Shebang        PreProc
+hi def link p6ClosureTrait   PreProc
+hi def link p6Routine        Function
+hi def link p6Operator       Operator
+hi def link p6Version        Operator
+hi def link p6Context        Operator
+hi def link p6Quote          Delimiter
+hi def link p6TypeConstraint PreCondit
+hi def link p6Exception      Exception
+hi def link p6Placeholder    Identifier
+hi def link p6Variable       Identifier
+hi def link p6VarSlash       Identifier
+hi def link p6VarNum         Identifier
+hi def link p6VarExclam      Identifier
+hi def link p6VarMatch       Identifier
+hi def link p6VarName        Identifier
+hi def link p6MatchVar       Identifier
+hi def link p6RxP5ReadRefId  Identifier
+hi def link p6RxP5ModDef     Identifier
+hi def link p6RxP5ModName    Identifier
+hi def link p6Conditional    Conditional
+hi def link p6StringSpecial  SpecialChar
 
-HiLink p6PodAbbr         p6Pod
-HiLink p6PodAbbrEOF      p6Pod
-HiLink p6PodAbbrNoCode   p6Pod
-HiLink p6PodAbbrCode     p6PodCode
-HiLink p6PodPara         p6Pod
-HiLink p6PodParaEOF      p6Pod
-HiLink p6PodParaNoCode   p6Pod
-HiLink p6PodParaCode     p6PodCode
-HiLink p6PodDelim        p6Pod
-HiLink p6PodDelimEOF     p6Pod
-HiLink p6PodDelimNoCode  p6Pod
-HiLink p6PodDelimCode    p6PodCode
-HiLink p6PodImplicitCode p6PodCode
-HiLink p6PodExtraConfig  p6PodPrefix
-HiLink p6PodVerticalBar  p6PodFormatCode
-HiLink p6PodColon        p6PodFormatCode
-HiLink p6PodSemicolon    p6PodFormatCode
-HiLink p6PodComma        p6PodFormatCode
-HiLink p6PodFormatOne    p6PodFormat
-HiLink p6PodFormatTwo    p6PodFormat
-HiLink p6PodFormatThree  p6PodFormat
-HiLink p6PodFormatFrench p6PodFormat
+hi def link p6PodAbbr         p6Pod
+hi def link p6PodAbbrEOF      p6Pod
+hi def link p6PodAbbrNoCode   p6Pod
+hi def link p6PodAbbrCode     p6PodCode
+hi def link p6PodPara         p6Pod
+hi def link p6PodParaEOF      p6Pod
+hi def link p6PodParaNoCode   p6Pod
+hi def link p6PodParaCode     p6PodCode
+hi def link p6PodDelim        p6Pod
+hi def link p6PodDelimEOF     p6Pod
+hi def link p6PodDelimNoCode  p6Pod
+hi def link p6PodDelimCode    p6PodCode
+hi def link p6PodImplicitCode p6PodCode
+hi def link p6PodExtraConfig  p6PodPrefix
+hi def link p6PodVerticalBar  p6PodFormatCode
+hi def link p6PodColon        p6PodFormatCode
+hi def link p6PodSemicolon    p6PodFormatCode
+hi def link p6PodComma        p6PodFormatCode
+hi def link p6PodFormatOne    p6PodFormat
+hi def link p6PodFormatTwo    p6PodFormat
+hi def link p6PodFormatThree  p6PodFormat
+hi def link p6PodFormatFrench p6PodFormat
 
-HiLink p6PodType           Type
-HiLink p6PodConfigOption   String
-HiLink p6PodCode           PreProc
-HiLink p6Pod               Comment
-HiLink p6PodComment        Comment
-HiLink p6PodAutoQuote      Operator
-HiLink p6PodConfigOperator Operator
-HiLink p6PodPrefix         Statement
-HiLink p6PodName           Identifier
-HiLink p6PodFormatCode     SpecialChar
-HiLink p6PodFormat         SpecialComment
+hi def link p6PodType           Type
+hi def link p6PodConfigOption   String
+hi def link p6PodCode           PreProc
+hi def link p6Pod               Comment
+hi def link p6PodComment        Comment
+hi def link p6PodAutoQuote      Operator
+hi def link p6PodConfigOperator Operator
+hi def link p6PodPrefix         Statement
+hi def link p6PodName           Identifier
+hi def link p6PodFormatCode     SpecialChar
+hi def link p6PodFormat         SpecialComment
 
-delcommand HiLink
 
 " Syncing to speed up processing
 "syn sync match p6SyncPod groupthere p6PodAbbrRegion     "^=\K\k*\>"
diff --git a/runtime/syntax/pfmain.vim b/runtime/syntax/pfmain.vim
index 794aa5dc23..af58da70ef 100644
--- a/runtime/syntax/pfmain.vim
+++ b/runtime/syntax/pfmain.vim
@@ -1811,26 +1811,24 @@ syntax match pfmainSpecial	"\<smtpd\>"
 syntax match pfmainSpecial	"\<trace\>"
 syntax match pfmainSpecial	"\<verify\>"
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pfmainConf	Statement
-HiLink pfmainRef	PreProc
-HiLink pfmainWord	identifier
+hi def link pfmainConf	Statement
+hi def link pfmainRef	PreProc
+hi def link pfmainWord	identifier
 
-HiLink pfmainDict	Type
-HiLink pfmainQueueDir	Constant
-HiLink pfmainTransport	Constant
-HiLink pfmainLock	Constant
-HiLink pfmainAnswer	Constant
+hi def link pfmainDict	Type
+hi def link pfmainQueueDir	Constant
+hi def link pfmainTransport	Constant
+hi def link pfmainLock	Constant
+hi def link pfmainAnswer	Constant
 
-HiLink pfmainComment	Comment
-HiLink pfmainNumber	Number
-HiLink pfmainTime	Number
-HiLink pfmainIP		Number
-HiLink pfmainVariable	Error
-HiLink pfmainSpecial	Special
+hi def link pfmainComment	Comment
+hi def link pfmainNumber	Number
+hi def link pfmainTime	Number
+hi def link pfmainIP		Number
+hi def link pfmainVariable	Error
+hi def link pfmainSpecial	Special
 
-delcommand HiLink
 
 let b:current_syntax = "pfmain"
 
diff --git a/runtime/syntax/php.vim b/runtime/syntax/php.vim
index a1b658e17a..efb355ec83 100644
--- a/runtime/syntax/php.vim
+++ b/runtime/syntax/php.vim
@@ -598,53 +598,52 @@ syntax match  phpDocTodo  "@\(todo\|fixme\|xxx\)\(\s\+\)\?" containedin=phpComme
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink   phpConstant  Constant
-HiLink   phpCoreConstant  Constant
-HiLink   phpComment Comment
-HiLink   phpDocTags PreProc
-HiLink   phpDocCustomTags Type
-HiLink   phpException Exception
-HiLink   phpBoolean Boolean
-HiLink   phpStorageClass  StorageClass
-HiLink   phpSCKeyword StorageClass
-HiLink   phpFCKeyword Define
-HiLink   phpStructure Structure
-HiLink   phpStringSingle  String
-HiLink   phpStringDouble  String
-HiLink   phpBacktick  String
-HiLink   phpNumber  Number
-HiLink   phpFloat Float
-HiLink   phpMethods Function
-HiLink   phpFunctions Function
-HiLink   phpBaselib Function
-HiLink   phpRepeat  Repeat
-HiLink   phpConditional Conditional
-HiLink   phpLabel Label
-HiLink   phpStatement Statement
-HiLink   phpKeyword Statement
-HiLink   phpType  Type
-HiLink   phpInclude Include
-HiLink   phpDefine  Define
-HiLink   phpBackslashSequences SpecialChar
-HiLink   phpBackslashDoubleQuote SpecialChar
-HiLink   phpBackslashSingleQuote SpecialChar
-HiLink   phpParent  Delimiter
-HiLink   phpBrackets  Delimiter
-HiLink   phpIdentifierConst Delimiter
-HiLink   phpParentError Error
-HiLink   phpOctalError  Error
-HiLink   phpInterpSimpleError Error
-HiLink   phpInterpBogusDollarCurley Error
-HiLink   phpInterpDollarCurly1 Error
-HiLink   phpInterpDollarCurly2 Error
-HiLink   phpInterpSimpleBracketsInner String
-HiLink   phpInterpSimpleCurly Delimiter
-HiLink   phpInterpVarname Identifier
-HiLink   phpTodo  Todo
-HiLink   phpDocTodo Todo
-HiLink   phpMemberSelector  Structure
+hi def link phpConstant  Constant
+hi def link phpCoreConstant  Constant
+hi def link phpComment Comment
+hi def link phpDocTags PreProc
+hi def link phpDocCustomTags Type
+hi def link phpException Exception
+hi def link phpBoolean Boolean
+hi def link phpStorageClass  StorageClass
+hi def link phpSCKeyword StorageClass
+hi def link phpFCKeyword Define
+hi def link phpStructure Structure
+hi def link phpStringSingle  String
+hi def link phpStringDouble  String
+hi def link phpBacktick  String
+hi def link phpNumber  Number
+hi def link phpFloat Float
+hi def link phpMethods Function
+hi def link phpFunctions Function
+hi def link phpBaselib Function
+hi def link phpRepeat  Repeat
+hi def link phpConditional Conditional
+hi def link phpLabel Label
+hi def link phpStatement Statement
+hi def link phpKeyword Statement
+hi def link phpType  Type
+hi def link phpInclude Include
+hi def link phpDefine  Define
+hi def link phpBackslashSequences SpecialChar
+hi def link phpBackslashDoubleQuote SpecialChar
+hi def link phpBackslashSingleQuote SpecialChar
+hi def link phpParent  Delimiter
+hi def link phpBrackets  Delimiter
+hi def link phpIdentifierConst Delimiter
+hi def link phpParentError Error
+hi def link phpOctalError  Error
+hi def link phpInterpSimpleError Error
+hi def link phpInterpBogusDollarCurley Error
+hi def link phpInterpDollarCurly1 Error
+hi def link phpInterpDollarCurly2 Error
+hi def link phpInterpSimpleBracketsInner String
+hi def link phpInterpSimpleCurly Delimiter
+hi def link phpInterpVarname Identifier
+hi def link phpTodo  Todo
+hi def link phpDocTodo Todo
+hi def link phpMemberSelector  Structure
 if exists("php_oldStyle")
 hi  phpIntVar guifg=Red ctermfg=DarkRed
 hi  phpEnvVar guifg=Red ctermfg=DarkRed
@@ -654,16 +653,15 @@ hi  phpRelation guifg=SeaGreen ctermfg=DarkGreen
 hi  phpIdentifier guifg=DarkGray ctermfg=Brown
 hi  phpIdentifierSimply guifg=DarkGray ctermfg=Brown
 else
-HiLink   phpIntVar Identifier
-HiLink   phpEnvVar Identifier
-HiLink   phpOperator Operator
-HiLink   phpVarSelector  Operator
-HiLink   phpRelation Operator
-HiLink   phpIdentifier Identifier
-HiLink   phpIdentifierSimply Identifier
+hi def link phpIntVar Identifier
+hi def link phpEnvVar Identifier
+hi def link phpOperator Operator
+hi def link phpVarSelector  Operator
+hi def link phpRelation Operator
+hi def link phpIdentifier Identifier
+hi def link phpIdentifierSimply Identifier
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "php"
 
diff --git a/runtime/syntax/pic.vim b/runtime/syntax/pic.vim
index b98984ed3d..bcb01f4dbd 100644
--- a/runtime/syntax/pic.vim
+++ b/runtime/syntax/pic.vim
@@ -89,27 +89,25 @@ syn match picDirective   "#\=DEFINE"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink picTodo		Todo
-HiLink picComment		Comment
-HiLink picDirective		Statement
-HiLink picLabel		Label
-HiLink picString		String
+hi def link picTodo		Todo
+hi def link picComment		Comment
+hi def link picDirective		Statement
+hi def link picLabel		Label
+hi def link picString		String
 
-"HiLink picOpcode		Keyword
-"HiLink picRegister		Structure
-"HiLink picRegisterPart	Special
+"hi def link picOpcode		Keyword
+"hi def link picRegister		Structure
+"hi def link picRegisterPart	Special
 
-HiLink picASCII		String
-HiLink picBinary		Number
-HiLink picDecimal		Number
-HiLink picHexadecimal		Number
-HiLink picOctal		Number
+hi def link picASCII		String
+hi def link picBinary		Number
+hi def link picDecimal		Number
+hi def link picHexadecimal		Number
+hi def link picOctal		Number
 
-HiLink picIdentifier		Identifier
+hi def link picIdentifier		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "pic"
 
diff --git a/runtime/syntax/pike.vim b/runtime/syntax/pike.vim
index dcf32113c5..ccd122c46c 100644
--- a/runtime/syntax/pike.vim
+++ b/runtime/syntax/pike.vim
@@ -102,42 +102,40 @@ syn sync ccomment pikeComment minlines=10
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pikeLabel		Label
-HiLink pikeUserLabel		Label
-HiLink pikeConditional	Conditional
-HiLink pikeRepeat		Repeat
-HiLink pikeCharacter		Character
-HiLink pikeSpecialCharacter pikeSpecial
-HiLink pikeNumber		Number
-HiLink pikeFloat		Float
-HiLink pikeOctalError		pikeError
-HiLink pikeParenError		pikeError
-HiLink pikeInParen		pikeError
-HiLink pikeCommentError	pikeError
-HiLink pikeOperator		Operator
-HiLink pikeInclude		Include
-HiLink pikePreProc		PreProc
-HiLink pikeDefine		Macro
-HiLink pikeIncluded		pikeString
-HiLink pikeError		Error
-HiLink pikeStatement		Statement
-HiLink pikePreCondit		PreCondit
-HiLink pikeType		Type
-HiLink pikeCommentError	pikeError
-HiLink pikeCommentString	pikeString
-HiLink pikeComment2String	pikeString
-HiLink pikeCommentSkip	pikeComment
-HiLink pikeString		String
-HiLink pikeComment		Comment
-HiLink pikeSpecial		SpecialChar
-HiLink pikeTodo		Todo
-HiLink pikeException		pikeStatement
-HiLink pikeCompoundType	Constant
-"HiLink pikeIdentifier	Identifier
+hi def link pikeLabel		Label
+hi def link pikeUserLabel		Label
+hi def link pikeConditional	Conditional
+hi def link pikeRepeat		Repeat
+hi def link pikeCharacter		Character
+hi def link pikeSpecialCharacter pikeSpecial
+hi def link pikeNumber		Number
+hi def link pikeFloat		Float
+hi def link pikeOctalError		pikeError
+hi def link pikeParenError		pikeError
+hi def link pikeInParen		pikeError
+hi def link pikeCommentError	pikeError
+hi def link pikeOperator		Operator
+hi def link pikeInclude		Include
+hi def link pikePreProc		PreProc
+hi def link pikeDefine		Macro
+hi def link pikeIncluded		pikeString
+hi def link pikeError		Error
+hi def link pikeStatement		Statement
+hi def link pikePreCondit		PreCondit
+hi def link pikeType		Type
+hi def link pikeCommentError	pikeError
+hi def link pikeCommentString	pikeString
+hi def link pikeComment2String	pikeString
+hi def link pikeCommentSkip	pikeComment
+hi def link pikeString		String
+hi def link pikeComment		Comment
+hi def link pikeSpecial		SpecialChar
+hi def link pikeTodo		Todo
+hi def link pikeException		pikeStatement
+hi def link pikeCompoundType	Constant
+"hi def link pikeIdentifier	Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "pike"
 
diff --git a/runtime/syntax/pilrc.vim b/runtime/syntax/pilrc.vim
index c1d3288b05..f0e5f9bbc7 100644
--- a/runtime/syntax/pilrc.vim
+++ b/runtime/syntax/pilrc.vim
@@ -117,22 +117,20 @@ syn region pilrcInclude start="public class" end="}"
 
 syn sync ccomment pilrcComment
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting
-HiLink pilrcKeyword		Statement
-HiLink pilrcType		Type
-HiLink pilrcError		Error
-HiLink pilrcCountry		SpecialChar
-HiLink pilrcLanguage		SpecialChar
-HiLink pilrcString		SpecialChar
-HiLink pilrcNumber		Number
-HiLink pilrcComment		Comment
-HiLink pilrcConstant		Constant
-HiLink pilrcFunction		Function
-HiLink pilrcInclude		SpecialChar
-HiLink pilrcIdentifier		Number
+hi def link pilrcKeyword		Statement
+hi def link pilrcType		Type
+hi def link pilrcError		Error
+hi def link pilrcCountry		SpecialChar
+hi def link pilrcLanguage		SpecialChar
+hi def link pilrcString		SpecialChar
+hi def link pilrcNumber		Number
+hi def link pilrcComment		Comment
+hi def link pilrcConstant		Constant
+hi def link pilrcFunction		Function
+hi def link pilrcInclude		SpecialChar
+hi def link pilrcIdentifier		Number
 
-delcommand HiLink
 
 let b:current_syntax = "pilrc"
diff --git a/runtime/syntax/pine.vim b/runtime/syntax/pine.vim
index e41dd87007..aadf50be15 100644
--- a/runtime/syntax/pine.vim
+++ b/runtime/syntax/pine.vim
@@ -345,12 +345,10 @@ syn match  pineComment  "^#.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pineConfig	Type
-HiLink pineComment	Comment
-HiLink pineOption	Macro
-delcommand HiLink
+hi def link pineConfig	Type
+hi def link pineComment	Comment
+hi def link pineOption	Macro
 
 let b:current_syntax = "pine"
 
diff --git a/runtime/syntax/pli.vim b/runtime/syntax/pli.vim
index 9c74f9b0f8..a274cc40bf 100644
--- a/runtime/syntax/pli.vim
+++ b/runtime/syntax/pli.vim
@@ -222,47 +222,45 @@ syn sync minlines=10 maxlines=100
 
 " Define the default highlighting.
 " Only when and item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink pl1Attribute       Macro
-HiLink pl1BlockError      Error
-HiLink pl1BooleanLiteral  Boolean
-HiLink pl1CharLiteral     Character
-HiLink pl1Comment         Comment
-HiLink pl1CommentL        Comment
-HiLink pl1Conditional     Conditional
-HiLink pl1Error           Error
-HiLink pl1ErrInBracket    Error
-HiLink pl1ErrInBlock      Error
-HiLink pl1ErrInParen      Error
-HiLink pl1Exception       Function
-HiLink pl1FloatLiteral    Float
-HiLink pl1Function        Function
-HiLink pl1Garbage         Error
-HiLink pl1HostIdentifier  Label
-HiLink pl1Identifier      Normal
-HiLink pl1IntLiteral      Number
-HiLink pl1Operator        Operator
-HiLink pl1Paren           Normal
-HiLink pl1ParenError      Error
-HiLink pl1SpaceError      Error
-HiLink pl1Pseudo          PreProc
-HiLink pl1PreProc         PreProc
-HiLink pl1PreProcSym      PreProc
-HiLink pl1Keyword         Keyword
-HiLink pl1Other           Keyword
-HiLink pl1Repeat          Repeat
-HiLink pl1Statement       Keyword
-HiLink pl1Storage         StorageClass
-HiLink pl1StringError     Error
-HiLink pl1StringLiteral   String
-HiLink pl1CommentString   String
-HiLink pl1Comment2String  String
-HiLink pl1Symbol          Normal
-HiLink pl1Trigger         Function
-HiLink pl1TypeAttribute   StorageClass
-HiLink pl1Todo            Todo
+hi def link pl1Attribute       Macro
+hi def link pl1BlockError      Error
+hi def link pl1BooleanLiteral  Boolean
+hi def link pl1CharLiteral     Character
+hi def link pl1Comment         Comment
+hi def link pl1CommentL        Comment
+hi def link pl1Conditional     Conditional
+hi def link pl1Error           Error
+hi def link pl1ErrInBracket    Error
+hi def link pl1ErrInBlock      Error
+hi def link pl1ErrInParen      Error
+hi def link pl1Exception       Function
+hi def link pl1FloatLiteral    Float
+hi def link pl1Function        Function
+hi def link pl1Garbage         Error
+hi def link pl1HostIdentifier  Label
+hi def link pl1Identifier      Normal
+hi def link pl1IntLiteral      Number
+hi def link pl1Operator        Operator
+hi def link pl1Paren           Normal
+hi def link pl1ParenError      Error
+hi def link pl1SpaceError      Error
+hi def link pl1Pseudo          PreProc
+hi def link pl1PreProc         PreProc
+hi def link pl1PreProcSym      PreProc
+hi def link pl1Keyword         Keyword
+hi def link pl1Other           Keyword
+hi def link pl1Repeat          Repeat
+hi def link pl1Statement       Keyword
+hi def link pl1Storage         StorageClass
+hi def link pl1StringError     Error
+hi def link pl1StringLiteral   String
+hi def link pl1CommentString   String
+hi def link pl1Comment2String  String
+hi def link pl1Symbol          Normal
+hi def link pl1Trigger         Function
+hi def link pl1TypeAttribute   StorageClass
+hi def link pl1Todo            Todo
 
-delcommand HiLink
 
 let b:current_syntax = "pl1"
diff --git a/runtime/syntax/plm.vim b/runtime/syntax/plm.vim
index de806b3335..c6618adacb 100644
--- a/runtime/syntax/plm.vim
+++ b/runtime/syntax/plm.vim
@@ -101,34 +101,32 @@ syn sync lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-"  HiLink plmLabel			Label
-"  HiLink plmConditional		Conditional
-"  HiLink plmRepeat			Repeat
-HiLink plmTodo			Todo
-HiLink plmNumber			Number
-HiLink plmOperator			Operator
-HiLink plmDelimiter			Operator
-"HiLink plmShowTab			Error
-"HiLink plmShowTabc			Error
-HiLink plmIdentifier			Identifier
-HiLink plmBuiltIn			Statement
-HiLink plm286BuiltIn			Statement
-HiLink plm386BuiltIn			Statement
-HiLink plm386w16BuiltIn		Statement
-HiLink plmReserved			Statement
-HiLink plm386Reserved			Statement
-HiLink plmPreProc			PreProc
-HiLink plmCommentError		plmError
-HiLink plmCommentString		plmString
-HiLink plmComment2String		plmString
-HiLink plmCommentSkip			plmComment
-HiLink plmString			String
-HiLink plmComment			Comment
+"  hi def link plmLabel			Label
+"  hi def link plmConditional		Conditional
+"  hi def link plmRepeat			Repeat
+hi def link plmTodo			Todo
+hi def link plmNumber			Number
+hi def link plmOperator			Operator
+hi def link plmDelimiter			Operator
+"hi def link plmShowTab			Error
+"hi def link plmShowTabc			Error
+hi def link plmIdentifier			Identifier
+hi def link plmBuiltIn			Statement
+hi def link plm286BuiltIn			Statement
+hi def link plm386BuiltIn			Statement
+hi def link plm386w16BuiltIn		Statement
+hi def link plmReserved			Statement
+hi def link plm386Reserved			Statement
+hi def link plmPreProc			PreProc
+hi def link plmCommentError		plmError
+hi def link plmCommentString		plmString
+hi def link plmComment2String		plmString
+hi def link plmCommentSkip			plmComment
+hi def link plmString			String
+hi def link plmComment			Comment
 
-delcommand HiLink
 
 let b:current_syntax = "plm"
 
diff --git a/runtime/syntax/plsql.vim b/runtime/syntax/plsql.vim
index 173c22f761..1868c9cb16 100644
--- a/runtime/syntax/plsql.vim
+++ b/runtime/syntax/plsql.vim
@@ -221,45 +221,43 @@ syn sync minlines=10 maxlines=100
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink plsqlAttribute		Macro
-HiLink plsqlBlockError	Error
-HiLink plsqlBooleanLiteral	Boolean
-HiLink plsqlCharLiteral	Character
-HiLink plsqlComment		Comment
-HiLink plsqlCommentL		Comment
-HiLink plsqlConditional	Conditional
-HiLink plsqlError		Error
-HiLink plsqlErrInBracket	Error
-HiLink plsqlErrInBlock	Error
-HiLink plsqlErrInParen	Error
-HiLink plsqlException		Function
-HiLink plsqlFloatLiteral	Float
-HiLink plsqlFunction		Function
-HiLink plsqlGarbage		Error
-HiLink plsqlHostIdentifier	Label
-HiLink plsqlIdentifier	Normal
-HiLink plsqlIntLiteral	Number
-HiLink plsqlOperator		Operator
-HiLink plsqlParen		Normal
-HiLink plsqlParenError	Error
-HiLink plsqlSpaceError	Error
-HiLink plsqlPseudo		PreProc
-HiLink plsqlKeyword		Keyword
-HiLink plsqlRepeat		Repeat
-HiLink plsqlStorage		StorageClass
-HiLink plsqlSQLKeyword	Function
-HiLink plsqlStringError	Error
-HiLink plsqlStringLiteral	String
-HiLink plsqlCommentString	String
-HiLink plsqlComment2String	String
-HiLink plsqlSymbol		Normal
-HiLink plsqlTrigger		Function
-HiLink plsqlTypeAttribute	StorageClass
-HiLink plsqlTodo		Todo
+hi def link plsqlAttribute		Macro
+hi def link plsqlBlockError	Error
+hi def link plsqlBooleanLiteral	Boolean
+hi def link plsqlCharLiteral	Character
+hi def link plsqlComment		Comment
+hi def link plsqlCommentL		Comment
+hi def link plsqlConditional	Conditional
+hi def link plsqlError		Error
+hi def link plsqlErrInBracket	Error
+hi def link plsqlErrInBlock	Error
+hi def link plsqlErrInParen	Error
+hi def link plsqlException		Function
+hi def link plsqlFloatLiteral	Float
+hi def link plsqlFunction		Function
+hi def link plsqlGarbage		Error
+hi def link plsqlHostIdentifier	Label
+hi def link plsqlIdentifier	Normal
+hi def link plsqlIntLiteral	Number
+hi def link plsqlOperator		Operator
+hi def link plsqlParen		Normal
+hi def link plsqlParenError	Error
+hi def link plsqlSpaceError	Error
+hi def link plsqlPseudo		PreProc
+hi def link plsqlKeyword		Keyword
+hi def link plsqlRepeat		Repeat
+hi def link plsqlStorage		StorageClass
+hi def link plsqlSQLKeyword	Function
+hi def link plsqlStringError	Error
+hi def link plsqlStringLiteral	String
+hi def link plsqlCommentString	String
+hi def link plsqlComment2String	String
+hi def link plsqlSymbol		Normal
+hi def link plsqlTrigger		Function
+hi def link plsqlTypeAttribute	StorageClass
+hi def link plsqlTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "plsql"
 
diff --git a/runtime/syntax/po.vim b/runtime/syntax/po.vim
index f98813c62a..15d09b18bd 100644
--- a/runtime/syntax/po.vim
+++ b/runtime/syntax/po.vim
@@ -80,52 +80,50 @@ syn match poVariable contained "%\d"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink poCommentSources    PreProc
-HiLink poComment	     Comment
-HiLink poCommentAutomatic  Comment
-HiLink poCommentTranslator Comment
-HiLink poCommentFlags      Special
-HiLink poCommentDiff       Comment
-HiLink poCopyrightUnset    Todo
-HiLink poFlagFuzzy         Todo
-HiLink poDiffOld           Todo
-HiLink poDiffNew          Special
-HiLink poObsolete         Comment
+hi def link poCommentSources    PreProc
+hi def link poComment	     Comment
+hi def link poCommentAutomatic  Comment
+hi def link poCommentTranslator Comment
+hi def link poCommentFlags      Special
+hi def link poCommentDiff       Comment
+hi def link poCopyrightUnset    Todo
+hi def link poFlagFuzzy         Todo
+hi def link poDiffOld           Todo
+hi def link poDiffNew          Special
+hi def link poObsolete         Comment
 
-HiLink poStatementMsgid   Statement
-HiLink poStatementMsgstr  Statement
-HiLink poStatementMsgidplural  Statement
-HiLink poStatementMsgCTxt Statement
-HiLink poPluralCaseN      Constant
+hi def link poStatementMsgid   Statement
+hi def link poStatementMsgstr  Statement
+hi def link poStatementMsgidplural  Statement
+hi def link poStatementMsgCTxt Statement
+hi def link poPluralCaseN      Constant
 
-HiLink poStringCTxt	    Comment
-HiLink poStringID	    String
-HiLink poStringSTR	    String
-HiLink poCommentKDE       Comment
-HiLink poCommentKDEError  Error
-HiLink poPluralKDE        Comment
-HiLink poPluralKDEError   Error
-HiLink poHeaderItem       Identifier
-HiLink poHeaderUndefined  Todo
-HiLink poKDEdesktopFile   Identifier
+hi def link poStringCTxt	    Comment
+hi def link poStringID	    String
+hi def link poStringSTR	    String
+hi def link poCommentKDE       Comment
+hi def link poCommentKDEError  Error
+hi def link poPluralKDE        Comment
+hi def link poPluralKDEError   Error
+hi def link poHeaderItem       Identifier
+hi def link poHeaderUndefined  Todo
+hi def link poKDEdesktopFile   Identifier
 
-HiLink poHtml              Identifier
-HiLink poHtmlNot           String
-HiLink poHtmlTranslatables String
-HiLink poLineBreak         String
+hi def link poHtml              Identifier
+hi def link poHtmlNot           String
+hi def link poHtmlTranslatables String
+hi def link poLineBreak         String
 
-HiLink poFormat	    poSpecial
-HiLink poSpecial	    Special
-HiLink poAcceleratorId    Special
-HiLink poAcceleratorStr   Special
-HiLink poVariable         Special
+hi def link poFormat	    poSpecial
+hi def link poSpecial	    Special
+hi def link poAcceleratorId    Special
+hi def link poAcceleratorStr   Special
+hi def link poVariable         Special
 
-HiLink poMsguniqError        Special
-HiLink poMsguniqErrorMarkers Comment
+hi def link poMsguniqError        Special
+hi def link poMsguniqErrorMarkers Comment
 
-delcommand HiLink
 
 let b:current_syntax = "po"
 
diff --git a/runtime/syntax/pod.vim b/runtime/syntax/pod.vim
index c545141275..7c65a8433f 100644
--- a/runtime/syntax/pod.vim
+++ b/runtime/syntax/pod.vim
@@ -65,19 +65,17 @@ syn match  podEscape2	"\d\+>"me=e-1 contained contains=@NoSpell
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink podCommand		Statement
-HiLink podCmdText		String
-HiLink podOverIndent		Number
-HiLink podForKeywd		Identifier
-HiLink podFormat		Identifier
-HiLink podVerbatimLine	PreProc
-HiLink podSpecial		Identifier
-HiLink podEscape		String
-HiLink podEscape2		Number
+hi def link podCommand		Statement
+hi def link podCmdText		String
+hi def link podOverIndent		Number
+hi def link podForKeywd		Identifier
+hi def link podFormat		Identifier
+hi def link podVerbatimLine	PreProc
+hi def link podSpecial		Identifier
+hi def link podEscape		String
+hi def link podEscape2		Number
 
-delcommand HiLink
 
 if exists("perl_pod_spellcheck_headings")
   " Spell-check headings
diff --git a/runtime/syntax/postscr.vim b/runtime/syntax/postscr.vim
index 33cc6ec128..d5dc9a22d6 100644
--- a/runtime/syntax/postscr.vim
+++ b/runtime/syntax/postscr.vim
@@ -724,58 +724,56 @@ endif " GhostScript highlighting
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink postscrComment         Comment
+hi def link postscrComment         Comment
 
-HiLink postscrConstant        Constant
-HiLink postscrString          String
-HiLink postscrASCIIString     postscrString
-HiLink postscrHexString       postscrString
-HiLink postscrASCII85String   postscrString
-HiLink postscrNumber          Number
-HiLink postscrInteger         postscrNumber
-HiLink postscrHex             postscrNumber
-HiLink postscrRadix           postscrNumber
-HiLink postscrFloat           Float
-HiLink postscrBoolean         Boolean
+hi def link postscrConstant        Constant
+hi def link postscrString          String
+hi def link postscrASCIIString     postscrString
+hi def link postscrHexString       postscrString
+hi def link postscrASCII85String   postscrString
+hi def link postscrNumber          Number
+hi def link postscrInteger         postscrNumber
+hi def link postscrHex             postscrNumber
+hi def link postscrRadix           postscrNumber
+hi def link postscrFloat           Float
+hi def link postscrBoolean         Boolean
 
-HiLink postscrIdentifier      Identifier
-HiLink postscrProcedure       Function
+hi def link postscrIdentifier      Identifier
+hi def link postscrProcedure       Function
 
-HiLink postscrName            Statement
-HiLink postscrConditional     Conditional
-HiLink postscrRepeat          Repeat
-HiLink postscrL2Repeat        postscrRepeat
-HiLink postscrOperator        Operator
-HiLink postscrL1Operator      postscrOperator
-HiLink postscrL2Operator      postscrOperator
-HiLink postscrL3Operator      postscrOperator
-HiLink postscrMathOperator    postscrOperator
-HiLink postscrLogicalOperator postscrOperator
-HiLink postscrBinaryOperator  postscrOperator
+hi def link postscrName            Statement
+hi def link postscrConditional     Conditional
+hi def link postscrRepeat          Repeat
+hi def link postscrL2Repeat        postscrRepeat
+hi def link postscrOperator        Operator
+hi def link postscrL1Operator      postscrOperator
+hi def link postscrL2Operator      postscrOperator
+hi def link postscrL3Operator      postscrOperator
+hi def link postscrMathOperator    postscrOperator
+hi def link postscrLogicalOperator postscrOperator
+hi def link postscrBinaryOperator  postscrOperator
 
-HiLink postscrDSCComment      SpecialComment
-HiLink postscrSpecialChar     SpecialChar
+hi def link postscrDSCComment      SpecialComment
+hi def link postscrSpecialChar     SpecialChar
 
-HiLink postscrTodo            Todo
+hi def link postscrTodo            Todo
 
-HiLink postscrError           Error
-HiLink postscrSpecialCharError postscrError
-HiLink postscrASCII85CharError postscrError
-HiLink postscrHexCharError    postscrError
-HiLink postscrASCIIStringError postscrError
-HiLink postscrIdentifierError postscrError
+hi def link postscrError           Error
+hi def link postscrSpecialCharError postscrError
+hi def link postscrASCII85CharError postscrError
+hi def link postscrHexCharError    postscrError
+hi def link postscrASCIIStringError postscrError
+hi def link postscrIdentifierError postscrError
 
 if exists("postscr_ghostscript")
-HiLink postscrGSOperator      postscrOperator
-HiLink postscrGSMathOperator  postscrMathOperator
+hi def link postscrGSOperator      postscrOperator
+hi def link postscrGSMathOperator  postscrMathOperator
 else
-HiLink postscrGSOperator      postscrError
-HiLink postscrGSMathOperator  postscrError
+hi def link postscrGSOperator      postscrError
+hi def link postscrGSMathOperator  postscrError
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "postscr"
 
diff --git a/runtime/syntax/ppd.vim b/runtime/syntax/ppd.vim
index 31d3841e33..da67e1f39f 100644
--- a/runtime/syntax/ppd.vim
+++ b/runtime/syntax/ppd.vim
@@ -19,18 +19,16 @@ syn match	ppdContraints	"^*UIConstraints:"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 
-HiLink ppdComment		Comment
-HiLink ppdDefine		Statement
-HiLink ppdUI			Function
-HiLink ppdUIGroup		Function
-HiLink ppdDef			String
-HiLink ppdGUIText		Type
-HiLink ppdContraints		Special
+hi def link ppdComment		Comment
+hi def link ppdDefine		Statement
+hi def link ppdUI			Function
+hi def link ppdUIGroup		Function
+hi def link ppdDef			String
+hi def link ppdGUIText		Type
+hi def link ppdContraints		Special
 
-delcommand HiLink
 
 let b:current_syntax = "ppd"
 
diff --git a/runtime/syntax/ppwiz.vim b/runtime/syntax/ppwiz.vim
index 599bf0b89f..514f8f36cc 100644
--- a/runtime/syntax/ppwiz.vim
+++ b/runtime/syntax/ppwiz.vim
@@ -61,24 +61,22 @@ syn cluster ppwizArgVal add=ppwizString,ppwizInteger
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ppwizSpecial  Special
-HiLink ppwizEqual    ppwizSpecial
-HiLink ppwizOperator ppwizSpecial
-HiLink ppwizComment  Comment
-HiLink ppwizDef      PreProc
-HiLink ppwizMacro    Statement
-HiLink ppwizArg      Identifier
-HiLink ppwizStdVar   Identifier
-HiLink ppwizRexxVar  Identifier
-HiLink ppwizString   Constant
-HiLink ppwizInteger  Constant
-HiLink ppwizCont     ppwizSpecial
-HiLink ppwizError    Error
-HiLink ppwizHTML     Type
+hi def link ppwizSpecial  Special
+hi def link ppwizEqual    ppwizSpecial
+hi def link ppwizOperator ppwizSpecial
+hi def link ppwizComment  Comment
+hi def link ppwizDef      PreProc
+hi def link ppwizMacro    Statement
+hi def link ppwizArg      Identifier
+hi def link ppwizStdVar   Identifier
+hi def link ppwizRexxVar  Identifier
+hi def link ppwizString   Constant
+hi def link ppwizInteger  Constant
+hi def link ppwizCont     ppwizSpecial
+hi def link ppwizError    Error
+hi def link ppwizHTML     Type
 
-delcommand HiLink
 
 let b:current_syntax = "ppwiz"
 
diff --git a/runtime/syntax/prescribe.vim b/runtime/syntax/prescribe.vim
index 05f9162e4c..cd5ddbeedd 100644
--- a/runtime/syntax/prescribe.vim
+++ b/runtime/syntax/prescribe.vim
@@ -42,16 +42,14 @@ syn region  prescribeComment	start=+CMNT+ end=+;+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink prescribeSpecial		PreProc
-HiLink prescribeStatement		Statement
-HiLink prescribeNumber		Number
-HiLink prescribeCSETArg		String
-HiLink prescribeFRPOArg		String
-HiLink prescribeComment		Comment
+hi def link prescribeSpecial		PreProc
+hi def link prescribeStatement		Statement
+hi def link prescribeNumber		Number
+hi def link prescribeCSETArg		String
+hi def link prescribeFRPOArg		String
+hi def link prescribeComment		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "prescribe"
 
diff --git a/runtime/syntax/procmail.vim b/runtime/syntax/procmail.vim
index 9202dbf29a..93f50fe9ef 100644
--- a/runtime/syntax/procmail.vim
+++ b/runtime/syntax/procmail.vim
@@ -31,25 +31,23 @@ syn region procmailRecipe start=+^\s*:.*$+ end=+^\s*\($\|}\)+me=e-1 contains=pro
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink procmailComment Comment
-HiLink procmailTodo    Todo
+hi def link procmailComment Comment
+hi def link procmailTodo    Todo
 
-HiLink procmailRecipe   Statement
-"HiLink procmailCondition   Statement
+hi def link procmailRecipe   Statement
+"hi def link procmailCondition   Statement
 
-HiLink procmailActionFolder	procmailAction
-HiLink procmailActionVariable procmailAction
-HiLink procmailActionForward	procmailAction
-HiLink procmailActionPipe	procmailAction
-HiLink procmailAction		Function
-HiLink procmailVar		Identifier
-HiLink procmailVarDecl	Identifier
+hi def link procmailActionFolder	procmailAction
+hi def link procmailActionVariable procmailAction
+hi def link procmailActionForward	procmailAction
+hi def link procmailActionPipe	procmailAction
+hi def link procmailAction		Function
+hi def link procmailVar		Identifier
+hi def link procmailVarDecl	Identifier
 
-HiLink procmailString String
+hi def link procmailString String
 
-delcommand HiLink
 
 let b:current_syntax = "procmail"
 
diff --git a/runtime/syntax/progress.vim b/runtime/syntax/progress.vim
index 9ff506960e..5e7cfef299 100644
--- a/runtime/syntax/progress.vim
+++ b/runtime/syntax/progress.vim
@@ -276,35 +276,33 @@ syn sync lines=800
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later.
-HiLink ProgressByte		Number
-HiLink ProgressCase		Repeat
-HiLink ProgressComment		Comment
-HiLink ProgressConditional	Conditional
-HiLink ProgressDebug		Debug
-HiLink ProgressDo		Repeat
-HiLink ProgressEndError		Error
-HiLink ProgressFor		Repeat
-HiLink ProgressFunction		Procedure
-HiLink ProgressIdentifier	Identifier
-HiLink ProgressInclude		Include
-HiLink ProgressMatrixDelimiter	Identifier
-HiLink ProgressNumber		Number
-HiLink ProgressOperator		Operator
-HiLink ProgressPreProc		PreProc
-HiLink ProgressProcedure	Procedure
-HiLink ProgressQuote		Delimiter
-HiLink ProgressRepeat		Repeat
-HiLink ProgressReserved		Statement
-HiLink ProgressSpaceError	Error
-HiLink ProgressString		String
-HiLink ProgressTodo		Todo
-HiLink ProgressType		Statement
-HiLink ProgressShowTab		Error
+hi def link ProgressByte		Number
+hi def link ProgressCase		Repeat
+hi def link ProgressComment		Comment
+hi def link ProgressConditional	Conditional
+hi def link ProgressDebug		Debug
+hi def link ProgressDo		Repeat
+hi def link ProgressEndError		Error
+hi def link ProgressFor		Repeat
+hi def link ProgressFunction		Procedure
+hi def link ProgressIdentifier	Identifier
+hi def link ProgressInclude		Include
+hi def link ProgressMatrixDelimiter	Identifier
+hi def link ProgressNumber		Number
+hi def link ProgressOperator		Operator
+hi def link ProgressPreProc		PreProc
+hi def link ProgressProcedure	Procedure
+hi def link ProgressQuote		Delimiter
+hi def link ProgressRepeat		Repeat
+hi def link ProgressReserved		Statement
+hi def link ProgressSpaceError	Error
+hi def link ProgressString		String
+hi def link ProgressTodo		Todo
+hi def link ProgressType		Statement
+hi def link ProgressShowTab		Error
 
-delcommand HiLink
 
 let b:current_syntax = "progress"
 
diff --git a/runtime/syntax/prolog.vim b/runtime/syntax/prolog.vim
index 2131308b80..f8fb966b66 100644
--- a/runtime/syntax/prolog.vim
+++ b/runtime/syntax/prolog.vim
@@ -77,36 +77,34 @@ syn sync maxlines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink prologComment          Comment
-HiLink prologCComment         Comment
-HiLink prologCharCode         Special
+hi def link prologComment          Comment
+hi def link prologCComment         Comment
+hi def link prologCharCode         Special
 
 if exists ("prolog_highlighting_clean")
 
-HiLink prologKeyword        Statement
-HiLink prologClauseHead     Statement
-HiLink prologClause Normal
+hi def link prologKeyword        Statement
+hi def link prologClauseHead     Statement
+hi def link prologClause Normal
 
 else
 
-HiLink prologKeyword        Keyword
-HiLink prologClauseHead     Constant
-HiLink prologClause Normal
-HiLink prologQuestion       PreProc
-HiLink prologSpecialCharacter Special
-HiLink prologNumber         Number
-HiLink prologAsIs           Normal
-HiLink prologCommentError   Error
-HiLink prologAtom           String
-HiLink prologString         String
-HiLink prologOperator       Operator
+hi def link prologKeyword        Keyword
+hi def link prologClauseHead     Constant
+hi def link prologClause Normal
+hi def link prologQuestion       PreProc
+hi def link prologSpecialCharacter Special
+hi def link prologNumber         Number
+hi def link prologAsIs           Normal
+hi def link prologCommentError   Error
+hi def link prologAtom           String
+hi def link prologString         String
+hi def link prologOperator       Operator
 
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "prolog"
 
diff --git a/runtime/syntax/psf.vim b/runtime/syntax/psf.vim
index e059ff9f4d..0971fe96bf 100644
--- a/runtime/syntax/psf.vim
+++ b/runtime/syntax/psf.vim
@@ -72,18 +72,16 @@ syn match  psfComment "#.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink psfObject       Statement
-HiLink psfAttrib       Type
-HiLink psfQuotString   String
-HiLink psfObjTag       Identifier
-HiLink psfAttAbbrev    PreProc
-HiLink psfObjTags      Identifier
+hi def link psfObject       Statement
+hi def link psfAttrib       Type
+hi def link psfQuotString   String
+hi def link psfObjTag       Identifier
+hi def link psfAttAbbrev    PreProc
+hi def link psfObjTags      Identifier
 
-HiLink psfComment      Comment
+hi def link psfComment      Comment
 
-delcommand HiLink
 
 " Long descriptions and copyrights confuse the syntax highlighting, so
 " force vim to backup at least 100 lines before the top visible line
diff --git a/runtime/syntax/ptcap.vim b/runtime/syntax/ptcap.vim
index 6d3c460d39..1ebeb5227b 100644
--- a/runtime/syntax/ptcap.vim
+++ b/runtime/syntax/ptcap.vim
@@ -70,27 +70,25 @@ syn region ptcapField	    start=":" skip="[^\\]\(\\\\\)*\\$" end="[^\\]\(\\\\\)*
 syn region ptcapString	    matchgroup=ptcapOperator start="=" skip="[^\\]\(\\\\\)*\\:" matchgroup=ptcapDelimiter end=":"me=e-1 matchgroup=NONE end="[^\\]\(\\\\\)*[^\\]$" end="^$" contains=ptcapEscapedChar,ptcapLineCont keepend contained
 syn region ptcapComment	    start="^\s*#" end="$" contains=ptcapLeadBlank
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ptcapComment		Comment
-HiLink ptcapDelimiter	Delimiter
+hi def link ptcapComment		Comment
+hi def link ptcapDelimiter	Delimiter
 " The highlighting of "ptcapEntry" should always be overridden by
 " its contents, so I use Todo highlighting to indicate that there
 " is work to be done with the syntax file if you can see it :-)
-HiLink ptcapEntry		Todo
-HiLink ptcapError		Error
-HiLink ptcapEscapedChar	SpecialChar
-HiLink ptcapField		Type
-HiLink ptcapLeadBlank	NONE
-HiLink ptcapLineCont	Special
-HiLink ptcapNames		Label
-HiLink ptcapNumber		NONE
-HiLink ptcapNumberError	Error
-HiLink ptcapOperator	Operator
-HiLink ptcapSpecialCap	Type
-HiLink ptcapString		NONE
+hi def link ptcapEntry		Todo
+hi def link ptcapError		Error
+hi def link ptcapEscapedChar	SpecialChar
+hi def link ptcapField		Type
+hi def link ptcapLeadBlank	NONE
+hi def link ptcapLineCont	Special
+hi def link ptcapNames		Label
+hi def link ptcapNumber		NONE
+hi def link ptcapNumberError	Error
+hi def link ptcapOperator	Operator
+hi def link ptcapSpecialCap	Type
+hi def link ptcapString		NONE
 
-delcommand HiLink
 
 let b:current_syntax = "ptcap"
 
diff --git a/runtime/syntax/purifylog.vim b/runtime/syntax/purifylog.vim
index b56ca6ae1d..2143d9fe28 100644
--- a/runtime/syntax/purifylog.vim
+++ b/runtime/syntax/purifylog.vim
@@ -55,53 +55,51 @@ syn match purifyLogZPW "^ZPW:.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink purifyLogFIU purifyLogInformational
-HiLink purifyLogMAF purifyLogInformational
-HiLink purifyLogMIU purifyLogInformational
-HiLink purifyLogSIG purifyLogInformational
-HiLink purifyLogWPF purifyLogInformational
-HiLink purifyLogWPM purifyLogInformational
-HiLink purifyLogWPN purifyLogInformational
-HiLink purifyLogWPR purifyLogInformational
-HiLink purifyLogWPW purifyLogInformational
-HiLink purifyLogWPX purifyLogInformational
+hi def link purifyLogFIU purifyLogInformational
+hi def link purifyLogMAF purifyLogInformational
+hi def link purifyLogMIU purifyLogInformational
+hi def link purifyLogSIG purifyLogInformational
+hi def link purifyLogWPF purifyLogInformational
+hi def link purifyLogWPM purifyLogInformational
+hi def link purifyLogWPN purifyLogInformational
+hi def link purifyLogWPR purifyLogInformational
+hi def link purifyLogWPW purifyLogInformational
+hi def link purifyLogWPX purifyLogInformational
 
-HiLink purifyLogABR purifyLogWarning
-HiLink purifyLogBSR purifyLogWarning
-HiLink purifyLogBSW purifyLogWarning
-HiLink purifyLogFMR purifyLogWarning
-HiLink purifyLogMLK purifyLogWarning
-HiLink purifyLogMSE purifyLogWarning
-HiLink purifyLogPAR purifyLogWarning
-HiLink purifyLogPLK purifyLogWarning
-HiLink purifyLogSBR purifyLogWarning
-HiLink purifyLogSOF purifyLogWarning
-HiLink purifyLogUMC purifyLogWarning
-HiLink purifyLogUMR purifyLogWarning
+hi def link purifyLogABR purifyLogWarning
+hi def link purifyLogBSR purifyLogWarning
+hi def link purifyLogBSW purifyLogWarning
+hi def link purifyLogFMR purifyLogWarning
+hi def link purifyLogMLK purifyLogWarning
+hi def link purifyLogMSE purifyLogWarning
+hi def link purifyLogPAR purifyLogWarning
+hi def link purifyLogPLK purifyLogWarning
+hi def link purifyLogSBR purifyLogWarning
+hi def link purifyLogSOF purifyLogWarning
+hi def link purifyLogUMC purifyLogWarning
+hi def link purifyLogUMR purifyLogWarning
 
-HiLink purifyLogABW purifyLogCorrupting
-HiLink purifyLogBRK purifyLogCorrupting
-HiLink purifyLogFMW purifyLogCorrupting
-HiLink purifyLogFNH purifyLogCorrupting
-HiLink purifyLogFUM purifyLogCorrupting
-HiLink purifyLogMRE purifyLogCorrupting
-HiLink purifyLogSBW purifyLogCorrupting
+hi def link purifyLogABW purifyLogCorrupting
+hi def link purifyLogBRK purifyLogCorrupting
+hi def link purifyLogFMW purifyLogCorrupting
+hi def link purifyLogFNH purifyLogCorrupting
+hi def link purifyLogFUM purifyLogCorrupting
+hi def link purifyLogMRE purifyLogCorrupting
+hi def link purifyLogSBW purifyLogCorrupting
 
-HiLink purifyLogCOR purifyLogFatal
-HiLink purifyLogNPR purifyLogFatal
-HiLink purifyLogNPW purifyLogFatal
-HiLink purifyLogZPR purifyLogFatal
-HiLink purifyLogZPW purifyLogFatal
+hi def link purifyLogCOR purifyLogFatal
+hi def link purifyLogNPR purifyLogFatal
+hi def link purifyLogNPW purifyLogFatal
+hi def link purifyLogZPR purifyLogFatal
+hi def link purifyLogZPW purifyLogFatal
 
-HiLink purifyLogHeader		Comment
-HiLink purifyLogInformational	PreProc
-HiLink purifyLogWarning		Type
-HiLink purifyLogCorrupting	Error
-HiLink purifyLogFatal		Error
+hi def link purifyLogHeader		Comment
+hi def link purifyLogInformational	PreProc
+hi def link purifyLogWarning		Type
+hi def link purifyLogCorrupting	Error
+hi def link purifyLogFatal		Error
 
-delcommand HiLink
 
 let b:current_syntax = "purifylog"
 
diff --git a/runtime/syntax/pyrex.vim b/runtime/syntax/pyrex.vim
index cd743df889..b860658975 100644
--- a/runtime/syntax/pyrex.vim
+++ b/runtime/syntax/pyrex.vim
@@ -37,17 +37,15 @@ syn match   pythonInclude     "from"
 syn match   pyrexForFrom        "\(for[^:]*\)\@<=from"
 
 " Default highlighting
-command -nargs=+ HiLink hi def link <args>
-HiLink pyrexStatement		Statement
-HiLink pyrexType		Type
-HiLink pyrexStructure		Structure
-HiLink pyrexInclude		PreCondit
-HiLink pyrexAccess		pyrexStatement
+hi def link pyrexStatement		Statement
+hi def link pyrexType		Type
+hi def link pyrexStructure		Structure
+hi def link pyrexInclude		PreCondit
+hi def link pyrexAccess		pyrexStatement
 if exists("python_highlight_builtins") || exists("pyrex_highlight_builtins")
-HiLink pyrexBuiltin	Function
+hi def link pyrexBuiltin	Function
 endif
-HiLink pyrexForFrom		Statement
+hi def link pyrexForFrom		Statement
 
-delcommand HiLink
 
 let b:current_syntax = "pyrex"
diff --git a/runtime/syntax/python.vim b/runtime/syntax/python.vim
index e44721b7fa..38bea3eefe 100644
--- a/runtime/syntax/python.vim
+++ b/runtime/syntax/python.vim
@@ -289,44 +289,42 @@ endif
 " Sync at the beginning of class, function, or method definition.
 syn sync match pythonSync grouphere NONE "^\s*\%(def\|class\)\s\+\h\w*\s*("
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlight links.  Can be overridden later.
-HiLink pythonStatement	Statement
-HiLink pythonConditional	Conditional
-HiLink pythonRepeat		Repeat
-HiLink pythonOperator		Operator
-HiLink pythonException	Exception
-HiLink pythonInclude		Include
-HiLink pythonAsync		Statement
-HiLink pythonDecorator	Define
-HiLink pythonDecoratorName	Function
-HiLink pythonFunction		Function
-HiLink pythonComment		Comment
-HiLink pythonTodo		Todo
-HiLink pythonString		String
-HiLink pythonRawString	String
-HiLink pythonQuotes		String
-HiLink pythonTripleQuotes	pythonQuotes
-HiLink pythonEscape		Special
+hi def link pythonStatement	Statement
+hi def link pythonConditional	Conditional
+hi def link pythonRepeat		Repeat
+hi def link pythonOperator		Operator
+hi def link pythonException	Exception
+hi def link pythonInclude		Include
+hi def link pythonAsync		Statement
+hi def link pythonDecorator	Define
+hi def link pythonDecoratorName	Function
+hi def link pythonFunction		Function
+hi def link pythonComment		Comment
+hi def link pythonTodo		Todo
+hi def link pythonString		String
+hi def link pythonRawString	String
+hi def link pythonQuotes		String
+hi def link pythonTripleQuotes	pythonQuotes
+hi def link pythonEscape		Special
 if !exists("python_no_number_highlight")
-  HiLink pythonNumber		Number
+  hi def link pythonNumber		Number
 endif
 if !exists("python_no_builtin_highlight")
-  HiLink pythonBuiltin	Function
+  hi def link pythonBuiltin	Function
 endif
 if !exists("python_no_exception_highlight")
-  HiLink pythonExceptions	Structure
+  hi def link pythonExceptions	Structure
 endif
 if exists("python_space_error_highlight")
-  HiLink pythonSpaceError	Error
+  hi def link pythonSpaceError	Error
 endif
 if !exists("python_no_doctest_highlight")
-  HiLink pythonDoctest	Special
-  HiLink pythonDoctestValue	Define
+  hi def link pythonDoctest	Special
+  hi def link pythonDoctestValue	Define
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "python"
 
diff --git a/runtime/syntax/radiance.vim b/runtime/syntax/radiance.vim
index 134792ac11..c49e339a28 100644
--- a/runtime/syntax/radiance.vim
+++ b/runtime/syntax/radiance.vim
@@ -124,20 +124,18 @@ syn match radianceComment "#.*$" contains=radianceTodo
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink radianceKeyword	Keyword
-HiLink radianceExtraType	Type
-HiLink radianceSurfType	Type
-HiLink radianceLightType	Type
-HiLink radianceMatType	Type
-HiLink radiancePatType	Type
-HiLink radianceTexType	Type
-HiLink radianceMixType	Type
-HiLink radianceComment	Comment
-HiLink radianceCommand	Function
-HiLink radianceID		String
-HiLink radianceTodo		Todo
-delcommand HiLink
+hi def link radianceKeyword	Keyword
+hi def link radianceExtraType	Type
+hi def link radianceSurfType	Type
+hi def link radianceLightType	Type
+hi def link radianceMatType	Type
+hi def link radiancePatType	Type
+hi def link radianceTexType	Type
+hi def link radianceMixType	Type
+hi def link radianceComment	Comment
+hi def link radianceCommand	Function
+hi def link radianceID		String
+hi def link radianceTodo		Todo
 
 let b:current_syntax = "radiance"
 
diff --git a/runtime/syntax/ratpoison.vim b/runtime/syntax/ratpoison.vim
index 30cf369803..af8676c43d 100644
--- a/runtime/syntax/ratpoison.vim
+++ b/runtime/syntax/ratpoison.vim
@@ -245,24 +245,22 @@ syn match   ratpoisonVoidCommand	"^\s*\zswindows\ze\s*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ratpoisonBooleanArg	Boolean
-HiLink ratpoisonCommandArg	Keyword
-HiLink ratpoisonComment	Comment
-HiLink ratpoisonDefCommand	Identifier
-HiLink ratpoisonGravityArg	Constant
-HiLink ratpoisonKeySeqArg	Special
-HiLink ratpoisonNumberArg	Number
-HiLink ratpoisonSetArg	Keyword
-HiLink ratpoisonStringCommand	Identifier
-HiLink ratpoisonTodo		Todo
-HiLink ratpoisonVoidCommand	Identifier
-HiLink ratpoisonWinFmtArg	Special
-HiLink ratpoisonWinNameArg	Constant
-HiLink ratpoisonWinListArg	Constant
+hi def link ratpoisonBooleanArg	Boolean
+hi def link ratpoisonCommandArg	Keyword
+hi def link ratpoisonComment	Comment
+hi def link ratpoisonDefCommand	Identifier
+hi def link ratpoisonGravityArg	Constant
+hi def link ratpoisonKeySeqArg	Special
+hi def link ratpoisonNumberArg	Number
+hi def link ratpoisonSetArg	Keyword
+hi def link ratpoisonStringCommand	Identifier
+hi def link ratpoisonTodo		Todo
+hi def link ratpoisonVoidCommand	Identifier
+hi def link ratpoisonWinFmtArg	Special
+hi def link ratpoisonWinNameArg	Constant
+hi def link ratpoisonWinListArg	Constant
 
-delcommand HiLink
 
 let b:current_syntax = "ratpoison"
 
diff --git a/runtime/syntax/rc.vim b/runtime/syntax/rc.vim
index 13900b339a..4c6856bc83 100644
--- a/runtime/syntax/rc.vim
+++ b/runtime/syntax/rc.vim
@@ -146,33 +146,32 @@ syn sync ccomment rcComment minlines=10
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink rcCharacter	Character
-HiLink rcSpecialCharacter rcSpecial
-HiLink rcNumber	Number
-HiLink rcFloat	Float
-HiLink rcOctalError	rcError
-HiLink rcParenError	rcError
-HiLink rcInParen	rcError
-HiLink rcCommentError	rcError
-HiLink rcInclude	Include
-HiLink rcPreProc	PreProc
-HiLink rcDefine	Macro
-HiLink rcIncluded	rcString
-HiLink rcError	Error
-HiLink rcPreCondit	PreCondit
-HiLink rcCommentString rcString
-HiLink rcComment2String rcString
-HiLink rcCommentSkip	rcComment
-HiLink rcString	String
-HiLink rcComment	Comment
-HiLink rcSpecial	SpecialChar
-HiLink rcTodo	Todo
+hi def link rcCharacter	Character
+hi def link rcSpecialCharacter rcSpecial
+hi def link rcNumber	Number
+hi def link rcFloat	Float
+hi def link rcOctalError	rcError
+hi def link rcParenError	rcError
+hi def link rcInParen	rcError
+hi def link rcCommentError	rcError
+hi def link rcInclude	Include
+hi def link rcPreProc	PreProc
+hi def link rcDefine	Macro
+hi def link rcIncluded	rcString
+hi def link rcError	Error
+hi def link rcPreCondit	PreCondit
+hi def link rcCommentString rcString
+hi def link rcComment2String rcString
+hi def link rcCommentSkip	rcComment
+hi def link rcString	String
+hi def link rcComment	Comment
+hi def link rcSpecial	SpecialChar
+hi def link rcTodo	Todo
 
-HiLink rcAttribute	rcCommonAttribute
-HiLink rcStdId	rcStatement
-HiLink rcStatement	Statement
+hi def link rcAttribute	rcCommonAttribute
+hi def link rcStdId	rcStatement
+hi def link rcStatement	Statement
 
 " Default color overrides
 hi def rcLanguage	term=reverse ctermbg=Red ctermfg=Yellow guibg=Red guifg=Yellow
@@ -183,9 +182,8 @@ hi def rcParam	ctermfg=DarkGreen guifg=DarkGreen
 hi def rcStatement	ctermfg=DarkGreen guifg=DarkGreen
 hi def rcCommonAttribute	ctermfg=Brown guifg=Brown
 
-"HiLink rcIdentifier	Identifier
+"hi def link rcIdentifier	Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "rc"
 
diff --git a/runtime/syntax/rcs.vim b/runtime/syntax/rcs.vim
index 5fa66c49b0..5a34802ada 100644
--- a/runtime/syntax/rcs.vim
+++ b/runtime/syntax/rcs.vim
@@ -50,16 +50,14 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink rcsKeyword     Keyword
-HiLink rcsNumber      Identifier
-HiLink rcsString      String
-HiLink rcsTextStr     String
-HiLink rcsSpecial     Special
-HiLink rcsDiffLines   Special
-HiLink rcsEOFError    Error
+hi def link rcsKeyword     Keyword
+hi def link rcsNumber      Identifier
+hi def link rcsString      String
+hi def link rcsTextStr     String
+hi def link rcsSpecial     Special
+hi def link rcsDiffLines   Special
+hi def link rcsEOFError    Error
 
-delcommand HiLink
 
 let b:current_syntax = "rcs"
diff --git a/runtime/syntax/rcslog.vim b/runtime/syntax/rcslog.vim
index 8451852993..18f4593c77 100644
--- a/runtime/syntax/rcslog.vim
+++ b/runtime/syntax/rcslog.vim
@@ -14,13 +14,11 @@ syn match rcslogDate		"^date: .*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink rcslogFile		Type
-HiLink rcslogRevision	Constant
-HiLink rcslogDate		Identifier
+hi def link rcslogFile		Type
+hi def link rcslogRevision	Constant
+hi def link rcslogDate		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "rcslog"
 
diff --git a/runtime/syntax/rebol.vim b/runtime/syntax/rebol.vim
index 9c367b01b7..a5d50c4ab1 100644
--- a/runtime/syntax/rebol.vim
+++ b/runtime/syntax/rebol.vim
@@ -139,56 +139,54 @@ syn keyword     rebolConstant   none
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink rebolTodo     Todo
+hi def link rebolTodo     Todo
 
-HiLink rebolStatement Statement
-HiLink rebolLabel	Label
-HiLink rebolConditional Conditional
-HiLink rebolRepeat	Repeat
+hi def link rebolStatement Statement
+hi def link rebolLabel	Label
+hi def link rebolConditional Conditional
+hi def link rebolRepeat	Repeat
 
-HiLink rebolOperator	Operator
-HiLink rebolLogicOperator rebolOperator
-HiLink rebolLogicFunction rebolLogicOperator
-HiLink rebolMathOperator rebolOperator
-HiLink rebolMathFunction rebolMathOperator
-HiLink rebolBinaryOperator rebolOperator
-HiLink rebolBinaryFunction rebolBinaryOperator
+hi def link rebolOperator	Operator
+hi def link rebolLogicOperator rebolOperator
+hi def link rebolLogicFunction rebolLogicOperator
+hi def link rebolMathOperator rebolOperator
+hi def link rebolMathFunction rebolMathOperator
+hi def link rebolBinaryOperator rebolOperator
+hi def link rebolBinaryFunction rebolBinaryOperator
 
-HiLink rebolType     Type
-HiLink rebolTypeFunction rebolOperator
+hi def link rebolType     Type
+hi def link rebolTypeFunction rebolOperator
 
-HiLink rebolWord     Identifier
-HiLink rebolWordPath rebolWord
-HiLink rebolFunction	Function
+hi def link rebolWord     Identifier
+hi def link rebolWordPath rebolWord
+hi def link rebolFunction	Function
 
-HiLink rebolCharacter Character
-HiLink rebolSpecialCharacter SpecialChar
-HiLink rebolString	String
+hi def link rebolCharacter Character
+hi def link rebolSpecialCharacter SpecialChar
+hi def link rebolString	String
 
-HiLink rebolNumber   Number
-HiLink rebolInteger  rebolNumber
-HiLink rebolDecimal  rebolNumber
-HiLink rebolTime     rebolNumber
-HiLink rebolDate     rebolNumber
-HiLink rebolMoney    rebolNumber
-HiLink rebolBinary   rebolNumber
-HiLink rebolEmail    rebolString
-HiLink rebolFile     rebolString
-HiLink rebolURL      rebolString
-HiLink rebolIssue    rebolNumber
-HiLink rebolTuple    rebolNumber
-HiLink rebolFloat    Float
-HiLink rebolBoolean  Boolean
+hi def link rebolNumber   Number
+hi def link rebolInteger  rebolNumber
+hi def link rebolDecimal  rebolNumber
+hi def link rebolTime     rebolNumber
+hi def link rebolDate     rebolNumber
+hi def link rebolMoney    rebolNumber
+hi def link rebolBinary   rebolNumber
+hi def link rebolEmail    rebolString
+hi def link rebolFile     rebolString
+hi def link rebolURL      rebolString
+hi def link rebolIssue    rebolNumber
+hi def link rebolTuple    rebolNumber
+hi def link rebolFloat    Float
+hi def link rebolBoolean  Boolean
 
-HiLink rebolConstant Constant
+hi def link rebolConstant Constant
 
-HiLink rebolComment	Comment
+hi def link rebolComment	Comment
 
-HiLink rebolError	Error
+hi def link rebolError	Error
 
-delcommand HiLink
 
 if exists("my_rebol_file")
   if file_readable(expand(my_rebol_file))
diff --git a/runtime/syntax/registry.vim b/runtime/syntax/registry.vim
index 652b609f09..67b5e49bcb 100644
--- a/runtime/syntax/registry.vim
+++ b/runtime/syntax/registry.vim
@@ -82,22 +82,20 @@ syn match registryHex		"^\s*\([0-9a-fA-F]\{2},\)\{0,999}\([0-9a-fA-F]\{2}\|\\\)$
 " Dword (32 bits)
 syn match registryDword		"dword:[0-9a-fA-F]\{8}$" contains=registrySpecial
 
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink registryComment	Comment
-HiLink registryHead		Constant
-HiLink registryHKEY		Constant
-HiLink registryPath		Special
-HiLink registryRemove	PreProc
-HiLink registryGUID		Identifier
-HiLink registrySpecial	Special
-HiLink registrySubKey	Type
-HiLink registryString	String
-HiLink registryHex		Number
-HiLink registryDword		Number
+hi def link registryComment	Comment
+hi def link registryHead		Constant
+hi def link registryHKEY		Constant
+hi def link registryPath		Special
+hi def link registryRemove	PreProc
+hi def link registryGUID		Identifier
+hi def link registrySpecial	Special
+hi def link registrySubKey	Type
+hi def link registryString	String
+hi def link registryHex		Number
+hi def link registryDword		Number
 
-delcommand HiLink
 
 
 let b:current_syntax = "registry"
diff --git a/runtime/syntax/remind.vim b/runtime/syntax/remind.vim
index 8e4e554343..9e7ff22e14 100644
--- a/runtime/syntax/remind.vim
+++ b/runtime/syntax/remind.vim
@@ -47,28 +47,26 @@ syn match remindDates		"'[0-9]\{4}[/-][0-9]\{1,2}[/-][0-9]\{1,2}\(@[0-9]\{1,2}[:
 syn match remindWarning		display excludenl "\S\s\+$"ms=s+1
 
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink remindCommands		Function
-HiLink remindExpiry		Repeat
-HiLink remindTag		Label
-HiLink remindTimed		Statement
-HiLink remindMove		Statement
-HiLink remindSpecial		Include
-HiLink remindRun		Function
-HiLink remindConditional	Conditional
-HiLink remindComment		Comment
-HiLink remindTimes		String
-HiLink remindString		String
-HiLink remindDebug		Debug
-HiLink remindVar		Identifier
-HiLink remindSubst		Constant
-HiLink remindAdvanceNumber	Number
-HiLink remindDateSeparators	Comment
-HiLink remindDates		String
-HiLink remindWarning		Error
+hi def link remindCommands		Function
+hi def link remindExpiry		Repeat
+hi def link remindTag		Label
+hi def link remindTimed		Statement
+hi def link remindMove		Statement
+hi def link remindSpecial		Include
+hi def link remindRun		Function
+hi def link remindConditional	Conditional
+hi def link remindComment		Comment
+hi def link remindTimes		String
+hi def link remindString		String
+hi def link remindDebug		Debug
+hi def link remindVar		Identifier
+hi def link remindSubst		Constant
+hi def link remindAdvanceNumber	Number
+hi def link remindDateSeparators	Comment
+hi def link remindDates		String
+hi def link remindWarning		Error
 
-delcommand HiLink
 
 let b:current_syntax = "remind"
 
diff --git a/runtime/syntax/resolv.vim b/runtime/syntax/resolv.vim
index 1744e66f82..a879116a5f 100644
--- a/runtime/syntax/resolv.vim
+++ b/runtime/syntax/resolv.vim
@@ -49,31 +49,29 @@ syn match resolvOption /\<\%(ndots\|timeout\|attempts\):\d\+\>/ contained contai
 " Additional errors
 syn match resolvError /^search .\{257,}/
 
-command! -nargs=+ HiLink hi def link <args>
 
-HiLink resolvIP Number
-HiLink resolvIPNetmask Number
-HiLink resolvHostname String
-HiLink resolvOption String
+hi def link resolvIP Number
+hi def link resolvIPNetmask Number
+hi def link resolvHostname String
+hi def link resolvOption String
 
-HiLink resolvIPNameserver Number
-HiLink resolvHostnameSearch String
-HiLink resolvIPNetmaskSortList Number
+hi def link resolvIPNameserver Number
+hi def link resolvHostnameSearch String
+hi def link resolvIPNetmaskSortList Number
 
-HiLink resolvNameServer Identifier
-HiLink resolvLwserver Identifier
-HiLink resolvDomain Identifier
-HiLink resolvSearch Identifier
-HiLink resolvSortList Identifier
-HiLink resolvOptions Identifier
+hi def link resolvNameServer Identifier
+hi def link resolvLwserver Identifier
+hi def link resolvDomain Identifier
+hi def link resolvSearch Identifier
+hi def link resolvSortList Identifier
+hi def link resolvOptions Identifier
 
-HiLink resolvComment Comment
-HiLink resolvOperator Operator
-HiLink resolvError Error
-HiLink resolvIPError Error
-HiLink resolvIPSpecial Special
+hi def link resolvComment Comment
+hi def link resolvOperator Operator
+hi def link resolvError Error
+hi def link resolvIPError Error
+hi def link resolvIPSpecial Special
 
-delcommand HiLink
 
 let b:current_syntax = "resolv"
 
diff --git a/runtime/syntax/rexx.vim b/runtime/syntax/rexx.vim
index b22af93c18..360fc8ff9f 100644
--- a/runtime/syntax/rexx.vim
+++ b/runtime/syntax/rexx.vim
@@ -242,78 +242,76 @@ exec "syn sync fromstart"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " make binary and hex strings stand out
 hi rexxStringConstant term=bold,underline ctermfg=5 cterm=bold guifg=darkMagenta gui=bold
 
-HiLink rexxLabel2		Function
-HiLink doLoopSelectLabelRegion	rexxKeyword
-HiLink endIterateLeaveLabelRegion	rexxKeyword
-HiLink rexxLoopKeywords	rexxKeyword " Todo
+hi def link rexxLabel2		Function
+hi def link doLoopSelectLabelRegion	rexxKeyword
+hi def link endIterateLeaveLabelRegion	rexxKeyword
+hi def link rexxLoopKeywords	rexxKeyword " Todo
 
-HiLink rexxNumber		Normal "DiffChange
-"  HiLink rexxIdentifier		DiffChange
+hi def link rexxNumber		Normal "DiffChange
+"  hi def link rexxIdentifier		DiffChange
 
-HiLink rexxRegularCallSignal	Statement
-HiLink rexxExceptionHandling	Statement
+hi def link rexxRegularCallSignal	Statement
+hi def link rexxExceptionHandling	Statement
 
-HiLink rexxLabel		Function
-HiLink rexxCharacter		Character
-HiLink rexxParenError		rexxError
-HiLink rexxInParen		rexxError
-HiLink rexxCommentError	rexxError
-HiLink rexxError		Error
-HiLink rexxKeyword		Statement
-HiLink rexxKeywordStatements	Statement
+hi def link rexxLabel		Function
+hi def link rexxCharacter		Character
+hi def link rexxParenError		rexxError
+hi def link rexxInParen		rexxError
+hi def link rexxCommentError	rexxError
+hi def link rexxError		Error
+hi def link rexxKeyword		Statement
+hi def link rexxKeywordStatements	Statement
 
-HiLink rexxFunction		Function
-HiLink rexxString		String
-HiLink rexxComment		Comment
-HiLink rexxTodo		Todo
-HiLink rexxSpecialVariable	Special
-HiLink rexxConditional	rexxKeyword
+hi def link rexxFunction		Function
+hi def link rexxString		String
+hi def link rexxComment		Comment
+hi def link rexxTodo		Todo
+hi def link rexxSpecialVariable	Special
+hi def link rexxConditional	rexxKeyword
 
-HiLink rexxOperator		Operator
-HiLink rexxMessageOperator	rexxOperator
-HiLink rexxLineComment	Comment
+hi def link rexxOperator		Operator
+hi def link rexxMessageOperator	rexxOperator
+hi def link rexxLineComment	Comment
 
-HiLink rexxLineContinue	WildMenu
+hi def link rexxLineContinue	WildMenu
 
-HiLink rexxDirective		rexxKeyword
-HiLink rexxClassDirective	Type
-HiLink rexxMethodDirective	rexxFunction
-HiLink rexxAttributeDirective	rexxFunction
-HiLink rexxRequiresDirective	Include
-HiLink rexxRoutineDirective	rexxFunction
+hi def link rexxDirective		rexxKeyword
+hi def link rexxClassDirective	Type
+hi def link rexxMethodDirective	rexxFunction
+hi def link rexxAttributeDirective	rexxFunction
+hi def link rexxRequiresDirective	Include
+hi def link rexxRoutineDirective	rexxFunction
 
 " rgf, 2012-09-09
-HiLink rexxOptionsDirective	rexxFunction
-HiLink rexxOptionsDirective2  rexxOptionsDirective
-HiLink rexxOptionsDirective3  Normal " rexxOptionsDirective
+hi def link rexxOptionsDirective	rexxFunction
+hi def link rexxOptionsDirective2  rexxOptionsDirective
+hi def link rexxOptionsDirective3  Normal " rexxOptionsDirective
 
-HiLink rexxConstantDirective	rexxFunction
+hi def link rexxConstantDirective	rexxFunction
 
-HiLink rexxConst		Constant
-HiLink rexxTypeSpecifier	Type
-HiLink rexxBuiltinClass	rexxTypeSpecifier
+hi def link rexxConst		Constant
+hi def link rexxTypeSpecifier	Type
+hi def link rexxBuiltinClass	rexxTypeSpecifier
 
-HiLink rexxEnvironmentSymbol  rexxConst
-HiLink rexxMessage		rexxFunction
+hi def link rexxEnvironmentSymbol  rexxConst
+hi def link rexxMessage		rexxFunction
 
-HiLink rexxParse              rexxKeyword
-HiLink rexxParse2             rexxParse
+hi def link rexxParse              rexxKeyword
+hi def link rexxParse2             rexxParse
 
-HiLink rexxGuard              rexxKeyword
-HiLink rexxTrace              rexxKeyword
+hi def link rexxGuard              rexxKeyword
+hi def link rexxTrace              rexxKeyword
 
-HiLink rexxRaise              rexxKeyword
-HiLink rexxRaise2             rexxRaise
+hi def link rexxRaise              rexxKeyword
+hi def link rexxRaise2             rexxRaise
 
-HiLink rexxForward            rexxKeyword
-HiLink rexxForward2           rexxForward
+hi def link rexxForward            rexxKeyword
+hi def link rexxForward2           rexxForward
 
-delcommand HiLink
 
 let b:current_syntax = "rexx"
 
diff --git a/runtime/syntax/rib.vim b/runtime/syntax/rib.vim
index 3d2235ffcb..0ee607122f 100644
--- a/runtime/syntax/rib.vim
+++ b/runtime/syntax/rib.vim
@@ -44,19 +44,17 @@ syn match	ribFloat	  display contained "[-]\=\.\d\+\(e[-+]\=\d\+\)\=\>"
 syn match	ribFloat	  display contained "[-]\=\d\+e[-+]\d\+\>"
 syn case match
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ribStructure		Structure
-HiLink ribCommand		Statement
+hi def link ribStructure		Structure
+hi def link ribCommand		Statement
 
-HiLink ribStructureComment	SpecialComment
-HiLink ribLineComment		Comment
+hi def link ribStructureComment	SpecialComment
+hi def link ribLineComment		Comment
 
-HiLink ribString		String
-HiLink ribNumber		Number
-HiLink ribFloat		Float
+hi def link ribString		String
+hi def link ribNumber		Number
+hi def link ribFloat		Float
 
-delcommand HiLink
 
 
 let b:current_syntax = "rib"
diff --git a/runtime/syntax/robots.vim b/runtime/syntax/robots.vim
index 23be8d2280..396bf52b25 100644
--- a/runtime/syntax/robots.vim
+++ b/runtime/syntax/robots.vim
@@ -38,19 +38,17 @@ syn match  robotsUrl		"http[s]\=://\S*"
 syn match  robotsMail		"\S*@\S*"
 syn region robotsString		start=+L\="+ skip=+\\\\\|\\"+ end=+"+
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink robotsComment		Comment
-HiLink robotsAgent		Type
-HiLink robotsDisallow		Statement
-HiLink robotsLine		Special
-HiLink robotsStar		Operator
-HiLink robotsDelimiter	Delimiter
-HiLink robotsUrl		String
-HiLink robotsMail		String
-HiLink robotsString		String
+hi def link robotsComment		Comment
+hi def link robotsAgent		Type
+hi def link robotsDisallow		Statement
+hi def link robotsLine		Special
+hi def link robotsStar		Operator
+hi def link robotsDelimiter	Delimiter
+hi def link robotsUrl		String
+hi def link robotsMail		String
+hi def link robotsString		String
 
-delcommand HiLink
 
 
 let b:current_syntax = "robots"
diff --git a/runtime/syntax/rpcgen.vim b/runtime/syntax/rpcgen.vim
index ee4cc3fdab..08183d43a4 100644
--- a/runtime/syntax/rpcgen.vim
+++ b/runtime/syntax/rpcgen.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	rpcgen
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Jan 13, 2015
-" Version:	10
+" Last Change:	Aug 31, 2016
+" Version:	12
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_RPCGEN
 
 if exists("b:current_syntax")
@@ -24,23 +24,22 @@ syn match   rpcProgNmbrErr contained	"=\s*0x[^23]\x*"ms=s+1
 syn match   rpcPassThru			"^\s*%.*$"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_rpcgen_syntax_inits")
 
-HiLink rpcProgName	rpcName
-HiLink rpcProgram	rpcStatement
-HiLink rpcVersName	rpcName
-HiLink rpcVersion	rpcStatement
+  hi def link rpcProgName	rpcName
+  hi def link rpcProgram	rpcStatement
+  hi def link rpcVersName	rpcName
+  hi def link rpcVersion	rpcStatement
 
-HiLink rpcDecl	cType
-HiLink rpcPassThru	cComment
+  hi def link rpcDecl	cType
+  hi def link rpcPassThru	cComment
 
-HiLink rpcName	Special
-HiLink rpcProcNmbr	Delimiter
-HiLink rpcProgNmbrErr	Error
-HiLink rpcStatement	Statement
+  hi def link rpcName	Special
+  hi def link rpcProcNmbr	Delimiter
+  hi def link rpcProgNmbrErr	Error
+  hi def link rpcStatement	Statement
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "rpcgen"
 
diff --git a/runtime/syntax/rpl.vim b/runtime/syntax/rpl.vim
index d2bffbaaae..f339f7ae6e 100644
--- a/runtime/syntax/rpl.vim
+++ b/runtime/syntax/rpl.vim
@@ -415,68 +415,66 @@ syntax match rplTab "\t"  transparent
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink highlight default link <args>
 
 " The default highlighting.
 
-HiLink rplControl		Statement
-HiLink rplStatement		Statement
-HiLink rplAlgConditional	Conditional
-HiLink rplConditional		Repeat
-HiLink rplConditionalError	Error
-HiLink rplRepeat		Repeat
-HiLink rplCycle		Repeat
-HiLink rplUntil		Repeat
-HiLink rplIntrinsic		Special
-HiLink rplStorage		StorageClass
-HiLink rplStorageExpr		StorageClass
-HiLink rplStorageError	Error
-HiLink rplReadWrite		rplIntrinsic
+hi def link rplControl		Statement
+hi def link rplStatement		Statement
+hi def link rplAlgConditional	Conditional
+hi def link rplConditional		Repeat
+hi def link rplConditionalError	Error
+hi def link rplRepeat		Repeat
+hi def link rplCycle		Repeat
+hi def link rplUntil		Repeat
+hi def link rplIntrinsic		Special
+hi def link rplStorage		StorageClass
+hi def link rplStorageExpr		StorageClass
+hi def link rplStorageError	Error
+hi def link rplReadWrite		rplIntrinsic
 
-HiLink rplOperator		Operator
+hi def link rplOperator		Operator
 
-HiLink rplList		Special
-HiLink rplArray		Special
-HiLink rplConstant		Identifier
-HiLink rplExpr		Type
+hi def link rplList		Special
+hi def link rplArray		Special
+hi def link rplConstant		Identifier
+hi def link rplExpr		Type
 
-HiLink rplString		String
-HiLink rplStringGuilles	String
-HiLink rplStringAntislash	String
+hi def link rplString		String
+hi def link rplStringGuilles	String
+hi def link rplStringAntislash	String
 
-HiLink rplBinary		Boolean
-HiLink rplOctal		Boolean
-HiLink rplDecimal		Boolean
-HiLink rplHexadecimal		Boolean
-HiLink rplInteger		Number
-HiLink rplFloat		Float
-HiLink rplComplex		Float
-HiLink rplBoolean		Identifier
+hi def link rplBinary		Boolean
+hi def link rplOctal		Boolean
+hi def link rplDecimal		Boolean
+hi def link rplHexadecimal		Boolean
+hi def link rplInteger		Number
+hi def link rplFloat		Float
+hi def link rplComplex		Float
+hi def link rplBoolean		Identifier
 
-HiLink rplObsolete		Todo
+hi def link rplObsolete		Todo
 
-HiLink rplPreCondit		PreCondit
-HiLink rplInclude		Include
-HiLink rplIncluded		rplString
-HiLink rplInclude		Include
-HiLink rplExecPath		Include
-HiLink rplPreProc		PreProc
-HiLink rplComment		Comment
-HiLink rplCommentLine		Comment
-HiLink rplCommentString	Comment
-HiLink rplSubDelimitor	rplStorage
-HiLink rplCommentError	Error
-HiLink rplParenError		Error
-HiLink rplSubError		Error
-HiLink rplArrayError		Error
-HiLink rplListError		Error
-HiLink rplTab			Error
-HiLink rplBinaryError		Error
-HiLink rplOctalError		Error
-HiLink rplDecimalError	Error
-HiLink rplHexadecimalError	Error
+hi def link rplPreCondit		PreCondit
+hi def link rplInclude		Include
+hi def link rplIncluded		rplString
+hi def link rplInclude		Include
+hi def link rplExecPath		Include
+hi def link rplPreProc		PreProc
+hi def link rplComment		Comment
+hi def link rplCommentLine		Comment
+hi def link rplCommentString	Comment
+hi def link rplSubDelimitor	rplStorage
+hi def link rplCommentError	Error
+hi def link rplParenError		Error
+hi def link rplSubError		Error
+hi def link rplArrayError		Error
+hi def link rplListError		Error
+hi def link rplTab			Error
+hi def link rplBinaryError		Error
+hi def link rplOctalError		Error
+hi def link rplDecimalError	Error
+hi def link rplHexadecimalError	Error
 
-delcommand HiLink
 
 let b:current_syntax = "rpl"
 
diff --git a/runtime/syntax/rtf.vim b/runtime/syntax/rtf.vim
index 0c63e8d523..c856f9ffcf 100644
--- a/runtime/syntax/rtf.vim
+++ b/runtime/syntax/rtf.vim
@@ -50,26 +50,24 @@ syn match rtfFootNote "[#$K+]{\\footnote.*}" contains=rtfControlWord,rtfNewContr
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 
-HiLink rtfControlWord		Statement
-HiLink rtfNewControlWord	Special
-HiLink rtfControlSymbol	Constant
-HiLink rtfCharacter		Character
-HiLink rtfUnicodeCharacter	SpecialChar
-HiLink rtfFootNote		Comment
+hi def link rtfControlWord		Statement
+hi def link rtfNewControlWord	Special
+hi def link rtfControlSymbol	Constant
+hi def link rtfCharacter		Character
+hi def link rtfUnicodeCharacter	SpecialChar
+hi def link rtfFootNote		Comment
 
 " Define colors for the syntax file
 hi rtfRed	      term=underline cterm=underline ctermfg=DarkRed gui=underline guifg=DarkRed
 hi rtfGreen	      term=underline cterm=underline ctermfg=DarkGreen gui=underline guifg=DarkGreen
 hi rtfBlue	      term=underline cterm=underline ctermfg=DarkBlue gui=underline guifg=DarkBlue
 
-HiLink rtfRed	rtfRed
-HiLink rtfGreen	rtfGreen
-HiLink rtfBlue	rtfBlue
+hi def link rtfRed	rtfRed
+hi def link rtfGreen	rtfGreen
+hi def link rtfBlue	rtfBlue
 
-delcommand HiLink
 
 
 let b:current_syntax = "rtf"
diff --git a/runtime/syntax/samba.vim b/runtime/syntax/samba.vim
index ddd35a8e3d..5b866cc6d9 100644
--- a/runtime/syntax/samba.vim
+++ b/runtime/syntax/samba.vim
@@ -105,15 +105,13 @@ syn keyword sambaKeyword contained store unknown unwriteable
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink sambaParameter Normal
-HiLink sambaKeyword   Type
-HiLink sambaSection   Statement
-HiLink sambaMacro     PreProc
-HiLink sambaComment   Comment
-HiLink sambaContinue  Operator
-HiLink sambaBoolean   Constant
-delcommand HiLink
+hi def link sambaParameter Normal
+hi def link sambaKeyword   Type
+hi def link sambaSection   Statement
+hi def link sambaMacro     PreProc
+hi def link sambaComment   Comment
+hi def link sambaContinue  Operator
+hi def link sambaBoolean   Constant
 
 let b:current_syntax = "samba"
 
diff --git a/runtime/syntax/sas.vim b/runtime/syntax/sas.vim
index a99501103d..90d411dc8b 100644
--- a/runtime/syntax/sas.vim
+++ b/runtime/syntax/sas.vim
@@ -41,7 +41,7 @@ syn region sasComment start=";\s*\*"hs=s+1 end=";" contains=sasTodo
 " Comments with * starting after a semicolon (Paulo Tanimoto)
 syn region sasComment start="^\s*\*" end=";" contains=sasTodo
 
-" This line defines macro variables in code.  HiLink at end of file
+" This line defines macro variables in code.  "hi def link" at end of file
 " defines the color scheme. Begin region with ampersand and end with
 " any non-word character offset by -1; put ampersand in the skip list
 " just in case it is used to concatenate macro variable values.
@@ -213,7 +213,6 @@ syn keyword sasUnderscore	_ALL_ _AUTOMATIC_ _CHARACTER_ _INFILE_ _N_ _NAME_ _NUL
 "  Define the default highlighting.
 "  Only when an item doesn't have highlighting yet
 
-command -nargs=+ HiLink hi def link <args>
 
 " Default sas enhanced editor color syntax
 hi sComment	term=bold cterm=NONE ctermfg=Green ctermbg=Black gui=NONE guifg=DarkGreen guibg=White
@@ -240,25 +239,24 @@ hi lNote	term=NONE cterm=NONE ctermfg=Cyan ctermbg=Black gui=none guifg=Blue gui
 
 " Special hilighting for the SAS proc section
 
-HiLink	sasComment	sComment
-HiLink	sasConditional	sKeyword
-HiLink	sasStep		sSection
-HiLink	sasFunction	sKeyword
-HiLink	sasMacro	mKeyword
-HiLink	sasMacroVar	NonText
-HiLink	sasNumber	sNumber
-HiLink	sasStatement	sKeyword
-HiLink	sasString	sString
-HiLink	sasProc		sProc
+hi def link sasComment	sComment
+hi def link sasConditional	sKeyword
+hi def link sasStep		sSection
+hi def link sasFunction	sKeyword
+hi def link sasMacro	mKeyword
+hi def link sasMacroVar	NonText
+hi def link sasNumber	sNumber
+hi def link sasStatement	sKeyword
+hi def link sasString	sString
+hi def link sasProc		sProc
 " (Bob Heckel)
-HiLink	sasTodo		Todo
-HiLink	sasErrMsg	lError
-HiLink	sasWarnMsg	lWarning
-HiLink	sasLogMsg	lNote
-HiLink	sasCards	sCard
+hi def link sasTodo		Todo
+hi def link sasErrMsg	lError
+hi def link sasWarnMsg	lWarning
+hi def link sasLogMsg	lNote
+hi def link sasCards	sCard
 " (Bob Heckel)
-HiLink	sasUnderscore	PreProc
-delcommand HiLink
+hi def link sasUnderscore	PreProc
 
 " Syncronize from beginning to keep large blocks from losing
 " syntax coloring while moving through code.
diff --git a/runtime/syntax/sather.vim b/runtime/syntax/sather.vim
index bc35ba2dcf..baa3a825d8 100644
--- a/runtime/syntax/sather.vim
+++ b/runtime/syntax/sather.vim
@@ -59,35 +59,33 @@ syn sync ccomment satherComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink satherBranch		satherStatement
-HiLink satherLabel		satherStatement
-HiLink satherConditional	satherStatement
-HiLink satherSynchronize	satherStatement
-HiLink satherRepeat		satherStatement
-HiLink satherExceptions	satherStatement
-HiLink satherStorageClass	satherDeclarative
-HiLink satherMethodDecl	satherDeclarative
-HiLink satherClassDecl	satherDeclarative
-HiLink satherScopeDecl	satherDeclarative
-HiLink satherBoolValue	satherValue
-HiLink satherSpecial		satherValue
-HiLink satherString		satherValue
-HiLink satherCharacter	satherValue
-HiLink satherSpecialCharacter satherValue
-HiLink satherNumber		satherValue
-HiLink satherStatement	Statement
-HiLink satherOperator		Statement
-HiLink satherComment		Comment
-HiLink satherType		Type
-HiLink satherValue		String
-HiLink satherString		String
-HiLink satherSpecial		String
-HiLink satherCharacter	String
-HiLink satherDeclarative	Type
-HiLink satherExternal		PreCondit
-delcommand HiLink
+hi def link satherBranch		satherStatement
+hi def link satherLabel		satherStatement
+hi def link satherConditional	satherStatement
+hi def link satherSynchronize	satherStatement
+hi def link satherRepeat		satherStatement
+hi def link satherExceptions	satherStatement
+hi def link satherStorageClass	satherDeclarative
+hi def link satherMethodDecl	satherDeclarative
+hi def link satherClassDecl	satherDeclarative
+hi def link satherScopeDecl	satherDeclarative
+hi def link satherBoolValue	satherValue
+hi def link satherSpecial		satherValue
+hi def link satherString		satherValue
+hi def link satherCharacter	satherValue
+hi def link satherSpecialCharacter satherValue
+hi def link satherNumber		satherValue
+hi def link satherStatement	Statement
+hi def link satherOperator		Statement
+hi def link satherComment		Comment
+hi def link satherType		Type
+hi def link satherValue		String
+hi def link satherString		String
+hi def link satherSpecial		String
+hi def link satherCharacter	String
+hi def link satherDeclarative	Type
+hi def link satherExternal		PreCondit
 
 let b:current_syntax = "sather"
 
diff --git a/runtime/syntax/scheme.vim b/runtime/syntax/scheme.vim
index ac50ead6ce..af9a659e07 100644
--- a/runtime/syntax/scheme.vim
+++ b/runtime/syntax/scheme.vim
@@ -300,29 +300,27 @@ syn sync match matchPlace grouphere NONE "^[^ \t]"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink schemeSyntax		Statement
-HiLink schemeFunc		Function
+hi def link schemeSyntax		Statement
+hi def link schemeFunc		Function
 
-HiLink schemeString		String
-HiLink schemeCharacter	Character
-HiLink schemeNumber		Number
-HiLink schemeBoolean		Boolean
+hi def link schemeString		String
+hi def link schemeCharacter	Character
+hi def link schemeNumber		Number
+hi def link schemeBoolean		Boolean
 
-HiLink schemeDelimiter	Delimiter
-HiLink schemeConstant		Constant
+hi def link schemeDelimiter	Delimiter
+hi def link schemeConstant		Constant
 
-HiLink schemeComment		Comment
-HiLink schemeMultilineComment	Comment
-HiLink schemeError		Error
+hi def link schemeComment		Comment
+hi def link schemeMultilineComment	Comment
+hi def link schemeError		Error
 
-HiLink schemeExtSyntax	Type
-HiLink schemeExtFunc		PreProc
+hi def link schemeExtSyntax	Type
+hi def link schemeExtFunc		PreProc
 
-HiLink schemeLang		PreProc
+hi def link schemeLang		PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "scheme"
 
diff --git a/runtime/syntax/scilab.vim b/runtime/syntax/scilab.vim
index bee4007f57..03e123b058 100644
--- a/runtime/syntax/scilab.vim
+++ b/runtime/syntax/scilab.vim
@@ -64,40 +64,38 @@ syn match scilabOverload			"%[A-Za-z0-9?!_#$]\+_[A-Za-z0-9?!_#$]\+"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink	scilabStatement				Statement
-HiLink	scilabFunction				Keyword
-HiLink	scilabPredicate				Keyword
-HiLink	scilabKeyword				Keyword
-HiLink	scilabDebug					Debug
-HiLink	scilabRepeat				Repeat
-HiLink	scilabConditional			Conditional
-HiLink	scilabMultiplex				Conditional
+hi def link scilabStatement				Statement
+hi def link scilabFunction				Keyword
+hi def link scilabPredicate				Keyword
+hi def link scilabKeyword				Keyword
+hi def link scilabDebug					Debug
+hi def link scilabRepeat				Repeat
+hi def link scilabConditional			Conditional
+hi def link scilabMultiplex				Conditional
 
-HiLink	scilabConstant				Constant
-HiLink	scilabBoolean				Boolean
+hi def link scilabConstant				Constant
+hi def link scilabBoolean				Boolean
 
-HiLink	scilabDelimiter				Delimiter
-HiLink	scilabMlistAccess			Delimiter
-HiLink	scilabComparison			Operator
-HiLink	scilabLogical				Operator
-HiLink	scilabAssignment			Operator
-HiLink	scilabArithmetic			Operator
-HiLink	scilabRange					Operator
-HiLink	scilabLineContinuation		Underlined
-HiLink	scilabTransposition			Operator
+hi def link scilabDelimiter				Delimiter
+hi def link scilabMlistAccess			Delimiter
+hi def link scilabComparison			Operator
+hi def link scilabLogical				Operator
+hi def link scilabAssignment			Operator
+hi def link scilabArithmetic			Operator
+hi def link scilabRange					Operator
+hi def link scilabLineContinuation		Underlined
+hi def link scilabTransposition			Operator
 
-HiLink	scilabTodo					Todo
-HiLink	scilabComment				Comment
+hi def link scilabTodo					Todo
+hi def link scilabComment				Comment
 
-HiLink	scilabNumber				Number
-HiLink	scilabString				String
+hi def link scilabNumber				Number
+hi def link scilabString				String
 
-HiLink	scilabIdentifier			Identifier
-HiLink	scilabOverload				Special
+hi def link scilabIdentifier			Identifier
+hi def link scilabOverload				Special
 
-delcommand HiLink
 
 let b:current_syntax = "scilab"
 
diff --git a/runtime/syntax/sd.vim b/runtime/syntax/sd.vim
index 015c1f0890..b497ba5eaa 100644
--- a/runtime/syntax/sd.vim
+++ b/runtime/syntax/sd.vim
@@ -50,22 +50,20 @@ syn keyword sdSpecial TRUE FALSE NULL
 syn keyword sdDelimiter STREAM STREAM_END
 syn match sdError /^search .\{257,}/
 
-command! -nargs=+ HiLink hi def link <args>
 
-HiLink sdIP Number
-HiLink sdHostname Type
-HiLink sdEncoding Identifier
-HiLink sdCoding Identifier
-HiLink sdSource Identifier
-HiLink sdComment Comment
-HiLink sdIPError Error
-HiLink sdError Error
-HiLink sdStatement Statement
-HiLink sdIPSpecial Special
-HiLink sdSpecial Special
-HiLink sdDelimiter Delimiter
+hi def link sdIP Number
+hi def link sdHostname Type
+hi def link sdEncoding Identifier
+hi def link sdCoding Identifier
+hi def link sdSource Identifier
+hi def link sdComment Comment
+hi def link sdIPError Error
+hi def link sdError Error
+hi def link sdStatement Statement
+hi def link sdIPSpecial Special
+hi def link sdSpecial Special
+hi def link sdDelimiter Delimiter
 
-delcommand HiLink
 
 let b:current_syntax = "sd"
 
diff --git a/runtime/syntax/sdl.vim b/runtime/syntax/sdl.vim
index 51086dad1f..7df38d1955 100644
--- a/runtime/syntax/sdl.vim
+++ b/runtime/syntax/sdl.vim
@@ -127,27 +127,25 @@ syn sync ccomment sdlComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 command -nargs=+ Hi     hi def <args>
 
-HiLink  sdlException	Label
-HiLink  sdlConditional	sdlStatement
-HiLink  sdlVirtual		sdlStatement
-HiLink  sdlExported		sdlFlag
-HiLink  sdlCommentError	sdlError
-HiLink  sdlOperator		Operator
-HiLink  sdlStructure	sdlType
+hi def link sdlException	Label
+hi def link sdlConditional	sdlStatement
+hi def link sdlVirtual		sdlStatement
+hi def link sdlExported		sdlFlag
+hi def link sdlCommentError	sdlError
+hi def link sdlOperator		Operator
+hi def link sdlStructure	sdlType
 Hi	    sdlStatement	term=bold ctermfg=4 guifg=Blue
 Hi	    sdlFlag		term=bold ctermfg=4 guifg=Blue gui=italic
 Hi	    sdlNewState		term=italic ctermfg=2 guifg=Magenta gui=underline
 Hi	    sdlInput		term=bold guifg=Red
-HiLink  sdlType		Type
-HiLink  sdlString		String
-HiLink  sdlComment		Comment
-HiLink  sdlSpecial		Special
-HiLink  sdlError		Error
+hi def link sdlType		Type
+hi def link sdlString		String
+hi def link sdlComment		Comment
+hi def link sdlSpecial		Special
+hi def link sdlError		Error
 
-delcommand HiLink
 delcommand Hi
 
 let b:current_syntax = "sdl"
diff --git a/runtime/syntax/sgmldecl.vim b/runtime/syntax/sgmldecl.vim
index 1bf1b49e34..6c1cde15ae 100644
--- a/runtime/syntax/sgmldecl.vim
+++ b/runtime/syntax/sgmldecl.vim
@@ -50,21 +50,19 @@ syn sync lines=250
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink	sgmldeclDeclKeys	Keyword
-HiLink	sgmldeclTypes		Type
-HiLink	sgmldeclConst		Constant
-HiLink	sgmldeclNConst		Constant
-HiLink	sgmldeclString		String
-HiLink	sgmldeclDeclBlock	Normal
-HiLink	sgmldeclBool		Boolean
-HiLink	sgmldeclSpecial		Special
-HiLink	sgmldeclComment		Comment
-HiLink	sgmldeclStatem		Statement
-HiLink	sgmldeclVariables	Type
+hi def link sgmldeclDeclKeys	Keyword
+hi def link sgmldeclTypes		Type
+hi def link sgmldeclConst		Constant
+hi def link sgmldeclNConst		Constant
+hi def link sgmldeclString		String
+hi def link sgmldeclDeclBlock	Normal
+hi def link sgmldeclBool		Boolean
+hi def link sgmldeclSpecial		Special
+hi def link sgmldeclComment		Comment
+hi def link sgmldeclStatem		Statement
+hi def link sgmldeclVariables	Type
 
-delcommand HiLink
 
 let b:current_syntax = "sgmldecl"
 
diff --git a/runtime/syntax/sgmllnx.vim b/runtime/syntax/sgmllnx.vim
index 7fd633d404..ccd78f494a 100644
--- a/runtime/syntax/sgmllnx.vim
+++ b/runtime/syntax/sgmllnx.vim
@@ -34,22 +34,20 @@ syn region sgmllnxDocType start=+<!doctype+ end=+>+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sgmllnxTag2	    Function
-HiLink sgmllnxTagN2	    Function
-HiLink sgmllnxTag	    Special
-HiLink sgmllnxEndTag	    Special
-HiLink sgmllnxParen	    Special
-HiLink sgmllnxEntity	    Type
-HiLink sgmllnxDocEnt	    Type
-HiLink sgmllnxTagName	    Statement
-HiLink sgmllnxComment	    Comment
-HiLink sgmllnxSpecial	    Special
-HiLink sgmllnxDocType	    PreProc
-HiLink sgmllnxTagError    Error
+hi def link sgmllnxTag2	    Function
+hi def link sgmllnxTagN2	    Function
+hi def link sgmllnxTag	    Special
+hi def link sgmllnxEndTag	    Special
+hi def link sgmllnxParen	    Special
+hi def link sgmllnxEntity	    Type
+hi def link sgmllnxDocEnt	    Type
+hi def link sgmllnxTagName	    Statement
+hi def link sgmllnxComment	    Comment
+hi def link sgmllnxSpecial	    Special
+hi def link sgmllnxDocType	    PreProc
+hi def link sgmllnxTagError    Error
 
-delcommand HiLink
 
 let b:current_syntax = "sgmllnx"
 
diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index 31c7b0534c..18da779764 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -2,13 +2,13 @@
 " Language:		shell (sh) Korn shell (ksh) bash (sh)
 " Maintainer:		Charles E. Campbell  <NdrOchipS@PcampbellAfamily.Mbiz>
 " Previous Maintainer:	Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change:		Aug 26, 2016
+" Last Change:		Aug 31, 2016
 " Version:		162
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
 " For options and settings, please use:      :help ft-sh-syntax
 " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr)
 
-" quit when a syntax file was already loaded
+" quit when a syntax file was already loaded {{{1
 if exists("b:current_syntax")
   finish
 endif
@@ -145,7 +145,7 @@ syn cluster shHereBeginList	contains=@shCommandSubList
 syn cluster shHereList	contains=shBeginHere,shHerePayload
 syn cluster shHereListDQ	contains=shBeginHere,@shDblQuoteList,shHerePayload
 syn cluster shIdList	contains=shCommandSub,shWrapLineOperator,shSetOption,shDeref,shDerefSimple,shHereString,shRedir,shExSingleQuote,shExDoubleQuote,shSingleQuote,shDoubleQuote,shExpr,shCtrlSeq,shStringSpecial,shAtExpr
-syn cluster shIfList	contains=@shLoopList,shDblBrace,shDblParen,shFunctionKey,shFunctionOne,shFunctionTwo,shParen
+syn cluster shIfList	contains=@shLoopList,shDblBrace,shDblParen,shFunctionKey,shFunctionOne,shFunctionTwo
 syn cluster shLoopList	contains=@shCaseList,@shErrorList,shCaseEsac,shConditional,shDblBrace,shExpr,shFor,shForPP,shIf,shOption,shSet,shTest,shTestOpr,shTouch
 syn cluster shPPSRightList	contains=shComment,shDeref,shDerefSimple,shEscape,shPosnParm
 syn cluster shSubShList	contains=@shCommandSubList,shCaseEsac,shColon,shCommandSub,shComment,shDo,shEcho,shExpr,shFor,shIf,shHereString,shRedir,shSetList,shSource,shStatement,shVariable,shCtrlSeq,shOperator
@@ -497,7 +497,7 @@ syn match  shDerefString	contained	"\\["']"	nextgroup=shDerefPattern
 if exists("b:is_bash")
  " bash : ${parameter:offset}
  " bash : ${parameter:offset:length}
- syn region shDerefOff	contained	start=':\ze[^-=?+]'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple,shDerefEscape	nextgroup=shDerefLen,shDeref,shDerefSimple
+ syn region shDerefOff	contained	start=':'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple,shDerefEscape	nextgroup=shDerefLen,shDeref,shDerefSimple
  syn region shDerefOff	contained	start=':\s-'	end='\ze:'	end='\ze}'	contains=shDeref,shDerefSimple,shDerefEscape	nextgroup=shDerefLen,shDeref,shDerefSimple
  syn match  shDerefLen	contained	":[^}]\+"	contains=shDeref,shDerefSimple
 
@@ -573,132 +573,134 @@ syn sync match shWhileSync	grouphere	shRepeat	"\<while\>"
 
 " Default Highlighting: {{{1
 " =====================
-hi def link shArithRegion	shShellVariables
-hi def link shAstQuote	shDoubleQuote
-hi def link shAtExpr	shSetList
-hi def link shBeginHere	shRedir
-hi def link shCaseBar	shConditional
-hi def link shCaseCommandSub	shCommandSub
-hi def link shCaseDoubleQuote	shDoubleQuote
-hi def link shCaseIn	shConditional
-hi def link shQuote	shOperator
-hi def link shCaseSingleQuote	shSingleQuote
-hi def link shCaseStart	shConditional
-hi def link shCmdSubRegion	shShellVariables
-hi def link shColon	shComment
-hi def link shDerefOp	shOperator
-hi def link shDerefPOL	shDerefOp
-hi def link shDerefPPS	shDerefOp
-hi def link shDerefPSR	shDerefOp
-hi def link shDeref	shShellVariables
-hi def link shDerefDelim	shOperator
-hi def link shDerefSimple	shDeref
-hi def link shDerefSpecial	shDeref
-hi def link shDerefString	shDoubleQuote
-hi def link shDerefVar	shDeref
-hi def link shDoubleQuote	shString
-hi def link shEcho	shString
-hi def link shEchoDelim	shOperator
-hi def link shEchoQuote	shString
-hi def link shForPP	shLoop
-hi def link shFunction	Function
-hi def link shEmbeddedEcho	shString
-hi def link shEscape	shCommandSub
-hi def link shExDoubleQuote	shDoubleQuote
-hi def link shExSingleQuote	shSingleQuote
-hi def link shHereDoc	shString
-hi def link shHereString	shRedir
-hi def link shHerePayload	shHereDoc
-hi def link shLoop	shStatement
-hi def link shSpecialNxt	shSpecial
-hi def link shNoQuote	shDoubleQuote
-hi def link shOption	shCommandSub
-hi def link shPattern	shString
-hi def link shParen	shArithmetic
-hi def link shPosnParm	shShellVariables
-hi def link shQuickComment	shComment
-hi def link shRange	shOperator
-hi def link shRedir	shOperator
-hi def link shSetListDelim	shOperator
-hi def link shSetOption	shOption
-hi def link shSingleQuote	shString
-hi def link shSource	shOperator
-hi def link shStringSpecial	shSpecial
-hi def link shSubShRegion	shOperator
-hi def link shTestOpr	shConditional
-hi def link shTestPattern	shString
-hi def link shTestDoubleQuote	shString
-hi def link shTestSingleQuote	shString
-hi def link shTouchCmd	shStatement
-hi def link shVariable	shSetList
-hi def link shWrapLineOperator	shOperator
+if !exists("skip_sh_syntax_inits")
+ hi def link shArithRegion	shShellVariables
+ hi def link shAstQuote	shDoubleQuote
+ hi def link shAtExpr	shSetList
+ hi def link shBeginHere	shRedir
+ hi def link shCaseBar	shConditional
+ hi def link shCaseCommandSub	shCommandSub
+ hi def link shCaseDoubleQuote	shDoubleQuote
+ hi def link shCaseIn	shConditional
+ hi def link shQuote	shOperator
+ hi def link shCaseSingleQuote	shSingleQuote
+ hi def link shCaseStart	shConditional
+ hi def link shCmdSubRegion	shShellVariables
+ hi def link shColon	shComment
+ hi def link shDerefOp	shOperator
+ hi def link shDerefPOL	shDerefOp
+ hi def link shDerefPPS	shDerefOp
+ hi def link shDerefPSR	shDerefOp
+ hi def link shDeref	shShellVariables
+ hi def link shDerefDelim	shOperator
+ hi def link shDerefSimple	shDeref
+ hi def link shDerefSpecial	shDeref
+ hi def link shDerefString	shDoubleQuote
+ hi def link shDerefVar	shDeref
+ hi def link shDoubleQuote	shString
+ hi def link shEcho	shString
+ hi def link shEchoDelim	shOperator
+ hi def link shEchoQuote	shString
+ hi def link shForPP	shLoop
+ hi def link shFunction	Function
+ hi def link shEmbeddedEcho	shString
+ hi def link shEscape	shCommandSub
+ hi def link shExDoubleQuote	shDoubleQuote
+ hi def link shExSingleQuote	shSingleQuote
+ hi def link shHereDoc	shString
+ hi def link shHereString	shRedir
+ hi def link shHerePayload	shHereDoc
+ hi def link shLoop	shStatement
+ hi def link shSpecialNxt	shSpecial
+ hi def link shNoQuote	shDoubleQuote
+ hi def link shOption	shCommandSub
+ hi def link shPattern	shString
+ hi def link shParen	shArithmetic
+ hi def link shPosnParm	shShellVariables
+ hi def link shQuickComment	shComment
+ hi def link shRange	shOperator
+ hi def link shRedir	shOperator
+ hi def link shSetListDelim	shOperator
+ hi def link shSetOption	shOption
+ hi def link shSingleQuote	shString
+ hi def link shSource	shOperator
+ hi def link shStringSpecial	shSpecial
+ hi def link shSubShRegion	shOperator
+ hi def link shTestOpr	shConditional
+ hi def link shTestPattern	shString
+ hi def link shTestDoubleQuote	shString
+ hi def link shTestSingleQuote	shString
+ hi def link shTouchCmd	shStatement
+ hi def link shVariable	shSetList
+ hi def link shWrapLineOperator	shOperator
 
-if exists("b:is_bash")
-  hi def link bashAdminStatement	shStatement
-  hi def link bashSpecialVariables	shShellVariables
-  hi def link bashStatement		shStatement
-  hi def link shCharClass		shSpecial
-  hi def link shDerefOff		shDerefOp
-  hi def link shDerefLen		shDerefOff
-endif
-if exists("b:is_kornshell")
-  hi def link kshSpecialVariables	shShellVariables
-  hi def link kshStatement		shStatement
-endif
-
-if !exists("g:sh_no_error")
- hi def link shCaseError		Error
- hi def link shCondError		Error
- hi def link shCurlyError		Error
- hi def link shDerefOpError		Error
- hi def link shDerefWordError		Error
- hi def link shDoError		Error
- hi def link shEsacError		Error
- hi def link shIfError		Error
- hi def link shInError		Error
- hi def link shParenError		Error
- hi def link shTestError		Error
- if exists("b:is_kornshell")
-   hi def link shDTestError		Error
+ if exists("b:is_bash")
+   hi def link bashAdminStatement	shStatement
+   hi def link bashSpecialVariables	shShellVariables
+   hi def link bashStatement		shStatement
+   hi def link shCharClass		shSpecial
+   hi def link shDerefOff		shDerefOp
+   hi def link shDerefLen		shDerefOff
+ endif
+ if exists("b:is_kornshell")
+   hi def link kshSpecialVariables	shShellVariables
+   hi def link kshStatement		shStatement
  endif
-endif
 
-hi def link shArithmetic		Special
-hi def link shCharClass		Identifier
-hi def link shSnglCase		Statement
-hi def link shCommandSub		Special
-hi def link shComment		Comment
-hi def link shConditional		Conditional
-hi def link shCtrlSeq		Special
-hi def link shExprRegion		Delimiter
-hi def link shFunctionKey		Function
-hi def link shFunctionName		Function
-hi def link shNumber		Number
-hi def link shOperator		Operator
-hi def link shRepeat		Repeat
-hi def link shSet		Statement
-hi def link shSetList		Identifier
-hi def link shShellVariables		PreProc
-hi def link shSpecial		Special
-hi def link shStatement		Statement
-hi def link shString		String
-hi def link shTodo		Todo
-hi def link shAlias		Identifier
-hi def link shHereDoc01		shRedir
-hi def link shHereDoc02		shRedir
-hi def link shHereDoc03		shRedir
-hi def link shHereDoc04		shRedir
-hi def link shHereDoc05		shRedir
-hi def link shHereDoc06		shRedir
-hi def link shHereDoc07		shRedir
-hi def link shHereDoc08		shRedir
-hi def link shHereDoc09		shRedir
-hi def link shHereDoc10		shRedir
-hi def link shHereDoc11		shRedir
-hi def link shHereDoc12		shRedir
-hi def link shHereDoc13		shRedir
-hi def link shHereDoc14		shRedir
-hi def link shHereDoc15		shRedir
+ if !exists("g:sh_no_error")
+  hi def link shCaseError		Error
+  hi def link shCondError		Error
+  hi def link shCurlyError		Error
+  hi def link shDerefOpError		Error
+  hi def link shDerefWordError		Error
+  hi def link shDoError		Error
+  hi def link shEsacError		Error
+  hi def link shIfError		Error
+  hi def link shInError		Error
+  hi def link shParenError		Error
+  hi def link shTestError		Error
+  if exists("b:is_kornshell")
+    hi def link shDTestError		Error
+  endif
+ endif
+
+ hi def link shArithmetic		Special
+ hi def link shCharClass		Identifier
+ hi def link shSnglCase		Statement
+ hi def link shCommandSub		Special
+ hi def link shComment		Comment
+ hi def link shConditional		Conditional
+ hi def link shCtrlSeq		Special
+ hi def link shExprRegion		Delimiter
+ hi def link shFunctionKey		Function
+ hi def link shFunctionName		Function
+ hi def link shNumber		Number
+ hi def link shOperator		Operator
+ hi def link shRepeat		Repeat
+ hi def link shSet		Statement
+ hi def link shSetList		Identifier
+ hi def link shShellVariables		PreProc
+ hi def link shSpecial		Special
+ hi def link shStatement		Statement
+ hi def link shString		String
+ hi def link shTodo		Todo
+ hi def link shAlias		Identifier
+ hi def link shHereDoc01		shRedir
+ hi def link shHereDoc02		shRedir
+ hi def link shHereDoc03		shRedir
+ hi def link shHereDoc04		shRedir
+ hi def link shHereDoc05		shRedir
+ hi def link shHereDoc06		shRedir
+ hi def link shHereDoc07		shRedir
+ hi def link shHereDoc08		shRedir
+ hi def link shHereDoc09		shRedir
+ hi def link shHereDoc10		shRedir
+ hi def link shHereDoc11		shRedir
+ hi def link shHereDoc12		shRedir
+ hi def link shHereDoc13		shRedir
+ hi def link shHereDoc14		shRedir
+ hi def link shHereDoc15		shRedir
+endif
 
 " Delete shell folding commands {{{1
 " =============================
diff --git a/runtime/syntax/sicad.vim b/runtime/syntax/sicad.vim
index 04f870d04e..20eb14cba1 100644
--- a/runtime/syntax/sicad.vim
+++ b/runtime/syntax/sicad.vim
@@ -359,33 +359,31 @@ syn keyword sicadStatement zparp zparpn zwinkp zwinkpn
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sicadLabel PreProc
-HiLink sicadLabel1 sicadLabel
-HiLink sicadLabel2 sicadLabel
-HiLink sicadConditional Conditional
-HiLink sicadBoolean Boolean
-HiLink sicadNumber Number
-HiLink sicadFloat Float
-HiLink sicadOperator Operator
-HiLink sicadStatement Statement
-HiLink sicadParameter sicadStatement
-HiLink sicadGoto sicadStatement
-HiLink sicadLineCont sicadStatement
-HiLink sicadString String
-HiLink sicadComment Comment
-HiLink sicadSpecial Special
-HiLink sicadIdentifier Type
-"  HiLink sicadIdentifier Identifier
-HiLink sicadError Error
-HiLink sicadParenError sicadError
-HiLink sicadApostropheError sicadError
-HiLink sicadStringError sicadError
-HiLink sicadCommentError sicadError
-"  HiLink sqlStatement Special  " modified highlight group in sql.vim
+hi def link sicadLabel PreProc
+hi def link sicadLabel1 sicadLabel
+hi def link sicadLabel2 sicadLabel
+hi def link sicadConditional Conditional
+hi def link sicadBoolean Boolean
+hi def link sicadNumber Number
+hi def link sicadFloat Float
+hi def link sicadOperator Operator
+hi def link sicadStatement Statement
+hi def link sicadParameter sicadStatement
+hi def link sicadGoto sicadStatement
+hi def link sicadLineCont sicadStatement
+hi def link sicadString String
+hi def link sicadComment Comment
+hi def link sicadSpecial Special
+hi def link sicadIdentifier Type
+"  hi def link sicadIdentifier Identifier
+hi def link sicadError Error
+hi def link sicadParenError sicadError
+hi def link sicadApostropheError sicadError
+hi def link sicadStringError sicadError
+hi def link sicadCommentError sicadError
+"  hi def link sqlStatement Special  " modified highlight group in sql.vim
 
-delcommand HiLink
 
 let b:current_syntax = "sicad"
 
diff --git a/runtime/syntax/simula.vim b/runtime/syntax/simula.vim
index eb3f8a1e85..82f66d049e 100644
--- a/runtime/syntax/simula.vim
+++ b/runtime/syntax/simula.vim
@@ -55,35 +55,33 @@ syn match	simulaReal		"-\=\<\d\+\(\.\d\+\)\=\(&&\=[+-]\=\d\+\)\=\>"
 " Real starting with a `.', optional exponent
 syn match	simulaReal		"-\=\.\d\+\(&&\=[+-]\=\d\+\)\=\>"
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink simulaAssigned		Identifier
-HiLink simulaBoolean		Boolean
-HiLink simulaCharacter		Character
-HiLink simulaCharError		Error
-HiLink simulaComment		Comment
-HiLink simulaCompound		Statement
-HiLink simulaConditional		Conditional
-HiLink simulaConstant		Constant
-HiLink simulaFunction		Function
-HiLink simulaNumber			Number
-HiLink simulaOperator		Operator
-HiLink simulaReal			Float
-HiLink simulaReferenceType		Type
-HiLink simulaRepeat			Repeat
-HiLink simulaReserved		Error
-HiLink simulaSemicolon		Statement
-HiLink simulaSpecial		Special
-HiLink simulaSpecialChar		SpecialChar
-HiLink simulaSpecialCharErr		Error
-HiLink simulaStatement		Statement
-HiLink simulaStorageClass		StorageClass
-HiLink simulaString			String
-HiLink simulaStructure		Structure
-HiLink simulaTodo			Todo
-HiLink simulaType			Type
+hi def link simulaAssigned		Identifier
+hi def link simulaBoolean		Boolean
+hi def link simulaCharacter		Character
+hi def link simulaCharError		Error
+hi def link simulaComment		Comment
+hi def link simulaCompound		Statement
+hi def link simulaConditional		Conditional
+hi def link simulaConstant		Constant
+hi def link simulaFunction		Function
+hi def link simulaNumber			Number
+hi def link simulaOperator		Operator
+hi def link simulaReal			Float
+hi def link simulaReferenceType		Type
+hi def link simulaRepeat			Repeat
+hi def link simulaReserved		Error
+hi def link simulaSemicolon		Statement
+hi def link simulaSpecial		Special
+hi def link simulaSpecialChar		SpecialChar
+hi def link simulaSpecialCharErr		Error
+hi def link simulaStatement		Statement
+hi def link simulaStorageClass		StorageClass
+hi def link simulaString			String
+hi def link simulaStructure		Structure
+hi def link simulaTodo			Todo
+hi def link simulaType			Type
 
-delcommand HiLink
 
 let b:current_syntax = "simula"
 " vim: sts=4 sw=4 ts=8
diff --git a/runtime/syntax/sinda.vim b/runtime/syntax/sinda.vim
index ef0929e07a..a6e5b45fcd 100644
--- a/runtime/syntax/sinda.vim
+++ b/runtime/syntax/sinda.vim
@@ -100,30 +100,28 @@ endif
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sindaMacro		Macro
-HiLink sindaOptions		Special
-HiLink sindaRoutine		Type
-HiLink sindaControl		Special
-HiLink sindaSubRoutine	Function
-HiLink sindaIdentifier	Identifier
+hi def link sindaMacro		Macro
+hi def link sindaOptions		Special
+hi def link sindaRoutine		Type
+hi def link sindaControl		Special
+hi def link sindaSubRoutine	Function
+hi def link sindaIdentifier	Identifier
 
-HiLink sindaFortran		PreProc
-HiLink sindaMotran		PreProc
+hi def link sindaFortran		PreProc
+hi def link sindaMotran		PreProc
 
-HiLink sindaComment		Comment
-HiLink sindaHeader		Typedef
-HiLink sindaIncludeFile	Type
-HiLink sindaInteger		Number
-HiLink sindaFloat		Float
-HiLink sindaScientific	Float
+hi def link sindaComment		Comment
+hi def link sindaHeader		Typedef
+hi def link sindaIncludeFile	Type
+hi def link sindaInteger		Number
+hi def link sindaFloat		Float
+hi def link sindaScientific	Float
 
-HiLink sindaEndData		Macro
+hi def link sindaEndData		Macro
 
-HiLink sindaTodo		Todo
+hi def link sindaTodo		Todo
 
-delcommand HiLink
 
 
 let b:current_syntax = "sinda"
diff --git a/runtime/syntax/sindacmp.vim b/runtime/syntax/sindacmp.vim
index 28c3cdc0ea..88373eb285 100644
--- a/runtime/syntax/sindacmp.vim
+++ b/runtime/syntax/sindacmp.vim
@@ -43,19 +43,17 @@ syn match  sindacmpFloat       "-\=\<[0-9]*\.[0-9]*"
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sindacmpTitle		     Type
-HiLink sindacmpUnit		     PreProc
+hi def link sindacmpTitle		     Type
+hi def link sindacmpUnit		     PreProc
 
-HiLink sindacmpLabel		     Statement
+hi def link sindacmpLabel		     Statement
 
-HiLink sindacmpHeader		     sindaHeader
+hi def link sindacmpHeader		     sindaHeader
 
-HiLink sindacmpInteger	     Number
-HiLink sindacmpFloat		     Special
+hi def link sindacmpInteger	     Number
+hi def link sindacmpFloat		     Special
 
-delcommand HiLink
 
 
 let b:current_syntax = "sindacmp"
diff --git a/runtime/syntax/sindaout.vim b/runtime/syntax/sindaout.vim
index b4fb177f06..c362f19467 100644
--- a/runtime/syntax/sindaout.vim
+++ b/runtime/syntax/sindaout.vim
@@ -60,24 +60,22 @@ syn match sindaoutError		"<<< Error >>>"
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 hi sindaHeaderDelim  ctermfg=Black ctermbg=Green	       guifg=Black guibg=Green
 
-HiLink sindaoutPos		     Statement
-HiLink sindaoutNeg		     PreProc
-HiLink sindaoutTitle		     Type
-HiLink sindaoutFile		     sindaIncludeFile
-HiLink sindaoutInteger	     sindaInteger
+hi def link sindaoutPos		     Statement
+hi def link sindaoutNeg		     PreProc
+hi def link sindaoutTitle		     Type
+hi def link sindaoutFile		     sindaIncludeFile
+hi def link sindaoutInteger	     sindaInteger
 
-HiLink sindaoutSectionDelim	      Delimiter
-HiLink sindaoutSectionTitle	     Exception
-HiLink sindaoutHeaderDelim	     SpecialComment
-HiLink sindaoutLabel		     Identifier
+hi def link sindaoutSectionDelim	      Delimiter
+hi def link sindaoutSectionTitle	     Exception
+hi def link sindaoutHeaderDelim	     SpecialComment
+hi def link sindaoutLabel		     Identifier
 
-HiLink sindaoutError		     Error
+hi def link sindaoutError		     Error
 
-delcommand HiLink
 
 
 let b:current_syntax = "sindaout"
diff --git a/runtime/syntax/skill.vim b/runtime/syntax/skill.vim
index f32d5ee3ed..47afffc0a9 100644
--- a/runtime/syntax/skill.vim
+++ b/runtime/syntax/skill.vim
@@ -523,28 +523,26 @@ syn sync ccomment skillComment minlines=10
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink skillcdfFunctions	Function
-HiLink skillgeFunctions		Function
-HiLink skillhiFunctions		Function
-HiLink skillleFunctions		Function
-HiLink skilldbefFunctions	Function
-HiLink skillddFunctions		Function
-HiLink skillpcFunctions		Function
-HiLink skilltechFunctions	Function
-HiLink skillConstants		Constant
-HiLink skillFunction		Function
-HiLink skillKeywords		Statement
-HiLink skillConditional		Conditional
-HiLink skillRepeat			Repeat
-HiLink skillString			String
-HiLink skillTodo			Todo
-HiLink skillNote			Todo
-HiLink skillComment			Comment
-HiLink skillCommentError	Error
+hi def link skillcdfFunctions	Function
+hi def link skillgeFunctions		Function
+hi def link skillhiFunctions		Function
+hi def link skillleFunctions		Function
+hi def link skilldbefFunctions	Function
+hi def link skillddFunctions		Function
+hi def link skillpcFunctions		Function
+hi def link skilltechFunctions	Function
+hi def link skillConstants		Constant
+hi def link skillFunction		Function
+hi def link skillKeywords		Statement
+hi def link skillConditional		Conditional
+hi def link skillRepeat			Repeat
+hi def link skillString			String
+hi def link skillTodo			Todo
+hi def link skillNote			Todo
+hi def link skillComment			Comment
+hi def link skillCommentError	Error
 
-delcommand HiLink
 
 let b:current_syntax = "skill"
 
diff --git a/runtime/syntax/sl.vim b/runtime/syntax/sl.vim
index a40d43ea6a..1f6c847353 100644
--- a/runtime/syntax/sl.vim
+++ b/runtime/syntax/sl.vim
@@ -73,36 +73,34 @@ syn sync ccomment slComment minlines=10
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink slLabel	Label
-HiLink slUserLabel	Label
-HiLink slConditional	Conditional
-HiLink slRepeat	Repeat
-HiLink slCharacter	Character
-HiLink slSpecialCharacter slSpecial
-HiLink slNumber	Number
-HiLink slFloat	Float
-HiLink slParenError	slError
-HiLink slInParen	slError
-HiLink slCommentError	slError
-HiLink slOperator	Operator
-HiLink slStorageClass	StorageClass
-HiLink slError	Error
-HiLink slStatement	Statement
-HiLink slType		Type
-HiLink slCommentError	slError
-HiLink slCommentString slString
-HiLink slComment2String slString
-HiLink slCommentSkip	slComment
-HiLink slString	String
-HiLink slComment	Comment
-HiLink slSpecial	SpecialChar
-HiLink slTodo	Todo
-HiLink slVariable	Identifier
-"HiLink slIdentifier	Identifier
+hi def link slLabel	Label
+hi def link slUserLabel	Label
+hi def link slConditional	Conditional
+hi def link slRepeat	Repeat
+hi def link slCharacter	Character
+hi def link slSpecialCharacter slSpecial
+hi def link slNumber	Number
+hi def link slFloat	Float
+hi def link slParenError	slError
+hi def link slInParen	slError
+hi def link slCommentError	slError
+hi def link slOperator	Operator
+hi def link slStorageClass	StorageClass
+hi def link slError	Error
+hi def link slStatement	Statement
+hi def link slType		Type
+hi def link slCommentError	slError
+hi def link slCommentString slString
+hi def link slComment2String slString
+hi def link slCommentSkip	slComment
+hi def link slString	String
+hi def link slComment	Comment
+hi def link slSpecial	SpecialChar
+hi def link slTodo	Todo
+hi def link slVariable	Identifier
+"hi def link slIdentifier	Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "sl"
 
diff --git a/runtime/syntax/slang.vim b/runtime/syntax/slang.vim
index 938e8d5c51..53ede4dc5a 100644
--- a/runtime/syntax/slang.vim
+++ b/runtime/syntax/slang.vim
@@ -53,38 +53,36 @@ syn region slangPreCondit start="^\s*#\s*\(ifdef\>\|ifndef\>\|iftrue\>\|ifnfalse
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink slangDefinition	Type
-HiLink slangBlock		slangDefinition
-HiLink slangLabel		Label
-HiLink slangConditional	Conditional
-HiLink slangRepeat		Repeat
-HiLink slangCharacter	Character
-HiLink slangFloat		Float
-HiLink slangImaginary	Float
-HiLink slangDecimal		slangNumber
-HiLink slangOctal		slangNumber
-HiLink slangHex		slangNumber
-HiLink slangNumber		Number
-HiLink slangParenError	Error
-HiLink slangOctalError	Error
-HiLink slangOperator		Operator
-HiLink slangStructure	Structure
-HiLink slangInclude		Include
-HiLink slangPreCondit	PreCondit
-HiLink slangError		Error
-HiLink slangStatement	Statement
-HiLink slangType		Type
-HiLink slangString		String
-HiLink slangConstant		Constant
-HiLink slangRangeArray	slangConstant
-HiLink slangComment		Comment
-HiLink slangSpecial		SpecialChar
-HiLink slangTodo		Todo
-HiLink slangDelim		Delimiter
+hi def link slangDefinition	Type
+hi def link slangBlock		slangDefinition
+hi def link slangLabel		Label
+hi def link slangConditional	Conditional
+hi def link slangRepeat		Repeat
+hi def link slangCharacter	Character
+hi def link slangFloat		Float
+hi def link slangImaginary	Float
+hi def link slangDecimal		slangNumber
+hi def link slangOctal		slangNumber
+hi def link slangHex		slangNumber
+hi def link slangNumber		Number
+hi def link slangParenError	Error
+hi def link slangOctalError	Error
+hi def link slangOperator		Operator
+hi def link slangStructure	Structure
+hi def link slangInclude		Include
+hi def link slangPreCondit	PreCondit
+hi def link slangError		Error
+hi def link slangStatement	Statement
+hi def link slangType		Type
+hi def link slangString		String
+hi def link slangConstant		Constant
+hi def link slangRangeArray	slangConstant
+hi def link slangComment		Comment
+hi def link slangSpecial		SpecialChar
+hi def link slangTodo		Todo
+hi def link slangDelim		Delimiter
 
-delcommand HiLink
 
 let b:current_syntax = "slang"
 
diff --git a/runtime/syntax/slice.vim b/runtime/syntax/slice.vim
index 202aee7599..3a57ece913 100644
--- a/runtime/syntax/slice.vim
+++ b/runtime/syntax/slice.vim
@@ -56,24 +56,22 @@ syn sync ccomment sliceComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sliceComment	Comment
-HiLink sliceConstruct	Keyword
-HiLink sliceType	Type
-HiLink sliceString	String
-HiLink sliceIncluded	String
-HiLink sliceQualifier	Keyword
-HiLink sliceInclude	Include
-HiLink sliceGuard	PreProc
-HiLink sliceBoolean	Boolean
-HiLink sliceFloat	Number
-HiLink sliceNumber	Number
-HiLink sliceOctal	Number
-HiLink sliceOctalZero	Special
-HiLink sliceNumberError Special
+hi def link sliceComment	Comment
+hi def link sliceConstruct	Keyword
+hi def link sliceType	Type
+hi def link sliceString	String
+hi def link sliceIncluded	String
+hi def link sliceQualifier	Keyword
+hi def link sliceInclude	Include
+hi def link sliceGuard	PreProc
+hi def link sliceBoolean	Boolean
+hi def link sliceFloat	Number
+hi def link sliceNumber	Number
+hi def link sliceOctal	Number
+hi def link sliceOctalZero	Special
+hi def link sliceNumberError Special
 
-delcommand HiLink
 
 let b:current_syntax = "slice"
 
diff --git a/runtime/syntax/slrnrc.vim b/runtime/syntax/slrnrc.vim
index a55439a20a..cf0734ae85 100644
--- a/runtime/syntax/slrnrc.vim
+++ b/runtime/syntax/slrnrc.vim
@@ -148,35 +148,33 @@ syn match   slrnrcUnsetkey	'^\s*unsetkey\s\+\("\)\=\(article\|group\|readline\)\
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink slrnrcTodo		Todo
-HiLink slrnrcSpaceError	Error
-HiLink slrnrcNumber		Number
-HiLink slrnrcSpecKey		SpecialChar
-HiLink slrnrcKey		String
-HiLink slrnrcSpecChar		SpecialChar
-HiLink slrnrcString		String
-HiLink slrnSlangPreCondit	Special
-HiLink slrnrcComment		Comment
-HiLink slrnrcVarInt		Identifier
-HiLink slrnrcVarStr		Identifier
-HiLink slrnrcCmd		slrnrcSet
-HiLink slrnrcSet		Operator
-HiLink slrnrcColor		Keyword
-HiLink slrnrcColorObj		Identifier
-HiLink slrnrcColorVal		String
-HiLink slrnrcMono		Keyword
-HiLink slrnrcMonoObj		Identifier
-HiLink slrnrcMonoVal		String
-HiLink slrnrcFunArt		Macro
-HiLink slrnrcFunGroup		Macro
-HiLink slrnrcFunRead		Macro
-HiLink slrnrcSetkeyObj	Identifier
-HiLink slrnrcSetkey		Keyword
-HiLink slrnrcUnsetkey		slrnrcSetkey
+hi def link slrnrcTodo		Todo
+hi def link slrnrcSpaceError	Error
+hi def link slrnrcNumber		Number
+hi def link slrnrcSpecKey		SpecialChar
+hi def link slrnrcKey		String
+hi def link slrnrcSpecChar		SpecialChar
+hi def link slrnrcString		String
+hi def link slrnSlangPreCondit	Special
+hi def link slrnrcComment		Comment
+hi def link slrnrcVarInt		Identifier
+hi def link slrnrcVarStr		Identifier
+hi def link slrnrcCmd		slrnrcSet
+hi def link slrnrcSet		Operator
+hi def link slrnrcColor		Keyword
+hi def link slrnrcColorObj		Identifier
+hi def link slrnrcColorVal		String
+hi def link slrnrcMono		Keyword
+hi def link slrnrcMonoObj		Identifier
+hi def link slrnrcMonoVal		String
+hi def link slrnrcFunArt		Macro
+hi def link slrnrcFunGroup		Macro
+hi def link slrnrcFunRead		Macro
+hi def link slrnrcSetkeyObj	Identifier
+hi def link slrnrcSetkey		Keyword
+hi def link slrnrcUnsetkey		slrnrcSetkey
 
-delcommand HiLink
 
 let b:current_syntax = "slrnrc"
 
diff --git a/runtime/syntax/slrnsc.vim b/runtime/syntax/slrnsc.vim
index a5dfa55e54..9f51cad380 100644
--- a/runtime/syntax/slrnsc.vim
+++ b/runtime/syntax/slrnsc.vim
@@ -45,25 +45,23 @@ syn match slrnScoreLine		"^\s*Score::\=\s\+=\=[-+]\=\d\+\s*\(%.*\)\=$" skipempty
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink slrnscComment		Comment
-HiLink slrnscSectionCom	slrnscComment
-HiLink slrnscGroup		String
-HiLink slrnscNumber		Number
-HiLink slrnscDate		Special
-HiLink slrnscDelim		Delimiter
-HiLink slrnscComma		SpecialChar
-HiLink slrnscOper		SpecialChar
-HiLink slrnscEsc		String
-HiLink slrnscSectionStd	Type
-HiLink slrnscSectionNot	Delimiter
-HiLink slrnscItem		Statement
-HiLink slrnscScore		Keyword
-HiLink slrnscScoreIdent	Identifier
-HiLink slrnscInclude		Keyword
+hi def link slrnscComment		Comment
+hi def link slrnscSectionCom	slrnscComment
+hi def link slrnscGroup		String
+hi def link slrnscNumber		Number
+hi def link slrnscDate		Special
+hi def link slrnscDelim		Delimiter
+hi def link slrnscComma		SpecialChar
+hi def link slrnscOper		SpecialChar
+hi def link slrnscEsc		String
+hi def link slrnscSectionStd	Type
+hi def link slrnscSectionNot	Delimiter
+hi def link slrnscItem		Statement
+hi def link slrnscScore		Keyword
+hi def link slrnscScoreIdent	Identifier
+hi def link slrnscInclude		Keyword
 
-delcommand HiLink
 
 let b:current_syntax = "slrnsc"
 
diff --git a/runtime/syntax/sm.vim b/runtime/syntax/sm.vim
index 33a67724f1..cb01d44bb6 100644
--- a/runtime/syntax/sm.vim
+++ b/runtime/syntax/sm.vim
@@ -57,27 +57,25 @@ syn region smClause	matchgroup=Delimiter start="\$?." matchgroup=Delimiter end="
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink smClause	Special
-HiLink smClauseError	Error
-HiLink smComment	Comment
-HiLink smDefine	Statement
-HiLink smElse		Delimiter
-HiLink smHeader	Statement
-HiLink smHeaderSep	String
-HiLink smMesg		Special
-HiLink smPrecedence	Number
-HiLink smRewrite	Statement
-HiLink smRewriteComment	Comment
-HiLink smRewriteLhsToken	String
-HiLink smRewriteLhsUser	Statement
-HiLink smRewriteRhsToken	String
-HiLink smRuleset	Preproc
-HiLink smTrusted	Special
-HiLink smVar		String
+hi def link smClause	Special
+hi def link smClauseError	Error
+hi def link smComment	Comment
+hi def link smDefine	Statement
+hi def link smElse		Delimiter
+hi def link smHeader	Statement
+hi def link smHeaderSep	String
+hi def link smMesg		Special
+hi def link smPrecedence	Number
+hi def link smRewrite	Statement
+hi def link smRewriteComment	Comment
+hi def link smRewriteLhsToken	String
+hi def link smRewriteLhsUser	Statement
+hi def link smRewriteRhsToken	String
+hi def link smRuleset	Preproc
+hi def link smTrusted	Special
+hi def link smVar		String
 
-delcommand HiLink
 
 let b:current_syntax = "sm"
 
diff --git a/runtime/syntax/smarty.vim b/runtime/syntax/smarty.vim
index ab8e85dced..a39c290abe 100644
--- a/runtime/syntax/smarty.vim
+++ b/runtime/syntax/smarty.vim
@@ -56,18 +56,16 @@ syn region  htmlString   contained start=+'+ end=+'+ contains=htmlSpecialChar,ja
   syn region htmlLink start="<a\>\_[^>]*\<href\>" end="</a>"me=e-4 contains=@Spell,htmlTag,htmlEndTag,htmlSpecialChar,htmlPreProc,htmlComment,javaScript,@htmlPreproc,smartyZone
 
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink smartyTagName Identifier
-HiLink smartyProperty Constant
+hi def link smartyTagName Identifier
+hi def link smartyProperty Constant
 " if you want the text inside the braces to be colored, then
 " remove the comment in from of the next statement
-"HiLink smartyZone Include
-HiLink smartyInFunc Function
-HiLink smartyBlock Constant
-HiLink smartyDot SpecialChar
-HiLink smartyModifier Function
-delcommand HiLink
+"hi def link smartyZone Include
+hi def link smartyInFunc Function
+hi def link smartyBlock Constant
+hi def link smartyDot SpecialChar
+hi def link smartyModifier Function
 
 let b:current_syntax = "smarty"
 
diff --git a/runtime/syntax/smil.vim b/runtime/syntax/smil.vim
index 84826323cf..4cf6e84710 100644
--- a/runtime/syntax/smil.vim
+++ b/runtime/syntax/smil.vim
@@ -113,29 +113,27 @@ syn region smilComment		      start=+<!DOCTYPE+ keepend end=+>+
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink smilTag			Function
-HiLink smilEndTag			Identifier
-HiLink smilArg			Type
-HiLink smilTagName			smilStatement
-HiLink smilSpecialTagName		Exception
-HiLink smilValue			Value
-HiLink smilSpecialChar		Special
+hi def link smilTag			Function
+hi def link smilEndTag			Identifier
+hi def link smilArg			Type
+hi def link smilTagName			smilStatement
+hi def link smilSpecialTagName		Exception
+hi def link smilValue			Value
+hi def link smilSpecialChar		Special
 
-HiLink smilSpecial			Special
-HiLink smilSpecialChar		Special
-HiLink smilString			String
-HiLink smilStatement			Statement
-HiLink smilComment			Comment
-HiLink smilCommentPart		Comment
-HiLink smilPreProc			PreProc
-HiLink smilValue			String
-HiLink smilCommentError		smilError
-HiLink smilTagError			smilError
-HiLink smilError			Error
+hi def link smilSpecial			Special
+hi def link smilSpecialChar		Special
+hi def link smilString			String
+hi def link smilStatement			Statement
+hi def link smilComment			Comment
+hi def link smilCommentPart		Comment
+hi def link smilPreProc			PreProc
+hi def link smilValue			String
+hi def link smilCommentError		smilError
+hi def link smilTagError			smilError
+hi def link smilError			Error
 
-delcommand HiLink
 
 let b:current_syntax = "smil"
 
diff --git a/runtime/syntax/smith.vim b/runtime/syntax/smith.vim
index 82429691c1..b045d3b963 100644
--- a/runtime/syntax/smith.vim
+++ b/runtime/syntax/smith.vim
@@ -26,15 +26,13 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink smithRegister	Identifier
-HiLink smithKeyword	Keyword
-HiLink smithComment Comment
-HiLink smithString String
-HiLink smithNumber	Number
+hi def link smithRegister	Identifier
+hi def link smithKeyword	Keyword
+hi def link smithComment Comment
+hi def link smithString String
+hi def link smithNumber	Number
 
-delcommand HiLink
 
 let b:current_syntax = "smith"
 
diff --git a/runtime/syntax/sml.vim b/runtime/syntax/sml.vim
index 01d494d2be..fa4524f93d 100644
--- a/runtime/syntax/sml.vim
+++ b/runtime/syntax/sml.vim
@@ -166,53 +166,51 @@ syn sync match smlSigSync     groupthere smlSig     "\<end\>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink smlBraceErr	 Error
-HiLink smlBrackErr	 Error
-HiLink smlParenErr	 Error
+hi def link smlBraceErr	 Error
+hi def link smlBrackErr	 Error
+hi def link smlParenErr	 Error
 
-HiLink smlCommentErr	 Error
+hi def link smlCommentErr	 Error
 
-HiLink smlEndErr	 Error
-HiLink smlThenErr	 Error
+hi def link smlEndErr	 Error
+hi def link smlThenErr	 Error
 
-HiLink smlCharErr	 Error
+hi def link smlCharErr	 Error
 
-HiLink smlComment	 Comment
+hi def link smlComment	 Comment
 
-HiLink smlModPath	 Include
-HiLink smlModule	 Include
-HiLink smlModParam1	 Include
-HiLink smlModType	 Include
-HiLink smlMPRestr3	 Include
-HiLink smlFullMod	 Include
-HiLink smlModTypeRestr Include
-HiLink smlWith	 Include
-HiLink smlMTDef	 Include
+hi def link smlModPath	 Include
+hi def link smlModule	 Include
+hi def link smlModParam1	 Include
+hi def link smlModType	 Include
+hi def link smlMPRestr3	 Include
+hi def link smlFullMod	 Include
+hi def link smlModTypeRestr Include
+hi def link smlWith	 Include
+hi def link smlMTDef	 Include
 
-HiLink smlConstructor  Constant
+hi def link smlConstructor  Constant
 
-HiLink smlModPreRHS	 Keyword
-HiLink smlMPRestr2	 Keyword
-HiLink smlKeyword	 Keyword
-HiLink smlFunDef	 Keyword
-HiLink smlRefAssign	 Keyword
-HiLink smlKeyChar	 Keyword
-HiLink smlAnyVar	 Keyword
-HiLink smlTopStop	 Keyword
-HiLink smlOperator	 Keyword
+hi def link smlModPreRHS	 Keyword
+hi def link smlMPRestr2	 Keyword
+hi def link smlKeyword	 Keyword
+hi def link smlFunDef	 Keyword
+hi def link smlRefAssign	 Keyword
+hi def link smlKeyChar	 Keyword
+hi def link smlAnyVar	 Keyword
+hi def link smlTopStop	 Keyword
+hi def link smlOperator	 Keyword
 
-HiLink smlBoolean	 Boolean
-HiLink smlCharacter	 Character
-HiLink smlNumber	 Number
-HiLink smlReal	 Float
-HiLink smlString	 String
-HiLink smlType	 Type
-HiLink smlTodo	 Todo
-HiLink smlEncl	 Keyword
+hi def link smlBoolean	 Boolean
+hi def link smlCharacter	 Character
+hi def link smlNumber	 Number
+hi def link smlReal	 Float
+hi def link smlString	 String
+hi def link smlType	 Type
+hi def link smlTodo	 Todo
+hi def link smlEncl	 Keyword
 
-delcommand HiLink
 
 let b:current_syntax = "sml"
 
diff --git a/runtime/syntax/snnsnet.vim b/runtime/syntax/snnsnet.vim
index c73891e2b8..9dc9e06e78 100644
--- a/runtime/syntax/snnsnet.vim
+++ b/runtime/syntax/snnsnet.vim
@@ -53,16 +53,14 @@ syn match	snnsnetNumbers	"\d" contained
 syn match	snnsnetComment	"#.*$" contains=snnsnetTodo
 syn keyword	snnsnetTodo	TODO XXX FIXME contained
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink snnsnetType		Type
-HiLink snnsnetComment		Comment
-HiLink snnsnetNumbers		Number
-HiLink snnsnetSection		Statement
-HiLink snnsnetTitle		Label
-HiLink snnsnetTodo		Todo
+hi def link snnsnetType		Type
+hi def link snnsnetComment		Comment
+hi def link snnsnetNumbers		Number
+hi def link snnsnetSection		Statement
+hi def link snnsnetTitle		Label
+hi def link snnsnetTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "snnsnet"
 
diff --git a/runtime/syntax/snnspat.vim b/runtime/syntax/snnspat.vim
index ffc4caea71..cb6e9c5bd1 100644
--- a/runtime/syntax/snnspat.vim
+++ b/runtime/syntax/snnspat.vim
@@ -43,19 +43,17 @@ syn match	snnspatNumbers	"\d" contained
 syn match	snnspatComment	"#.*$" contains=snnspatTodo
 syn keyword	snnspatTodo	TODO XXX FIXME contained
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink snnspatGen		Statement
-HiLink snnspatHeader		Error
-HiLink snnspatNoHeader	Define
-HiLink snnspatNumbers		Number
-HiLink snnspatComment		Comment
-HiLink snnspatError		Error
-HiLink snnspatTodo		Todo
-HiLink snnspatAccepted	NONE
-HiLink snnspatBrac		NONE
+hi def link snnspatGen		Statement
+hi def link snnspatHeader		Error
+hi def link snnspatNoHeader	Define
+hi def link snnspatNumbers		Number
+hi def link snnspatComment		Comment
+hi def link snnspatError		Error
+hi def link snnspatTodo		Todo
+hi def link snnspatAccepted	NONE
+hi def link snnspatBrac		NONE
 
-delcommand HiLink
 
 let b:current_syntax = "snnspat"
 
diff --git a/runtime/syntax/snnsres.vim b/runtime/syntax/snnsres.vim
index 2d2791696c..2f19b67dbe 100644
--- a/runtime/syntax/snnsres.vim
+++ b/runtime/syntax/snnsres.vim
@@ -36,16 +36,14 @@ syn match	snnsresNumbers	"\d" contained
 syn match	snnsresComment	"#.*$" contains=snnsresTodo
 syn keyword	snnsresTodo	TODO XXX FIXME contained
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink snnsresGen		Statement
-HiLink snnsresHeader		Statement
-HiLink snnsresNoHeader	Define
-HiLink snnsresNumbers		Number
-HiLink snnsresComment		Comment
-HiLink snnsresTodo		Todo
+hi def link snnsresGen		Statement
+hi def link snnsresHeader		Statement
+hi def link snnsresNoHeader	Define
+hi def link snnsresNumbers		Number
+hi def link snnsresComment		Comment
+hi def link snnsresTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "snnsres"
 
diff --git a/runtime/syntax/snobol4.vim b/runtime/syntax/snobol4.vim
index 691acdec9a..a14f15eef4 100644
--- a/runtime/syntax/snobol4.vim
+++ b/runtime/syntax/snobol4.vim
@@ -77,38 +77,36 @@ syn match       snobol4ErrInBracket display contained "[){}]\|<%\|%>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink snobol4Constant        Constant
-HiLink snobol4Label           Label
-HiLink snobol4Goto            Repeat
-HiLink snobol4Conditional     Conditional
-HiLink snobol4Repeat          Repeat
-HiLink snobol4Number          Number
-HiLink snobol4Error           Error
-HiLink snobol4Statement       PreProc
-HiLink snobol4BogusStatement  snobol4Error
-HiLink snobol4String          String
-HiLink snobol4Comment         Comment
-HiLink snobol4Special         Special
-HiLink snobol4Todo            Todo
-HiLink snobol4Keyword         Keyword
-HiLink snobol4Function        Function
-HiLink snobol4MathsOperator   Operator
-HiLink snobol4ParenError      snobol4Error
-HiLink snobol4ErrInParen      snobol4Error
-HiLink snobol4ErrInBracket    snobol4Error
-HiLink snobol4SysVar          Keyword
-HiLink snobol4BogusSysVar     snobol4Error
+hi def link snobol4Constant        Constant
+hi def link snobol4Label           Label
+hi def link snobol4Goto            Repeat
+hi def link snobol4Conditional     Conditional
+hi def link snobol4Repeat          Repeat
+hi def link snobol4Number          Number
+hi def link snobol4Error           Error
+hi def link snobol4Statement       PreProc
+hi def link snobol4BogusStatement  snobol4Error
+hi def link snobol4String          String
+hi def link snobol4Comment         Comment
+hi def link snobol4Special         Special
+hi def link snobol4Todo            Todo
+hi def link snobol4Keyword         Keyword
+hi def link snobol4Function        Function
+hi def link snobol4MathsOperator   Operator
+hi def link snobol4ParenError      snobol4Error
+hi def link snobol4ErrInParen      snobol4Error
+hi def link snobol4ErrInBracket    snobol4Error
+hi def link snobol4SysVar          Keyword
+hi def link snobol4BogusSysVar     snobol4Error
 if exists("snobol4_strict_mode")
-HiLink snobol4ExtSysVar       WarningMsg
-HiLink snobol4ExtKeyword      WarningMsg
+hi def link snobol4ExtSysVar       WarningMsg
+hi def link snobol4ExtKeyword      WarningMsg
 else
-HiLink snobol4ExtSysVar       snobol4SysVar
-HiLink snobol4ExtKeyword      snobol4Keyword
+hi def link snobol4ExtSysVar       snobol4SysVar
+hi def link snobol4ExtKeyword      snobol4Keyword
 endif
 
-delcommand HiLink
 
 let b:current_syntax = "snobol4"
 " vim: ts=8
diff --git a/runtime/syntax/spec.vim b/runtime/syntax/spec.vim
index edfdf4365c..3a7dc9e422 100644
--- a/runtime/syntax/spec.vim
+++ b/runtime/syntax/spec.vim
@@ -157,68 +157,66 @@ syn sync match shCaseEsacSync groupthere shCaseEsac "\<esac\>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 "main types color definitions
-HiLink specSection			Structure
-HiLink specSectionMacro		Macro
-HiLink specWWWlink			PreProc
-HiLink specOpts			Operator
+hi def link specSection			Structure
+hi def link specSectionMacro		Macro
+hi def link specWWWlink			PreProc
+hi def link specOpts			Operator
 
 "yes, it's ugly, but white is sooo cool
 if &background == "dark"
 hi def specGlobalMacro		ctermfg=white
 else
-HiLink specGlobalMacro		Identifier
+hi def link specGlobalMacro		Identifier
 endif
 
 "sh colors
-HiLink shComment			Comment
-HiLink shIf				Statement
-HiLink shOperator			Special
-HiLink shQuote1			String
-HiLink shQuote2			String
-HiLink shQuoteDelim			Statement
+hi def link shComment			Comment
+hi def link shIf				Statement
+hi def link shOperator			Special
+hi def link shQuote1			String
+hi def link shQuote2			String
+hi def link shQuoteDelim			Statement
 
 "spec colors
-HiLink specBlock			Function
-HiLink specColon			Special
-HiLink specCommand			Statement
-HiLink specCommandOpts		specOpts
-HiLink specCommandSpecial		Special
-HiLink specComment			Comment
-HiLink specConfigure			specCommand
-HiLink specDate			String
-HiLink specDescriptionOpts		specOpts
-HiLink specEmail			specWWWlink
-HiLink specError			Error
-HiLink specFilesDirective		specSectionMacro
-HiLink specFilesOpts			specOpts
-HiLink specLicense			String
-HiLink specMacroNameLocal		specGlobalMacro
-HiLink specMacroNameOther		specGlobalMacro
-HiLink specManpageFile		NONE
-HiLink specMonth			specDate
-HiLink specNoNumberHilite		NONE
-HiLink specNumber			Number
-HiLink specPackageOpts		specOpts
-HiLink specPercent			Special
-HiLink specSpecialChar		Special
-HiLink specSpecialVariables		specGlobalMacro
-HiLink specSpecialVariablesNames	specGlobalMacro
-HiLink specTarCommand			specCommand
-HiLink specURL			specWWWlink
-HiLink specURLMacro			specWWWlink
-HiLink specVariables			Identifier
-HiLink specWeekday			specDate
-HiLink specListedFilesBin		Statement
-HiLink specListedFilesDoc		Statement
-HiLink specListedFilesEtc		Statement
-HiLink specListedFilesLib		Statement
-HiLink specListedFilesPrefix		Statement
-HiLink specListedFilesShare		Statement
+hi def link specBlock			Function
+hi def link specColon			Special
+hi def link specCommand			Statement
+hi def link specCommandOpts		specOpts
+hi def link specCommandSpecial		Special
+hi def link specComment			Comment
+hi def link specConfigure			specCommand
+hi def link specDate			String
+hi def link specDescriptionOpts		specOpts
+hi def link specEmail			specWWWlink
+hi def link specError			Error
+hi def link specFilesDirective		specSectionMacro
+hi def link specFilesOpts			specOpts
+hi def link specLicense			String
+hi def link specMacroNameLocal		specGlobalMacro
+hi def link specMacroNameOther		specGlobalMacro
+hi def link specManpageFile		NONE
+hi def link specMonth			specDate
+hi def link specNoNumberHilite		NONE
+hi def link specNumber			Number
+hi def link specPackageOpts		specOpts
+hi def link specPercent			Special
+hi def link specSpecialChar		Special
+hi def link specSpecialVariables		specGlobalMacro
+hi def link specSpecialVariablesNames	specGlobalMacro
+hi def link specTarCommand			specCommand
+hi def link specURL			specWWWlink
+hi def link specURLMacro			specWWWlink
+hi def link specVariables			Identifier
+hi def link specWeekday			specDate
+hi def link specListedFilesBin		Statement
+hi def link specListedFilesDoc		Statement
+hi def link specListedFilesEtc		Statement
+hi def link specListedFilesLib		Statement
+hi def link specListedFilesPrefix		Statement
+hi def link specListedFilesShare		Statement
 
-delcommand HiLink
 
 let b:current_syntax = "spec"
 
diff --git a/runtime/syntax/specman.vim b/runtime/syntax/specman.vim
index 4fa4c218d8..9387925ef2 100644
--- a/runtime/syntax/specman.vim
+++ b/runtime/syntax/specman.vim
@@ -135,37 +135,35 @@ syn sync lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 " The default methods for highlighting.  Can be overridden later
-HiLink	specmanConditional	Conditional
-HiLink	specmanConstraint	Conditional
-HiLink	specmanRepeat		Repeat
-HiLink	specmanString		String
-HiLink	specmanComment		Comment
-HiLink	specmanConstant		Macro
-HiLink	specmanNumber		Number
-HiLink	specmanCompare		Operator
-HiLink	specmanOperator		Operator
-HiLink	specmanLogical		Operator
-HiLink	specmanStatement	Statement
-HiLink	specmanHDL		SpecialChar
-HiLink	specmanMethod		Function
-HiLink	specmanInclude		Include
-HiLink	specmanStructure	Structure
-HiLink	specmanBoolean		Boolean
-HiLink	specmanFSM		Label
-HiLink	specmanSpecial		Special
-HiLink	specmanType		Type
-HiLink	specmanTemporal		Type
-HiLink	specmanFile		Include
-HiLink	specmanPreCondit	Include
-HiLink	specmanDefine		Typedef
-HiLink	specmanLabel		Label
-HiLink	specmanPacking		keyword
-HiLink	specmanTodo		Todo
-HiLink	specmanParenError	Error
-HiLink	specmanErrInParen	Error
-HiLink	specmanErrInBracket	Error
-delcommand	HiLink
+hi def link specmanConditional	Conditional
+hi def link specmanConstraint	Conditional
+hi def link specmanRepeat		Repeat
+hi def link specmanString		String
+hi def link specmanComment		Comment
+hi def link specmanConstant		Macro
+hi def link specmanNumber		Number
+hi def link specmanCompare		Operator
+hi def link specmanOperator		Operator
+hi def link specmanLogical		Operator
+hi def link specmanStatement	Statement
+hi def link specmanHDL		SpecialChar
+hi def link specmanMethod		Function
+hi def link specmanInclude		Include
+hi def link specmanStructure	Structure
+hi def link specmanBoolean		Boolean
+hi def link specmanFSM		Label
+hi def link specmanSpecial		Special
+hi def link specmanType		Type
+hi def link specmanTemporal		Type
+hi def link specmanFile		Include
+hi def link specmanPreCondit	Include
+hi def link specmanDefine		Typedef
+hi def link specmanLabel		Label
+hi def link specmanPacking		keyword
+hi def link specmanTodo		Todo
+hi def link specmanParenError	Error
+hi def link specmanErrInParen	Error
+hi def link specmanErrInBracket	Error
 
 let b:current_syntax = "specman"
diff --git a/runtime/syntax/spice.vim b/runtime/syntax/spice.vim
index 57ff05f807..306039bc74 100644
--- a/runtime/syntax/spice.vim
+++ b/runtime/syntax/spice.vim
@@ -51,19 +51,17 @@ syn sync minlines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink spiceTodo		Todo
-HiLink spiceWrapLineOperator	spiceOperator
-HiLink spiceSinglequote	spiceExpr
-HiLink spiceExpr		Function
-HiLink spiceParenError	Error
-HiLink spiceStatement		Statement
-HiLink spiceNumber		Number
-HiLink spiceComment		Comment
-HiLink spiceOperator		Operator
+hi def link spiceTodo		Todo
+hi def link spiceWrapLineOperator	spiceOperator
+hi def link spiceSinglequote	spiceExpr
+hi def link spiceExpr		Function
+hi def link spiceParenError	Error
+hi def link spiceStatement		Statement
+hi def link spiceNumber		Number
+hi def link spiceComment		Comment
+hi def link spiceOperator		Operator
 
-delcommand HiLink
 
 let b:current_syntax = "spice"
 
diff --git a/runtime/syntax/splint.vim b/runtime/syntax/splint.vim
index 14f84a8691..8eba57d288 100644
--- a/runtime/syntax/splint.vim
+++ b/runtime/syntax/splint.vim
@@ -193,52 +193,50 @@ syn cluster	cMultiGroup	add=@splintAllStuff
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink splintShortAnn		splintAnnotation
-HiLink splintAnnotation	Comment
-HiLink splintAnnError		splintError
-HiLink splintAnnError2	splintError
-HiLink splintFlag		SpecialComment
-HiLink splintGlobalFlag	splintError
-HiLink splintSpecialAnnot	splintAnnKey
-HiLink splintStateAnnot	splintAnnKey
-HiLink splintSpecTag		splintAnnKey
-HiLink splintModifies		splintAnnKey
-HiLink splintRequires		splintAnnKey
-HiLink splintGlobals		splintAnnKey
-HiLink splintGlobitem		Constant
-HiLink splintGlobannot	splintAnnKey
-HiLink splintWarning		splintAnnKey
-HiLink splintModitem		Constant
-HiLink splintIter		splintAnnKey
-HiLink splintConst		splintAnnKey
-HiLink splintAlt		splintAnnKey
-HiLink splintType		splintAnnKey
-HiLink splintGlobalType	splintAnnKey
-HiLink splintMemMgm		splintAnnKey
-HiLink splintAlias		splintAnnKey
-HiLink splintExposure		splintAnnKey
-HiLink splintDefState		splintAnnKey
-HiLink splintGlobState	splintAnnKey
-HiLink splintNullState	splintAnnKey
-HiLink splintNullPred		splintAnnKey
-HiLink splintExit		splintAnnKey
-HiLink splintExec		splintAnnKey
-HiLink splintSef		splintAnnKey
-HiLink splintDecl		splintAnnKey
-HiLink splintCase		splintAnnKey
-HiLink splintBreak		splintAnnKey
-HiLink splintUnreach		splintAnnKey
-HiLink splintSpecFunc		splintAnnKey
-HiLink splintErrSupp		splintAnnKey
-HiLink splintTypeAcc		splintAnnKey
-HiLink splintMacro		splintAnnKey
-HiLink splintSpecType		splintAnnKey
-HiLink splintAnnKey		Type
-HiLink splintError		Error
+hi def link splintShortAnn		splintAnnotation
+hi def link splintAnnotation	Comment
+hi def link splintAnnError		splintError
+hi def link splintAnnError2	splintError
+hi def link splintFlag		SpecialComment
+hi def link splintGlobalFlag	splintError
+hi def link splintSpecialAnnot	splintAnnKey
+hi def link splintStateAnnot	splintAnnKey
+hi def link splintSpecTag		splintAnnKey
+hi def link splintModifies		splintAnnKey
+hi def link splintRequires		splintAnnKey
+hi def link splintGlobals		splintAnnKey
+hi def link splintGlobitem		Constant
+hi def link splintGlobannot	splintAnnKey
+hi def link splintWarning		splintAnnKey
+hi def link splintModitem		Constant
+hi def link splintIter		splintAnnKey
+hi def link splintConst		splintAnnKey
+hi def link splintAlt		splintAnnKey
+hi def link splintType		splintAnnKey
+hi def link splintGlobalType	splintAnnKey
+hi def link splintMemMgm		splintAnnKey
+hi def link splintAlias		splintAnnKey
+hi def link splintExposure		splintAnnKey
+hi def link splintDefState		splintAnnKey
+hi def link splintGlobState	splintAnnKey
+hi def link splintNullState	splintAnnKey
+hi def link splintNullPred		splintAnnKey
+hi def link splintExit		splintAnnKey
+hi def link splintExec		splintAnnKey
+hi def link splintSef		splintAnnKey
+hi def link splintDecl		splintAnnKey
+hi def link splintCase		splintAnnKey
+hi def link splintBreak		splintAnnKey
+hi def link splintUnreach		splintAnnKey
+hi def link splintSpecFunc		splintAnnKey
+hi def link splintErrSupp		splintAnnKey
+hi def link splintTypeAcc		splintAnnKey
+hi def link splintMacro		splintAnnKey
+hi def link splintSpecType		splintAnnKey
+hi def link splintAnnKey		Type
+hi def link splintError		Error
 
-delcommand HiLink
 
 let b:current_syntax = "splint"
 
diff --git a/runtime/syntax/spup.vim b/runtime/syntax/spup.vim
index 96e0f58a0e..743c7b5711 100644
--- a/runtime/syntax/spup.vim
+++ b/runtime/syntax/spup.vim
@@ -204,65 +204,63 @@ syn sync match spupSyncUnit       grouphere spupUnit       "^UNIT"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink spupCdi	    spupSection
-HiLink spupConditions   spupSection
-HiLink spupDeclare	    spupSection
-HiLink spupEstimation   spupSection
-HiLink spupExternal	    spupSection
-HiLink spupFlowsheet    spupSection
-HiLink spupFunction	    spupSection
-HiLink spupGlobal	    spupSection
-HiLink spupHomotopy	    spupSection
-HiLink spupMacro	    spupSection
-HiLink spupModel	    spupSection
-HiLink spupOperation    spupSection
-HiLink spupOptions	    spupSection
-HiLink spupProcedure    spupSection
-HiLink spupProfiles	    spupSection
-HiLink spupReport	    spupSection
-HiLink spupTitle	    spupConstant  " this is correct, truly ;)
-HiLink spupUnit	    spupSection
+hi def link spupCdi	    spupSection
+hi def link spupConditions   spupSection
+hi def link spupDeclare	    spupSection
+hi def link spupEstimation   spupSection
+hi def link spupExternal	    spupSection
+hi def link spupFlowsheet    spupSection
+hi def link spupFunction	    spupSection
+hi def link spupGlobal	    spupSection
+hi def link spupHomotopy	    spupSection
+hi def link spupMacro	    spupSection
+hi def link spupModel	    spupSection
+hi def link spupOperation    spupSection
+hi def link spupOptions	    spupSection
+hi def link spupProcedure    spupSection
+hi def link spupProfiles	    spupSection
+hi def link spupReport	    spupSection
+hi def link spupTitle	    spupConstant  " this is correct, truly ;)
+hi def link spupUnit	    spupSection
 
-HiLink spupCdiSubs	      spupSubs
-HiLink spupConditionsSubs spupSubs
-HiLink spupDeclareSubs    spupSubs
-HiLink spupEstimationSubs spupSubs
-HiLink spupExternalSubs   spupSubs
-HiLink spupFlowsheetSubs  spupSubs
-HiLink spupFunctionSubs   spupSubs
-HiLink spupHomotopySubs   spupSubs
-HiLink spupMacroSubs      spupSubs
-HiLink spupModelSubs      spupSubs
-HiLink spupOperationSubs  spupSubs
-HiLink spupOptionsSubs    spupSubs
-HiLink spupProcedureSubs  spupSubs
-HiLink spupReportSubs     spupSubs
-HiLink spupUnitSubs	      spupSubs
+hi def link spupCdiSubs	      spupSubs
+hi def link spupConditionsSubs spupSubs
+hi def link spupDeclareSubs    spupSubs
+hi def link spupEstimationSubs spupSubs
+hi def link spupExternalSubs   spupSubs
+hi def link spupFlowsheetSubs  spupSubs
+hi def link spupFunctionSubs   spupSubs
+hi def link spupHomotopySubs   spupSubs
+hi def link spupMacroSubs      spupSubs
+hi def link spupModelSubs      spupSubs
+hi def link spupOperationSubs  spupSubs
+hi def link spupOptionsSubs    spupSubs
+hi def link spupProcedureSubs  spupSubs
+hi def link spupReportSubs     spupSubs
+hi def link spupUnitSubs	      spupSubs
 
-HiLink spupCode	       Normal
-HiLink spupComment	       Comment
-HiLink spupComment2	       spupComment
-HiLink spupConditional     Statement
-HiLink spupConstant	       Constant
-HiLink spupError	       Error
-HiLink spupHelp	       Normal
-HiLink spupIdentifier      Identifier
-HiLink spupNumber	       Constant
-HiLink spupOperator	       Special
-HiLink spupOpenBrace       spupError
-HiLink spupSection	       Statement
-HiLink spupSpecial	       spupTextprocGeneric
-HiLink spupStreams	       Type
-HiLink spupString	       Constant
-HiLink spupSubs	       Statement
-HiLink spupSymbol	       Special
-HiLink spupTextprocError   Normal
-HiLink spupTextprocGeneric PreProc
-HiLink spupTypes	       Type
+hi def link spupCode	       Normal
+hi def link spupComment	       Comment
+hi def link spupComment2	       spupComment
+hi def link spupConditional     Statement
+hi def link spupConstant	       Constant
+hi def link spupError	       Error
+hi def link spupHelp	       Normal
+hi def link spupIdentifier      Identifier
+hi def link spupNumber	       Constant
+hi def link spupOperator	       Special
+hi def link spupOpenBrace       spupError
+hi def link spupSection	       Statement
+hi def link spupSpecial	       spupTextprocGeneric
+hi def link spupStreams	       Type
+hi def link spupString	       Constant
+hi def link spupSubs	       Statement
+hi def link spupSymbol	       Special
+hi def link spupTextprocError   Normal
+hi def link spupTextprocGeneric PreProc
+hi def link spupTypes	       Type
 
-delcommand HiLink
 
 let b:current_syntax = "spup"
 
diff --git a/runtime/syntax/sqlforms.vim b/runtime/syntax/sqlforms.vim
index 358349c463..6077dd1e94 100644
--- a/runtime/syntax/sqlforms.vim
+++ b/runtime/syntax/sqlforms.vim
@@ -131,23 +131,21 @@ syntax match sqlNumber  "-\=\<[0-9]*\.\=[0-9_]\>"
 
 syntax sync ccomment sqlComment
 
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sqlComment Comment
-HiLink sqlKeyword Statement
-HiLink sqlNumber Number
-HiLink sqlOperator Statement
-HiLink sqlProcedure Statement
-HiLink sqlFunction Statement
-HiLink sqlSystem Identifier
-HiLink sqlSpecial Special
-HiLink sqlStatement Statement
-HiLink sqlString String
-HiLink sqlType Type
-HiLink sqlCodes Identifier
-HiLink sqlTriggers PreProc
+hi def link sqlComment Comment
+hi def link sqlKeyword Statement
+hi def link sqlNumber Number
+hi def link sqlOperator Statement
+hi def link sqlProcedure Statement
+hi def link sqlFunction Statement
+hi def link sqlSystem Identifier
+hi def link sqlSpecial Special
+hi def link sqlStatement Statement
+hi def link sqlString String
+hi def link sqlType Type
+hi def link sqlCodes Identifier
+hi def link sqlTriggers PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "sqlforms"
 
diff --git a/runtime/syntax/sqlinformix.vim b/runtime/syntax/sqlinformix.vim
index 20a88acf4b..e01912bc40 100644
--- a/runtime/syntax/sqlinformix.vim
+++ b/runtime/syntax/sqlinformix.vim
@@ -152,34 +152,32 @@ syn keyword sqlTodo TODO FIXME XXX DEBUG NOTE
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 
 " === Comment syntax group ===
-HiLink sqlComment	Comment
+hi def link sqlComment	Comment
 
 " === Constant syntax group ===
-HiLink sqlNumber	Number
-HiLink sqlBoolean	Boolean
-HiLink sqlString	String
+hi def link sqlNumber	Number
+hi def link sqlBoolean	Boolean
+hi def link sqlString	String
 
 " === Statment syntax group ===
-HiLink sqlStatement	Statement
-HiLink sqlConditional	Conditional
-HiLink sqlRepeat		Repeat
-HiLink sqlKeyword		Keyword
-HiLink sqlOperator	Operator
-HiLink sqlException	Exception
+hi def link sqlStatement	Statement
+hi def link sqlConditional	Conditional
+hi def link sqlRepeat		Repeat
+hi def link sqlKeyword		Keyword
+hi def link sqlOperator	Operator
+hi def link sqlException	Exception
 
 " === Identifier syntax group ===
-HiLink sqlFunction	Function
+hi def link sqlFunction	Function
 
 " === Type syntax group ===
-HiLink sqlType	Type
+hi def link sqlType	Type
 
 " === Todo syntax group ===
-HiLink sqlTodo	Todo
+hi def link sqlTodo	Todo
 
-delcommand HiLink
 
 let b:current_syntax = "sqlinformix"
diff --git a/runtime/syntax/sqlj.vim b/runtime/syntax/sqlj.vim
index ea8d7ecb6c..c901145c3c 100644
--- a/runtime/syntax/sqlj.vim
+++ b/runtime/syntax/sqlj.vim
@@ -74,20 +74,18 @@ syn match sqlComment	"--.*"
 
 syn sync ccomment sqljComment
 
-command! -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later.
-HiLink sqljComment	Comment
-HiLink sqljKeyword	sqljSpecial
-HiLink sqljNumber	Number
-HiLink sqljOperator	sqljStatement
-HiLink sqljSpecial	Special
-HiLink sqljStatement	Statement
-HiLink sqljString	String
-HiLink sqljType	Type
-HiLink sqljPre	PreProc
+hi def link sqljComment	Comment
+hi def link sqljKeyword	sqljSpecial
+hi def link sqljNumber	Number
+hi def link sqljOperator	sqljStatement
+hi def link sqljSpecial	Special
+hi def link sqljStatement	Statement
+hi def link sqljString	String
+hi def link sqljType	Type
+hi def link sqljPre	PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "sqlj"
 
diff --git a/runtime/syntax/sqloracle.vim b/runtime/syntax/sqloracle.vim
index f9e24af98c..bf2862f497 100644
--- a/runtime/syntax/sqloracle.vim
+++ b/runtime/syntax/sqloracle.vim
@@ -128,19 +128,17 @@ syn keyword sqlFunction	xmlparse xmlpatch xmlpi xmlquery xmlroot xmlsequence xml
 syn keyword sqlTodo TODO FIXME XXX DEBUG NOTE contained
 
 " Define the default highlighting.
-command -nargs=+ HiLink hi def link <args>
-HiLink Quote            Special
-HiLink sqlComment	Comment
-HiLink sqlFunction	Function
-HiLink sqlKeyword	sqlSpecial
-HiLink sqlNumber	Number
-HiLink sqlOperator	sqlStatement
-HiLink sqlSpecial	Special
-HiLink sqlStatement	Statement
-HiLink sqlString	String
-HiLink sqlType		Type
-HiLink sqlTodo		Todo
+hi def link Quote            Special
+hi def link sqlComment	Comment
+hi def link sqlFunction	Function
+hi def link sqlKeyword	sqlSpecial
+hi def link sqlNumber	Number
+hi def link sqlOperator	sqlStatement
+hi def link sqlSpecial	Special
+hi def link sqlStatement	Statement
+hi def link sqlString	String
+hi def link sqlType		Type
+hi def link sqlTodo		Todo
 
-delcommand HiLink
 let b:current_syntax = "sql"
 " vim: ts=8
diff --git a/runtime/syntax/sqr.vim b/runtime/syntax/sqr.vim
index 7e73443571..40b48358c6 100644
--- a/runtime/syntax/sqr.vim
+++ b/runtime/syntax/sqr.vim
@@ -236,28 +236,26 @@ syn match	sqrError	/.\+\zs!!.*/
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sqrSection Statement
-HiLink sqrParagraph Statement
-HiLink sqrReserved Statement
-HiLink sqrParameter Statement
-HiLink sqrPreProc PreProc
-HiLink sqrSubstVar PreProc
-HiLink sqrCommand Statement
-HiLink sqrParam Type
-HiLink sqrFunction Special
+hi def link sqrSection Statement
+hi def link sqrParagraph Statement
+hi def link sqrReserved Statement
+hi def link sqrParameter Statement
+hi def link sqrPreProc PreProc
+hi def link sqrSubstVar PreProc
+hi def link sqrCommand Statement
+hi def link sqrParam Type
+hi def link sqrFunction Special
 
-HiLink sqrString String
-HiLink sqrStrOpen Todo
-HiLink sqrNumber Number
-HiLink sqrVariable Identifier
+hi def link sqrString String
+hi def link sqrStrOpen Todo
+hi def link sqrNumber Number
+hi def link sqrVariable Identifier
 
-HiLink sqrComment Comment
-HiLink sqrTodo Todo
-HiLink sqrError Error
+hi def link sqrComment Comment
+hi def link sqrTodo Todo
+hi def link sqrError Error
 
-delcommand HiLink
 
 let b:current_syntax = "sqr"
 
diff --git a/runtime/syntax/squid.vim b/runtime/syntax/squid.vim
index ee2b854ad4..a8abd180a0 100644
--- a/runtime/syntax/squid.vim
+++ b/runtime/syntax/squid.vim
@@ -121,21 +121,19 @@ syn sync minlines=3
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink squidTodo	Todo
-HiLink squidComment	Comment
-HiLink squidTag	Special
-HiLink squidConf	Keyword
-HiLink squidOpt	Constant
-HiLink squidAction	String
-HiLink squidNumber	Number
-HiLink squidIP	Number
-HiLink squidAcl	Keyword
-HiLink squidStr	String
-HiLink squidRegexOpt	Special
+hi def link squidTodo	Todo
+hi def link squidComment	Comment
+hi def link squidTag	Special
+hi def link squidConf	Keyword
+hi def link squidOpt	Constant
+hi def link squidAction	String
+hi def link squidNumber	Number
+hi def link squidIP	Number
+hi def link squidAcl	Keyword
+hi def link squidStr	String
+hi def link squidRegexOpt	Special
 
-delcommand HiLink
 
 let b:current_syntax = "squid"
 
diff --git a/runtime/syntax/srec.vim b/runtime/syntax/srec.vim
index 834cec7baa..6ac22d9062 100644
--- a/runtime/syntax/srec.vim
+++ b/runtime/syntax/srec.vim
@@ -61,24 +61,22 @@ syn match srecChecksum "[0-9a-fA-F]\{2}$" contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting. Can be overridden later
-HiLink srecRecStart            srecRecType
-HiLink srecRecTypeUnknown      srecRecType
-HiLink srecRecType             WarningMsg
-HiLink srecByteCount           Constant
+hi def link srecRecStart            srecRecType
+hi def link srecRecTypeUnknown      srecRecType
+hi def link srecRecType             WarningMsg
+hi def link srecByteCount           Constant
 hi def srecAddressFieldUnknown term=italic cterm=italic gui=italic
-HiLink srecNoAddress           DiffAdd
-HiLink srecDataAddress         Comment
-HiLink srecRecCount            srecNoAddress
-HiLink srecStartAddress        srecDataAddress
+hi def link srecNoAddress           DiffAdd
+hi def link srecDataAddress         Comment
+hi def link srecRecCount            srecNoAddress
+hi def link srecStartAddress        srecDataAddress
 hi def srecDataOdd             term=bold cterm=bold gui=bold
 hi def srecDataEven            term=NONE cterm=NONE gui=NONE
-HiLink srecDataUnexpected      Error
-HiLink srecChecksum            DiffChange
+hi def link srecDataUnexpected      Error
+hi def link srecChecksum            DiffChange
 
-delcommand HiLink
 
 let b:current_syntax = "srec"
 
diff --git a/runtime/syntax/sshconfig.vim b/runtime/syntax/sshconfig.vim
index 051b2f9a8a..8401923e02 100644
--- a/runtime/syntax/sshconfig.vim
+++ b/runtime/syntax/sshconfig.vim
@@ -226,33 +226,31 @@ syn keyword sshconfigKeyword VisualHostKey
 syn keyword sshconfigKeyword XAuthLocation
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sshconfigComment        Comment
-HiLink sshconfigTodo           Todo
-HiLink sshconfigHostPort       sshconfigConstant
-HiLink sshconfigNumber         sshconfigConstant
-HiLink sshconfigConstant       Constant
-HiLink sshconfigYesNo          sshconfigEnum
-HiLink sshconfigCipher         sshconfigEnum
-HiLink sshconfigCiphers	 sshconfigEnum
-HiLink sshconfigMAC            sshconfigEnum
-HiLink sshconfigHostKeyAlgo    sshconfigEnum
-HiLink sshconfigLogLevel       sshconfigEnum
-HiLink sshconfigSysLogFacility sshconfigEnum
-HiLink sshconfigAddressFamily  sshconfigEnum
-HiLink sshconfigIPQoS		 sshconfigEnum
-HiLink sshconfigKbdInteractive sshconfigEnum
-HiLink sshconfigKexAlgo	 sshconfigEnum
-HiLink sshconfigTunnel	 sshconfigEnum
-HiLink sshconfigPreferredAuth  sshconfigEnum
-HiLink sshconfigVar            sshconfigEnum
-HiLink sshconfigEnum           Identifier
-HiLink sshconfigSpecial        Special
-HiLink sshconfigKeyword        Keyword
-HiLink sshconfigHostSect       Type
-HiLink sshconfigMatch          Type
-delcommand HiLink
+hi def link sshconfigComment        Comment
+hi def link sshconfigTodo           Todo
+hi def link sshconfigHostPort       sshconfigConstant
+hi def link sshconfigNumber         sshconfigConstant
+hi def link sshconfigConstant       Constant
+hi def link sshconfigYesNo          sshconfigEnum
+hi def link sshconfigCipher         sshconfigEnum
+hi def link sshconfigCiphers	 sshconfigEnum
+hi def link sshconfigMAC            sshconfigEnum
+hi def link sshconfigHostKeyAlgo    sshconfigEnum
+hi def link sshconfigLogLevel       sshconfigEnum
+hi def link sshconfigSysLogFacility sshconfigEnum
+hi def link sshconfigAddressFamily  sshconfigEnum
+hi def link sshconfigIPQoS		 sshconfigEnum
+hi def link sshconfigKbdInteractive sshconfigEnum
+hi def link sshconfigKexAlgo	 sshconfigEnum
+hi def link sshconfigTunnel	 sshconfigEnum
+hi def link sshconfigPreferredAuth  sshconfigEnum
+hi def link sshconfigVar            sshconfigEnum
+hi def link sshconfigEnum           Identifier
+hi def link sshconfigSpecial        Special
+hi def link sshconfigKeyword        Keyword
+hi def link sshconfigHostSect       Type
+hi def link sshconfigMatch          Type
 
 let b:current_syntax = "sshconfig"
 
diff --git a/runtime/syntax/sshdconfig.vim b/runtime/syntax/sshdconfig.vim
index 28b8acaf60..1556258b25 100644
--- a/runtime/syntax/sshdconfig.vim
+++ b/runtime/syntax/sshdconfig.vim
@@ -232,36 +232,34 @@ syn keyword sshdconfigKeyword XAuthLocation
 
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink sshdconfigComment              Comment
-HiLink sshdconfigTodo                 Todo
-HiLink sshdconfigHostPort             sshdconfigConstant
-HiLink sshdconfigTime                 sshdconfigConstant
-HiLink sshdconfigNumber               sshdconfigConstant
-HiLink sshdconfigConstant             Constant
-HiLink sshdconfigYesNo                sshdconfigEnum
-HiLink sshdconfigAddressFamily        sshdconfigEnum
-HiLink sshdconfigPrivilegeSeparation  sshdconfigEnum
-HiLink sshdconfigTcpForwarding        sshdconfigEnum
-HiLink sshdconfigRootLogin            sshdconfigEnum
-HiLink sshdconfigCiphers              sshdconfigEnum
-HiLink sshdconfigMAC                  sshdconfigEnum
-HiLink sshdconfigHostKeyAlgo          sshdconfigEnum
-HiLink sshdconfigRootLogin            sshdconfigEnum
-HiLink sshdconfigLogLevel             sshdconfigEnum
-HiLink sshdconfigSysLogFacility       sshdconfigEnum
-HiLink sshdconfigVar                  sshdconfigEnum
-HiLink sshdconfigCompression          sshdconfigEnum
-HiLink sshdconfigIPQoS                sshdconfigEnum
-HiLink sshdconfigKexAlgo              sshdconfigEnum
-HiLink sshdconfigTunnel               sshdconfigEnum
-HiLink sshdconfigSubsystem            sshdconfigEnum
-HiLink sshdconfigEnum                 Function
-HiLink sshdconfigSpecial              Special
-HiLink sshdconfigKeyword              Keyword
-HiLink sshdconfigMatch                Type
-delcommand HiLink
+hi def link sshdconfigComment              Comment
+hi def link sshdconfigTodo                 Todo
+hi def link sshdconfigHostPort             sshdconfigConstant
+hi def link sshdconfigTime                 sshdconfigConstant
+hi def link sshdconfigNumber               sshdconfigConstant
+hi def link sshdconfigConstant             Constant
+hi def link sshdconfigYesNo                sshdconfigEnum
+hi def link sshdconfigAddressFamily        sshdconfigEnum
+hi def link sshdconfigPrivilegeSeparation  sshdconfigEnum
+hi def link sshdconfigTcpForwarding        sshdconfigEnum
+hi def link sshdconfigRootLogin            sshdconfigEnum
+hi def link sshdconfigCiphers              sshdconfigEnum
+hi def link sshdconfigMAC                  sshdconfigEnum
+hi def link sshdconfigHostKeyAlgo          sshdconfigEnum
+hi def link sshdconfigRootLogin            sshdconfigEnum
+hi def link sshdconfigLogLevel             sshdconfigEnum
+hi def link sshdconfigSysLogFacility       sshdconfigEnum
+hi def link sshdconfigVar                  sshdconfigEnum
+hi def link sshdconfigCompression          sshdconfigEnum
+hi def link sshdconfigIPQoS                sshdconfigEnum
+hi def link sshdconfigKexAlgo              sshdconfigEnum
+hi def link sshdconfigTunnel               sshdconfigEnum
+hi def link sshdconfigSubsystem            sshdconfigEnum
+hi def link sshdconfigEnum                 Function
+hi def link sshdconfigSpecial              Special
+hi def link sshdconfigKeyword              Keyword
+hi def link sshdconfigMatch                Type
 
 let b:current_syntax = "sshdconfig"
 
diff --git a/runtime/syntax/st.vim b/runtime/syntax/st.vim
index 1071caa7b1..8160c7704a 100644
--- a/runtime/syntax/st.vim
+++ b/runtime/syntax/st.vim
@@ -75,21 +75,19 @@ syn sync minlines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink stKeyword		Statement
-HiLink stMethod		Statement
-HiLink stComment		Comment
-HiLink stCharacter		Constant
-HiLink stString		Constant
-HiLink stSymbol		Special
-HiLink stNumber		Type
-HiLink stFloat		Type
-HiLink stError		Error
-HiLink stLocalVariables	Identifier
-HiLink stBlockVariable	Identifier
+hi def link stKeyword		Statement
+hi def link stMethod		Statement
+hi def link stComment		Comment
+hi def link stCharacter		Constant
+hi def link stString		Constant
+hi def link stSymbol		Special
+hi def link stNumber		Type
+hi def link stFloat		Type
+hi def link stError		Error
+hi def link stLocalVariables	Identifier
+hi def link stBlockVariable	Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "st"
 
diff --git a/runtime/syntax/stp.vim b/runtime/syntax/stp.vim
index fbd659682d..2992d8be47 100644
--- a/runtime/syntax/stp.vim
+++ b/runtime/syntax/stp.vim
@@ -129,27 +129,25 @@ syn sync minlines=10 maxlines=100
 
 " Define the default highlighting.
 " Only when and item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink stpConditional Conditional
-HiLink stpComment Comment
-HiLink stpKeyword Keyword
-HiLink stpNumber Number
-HiLink stpOperator Operator
-HiLink stpSpecial Special
-HiLink stpStatement Statement
-HiLink stpString String
-HiLink stpStringError Error
-HiLink stpType Type
-HiLink stpTodo Todo
-HiLink stpFunction Function
-HiLink stpGlobals Macro
-HiLink stpParen Normal
-HiLink stpParenError Error
-HiLink stpSQLKeyword Function
-HiLink stpRepeat Repeat
+hi def link stpConditional Conditional
+hi def link stpComment Comment
+hi def link stpKeyword Keyword
+hi def link stpNumber Number
+hi def link stpOperator Operator
+hi def link stpSpecial Special
+hi def link stpStatement Statement
+hi def link stpString String
+hi def link stpStringError Error
+hi def link stpType Type
+hi def link stpTodo Todo
+hi def link stpFunction Function
+hi def link stpGlobals Macro
+hi def link stpParen Normal
+hi def link stpParenError Error
+hi def link stpSQLKeyword Function
+hi def link stpRepeat Repeat
 
-delcommand HiLink
 
 let b:current_syntax = "stp"
 
diff --git a/runtime/syntax/strace.vim b/runtime/syntax/strace.vim
index 45b70071a0..206c58919e 100644
--- a/runtime/syntax/strace.vim
+++ b/runtime/syntax/strace.vim
@@ -32,24 +32,22 @@ syn match straceOperator "[-+=*/!%&|:,]"
 syn region straceComment start="/\*" end="\*/" oneline
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink straceComment Comment
-HiLink straceVerbosed Comment
-HiLink stracePID PreProc
-HiLink straceNumber Number
-HiLink straceNumberRHS Type
-HiLink straceOtherRHS Type
-HiLink straceString String
-HiLink straceConstant Function
-HiLink straceEquals Type
-HiLink straceSysCallEmbed straceSysCall
-HiLink straceSysCall Statement
-HiLink straceParenthesis Statement
-HiLink straceOperator Normal
-HiLink straceSpecialChar Special
-HiLink straceOtherPID PreProc
+hi def link straceComment Comment
+hi def link straceVerbosed Comment
+hi def link stracePID PreProc
+hi def link straceNumber Number
+hi def link straceNumberRHS Type
+hi def link straceOtherRHS Type
+hi def link straceString String
+hi def link straceConstant Function
+hi def link straceEquals Type
+hi def link straceSysCallEmbed straceSysCall
+hi def link straceSysCall Statement
+hi def link straceParenthesis Statement
+hi def link straceOperator Normal
+hi def link straceSpecialChar Special
+hi def link straceOtherPID PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "strace"
diff --git a/runtime/syntax/svn.vim b/runtime/syntax/svn.vim
index 8b83753896..6239790f12 100644
--- a/runtime/syntax/svn.vim
+++ b/runtime/syntax/svn.vim
@@ -40,19 +40,17 @@ syn sync match svnSync  grouphere svnRegion "^--.*--$"me=s-1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet.
-command -nargs=+ HiLink hi def link <args>
 
-HiLink svnSummary     Keyword
-HiLink svnBlank       Error
+hi def link svnSummary     Keyword
+hi def link svnBlank       Error
 
-HiLink svnRegion      Comment
-HiLink svnDelimiter   NonText
-HiLink svnRemoved     Constant
-HiLink svnAdded       Identifier
-HiLink svnModified    Special
-HiLink svnProperty    Special
-HiLink svnRenamed     Special
+hi def link svnRegion      Comment
+hi def link svnDelimiter   NonText
+hi def link svnRemoved     Constant
+hi def link svnAdded       Identifier
+hi def link svnModified    Special
+hi def link svnProperty    Special
+hi def link svnRenamed     Special
 
-delcommand HiLink
 
 let b:current_syntax = "svn"
diff --git a/runtime/syntax/systemverilog.vim b/runtime/syntax/systemverilog.vim
index 94074bd083..f99ea8d889 100644
--- a/runtime/syntax/systemverilog.vim
+++ b/runtime/syntax/systemverilog.vim
@@ -69,18 +69,16 @@ syn keyword systemverilogStatement   implements
 syn keyword systemverilogStatement   interconnect soft nettype
 
 " Define the default highlighting.
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink systemverilogStatement       Statement
-HiLink systemverilogTypeDef         TypeDef
-HiLink systemverilogConditional     Conditional
-HiLink systemverilogRepeat          Repeat
-HiLink systemverilogLabel           Label
-HiLink systemverilogGlobal          Define
-HiLink systemverilogNumber          Number
+hi def link systemverilogStatement       Statement
+hi def link systemverilogTypeDef         TypeDef
+hi def link systemverilogConditional     Conditional
+hi def link systemverilogRepeat          Repeat
+hi def link systemverilogLabel           Label
+hi def link systemverilogGlobal          Define
+hi def link systemverilogNumber          Number
 
-delcommand HiLink
 
 let b:current_syntax = "systemverilog"
 
diff --git a/runtime/syntax/tads.vim b/runtime/syntax/tads.vim
index 0f63bea2fe..23a65b99ec 100644
--- a/runtime/syntax/tads.vim
+++ b/runtime/syntax/tads.vim
@@ -120,48 +120,46 @@ execute "syn sync maxlines=" . tads_sync_dist
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
-HiLink tadsFunctionDef Function
-HiLink tadsFunction  Structure
-HiLink tadsClass     Structure
-HiLink tadsClassDef  Identifier
-HiLink tadsObjectDef Identifier
+hi def link tadsFunctionDef Function
+hi def link tadsFunction  Structure
+hi def link tadsClass     Structure
+hi def link tadsClassDef  Identifier
+hi def link tadsObjectDef Identifier
 " no highlight for tadsEmbedded, so it prints as normal text w/in the string
 
-HiLink tadsOperator	Operator
-HiLink tadsStructure	Structure
-HiLink tadsTodo	Todo
-HiLink tadsLabel	Label
-HiLink tadsConditional	Conditional
-HiLink tadsRepeat	Repeat
-HiLink tadsException	Exception
-HiLink tadsStatement	Statement
-HiLink tadsStorageClass	StorageClass
-HiLink tadsKeyWord   Keyword
-HiLink tadsSpecial	SpecialChar
-HiLink tadsNumber	Number
-HiLink tadsBoolean	Boolean
-HiLink tadsDoubleString	tadsString
-HiLink tadsSingleString	tadsString
+hi def link tadsOperator	Operator
+hi def link tadsStructure	Structure
+hi def link tadsTodo	Todo
+hi def link tadsLabel	Label
+hi def link tadsConditional	Conditional
+hi def link tadsRepeat	Repeat
+hi def link tadsException	Exception
+hi def link tadsStatement	Statement
+hi def link tadsStorageClass	StorageClass
+hi def link tadsKeyWord   Keyword
+hi def link tadsSpecial	SpecialChar
+hi def link tadsNumber	Number
+hi def link tadsBoolean	Boolean
+hi def link tadsDoubleString	tadsString
+hi def link tadsSingleString	tadsString
 
-HiLink tadsOctalError	tadsError
-HiLink tadsCommentError	tadsError
-HiLink tadsBraceError	tadsError
-HiLink tadsInBrace	tadsError
-HiLink tadsError	Error
+hi def link tadsOctalError	tadsError
+hi def link tadsCommentError	tadsError
+hi def link tadsBraceError	tadsError
+hi def link tadsInBrace	tadsError
+hi def link tadsError	Error
 
-HiLink tadsInclude	Include
-HiLink tadsPreProc	PreProc
-HiLink tadsDefine	Macro
-HiLink tadsIncluded	tadsString
-HiLink tadsPreCondit	PreCondit
+hi def link tadsInclude	Include
+hi def link tadsPreProc	PreProc
+hi def link tadsDefine	Macro
+hi def link tadsIncluded	tadsString
+hi def link tadsPreCondit	PreCondit
 
-HiLink tadsString	String
-HiLink tadsComment	Comment
+hi def link tadsString	String
+hi def link tadsComment	Comment
 
-delcommand HiLink
 
 
 let b:current_syntax = "tads"
diff --git a/runtime/syntax/tags.vim b/runtime/syntax/tags.vim
index a7044c04ec..3980f84a30 100644
--- a/runtime/syntax/tags.vim
+++ b/runtime/syntax/tags.vim
@@ -1,7 +1,7 @@
 " Language:		tags
 " Maintainer:	Charles E. Campbell  <NdrOchip@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:		4
+" Last Change:	Aug 31, 2016
+" Version:		6
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TAGS
 
 " quit when a syntax file was already loaded
@@ -19,17 +19,16 @@ syn match	tagComment	"^!_TAG_.*$"
 syn match	tagField	contained "[a-z]*:"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_drchip_tags_inits")
 
-HiLink tagBaseFile	PreProc
-HiLink tagComment	Comment
-HiLink tagDelim	Delimiter
-HiLink tagField	Number
-HiLink tagName	Identifier
-HiLink tagPath	PreProc
+  hi def link tagBaseFile	PreProc
+  hi def link tagComment	Comment
+  hi def link tagDelim	Delimiter
+  hi def link tagField	Number
+  hi def link tagName	Identifier
+  hi def link tagPath	PreProc
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "tags"
 
diff --git a/runtime/syntax/tak.vim b/runtime/syntax/tak.vim
index b363ea33c6..7a8fceb860 100644
--- a/runtime/syntax/tak.vim
+++ b/runtime/syntax/tak.vim
@@ -89,31 +89,29 @@ endif
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink takMacro		Macro
-HiLink takOptions		Special
-HiLink takRoutine		Type
-HiLink takControl		Special
-HiLink takSolids		Special
-HiLink takSolidsArg		Statement
-HiLink takIdentifier		Identifier
+hi def link takMacro		Macro
+hi def link takOptions		Special
+hi def link takRoutine		Type
+hi def link takControl		Special
+hi def link takSolids		Special
+hi def link takSolidsArg		Statement
+hi def link takIdentifier		Identifier
 
-HiLink takFortran		PreProc
-HiLink takMotran		PreProc
+hi def link takFortran		PreProc
+hi def link takMotran		PreProc
 
-HiLink takComment		Comment
-HiLink takHeader		Typedef
-HiLink takIncludeFile		Type
-HiLink takInteger		Number
-HiLink takFloat		Float
-HiLink takScientific		Float
+hi def link takComment		Comment
+hi def link takHeader		Typedef
+hi def link takIncludeFile		Type
+hi def link takInteger		Number
+hi def link takFloat		Float
+hi def link takScientific		Float
 
-HiLink takEndData		Macro
+hi def link takEndData		Macro
 
-HiLink takTodo		Todo
+hi def link takTodo		Todo
 
-delcommand HiLink
 
 
 let b:current_syntax = "tak"
diff --git a/runtime/syntax/takcmp.vim b/runtime/syntax/takcmp.vim
index 6faddc2642..9426e02223 100644
--- a/runtime/syntax/takcmp.vim
+++ b/runtime/syntax/takcmp.vim
@@ -49,21 +49,19 @@ syn case ignore
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink takcmpTitle		   Type
-HiLink takcmpUnit		   PreProc
+hi def link takcmpTitle		   Type
+hi def link takcmpUnit		   PreProc
 
-HiLink takcmpLabel		   Statement
+hi def link takcmpLabel		   Statement
 
-HiLink takcmpHeader		   takHeader
+hi def link takcmpHeader		   takHeader
 
-HiLink takcmpDate		   Identifier
-HiLink takcmpTime		   Identifier
-HiLink takcmpInteger		   Number
-HiLink takcmpFloat		   Special
+hi def link takcmpDate		   Identifier
+hi def link takcmpTime		   Identifier
+hi def link takcmpInteger		   Number
+hi def link takcmpFloat		   Special
 
-delcommand HiLink
 
 
 let b:current_syntax = "takcmp"
diff --git a/runtime/syntax/takout.vim b/runtime/syntax/takout.vim
index ed69ff0a21..5e5d360767 100644
--- a/runtime/syntax/takout.vim
+++ b/runtime/syntax/takout.vim
@@ -64,22 +64,20 @@ syn match takoutError	     "<<< Error >>>"
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink takoutPos		   Statement
-HiLink takoutNeg		   PreProc
-HiLink takoutTitle		   Type
-HiLink takoutFile		   takIncludeFile
-HiLink takoutInteger		   takInteger
+hi def link takoutPos		   Statement
+hi def link takoutNeg		   PreProc
+hi def link takoutTitle		   Type
+hi def link takoutFile		   takIncludeFile
+hi def link takoutInteger		   takInteger
 
-HiLink takoutSectionDelim	    Delimiter
-HiLink takoutSectionTitle	   Exception
-HiLink takoutHeaderDelim	   SpecialComment
-HiLink takoutLabel		   Identifier
+hi def link takoutSectionDelim	    Delimiter
+hi def link takoutSectionTitle	   Exception
+hi def link takoutHeaderDelim	   SpecialComment
+hi def link takoutLabel		   Identifier
 
-HiLink takoutError		   Error
+hi def link takoutError		   Error
 
-delcommand HiLink
 
 
 let b:current_syntax = "takout"
diff --git a/runtime/syntax/tasm.vim b/runtime/syntax/tasm.vim
index 995e8b49d4..c9fc8186d0 100644
--- a/runtime/syntax/tasm.vim
+++ b/runtime/syntax/tasm.vim
@@ -93,23 +93,21 @@ syn match tasmBin "\<[01]\+B\>"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tasmString String
-HiLink tasmDec Number
-HiLink tasmHex Number
-HiLink tasmOct Number
-HiLink tasmBin Number
-HiLink tasmInstruction Keyword
-HiLink tasmCoprocInstr Keyword
-HiLink tasmMMXInst	Keyword
-HiLink tasmDirective PreProc
-HiLink tasmRegister Identifier
-HiLink tasmProctype PreProc
-HiLink tasmComment Comment
-HiLink tasmLabel Label
+hi def link tasmString String
+hi def link tasmDec Number
+hi def link tasmHex Number
+hi def link tasmOct Number
+hi def link tasmBin Number
+hi def link tasmInstruction Keyword
+hi def link tasmCoprocInstr Keyword
+hi def link tasmMMXInst	Keyword
+hi def link tasmDirective PreProc
+hi def link tasmRegister Identifier
+hi def link tasmProctype PreProc
+hi def link tasmComment Comment
+hi def link tasmLabel Label
 
-delcommand HiLink
 
 let b:curret_syntax = "tasm"
 
diff --git a/runtime/syntax/tcl.vim b/runtime/syntax/tcl.vim
index ff51c140e5..64efd6fec4 100644
--- a/runtime/syntax/tcl.vim
+++ b/runtime/syntax/tcl.vim
@@ -236,40 +236,38 @@ syn region  tclComment		start=/;\s*\#/hs=s+1 skip="\\$" end="$" contains=tclTodo
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tcltkSwitch		Special
-HiLink tclExpand		Special
-HiLink tclLabel		Label
-HiLink tclConditional		Conditional
-HiLink tclRepeat		Repeat
-HiLink tclNumber		Number
-HiLink tclError		Error
-HiLink tclCommand		Statement
-HiLink tclProcCommand		Type
-HiLink tclString		String
-HiLink tclComment		Comment
-HiLink tclSpecial		Special
-HiLink tclTodo		Todo
+hi def link tcltkSwitch		Special
+hi def link tclExpand		Special
+hi def link tclLabel		Label
+hi def link tclConditional		Conditional
+hi def link tclRepeat		Repeat
+hi def link tclNumber		Number
+hi def link tclError		Error
+hi def link tclCommand		Statement
+hi def link tclProcCommand		Type
+hi def link tclString		String
+hi def link tclComment		Comment
+hi def link tclSpecial		Special
+hi def link tclTodo		Todo
 " Below here are the commands and their options.
-HiLink tcltkCommandColor	Statement
-HiLink tcltkWidgetColor	Structure
-HiLink tclLineContinue	WarningMsg
+hi def link tcltkCommandColor	Statement
+hi def link tcltkWidgetColor	Structure
+hi def link tclLineContinue	WarningMsg
 if exists('g:tcl_warn_continuation')
-HiLink tclNotLineContinue	ErrorMsg
+hi def link tclNotLineContinue	ErrorMsg
 endif
-HiLink tcltkStringSwitch	Special
-HiLink tcltkArraySwitch	Special
-HiLink tcltkLsortSwitch	Special
-HiLink tcltkPackSwitch	Special
-HiLink tcltkPackConfSwitch	Special
-HiLink tcltkMaths		Special
-HiLink tcltkNamespaceSwitch	Special
-HiLink tcltkWidgetSwitch	Special
-HiLink tcltkPackConfColor	Identifier
-HiLink tclVarRef		Identifier
+hi def link tcltkStringSwitch	Special
+hi def link tcltkArraySwitch	Special
+hi def link tcltkLsortSwitch	Special
+hi def link tcltkPackSwitch	Special
+hi def link tcltkPackConfSwitch	Special
+hi def link tcltkMaths		Special
+hi def link tcltkNamespaceSwitch	Special
+hi def link tcltkWidgetSwitch	Special
+hi def link tcltkPackConfColor	Identifier
+hi def link tclVarRef		Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "tcl"
 
diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim
index 6cb27ea4ba..f4a0875da0 100644
--- a/runtime/syntax/tex.vim
+++ b/runtime/syntax/tex.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	TeX
 " Maintainer:	Charles E. Campbell <NdrchipO@ScampbellPfamily.AbizM>
-" Last Change:	Jul 05, 2016
-" Version:	98
+" Last Change:	Aug 31, 2016
+" Version:	100
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
 "
 " Notes: {{{1
@@ -48,12 +48,6 @@ let s:keepcpo= &cpo
 set cpo&vim
 scriptencoding utf-8
 
-" Define the default highlighting. {{{1
-" For version 5.7 and earlier: only when not done already
-" For version 5.8 and later: only when an item doesn't have highlighting yet
-let did_tex_syntax_inits = 1
-command -nargs=+ HiLink hi def link <args>
-
 " by default, enable all region-based highlighting
 let s:tex_fast= "bcmMprsSvV"
 if exists("g:tex_fast")
@@ -405,7 +399,7 @@ if !exists("g:tex_no_math")
  " TexNewMathZone: function creates a mathzone with the given suffix and mathzone name. {{{2
  "                 Starred forms are created if starform is true.  Starred
  "                 forms have syntax group and synchronization groups with a
- "                 "S" appended.  Handles: cluster, syntax, sync, and HiLink.
+ "                 "S" appended.  Handles: cluster, syntax, sync, and hi link.
  fun! TexNewMathZone(sfx,mathzone,starform)
    let grpname  = "texMathZone".a:sfx
    let syncname = "texSyncMathZone".a:sfx
@@ -1260,86 +1254,87 @@ endif
 
 " ---------------------------------------------------------------------
 " Highlighting: {{{1
-if did_tex_syntax_inits == 1
- let did_tex_syntax_inits= 2
+
+" Define the default highlighting. {{{1
+if !exists("skip_tex_syntax_inits")
+
   " TeX highlighting groups which should share similar highlighting
   if !exists("g:tex_no_error")
    if !exists("g:tex_no_math")
-    HiLink texBadMath		texError
-    HiLink texMathDelimBad	texError
-    HiLink texMathError		texError
+    hi def link texBadMath		texError
+    hi def link texMathDelimBad	texError
+    hi def link texMathError		texError
     if !b:tex_stylish
-      HiLink texOnlyMath	texError
+      hi def link texOnlyMath	texError
     endif
    endif
-   HiLink texError		Error
+   hi def link texError		Error
   endif
 
   hi texBoldStyle		gui=bold	cterm=bold
   hi texItalStyle		gui=italic	cterm=italic
   hi texBoldItalStyle		gui=bold,italic cterm=bold,italic
   hi texItalBoldStyle		gui=bold,italic cterm=bold,italic
-  HiLink texCite		texRefZone
-  HiLink texDefCmd		texDef
-  HiLink texDefName		texDef
-  HiLink texDocType		texCmdName
-  HiLink texDocTypeArgs		texCmdArgs
-  HiLink texInputFileOpt	texCmdArgs
-  HiLink texInputCurlies	texDelimiter
-  HiLink texLigature		texSpecialChar
+  hi def link texCite		texRefZone
+  hi def link texDefCmd		texDef
+  hi def link texDefName		texDef
+  hi def link texDocType		texCmdName
+  hi def link texDocTypeArgs		texCmdArgs
+  hi def link texInputFileOpt	texCmdArgs
+  hi def link texInputCurlies	texDelimiter
+  hi def link texLigature		texSpecialChar
   if !exists("g:tex_no_math")
-   HiLink texMathDelimSet1	texMathDelim
-   HiLink texMathDelimSet2	texMathDelim
-   HiLink texMathDelimKey	texMathDelim
-   HiLink texMathMatcher	texMath
-   HiLink texAccent		texStatement
-   HiLink texGreek		texStatement
-   HiLink texSuperscript	texStatement
-   HiLink texSubscript		texStatement
-   HiLink texSuperscripts 	texSuperscript
-   HiLink texSubscripts 	texSubscript
-   HiLink texMathSymbol		texStatement
-   HiLink texMathZoneV		texMath
-   HiLink texMathZoneW		texMath
-   HiLink texMathZoneX		texMath
-   HiLink texMathZoneY		texMath
-   HiLink texMathZoneV		texMath
-   HiLink texMathZoneZ		texMath
+   hi def link texMathDelimSet1	texMathDelim
+   hi def link texMathDelimSet2	texMathDelim
+   hi def link texMathDelimKey	texMathDelim
+   hi def link texMathMatcher	texMath
+   hi def link texAccent		texStatement
+   hi def link texGreek		texStatement
+   hi def link texSuperscript	texStatement
+   hi def link texSubscript		texStatement
+   hi def link texSuperscripts 	texSuperscript
+   hi def link texSubscripts 	texSubscript
+   hi def link texMathSymbol		texStatement
+   hi def link texMathZoneV		texMath
+   hi def link texMathZoneW		texMath
+   hi def link texMathZoneX		texMath
+   hi def link texMathZoneY		texMath
+   hi def link texMathZoneV		texMath
+   hi def link texMathZoneZ		texMath
   endif
-  HiLink texBeginEnd		texCmdName
-  HiLink texBeginEndName	texSection
-  HiLink texSpaceCode		texStatement
-  HiLink texStyleStatement	texStatement
-  HiLink texTypeSize		texType
-  HiLink texTypeStyle		texType
+  hi def link texBeginEnd		texCmdName
+  hi def link texBeginEndName	texSection
+  hi def link texSpaceCode		texStatement
+  hi def link texStyleStatement	texStatement
+  hi def link texTypeSize		texType
+  hi def link texTypeStyle		texType
 
    " Basic TeX highlighting groups
-  HiLink texCmdArgs		Number
-  HiLink texCmdName		Statement
-  HiLink texComment		Comment
-  HiLink texDef			Statement
-  HiLink texDefParm		Special
-  HiLink texDelimiter		Delimiter
-  HiLink texInput		Special
-  HiLink texInputFile		Special
-  HiLink texLength		Number
-  HiLink texMath		Special
-  HiLink texMathDelim		Statement
-  HiLink texMathOper		Operator
-  HiLink texNewCmd		Statement
-  HiLink texNewEnv		Statement
-  HiLink texOption		Number
-  HiLink texRefZone		Special
-  HiLink texSection		PreCondit
-  HiLink texSpaceCodeChar	Special
-  HiLink texSpecialChar		SpecialChar
-  HiLink texStatement		Statement
-  HiLink texString		String
-  HiLink texTodo		Todo
-  HiLink texType		Type
-  HiLink texZone		PreCondit
+  hi def link texCmdArgs		Number
+  hi def link texCmdName		Statement
+  hi def link texComment		Comment
+  hi def link texDef			Statement
+  hi def link texDefParm		Special
+  hi def link texDelimiter		Delimiter
+  hi def link texInput		Special
+  hi def link texInputFile		Special
+  hi def link texLength		Number
+  hi def link texMath		Special
+  hi def link texMathDelim		Statement
+  hi def link texMathOper		Operator
+  hi def link texNewCmd		Statement
+  hi def link texNewEnv		Statement
+  hi def link texOption		Number
+  hi def link texRefZone		Special
+  hi def link texSection		PreCondit
+  hi def link texSpaceCodeChar	Special
+  hi def link texSpecialChar		SpecialChar
+  hi def link texStatement		Statement
+  hi def link texString		String
+  hi def link texTodo		Todo
+  hi def link texType		Type
+  hi def link texZone		PreCondit
 
-  delcommand HiLink
 endif
 
 " Cleanup: {{{1
diff --git a/runtime/syntax/texinfo.vim b/runtime/syntax/texinfo.vim
index ec353bb140..a4b7689707 100644
--- a/runtime/syntax/texinfo.vim
+++ b/runtime/syntax/texinfo.vim
@@ -355,38 +355,36 @@ syn cluster texinfoReducedAll contains=texinfoSpecialChar,texinfoBrcPrmAtCmd
 " highlighting
 
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink texinfoSpecialChar	Special
-HiLink texinfoHFSpecialChar	Special
+hi def link texinfoSpecialChar	Special
+hi def link texinfoHFSpecialChar	Special
 
-HiLink texinfoError		Error
-HiLink texinfoIdent		Identifier
-HiLink texinfoAssignment	Identifier
-HiLink texinfoSinglePar	Identifier
-HiLink texinfoIndexPar	Identifier
-HiLink texinfoSIPar		Identifier
-HiLink texinfoDIEPar		Identifier
-HiLink texinfoTexCmd		PreProc
+hi def link texinfoError		Error
+hi def link texinfoIdent		Identifier
+hi def link texinfoAssignment	Identifier
+hi def link texinfoSinglePar	Identifier
+hi def link texinfoIndexPar	Identifier
+hi def link texinfoSIPar		Identifier
+hi def link texinfoDIEPar		Identifier
+hi def link texinfoTexCmd		PreProc
 
 
-HiLink texinfoAtCmd		Statement	"@-command
-HiLink texinfoPrmAtCmd	String		"@-command in one line with unknown nr. of parameters
+hi def link texinfoAtCmd		Statement	"@-command
+hi def link texinfoPrmAtCmd	String		"@-command in one line with unknown nr. of parameters
 					      "is String because is found as a region and is 'matchgroup'-ed
 					      "to texinfoAtCmd
-HiLink texinfoBrcPrmAtCmd	String		"@-command with parameter(s) in braces ({})
+hi def link texinfoBrcPrmAtCmd	String		"@-command with parameter(s) in braces ({})
 					      "is String because is found as a region and is 'matchgroup'-ed to texinfoAtCmd
-HiLink texinfoMltlnAtCmdFLine  texinfoAtCmd	"repeated embedded First lines in @-commands
-HiLink texinfoMltlnAtCmd	String		"@-command in multiple lines
+hi def link texinfoMltlnAtCmdFLine  texinfoAtCmd	"repeated embedded First lines in @-commands
+hi def link texinfoMltlnAtCmd	String		"@-command in multiple lines
 					      "is String because is found as a region and is 'matchgroup'-ed to texinfoAtCmd
-HiLink texinfoMltln2AtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
-HiLink texinfoMltlnDMAtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors; used for @detailmenu, which can be included in @menu)
-HiLink texinfoMltlnNAtCmd	Normal		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
-HiLink texinfoThisAtCmd	Statement	"@-command used in headers and footers (@this... series)
+hi def link texinfoMltln2AtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
+hi def link texinfoMltlnDMAtCmd	PreProc		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors; used for @detailmenu, which can be included in @menu)
+hi def link texinfoMltlnNAtCmd	Normal		"@-command in multiple lines (same as texinfoMltlnAtCmd, just with other colors)
+hi def link texinfoThisAtCmd	Statement	"@-command used in headers and footers (@this... series)
 
-HiLink texinfoComment	Comment
+hi def link texinfoComment	Comment
 
-delcommand HiLink
 
 
 let b:current_syntax = "texinfo"
diff --git a/runtime/syntax/texmf.vim b/runtime/syntax/texmf.vim
index 4c3ccf8f45..d1268faff7 100644
--- a/runtime/syntax/texmf.vim
+++ b/runtime/syntax/texmf.vim
@@ -42,35 +42,33 @@ syn region texmfBrace matchgroup=texmfBraceBrace start="{" end="}" contains=ALLB
 syn match texmfBraceError "}"
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink texmfComment Comment
-HiLink texmfTodo Todo
+hi def link texmfComment Comment
+hi def link texmfTodo Todo
 
-HiLink texmfPassedParameter texmfVariable
-HiLink texmfVariable Identifier
+hi def link texmfPassedParameter texmfVariable
+hi def link texmfVariable Identifier
 
-HiLink texmfNumber Number
-HiLink texmfString String
+hi def link texmfNumber Number
+hi def link texmfString String
 
-HiLink texmfLHSStart texmfLHS
-HiLink texmfLHSVariable texmfLHS
-HiLink texmfLHSDot texmfLHS
-HiLink texmfLHS Type
+hi def link texmfLHSStart texmfLHS
+hi def link texmfLHSVariable texmfLHS
+hi def link texmfLHSDot texmfLHS
+hi def link texmfLHS Type
 
-HiLink texmfEquals Normal
+hi def link texmfEquals Normal
 
-HiLink texmfBraceBrace texmfDelimiter
-HiLink texmfComma texmfDelimiter
-HiLink texmfColons texmfDelimiter
-HiLink texmfDelimiter Preproc
+hi def link texmfBraceBrace texmfDelimiter
+hi def link texmfComma texmfDelimiter
+hi def link texmfColons texmfDelimiter
+hi def link texmfDelimiter Preproc
 
-HiLink texmfDoubleExclam Statement
-HiLink texmfSpecial Special
+hi def link texmfDoubleExclam Statement
+hi def link texmfSpecial Special
 
-HiLink texmfBraceError texmfError
-HiLink texmfError Error
+hi def link texmfBraceError texmfError
+hi def link texmfError Error
 
-delcommand HiLink
 
 let b:current_syntax = "texmf"
diff --git a/runtime/syntax/tf.vim b/runtime/syntax/tf.vim
index 9de93dae23..47775b8637 100644
--- a/runtime/syntax/tf.vim
+++ b/runtime/syntax/tf.vim
@@ -159,35 +159,33 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tfComment		Comment
-HiLink tfString		String
-HiLink tfNumber		Number
-HiLink tfFloat		Float
-HiLink tfIdentifier		Identifier
-HiLink tfVar			Identifier
-HiLink tfWorld		Identifier
-HiLink tfReadonly		Identifier
-HiLink tfHook		Identifier
-HiLink tfFunctions		Function
-HiLink tfRepeat		Repeat
-HiLink tfConditional		Conditional
-HiLink tfLabel		Label
-HiLink tfStatement		Statement
-HiLink tfType		Type
-HiLink tfInclude		Include
-HiLink tfDefine		Define
-HiLink tfSpecialChar		SpecialChar
-HiLink tfSpecialCharEsc	SpecialChar
-HiLink tfParentError		Error
-HiLink tfTodo		Todo
-HiLink tfEndCommand		Delimiter
-HiLink tfJoinLines		Delimiter
-HiLink tfOperator		Operator
-HiLink tfRelation		Operator
+hi def link tfComment		Comment
+hi def link tfString		String
+hi def link tfNumber		Number
+hi def link tfFloat		Float
+hi def link tfIdentifier		Identifier
+hi def link tfVar			Identifier
+hi def link tfWorld		Identifier
+hi def link tfReadonly		Identifier
+hi def link tfHook		Identifier
+hi def link tfFunctions		Function
+hi def link tfRepeat		Repeat
+hi def link tfConditional		Conditional
+hi def link tfLabel		Label
+hi def link tfStatement		Statement
+hi def link tfType		Type
+hi def link tfInclude		Include
+hi def link tfDefine		Define
+hi def link tfSpecialChar		SpecialChar
+hi def link tfSpecialCharEsc	SpecialChar
+hi def link tfParentError		Error
+hi def link tfTodo		Todo
+hi def link tfEndCommand		Delimiter
+hi def link tfJoinLines		Delimiter
+hi def link tfOperator		Operator
+hi def link tfRelation		Operator
 
-delcommand HiLink
 
 let b:current_syntax = "tf"
 
diff --git a/runtime/syntax/tli.vim b/runtime/syntax/tli.vim
index e0e19ab98f..b96d4a2119 100644
--- a/runtime/syntax/tli.vim
+++ b/runtime/syntax/tli.vim
@@ -42,18 +42,16 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tliNumber	Number
-HiLink tliString	String
-HiLink tliComment	Comment
-HiLink tliSpecial	SpecialChar
-HiLink tliIdentifier Identifier
-HiLink tliObject     Statement
-HiLink tliField      Type
-HiLink tliStyle      PreProc
+hi def link tliNumber	Number
+hi def link tliString	String
+hi def link tliComment	Comment
+hi def link tliSpecial	SpecialChar
+hi def link tliIdentifier Identifier
+hi def link tliObject     Statement
+hi def link tliField      Type
+hi def link tliStyle      PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "tli"
 
diff --git a/runtime/syntax/tpp.vim b/runtime/syntax/tpp.vim
index b1ea35f041..1244b97f08 100644
--- a/runtime/syntax/tpp.vim
+++ b/runtime/syntax/tpp.vim
@@ -59,26 +59,24 @@ syn match tppComment "^--##.*$"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tppAbstractOptionKey		Special
-HiLink tppPageLocalOptionKey		Keyword
-HiLink tppPageLocalSwitchKey		Keyword
-HiLink tppColorOptionKey		Keyword
-HiLink tppTimeOptionKey		Comment
-HiLink tppNewPageOptionKey		PreProc
-HiLink tppString			String
-HiLink tppColor			String
-HiLink tppTime			Number
-HiLink tppComment			Comment
-HiLink tppAbstractOption		Error
-HiLink tppPageLocalOption		Error
-HiLink tppPageLocalSwitch		Error
-HiLink tppColorOption			Error
-HiLink tppNewPageOption		Error
-HiLink tppTimeOption			Error
+hi def link tppAbstractOptionKey		Special
+hi def link tppPageLocalOptionKey		Keyword
+hi def link tppPageLocalSwitchKey		Keyword
+hi def link tppColorOptionKey		Keyword
+hi def link tppTimeOptionKey		Comment
+hi def link tppNewPageOptionKey		PreProc
+hi def link tppString			String
+hi def link tppColor			String
+hi def link tppTime			Number
+hi def link tppComment			Comment
+hi def link tppAbstractOption		Error
+hi def link tppPageLocalOption		Error
+hi def link tppPageLocalSwitch		Error
+hi def link tppColorOption			Error
+hi def link tppNewPageOption		Error
+hi def link tppTimeOption			Error
 
-delcommand HiLink
 
 let b:current_syntax = "tpp"
 
diff --git a/runtime/syntax/trasys.vim b/runtime/syntax/trasys.vim
index 1e7f75c357..d52b5eeb47 100644
--- a/runtime/syntax/trasys.vim
+++ b/runtime/syntax/trasys.vim
@@ -130,31 +130,29 @@ syn sync match trasysSync grouphere trasysComment "^HEADER DOCUMENTATION DATA"
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink trasysOptions		Special
-HiLink trasysSurface		Special
-HiLink trasysSurfaceType	Constant
-HiLink trasysSurfaceArgs	Constant
-HiLink trasysArgs		Constant
-HiLink trasysOperations	Statement
-HiLink trasysSubRoutine	Statement
-HiLink trassyPrcsrSegm	PreProc
-HiLink trasysIdentifier	Identifier
-HiLink trasysComment		Comment
-HiLink trasysHeader		Typedef
-HiLink trasysMacro		Macro
-HiLink trasysInteger		Number
-HiLink trasysFloat		Float
-HiLink trasysScientific	Float
+hi def link trasysOptions		Special
+hi def link trasysSurface		Special
+hi def link trasysSurfaceType	Constant
+hi def link trasysSurfaceArgs	Constant
+hi def link trasysArgs		Constant
+hi def link trasysOperations	Statement
+hi def link trasysSubRoutine	Statement
+hi def link trassyPrcsrSegm	PreProc
+hi def link trasysIdentifier	Identifier
+hi def link trasysComment		Comment
+hi def link trasysHeader		Typedef
+hi def link trasysMacro		Macro
+hi def link trasysInteger		Number
+hi def link trasysFloat		Float
+hi def link trasysScientific	Float
 
-HiLink trasysBlank		SpecialChar
+hi def link trasysBlank		SpecialChar
 
-HiLink trasysEndData		Macro
+hi def link trasysEndData		Macro
 
-HiLink trasysTodo		Todo
+hi def link trasysTodo		Todo
 
-delcommand HiLink
 
 
 let b:current_syntax = "trasys"
diff --git a/runtime/syntax/tsalt.vim b/runtime/syntax/tsalt.vim
index 7bccde0e52..8dd2a24df9 100644
--- a/runtime/syntax/tsalt.vim
+++ b/runtime/syntax/tsalt.vim
@@ -169,37 +169,35 @@ syn sync ccomment tsaltComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tsaltFunction		Statement
-HiLink tsaltSysVar		Type
-"HiLink tsaltLibFunc		UserDefFunc
-"HiLink tsaltConstants		Type
-"HiLink tsaltFuncArg		Type
-"HiLink tsaltOperator		Operator
-"HiLink tsaltLabel		Label
-"HiLink tsaltUserLabel		Label
-HiLink tsaltConditional		Conditional
-HiLink tsaltRepeat		Repeat
-HiLink tsaltCharacter		SpecialChar
-HiLink tsaltSpecialCharacter	SpecialChar
-HiLink tsaltNumber		Number
-HiLink tsaltFloat		Float
-HiLink tsaltCommentError	tsaltError
-HiLink tsaltInclude		Include
-HiLink tsaltPreProc		PreProc
-HiLink tsaltDefine		Macro
-HiLink tsaltIncluded		tsaltString
-HiLink tsaltError		Error
-HiLink tsaltStatement		Statement
-HiLink tsaltPreCondit		PreCondit
-HiLink tsaltType		Type
-HiLink tsaltString		String
-HiLink tsaltComment		Comment
-HiLink tsaltSpecial		Special
-HiLink tsaltTodo		Todo
+hi def link tsaltFunction		Statement
+hi def link tsaltSysVar		Type
+"hi def link tsaltLibFunc		UserDefFunc
+"hi def link tsaltConstants		Type
+"hi def link tsaltFuncArg		Type
+"hi def link tsaltOperator		Operator
+"hi def link tsaltLabel		Label
+"hi def link tsaltUserLabel		Label
+hi def link tsaltConditional		Conditional
+hi def link tsaltRepeat		Repeat
+hi def link tsaltCharacter		SpecialChar
+hi def link tsaltSpecialCharacter	SpecialChar
+hi def link tsaltNumber		Number
+hi def link tsaltFloat		Float
+hi def link tsaltCommentError	tsaltError
+hi def link tsaltInclude		Include
+hi def link tsaltPreProc		PreProc
+hi def link tsaltDefine		Macro
+hi def link tsaltIncluded		tsaltString
+hi def link tsaltError		Error
+hi def link tsaltStatement		Statement
+hi def link tsaltPreCondit		PreCondit
+hi def link tsaltType		Type
+hi def link tsaltString		String
+hi def link tsaltComment		Comment
+hi def link tsaltSpecial		Special
+hi def link tsaltTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "tsalt"
 
diff --git a/runtime/syntax/tsscl.vim b/runtime/syntax/tsscl.vim
index 32ca8d4359..fd2a5e2ba9 100644
--- a/runtime/syntax/tsscl.vim
+++ b/runtime/syntax/tsscl.vim
@@ -177,28 +177,26 @@ syn match  tssclScientific  "-\=\<[0-9]*\.[0-9]*E[-+]\=[0-9]\+\>"
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tssclCommand		Statement
-HiLink tssclKeyword		Special
-HiLink tssclEnd		Macro
-HiLink tssclUnits		Special
+hi def link tssclCommand		Statement
+hi def link tssclKeyword		Special
+hi def link tssclEnd		Macro
+hi def link tssclUnits		Special
 
-HiLink tssclComment		Comment
-HiLink tssclDirective		Statement
-HiLink tssclConditional	Conditional
-HiLink tssclContChar		Macro
-HiLink tssclQualifier		Typedef
-HiLink tssclSymbol		Identifier
-HiLink tssclSymbol2		Symbol
-HiLink tssclString		String
-HiLink tssclOper		Operator
+hi def link tssclComment		Comment
+hi def link tssclDirective		Statement
+hi def link tssclConditional	Conditional
+hi def link tssclContChar		Macro
+hi def link tssclQualifier		Typedef
+hi def link tssclSymbol		Identifier
+hi def link tssclSymbol2		Symbol
+hi def link tssclString		String
+hi def link tssclOper		Operator
 
-HiLink tssclInteger		Number
-HiLink tssclFloat		Number
-HiLink tssclScientific	Number
+hi def link tssclInteger		Number
+hi def link tssclFloat		Number
+hi def link tssclScientific	Number
 
-delcommand HiLink
 
 
 let b:current_syntax = "tsscl"
diff --git a/runtime/syntax/tssgm.vim b/runtime/syntax/tssgm.vim
index c575347c60..8ca7962e81 100644
--- a/runtime/syntax/tssgm.vim
+++ b/runtime/syntax/tssgm.vim
@@ -73,26 +73,24 @@ syn match  tssgmScientific  "-\=\<[0-9]*\.[0-9]*E[-+]\=[0-9]\+\>"
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tssgmParam		Statement
-HiLink tssgmSurfType		Type
-HiLink tssgmArgs		Special
-HiLink tssgmDelim		Typedef
-HiLink tssgmEnd		Macro
-HiLink tssgmUnits		Special
+hi def link tssgmParam		Statement
+hi def link tssgmSurfType		Type
+hi def link tssgmArgs		Special
+hi def link tssgmDelim		Typedef
+hi def link tssgmEnd		Macro
+hi def link tssgmUnits		Special
 
-HiLink tssgmDefault		SpecialComment
-HiLink tssgmComment		Statement
-HiLink tssgmCommentString	Comment
-HiLink tssgmSurfIdent		Identifier
-HiLink tssgmString		Delimiter
+hi def link tssgmDefault		SpecialComment
+hi def link tssgmComment		Statement
+hi def link tssgmCommentString	Comment
+hi def link tssgmSurfIdent		Identifier
+hi def link tssgmString		Delimiter
 
-HiLink tssgmInteger		Number
-HiLink tssgmFloat		Float
-HiLink tssgmScientific	Float
+hi def link tssgmInteger		Number
+hi def link tssgmFloat		Float
+hi def link tssgmScientific	Float
 
-delcommand HiLink
 
 
 let b:current_syntax = "tssgm"
diff --git a/runtime/syntax/tssop.vim b/runtime/syntax/tssop.vim
index f8fadab330..6a775b2358 100644
--- a/runtime/syntax/tssop.vim
+++ b/runtime/syntax/tssop.vim
@@ -54,21 +54,19 @@ syn match  tssopScientific  "-\=\<[0-9]*\.[0-9]*E[-+]\=[0-9]\+\>"
 
 " Define the default highlighting
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink tssopParam		Statement
-HiLink tssopProp		Identifier
-HiLink tssopArgs		Special
+hi def link tssopParam		Statement
+hi def link tssopProp		Identifier
+hi def link tssopArgs		Special
 
-HiLink tssopComment		Statement
-HiLink tssopCommentString	Comment
-HiLink tssopPropName		Typedef
+hi def link tssopComment		Statement
+hi def link tssopCommentString	Comment
+hi def link tssopPropName		Typedef
 
-HiLink tssopInteger		Number
-HiLink tssopFloat		Float
-HiLink tssopScientific	Float
+hi def link tssopInteger		Number
+hi def link tssopFloat		Float
+hi def link tssopScientific	Float
 
-delcommand HiLink
 
 
 let b:current_syntax = "tssop"
diff --git a/runtime/syntax/uc.vim b/runtime/syntax/uc.vim
index e128cbf82c..90d33396c5 100644
--- a/runtime/syntax/uc.vim
+++ b/runtime/syntax/uc.vim
@@ -108,55 +108,53 @@ exec "syn sync ccomment ucComment minlines=" . uc_minlines
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink ucFuncDef			Conditional
-HiLink ucEventDef			Conditional
-HiLink ucBraces			Function
-HiLink ucBranch			Conditional
-HiLink ucLabel			Label
-HiLink ucUserLabel			Label
-HiLink ucConditional			Conditional
-HiLink ucRepeat			Repeat
-HiLink ucStorageClass			StorageClass
-HiLink ucMethodDecl			ucStorageClass
-HiLink ucClassDecl			ucStorageClass
-HiLink ucScopeDecl			ucStorageClass
-HiLink ucBoolean			Boolean
-HiLink ucSpecial			Special
-HiLink ucSpecialError			Error
-HiLink ucSpecialCharError		Error
-HiLink ucString			String
-HiLink ucCharacter			Character
-HiLink ucSpecialChar			SpecialChar
-HiLink ucNumber			Number
-HiLink ucError			Error
-HiLink ucStringError			Error
-HiLink ucStatement			Statement
-HiLink ucOperator			Operator
-HiLink ucOverLoaded			Operator
-HiLink ucComment			Comment
-HiLink ucDocComment			Comment
-HiLink ucLineComment			Comment
-HiLink ucConstant			ucBoolean
-HiLink ucTypedef			Typedef
-HiLink ucTodo				Todo
+hi def link ucFuncDef			Conditional
+hi def link ucEventDef			Conditional
+hi def link ucBraces			Function
+hi def link ucBranch			Conditional
+hi def link ucLabel			Label
+hi def link ucUserLabel			Label
+hi def link ucConditional			Conditional
+hi def link ucRepeat			Repeat
+hi def link ucStorageClass			StorageClass
+hi def link ucMethodDecl			ucStorageClass
+hi def link ucClassDecl			ucStorageClass
+hi def link ucScopeDecl			ucStorageClass
+hi def link ucBoolean			Boolean
+hi def link ucSpecial			Special
+hi def link ucSpecialError			Error
+hi def link ucSpecialCharError		Error
+hi def link ucString			String
+hi def link ucCharacter			Character
+hi def link ucSpecialChar			SpecialChar
+hi def link ucNumber			Number
+hi def link ucError			Error
+hi def link ucStringError			Error
+hi def link ucStatement			Statement
+hi def link ucOperator			Operator
+hi def link ucOverLoaded			Operator
+hi def link ucComment			Comment
+hi def link ucDocComment			Comment
+hi def link ucLineComment			Comment
+hi def link ucConstant			ucBoolean
+hi def link ucTypedef			Typedef
+hi def link ucTodo				Todo
 
-HiLink ucCommentTitle			SpecialComment
-HiLink ucDocTags			Special
-HiLink ucDocParam			Function
-HiLink ucCommentStar			ucComment
+hi def link ucCommentTitle			SpecialComment
+hi def link ucDocTags			Special
+hi def link ucDocParam			Function
+hi def link ucCommentStar			ucComment
 
-HiLink ucType				Type
-HiLink ucExternal			Include
+hi def link ucType				Type
+hi def link ucExternal			Include
 
-HiLink ucClassKeys			Conditional
-HiLink ucClassLabel			Conditional
+hi def link ucClassKeys			Conditional
+hi def link ucClassLabel			Conditional
 
-HiLink htmlComment			Special
-HiLink htmlCommentPart		Special
+hi def link htmlComment			Special
+hi def link htmlCommentPart		Special
 
-delcommand HiLink
 
 let b:current_syntax = "uc"
 
diff --git a/runtime/syntax/uil.vim b/runtime/syntax/uil.vim
index 689b187a25..ccf07d5a24 100644
--- a/runtime/syntax/uil.vim
+++ b/runtime/syntax/uil.vim
@@ -46,28 +46,26 @@ syn sync ccomment uilComment
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink uilCharacter		uilString
-HiLink uilSpecialCharacter	uilSpecial
-HiLink uilNumber		uilString
-HiLink uilCommentError	uilError
-HiLink uilInclude		uilPreCondit
-HiLink uilDefine		uilPreCondit
-HiLink uilIncluded		uilString
-HiLink uilSpecialFunction	uilRessource
-HiLink uilRessource		Identifier
-HiLink uilSpecialStatement	Keyword
-HiLink uilError		Error
-HiLink uilPreCondit		PreCondit
-HiLink uilType		Type
-HiLink uilString		String
-HiLink uilComment		Comment
-HiLink uilSpecial		Special
-HiLink uilTodo		Todo
+hi def link uilCharacter		uilString
+hi def link uilSpecialCharacter	uilSpecial
+hi def link uilNumber		uilString
+hi def link uilCommentError	uilError
+hi def link uilInclude		uilPreCondit
+hi def link uilDefine		uilPreCondit
+hi def link uilIncluded		uilString
+hi def link uilSpecialFunction	uilRessource
+hi def link uilRessource		Identifier
+hi def link uilSpecialStatement	Keyword
+hi def link uilError		Error
+hi def link uilPreCondit		PreCondit
+hi def link uilType		Type
+hi def link uilString		String
+hi def link uilComment		Comment
+hi def link uilSpecial		Special
+hi def link uilTodo		Todo
 
-delcommand HiLink
 
 
 let b:current_syntax = "uil"
diff --git a/runtime/syntax/vb.vim b/runtime/syntax/vb.vim
index 24c94fd5ba..8ddb1efac3 100644
--- a/runtime/syntax/vb.vim
+++ b/runtime/syntax/vb.vim
@@ -336,31 +336,29 @@ syn match   vbTypeSpecifier  "#[a-zA-Z0-9]"me=e-1
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink vbBoolean		Boolean
-HiLink vbLineNumber		Comment
-HiLink vbComment		Comment
-HiLink vbConditional	Conditional
-HiLink vbConst			Constant
-HiLink vbDefine			Constant
-HiLink vbError			Error
-HiLink vbFunction		Identifier
-HiLink vbIdentifier		Identifier
-HiLink vbNumber			Number
-HiLink vbFloat			Float
-HiLink vbMethods		PreProc
-HiLink vbOperator		Operator
-HiLink vbRepeat			Repeat
-HiLink vbString			String
-HiLink vbStatement		Statement
-HiLink vbKeyword		Statement
-HiLink vbEvents			Special
-HiLink vbTodo			Todo
-HiLink vbTypes			Type
-HiLink vbTypeSpecifier	Type
+hi def link vbBoolean		Boolean
+hi def link vbLineNumber		Comment
+hi def link vbComment		Comment
+hi def link vbConditional	Conditional
+hi def link vbConst			Constant
+hi def link vbDefine			Constant
+hi def link vbError			Error
+hi def link vbFunction		Identifier
+hi def link vbIdentifier		Identifier
+hi def link vbNumber			Number
+hi def link vbFloat			Float
+hi def link vbMethods		PreProc
+hi def link vbOperator		Operator
+hi def link vbRepeat			Repeat
+hi def link vbString			String
+hi def link vbStatement		Statement
+hi def link vbKeyword		Statement
+hi def link vbEvents			Special
+hi def link vbTodo			Todo
+hi def link vbTypes			Type
+hi def link vbTypeSpecifier	Type
 
-delcommand HiLink
 
 let b:current_syntax = "vb"
 
diff --git a/runtime/syntax/vera.vim b/runtime/syntax/vera.vim
index 7952c94290..b41c0a6cbf 100644
--- a/runtime/syntax/vera.vim
+++ b/runtime/syntax/vera.vim
@@ -285,65 +285,63 @@ exec "syn sync ccomment veraComment minlines=" . b:vera_minlines
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink veraClass		Identifier
-HiLink veraObject		Identifier
-HiLink veraUserMethod		Function
-HiLink veraTask		Keyword
-HiLink veraModifier		Tag
-HiLink veraDeprecated		veraError
-HiLink veraMethods		Statement
-" HiLink veraInterface		Label
-HiLink veraInterface		Function
+hi def link veraClass		Identifier
+hi def link veraObject		Identifier
+hi def link veraUserMethod		Function
+hi def link veraTask		Keyword
+hi def link veraModifier		Tag
+hi def link veraDeprecated		veraError
+hi def link veraMethods		Statement
+" hi def link veraInterface		Label
+hi def link veraInterface		Function
 
-HiLink veraFormat		veraSpecial
-HiLink veraCppString		veraString
-HiLink veraCommentL		veraComment
-HiLink veraCommentStart		veraComment
-HiLink veraLabel			Label
-HiLink veraUserLabel		Label
-HiLink veraConditional		Conditional
-HiLink veraRepeat		Repeat
-HiLink veraCharacter		Character
-HiLink veraSpecialCharacter	veraSpecial
-HiLink veraNumber		Number
-HiLink veraOctal			Number
-HiLink veraOctalZero		PreProc	 " link this to Error if you want
-HiLink veraFloat			Float
-HiLink veraOctalError		veraError
-HiLink veraParenError		veraError
-HiLink veraErrInParen		veraError
-HiLink veraErrInBracket		veraError
-HiLink veraCommentError		veraError
-HiLink veraCommentStartError	veraError
-HiLink veraSpaceError         SpaceError
-HiLink veraSpecialError		veraError
-HiLink veraOperator		Operator
-HiLink veraStructure		Structure
-HiLink veraInclude		Include
-HiLink veraPreProc		PreProc
-HiLink veraDefine		Macro
-HiLink veraIncluded		veraString
-HiLink veraError			Error
-HiLink veraStatement		Statement
-HiLink veraPreCondit		PreCondit
-HiLink veraType			Type
-" HiLink veraConstant		Constant
-HiLink veraConstant		Keyword
-HiLink veraUserConstant		Constant
-HiLink veraCommentString		veraString
-HiLink veraComment2String	veraString
-HiLink veraCommentSkip		veraComment
-HiLink veraString		String
-HiLink veraComment		Comment
-HiLink veraSpecial		SpecialChar
-HiLink veraTodo			Todo
-HiLink veraCppSkip		veraCppOut
-HiLink veraCppOut2		veraCppOut
-HiLink veraCppOut		Comment
+hi def link veraFormat		veraSpecial
+hi def link veraCppString		veraString
+hi def link veraCommentL		veraComment
+hi def link veraCommentStart		veraComment
+hi def link veraLabel			Label
+hi def link veraUserLabel		Label
+hi def link veraConditional		Conditional
+hi def link veraRepeat		Repeat
+hi def link veraCharacter		Character
+hi def link veraSpecialCharacter	veraSpecial
+hi def link veraNumber		Number
+hi def link veraOctal			Number
+hi def link veraOctalZero		PreProc	 " link this to Error if you want
+hi def link veraFloat			Float
+hi def link veraOctalError		veraError
+hi def link veraParenError		veraError
+hi def link veraErrInParen		veraError
+hi def link veraErrInBracket		veraError
+hi def link veraCommentError		veraError
+hi def link veraCommentStartError	veraError
+hi def link veraSpaceError         SpaceError
+hi def link veraSpecialError		veraError
+hi def link veraOperator		Operator
+hi def link veraStructure		Structure
+hi def link veraInclude		Include
+hi def link veraPreProc		PreProc
+hi def link veraDefine		Macro
+hi def link veraIncluded		veraString
+hi def link veraError			Error
+hi def link veraStatement		Statement
+hi def link veraPreCondit		PreCondit
+hi def link veraType			Type
+" hi def link veraConstant		Constant
+hi def link veraConstant		Keyword
+hi def link veraUserConstant		Constant
+hi def link veraCommentString		veraString
+hi def link veraComment2String	veraString
+hi def link veraCommentSkip		veraComment
+hi def link veraString		String
+hi def link veraComment		Comment
+hi def link veraSpecial		SpecialChar
+hi def link veraTodo			Todo
+hi def link veraCppSkip		veraCppOut
+hi def link veraCppOut2		veraCppOut
+hi def link veraCppOut		Comment
 
-delcommand HiLink
 
 let b:current_syntax = "vera"
 
diff --git a/runtime/syntax/verilog.vim b/runtime/syntax/verilog.vim
index 4b7570a13d..bbaca491a7 100644
--- a/runtime/syntax/verilog.vim
+++ b/runtime/syntax/verilog.vim
@@ -96,25 +96,23 @@ syn sync minlines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink verilogCharacter       Character
-HiLink verilogConditional     Conditional
-HiLink verilogRepeat          Repeat
-HiLink verilogString          String
-HiLink verilogTodo            Todo
-HiLink verilogComment         Comment
-HiLink verilogConstant        Constant
-HiLink verilogLabel           Label
-HiLink verilogNumber          Number
-HiLink verilogOperator        Special
-HiLink verilogStatement       Statement
-HiLink verilogGlobal          Define
-HiLink verilogDirective       SpecialComment
-HiLink verilogEscape		 Special
+hi def link verilogCharacter       Character
+hi def link verilogConditional     Conditional
+hi def link verilogRepeat          Repeat
+hi def link verilogString          String
+hi def link verilogTodo            Todo
+hi def link verilogComment         Comment
+hi def link verilogConstant        Constant
+hi def link verilogLabel           Label
+hi def link verilogNumber          Number
+hi def link verilogOperator        Special
+hi def link verilogStatement       Statement
+hi def link verilogGlobal          Define
+hi def link verilogDirective       SpecialComment
+hi def link verilogEscape		 Special
 
-delcommand HiLink
 
 let b:current_syntax = "verilog"
 
diff --git a/runtime/syntax/verilogams.vim b/runtime/syntax/verilogams.vim
index 3e236099f5..7551b681a8 100644
--- a/runtime/syntax/verilogams.vim
+++ b/runtime/syntax/verilogams.vim
@@ -107,27 +107,25 @@ syn sync lines=50
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default highlighting.
-HiLink verilogamsCharacter    Character
-HiLink verilogamsConditional  Conditional
-HiLink verilogamsRepeat       Repeat
-HiLink verilogamsString       String
-HiLink verilogamsTodo         Todo
-HiLink verilogamsComment      Comment
-HiLink verilogamsConstant     Constant
-HiLink verilogamsLabel        Label
-HiLink verilogamsNumber       Number
-HiLink verilogamsOperator     Special
-HiLink verilogamsStatement    Statement
-HiLink verilogamsGlobal       Define
-HiLink verilogamsDirective    SpecialComment
-HiLink verilogamsEscape       Special
-HiLink verilogamsType         Type
-HiLink verilogamsSystask      Function
+hi def link verilogamsCharacter    Character
+hi def link verilogamsConditional  Conditional
+hi def link verilogamsRepeat       Repeat
+hi def link verilogamsString       String
+hi def link verilogamsTodo         Todo
+hi def link verilogamsComment      Comment
+hi def link verilogamsConstant     Constant
+hi def link verilogamsLabel        Label
+hi def link verilogamsNumber       Number
+hi def link verilogamsOperator     Special
+hi def link verilogamsStatement    Statement
+hi def link verilogamsGlobal       Define
+hi def link verilogamsDirective    SpecialComment
+hi def link verilogamsEscape       Special
+hi def link verilogamsType         Type
+hi def link verilogamsSystask      Function
 
-delcommand HiLink
 
 let b:current_syntax = "verilogams"
 
diff --git a/runtime/syntax/vhdl.vim b/runtime/syntax/vhdl.vim
index 4a54216083..f4b11ff5dd 100644
--- a/runtime/syntax/vhdl.vim
+++ b/runtime/syntax/vhdl.vim
@@ -234,26 +234,24 @@ syn sync	minlines=600
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink	vhdlSpecial	Special
-HiLink	vhdlStatement   Statement
-HiLink	vhdlCharacter   Character
-HiLink	vhdlString	String
-HiLink	vhdlVector	Number
-HiLink	vhdlBoolean	Number
-HiLink	vhdlTodo	Todo
-HiLink	vhdlFixme	Fixme
-HiLink	vhdlComment	Comment
-HiLink	vhdlNumber	Number
-HiLink	vhdlTime	Number
-HiLink	vhdlType	Type
-HiLink	vhdlOperator    Operator
-HiLink	vhdlError	Error
-HiLink	vhdlAttribute   Special
-HiLink	vhdlPreProc	PreProc
+hi def link vhdlSpecial	Special
+hi def link vhdlStatement   Statement
+hi def link vhdlCharacter   Character
+hi def link vhdlString	String
+hi def link vhdlVector	Number
+hi def link vhdlBoolean	Number
+hi def link vhdlTodo	Todo
+hi def link vhdlFixme	Fixme
+hi def link vhdlComment	Comment
+hi def link vhdlNumber	Number
+hi def link vhdlTime	Number
+hi def link vhdlType	Type
+hi def link vhdlOperator    Operator
+hi def link vhdlError	Error
+hi def link vhdlAttribute   Special
+hi def link vhdlPreProc	PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "vhdl"
 
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 91f70c6a1a..650f2e4a7b 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -139,8 +139,8 @@ syn match vimNumber	"\%(^\|[^a-zA-Z]\)\zs#\x\{6}"
 syn match vimCmdSep	"[:|]\+"	skipwhite nextgroup=vimAddress,vimAutoCmd,vimIsCommand,vimExtCmd,vimFilter,vimLet,vimMap,vimMark,vimSet,vimSyntax,vimUserCmd
 syn match vimIsCommand	"\<\h\w*\>"	contains=vimCommand
 syn match vimVar        contained	"\<\h[a-zA-Z0-9#_]*\>"
-syn match vimVar		"\<[bwglsav]:\h[a-zA-Z0-9#_]*\>"
-syn match vimFBVar      contained   "\<[bwglsav]:\h[a-zA-Z0-9#_]*\>"
+syn match vimVar		"\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"
+syn match vimFBVar      contained   "\<[bwglstav]:\h[a-zA-Z0-9#_]*\>"
 syn keyword vimCommand  contained	in
 
 " Insertions And Appends: insert append {{{2
@@ -772,171 +772,169 @@ syn sync match vimAugroupSyncA	groupthere NONE	"\<aug\%[roup]\>\s\+[eE][nN][dD]"
 " Highlighting Settings {{{2
 " ====================
 
-if !exists("g:vimsyn_noerror")
- hi def link vimBehaveError	vimError
- hi def link vimCollClassErr	vimError
- hi def link vimErrSetting	vimError
- hi def link vimEmbedError	vimError
- hi def link vimFTError	vimError
- hi def link vimFunctionError	vimError
- hi def link vimFunc         	vimError
- hi def link vimHiAttribList	vimError
- hi def link vimHiCtermError	vimError
- hi def link vimHiKeyError	vimError
- hi def link vimKeyCodeError	vimError
- hi def link vimMapModErr	vimError
- hi def link vimSubstFlagErr	vimError
- hi def link vimSynCaseError	vimError
- hi def link vimBufnrWarn	vimWarn
-endif
+if !exists("skip_vim_syntax_inits")
+ if !exists("g:vimsyn_noerror")
+  hi def link vimBehaveError	vimError
+  hi def link vimCollClassErr	vimError
+  hi def link vimErrSetting	vimError
+  hi def link vimEmbedError	vimError
+  hi def link vimFTError	vimError
+  hi def link vimFunctionError	vimError
+  hi def link vimFunc         	vimError
+  hi def link vimHiAttribList	vimError
+  hi def link vimHiCtermError	vimError
+  hi def link vimHiKeyError	vimError
+  hi def link vimKeyCodeError	vimError
+  hi def link vimMapModErr	vimError
+  hi def link vimSubstFlagErr	vimError
+  hi def link vimSynCaseError	vimError
+  hi def link vimBufnrWarn	vimWarn
+ endif
 
-hi def link vimAbb	vimCommand
-hi def link vimAddress	vimMark
-hi def link vimAugroupError	vimError
-hi def link vimAugroupKey	vimCommand
-hi def link vimAuHighlight	vimHighlight
-hi def link vimAutoCmdOpt	vimOption
-hi def link vimAutoCmd	vimCommand
-hi def link vimAutoEvent	Type
-hi def link nvimAutoEvent	vimAutoEvent
-hi def link vimAutoSet	vimCommand
-hi def link vimBehaveModel	vimBehave
-hi def link vimBehave	vimCommand
-hi def link vimBracket	Delimiter
-hi def link vimCmplxRepeat	SpecialChar
-hi def link vimCommand	Statement
-hi def link vimComment	Comment
-hi def link vimCommentString	vimString
-hi def link vimCommentTitle	PreProc
-hi def link vimCondHL	vimCommand
-hi def link vimContinue	Special
-hi def link vimCtrlChar	SpecialChar
-hi def link vimEchoHLNone	vimGroup
-hi def link vimEchoHL	vimCommand
-hi def link vimElseIfErr	Error
-hi def link vimElseif	vimCondHL
-hi def link vimEnvvar	PreProc
-hi def link vimError	Error
-hi def link vimFBVar	vimVar
-hi def link vimFgBgAttrib	vimHiAttrib
-hi def link vimFold	Folded
-hi def link vimFTCmd	vimCommand
-hi def link vimFTOption	vimSynType
-hi def link vimFuncKey	vimCommand
-hi def link vimFuncName	Function
-hi def link vimFuncSID	Special
-hi def link vimFuncVar	Identifier
-hi def link vimGroupAdd	vimSynOption
-hi def link vimGroupName	vimGroup
-hi def link vimGroupRem	vimSynOption
-hi def link vimGroupSpecial	Special
-hi def link vimGroup	Type
-hi def link vimHiAttrib	PreProc
-hi def link vimHiClear	vimHighlight
-hi def link vimHiCtermFgBg	vimHiTerm
-hi def link vimHiCTerm	vimHiTerm
-hi def link vimHighlight	vimCommand
-hi def link vimHiGroup	vimGroupName
-hi def link vimHiGuiFgBg	vimHiTerm
-hi def link vimHiGuiFont	vimHiTerm
-hi def link vimHiGuiRgb	vimNumber
-hi def link vimHiGui	vimHiTerm
-hi def link vimHiNmbr	Number
-hi def link vimHiStartStop	vimHiTerm
-hi def link vimHiTerm	Type
-hi def link vimHLGroup	vimGroup
-hi def link nvimHLGroup	vimHLGroup
-hi def link vimHLMod	PreProc
-hi def link vimInsert	vimString
-hi def link vimIskSep	Delimiter
-hi def link vimKeyCode	vimSpecFile
-hi def link vimKeyword	Statement
-hi def link vimLet	vimCommand
-hi def link vimLineComment	vimComment
-hi def link vimMapBang	vimCommand
-hi def link vimMapModKey	vimFuncSID
-hi def link vimMapMod	vimBracket
-hi def link vimMap	vimCommand
-hi def link nvimMap	vimMap
-hi def link vimMark	Number
-hi def link vimMarkNumber	vimNumber
-hi def link vimMenuMod	vimMapMod
-hi def link vimMenuNameMore	vimMenuName
-hi def link vimMenuName	PreProc
-hi def link vimMtchComment	vimComment
-hi def link vimNorm	vimCommand
-hi def link vimNotation	Special
-hi def link vimNotFunc	vimCommand
-hi def link vimNotPatSep	vimString
-hi def link vimNumber	Number
-hi def link vimOperError	Error
-hi def link vimOper	Operator
-hi def link vimOption	PreProc
-hi def link vimParenSep	Delimiter
-hi def link vimPatSepErr	vimPatSep
-hi def link vimPatSepR	vimPatSep
-hi def link vimPatSep	SpecialChar
-hi def link vimPatSepZone	vimString
-hi def link vimPatSepZ	vimPatSep
-hi def link vimPattern	Type
-hi def link vimPlainMark	vimMark
-hi def link vimPlainRegister	vimRegister
-hi def link vimRegister	SpecialChar
-hi def link vimScriptDelim	Comment
-hi def link vimSearchDelim	Statement
-hi def link vimSearch	vimString
-hi def link vimSep	Delimiter
-hi def link vimSetMod	vimOption
-hi def link vimSetSep	Statement
-hi def link vimSetString	vimString
-hi def link vimSpecFile	Identifier
-hi def link vimSpecFileMod	vimSpecFile
-hi def link vimSpecial	Type
-hi def link vimStatement	Statement
-hi def link vimStringCont	vimString
-hi def link vimString	String
-hi def link vimSubst1	vimSubst
-hi def link vimSubstDelim	Delimiter
-hi def link vimSubstFlags	Special
-hi def link vimSubstSubstr	SpecialChar
-hi def link vimSubstTwoBS	vimString
-hi def link vimSubst	vimCommand
-hi def link vimSynCaseError	Error
-hi def link vimSynCase	Type
-hi def link vimSyncC	Type
-hi def link vimSyncError	Error
-hi def link vimSyncGroupName	vimGroupName
-hi def link vimSyncGroup	vimGroupName
-hi def link vimSyncKey	Type
-hi def link vimSyncNone	Type
-hi def link vimSynContains	vimSynOption
-hi def link vimSynError	Error
-hi def link vimSynKeyContainedin	vimSynContains
-hi def link vimSynKeyOpt	vimSynOption
-hi def link vimSynMtchGrp	vimSynOption
-hi def link vimSynMtchOpt	vimSynOption
-hi def link vimSynNextgroup	vimSynOption
-hi def link vimSynNotPatRange	vimSynRegPat
-hi def link vimSynOption	Special
-hi def link vimSynPatRange	vimString
-hi def link vimSynRegOpt	vimSynOption
-hi def link vimSynRegPat	vimString
-hi def link vimSynReg	Type
-hi def link vimSyntax	vimCommand
-hi def link vimSynType	vimSpecial
-hi def link vimTodo	Todo
-hi def link vimUnmap	vimMap
-hi def link nvimUnmap	vimMap
-hi def link vimUserAttrbCmpltFunc	Special
-hi def link vimUserAttrbCmplt	vimSpecial
-hi def link vimUserAttrbKey	vimOption
-hi def link vimUserAttrb	vimSpecial
-hi def link vimUserAttrbError	Error
-hi def link vimUserCmdError	Error
-hi def link vimUserCommand	vimCommand
-hi def link vimUserFunc	Normal
-hi def link vimVar	Identifier
-hi def link vimWarn	WarningMsg
+ hi def link vimAbb	vimCommand
+ hi def link vimAddress	vimMark
+ hi def link vimAugroupError	vimError
+ hi def link vimAugroupKey	vimCommand
+ hi def link vimAuHighlight	vimHighlight
+ hi def link vimAutoCmdOpt	vimOption
+ hi def link vimAutoCmd	vimCommand
+ hi def link vimAutoEvent	Type
+ hi def link vimAutoSet	vimCommand
+ hi def link vimBehaveModel	vimBehave
+ hi def link vimBehave	vimCommand
+ hi def link vimBracket	Delimiter
+ hi def link vimCmplxRepeat	SpecialChar
+ hi def link vimCommand	Statement
+ hi def link vimComment	Comment
+ hi def link vimCommentString	vimString
+ hi def link vimCommentTitle	PreProc
+ hi def link vimCondHL	vimCommand
+ hi def link vimContinue	Special
+ hi def link vimCtrlChar	SpecialChar
+ hi def link vimEchoHLNone	vimGroup
+ hi def link vimEchoHL	vimCommand
+ hi def link vimElseIfErr	Error
+ hi def link vimElseif	vimCondHL
+ hi def link vimEnvvar	PreProc
+ hi def link vimError	Error
+ hi def link vimFBVar	vimVar
+ hi def link vimFgBgAttrib	vimHiAttrib
+ hi def link vimFold	Folded
+ hi def link vimFTCmd	vimCommand
+ hi def link vimFTOption	vimSynType
+ hi def link vimFuncKey	vimCommand
+ hi def link vimFuncName	Function
+ hi def link vimFuncSID	Special
+ hi def link vimFuncVar	Identifier
+ hi def link vimGroupAdd	vimSynOption
+ hi def link vimGroupName	vimGroup
+ hi def link vimGroupRem	vimSynOption
+ hi def link vimGroupSpecial	Special
+ hi def link vimGroup	Type
+ hi def link vimHiAttrib	PreProc
+ hi def link vimHiClear	vimHighlight
+ hi def link vimHiCtermFgBg	vimHiTerm
+ hi def link vimHiCTerm	vimHiTerm
+ hi def link vimHighlight	vimCommand
+ hi def link vimHiGroup	vimGroupName
+ hi def link vimHiGuiFgBg	vimHiTerm
+ hi def link vimHiGuiFont	vimHiTerm
+ hi def link vimHiGuiRgb	vimNumber
+ hi def link vimHiGui	vimHiTerm
+ hi def link vimHiNmbr	Number
+ hi def link vimHiStartStop	vimHiTerm
+ hi def link vimHiTerm	Type
+ hi def link vimHLGroup	vimGroup
+ hi def link vimHLMod	PreProc
+ hi def link vimInsert	vimString
+ hi def link vimIskSep	Delimiter
+ hi def link vimKeyCode	vimSpecFile
+ hi def link vimKeyword	Statement
+ hi def link vimLet	vimCommand
+ hi def link vimLineComment	vimComment
+ hi def link vimMapBang	vimCommand
+ hi def link vimMapModKey	vimFuncSID
+ hi def link vimMapMod	vimBracket
+ hi def link vimMap	vimCommand
+ hi def link vimMark	Number
+ hi def link vimMarkNumber	vimNumber
+ hi def link vimMenuMod	vimMapMod
+ hi def link vimMenuNameMore	vimMenuName
+ hi def link vimMenuName	PreProc
+ hi def link vimMtchComment	vimComment
+ hi def link vimNorm	vimCommand
+ hi def link vimNotation	Special
+ hi def link vimNotFunc	vimCommand
+ hi def link vimNotPatSep	vimString
+ hi def link vimNumber	Number
+ hi def link vimOperError	Error
+ hi def link vimOper	Operator
+ hi def link vimOption	PreProc
+ hi def link vimParenSep	Delimiter
+ hi def link vimPatSepErr	vimPatSep
+ hi def link vimPatSepR	vimPatSep
+ hi def link vimPatSep	SpecialChar
+ hi def link vimPatSepZone	vimString
+ hi def link vimPatSepZ	vimPatSep
+ hi def link vimPattern	Type
+ hi def link vimPlainMark	vimMark
+ hi def link vimPlainRegister	vimRegister
+ hi def link vimRegister	SpecialChar
+ hi def link vimScriptDelim	Comment
+ hi def link vimSearchDelim	Statement
+ hi def link vimSearch	vimString
+ hi def link vimSep	Delimiter
+ hi def link vimSetMod	vimOption
+ hi def link vimSetSep	Statement
+ hi def link vimSetString	vimString
+ hi def link vimSpecFile	Identifier
+ hi def link vimSpecFileMod	vimSpecFile
+ hi def link vimSpecial	Type
+ hi def link vimStatement	Statement
+ hi def link vimStringCont	vimString
+ hi def link vimString	String
+ hi def link vimSubst1	vimSubst
+ hi def link vimSubstDelim	Delimiter
+ hi def link vimSubstFlags	Special
+ hi def link vimSubstSubstr	SpecialChar
+ hi def link vimSubstTwoBS	vimString
+ hi def link vimSubst	vimCommand
+ hi def link vimSynCaseError	Error
+ hi def link vimSynCase	Type
+ hi def link vimSyncC	Type
+ hi def link vimSyncError	Error
+ hi def link vimSyncGroupName	vimGroupName
+ hi def link vimSyncGroup	vimGroupName
+ hi def link vimSyncKey	Type
+ hi def link vimSyncNone	Type
+ hi def link vimSynContains	vimSynOption
+ hi def link vimSynError	Error
+ hi def link vimSynKeyContainedin	vimSynContains
+ hi def link vimSynKeyOpt	vimSynOption
+ hi def link vimSynMtchGrp	vimSynOption
+ hi def link vimSynMtchOpt	vimSynOption
+ hi def link vimSynNextgroup	vimSynOption
+ hi def link vimSynNotPatRange	vimSynRegPat
+ hi def link vimSynOption	Special
+ hi def link vimSynPatRange	vimString
+ hi def link vimSynRegOpt	vimSynOption
+ hi def link vimSynRegPat	vimString
+ hi def link vimSynReg	Type
+ hi def link vimSyntax	vimCommand
+ hi def link vimSynType	vimSpecial
+ hi def link vimTodo	Todo
+ hi def link vimUnmap	vimMap
+ hi def link vimUserAttrbCmpltFunc	Special
+ hi def link vimUserAttrbCmplt	vimSpecial
+ hi def link vimUserAttrbKey	vimOption
+ hi def link vimUserAttrb	vimSpecial
+ hi def link vimUserAttrbError	Error
+ hi def link vimUserCmdError	Error
+ hi def link vimUserCommand	vimCommand
+ hi def link vimUserFunc	Normal
+ hi def link vimVar	Identifier
+ hi def link vimWarn	WarningMsg
+endif
 
 " Current Syntax Variable: {{{2
 let b:current_syntax = "vim"
diff --git a/runtime/syntax/virata.vim b/runtime/syntax/virata.vim
index 3023f13a91..0ed54fa899 100644
--- a/runtime/syntax/virata.vim
+++ b/runtime/syntax/virata.vim
@@ -155,54 +155,52 @@ syn sync minlines=50		"for multiple region nesting
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " Sub Links:
-HiLink virataDefSubstError	virataPreProcError
-HiLink virataDefSubst		virataPreProc
-HiLink virataInAlter		virataOperator
-HiLink virataInExec		virataOperator
-HiLink virataInExport		virataOperator
-HiLink virataInImport		virataOperator
-HiLink virataInInstance	virataOperator
-HiLink virataInMake		virataOperator
-HiLink virataInModule		virataOperator
-HiLink virataInProcess	virataOperator
-HiLink virataInMacAddr	virataHexNumber
+hi def link virataDefSubstError	virataPreProcError
+hi def link virataDefSubst		virataPreProc
+hi def link virataInAlter		virataOperator
+hi def link virataInExec		virataOperator
+hi def link virataInExport		virataOperator
+hi def link virataInImport		virataOperator
+hi def link virataInInstance	virataOperator
+hi def link virataInMake		virataOperator
+hi def link virataInModule		virataOperator
+hi def link virataInProcess	virataOperator
+hi def link virataInMacAddr	virataHexNumber
 
 " Comment Group:
-HiLink virataComment		Comment
-HiLink virataSpclComment	SpecialComment
-HiLink virataInCommentTodo	Todo
+hi def link virataComment		Comment
+hi def link virataSpclComment	SpecialComment
+hi def link virataInCommentTodo	Todo
 
 " Constant Group:
-HiLink virataString		String
-HiLink virataStringError	Error
-HiLink virataCharacter	Character
-HiLink virataSpclChar		Special
-HiLink virataDecNumber	Number
-HiLink virataHexNumber	Number
-HiLink virataSizeNumber	Number
-HiLink virataNumberError	Error
+hi def link virataString		String
+hi def link virataStringError	Error
+hi def link virataCharacter	Character
+hi def link virataSpclChar		Special
+hi def link virataDecNumber	Number
+hi def link virataHexNumber	Number
+hi def link virataSizeNumber	Number
+hi def link virataNumberError	Error
 
 " Identifier Group:
-HiLink virataIdentError	Error
+hi def link virataIdentError	Error
 
 " PreProc Group:
-HiLink virataPreProc		PreProc
-HiLink virataDefine		Define
-HiLink virataInclude		Include
-HiLink virataPreCondit	PreCondit
-HiLink virataPreProcError	Error
-HiLink virataPreProcWarn	Todo
+hi def link virataPreProc		PreProc
+hi def link virataDefine		Define
+hi def link virataInclude		Include
+hi def link virataPreCondit	PreCondit
+hi def link virataPreProcError	Error
+hi def link virataPreProcWarn	Todo
 
 " Directive Group:
-HiLink virataStatement	Statement
-HiLink virataCfgStatement	Statement
-HiLink virataOperator		Operator
-HiLink virataDirective	Keyword
+hi def link virataStatement	Statement
+hi def link virataCfgStatement	Statement
+hi def link virataOperator		Operator
+hi def link virataDirective	Keyword
 
-delcommand HiLink
 
 let b:current_syntax = "virata"
 
diff --git a/runtime/syntax/vmasm.vim b/runtime/syntax/vmasm.vim
index a4b71229ec..c5cbb1e3a2 100644
--- a/runtime/syntax/vmasm.vim
+++ b/runtime/syntax/vmasm.vim
@@ -194,7 +194,6 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
 " The default methods for highlighting.  Can be overridden later
 " Comment Constant Error Identifier PreProc Special Statement Todo Type
@@ -206,34 +205,33 @@ command -nargs=+ HiLink hi def link <args>
 " Statement		Conditional Exception Keyword Label Operator Repeat
 " Type		StorageClass Structure Typedef
 
-HiLink vmasmComment		Comment
-HiLink vmasmTodo		Todo
+hi def link vmasmComment		Comment
+hi def link vmasmTodo		Todo
 
-HiLink vmasmhexNumber		Number		" Constant
-HiLink vmasmoctNumber		Number		" Constant
-HiLink vmasmbinNumber		Number		" Constant
-HiLink vmasmdecNumber		Number		" Constant
-HiLink vmasmfloatNumber	Number		" Constant
+hi def link vmasmhexNumber		Number		" Constant
+hi def link vmasmoctNumber		Number		" Constant
+hi def link vmasmbinNumber		Number		" Constant
+hi def link vmasmdecNumber		Number		" Constant
+hi def link vmasmfloatNumber	Number		" Constant
 
-"  HiLink vmasmString		String		" Constant
+"  hi def link vmasmString		String		" Constant
 
-HiLink vmasmReg		Identifier
-HiLink vmasmOperator		Identifier
+hi def link vmasmReg		Identifier
+hi def link vmasmOperator		Identifier
 
-HiLink vmasmInclude		Include		" PreProc
-HiLink vmasmMacro		Macro		" PreProc
-" HiLink vmasmMacroParam	Keyword		" Statement
+hi def link vmasmInclude		Include		" PreProc
+hi def link vmasmMacro		Macro		" PreProc
+" hi def link vmasmMacroParam	Keyword		" Statement
 
-HiLink vmasmDirective		Special
-HiLink vmasmPreCond		Special
+hi def link vmasmDirective		Special
+hi def link vmasmPreCond		Special
 
 
-HiLink vmasmOpcode		Statement
-HiLink vmasmCond		Conditional	" Statement
-HiLink vmasmRepeat		Repeat		" Statement
+hi def link vmasmOpcode		Statement
+hi def link vmasmCond		Conditional	" Statement
+hi def link vmasmRepeat		Repeat		" Statement
 
-HiLink vmasmLabel		Type
-delcommand HiLink
+hi def link vmasmLabel		Type
 
 let b:current_syntax = "vmasm"
 
diff --git a/runtime/syntax/vrml.vim b/runtime/syntax/vrml.vim
index 530becb55a..2474493c94 100644
--- a/runtime/syntax/vrml.vim
+++ b/runtime/syntax/vrml.vim
@@ -196,28 +196,26 @@ syn region VRMLString start=+"+ skip=+\\\\\|\\"+ end=+"+ fold contains=VRMLSpeci
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink VRMLCharacter  VRMLString
-HiLink VRMLSpecialCharacter VRMLSpecial
-HiLink VRMLNumber     VRMLString
-HiLink VRMLValues     VRMLString
-HiLink VRMLString     String
-HiLink VRMLSpecial    Special
-HiLink VRMLComment    Comment
-HiLink VRMLNodes      Statement
-HiLink VRMLFields     Type
-HiLink VRMLEvents     Type
-HiLink VRMLfTypes     LineNr
+hi def link VRMLCharacter  VRMLString
+hi def link VRMLSpecialCharacter VRMLSpecial
+hi def link VRMLNumber     VRMLString
+hi def link VRMLValues     VRMLString
+hi def link VRMLString     String
+hi def link VRMLSpecial    Special
+hi def link VRMLComment    Comment
+hi def link VRMLNodes      Statement
+hi def link VRMLFields     Type
+hi def link VRMLEvents     Type
+hi def link VRMLfTypes     LineNr
 "  hi     VRMLfTypes     ctermfg=6 guifg=Brown
-HiLink VRMLInstances  PreCondit
-HiLink VRMLRoutes     PreCondit
-HiLink VRMLProtos     PreProc
-HiLink VRMLRouteNode  Identifier
-HiLink VRMLInstName   Identifier
-HiLink VRMLTypes      Identifier
+hi def link VRMLInstances  PreCondit
+hi def link VRMLRoutes     PreCondit
+hi def link VRMLProtos     PreProc
+hi def link VRMLRouteNode  Identifier
+hi def link VRMLInstName   Identifier
+hi def link VRMLTypes      Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "vrml"
 
diff --git a/runtime/syntax/vsejcl.vim b/runtime/syntax/vsejcl.vim
index 5a106c2ef8..f329836236 100644
--- a/runtime/syntax/vsejcl.vim
+++ b/runtime/syntax/vsejcl.vim
@@ -21,17 +21,15 @@ syn match vsejclParms /(.\{-})/ contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink vsejclComment		Comment
-HiLink vsejclField		Type
-HiLink vsejclKeyword		Statement
-HiLink vsejclObject		Constant
-HiLink vsejclString		Constant
-HiLink vsejclMisc			Special
-HiLink vsejclParms		Constant
+hi def link vsejclComment		Comment
+hi def link vsejclField		Type
+hi def link vsejclKeyword		Statement
+hi def link vsejclObject		Constant
+hi def link vsejclString		Constant
+hi def link vsejclMisc			Special
+hi def link vsejclParms		Constant
 
-delcommand HiLink
 
 let b:current_syntax = "vsejcl"
 
diff --git a/runtime/syntax/wdiff.vim b/runtime/syntax/wdiff.vim
index bdc7be7131..d0afadff2f 100644
--- a/runtime/syntax/wdiff.vim
+++ b/runtime/syntax/wdiff.vim
@@ -21,11 +21,9 @@ syn region wdiffNew start="{+" end="+}"
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink wdiffOld       Special
-HiLink wdiffNew       Identifier
+hi def link wdiffOld       Special
+hi def link wdiffNew       Identifier
 
-delcommand HiLink
 
 let b:current_syntax = "wdiff"
diff --git a/runtime/syntax/webmacro.vim b/runtime/syntax/webmacro.vim
index 2c32f537d8..fb1fff6d3d 100644
--- a/runtime/syntax/webmacro.vim
+++ b/runtime/syntax/webmacro.vim
@@ -45,22 +45,20 @@ syn match webmacroHash "[#{}\$]" contained
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink webmacroComment CommentTitle
-HiLink webmacroVariable PreProc
-HiLink webmacroIf webmacroStatement
-HiLink webmacroForeach webmacroStatement
-HiLink webmacroSet webmacroStatement
-HiLink webmacroInclude webmacroStatement
-HiLink webmacroParse webmacroStatement
-HiLink webmacroStatement Function
-HiLink webmacroNumber Number
-HiLink webmacroBoolean Boolean
-HiLink webmacroSpecial Special
-HiLink webmacroString String
-HiLink webmacroBracesError Error
-delcommand HiLink
+hi def link webmacroComment CommentTitle
+hi def link webmacroVariable PreProc
+hi def link webmacroIf webmacroStatement
+hi def link webmacroForeach webmacroStatement
+hi def link webmacroSet webmacroStatement
+hi def link webmacroInclude webmacroStatement
+hi def link webmacroParse webmacroStatement
+hi def link webmacroStatement Function
+hi def link webmacroNumber Number
+hi def link webmacroBoolean Boolean
+hi def link webmacroSpecial Special
+hi def link webmacroString String
+hi def link webmacroBracesError Error
 
 let b:current_syntax = "webmacro"
 
diff --git a/runtime/syntax/winbatch.vim b/runtime/syntax/winbatch.vim
index e787a5d09f..15ea0fc77b 100644
--- a/runtime/syntax/winbatch.vim
+++ b/runtime/syntax/winbatch.vim
@@ -156,20 +156,18 @@ syn keyword winbatchImplicit xsendmessage xverifyccard yield
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink winbatchLabel		PreProc
-HiLink winbatchCtl		Operator
-HiLink winbatchStatement	Statement
-HiLink winbatchTodo		Todo
-HiLink winbatchString		String
-HiLink winbatchVar		Type
-HiLink winbatchComment	Comment
-HiLink winbatchImplicit	Special
-HiLink winbatchNumber		Number
-HiLink winbatchConstant	StorageClass
+hi def link winbatchLabel		PreProc
+hi def link winbatchCtl		Operator
+hi def link winbatchStatement	Statement
+hi def link winbatchTodo		Todo
+hi def link winbatchString		String
+hi def link winbatchVar		Type
+hi def link winbatchComment	Comment
+hi def link winbatchImplicit	Special
+hi def link winbatchNumber		Number
+hi def link winbatchConstant	StorageClass
 
-delcommand HiLink
 
 let b:current_syntax = "winbatch"
 
diff --git a/runtime/syntax/wml.vim b/runtime/syntax/wml.vim
index b9169d003b..73bf822e40 100644
--- a/runtime/syntax/wml.vim
+++ b/runtime/syntax/wml.vim
@@ -130,23 +130,21 @@ endif
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink wmlNextLine	Special
-HiLink wmlUse		Include
-HiLink wmlUsed	String
-HiLink wmlBody	Special
-HiLink wmlDiverted	Label
-HiLink wmlDivert	Delimiter
-HiLink wmlDivertEnd	Delimiter
-HiLink wmlLocationId	Label
-HiLink wmlLocation	Delimiter
-" HiLink wmlLocationed	Delimiter
-HiLink wmlDefineName	String
-HiLink wmlComment	Comment
-HiLink wmlInclude	Include
-HiLink wmlSharpBang	PreProc
+hi def link wmlNextLine	Special
+hi def link wmlUse		Include
+hi def link wmlUsed	String
+hi def link wmlBody	Special
+hi def link wmlDiverted	Label
+hi def link wmlDivert	Delimiter
+hi def link wmlDivertEnd	Delimiter
+hi def link wmlLocationId	Label
+hi def link wmlLocation	Delimiter
+" hi def link wmlLocationed	Delimiter
+hi def link wmlDefineName	String
+hi def link wmlComment	Comment
+hi def link wmlInclude	Include
+hi def link wmlSharpBang	PreProc
 
-delcommand HiLink
 
 let b:current_syntax = "wml"
diff --git a/runtime/syntax/wsml.vim b/runtime/syntax/wsml.vim
index f2fbbf25c1..d01294caac 100644
--- a/runtime/syntax/wsml.vim
+++ b/runtime/syntax/wsml.vim
@@ -77,38 +77,36 @@ syn cluster wsmlTop add=wsmlString,wsmlCharacter,wsmlNumber,wsmlSpecial,wsmlStri
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink wsmlHeader			TypeDef
-HiLink wsmlNamespace			TypeDef
-HiLink wsmlOntology			Statement
-HiLink wsmlAxiom			TypeDef
-HiLink wsmlService			TypeDef
-HiLink wsmlNFP			TypeDef
-HiLink wsmlTopLevel			TypeDef
-HiLink wsmlMediation			TypeDef 
-HiLink wsmlBehavioral		TypeDef
-HiLink wsmlChoreographyPri		TypeDef
-HiLink wsmlChoreographySec		Operator
-HiLink wsmlChoreographyTer		Special
-HiLink wsmlString			String
-HiLink wsmlIdentifier		Normal 
-HiLink wsmlSqName                     Normal
-HiLink wsmlVariable			Define
-HiLink wsmlKeywordsInsideLEs		Operator
-HiLink wsmlOperator			Operator
-HiLink wsmlBrace			Operator
-HiLink wsmlCharacter			Character
-HiLink wsmlNumber			Number
-HiLink wsmlDataTypes			Special
-HiLink wsmlComment			Comment
-HiLink wsmlDocComment		Comment
-HiLink wsmlLineComment		Comment
-HiLink wsmlTodo			Todo
-HiLink wsmlFixMe			Error
-HiLink wsmlCommentTitle		SpecialComment
-HiLink wsmlCommentStar		wsmlComment
+hi def link wsmlHeader			TypeDef
+hi def link wsmlNamespace			TypeDef
+hi def link wsmlOntology			Statement
+hi def link wsmlAxiom			TypeDef
+hi def link wsmlService			TypeDef
+hi def link wsmlNFP			TypeDef
+hi def link wsmlTopLevel			TypeDef
+hi def link wsmlMediation			TypeDef 
+hi def link wsmlBehavioral		TypeDef
+hi def link wsmlChoreographyPri		TypeDef
+hi def link wsmlChoreographySec		Operator
+hi def link wsmlChoreographyTer		Special
+hi def link wsmlString			String
+hi def link wsmlIdentifier		Normal 
+hi def link wsmlSqName                     Normal
+hi def link wsmlVariable			Define
+hi def link wsmlKeywordsInsideLEs		Operator
+hi def link wsmlOperator			Operator
+hi def link wsmlBrace			Operator
+hi def link wsmlCharacter			Character
+hi def link wsmlNumber			Number
+hi def link wsmlDataTypes			Special
+hi def link wsmlComment			Comment
+hi def link wsmlDocComment		Comment
+hi def link wsmlLineComment		Comment
+hi def link wsmlTodo			Todo
+hi def link wsmlFixMe			Error
+hi def link wsmlCommentTitle		SpecialComment
+hi def link wsmlCommentStar		wsmlComment
 
-delcommand HiLink
 
 let b:current_syntax = "wsml"
 let b:spell_options="contained"
diff --git a/runtime/syntax/xdefaults.vim b/runtime/syntax/xdefaults.vim
index 1dfcc34ae5..7da5969cde 100644
--- a/runtime/syntax/xdefaults.vim
+++ b/runtime/syntax/xdefaults.vim
@@ -107,27 +107,25 @@ syn keyword xdefaultsSymbol contained Y_RESOLUTION
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
-HiLink xdefaultsLabel		Type
-HiLink xdefaultsValue		Constant
-HiLink xdefaultsComment	Comment
-HiLink xdefaultsCommentH	xdefaultsComment
-HiLink xdefaultsPreProc	PreProc
-HiLink xdefaultsInclude	xdefaultsPreProc
-HiLink xdefaultsCppSkip	xdefaultsCppOut
-HiLink xdefaultsCppOut2	xdefaultsCppOut
-HiLink xdefaultsCppOut	Comment
-HiLink xdefaultsIncluded	String
-HiLink xdefaultsDefine	Macro
-HiLink xdefaultsSymbol	Statement
-HiLink xdefaultsSpecial	Statement
-HiLink xdefaultsErrorLine	Error
-HiLink xdefaultsCommentError	Error
-HiLink xdefaultsPunct		Normal
-HiLink xdefaultsLineEnd	Special
-HiLink xdefaultsTodo		Todo
+hi def link xdefaultsLabel		Type
+hi def link xdefaultsValue		Constant
+hi def link xdefaultsComment	Comment
+hi def link xdefaultsCommentH	xdefaultsComment
+hi def link xdefaultsPreProc	PreProc
+hi def link xdefaultsInclude	xdefaultsPreProc
+hi def link xdefaultsCppSkip	xdefaultsCppOut
+hi def link xdefaultsCppOut2	xdefaultsCppOut
+hi def link xdefaultsCppOut	Comment
+hi def link xdefaultsIncluded	String
+hi def link xdefaultsDefine	Macro
+hi def link xdefaultsSymbol	Statement
+hi def link xdefaultsSpecial	Statement
+hi def link xdefaultsErrorLine	Error
+hi def link xdefaultsCommentError	Error
+hi def link xdefaultsPunct		Normal
+hi def link xdefaultsLineEnd	Special
+hi def link xdefaultsTodo		Todo
 
-delcommand HiLink
 
 let b:current_syntax = "xdefaults"
 
diff --git a/runtime/syntax/xkb.vim b/runtime/syntax/xkb.vim
index efb7d66c0c..59fc497e62 100644
--- a/runtime/syntax/xkb.vim
+++ b/runtime/syntax/xkb.vim
@@ -47,35 +47,33 @@ syn keyword xkbTModif default hidden partial virtual
 syn keyword xkbSect alphanumeric_keys alternate_group function_keys keypad_keys modifier_keys xkb_compatibility xkb_geometry xkb_keycodes xkb_keymap xkb_semantics xkb_symbols xkb_types
 
 " Define the default highlighting
-command -nargs=+ HiLink hi def link <args>
 
-HiLink xkbModif xkbPreproc
-HiLink xkbTModif xkbPreproc
-HiLink xkbPreproc Preproc
+hi def link xkbModif xkbPreproc
+hi def link xkbTModif xkbPreproc
+hi def link xkbPreproc Preproc
 
-HiLink xkbIdentifier Keyword
-HiLink xkbFunction Function
-HiLink xkbSect Type
-HiLink xkbPhysicalKey Identifier
-HiLink xkbKeyword Keyword
+hi def link xkbIdentifier Keyword
+hi def link xkbFunction Function
+hi def link xkbSect Type
+hi def link xkbPhysicalKey Identifier
+hi def link xkbKeyword Keyword
 
-HiLink xkbComment Comment
-HiLink xkbTodo Todo
+hi def link xkbComment Comment
+hi def link xkbTodo Todo
 
-HiLink xkbConstant Constant
-HiLink xkbString String
+hi def link xkbConstant Constant
+hi def link xkbString String
 
-HiLink xkbSpecialChar xkbSpecial
-HiLink xkbSpecial Special
+hi def link xkbSpecialChar xkbSpecial
+hi def link xkbSpecial Special
 
-HiLink xkbParenError xkbBalancingError
-HiLink xkbBraceError xkbBalancingError
-HiLink xkbBraketError xkbBalancingError
-HiLink xkbBalancingError xkbError
-HiLink xkbCommentStartError xkbCommentError
-HiLink xkbCommentError xkbError
-HiLink xkbError Error
+hi def link xkbParenError xkbBalancingError
+hi def link xkbBraceError xkbBalancingError
+hi def link xkbBraketError xkbBalancingError
+hi def link xkbBalancingError xkbError
+hi def link xkbCommentStartError xkbCommentError
+hi def link xkbCommentError xkbError
+hi def link xkbError Error
 
-delcommand HiLink
 
 let b:current_syntax = "xkb"
diff --git a/runtime/syntax/xmath.vim b/runtime/syntax/xmath.vim
index a81adf53cc..22b3e85dae 100644
--- a/runtime/syntax/xmath.vim
+++ b/runtime/syntax/xmath.vim
@@ -1,11 +1,12 @@
 " Vim syntax file
 " Language:	xmath (a simulation tool)
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Sep 11, 2006
-" Version:	7
+" Last Change:	Aug 31, 2016
+" Version:	9
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_XMATH
 
-" quit when a syntax file was already loaded
+" For version 5.x: Clear all syntax items
+" For version 6.x: Quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
 endif
@@ -191,34 +192,33 @@ syn sync match xmathSyncComment	grouphere xmathCommentBlock "#{"
 syn sync match xmathSyncComment	groupthere NONE "}#"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_xmath_syntax_inits")
 
-HiLink xmathBraceError	xmathError
-HiLink xmathCmd	xmathStatement
-HiLink xmathCommentBlock	xmathComment
-HiLink xmathCurlyError	xmathError
-HiLink xmathFuncCmd	xmathStatement
-HiLink xmathParenError	xmathError
+  hi def link xmathBraceError	xmathError
+  hi def link xmathCmd	xmathStatement
+  hi def link xmathCommentBlock	xmathComment
+  hi def link xmathCurlyError	xmathError
+  hi def link xmathFuncCmd	xmathStatement
+  hi def link xmathParenError	xmathError
 
-" The default methods for highlighting.  Can be overridden later
-HiLink xmathCharacter	Character
-HiLink xmathComma	Delimiter
-HiLink xmathComment	Comment
-HiLink xmathCommentBlock	Comment
-HiLink xmathConditional	Conditional
-HiLink xmathError	Error
-HiLink xmathFunc	Function
-HiLink xmathLabel	PreProc
-HiLink xmathNumber	Number
-HiLink xmathRepeat	Repeat
-HiLink xmathSpecial	Type
-HiLink xmathSpecialChar	SpecialChar
-HiLink xmathStatement	Statement
-HiLink xmathString	String
-HiLink xmathTodo	Todo
+  " The default methods for highlighting.  Can be overridden later
+  hi def link xmathCharacter	Character
+  hi def link xmathComma	Delimiter
+  hi def link xmathComment	Comment
+  hi def link xmathCommentBlock	Comment
+  hi def link xmathConditional	Conditional
+  hi def link xmathError	Error
+  hi def link xmathFunc	Function
+  hi def link xmathLabel	PreProc
+  hi def link xmathNumber	Number
+  hi def link xmathRepeat	Repeat
+  hi def link xmathSpecial	Type
+  hi def link xmathSpecialChar	SpecialChar
+  hi def link xmathStatement	Statement
+  hi def link xmathString	String
+  hi def link xmathTodo	Todo
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "xmath"
 
diff --git a/runtime/syntax/xpm.vim b/runtime/syntax/xpm.vim
index 8cc92a1189..2021c3a967 100644
--- a/runtime/syntax/xpm.vim
+++ b/runtime/syntax/xpm.vim
@@ -124,15 +124,13 @@ endif		" has("gui_running")
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink xpmType		Type
-HiLink xpmStorageClass	StorageClass
-HiLink xpmTodo		Todo
-HiLink xpmComment		Comment
-HiLink xpmPixelString	String
+hi def link xpmType		Type
+hi def link xpmStorageClass	StorageClass
+hi def link xpmTodo		Todo
+hi def link xpmComment		Comment
+hi def link xpmPixelString	String
 
-delcommand HiLink
 
 let b:current_syntax = "xpm"
 
diff --git a/runtime/syntax/xpm2.vim b/runtime/syntax/xpm2.vim
index 908f3914e5..1d0eb572fd 100644
--- a/runtime/syntax/xpm2.vim
+++ b/runtime/syntax/xpm2.vim
@@ -20,7 +20,6 @@ syn keyword xpm2Todo		TODO FIXME XXX  contained
 syn match   xpm2Comment		"\!.*$"  contains=@Spell,xpm2Todo
 
 
-command -nargs=+ HiLink hi def link <args>
 command -nargs=+ Hi hi def <args>
 
 if has("gui_running")
@@ -55,7 +54,7 @@ if has("gui_running")
 	if s !~ '/'
 	  exe 'syn match xpm2Values /' . s . '/'
 	endif
-	HiLink xpm2Values Statement
+	hi def link xpm2Values Statement
 
 	let n = 1			" n = color index
 
@@ -104,11 +103,11 @@ if has("gui_running")
 	" now create syntax items
 	" highlight the color string as normal string (no pixel string)
 	exe 'syn match xpm2Col'.n.'Def /'.s.'/ contains=xpm2Col'.n.'inDef'
-	exe 'HiLink xpm2Col'.n.'Def Constant'
+	exe 'hi def link xpm2Col'.n.'Def Constant'
 
 	" but highlight the first whitespace after chars in its color
 	exe 'syn match xpm2Col'.n.'inDef /^'.chars.'/hs=s+'.(cpp).' contained'
-	exe 'HiLink xpm2Col'.n.'inDef xpm2Color'.n
+	exe 'hi def link xpm2Col'.n.'inDef xpm2Color'.n
 
 	" remove the following whitespace from chars
 	let chars = substitute(chars, '\\s\\+$', '', '')
@@ -138,13 +137,12 @@ endif		" has("gui_running")
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
 " The default highlighting.
-HiLink xpm2Type		Type
-HiLink xpm2StorageClass	StorageClass
-HiLink xpm2Todo		Todo
-HiLink xpm2Comment		Comment
-HiLink xpm2PixelString	String
+hi def link xpm2Type		Type
+hi def link xpm2StorageClass	StorageClass
+hi def link xpm2Todo		Todo
+hi def link xpm2Comment		Comment
+hi def link xpm2PixelString	String
 
-delcommand HiLink
 delcommand Hi
 
 let b:current_syntax = "xpm2"
diff --git a/runtime/syntax/xs.vim b/runtime/syntax/xs.vim
index 9a9140fdd0..d4ac9d1bc7 100644
--- a/runtime/syntax/xs.vim
+++ b/runtime/syntax/xs.vim
@@ -3243,20 +3243,18 @@ syn keyword xsMacro xiv_iv xuv_uv yystype
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink xsPrivate    Error
-HiLink xsSuperseded Error
-HiLink xsType       Type
-HiLink xsString     String
-HiLink xsConstant   Constant
-HiLink xsException  Exception
-HiLink xsKeyword    Keyword
-HiLink xsFunction   Function
-HiLink xsVariable   Identifier
-HiLink xsMacro      Macro
+hi def link xsPrivate    Error
+hi def link xsSuperseded Error
+hi def link xsType       Type
+hi def link xsString     String
+hi def link xsConstant   Constant
+hi def link xsException  Exception
+hi def link xsKeyword    Keyword
+hi def link xsFunction   Function
+hi def link xsVariable   Identifier
+hi def link xsMacro      Macro
 
-delcommand HiLink
 
 let b:current_syntax = "xs"
 
diff --git a/runtime/syntax/xxd.vim b/runtime/syntax/xxd.vim
index 1145ebccf2..f3c43e816c 100644
--- a/runtime/syntax/xxd.vim
+++ b/runtime/syntax/xxd.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:		bin using xxd
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:		8
+" Last Change:	Aug 31, 2016
+" Version:		10
 " Notes:		use :help xxd   to see how to invoke it
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_XXD
 
@@ -17,14 +17,13 @@ syn match xxdAscii				"  .\{,16\}\r\=$"hs=s+2	contains=xxdDot
 syn match xxdDot	contained	"[.\r]"
 
 " Define the default highlighting.
-" Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
+if !exists("skip_xxd_syntax_inits")
 
-HiLink xxdAddress	Constant
-HiLink xxdSep		Identifier
-HiLink xxdAscii	Statement
+ hi def link xxdAddress	Constant
+ hi def link xxdSep		Identifier
+ hi def link xxdAscii	Statement
 
-delcommand HiLink
+endif
 
 let b:current_syntax = "xxd"
 
diff --git a/runtime/syntax/yacc.vim b/runtime/syntax/yacc.vim
index 634c12ee5e..8d5eb13071 100644
--- a/runtime/syntax/yacc.vim
+++ b/runtime/syntax/yacc.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
 " Language:	Yacc
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Apr 02, 2015
-" Version:	13
-" URL:	http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
+" Last Change:	Aug 31, 2016
+" Version:	15
+" URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_YACC
 "
 " Options: {{{1
 "   g:yacc_uses_cpp : if this variable exists, then C++ is loaded rather than C
@@ -87,7 +87,7 @@ syn sync fromstart
 
 " ---------------------------------------------------------------------
 " Define the default highlighting. {{{1
-if !exists("did_yacc_syn_inits")
+if !exists("skip_yacc_syn_inits")
   hi def link yaccBrkt	yaccStmt
   hi def link yaccComment	Comment
   hi def link yaccCurly	Delimiter
diff --git a/runtime/syntax/z8a.vim b/runtime/syntax/z8a.vim
index 054f6390e6..6809eb98cd 100644
--- a/runtime/syntax/z8a.vim
+++ b/runtime/syntax/z8a.vim
@@ -83,21 +83,19 @@ syn case match
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
-command -nargs=+ HiLink hi def link <args>
 
-HiLink z8aSection		Special
-HiLink z8aLabel		Label
-HiLink z8aSpecialLabel	Label
-HiLink z8aComment		Comment
-HiLink z8aInstruction	Statement
-HiLink z8aSpecInst		Statement
-HiLink z8aInclude		Include
-HiLink z8aPreCondit		PreCondit
-HiLink z8aPreProc		PreProc
-HiLink z8aNumber		Number
-HiLink z8aString		String
+hi def link z8aSection		Special
+hi def link z8aLabel		Label
+hi def link z8aSpecialLabel	Label
+hi def link z8aComment		Comment
+hi def link z8aInstruction	Statement
+hi def link z8aSpecInst		Statement
+hi def link z8aInclude		Include
+hi def link z8aPreCondit		PreCondit
+hi def link z8aPreProc		PreProc
+hi def link z8aNumber		Number
+hi def link z8aString		String
 
-delcommand HiLink
 
 let b:current_syntax = "z8a"
 " vim: ts=8
diff --git a/src/nvim/po/eo.po b/src/nvim/po/eo.po
index 10cab0342e..3fb300c63f 100644
--- a/src/nvim/po/eo.po
+++ b/src/nvim/po/eo.po
@@ -5,7 +5,7 @@
 #
 # UNUA TRADUKISTO Dominique PELLE   <dominique.pelle ĉe gmail.com>
 # PROVLEGANTO(J)  Felipe CASTRO     <fefcas ĉe gmail.com>
-#                 Antono MECHELYNCK <antoine.mechelynck ĉe skynet.be>
+#                 Antono MECHELYNCK <antoine.mechelynck ĉe gmail.com>
 #                 Yves NEVELSTEEN
 #
 # Uzitaj vortaroj kaj fakvortaroj:
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Esperanto)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-26 20:54+0200\n"
-"PO-Revision-Date: 2016-08-26 20:30+0200\n"
+"POT-Creation-Date: 2017-01-16 00:30+0100\n"
+"PO-Revision-Date: 2017-01-16 01:14+0100\n"
 "Last-Translator: Dominique PELLÉ <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: eo\n"
@@ -32,13 +32,20 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#, fuzzy
-#~ msgid "Unable to get option value"
-#~ msgstr "fiaskis akiri valoron de opcio"
+msgid "E831: bf_key_init() called with empty password"
+msgstr "E831: bf_key_init() alvokita kun malplena pasvorto"
 
-#, fuzzy
-#~ msgid "internal error: unknown option type"
-#~ msgstr "interna eraro: neniu vim-a listero"
+msgid "E820: sizeof(uint32_t) != 4"
+msgstr "E820: sizeof(uint32_t) != 4"
+
+msgid "E817: Blowfish big/little endian use wrong"
+msgstr "E817: Misuzo de pezkomenca/pezfina en blowfish"
+
+msgid "E818: sha256 test failed"
+msgstr "E818: Testo de sha256 malsukcesis"
+
+msgid "E819: Blowfish test failed"
+msgstr "E819: Testo de blowfish malsukcesis"
 
 msgid "[Location List]"
 msgstr "[Listo de lokoj]"
@@ -59,6 +66,9 @@ msgstr "E83: Ne eblas disponigi bufron, nun uzas alian..."
 msgid "E931: Buffer cannot be registered"
 msgstr "E931: Bufro ne povas esti registrita"
 
+msgid "E937: Attempt to delete a buffer that is in use"
+msgstr "E937: Provo de forviŝo de bufro, kiu estas uzanta"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: Neniu bufro estis malŝargita"
 
@@ -106,19 +116,17 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Ne eblas iri antaŭ la unuan bufron"
 
 #, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr ""
-"E89: Neniu skribo de post la lasta ŝanĝo de la bufro %<PRId64> (aldonu ! por "
+"E89: Neniu skribo de post la lasta ŝanĝo de la bufro %ld (aldonu ! por "
 "transpasi)"
 
-#. wrap around (may cause duplicates)
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Averto: Listo de dosiernomoj troas"
 
 #, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: Bufro %<PRId64> ne trovita"
+msgid "E92: Buffer %ld not found"
+msgstr "E92: Bufro %ld ne trovita"
 
 #, c-format
 msgid "E93: More than one match for %s"
@@ -129,8 +137,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Neniu bufro kongruas kun %s"
 
 #, c-format
-msgid "line %<PRId64>"
-msgstr "linio %<PRId64>"
+msgid "line %ld"
+msgstr "linio %ld"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Bufro kun tiu nomo jam ekzistas"
@@ -158,12 +166,12 @@ msgid "1 line --%d%%--"
 msgstr "1 linio --%d%%--"
 
 #, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> linioj --%d%%--"
+msgid "%ld lines --%d%%--"
+msgstr "%ld linioj --%d%%--"
 
 #, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "linio %<PRId64> de %<PRId64> --%d%%-- kol "
+msgid "line %ld of %ld --%d%%-- col "
+msgstr "linio %ld de %ld --%d%%-- kol "
 
 msgid "[No Name]"
 msgstr "[Neniu nomo]"
@@ -209,6 +217,13 @@ msgstr ""
 msgid "Signs for %s:"
 msgstr "Emfazaj simbolaĵoj de %s:"
 
+#, c-format
+msgid "    line=%ld  id=%d  name=%s"
+msgstr "    linio=%ld  id=%d  nomo=%s"
+
+msgid "E902: Cannot connect to port"
+msgstr "E902: Ne eblas konekti al pordo"
+
 msgid "E901: gethostbyname() in channel_open()"
 msgstr "E901: gethostbyname() en channel_open()"
 
@@ -237,24 +252,69 @@ msgid "E631: %s(): write failed"
 msgstr "E631: %s(): Konservo malsukcesis"
 
 #, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    linio=%<PRId64>  id=%d  nomo=%s"
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: Ne eblas uzi reagfunkcion kun %s()"
 
-msgid "E545: Missing colon"
-msgstr "E545: Mankas dupunkto"
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr "E912: ne eblas uzi ch_evalexpr()/ch_sendexpr() kun kruda aŭ nl kanalo"
 
-msgid "E546: Illegal mode"
-msgstr "E546: Reĝimo nepermesata"
+msgid "E906: not an open channel"
+msgstr "E906: ne estas malfermita kanalo"
 
-msgid "E548: digit expected"
-msgstr "E548: cifero atendata"
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: dosiero _io bezonas _name"
 
-msgid "E549: Illegal percentage"
-msgstr "E549: Nevalida procento"
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: bufro in_io bezonas in_buf aŭ in_name"
 
 #, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: Ne eblas dosierdiferenci pli ol %<PRId64> bufrojn"
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: bufro devas esti ŝargita: %s"
+
+msgid "E821: File is encrypted with unknown method"
+msgstr "E821: Dosiero estas ĉifrita per nekonata metodo"
+
+msgid "Warning: Using a weak encryption method; see :help 'cm'"
+msgstr "Averto: uzo de malfortika ĉifrada metodo; vidu :help 'cm'"
+
+msgid "Enter encryption key: "
+msgstr "Tajpu la ŝlosilon de ĉifrado: "
+
+msgid "Enter same key again: "
+msgstr "Tajpu la ŝlosilon denove: "
+
+msgid "Keys don't match!"
+msgstr "Ŝlosiloj ne kongruas!"
+
+msgid "[crypted]"
+msgstr "[ĉifrita]"
+
+#, c-format
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Mankas dupunkto en la vortaro: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Ripetita ŝlosilo en la vortaro: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Mankas komo en la vortaro: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Mankas fino de vortaro '}': %s"
+
+msgid "extend() argument"
+msgstr "argumento de extend()"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: Ŝlosilo jam ekzistas: %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
+msgstr "E96: Ne eblas dosierdiferenci pli ol %ld bufrojn"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Ne eblas legi aŭ skribi provizorajn dosierojn"
@@ -262,6 +322,9 @@ msgstr "E810: Ne eblas legi aŭ skribi provizorajn dosierojn"
 msgid "E97: Cannot create diffs"
 msgstr "E97: Ne eblas krei dosierdiferencojn"
 
+msgid "Patch file"
+msgstr "Flika dosiero"
+
 msgid "E816: Cannot read patch output"
 msgstr "E816: Ne eblas legi eliron de flikilo \"patch\""
 
@@ -406,13 +469,10 @@ msgstr "kongruo %d de %d"
 msgid "match %d"
 msgstr "kongruo %d"
 
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: Neatenditaj signoj en \":let\""
 
-#, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: indekso de listo ekster limoj: %<PRId64>"
-
 #, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: Nedifinita variablo: %s"
@@ -420,41 +480,6 @@ msgstr "E121: Nedifinita variablo: %s"
 msgid "E111: Missing ']'"
 msgstr "E111: Mankas ']'"
 
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: Argumento de %s devas esti Listo"
-
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: Argumento de %s devas esti Listo aŭ Vortaro"
-
-msgid "E714: List required"
-msgstr "E714: Listo bezonata"
-
-msgid "E715: Dictionary required"
-msgstr "E715: Vortaro bezonata"
-
-msgid "E928: String required"
-msgstr "E928: Ĉeno bezonata"
-
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: Tro da argumentoj por funkcio: %s"
-
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: Ŝlosilo malekzistas en Vortaro: %s"
-
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: La funkcio %s jam ekzistas (aldonu ! por anstataŭigi ĝin)"
-
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: Rikordo de vortaro jam ekzistas"
-
-msgid "E718: Funcref required"
-msgstr "E718: Funcref bezonata"
-
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: Uzo de [:] ne eblas kun Vortaro"
 
@@ -513,7 +538,7 @@ msgstr "E109: Mankas ':' post '?'"
 msgid "E691: Can only compare List with List"
 msgstr "E691: Eblas nur kompari Liston kun Listo"
 
-msgid "E692: Invalid operation for Lists"
+msgid "E692: Invalid operation for List"
 msgstr "E692: Nevalida operacio de Listoj"
 
 msgid "E735: Can only compare Dictionary with Dictionary"
@@ -522,9 +547,6 @@ msgstr "E735: Eblas nur kompari Vortaron kun Vortaro"
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: Nevalida operacio de Vortaro"
 
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: Eblas nur kompari Funcref kun Funcref"
-
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: Nevalida operacio de Funcref-oj"
 
@@ -675,30 +697,37 @@ msgstr "argumento de add()"
 msgid "E785: complete() can only be used in Insert mode"
 msgstr "E785: complete() uzeblas nur en Enmeta reĝimo"
 
+#.
+#. * Yes this is ugly, I don't particularly like it either.  But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all.  See below what 'ok' and 'ync' are used for.
+#.
 msgid "&Ok"
 msgstr "&Bone"
 
 #, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: Ŝlosilo jam ekzistas: %s"
-
-msgid "extend() argument"
-msgstr "argumento de extend()"
-
-msgid "map() argument"
-msgstr "argumento de map()"
-
-msgid "filter() argument"
-msgstr "argumento de filter()"
-
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld linioj: "
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld linio: "
+msgstr[1] "+-%s%3ld linioj: "
 
 #, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: Nekonata funkcio: %s"
 
+msgid "E922: expected a dict"
+msgstr "E922: vortaro atendita"
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: Dua argumento de function() devas esti listo aŭ Vortaro"
+
+msgid ""
+"&OK\n"
+"&Cancel"
+msgstr ""
+"&Bone\n"
+"&Rezigni"
+
 msgid "called inputrestore() more often than inputsave()"
 msgstr "alvokis inputrestore() pli ofte ol inputsave()"
 
@@ -708,6 +737,9 @@ msgstr "argumento de insert()"
 msgid "E786: Range not allowed"
 msgstr "E786: Amplekso nepermesebla"
 
+msgid "E916: not a valid job"
+msgstr "E916: nevalida tasko"
+
 msgid "E701: Invalid type for len()"
 msgstr "E701: Nevalida datumtipo de len()"
 
@@ -724,6 +756,16 @@ msgstr "E727: Komenco preter fino"
 msgid "<empty>"
 msgstr "<malplena>"
 
+msgid "E240: No connection to Vim server"
+msgstr "E240: Neniu konekto al Vim-servilo"
+
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: Ne eblas sendi al %s"
+
+msgid "E277: Unable to read a server reply"
+msgstr "E277: Ne eblas legi respondon de servilo"
+
 msgid "remove() argument"
 msgstr "argumento de remove()"
 
@@ -733,6 +775,9 @@ msgstr "E655: Tro da simbolaj ligiloj (ĉu estas ciklo?)"
 msgid "reverse() argument"
 msgstr "argumento de reverse()"
 
+msgid "E258: Unable to send to client"
+msgstr "E258: Ne eblas sendi al kliento"
+
 #, c-format
 msgid "E927: Invalid action: '%s'"
 msgstr "E927: Nevalida ago: '%s'"
@@ -740,180 +785,27 @@ msgstr "E927: Nevalida ago: '%s'"
 msgid "sort() argument"
 msgstr "argumento de sort()"
 
-#, fuzzy
-#~ msgid "uniq() argument"
-#~ msgstr "argumento de add()"
+msgid "uniq() argument"
+msgstr "argumento de uniq()"
 
 msgid "E702: Sort compare function failed"
-msgstr "E702: Ordiga funkcio fiaskis"
+msgstr "E702: Ordiga funkcio malsukcesis"
 
-#, fuzzy
-#~ msgid "E882: Uniq compare function failed"
-#~ msgstr "E702: Ordiga funkcio fiaskis"
+msgid "E882: Uniq compare function failed"
+msgstr "E882: kompara funkcio de uniq() malsukcesis"
 
 msgid "(Invalid)"
 msgstr "(Nevalida)"
 
+#, c-format
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: nevalida indekso de \"submatch\": %d"
+
 msgid "E677: Error writing temp file"
 msgstr "E677: Eraro dum skribo de provizora dosiero"
 
-msgid "E805: Using a Float as a Number"
-msgstr "E805: Uzo de Glitpunktnombro kiel Nombro"
-
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: Uzo de Funcref kiel Nombro"
-
-msgid "E745: Using a List as a Number"
-msgstr "E745: Uzo de Listo kiel Nombro"
-
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: Uzo de Vortaro kiel Nombro"
-
-msgid "E891: Using a Funcref as a Float"
-msgstr "E891: Uzo de Funcref kiel Glitpunktnombro"
-
-msgid "E892: Using a String as a Float"
-msgstr "E892: Uzo de Ĉeno kiel Glitpunktnombro"
-
-msgid "E893: Using a List as a Float"
-msgstr "E893: Uzo de Listo kiel Glitpunktnombro"
-
-msgid "E894: Using a Dictionary as a Float"
-msgstr "E894: Uzo de Vortaro kiel Glitpunktnombro"
-
-msgid "E729: using Funcref as a String"
-msgstr "E729: uzo de Funcref kiel Ĉeno"
-
-msgid "E730: using List as a String"
-msgstr "E730: uzo de Listo kiel Ĉeno"
-
-msgid "E731: using Dictionary as a String"
-msgstr "E731: uzo de Vortaro kiel Ĉeno"
-
-msgid "E908: using an invalid value as a String"
-msgstr "E908: uzo de nevalida valoro kiel Ĉeno"
-
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: Nekongrua datumtipo de variablo: %s"
-
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: Ne eblas forviŝi variablon %s"
-
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: Nomo de variablo Funcref devas finiĝi per majusklo: %s"
-
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: Nomo de variablo konfliktas kun ekzistanta funkcio: %s"
-
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: Valoro estas ŝlosita: %s"
-
-msgid "Unknown"
-msgstr "Nekonata"
-
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: Ne eblas ŝanĝi valoron de %s"
-
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: variablo ingita tro profunde por fari kopion"
-
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: Nedifinita funkcio: %s"
-
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: Mankas '(': %s"
-
-msgid "E862: Cannot use g: here"
-msgstr "E862: Ne eblas uzi g: ĉi tie"
-
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: Nevalida argumento: %s"
-
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: Ripetita nomo de argumento: %s"
-
-msgid "E126: Missing :endfunction"
-msgstr "E126: Mankas \":endfunction\""
-
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: Nomo de funkcio konfliktas kun variablo: %s"
-
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: Ne eblas redifini funkcion %s: Estas nuntempe uzata"
-
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: Nomo de funkcio ne kongruas kun dosiernomo de skripto: %s"
-
-msgid "E129: Function name required"
-msgstr "E129: Nomo de funkcio bezonata"
-
-#, fuzzy, c-format
-#~ msgid "E128: Function name must start with a capital or \"s:\": %s"
-#~ msgstr "E128: Nomo de funkcio devas eki per majusklo aŭ enhavi dupunkton: %s"
-
-#, fuzzy, c-format
-#~ msgid "E884: Function name cannot contain a colon: %s"
-#~ msgstr "E128: Nomo de funkcio devas eki per majusklo aŭ enhavi dupunkton: %s"
-
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: Ne eblas forviŝi funkcion %s: Estas nuntempe uzata"
-
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: Profundo de funkcia alvoko superas 'maxfuncdepth'"
-
-#, c-format
-msgid "calling %s"
-msgstr "alvokas %s"
-
-#, c-format
-msgid "%s aborted"
-msgstr "%s ĉesigita"
-
-#, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s liveras #%<PRId64>"
-
-#, c-format
-msgid "%s returning %s"
-msgstr "%s liveras %s"
-
-#, c-format
-msgid "continuing in %s"
-msgstr "daŭrigas en %s"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: \":return\" ekster funkcio"
-
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# mallokaj variabloj:\n"
-
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tLaste ŝaltita de "
-
-msgid "No old files"
-msgstr "Neniu malnova dosiero"
+msgid "E921: Invalid callback argument"
+msgstr "E921: Nevalida argumento de reagfunctio"
 
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
@@ -934,12 +826,12 @@ msgid "1 line moved"
 msgstr "1 linio movita"
 
 #, c-format
-msgid "%<PRId64> lines moved"
-msgstr "%<PRId64> linioj movitaj"
+msgid "%ld lines moved"
+msgstr "%ld linioj movitaj"
 
 #, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "%<PRId64> linioj filtritaj"
+msgid "%ld lines filtered"
+msgstr "%ld linioj filtritaj"
 
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *Filtraj* Aŭtokomandoj ne rajtas ŝanĝi aktualan bufron"
@@ -968,13 +860,17 @@ msgid " oldfiles"
 msgstr " malnovaj dosieroj"
 
 msgid " FAILED"
-msgstr " FIASKIS"
+msgstr " MALSUKCESIS"
 
 #. avoid a wait_return for this message, it's annoying
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: Dosiero viminfo ne skribeblas: %s"
 
+#, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: Tro da provizoraj dosieroj viminfo, kiel %s!"
+
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: Ne eblas skribi dosieron viminfo %s!"
@@ -983,6 +879,10 @@ msgstr "E138: Ne eblas skribi dosieron viminfo %s!"
 msgid "Writing viminfo file \"%s\""
 msgstr "Skribas dosieron viminfo \"%s\""
 
+#, c-format
+msgid "E886: Can't rename viminfo file to %s!"
+msgstr "E886: Ne eblas renomi dosieron viminfo al %s!"
+
 #. Write the info:
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
@@ -1001,6 +901,16 @@ msgstr "# Valoro de 'encoding' kiam tiu dosiero estis kreita\n"
 msgid "Illegal starting char"
 msgstr "Nevalida eka signo"
 
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# Linioj komencantaj per |, kopiitaj sen ŝanĝo:\n"
+
+msgid "Save As"
+msgstr "Konservi kiel"
+
 msgid "Write partial file?"
 msgstr "Ĉu skribi partan dosieron?"
 
@@ -1020,8 +930,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Permutodosiero .swp ekzistas: %s (:silent! por transpasi)"
 
 #, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: Neniu dosiernomo de bufro %<PRId64>"
+msgid "E141: No file name for buffer %ld"
+msgstr "E141: Neniu dosiernomo de bufro %ld"
 
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: Dosiero ne skribita: Skribo malŝaltita per la opcio 'write'"
@@ -1048,6 +958,9 @@ msgstr ""
 msgid "E505: \"%s\" is read-only (add ! to override)"
 msgstr "E505: \"%s\" estas nurlegebla (aldonu ! por transpasi)"
 
+msgid "Edit File"
+msgstr "Redakti dosieron"
+
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: Aŭtokomandoj neatendite forviŝis novan bufron %s"
@@ -1075,19 +988,19 @@ msgid "1 substitution"
 msgstr "1 anstataŭigo"
 
 #, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> kongruoj"
+msgid "%ld matches"
+msgstr "%ld kongruoj"
 
 #, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64> anstataŭigoj"
+msgid "%ld substitutions"
+msgstr "%ld anstataŭigoj"
 
 msgid " on 1 line"
 msgstr " en 1 linio"
 
 #, c-format
-msgid " on %<PRId64> lines"
-msgstr " en %<PRId64> linioj"
+msgid " on %ld lines"
+msgstr " en %ld linioj"
 
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: Ne eblas fari \":global\" rekursie"
@@ -1129,10 +1042,6 @@ msgstr "E149: Bedaŭrinde estas neniu helpo por %s"
 msgid "Sorry, help file \"%s\" not found"
 msgstr "Bedaŭrinde, la helpdosiero \"%s\" ne troveblas"
 
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: Ne estas dosierujo: %s"
-
 #, c-format
 msgid "E151: No match: %s"
 msgstr "E151: Neniu kongruo: %s"
@@ -1153,6 +1062,10 @@ msgstr "E670: Miksaĵo de kodoprezento de helpa dosiero en lingvo: %s"
 msgid "E154: Duplicate tag \"%s\" in file %s/%s"
 msgstr "E154: Ripetita etikedo \"%s\" en dosiero %s/%s"
 
+#, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: Ne estas dosierujo: %s"
+
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: Nekonata simbola komando: %s"
@@ -1182,8 +1095,15 @@ msgid "E934: Cannot jump to a buffer that does not have a name"
 msgstr "E934: Ne eblas salti al sennoma bufro"
 
 #, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: Nevalida identigilo de simbolo: %<PRId64>"
+msgid "E157: Invalid sign ID: %ld"
+msgstr "E157: Nevalida identigilo de simbolo: %ld"
+
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: Ne eblas ŝanĝi simbolon %s"
+
+msgid " (NOT FOUND)"
+msgstr "  (NETROVITA)"
 
 msgid " (not supported)"
 msgstr " (nesubtenata)"
@@ -1198,8 +1118,8 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Eniras sencimigan reĝimon.  Tajpu \"cont\" por daŭrigi."
 
 #, c-format
-msgid "line %<PRId64>: %s"
-msgstr "linio %<PRId64>: %s"
+msgid "line %ld: %s"
+msgstr "linio %ld: %s"
 
 #, c-format
 msgid "cmd: %s"
@@ -1213,8 +1133,8 @@ msgid "frame at highest level: %d"
 msgstr "kadro je la plej alta nivelo: %d"
 
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "Kontrolpunkto en \"%s%s\" linio %<PRId64>"
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "Kontrolpunkto en \"%s%s\" linio %ld"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1224,8 +1144,8 @@ msgid "No breakpoints defined"
 msgstr "Neniu kontrolpunkto estas difinita"
 
 #, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s  linio %<PRId64>"
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  linio %ld"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Uzu unue \":profile start {dosiernomo}\""
@@ -1269,6 +1189,9 @@ msgstr "Serĉado de \"%s\""
 msgid "not found in '%s': \"%s\""
 msgstr "ne trovita en '%s: \"%s\""
 
+msgid "Source Vim script"
+msgstr "Ruli Vim-skripton"
+
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "Ne eblas ruli dosierujon: \"%s\""
@@ -1278,16 +1201,16 @@ msgid "could not source \"%s\""
 msgstr "ne eblis ruli \"%s\""
 
 #, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "linio %<PRId64>: ne eblis ruli \"%s\""
+msgid "line %ld: could not source \"%s\""
+msgstr "linio %ld: ne eblis ruli \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "rulas \"%s\""
 
 #, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "linio %<PRId64>: rulas \"%s\""
+msgid "line %ld: sourcing \"%s\""
+msgstr "linio %ld: rulas \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1329,8 +1252,6 @@ msgstr "Aktuala %slingvo: \"%s\""
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: Ne eblas ŝanĝi la lingvon al \"%s\""
 
-#. don't redisplay the window
-#. don't wait for return
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Eniras reĝimon Ex. Tajpu \"visual\" por iri al reĝimo Normala."
 
@@ -1362,12 +1283,10 @@ msgstr "E493: Inversa amplekso donita"
 msgid "Backwards range given, OK to swap"
 msgstr "Inversa amplekso donita, permuteblas"
 
-#. append
-#. typed wrong
 msgid "E494: Use w or w>>"
 msgstr "E494: Uzu w aŭ w>>"
 
-msgid "E319: The command is not available in this version"
+msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: Bedaŭrinde, tiu komando ne haveblas en tiu versio"
 
 msgid "E172: Only one file name allowed"
@@ -1384,8 +1303,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: 1 plia redaktenda dosiero"
 
 #, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: %<PRId64> pliaj redaktendaj dosieroj"
+msgid "E173: %ld more files to edit"
+msgstr "E173: %ld pliaj redaktendaj dosieroj"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: La komando jam ekzistas: aldonu ! por anstataŭigi ĝin"
@@ -1451,6 +1370,9 @@ msgstr ""
 msgid "E467: Custom completion requires a function argument"
 msgstr "E467: Uzula kompletigo bezonas funkcian argumenton"
 
+msgid "unknown"
+msgstr "nekonata"
+
 #, c-format
 msgid "E185: Cannot find color scheme '%s'"
 msgstr "E185: Ne eblas trovi agordaron de koloroj '%s'"
@@ -1464,6 +1386,9 @@ msgstr "E784: Ne eblas fermi lastan langeton"
 msgid "Already only one tab page"
 msgstr "Jam nur unu langeto"
 
+msgid "Edit File in new window"
+msgstr "Redakti Dosieron en nova fenestro"
+
 #, c-format
 msgid "Tab page %d"
 msgstr "Langeto %d"
@@ -1471,6 +1396,9 @@ msgstr "Langeto %d"
 msgid "No swap file"
 msgstr "Neniu permutodosiero .swp"
 
+msgid "Append File"
+msgstr "Postaldoni dosieron"
+
 msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
 msgstr ""
 "E747: Ne eblas ŝanĝi dosierujon, bufro estas ŝanĝita (aldonu ! por transpasi)"
@@ -1484,6 +1412,10 @@ msgstr "E187: Nekonata"
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: \":winsize\" bezonas du numerajn argumentojn"
 
+#, c-format
+msgid "Window position: X %d, Y %d"
+msgstr "Pozicio de fenestro: X %d, Y %d"
+
 msgid "E188: Obtaining window position not implemented for this platform"
 msgstr ""
 "E188: Akiro de pozicio de fenestro ne estas realigita por tiu platformo"
@@ -1491,6 +1423,22 @@ msgstr ""
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: \":winpos\" bezonas du numerajn argumentojn"
 
+msgid "E930: Cannot use :redir inside execute()"
+msgstr "E930: Ne eblas uzi :redir en execute()"
+
+msgid "Save Redirection"
+msgstr "Konservi alidirekton"
+
+# DP: mi ne certas pri superflugo
+msgid "Save View"
+msgstr "Konservi superflugon"
+
+msgid "Save Session"
+msgstr "Konservi seancon"
+
+msgid "Save Setup"
+msgstr "Konservi agordaron"
+
 #, c-format
 msgid "E739: Cannot create directory: %s"
 msgstr "E739: Ne eblas krei dosierujon %s"
@@ -1510,6 +1458,9 @@ msgstr "E191: Argumento devas esti litero, citilo aŭ retrocitilo"
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: Tro profunda rekursia alvoko de \":normal\""
 
+msgid "E809: #< is not available without the +eval feature"
+msgstr "E809: #< ne haveblas sen la eblo +eval"
+
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: Neniu alterna dosiernomo por anstataŭigi al '#'"
 
@@ -1532,9 +1483,9 @@ msgstr "E498: neniu dosiernomo \":source\" por anstataŭigi al \"<sfile>\""
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: neniu uzebla numero de linio por \"<slnum>\""
 
-#, fuzzy, c-format
-#~ msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
-#~ msgstr "E499: Malplena dosiernomo por '%' aŭ '#', nur funkcias kun \":p:h\""
+#, no-c-format
+msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
+msgstr "E499: Malplena dosiernomo por '%' aŭ '#', nur funkcias kun \":p:h\""
 
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: Liveras malplenan ĉenon"
@@ -1542,6 +1493,9 @@ msgstr "E500: Liveras malplenan ĉenon"
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: Ne eblas malfermi dosieron viminfo en lega reĝimo"
 
+msgid "E196: No digraphs in this version"
+msgstr "E196: Neniu duliteraĵo en tiu versio"
+
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: Ne eblas lanĉi (:throw) escepton kun prefikso 'Vim'"
 
@@ -1559,8 +1513,8 @@ msgid "Exception discarded: %s"
 msgstr "Escepto ne konservita: %s"
 
 #, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s, linio %<PRId64>"
+msgid "%s, line %ld"
+msgstr "%s, linio %ld"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1693,33 +1647,6 @@ msgstr "E198: cmd_pchar preter la longo de komando"
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: Aktiva fenestro aŭ bufro forviŝita"
 
-msgid "E854: path too long for completion"
-msgstr "E854: tro longa vojo por kompletigo"
-
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: Nevalida vojo: '**[nombro]' devas esti ĉe la fino de la vojo aŭ "
-"sekvita de '%s'."
-
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: Ne eblas trovi dosierujon \"%s\" en cdpath"
-
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: Ne eblas trovi dosieron \"%s\" en serĉvojo"
-
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: Ne plu trovis dosierujon \"%s\" en cdpath"
-
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: Ne plu trovis dosieron \"%s\" en serĉvojo"
-
 msgid "E812: Autocommands changed buffer or buffer name"
 msgstr "E812: Aŭtokomandoj ŝanĝis bufron aŭ nomon de bufro"
 
@@ -1732,6 +1659,9 @@ msgstr "estas dosierujo"
 msgid "is not a file"
 msgstr "ne estas dosiero"
 
+msgid "is a device (disabled with 'opendevice' option)"
+msgstr "estas aparatdosiero (malŝaltita per la opcio 'opendevice')"
+
 msgid "[New File]"
 msgstr "[Nova dosiero]"
 
@@ -1750,26 +1680,25 @@ msgstr "E200: La aŭtokomandoj *ReadPre igis la dosieron nelegebla"
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr "E201: La aŭtokomandoj *ReadPre ne rajtas ŝanĝi la aktualan bufron"
 
-msgid "Nvim: Reading from stdin...\n"
+msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: Legado el stdin...\n"
 
+msgid "Reading from stdin..."
+msgstr "Legado el stdin..."
+
 #. Re-opening the original file failed!
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: Konverto igis la dosieron nelegebla!"
 
-#. fifo or socket
 msgid "[fifo/socket]"
 msgstr "[rektvica memoro/kontaktoskatolo]"
 
-#. fifo
 msgid "[fifo]"
 msgstr "[rektvica memoro]"
 
-#. or socket
 msgid "[socket]"
 msgstr "[kontaktoskatolo]"
 
-#. or character special
 msgid "[character special]"
 msgstr "[speciala signo]"
 
@@ -1786,12 +1715,12 @@ msgid "[converted]"
 msgstr "[konvertita]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[ERARO DE KONVERTO en linio %<PRId64>]"
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[ERARO DE KONVERTO en linio %ld]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[NEVALIDA BAJTO en linio %<PRId64>]"
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[NEVALIDA BAJTO en linio %ld]"
 
 msgid "[READ ERRORS]"
 msgstr "[ERAROJ DE LEGADO]"
@@ -1800,7 +1729,7 @@ msgid "Can't find temp file for conversion"
 msgstr "Ne eblas trovi provizoran dosieron por konverti"
 
 msgid "Conversion with 'charconvert' failed"
-msgstr "Konverto kun 'charconvert' fiaskis"
+msgstr "Konverto kun 'charconvert' malsukcesis"
 
 msgid "can't read output of 'charconvert'"
 msgstr "ne eblas legi la eligon de 'charconvert'"
@@ -1814,9 +1743,18 @@ msgstr "E203: Aŭtokomandoj forviŝis aŭ malŝargis la skribendan bufron"
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr "E204: Aŭtokomando ŝanĝis la nombron de linioj neatendite"
 
+msgid "NetBeans disallows writes of unmodified buffers"
+msgstr "NetBeans malpermesas skribojn de neŝanĝitaj bufroj"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "Partaj skriboj malpermesitaj ĉe bufroj NetBeans"
+
 msgid "is not a file or writable device"
 msgstr "ne estas dosiero aŭ skribebla aparatdosiero"
 
+msgid "writing to device disabled with 'opendevice' option"
+msgstr "skribo al aparatdosiero malŝaltita per la opcio 'opendevice'"
+
 msgid "is read-only (add ! to override)"
 msgstr "estas nurlegebla (aldonu ! por transpasi)"
 
@@ -1835,7 +1773,9 @@ msgstr "E509: Ne eblas krei restaŭrkopion (aldonu ! por transpasi)"
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: Ne eblas krei restaŭrkopion (aldonu ! por transpasi)"
 
-#. Can't write without a tempfile!
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr "E460: La rimeda forko estus perdita (aldonu ! por transpasi)"
+
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: Ne eblas trovi provizoran dosieron por skribi"
 
@@ -1850,20 +1790,21 @@ msgstr "E212: Ne eblas malfermi la dosieron por skribi"
 
 # AM: fsync: ne traduku (nomo de C-komando)
 msgid "E667: Fsync failed"
-msgstr "E667: Fsync fiaskis"
+msgstr "E667: Fsync malsukcesis"
 
 msgid "E512: Close failed"
-msgstr "E512: Fermo fiaskis"
+msgstr "E512: Fermo malsukcesis"
 
 msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
-msgstr "E513: skriberaro, konverto fiaskis (igu 'fenc' malplena por transpasi)"
+msgstr ""
+"E513: skriberaro, konverto malsukcesis (igu 'fenc' malplena por transpasi)"
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
+"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: skriberaro, konverto fiaskis en linio %<PRId64> (igu 'fenc' malplena  "
+"E513: skriberaro, konverto malsukcesis en linio %ld (igu 'fenc' malplena  "
 "por transpasi)"
 
 msgid "E514: write error (file system full?)"
@@ -1873,8 +1814,8 @@ msgid " CONVERSION ERROR"
 msgstr " ERARO DE KONVERTO"
 
 #, c-format
-msgid " in line %<PRId64>;"
-msgstr " en linio %<PRId64>;"
+msgid " in line %ld;"
+msgstr " en linio %ld;"
 
 msgid "[Device]"
 msgstr "[Aparatdosiero]"
@@ -1935,15 +1876,15 @@ msgid "1 line, "
 msgstr "1 linio, "
 
 #, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> linioj, "
+msgid "%ld lines, "
+msgstr "%ld linioj, "
 
 msgid "1 character"
 msgstr "1 signo"
 
 #, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64> signoj"
+msgid "%lld characters"
+msgstr "%lld signoj"
 
 msgid "[noeol]"
 msgstr "[sen EOL]"
@@ -2025,6 +1966,9 @@ msgstr "E462: Ne eblis prepari por reŝargi \"%s\""
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: Ne eblis reŝargi \"%s\""
 
+msgid "--Deleted--"
+msgstr "--Forviŝita--"
+
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "aŭto-forviŝas aŭtokomandon: %s <bufro=%d>"
@@ -2034,12 +1978,12 @@ msgstr "aŭto-forviŝas aŭtokomandon: %s <bufro=%d>"
 msgid "E367: No such group: \"%s\""
 msgstr "E367: Ne ekzistas tia grupo: \"%s\""
 
+msgid "E936: Cannot delete the current group"
+msgstr "E936: Ne eblas forviŝi la aktualan grupon"
+
 msgid "W19: Deleting augroup that is still in use"
 msgstr "W19: Forviŝo de augroup kiu estas ankoraŭ uzata"
 
-msgid "--Deleted--"
-msgstr "--Forviŝita--"
-
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: Nevalida signo post *: %s"
@@ -2106,7 +2050,6 @@ msgid_plural "+--%3ld lines folded "
 msgstr[0] "+--%3ld linio faldita "
 msgstr[1] "+--%3ld linioj falditaj "
 
-#. buffer has already been read
 msgid "E222: Add to read buffer"
 msgstr "E222: Aldoni al lega bufro"
 
@@ -2138,329 +2081,294 @@ msgstr "Neniu mapo trovita"
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: Nevalida reĝimo"
 
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-msgid "--No lines in buffer--"
-msgstr "--Neniu linio en bufro--"
+msgid "E851: Failed to create a new process for the GUI"
+msgstr "E851: Malsukcesis krei novan procezon por la grafika interfaco"
 
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-msgid "E470: Command aborted"
-msgstr "E470: komando ĉesigita"
+msgid "E852: The child process failed to start the GUI"
+msgstr "E852: La ida procezo malsukcesis startigi la grafikan interfacon"
 
-msgid "E471: Argument required"
-msgstr "E471: Argumento bezonata"
+msgid "E229: Cannot start the GUI"
+msgstr "E229: Ne eblas lanĉi la grafikan interfacon"
 
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ devus esti sekvita de /, ? aŭ &"
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: Ne eblas legi el \"%s\""
 
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgid "E665: Cannot start GUI, no valid font found"
 msgstr ""
-"E11: Nevalida en fenestro de komanda linio; <CR> plenumas, CTRL-C eliras"
+"E665: Ne eblas startigi grafikan interfacon, neniu valida tiparo trovita"
 
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: 'guifontwide' nevalida"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: Valoro de 'imactivatekey' estas nevalida"
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: Ne eblas disponigi koloron %s"
+
+msgid "No match at cursor, finding next"
+msgstr "Neniu kongruo ĉe kursorpozicio, trovas sekvan"
+
+msgid "<cannot open> "
+msgstr "<ne eblas malfermi> "
+
+#, c-format
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: ne eblas akiri tiparon %s"
+
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile: ne eblas reveni al la aktuala dosierujo"
+
+msgid "Pathname:"
+msgstr "Serĉvojo:"
+
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: ne eblas akiri aktualan dosierujon"
+
+msgid "OK"
+msgstr "Bone"
+
+msgid "Cancel"
+msgstr "Rezigni"
+
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
 msgstr ""
-"E12: Nepermesebla komando el exrc/vimrc en aktuala dosierujo aŭ etikeda serĉo"
+"Fenestraĵo de rulumskalo: Ne eblis akiri geometrion de reduktita rastrumbildo"
 
-msgid "E171: Missing :endif"
-msgstr "E171: Mankas \":endif\""
+msgid "Vim dialog"
+msgstr "Vim dialogo"
 
-msgid "E600: Missing :endtry"
-msgstr "E600: Mankas \":endtry\""
+msgid "E232: Cannot create BalloonEval with both message and callback"
+msgstr "E232: Ne eblas krei BalloonEval kun ambaŭ mesaĝo kaj reagfunkcio"
 
-msgid "E170: Missing :endwhile"
-msgstr "E170: Mankas \":endwhile\""
+msgid "_Cancel"
+msgstr "_Rezigni"
 
-msgid "E170: Missing :endfor"
-msgstr "E170: Mankas \":endfor\""
+msgid "_Save"
+msgstr "_Konservi"
 
-msgid "E588: :endwhile without :while"
-msgstr "E588: \":endwhile\" sen \":while\""
+msgid "_Open"
+msgstr "_Malfermi"
 
-msgid "E588: :endfor without :for"
-msgstr "E588: \":endfor\" sen \":for\""
+msgid "_OK"
+msgstr "_Bone"
 
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: Dosiero ekzistas (aldonu ! por transpasi)"
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
+msgstr ""
+"&Jes\n"
+"&Ne\n"
+"&Rezigni"
 
-msgid "E472: Command failed"
-msgstr "E472: La komando fiaskis"
+msgid "Yes"
+msgstr "Jes"
 
-msgid "E473: Internal error"
-msgstr "E473: Interna eraro"
+msgid "No"
+msgstr "Ne"
 
-msgid "Interrupted"
-msgstr "Interrompita"
+# todo '_' is for hotkey, i guess?
+msgid "Input _Methods"
+msgstr "Enigaj _metodoj"
 
-msgid "E14: Invalid address"
-msgstr "E14: Nevalida adreso"
+msgid "VIM - Search and Replace..."
+msgstr "VIM - Serĉi kaj anstataŭigi..."
 
-msgid "E474: Invalid argument"
-msgstr "E474: Nevalida argumento"
+msgid "VIM - Search..."
+msgstr "VIM- Serĉi..."
+
+msgid "Find what:"
+msgstr "Serĉi kion:"
+
+msgid "Replace with:"
+msgstr "Anstataŭigi per:"
+
+#. whole word only button
+msgid "Match whole word only"
+msgstr "Kongrui kun nur plena vorto"
+
+#. match case button
+msgid "Match case"
+msgstr "Uskleca kongruo"
+
+msgid "Direction"
+msgstr "Direkto"
+
+#. 'Up' and 'Down' buttons
+msgid "Up"
+msgstr "Supren"
+
+msgid "Down"
+msgstr "Suben"
+
+msgid "Find Next"
+msgstr "Trovi sekvantan"
+
+msgid "Replace"
+msgstr "Anstataŭigi"
+
+msgid "Replace All"
+msgstr "Anstataŭigi ĉiujn"
+
+msgid "_Close"
+msgstr "_Fermi"
+
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: Ricevis peton \"die\" (morti) el la seanca administrilo\n"
+
+msgid "Close tab"
+msgstr "Fermi langeton"
+
+msgid "New tab"
+msgstr "Nova langeto"
+
+msgid "Open Tab..."
+msgstr "Malfermi langeton..."
+
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim: Ĉefa fenestro neatendite detruiĝis\n"
+
+msgid "&Filter"
+msgstr "&Filtri"
+
+msgid "&Cancel"
+msgstr "&Rezigni"
+
+msgid "Directories"
+msgstr "Dosierujoj"
+
+msgid "Filter"
+msgstr "Filtri"
+
+msgid "&Help"
+msgstr "&Helpo"
+
+msgid "Files"
+msgstr "Dosieroj"
+
+msgid "&OK"
+msgstr "&Bone"
+
+msgid "Selection"
+msgstr "Apartigo"
+
+msgid "Find &Next"
+msgstr "Trovi &Sekvanta"
+
+msgid "&Replace"
+msgstr "&Anstataŭigi"
+
+msgid "Replace &All"
+msgstr "Anstataŭigi ĉi&on"
+
+msgid "&Undo"
+msgstr "&Malfari"
+
+msgid "Open tab..."
+msgstr "Malfermi langeton..."
+
+msgid "Find string (use '\\\\' to find  a '\\')"
+msgstr "Trovi ĉenon (uzu '\\\\' por trovi '\\')"
+
+msgid "Find & Replace (use '\\\\' to find  a '\\')"
+msgstr "Trovi kaj anstataŭigi (uzu '\\\\' por trovi '\\')"
+
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+msgid "Not Used"
+msgstr "Ne uzata"
+
+msgid "Directory\t*.nothing\n"
+msgstr "Dosierujo\t*.nenio\n"
 
 #, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: Nevalida argumento: %s"
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: Ne eblas trovi titolon de fenestro \"%s\""
 
 #, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: Nevalida esprimo: %s"
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: Ne subtenata argumento: \"-%s\"; Uzu la version OLE."
 
-msgid "E16: Invalid range"
-msgstr "E16: Nevalida amplekso"
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: Ne eblas malfermi fenestron interne de aplikaĵo MDI"
 
-msgid "E476: Invalid command"
-msgstr "E476: Nevalida komando"
+msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
+msgstr ""
+"Vim E458: Ne eblas disponigi rikordon de kolormapo, iuj koloroj estas eble "
+"neĝustaj"
 
 #, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" estas dosierujo"
-
-#, fuzzy
-#~ msgid "E900: Invalid job id"
-#~ msgstr "E49: Nevalida grando de rulumo"
-
-#~ msgid "E901: Job table is full"
-#~ msgstr ""
+msgid "E250: Fonts for the following charsets are missing in fontset %s:"
+msgstr "E250: Tiparoj de tiuj signaroj mankas en aro de tiparo %s:"
 
 #, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: Alvoko al biblioteko fiaskis por \"%s()\""
-
-msgid "E19: Mark has invalid line number"
-msgstr "E19: Marko havas nevalidan numeron de linio"
-
-msgid "E20: Mark not set"
-msgstr "E20: Marko ne estas agordita"
-
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: Ne eblas fari ŝanĝojn, 'modifiable' estas malŝaltita"
-
-msgid "E22: Scripts nested too deep"
-msgstr "E22: Tro profunde ingitaj skriptoj"
-
-msgid "E23: No alternate file"
-msgstr "E23: Neniu alterna dosiero"
-
-msgid "E24: No such abbreviation"
-msgstr "E24: Ne estas tia mallongigo"
-
-msgid "E477: No ! allowed"
-msgstr "E477: Neniu ! permesebla"
-
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: Grafika interfaco ne uzeblas: Malŝaltita dum kompilado"
+msgid "E252: Fontset name: %s"
+msgstr "E252: Nomo de tiparo: %s"
 
 #, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: Neniu grupo de emfazo kiel: %s"
-
-msgid "E29: No inserted text yet"
-msgstr "E29: Ankoraŭ neniu enmetita teksto"
-
-msgid "E30: No previous command line"
-msgstr "E30: Neniu antaŭa komanda linio"
-
-msgid "E31: No such mapping"
-msgstr "E31: Neniu tiel mapo"
-
-msgid "E479: No match"
-msgstr "E479: Neniu kongruo"
+msgid "Font '%s' is not fixed-width"
+msgstr "Tiparo '%s' ne estas egallarĝa"
 
 #, c-format
-msgid "E480: No match: %s"
-msgstr "E480: Neniu kongruo: %s"
-
-msgid "E32: No file name"
-msgstr "E32: Neniu dosiernomo"
-
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: Neniu antaŭa regulesprimo de anstataŭigo"
-
-msgid "E34: No previous command"
-msgstr "E34: Neniu antaŭa komando"
-
-msgid "E35: No previous regular expression"
-msgstr "E35: Neniu antaŭa regulesprimo"
-
-msgid "E481: No range allowed"
-msgstr "E481: Amplekso nepermesebla"
-
-msgid "E36: Not enough room"
-msgstr "E36: Ne sufiĉe da spaco"
+msgid "E253: Fontset name: %s"
+msgstr "E253: Nomo de tiparo: %s"
 
 #, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: Ne eblas krei dosieron %s"
-
-msgid "E483: Can't get temp file name"
-msgstr "E483: Ne eblas akiri provizoran dosiernomon"
+msgid "Font0: %s"
+msgstr "Font0: %s"
 
 #, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: Ne eblas malfermi dosieron %s"
+msgid "Font1: %s"
+msgstr "Font1: %s"
 
 #, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: Ne eblas legi dosieron %s"
-
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: Neniu skribo de post lasta ŝanĝo (aldonu ! por transpasi)"
-
-#, fuzzy
-#~ msgid "E37: No write since last change"
-#~ msgstr "[Neniu skribo de post lasta ŝanĝo]\n"
-
-msgid "E38: Null argument"
-msgstr "E38: Nula argumento"
-
-msgid "E39: Number expected"
-msgstr "E39: Nombro atendita"
+msgid "Font%ld width is not twice that of font0"
+msgstr "Font%ld ne estas duoble pli larĝa ol font0"
 
 #, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: Ne eblas malfermi eraran dosieron %s"
-
-msgid "E41: Out of memory!"
-msgstr "E41: Ne plu restas memoro!"
-
-msgid "Pattern not found"
-msgstr "Ŝablono ne trovita"
+msgid "Font0 width: %ld"
+msgstr "Larĝo de font0: %ld"
 
 #, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: Ŝablono ne trovita: %s"
+msgid "Font1 width: %ld"
+msgstr "Larĝo de Font1: %ld"
 
-msgid "E487: Argument must be positive"
-msgstr "E487: La argumento devas esti pozitiva"
+msgid "Invalid font specification"
+msgstr "Nevalida tiparo specifita"
 
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: Ne eblas reiri al antaŭa dosierujo"
+msgid "&Dismiss"
+msgstr "&Forlasi"
 
-msgid "E42: No Errors"
-msgstr "E42: Neniu eraro"
+msgid "no specific match"
+msgstr "Neniu specifa kongruo"
 
-msgid "E776: No location list"
-msgstr "E776: Neniu listo de loko"
+msgid "Vim - Font Selector"
+msgstr "Vim - Elektilo de tiparo"
 
-msgid "E43: Damaged match string"
-msgstr "E43: Difekta kongruenda ĉeno"
+msgid "Name:"
+msgstr "Nomo:"
 
-msgid "E44: Corrupted regexp program"
-msgstr "E44: Difekta programo de regulesprimo"
+#. create toggle button
+msgid "Show size in Points"
+msgstr "Montri grandon en punktoj"
 
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: La opcio 'readonly' estas ŝaltita '(aldonu ! por transpasi)"
+msgid "Encoding:"
+msgstr "Kodoprezento:"
 
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: Ne eblas ŝanĝi nurlegeblan variablon \"%s\""
+msgid "Font:"
+msgstr "Tiparo:"
 
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: Ne eblas agordi variablon en la sabloludejo: \"%s\""
+msgid "Style:"
+msgstr "Stilo:"
 
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: Ne eblas uzi malplenan ŝlosilon de Vortaro"
+msgid "Size:"
+msgstr "Grando:"
 
-msgid "E47: Error while reading errorfile"
-msgstr "E47: Eraro dum legado de erardosiero"
-
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: Nepermesebla en sabloludejo"
-
-msgid "E523: Not allowed here"
-msgstr "E523: Nepermesebla tie"
-
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: Reĝimo de ekrano ne subtenata"
-
-msgid "E49: Invalid scroll size"
-msgstr "E49: Nevalida grando de rulumo"
-
-msgid "E91: 'shell' option is empty"
-msgstr "E91: La opcio 'shell' estas malplena"
-
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: Ne eblis legi datumojn de simboloj!"
-
-msgid "E72: Close error on swap file"
-msgstr "E72: Eraro dum malfermo de permutodosiero .swp"
-
-msgid "E73: tag stack empty"
-msgstr "E73: malplena stako de etikedo"
-
-msgid "E74: Command too complex"
-msgstr "E74: Komando tro kompleksa"
-
-msgid "E75: Name too long"
-msgstr "E75: Nomo tro longa"
-
-msgid "E76: Too many ["
-msgstr "E76: Tro da ["
-
-msgid "E77: Too many file names"
-msgstr "E77: Tro da dosiernomoj"
-
-msgid "E488: Trailing characters"
-msgstr "E488: Vostaj signoj"
-
-msgid "E78: Unknown mark"
-msgstr "E78: Nekonata marko"
-
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: Ne eblas malvolvi ĵokerojn"
-
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' ne rajtas esti malpli ol 'winminheight'"
-
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' ne rajtas esti malpli ol 'winminwidth'"
-
-msgid "E80: Error while writing"
-msgstr "E80: Eraro dum skribado"
-
-msgid "Zero count"
-msgstr "Nul kvantoro"
-
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: Uzo de <SID> ekster kunteksto de skripto"
-
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: Interna eraro: %s"
-
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: ŝablono uzas pli da memoro ol 'maxmempattern'"
-
-msgid "E749: empty buffer"
-msgstr "E749: malplena bufro"
-
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: La bufro %<PRId64> ne ekzistas"
-
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: Nevalida serĉa ŝablono aŭ disigilo"
-
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: Dosiero estas ŝargita en alia bufro"
-
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: La opcio '%s' ne estas ŝaltita"
-
-msgid "E850: Invalid register name"
-msgstr "E850: Nevalida nomo de reĝistro"
-
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "serĉo atingis SUPRON, daŭrigonte al SUBO"
-
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "serĉo atingis SUBON, daŭrigonte al SUPRO"
+msgid "E256: Hangul automata ERROR"
+msgstr "E256: ERARO en aŭtomato de korea alfabeto"
 
 msgid "E550: Missing colon"
 msgstr "E550: Mankas dupunkto"
@@ -2551,7 +2459,7 @@ msgid "Sending to printer..."
 msgstr "Sendas al presilo..."
 
 msgid "E365: Failed to print PostScript file"
-msgstr "E365: Presado de PostSkripta dosiero fiaskis"
+msgstr "E365: Presado de PostSkripta dosiero malsukcesis"
 
 msgid "Print job sent."
 msgstr "Laboro de presado sendita."
@@ -2591,6 +2499,9 @@ msgstr "E257: cstag: etikedo netrovita"
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: Eraro de stat(%s): %d"
 
+msgid "E563: stat error"
+msgstr "E563: Eraro de stat"
+
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s ne estas dosierujo aŭ valida datumbazo de cscope"
@@ -2600,8 +2511,8 @@ msgid "Added cscope database %s"
 msgstr "Aldonis datumbazon de cscope %s"
 
 #, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: eraro dum legado de konekto de cscope %<PRId64>"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: eraro dum legado de konekto de cscope %ld"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: nekonata tipo de serĉo de cscope"
@@ -2612,18 +2523,17 @@ msgstr "E566: Ne eblis krei duktojn de cscope"
 msgid "E622: Could not fork for cscope"
 msgstr "E622: Ne eblis forki cscope"
 
-#, fuzzy
-#~ msgid "cs_create_connection setpgid failed"
-#~ msgstr "plenumo de cs_create_connection fiaskis"
+msgid "cs_create_connection setpgid failed"
+msgstr "plenumo de cs_create_connection-setgpid malsukcesis"
 
 msgid "cs_create_connection exec failed"
-msgstr "plenumo de cs_create_connection fiaskis"
+msgstr "plenumo de cs_create_connection malsukcesis"
 
 msgid "cs_create_connection: fdopen for to_fp failed"
-msgstr "cs_create_connection: fdopen de to_fp fiaskis"
+msgstr "cs_create_connection: fdopen de to_fp malsukcesis"
 
 msgid "cs_create_connection: fdopen for fr_fp failed"
-msgstr "cs_create_connection: fdopen de fr_fp fiaskis"
+msgstr "cs_create_connection: fdopen de fr_fp malsukcesis"
 
 msgid "E623: Could not spawn cscope process"
 msgstr "E623: Ne eblis naskigi procezon cscope"
@@ -2669,6 +2579,13 @@ msgstr ""
 "       s: Trovi tiun C-simbolon\n"
 "       t: Trovi tiun ĉenon\n"
 
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: ne eblas malfermi datumbazon de cscope: %s"
+
+msgid "E626: cannot get cscope database information"
+msgstr "E626: ne eblas akiri informojn pri la datumbazo de cscope"
+
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: ripetita datumbazo de cscope ne aldonita"
 
@@ -2711,6 +2628,222 @@ msgstr "neniu konekto de cscope\n"
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    nomo de datumbazo                   prefiksa vojo\n"
 
+msgid "Lua library cannot be loaded."
+msgstr "La biblioteko Lua no ŝargeblis."
+
+msgid "cannot save undo information"
+msgstr "ne eblas konservi informojn de malfaro"
+
+msgid ""
+"E815: Sorry, this command is disabled, the MzScheme libraries could not be "
+"loaded."
+msgstr ""
+"E815: Bedaŭrinde, tiu komando estas malŝaltita, ne eblis ŝargi la "
+"bibliotekojn."
+
+msgid ""
+"E895: Sorry, this command is disabled, the MzScheme's racket/base module "
+"could not be loaded."
+msgstr ""
+"E895: Bedaŭrinde, tiu komando estas malŝaltita, ne eblis ŝargi la modulon de "
+"MzScheme racket/base."
+
+msgid "invalid expression"
+msgstr "nevalida esprimo"
+
+msgid "expressions disabled at compile time"
+msgstr "esprimoj malŝaltitaj dum kompilado"
+
+msgid "hidden option"
+msgstr "kaŝita opcio"
+
+msgid "unknown option"
+msgstr "nekonata opcio"
+
+msgid "window index is out of range"
+msgstr "indekso de fenestro estas ekster limoj"
+
+msgid "couldn't open buffer"
+msgstr "ne eblis malfermi bufron"
+
+msgid "cannot delete line"
+msgstr "ne eblas forviŝi linion"
+
+msgid "cannot replace line"
+msgstr "ne eblas anstataŭigi linion"
+
+msgid "cannot insert line"
+msgstr "ne eblas enmeti linion"
+
+msgid "string cannot contain newlines"
+msgstr "ĉeno ne rajtas enhavi liniavancojn"
+
+msgid "error converting Scheme values to Vim"
+msgstr "eraro dum konverto de Scheme-valoro al Vim"
+
+msgid "Vim error: ~a"
+msgstr "Eraro de Vim: ~a"
+
+msgid "Vim error"
+msgstr "Eraro de Vim"
+
+msgid "buffer is invalid"
+msgstr "bufro estas nevalida"
+
+msgid "window is invalid"
+msgstr "fenestro estas nevalida"
+
+msgid "linenr out of range"
+msgstr "numero de linio ekster limoj"
+
+msgid "not allowed in the Vim sandbox"
+msgstr "nepermesebla en sabloludejo de Vim"
+
+msgid "E836: This Vim cannot execute :python after using :py3"
+msgstr "E836: Vim ne povas plenumi :python post uzo de :py3"
+
+msgid ""
+"E263: Sorry, this command is disabled, the Python library could not be "
+"loaded."
+msgstr ""
+"E263: Bedaŭrinde tiu komando estas malŝaltita: la biblioteko de Pitono ne "
+"ŝargeblis."
+
+msgid ""
+"E887: Sorry, this command is disabled, the Python's site module could not be "
+"loaded."
+msgstr ""
+"E887` Bedaŭrinde tiu komando estas malŝaltita: la biblioteko de Pitono ne "
+"ŝargeblis."
+
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: Ne eblas alvoki Pitonon rekursie"
+
+msgid "E837: This Vim cannot execute :py3 after using :python"
+msgstr "E837: Vim ne povas plenumi :py3  post uzo de :python"
+
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_ devas esti apero de Ĉeno"
+
+msgid ""
+"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
+msgstr ""
+"E266: Bedaŭrinde tiu komando estas malŝaltita, la biblioteko Ruby ne "
+"ŝargeblis."
+
+msgid "E267: unexpected return"
+msgstr "E267: \"return\" neatendita"
+
+msgid "E268: unexpected next"
+msgstr "E268: \"next\" neatendita"
+
+msgid "E269: unexpected break"
+msgstr "E269: \"break\" neatendita"
+
+msgid "E270: unexpected redo"
+msgstr "E270: \"redo\" neatendita"
+
+msgid "E271: retry outside of rescue clause"
+msgstr "E271: \"retry\" ekster klaŭzo \"rescue\""
+
+msgid "E272: unhandled exception"
+msgstr "E272: netraktita escepto"
+
+#, c-format
+msgid "E273: unknown longjmp status %d"
+msgstr "E273: nekonata stato de longjmp: %d"
+
+msgid "invalid buffer number"
+msgstr "nevalida numero de bufro"
+
+msgid "not implemented yet"
+msgstr "ankoraŭ ne realigita"
+
+#. ???
+msgid "cannot set line(s)"
+msgstr "ne eblas meti la linio(j)n"
+
+msgid "invalid mark name"
+msgstr "nevalida nomo de marko"
+
+msgid "mark not set"
+msgstr "marko ne estas metita"
+
+#, c-format
+msgid "row %d column %d"
+msgstr "linio %d kolumno %d"
+
+msgid "cannot insert/append line"
+msgstr "ne eblas enmeti/postaldoni linion"
+
+msgid "line number out of range"
+msgstr "numero de linio ekster limoj"
+
+msgid "unknown flag: "
+msgstr "nekonata flago: "
+
+# DP: ĉu traduki vimOption
+msgid "unknown vimOption"
+msgstr "nekonata vimOption"
+
+msgid "keyboard interrupt"
+msgstr "klavara interrompo"
+
+msgid "vim error"
+msgstr "eraro de Vim"
+
+msgid "cannot create buffer/window command: object is being deleted"
+msgstr "ne eblas krei komandon de bufro/fenestro: objekto estas forviŝiĝanta"
+
+msgid ""
+"cannot register callback command: buffer/window is already being deleted"
+msgstr ""
+"ne eblas registri postalvokan komandon: bufro/fenestro estas jam forviŝiĝanta"
+
+#. This should never happen.  Famous last word?
+msgid ""
+"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
+"org"
+msgstr ""
+"E280: NERIPAREBLA TCL-ERARO: reflist difekta!? Bv. retpoŝti al vim-dev@vim."
+"org"
+
+msgid "cannot register callback command: buffer/window reference not found"
+msgstr ""
+"ne eblas registri postalvokan komandon: referenco de bufro/fenestro ne "
+"troveblas"
+
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
+msgstr ""
+"E571: Bedaŭrinde tiu komando estas malŝaltita: la biblioteko Tcl ne "
+"ŝargeblis."
+
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: elira kodo %d"
+
+msgid "cannot get line"
+msgstr "ne eblas akiri linion"
+
+msgid "Unable to register a command server name"
+msgstr "Ne eblas registri nomon de komanda servilo"
+
+msgid "E248: Failed to send command to the destination program"
+msgstr "E248: Sendo de komando al cela programo malsukcesis"
+
+#, c-format
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: Nevalida identigilo de servilo uzita: %s"
+
+msgid "E251: VIM instance registry property is badly formed.  Deleted!"
+msgstr ""
+"E251: Ecoj de registro de apero de VIM estas nevalide formata. Forviŝita!"
+
+#, c-format
+msgid "E938: Duplicate key in JSON: \"%s\""
+msgstr "E938: Ripetita ŝlosilo en JSON: \"%s\""
+
 #, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Mankas komo en Listo: %s"
@@ -2741,6 +2874,15 @@ msgstr "Nevalida argumento por"
 msgid "%d files to edit\n"
 msgstr "%d redaktendaj dosieroj\n"
 
+msgid "netbeans is not supported with this GUI\n"
+msgstr "netbeans ne estas subtenata kun tiu grafika interfaco\n"
+
+msgid "'-nb' cannot be used: not enabled at compile time\n"
+msgstr "'-nb' ne uzeblas: malŝaltita dum kompilado\n"
+
+msgid "This Vim was not compiled with the diff feature."
+msgstr "Tiu Vim ne estis kompilita kun la kompara eblo."
+
 msgid "Attempt to open script file again: \""
 msgstr "Provas malfermi skriptan dosieron denove: \""
 
@@ -2750,6 +2892,12 @@ msgstr "Ne eblas malfermi en lega reĝimo: \""
 msgid "Cannot open for script output: \""
 msgstr "Ne eblas malfermi por eligo de skripto: \""
 
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: Eraro: malsukcesis lanĉi gvim el NetBeans\n"
+
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr "Vim: Eraro: Tiu versio de Vim ne ruliĝas en terminalo Cygwin\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: Averto: Eligo ne estas al terminalo\n"
 
@@ -2803,6 +2951,13 @@ msgstr ""
 "\n"
 "   aŭ:"
 
+msgid ""
+"\n"
+"Where case is ignored prepend / to make flag upper case"
+msgstr ""
+"\n"
+"Kie uskleco estas ignorita antaŭaldonu / por igi flagon majuskla"
+
 msgid ""
 "\n"
 "\n"
@@ -2818,6 +2973,18 @@ msgstr "--\t\t\tNur dosiernomoj post tio"
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\t\tNe malvolvi ĵokerojn"
 
+msgid "-register\t\tRegister this gvim for OLE"
+msgstr "-register\t\tRegistri tiun gvim al OLE"
+
+msgid "-unregister\t\tUnregister gvim for OLE"
+msgstr "-unregister\t\tMalregistri gvim de OLE"
+
+msgid "-g\t\t\tRun using GUI (like \"gvim\")"
+msgstr "-g\t\t\tRuli per grafika interfaco (kiel \"gvim\")"
+
+msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
+msgstr "-f  aŭ  --nofork\tMalfono: ne forki kiam lanĉas grafikan interfacon"
+
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tReĝimo Vi (kiel \"vi\")"
 
@@ -2879,6 +3046,12 @@ msgstr "-r (kun dosiernomo)\tRestaŭri kolapsintan seancon"
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\t\tKiel -r"
 
+msgid "-f\t\t\tDon't use newcli to open window"
+msgstr "-f\t\t\tNe uzi newcli por malfermi fenestrojn"
+
+msgid "-dev <device>\t\tUse <device> for I/O"
+msgstr "-dev <aparatdosiero>\t\tUzi <aparatdosiero>-n por eneligo"
+
 msgid "-A\t\t\tstart in Arabic mode"
 msgstr "-A\t\t\tKomenci en araba reĝimo"
 
@@ -2891,9 +3064,20 @@ msgstr "-F\t\t\tKomenci en persa reĝimo"
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminalo>\tAgordi terminalon al <terminalo>"
 
+msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
+msgstr ""
+"--not-a-term\t\tPreterpasi averton por enigo/eligo, kiu ne estas terminalo"
+
+msgid "--ttyfail\t\tExit if input or output is not a terminal"
+msgstr ""
+"--ttyfail\t\tEliri se le eniro aŭ eliro ne estas terminalo"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\tUzi <vimrc> anstataŭ iun ajn .vimrc"
 
+msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
+msgstr "-U <gvimrc>\t\tUzi <gvimrc> anstataŭ iun ajn .gvimrc"
+
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\tNe ŝargi kromaĵajn skriptojn"
 
@@ -2935,6 +3119,50 @@ msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr ""
 "-W <eligaskripto>\tSkribi ĉiujn tajpitajn komandojn al dosiero <eligaskripto>"
 
+msgid "-x\t\t\tEdit encrypted files"
+msgstr "-x\t\t\tRedakti ĉifradan dosieron"
+
+msgid "-display <display>\tConnect vim to this particular X-server"
+msgstr "-display <ekrano>\tKonekti Vim al tiu X-servilo"
+
+msgid "-X\t\t\tDo not connect to X server"
+msgstr "-X\t\t\tNe konekti al X-servilo"
+
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <dosieroj>\tRedakti <dosieroj>-n en Vim-servilo se eblas"
+
+msgid "--remote-silent <files>  Same, don't complain if there is no server"
+msgstr "--remote-silent <dosieroj>  Same, sed ne plendi se ne estas servilo"
+
+msgid ""
+"--remote-wait <files>  As --remote but wait for files to have been edited"
+msgstr ""
+"--remote-wait <dosieroj>  Kiel --remote sed atendi ĝis dosieroj estas "
+"redaktitaj"
+
+msgid ""
+"--remote-wait-silent <files>  Same, don't complain if there is no server"
+msgstr ""
+"--remote-wait-silent <dosieroj> Same, sed ne plendi se ne estas servilo"
+
+msgid ""
+"--remote-tab[-wait][-silent] <files>  As --remote but use tab page per file"
+msgstr ""
+"--remote-tab[-wait][-silent] <dosieroj> Kiel --remote sed uzi langeton por "
+"ĉiu dosiero"
+
+msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
+msgstr "--remote-send <klavoj> Sendi <klavoj>-n al Vim-servilo kaj eliri"
+
+msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
+msgstr "--remote-expr <espr>\tKomputi <espr> en Vim-servilo kaj afiŝi rezulton"
+
+msgid "--serverlist\t\tList available Vim server names and exit"
+msgstr "--serverlist\t\tListigi haveblajn nomojn de Vim-serviloj kaj eliri"
+
+msgid "--servername <name>\tSend to/become the Vim server <name>"
+msgstr "--servername <nomo>\tSendu al/iĝi la Vim-servilo <nomo>"
+
 msgid "--startuptime <file>\tWrite startup timing messages to <file>"
 msgstr ""
 "--startuptime <dosiero>  Skribi mesaĝojn de komenca tempomezurado al "
@@ -2949,6 +3177,118 @@ msgstr "-h  aŭ  --help\tAfiŝi Helpon (tiun mesaĝon) kaj eliri"
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\tAfiŝi informon de versio kaj eliri"
 
+msgid ""
+"\n"
+"Arguments recognised by gvim (Motif version):\n"
+msgstr ""
+"\n"
+"Argumentoj agnoskitaj de gvim (versio Motif):\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"Argumentoj agnoskitaj de gvim (versio neXtaw):\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (Athena version):\n"
+msgstr ""
+"\n"
+"Argumentoj agnoskitaj de gvim (versio Athena):\n"
+
+msgid "-display <display>\tRun vim on <display>"
+msgstr "-display <ekrano>\tLanĉi vim sur <ekrano>"
+
+msgid "-iconic\t\tStart vim iconified"
+msgstr "-iconic\t\tLanĉi vim piktograme"
+
+msgid "-background <color>\tUse <color> for the background (also: -bg)"
+msgstr "-background <koloro>\tUzi <koloro>-n por la fona koloro (ankaŭ: -bg)"
+
+msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
+msgstr ""
+"-foreground <koloro>\tUzi <koloro>-n por la malfona koloro (ankaŭ: -fg)"
+
+msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
+msgstr "-font <tiparo>\tUzi <tiparo>-n por normala teksto (ankaŭ: -fn)"
+
+msgid "-boldfont <font>\tUse <font> for bold text"
+msgstr "-boldfont <tiparo>\tUzi <tiparo>-n por grasa teksto"
+
+msgid "-italicfont <font>\tUse <font> for italic text"
+msgstr "-italicfont <tiparo>\tUzi <tiparo>-n por kursiva teksto"
+
+msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
+msgstr "-geometry <geom>\tUzi <geom> kiel komenca geometrio (ankaŭ: -geom)"
+
+msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
+msgstr "-borderwidth <larĝo>\tUzi <larĝo>-n kiel larĝo de bordero (ankaŭ: -bw)"
+
+msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
+msgstr ""
+"-scrollbarwidth <larĝo>  Uzi <larĝo>-n kiel larĝo de rulumskalo (ankaŭ: -sw)"
+
+msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
+msgstr ""
+"-menuheight <alto>\tUzi <alto>-n kiel alto de menuzona alto (ankaŭ: -mh)"
+
+msgid "-reverse\t\tUse reverse video (also: -rv)"
+msgstr "-reverse\t\tUzi inversan videon (ankaŭ: -rv)"
+
+msgid "+reverse\t\tDon't use reverse video (also: +rv)"
+msgstr "+reverse\t\tNe uzi inversan videon (ankaŭ: +rv)"
+
+msgid "-xrm <resource>\tSet the specified resource"
+msgstr "-xrm <rimedo>\tAgordi la specifitan <rimedo>-n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (GTK+ version):\n"
+msgstr ""
+"\n"
+"Argumentoj agnoskitaj de gvim (versio GTK+):\n"
+
+msgid "-display <display>\tRun vim on <display> (also: --display)"
+msgstr "-display <ekrano>\tLanĉi Vim sur tiu <ekrano> (ankaŭ: --display)"
+
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "--role <rolo>\tDoni unikan rolon por identigi la ĉefan fenestron"
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\tMalfermi Vim en alia GTK fenestraĵo"
+
+msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
+msgstr "--echo-wid\t\tIgas gvim afiŝi la identigilon de vindozo sur stdout"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <gepatra titolo>\tMalfermi Vim en gepatra aplikaĵo"
+
+msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
+msgstr "--windowid <HWND>\tMalfermi Vim en alia win32 fenestraĵo"
+
+msgid "No display"
+msgstr "Neniu ekrano"
+
+#. Failed to send, abort.
+msgid ": Send failed.\n"
+msgstr ": Sendo malsukcesis.\n"
+
+#. Let vim start normally.
+msgid ": Send failed. Trying to execute locally\n"
+msgstr ": Sendo malsukcesis. Provo de loka plenumo\n"
+
+#, c-format
+msgid "%d of %d edited"
+msgstr "%d de %d redaktita(j)"
+
+msgid "No display: Send expression failed.\n"
+msgstr "Neniu ekrano: Sendado de esprimo malsukcesis.\n"
+
+msgid ": Send expression failed.\n"
+msgstr ": Sendado de esprimo malsukcesis.\n"
+
 msgid "No marks set"
 msgstr "Neniu marko"
 
@@ -3005,6 +3345,28 @@ msgstr ""
 msgid "Missing '>'"
 msgstr "Mankas '>'"
 
+msgid "E543: Not a valid codepage"
+msgstr "E543: Nevalida kodpaĝo"
+
+msgid "E284: Cannot set IC values"
+msgstr "E284: Ne eblas agordi valorojn de IC"
+
+msgid "E285: Failed to create input context"
+msgstr "E285: Kreado de eniga kunteksto malsukcesis"
+
+msgid "E286: Failed to open input method"
+msgstr "E286: Malfermo de eniga metodo malsukcesis"
+
+msgid "E287: Warning: Could not set destroy callback to IM"
+msgstr "E287: Averto: Ne eblis agordi detruan reagfunkcion al IM"
+
+msgid "E288: input method doesn't support any style"
+msgstr "E288: eniga metodo subtenas neniun stilon"
+
+# DP: mi ne scias, kio estas "preedit"
+msgid "E289: input method doesn't support my preedit type"
+msgstr "E289: eniga metodo ne subtenas mian antaŭredaktan tipon"
+
 msgid "E293: block was not locked"
 msgstr "E293: bloko ne estis ŝlosita"
 
@@ -3032,6 +3394,9 @@ msgstr "E298: Ĉu ne akiris blokon n-ro 1?"
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: Ĉu ne akiris blokon n-ro 2?"
 
+msgid "E843: Error while updating swap file crypt"
+msgstr "E843: Eraro dum ĝisdatigo de ĉifrada permutodosiero .swp"
+
 #. could not (re)open the swap file, what can we do????
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: Ve, perdis la permutodosieron .swp!!!"
@@ -3047,7 +3412,6 @@ msgstr ""
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0(): Ne akiris blokon 0??"
 
-#. no swap files found
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: Neniu permutodosiero .swp trovita por %s"
@@ -3092,6 +3456,11 @@ msgstr ""
 ",\n"
 "aŭ la dosiero estas difekta."
 
+#, c-format
+msgid ""
+"E833: %s is encrypted and this version of Vim does not support encryption"
+msgstr "E833: %s estas ĉifrata kaj tiu versio de Vim ne subtenas ĉifradon"
+
 msgid " has been damaged (page size is smaller than minimum value).\n"
 msgstr " difektiĝis (paĝa grando pli malgranda ol minimuma valoro).\n"
 
@@ -3106,6 +3475,39 @@ msgstr "Originala dosiero \"%s\""
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: Averto: Originala dosiero eble ŝanĝiĝis"
 
+#, c-format
+msgid "Swap file is encrypted: \"%s\""
+msgstr "Perumutodosiero .swp estas ĉifrata: \"%s\""
+
+msgid ""
+"\n"
+"If you entered a new crypt key but did not write the text file,"
+msgstr ""
+"\n"
+"Se vi tajpis novan ŝlosilon de ĉifrado sed ne skribis la tekstan dosieron,"
+
+msgid ""
+"\n"
+"enter the new crypt key."
+msgstr ""
+"\n"
+"tajpu la novan ŝlosilon de ĉifrado."
+
+msgid ""
+"\n"
+"If you wrote the text file after changing the crypt key press enter"
+msgstr ""
+"\n"
+"Se vi skribis la tekstan dosieron post ŝanĝo de la ŝlosilo de ĉifrado, premu "
+"enenklavon"
+
+msgid ""
+"\n"
+"to use the same key for text file and swap file"
+msgstr ""
+"\n"
+"por uzi la saman ŝlosilon por la teksta dosiero kaj permuto dosiero .swp"
+
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: Ne eblas legi blokon 1 de %s"
@@ -3175,6 +3577,10 @@ msgstr ""
 "La dosiero .swp nun forviŝindas.\n"
 "\n"
 
+msgid "Using crypt key from swap file for the text file.\n"
+msgstr ""
+"Uzas ŝlosilon de ĉifrado el permuto dosiero .swp por la teksta dosiero.\n"
+
 #. use msg() to start the scrolling properly
 msgid "Swap files found:"
 msgstr "Permutodosiero .swp trovita:"
@@ -3249,6 +3655,13 @@ msgstr ""
 msgid " (still running)"
 msgstr " (ankoraŭ ruliĝas)"
 
+msgid ""
+"\n"
+"         [not usable with this version of Vim]"
+msgstr ""
+"\n"
+"         [ne uzebla per tiu versio de Vim]"
+
 msgid ""
 "\n"
 "         [not usable on this computer]"
@@ -3269,15 +3682,15 @@ msgid "File preserved"
 msgstr "Dosiero konservita"
 
 msgid "E314: Preserve failed"
-msgstr "E314: Konservo fiaskis"
+msgstr "E314: Konservo malsukcesis"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get: nevalida lnum: %<PRId64>"
+msgid "E315: ml_get: invalid lnum: %ld"
+msgstr "E315: ml_get: nevalida lnum: %ld"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get: ne eblas trovi linion %<PRId64>"
+msgid "E316: ml_get: cannot find line %ld"
+msgstr "E316: ml_get: ne eblas trovi linion %ld"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: nevalida referenco de bloko id 3"
@@ -3295,8 +3708,8 @@ msgid "deleted block 1?"
 msgstr "ĉu forviŝita bloko 1?"
 
 #, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: Ne eblas trovi linion %<PRId64>"
+msgid "E320: Cannot find line %ld"
+msgstr "E320: Ne eblas trovi linion %ld"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: nevalida referenco de bloko id"
@@ -3305,12 +3718,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count estas nul"
 
 #, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: numero de linio ekster limoj: %<PRId64> preter la fino"
+msgid "E322: line number out of range: %ld past the end"
+msgstr "E322: numero de linio ekster limoj: %ld preter la fino"
 
 #, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: nevalida nombro de linioj en bloko %<PRId64>"
+msgid "E323: line count wrong in block %ld"
+msgstr "E323: nevalida nombro de linioj en bloko %ld"
 
 msgid "Stack size increases"
 msgstr "Stako pligrandiĝas"
@@ -3338,6 +3751,8 @@ msgstr "Dum malfermo de dosiero \""
 msgid "      NEWER than swap file!\n"
 msgstr "      PLI NOVA ol permutodosiero .swp!\n"
 
+#. Some of these messages are long to allow translation to
+#. * other languages.
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
@@ -3349,9 +3764,6 @@ msgstr ""
 "    por ne havi du malsamajn aperojn de la sama dosiero, kiam vi faros\n"
 "    ŝanĝojn. Eliru aŭ daŭrigu singarde.\n"
 
-msgid "  Quit, or continue with caution.\n"
-msgstr "  Eliru, aŭ daŭrigu singarde.\n"
-
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Redakta seanco de tiu dosiero kolapsis.\n"
 
@@ -3417,21 +3829,9 @@ msgstr ""
 "&Eliri\n"
 "Ĉe&sigi"
 
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
 msgid "E326: Too many swap files found"
 msgstr "E326: Tro da dosieroj trovitaj"
 
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: Ne plu restas memoro! (disponigo de %<PRIu64> bajtoj)"
-
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: Parto de vojo de menuero ne estas sub-menuo"
 
@@ -3464,6 +3864,9 @@ msgstr ""
 "\n"
 "--- Menuoj ---"
 
+msgid "Tear off this menu"
+msgstr "Disigi tiun menuon"
+
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: Vojo de menuo devas konduki al menuero"
 
@@ -3493,6 +3896,9 @@ msgstr "linio %4ld:"
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Nevalida nomo de reĝistro: '%s'"
 
+msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
+msgstr "Flegado de mesaĝoj: Dominique PELLÉ <dominique.pelle@gmail.com>"
+
 msgid "Interrupt: "
 msgstr "Interrompo: "
 
@@ -3500,8 +3906,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Premu ENEN-KLAVON aŭ tajpu komandon por daŭrigi"
 
 #, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s linio %<PRId64>"
+msgid "%s line %ld"
+msgstr "%s linio %ld"
 
 msgid "-- More --"
 msgstr "-- Pli --"
@@ -3519,15 +3925,6 @@ msgstr ""
 "&Jes\n"
 "&Ne"
 
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"&Jes\n"
-"&Ne\n"
-"&Rezigni"
-
 # AM: ĉu Vim konvertos unuliterajn respondojn?
 # DP: jes, '&' bone funkcias (mi kontrolis)
 msgid ""
@@ -3543,11 +3940,24 @@ msgstr ""
 "&Forlasi Ĉion\n"
 "&Rezigni"
 
+msgid "Select Directory dialog"
+msgstr "Dialogujo de dosiera elekto"
+
+msgid "Save File dialog"
+msgstr "Dialogujo de dosiera konservo"
+
+msgid "Open File dialog"
+msgstr "Dialogujo de dosiera malfermo"
+
+#. TODO: non-GUI file selector here
+msgid "E338: Sorry, no file browser in console mode"
+msgstr "E338: Bedaŭrinde ne estas dosierfoliumilo en konzola reĝimo"
+
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: Ne sufiĉaj argumentoj por printf()"
 
 msgid "E807: Expected Float argument for printf()"
-msgstr "E807: Atendis Glitpunktnombron kiel argumento de printf()"
+msgstr "E807: Atendis Glitpunktnombron kiel argumenton de printf()"
 
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: Tro da argumentoj al printf()"
@@ -3569,12 +3979,12 @@ msgid "1 line less"
 msgstr "1 malplia linio"
 
 #, c-format
-msgid "%<PRId64> more lines"
-msgstr "%<PRId64> pliaj linioj"
+msgid "%ld more lines"
+msgstr "%ld pliaj linioj"
 
 #, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "%<PRId64> malpliaj linioj"
+msgid "%ld fewer lines"
+msgstr "%ld malpliaj linioj"
 
 msgid " (Interrupted)"
 msgstr " (Interrompita)"
@@ -3582,16 +3992,112 @@ msgstr " (Interrompita)"
 msgid "Beep!"
 msgstr "Bip!"
 
+msgid "ERROR: "
+msgstr "ERARO: "
+
+#, c-format
+msgid ""
+"\n"
+"[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
+msgstr ""
+"\n"
+"[bajtoj] totalaj disponigitaj/maldisponigitaj %lu-%lu, nun uzataj %lu, "
+"kulmina uzo %lu\n"
+
+#, c-format
+msgid ""
+"[calls] total re/malloc()'s %lu, total free()'s %lu\n"
+"\n"
+msgstr ""
+"[alvokoj] totalaj re/malloc() %lu, totalaj free() %lu\n"
+"\n"
+
+msgid "E340: Line is becoming too long"
+msgstr "E340: Linio iĝas tro longa"
+
+#, c-format
+msgid "E341: Internal error: lalloc(%ld, )"
+msgstr "E341: Interna eraro: lalloc(%ld, )"
+
+#, c-format
+msgid "E342: Out of memory!  (allocating %lu bytes)"
+msgstr "E342: Ne plu restas memoro! (disponigo de %lu bajtoj)"
+
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "Alvokas ŝelon por plenumi: \"%s\""
 
+msgid "E545: Missing colon"
+msgstr "E545: Mankas dupunkto"
+
+msgid "E546: Illegal mode"
+msgstr "E546: Reĝimo nepermesata"
+
+msgid "E547: Illegal mouseshape"
+msgstr "E547: Nevalida formo de muskursoro"
+
+msgid "E548: digit expected"
+msgstr "E548: cifero atendata"
+
+msgid "E549: Illegal percentage"
+msgstr "E549: Nevalida procento"
+
+msgid "E854: path too long for completion"
+msgstr "E854: tro longa vojo por kompletigo"
+
+#, c-format
+msgid ""
+"E343: Invalid path: '**[number]' must be at the end of the path or be "
+"followed by '%s'."
+msgstr ""
+"E343: Nevalida vojo: '**[nombro]' devas esti ĉe la fino de la vojo aŭ "
+"sekvita de '%s'."
+
+#, c-format
+msgid "E344: Can't find directory \"%s\" in cdpath"
+msgstr "E344: Ne eblas trovi dosierujon \"%s\" en cdpath"
+
+#, c-format
+msgid "E345: Can't find file \"%s\" in path"
+msgstr "E345: Ne eblas trovi dosieron \"%s\" en serĉvojo"
+
+#, c-format
+msgid "E346: No more directory \"%s\" found in cdpath"
+msgstr "E346: Ne plu trovis dosierujon \"%s\" en cdpath"
+
+#, c-format
+msgid "E347: No more file \"%s\" found in path"
+msgstr "E347: Ne plu trovis dosieron \"%s\" en serĉvojo"
+
+#, c-format
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr ""
+"E668: Nevalida permeso de dosiero de informo de konekto NetBeans: \"%s\""
+
+#, c-format
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: Konekto de NetBeans perdita por bufro %ld"
+
+msgid "E838: netbeans is not supported with this GUI"
+msgstr "E838: netbeans ne estas subtenata kun tiu grafika interfaco"
+
+msgid "E511: netbeans already connected"
+msgstr "E511: nebeans jam konektata"
+
+#, c-format
+msgid "E505: %s is read-only (add ! to override)"
+msgstr "E505: %s estas nurlegebla (aldonu ! por transpasi)"
+
 msgid "E349: No identifier under cursor"
 msgstr "E349: Neniu identigilo sub la kursoro"
 
 msgid "E774: 'operatorfunc' is empty"
 msgstr "E774: 'operatorfunc' estas malplena"
 
+# DP: ĉu Eval devas esti tradukita?
+msgid "E775: Eval feature not available"
+msgstr "E775: Eval eblo ne disponeblas"
+
 msgid "Warning: terminal cannot highlight"
 msgstr "Averto: terminalo ne povas emfazi"
 
@@ -3610,7 +4116,7 @@ msgstr "E662: Ĉe komenco de ŝanĝlisto"
 msgid "E663: At end of changelist"
 msgstr "E663: Ĉe fino de ŝanĝlisto"
 
-msgid "Type  :quit<Enter>  to exit Nvim"
+msgid "Type  :quit<Enter>  to exit Vim"
 msgstr "Tajpu \":quit<Enenklavo>\" por eliri el Vim"
 
 #, c-format
@@ -3622,37 +4128,41 @@ msgid "1 line %sed %d times"
 msgstr "1 linio %sita %d foje"
 
 #, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> linio %sita 1 foje"
+msgid "%ld lines %sed 1 time"
+msgstr "%ld linio %sita 1 foje"
 
 #, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> linioj %sitaj %d foje"
+msgid "%ld lines %sed %d times"
+msgstr "%ld linioj %sitaj %d foje"
 
 #, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "%<PRId64> krommarĝenendaj linioj... "
+msgid "%ld lines to indent... "
+msgstr "%ld krommarĝenendaj linioj... "
 
 msgid "1 line indented "
 msgstr "1 linio krommarĝenita "
 
 #, c-format
-msgid "%<PRId64> lines indented "
-msgstr "%<PRId64> linioj krommarĝenitaj "
+msgid "%ld lines indented "
+msgstr "%ld linioj krommarĝenitaj "
 
 msgid "E748: No previously used register"
 msgstr "E748: Neniu reĝistro antaŭe uzata"
 
 #. must display the prompt
 msgid "cannot yank; delete anyway"
-msgstr "ne eblas kopii; forviŝi tamene"
+msgstr "ne eblas kopii; tamen forviŝi"
 
 msgid "1 line changed"
 msgstr "1 linio ŝanĝita"
 
 #, c-format
-msgid "%<PRId64> lines changed"
-msgstr "%<PRId64> linioj ŝanĝitaj"
+msgid "%ld lines changed"
+msgstr "%ld linioj ŝanĝitaj"
+
+#, c-format
+msgid "freeing %ld lines"
+msgstr "malokupas %ld liniojn"
 
 msgid "block of 1 line yanked"
 msgstr "bloko de 1 linio kopiita"
@@ -3661,12 +4171,12 @@ msgid "1 line yanked"
 msgstr "1 linio kopiita"
 
 #, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "bloko de %<PRId64> linioj kopiita"
+msgid "block of %ld lines yanked"
+msgstr "bloko de %ld linioj kopiita"
 
 #, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "%<PRId64> linioj kopiitaj"
+msgid "%ld lines yanked"
+msgstr "%ld linioj kopiitaj"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3694,45 +4204,44 @@ msgstr ""
 msgid "E574: Unknown register type %d"
 msgstr "E574: Nekonata tipo de reĝistro %d"
 
+msgid ""
+"E883: search pattern and expression register may not contain two or more "
+"lines"
+msgstr ""
+"E883: serĉa ŝablono kaj esprima reĝistro ne povas enhavi du aŭ pliajn liniojn"
+
 #, c-format
-msgid "%<PRId64> Cols; "
-msgstr "%<PRId64> Kolumnoj; "
+msgid "%ld Cols; "
+msgstr "%ld Kolumnoj; "
+
+#, c-format
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+msgstr ""
+"Apartigis %s%ld de %ld Linioj; %lld de %lld Vortoj; %lld de %lld Bajtoj"
 
 #, c-format
 msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
 msgstr ""
-"Apartigis %s%<PRId64> de %<PRId64> Linioj; %<PRId64> de %<PRId64> Vortoj; "
-"%<PRId64> de %<PRId64> Bajtoj"
+"Apartigis %s%ld de %ld Linioj; %lld de %lld Vortoj; %lld de %lld Signoj; "
+"%lld de %lld Bajtoj"
+
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+msgstr "Kol %s de %s; Linio %ld de %ld; Vorto %lld de %lld; Bajto %lld de %lld"
 
 #, c-format
 msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
 msgstr ""
-"Apartigis %s%<PRId64> de %<PRId64> Linioj; %<PRId64> de %<PRId64> Vortoj; "
-"%<PRId64> de %<PRId64> Signoj; %<PRId64> de %<PRId64> Bajtoj"
+"Kol %s de %s; Linio %ld de %ld; Vorto %lld de %lld; Signo %lld de %lld; "
+"Bajto %lld de %lld"
 
 #, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
-msgstr ""
-"Kol %s de %s; Linio %<PRId64> de %<PRId64>; Vorto %<PRId64> de %<PRId64>; "
-"Bajto %<PRId64> de %<PRId64>"
-
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
-msgstr ""
-"Kol %s de %s; Linio %<PRId64> de %<PRId64>; Vorto %<PRId64> de %<PRId64>; "
-"Signo %<PRId64> de %<PRId64>; Bajto %<PRId64> de %<PRId64>"
-
-#, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr "(+%<PRId64> por BOM)"
+msgid "(+%ld for BOM)"
+msgstr "(+%ld por BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Folio %N"
@@ -3740,7 +4249,6 @@ msgstr "%<%f%h%m%=Folio %N"
 msgid "Thanks for flying Vim"
 msgstr "Dankon pro flugi per Vim"
 
-#. found a mismatch: skip
 msgid "E518: Unknown option"
 msgstr "E518: Nekonata opcio"
 
@@ -3770,6 +4278,12 @@ msgstr "Por opcio %s"
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: Ne eblas agordi 'term' al malplena ĉeno"
 
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: term ne ŝanĝeblas en grafika interfaco"
+
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: Uzu \":gui\" por lanĉi la grafikan interfacon"
+
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: 'backupext' kaj 'patchmode' estas egalaj"
 
@@ -3779,6 +4293,9 @@ msgstr "E834: Konfliktoj kun la valoro de 'listchars'"
 msgid "E835: Conflicts with value of 'fillchars'"
 msgstr "E835: Konfliktoj kun la valoro de 'fillchars'"
 
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: Ne ŝanĝeblas en la grafika interfaco GTK+ 2"
+
 msgid "E524: Missing colon"
 msgstr "E524: Mankas dupunkto"
 
@@ -3798,6 +4315,21 @@ msgstr "E528: Devas specifi ' valoron"
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: enhavas nepreseblan aŭ plurĉellarĝan signon"
 
+msgid "E596: Invalid font(s)"
+msgstr "E596: Nevalida(j) tiparo(j)"
+
+msgid "E597: can't select fontset"
+msgstr "E597: ne eblas elekti tiparon"
+
+msgid "E598: Invalid fontset"
+msgstr "E598: Nevalida tiparo"
+
+msgid "E533: can't select wide font"
+msgstr "E533: ne eblas elekti larĝan tiparon"
+
+msgid "E534: Invalid wide font"
+msgstr "E534: Nevalida larĝa tiparo"
+
 #, c-format
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: Nevalida signo post <%c>"
@@ -3809,6 +4341,9 @@ msgstr "E536: komo bezonata"
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' devas esti malplena aŭ enhavi %s"
 
+msgid "E538: No mouse support"
+msgstr "E538: Neniu muso subtenata"
+
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: '}' mankas"
 
@@ -3816,7 +4351,7 @@ msgid "E541: too many items"
 msgstr "E541: tro da elementoj"
 
 msgid "E542: unbalanced groups"
-msgstr "E542: misekvilibritaj grupoj"
+msgstr "E542: misekvilibraj grupoj"
 
 msgid "E590: A preview window already exists"
 msgstr "E590: Antaŭvida fenestro jam ekzistas"
@@ -3882,19 +4417,104 @@ msgstr "E357: 'langmap': Kongrua signo mankas por %s"
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap': Ekstraj signoj post punktokomo: %s"
 
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"Ne eblas plenumi ŝelon "
+msgid "cannot open "
+msgstr "ne eblas malfermi "
+
+msgid "VIM: Can't open window!\n"
+msgstr "VIM: Ne eblas malfermi fenestron!\n"
+
+msgid "Need Amigados version 2.04 or later\n"
+msgstr "Bezonas version 2.04 de Amigados aŭ pli novan\n"
+
+#, c-format
+msgid "Need %s version %ld\n"
+msgstr "Bezonas %s-on versio %ld\n"
+
+msgid "Cannot open NIL:\n"
+msgstr "Ne eblas malfermi NIL:\n"
+
+msgid "Cannot create "
+msgstr "Ne eblas krei "
+
+#, c-format
+msgid "Vim exiting with %d\n"
+msgstr "Vim eliras kun %d\n"
+
+msgid "cannot change console mode ?!\n"
+msgstr "ne eblas ŝanĝi reĝimon de konzolo?!\n"
+
+msgid "mch_get_shellsize: not a console??\n"
+msgstr "mch_get_shellsize: ne estas konzolo??\n"
+
+#. if Vim opened a window: Executing a shell may cause crashes
+msgid "E360: Cannot execute shell with -f option"
+msgstr "E360: Ne eblas plenumi ŝelon kun opcio -f"
+
+msgid "Cannot execute "
+msgstr "Ne eblas plenumi "
+
+msgid "shell "
+msgstr "ŝelo "
+
+msgid " returned\n"
+msgstr " liveris\n"
+
+msgid "ANCHOR_BUF_SIZE too small."
+msgstr "ANCHOR_BUF_SIZE tro malgranda."
+
+msgid "I/O ERROR"
+msgstr "ERARO DE ENIGO/ELIGO"
+
+msgid "Message"
+msgstr "Mesaĝo"
+
+msgid "E237: Printer selection failed"
+msgstr "E237: Elekto de presilo malsukcesis"
+
+#, c-format
+msgid "to %s on %s"
+msgstr "al %s de %s"
+
+#, c-format
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: Nekonata tiparo de presilo: %s"
+
+#, c-format
+msgid "E238: Print error: %s"
+msgstr "E238: Eraro de presado: %s"
+
+#, c-format
+msgid "Printing '%s'"
+msgstr "Presas '%s'"
+
+#, c-format
+msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
+msgstr "E244: Nevalida nomo de signaro \"%s\" en nomo de tiparo \"%s\""
+
+#, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr "E244: Nevalida nomo de kvalito \"%s\" en nomo de tiparo \"%s\""
+
+#, c-format
+msgid "E245: Illegal char '%c' in font name \"%s\""
+msgstr "E245: Nevalida signo '%c' en nomo de tiparo \"%s\""
+
+#, c-format
+msgid "Opening the X display took %ld msec"
+msgstr "Malfermo de vidigo X daŭris %ld msek"
 
 msgid ""
 "\n"
-"shell returned "
+"Vim: Got X error\n"
 msgstr ""
 "\n"
-"ŝelo liveris "
+"Vim: Alvenis X eraro\n"
+
+msgid "Testing the X display failed"
+msgstr "Testo de la vidigo X malsukcesis"
+
+msgid "Opening the X display timed out"
+msgstr "Tempolimo okazis dum malfermo de vidigo X"
 
 msgid ""
 "\n"
@@ -3919,13 +4539,115 @@ msgid "Could not get security context %s for %s. Removing it!"
 msgstr ""
 "Ne povis akiri kuntekston de sekureco %s por %s. Gi nun estas forigata!"
 
+msgid ""
+"\n"
+"Cannot execute shell sh\n"
+msgstr ""
+"\n"
+"Ne eblas plenumi ŝelon sh\n"
+
+msgid ""
+"\n"
+"shell returned "
+msgstr ""
+"\n"
+"ŝelo liveris "
+
+msgid ""
+"\n"
+"Cannot create pipes\n"
+msgstr ""
+"\n"
+"Ne eblas krei duktojn\n"
+
+msgid ""
+"\n"
+"Cannot fork\n"
+msgstr ""
+"\n"
+"Ne eblas forki\n"
+
+msgid ""
+"\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"Ne eblas plenumi ŝelon "
+
+msgid ""
+"\n"
+"Command terminated\n"
+msgstr ""
+"\n"
+"Komando terminigita\n"
+
+msgid "XSMP lost ICE connection"
+msgstr "XSMP perdis la konekton ICE"
+
 #, c-format
 msgid "dlerror = \"%s\""
 msgstr "dlerror = \"%s\""
 
+msgid "Opening the X display failed"
+msgstr "Malfermo de vidigo X malsukcesis"
+
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP: traktado de peto konservi-mem"
+
+msgid "XSMP opening connection"
+msgstr "XSMP: malfermo de konekto"
+
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP: kontrolo de konekto ICE malsukcesis"
+
 #, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: Ne eblas trovi dosieron \"%s\" en serĉvojo"
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "XSMP: SmcOpenConnection malsukcesis: %s"
+
+msgid "At line"
+msgstr "Ĉe linio"
+
+msgid "Could not load vim32.dll!"
+msgstr "Ne eblis ŝargi vim32.dll!"
+
+msgid "VIM Error"
+msgstr "Eraro de VIM"
+
+msgid "Could not fix up function pointers to the DLL!"
+msgstr "Ne eblis ripari referencojn de funkcioj al la DLL!"
+
+# DP: la eventoj estas tiuj, kiuj estas en la sekvantaj ĉenoj
+#, c-format
+msgid "Vim: Caught %s event\n"
+msgstr "Vim: Kaptis eventon %s\n"
+
+msgid "close"
+msgstr "fermo"
+
+msgid "logoff"
+msgstr "elsaluto"
+
+msgid "shutdown"
+msgstr "sistemfermo"
+
+msgid "E371: Command not found"
+msgstr "E371: Netrovebla komando"
+
+msgid ""
+"VIMRUN.EXE not found in your $PATH.\n"
+"External commands will not pause after completion.\n"
+"See  :help win32-vimrun  for more information."
+msgstr ""
+"VIMRUN.EXE ne troveblas en via $PATH.\n"
+"Eksteraj komandoj ne paŭzos post kompletigo.\n"
+"Vidu  :help win32-vimrun  por pliaj informoj."
+
+msgid "Vim Warning"
+msgstr "Averto de Vim"
+
+#, c-format
+msgid "shell returned %d"
+msgstr "la ŝelo liveris %d"
 
 #, c-format
 msgid "E372: Too many %%%c in format string"
@@ -3960,6 +4682,15 @@ msgstr "E379: Nomo de dosierujo mankas aŭ estas malplena"
 msgid "E553: No more items"
 msgstr "E553: Ne plu estas eroj"
 
+msgid "E924: Current window was closed"
+msgstr "E924: Aktuala vindozo fermiĝis"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: Aktuala rapidriparo ŝanĝiĝis"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: Aktuala listo de lokoj ŝanĝiĝis"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d de %d)%s%s: "
@@ -3983,6 +4714,9 @@ msgstr "Neniu ano"
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: Ne eblas skribi, opcio 'buftype' estas ŝaltita"
 
+msgid "Error file"
+msgstr "Erara Dosiero"
+
 msgid "E683: File name missing or invalid pattern"
 msgstr "E683: Dosiernomo mankas aŭ nevalida ŝablono"
 
@@ -4017,7 +4751,7 @@ msgid "E55: Unmatched %s)"
 msgstr "E55: Neekvilibra %s"
 
 msgid "E66: \\z( not allowed here"
-msgstr "E66: \\z( estas permesebla tie"
+msgstr "E66: \\z( estas nepermesebla tie"
 
 # DP: vidu http://www.thefreedictionary.com/et+al.
 msgid "E67: \\z1 et al. not allowed here"
@@ -4088,6 +4822,10 @@ msgstr "E554: Sintaksa eraro en %s{...}"
 msgid "External submatches:\n"
 msgstr "Eksteraj subkongruoj:\n"
 
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (NFA-regulesprimo) ne eblas ripeti %s"
+
 msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
 "used "
@@ -4095,6 +4833,9 @@ msgstr ""
 "E864: \\%#= povas nur esti sekvita de 0, 1, aŭ 2. La aŭtomata motoro de "
 "regulesprimo estos uzata "
 
+msgid "Switching to backtracking RE engine for pattern: "
+msgstr "Ŝangota al malavanca motoro de regulesprimo por ŝablono: "
+
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) Trovis finon de regulesprimo tro frue"
 
@@ -4102,17 +4843,21 @@ msgstr "E865: (NFA) Trovis finon de regulesprimo tro frue"
 msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (NFA-regulesprimo) Mispoziciigita %c"
 
-#, fuzzy, c-format
-#~ msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-#~ msgstr "E877: (NFA-regulesprimo) Nevalida klaso de signo "
+#, c-format
+msgid "E877: (NFA regexp) Invalid character class: %ld"
+msgstr "E877: (NFA-regulesprimo) Nevalida klaso de signo: %ld"
 
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
 msgstr "E867: (NFA) Nekonata operatoro '\\z%c'"
 
-#, fuzzy, c-format
-#~ msgid "E867: (NFA) Unknown operator '\\%%%c'"
-#~ msgstr "E867: (NFA) Nekonata operatoro '\\z%c'"
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\%%%c'"
+msgstr "E867: (NFA) Nekonata operatoro '\\%%%c'"
+
+#. should never happen
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: Eraro dum prekomputado de NFA kun ekvivalentoklaso!"
 
 #, c-format
 msgid "E869: (NFA) Unknown operator '\\@%c'"
@@ -4131,9 +4876,8 @@ msgstr ""
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA-regulesprimo) tro da '('"
 
-#, fuzzy
-#~ msgid "E879: (NFA regexp) Too many \\z("
-#~ msgstr "E872: (NFA-regulesprimo) tro da '('"
+msgid "E879: (NFA regexp) Too many \\z("
+msgstr "E879: (NFA-regulesprimo) tro da \\z("
 
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA-regulesprimo) propra end-eraro"
@@ -4151,6 +4895,9 @@ msgstr ""
 msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
 msgstr "E876: (NFA-regulesprimo) ne sufiĉa spaco por enmomorigi la tutan NFA "
 
+msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+msgstr "E878: (NFA) Ne povis asigni memoron por traigi branĉojn!"
+
 msgid ""
 "Could not open temporary log file for writing, displaying on stderr ... "
 msgstr ""
@@ -4347,13 +5094,6 @@ msgstr "E762: Signo en FOL, LOW aŭ UPP estas ekster limoj"
 msgid "Compressing word tree..."
 msgstr "Densigas arbon de vortoj..."
 
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: Literumilo ne estas ŝaltita"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr "Averto: Ne eblas trovi vortliston \"%s.%s.spl\" aŭ \"%s.ascii.spl\""
-
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "Legado de literuma dosiero \"%s\""
@@ -4402,6 +5142,10 @@ msgstr "Malsukceso dum konverto de vorto en %s linio %d: %s"
 msgid "Conversion in %s not supported: from %s to %s"
 msgstr "Konverto en %s nesubtenata: de %s al %s"
 
+#, c-format
+msgid "Conversion in %s not supported"
+msgstr "Konverto en %s nesubtenata"
+
 #, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "Nevalida valoro de FLAG en %s linio %d: %s"
@@ -4586,6 +5330,9 @@ msgstr "Nekonata flago en %s linio %d: %s"
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "Ignoris %d vorto(j)n kun neaskiaj signoj"
 
+msgid "E845: Insufficient memory, word list will be incomplete"
+msgstr "E845: Ne sufiĉe da memoro, vortlisto estos nekompleta."
+
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
 msgstr "Densigis %d de %d nodoj; %d (%d%%) restantaj"
@@ -4593,14 +5340,16 @@ msgstr "Densigis %d de %d nodoj; %d (%d%%) restantaj"
 msgid "Reading back spell file..."
 msgstr "Relegas la dosieron de literumo..."
 
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
+#.
+#. * Go through the trie of good words, soundfold each word and add it to
+#. * the soundfold trie.
+#.
 msgid "Performing soundfolding..."
 msgstr "Fonetika analizado..."
 
 #, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "Nombro de vortoj post fonetika analizado: %<PRId64>"
+msgid "Number of words after soundfolding: %ld"
+msgstr "Nombro de vortoj post fonetika analizado: %ld"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -4635,66 +5384,22 @@ msgid "Done!"
 msgstr "Farita!"
 
 #, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: 'spellfile' ne havas %<PRId64> rikordojn"
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' ne havas %ld rikordojn"
 
-#, fuzzy, c-format
-#~ msgid "Word '%.*s' removed from %s"
-#~ msgstr "Vorto fortirita el %s"
+#, c-format
+msgid "Word '%.*s' removed from %s"
+msgstr "Vorto '%.*s' fortirita el %s"
 
-#, fuzzy, c-format
-#~ msgid "Word '%.*s' added to %s"
-#~ msgstr "Vorto aldonita al %s"
+#, c-format
+msgid "Word '%.*s' added to %s"
+msgstr "Vorto '%.*s' aldonita al %s"
 
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: Signoj de vorto malsamas tra literumaj dosieroj"
 
-msgid "Sorry, no suggestions"
-msgstr "Bedaŭrinde ne estas sugestoj"
-
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "Bedaŭrinde estas nur %<PRId64> sugestoj"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "Anstataŭigi \"%.*s\" per:"
-
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-msgid "E752: No previous spell replacement"
-msgstr "E752: Neniu antaŭa literuma anstataŭigo"
-
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: Netrovita: %s"
-
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: Tio ne ŝajnas esti dosiero .sug: %s"
-
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: Malnova dosiero .sug, bezonas ĝisdatigon: %s"
-
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: Dosiero .sug estas por pli nova versio de Vim: %s"
-
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: Dosiero .sug ne kongruas kun dosiero .spl: %s"
-
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: eraro dum legado de dosiero .sug: %s"
-
 #. This should have been checked when generating the .spl
-#. file.
+#. * file.
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: ripetita signo en rikordo MAP"
 
@@ -4802,7 +5507,6 @@ msgstr "E848: Tro da sintaksaj grupoj"
 msgid "E400: No cluster specified"
 msgstr "E400: Neniu fasko specifita"
 
-#. end delimiter not found
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: Disigilo de ŝablono netrovita: %s"
@@ -4842,9 +5546,10 @@ msgstr "E409: Nekonata nomo de grupo: %s"
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: Nevalida \":syntax\" subkomando: %s"
 
-#~ msgid ""
-#~ "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
-#~ msgstr ""
+msgid ""
+"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
+msgstr ""
+"  TOTALO    NOMBRO  KONGRUO PLEJ MALRAPID  MEZA   NOMO               ŜABLONO"
 
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: rekursia buklo dum ŝargo de syncolor.vim"
@@ -4859,7 +5564,7 @@ msgstr "E412: Ne sufiĉaj argumentoj: \":highlight link %s\""
 
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
-msgstr "E413: Tro argumentoj: \":highlight link %s\""
+msgstr "E413: Tro da argumentoj: \":highlight link %s\""
 
 msgid "E414: group has settings, highlight link ignored"
 msgstr "E414: grupo havas agordojn, ligilo de emfazo ignorita"
@@ -4967,6 +5672,10 @@ msgstr ""
 msgid "Searching tags file %s"
 msgstr "Serĉado de dosiero de etikedoj %s"
 
+#, c-format
+msgid "E430: Tag file path truncated for %s\n"
+msgstr "E430: Vojo de etikeda dosiero trunkita por %s\n"
+
 msgid "Ignoring long line in tags file"
 msgstr "Ignoro de longa linio en etikeda dosiero"
 
@@ -4975,8 +5684,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Eraro de formato en etikeda dosiero \"%s\""
 
 #, c-format
-msgid "Before byte %<PRId64>"
-msgstr "Antaŭ bajto %<PRId64>"
+msgid "Before byte %ld"
+msgstr "Antaŭ bajto %ld"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5026,14 +5735,26 @@ msgstr ""
 "\n"
 "--- Klavoj de terminalo ---"
 
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "Ne povas malfermi $VIMRUNTIME/rgb.txt"
+
+msgid "new shell started\n"
+msgstr "nova ŝelo lanĉita\n"
+
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: Eraro dum legado de eniro, elironta...\n"
 
+msgid "Used CUT_BUFFER0 instead of empty selection"
+msgstr "Uzis CUT_BUFFER0 anstataŭ malplenan apartigon"
+
 #. This happens when the FileChangedRO autocommand changes the
 #. * file in a way it becomes shorter.
-#, fuzzy
-#~ msgid "E881: Line count changed unexpectedly"
-#~ msgstr "E834: Nombro de linioj ŝanĝiĝis neatendite"
+msgid "E881: Line count changed unexpectedly"
+msgstr "E881: Nombro de linioj ŝanĝiĝis neatendite"
+
+#. must display the prompt
+msgid "No undo possible; continue anyway"
+msgstr "Malfaro neebla; tamen daŭrigi"
 
 #, c-format
 msgid "E828: Cannot open undo file for writing: %s"
@@ -5081,6 +5802,18 @@ msgstr "E822: Ne eblas malfermi malfaran dosieron por legi: %s"
 msgid "E823: Not an undo file: %s"
 msgstr "E823: Ne estas malfara dosiero: %s"
 
+#, c-format
+msgid "E832: Non-encrypted file has encrypted undo file: %s"
+msgstr "E832: Ne ĉifrata dosiero havas ĉifratan malfaran dosieron: %s"
+
+#, c-format
+msgid "E826: Undo file decryption failed: %s"
+msgstr "E826: Malĉifrado de malfara dosiero malsukcesis: %s"
+
+#, c-format
+msgid "E827: Undo file is encrypted: %s"
+msgstr "E827: Malfara dosiero estas ĉifrata: %s"
+
 #, c-format
 msgid "E824: Incompatible undo file: %s"
 msgstr "E824: Malkongrua malfara dosiero: %s"
@@ -5099,8 +5832,8 @@ msgid "Already at newest change"
 msgstr "Jam al la plej nova ŝanĝo"
 
 #, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "E830: Malfara numero %<PRId64> netrovita"
+msgid "E830: Undo number %ld not found"
+msgstr "E830: Malfara numero %ld netrovita"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: nevalidaj numeroj de linioj"
@@ -5124,8 +5857,8 @@ msgid "changes"
 msgstr "ŝanĝoj"
 
 #, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
+msgid "%ld %s; %s #%ld  %s"
+msgstr "%ld %s; %s #%ld  %s"
 
 msgid "before"
 msgstr "antaŭ"
@@ -5140,8 +5873,8 @@ msgid "number changes  when               saved"
 msgstr "numero ŝanĝoj   tempo              konservita"
 
 #, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "antaŭ %<PRId64> sekundoj"
+msgid "%ld seconds ago"
+msgstr "antaŭ %ld sekundoj"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin estas nepermesebla post malfaro"
@@ -5152,6 +5885,189 @@ msgstr "E439: listo de malfaro estas difekta"
 msgid "E440: undo line missing"
 msgstr "E440: linio de malfaro mankas"
 
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: La funkcio %s jam ekzistas (aldonu ! por anstataŭigi ĝin)"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: Rikordo de vortaro jam ekzistas"
+
+msgid "E718: Funcref required"
+msgstr "E718: Funcref bezonata"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: Nekonata funkcio: %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: Nevalida argumento: %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: Ripetita nomo de argumento: %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: Tro da argumentoj por funkcio: %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: Nevalidaj argumentoj por funkcio: %s"
+
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr "E132: Profundo de funkcia alvoko superas 'maxfuncdepth'"
+
+#, c-format
+msgid "calling %s"
+msgstr "alvokas %s"
+
+#, c-format
+msgid "%s aborted"
+msgstr "%s ĉesigita"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s liveras #%ld"
+
+#, c-format
+msgid "%s returning %s"
+msgstr "%s liveras %s"
+
+msgid "E699: Too many arguments"
+msgstr "E699: Tro da argumentoj"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: Nekonata funkcio: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: funkcio estis forviŝita: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: Ne sufiĉe da argumentoj por funkcio: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: <SID> estas uzata ekster kunteksto de skripto: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: Alvoko de funkcio dict sen Vortaro: %s"
+
+msgid "E129: Function name required"
+msgstr "E129: Nomo de funkcio bezonata"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr "E128: Nomo de funkcio devas eki per majusklo aŭ per \"s:\": %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr "E884: Nomo de funkcio ne povas enhavi dupunkton: %s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: Nedifinita funkcio: %s"
+
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: Mankas '(': %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: Ne eblas uzi g: ĉi tie"
+
+#, c-format
+msgid "E932: Closure function should not be at top level: %s"
+msgstr "E932: Fermo-funkcio devus esti je la plej alta nivelo: %s"
+
+msgid "E126: Missing :endfunction"
+msgstr "E126: Mankas \":endfunction\""
+
+#, c-format
+msgid "E707: Function name conflicts with variable: %s"
+msgstr "E707: Nomo de funkcio konfliktas kun variablo: %s"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr "E127: Ne eblas redifini funkcion %s: Estas nuntempe uzata"
+
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: Nomo de funkcio ne kongruas kun dosiernomo de skripto: %s"
+
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: Ne eblas forviŝi funkcion %s: Estas nuntempe uzata"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: \":return\" ekster funkcio"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: Mankas krampoj: %s"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit GUI version"
+msgstr ""
+"\n"
+"Grafika versio MS-Vindozo 64-bitoj"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI version"
+msgstr ""
+"\n"
+"Grafika versio MS-Vindozo 32-bitoj"
+
+msgid " with OLE support"
+msgstr " kun subteno de OLE"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit console version"
+msgstr ""
+"\n"
+"Versio konzola MS-Vindozo 64-bitoj"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit console version"
+msgstr ""
+"\n"
+"Versio konzola MS-Vindozo 32-bitoj"
+
+msgid ""
+"\n"
+"MacOS X (unix) version"
+msgstr ""
+"\n"
+"Versio Mak OS X (unikso)"
+
+msgid ""
+"\n"
+"MacOS X version"
+msgstr ""
+"\n"
+"Versio Mak OS X"
+
+msgid ""
+"\n"
+"MacOS version"
+msgstr ""
+"\n"
+"Versio Mak OS"
+
+msgid ""
+"\n"
+"OpenVMS version"
+msgstr ""
+"\n"
+"Versio OpenVMS"
+
 msgid ""
 "\n"
 "Included patches: "
@@ -5186,9 +6102,70 @@ msgstr ""
 "\n"
 "Grandega versio "
 
+msgid ""
+"\n"
+"Big version "
+msgstr ""
+"\n"
+"Granda versio "
+
+msgid ""
+"\n"
+"Normal version "
+msgstr ""
+"\n"
+"Normala versio "
+
+msgid ""
+"\n"
+"Small version "
+msgstr ""
+"\n"
+"Malgranda versio "
+
+msgid ""
+"\n"
+"Tiny version "
+msgstr ""
+"\n"
+"Malgrandega versio "
+
 msgid "without GUI."
 msgstr "sen grafika interfaco."
 
+msgid "with GTK3 GUI."
+msgstr "kun grafika interfaco GTK3."
+
+msgid "with GTK2-GNOME GUI."
+msgstr "kun grafika interfaco GTK2-GNOME."
+
+msgid "with GTK2 GUI."
+msgstr "kun grafika interfaco GTK2."
+
+msgid "with X11-Motif GUI."
+msgstr "kun grafika interfaco X11-Motif."
+
+msgid "with X11-neXtaw GUI."
+msgstr "kun grafika interfaco X11-neXtaw."
+
+msgid "with X11-Athena GUI."
+msgstr "kun grafika interfaco X11-Athena."
+
+msgid "with Photon GUI."
+msgstr "kun grafika interfaco Photon."
+
+msgid "with GUI."
+msgstr "sen grafika interfaco."
+
+msgid "with Carbon GUI."
+msgstr "kun grafika interfaco Carbon."
+
+msgid "with Cocoa GUI."
+msgstr "kun grafika interfaco Cocoa."
+
+msgid "with (classic) GUI."
+msgstr "kun (klasika) grafika interfaco."
+
 msgid "  Features included (+) or not (-):\n"
 msgstr "  Ebloj inkluzivitaj (+) aŭ ne (-):\n"
 
@@ -5210,6 +6187,24 @@ msgstr "         dosiero exrc de uzanto: \""
 msgid "  2nd user exrc file: \""
 msgstr "     2-a dosiero exrc de uzanto: \""
 
+msgid "  system gvimrc file: \""
+msgstr "         sistema dosiero gvimrc: \""
+
+msgid "    user gvimrc file: \""
+msgstr "       dosiero gvimrc de uzanto: \""
+
+msgid "2nd user gvimrc file: \""
+msgstr "   2-a dosiero gvimrc de uzanto: \""
+
+msgid "3rd user gvimrc file: \""
+msgstr "   3-a dosiero gvimrc de uzanto: \""
+
+msgid "       defaults file: \""
+msgstr "           dosiero de defaŭltoj: \""
+
+msgid "    system menu file: \""
+msgstr "       dosiero de sistema menuo: \""
+
 msgid "  fall-back for $VIM: \""
 msgstr "               defaŭlto de $VIM: \""
 
@@ -5219,6 +6214,9 @@ msgstr "         defaŭlto de VIMRUNTIME: \""
 msgid "Compilation: "
 msgstr "Kompilado: "
 
+msgid "Compiler: "
+msgstr "Kompililo: "
+
 msgid "Linking: "
 msgstr "Ligado: "
 
@@ -5254,8 +6252,8 @@ msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "tajpu  :help<Enenklavo>  aŭ  <F1> por aliri la helpon  "
 
 # DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-msgid "type  :help version7<Enter>   for version info"
-msgstr "tajpu  :help version7<Enenklavo>  por informo de versio"
+msgid "type  :help version8<Enter>   for version info"
+msgstr "tajpu  :help version8<Enenklavo>  por informo de versio"
 
 msgid "Running in Vi compatible mode"
 msgstr "Ruliĝas en reĝimo kongrua kun Vi"
@@ -5268,6 +6266,30 @@ msgstr "tajpu :set nocp<Enenklavo>        por Vim defaŭltoj    "
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "tajpu :help cp-default<Enenklavo> por pliaj informoj   "
 
+# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
+msgid "menu  Help->Orphans           for information    "
+msgstr "menuo  Help->Orfinoj              por pliaj informoj   "
+
+msgid "Running modeless, typed text is inserted"
+msgstr "Ruliĝas senreĝime, tajpita teksto estas enmetita"
+
+# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
+msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
+msgstr "menuo Redakti->Mallokaj Agordoj->Baskuligi Enmetan Reĝimon"
+
+# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
+msgid "                              for two modes      "
+msgstr "                                  por du reĝimoj       "
+
+# DP: tiu ĉeno pli longas (mi ne volas igi ĉiujn aliajn ĉenojn
+#     pli longajn)
+msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
+msgstr "menuo Redakti->Mallokaj Agordoj->Baskuligi Reĝimon Kongruan kun Vi"
+
+# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
+msgid "                              for Vim defaults   "
+msgstr "                                  por defaŭltoj de Vim "
+
 msgid "Sponsor Vim development!"
 msgstr "Subtenu la programadon de Vim!"
 
@@ -5313,1737 +6335,703 @@ msgstr "E445: La alia fenestro enhavas ŝanĝojn"
 msgid "E446: No file name under cursor"
 msgstr "E446: Neniu dosiernomo sub la kursoro"
 
-#~ msgid "E831: bf_key_init() called with empty password"
-#~ msgstr "E831: bf_key_init() alvokita kun malplena pasvorto"
+#, c-format
+msgid "E447: Can't find file \"%s\" in path"
+msgstr "E447: Ne eblas trovi dosieron \"%s\" en serĉvojo"
 
-#~ msgid "E820: sizeof(uint32_t) != 4"
-#~ msgstr "E820: sizeof(uint32_t) != 4"
+#, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: Nevalida ID: %ld (devas esti egala aŭ pli granda ol 1)"
 
-#~ msgid "E817: Blowfish big/little endian use wrong"
-#~ msgstr "E817: Misuzo de pezkomenca/pezfina en blowfish"
+#, c-format
+msgid "E801: ID already taken: %ld"
+msgstr "E801: ID jam uzata: %ld"
 
-#~ msgid "E818: sha256 test failed"
-#~ msgstr "E818: Testo de sha256 fiaskis"
+msgid "List or number required"
+msgstr "Listo aŭ nombro bezonata"
 
-#~ msgid "E819: Blowfish test failed"
-#~ msgstr "E819: Testo de blowfish fiaskis"
+#, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: Nevalida ID: %ld (devas esti egala aŭ pli granda ol 1)"
 
-#~ msgid "Patch file"
-#~ msgstr "Flika dosiero"
+#, c-format
+msgid "E803: ID not found: %ld"
+msgstr "E803: ID netrovita: %ld"
 
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "&Bone\n"
-#~ "&Rezigni"
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: Ne eblis ŝargi bibliotekon %s"
 
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: Neniu konekto al Vim-servilo"
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"Bedaŭrinde tiu komando estas malŝaltita: la biblioteko de Perl ne ŝargeblis."
 
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: Ne eblas sendi al %s"
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: Plenumo de Perl esprimoj malpermesata en sabloludejo sen la modulo Safe"
 
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: Ne eblas legi respondon de servilo"
+msgid "Edit with &multiple Vims"
+msgstr "Redakti per &pluraj Vim-oj"
 
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: Ne eblas sendi al kliento"
+msgid "Edit with single &Vim"
+msgstr "Redakti per unuopa &Vim"
 
-#~ msgid "Save As"
-#~ msgstr "Konservi kiel"
+msgid "Diff with Vim"
+msgstr "Kompari per Vim"
 
-#~ msgid "Edit File"
-#~ msgstr "Redakti dosieron"
+msgid "Edit with &Vim"
+msgstr "Redakti per &Vim"
 
-#~ msgid " (NOT FOUND)"
-#~ msgstr "  (NETROVITA)"
+#. Now concatenate
+msgid "Edit with existing Vim - "
+msgstr "Redakti per ekzistanta Vim - "
 
-#~ msgid "Source Vim script"
-#~ msgstr "Ruli Vim-skripton"
+msgid "Edits the selected file(s) with Vim"
+msgstr "Redakti la apartigita(j)n dosiero(j)n per Vim"
 
-#~ msgid "unknown"
-#~ msgstr "nekonata"
+msgid "Error creating process: Check if gvim is in your path!"
+msgstr "Eraro dum kreo de procezo: Kontrolu ĉu gvim estas en via serĉvojo!"
 
-#~ msgid "Edit File in new window"
-#~ msgstr "Redakti Dosieron en nova fenestro"
+msgid "gvimext.dll error"
+msgstr "Eraro de gvimext.dll"
 
-#~ msgid "Append File"
-#~ msgstr "Postaldoni dosieron"
+msgid "Path length too long!"
+msgstr "Serĉvojo estas tro longa!"
 
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "Pozicio de fenestro: X %d, Y %d"
+msgid "--No lines in buffer--"
+msgstr "--Neniu linio en bufro--"
 
-#~ msgid "Save Redirection"
-#~ msgstr "Konservi alidirekton"
+#.
+#. * The error messages that can be shared are included here.
+#. * Excluded are errors that are only used once and debugging messages.
+#.
+msgid "E470: Command aborted"
+msgstr "E470: komando ĉesigita"
 
-# DP: mi ne certas pri superflugo
-#~ msgid "Save View"
-#~ msgstr "Konservi superflugon"
+msgid "E471: Argument required"
+msgstr "E471: Argumento bezonata"
 
-#~ msgid "Save Session"
-#~ msgstr "Konservi seancon"
+msgid "E10: \\ should be followed by /, ? or &"
+msgstr "E10: \\ devus esti sekvita de /, ? aŭ &"
 
-#~ msgid "Save Setup"
-#~ msgstr "Konservi agordaron"
+msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgstr ""
+"E11: Nevalida en fenestro de komanda linio; <CR> plenumas, CTRL-C eliras"
 
-#~ msgid "E809: #< is not available without the +eval feature"
-#~ msgstr "E809: #< ne haveblas sen la eblo +eval"
+msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgstr ""
+"E12: Nepermesebla komando el exrc/vimrc en aktuala dosierujo aŭ etikeda serĉo"
 
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: Neniu duliteraĵo en tiu versio"
+msgid "E171: Missing :endif"
+msgstr "E171: Mankas \":endif\""
 
-#~ msgid "is a device (disabled with 'opendevice' option)"
-#~ msgstr "estas aparatdosiero (malŝaltita per la opcio 'opendevice')"
+msgid "E600: Missing :endtry"
+msgstr "E600: Mankas \":endtry\""
 
-#~ msgid "Reading from stdin..."
-#~ msgstr "Legado el stdin..."
+msgid "E170: Missing :endwhile"
+msgstr "E170: Mankas \":endwhile\""
 
-#~ msgid "[crypted]"
-#~ msgstr "[ĉifrita]"
+msgid "E170: Missing :endfor"
+msgstr "E170: Mankas \":endfor\""
 
-#~ msgid "E821: File is encrypted with unknown method"
-#~ msgstr "E821: Dosiero estas ĉifrata per nekonata metodo"
+msgid "E588: :endwhile without :while"
+msgstr "E588: \":endwhile\" sen \":while\""
 
-#~ msgid "Warning: Using a weak encryption method; see :help 'cm'"
-#~ msgstr "Averto: uzo de malfortika ĉifrada metodo; vidu :help 'cm'"
+msgid "E588: :endfor without :for"
+msgstr "E588: \":endfor\" sen \":for\""
 
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeans malpermesas skribojn de neŝanĝitaj bufroj"
+msgid "E13: File exists (add ! to override)"
+msgstr "E13: Dosiero ekzistas (aldonu ! por transpasi)"
 
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "Partaj skriboj malpermesitaj ĉe bufroj NetBeans"
+msgid "E472: Command failed"
+msgstr "E472: La komando malsukcesis"
 
-#~ msgid "writing to device disabled with 'opendevice' option"
-#~ msgstr "skribo al aparatdosiero malŝaltita per la opcio 'opendevice'"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: Nekonata familio de tiparo: %s"
 
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: La rimeda forko estus perdita (aldonu ! por transpasi)"
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: Nekonata tiparo: %s"
 
-#~ msgid "E851: Failed to create a new process for the GUI"
-#~ msgstr "E851: Ne sukcesis krei novan procezon por la grafika interfaco"
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: La tiparo \"%s\" ne estas egallarĝa"
 
-#~ msgid "E852: The child process failed to start the GUI"
-#~ msgstr "E852: La ida procezo ne sukcesis startigi la grafikan interfacon"
+msgid "E473: Internal error"
+msgstr "E473: Interna eraro"
 
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: Ne eblas lanĉi la grafikan interfacon"
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: Interna eraro: %s"
 
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: Ne eblas legi el \"%s\""
+msgid "Interrupted"
+msgstr "Interrompita"
 
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr ""
-#~ "E665: Ne eblas startigi grafikan interfacon, neniu valida tiparo trovita"
+msgid "E14: Invalid address"
+msgstr "E14: Nevalida adreso"
 
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: 'guifontwide' nevalida"
+msgid "E474: Invalid argument"
+msgstr "E474: Nevalida argumento"
 
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: Valoro de 'imactivatekey' estas nevalida"
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: Nevalida argumento: %s"
 
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: Ne eblas disponigi koloron %s"
+#, c-format
+msgid "E15: Invalid expression: %s"
+msgstr "E15: Nevalida esprimo: %s"
 
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "Neniu kongruo ĉe kursorpozicio, trovas sekvan"
+msgid "E16: Invalid range"
+msgstr "E16: Nevalida amplekso"
 
-#~ msgid "<cannot open> "
-#~ msgstr "<ne eblas malfermi> "
+msgid "E476: Invalid command"
+msgstr "E476: Nevalida komando"
 
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: ne eblas akiri tiparon %s"
+#, c-format
+msgid "E17: \"%s\" is a directory"
+msgstr "E17: \"%s\" estas dosierujo"
 
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr "E614: vim_SelFile: ne eblas reveni al la aktuala dosierujo"
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: Alvoko al biblioteko malsukcesis por \"%s()\""
 
-#~ msgid "Pathname:"
-#~ msgstr "Serĉvojo:"
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: Ne eblis ŝargi bibliotekan funkcion %s"
 
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: ne eblas akiri aktualan dosierujon"
+msgid "E19: Mark has invalid line number"
+msgstr "E19: Marko havas nevalidan numeron de linio"
 
-#~ msgid "OK"
-#~ msgstr "Bone"
+msgid "E20: Mark not set"
+msgstr "E20: Marko ne estas agordita"
 
-#~ msgid "Cancel"
-#~ msgstr "Rezigni"
+msgid "E21: Cannot make changes, 'modifiable' is off"
+msgstr "E21: Ne eblas fari ŝanĝojn, 'modifiable' estas malŝaltita"
 
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr ""
-#~ "Fenestraĵo de rulumskalo: Ne eblis akiri geometrion de reduktita "
-#~ "rastrumbildo"
+msgid "E22: Scripts nested too deep"
+msgstr "E22: Tro profunde ingitaj skriptoj"
 
-#~ msgid "Vim dialog"
-#~ msgstr "Vim dialogo"
+msgid "E23: No alternate file"
+msgstr "E23: Neniu alterna dosiero"
 
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr "E232: Ne eblas krei BalloonEval kun ambaŭ mesaĝo kaj reagfunkcio"
+msgid "E24: No such abbreviation"
+msgstr "E24: Ne estas tia mallongigo"
 
-msgid "Yes"
-msgstr "Jes"
+msgid "E477: No ! allowed"
+msgstr "E477: Neniu ! permesebla"
 
-msgid "No"
-msgstr "Ne"
+msgid "E25: GUI cannot be used: Not enabled at compile time"
+msgstr "E25: Grafika interfaco ne uzeblas: Malŝaltita dum kompilado"
 
-# todo '_' is for hotkey, i guess?
-#~ msgid "Input _Methods"
-#~ msgstr "Enigaj _metodoj"
+msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
+msgstr "E26: La hebrea ne uzeblas: Malŝaltita dum kompilado\n"
 
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "VIM - Serĉi kaj anstataŭigi..."
+msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
+msgstr "E27: La persa ne uzeblas: Malŝaltita dum kompilado\n"
 
-#~ msgid "VIM - Search..."
-#~ msgstr "VIM- Serĉi..."
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: La araba ne uzeblas: Malŝaltita dum kompilado\n"
 
-#~ msgid "Find what:"
-#~ msgstr "Serĉi kion:"
+#, c-format
+msgid "E28: No such highlight group name: %s"
+msgstr "E28: Neniu grupo de emfazo kiel: %s"
 
-#~ msgid "Replace with:"
-#~ msgstr "Anstataŭigi per:"
+msgid "E29: No inserted text yet"
+msgstr "E29: Ankoraŭ neniu enmetita teksto"
 
-#~ msgid "Match whole word only"
-#~ msgstr "Kongrui kun nur plena vorto"
+msgid "E30: No previous command line"
+msgstr "E30: Neniu antaŭa komanda linio"
 
-#~ msgid "Match case"
-#~ msgstr "Uskleca kongruo"
+msgid "E31: No such mapping"
+msgstr "E31: Neniu tiel mapo"
 
-#~ msgid "Direction"
-#~ msgstr "Direkto"
+msgid "E479: No match"
+msgstr "E479: Neniu kongruo"
 
-#~ msgid "Up"
-#~ msgstr "Supren"
+#, c-format
+msgid "E480: No match: %s"
+msgstr "E480: Neniu kongruo: %s"
 
-#~ msgid "Down"
-#~ msgstr "Suben"
+msgid "E32: No file name"
+msgstr "E32: Neniu dosiernomo"
 
-#~ msgid "Find Next"
-#~ msgstr "Trovi sekvantan"
+msgid "E33: No previous substitute regular expression"
+msgstr "E33: Neniu antaŭa regulesprimo de anstataŭigo"
 
-#~ msgid "Replace"
-#~ msgstr "Anstataŭigi"
+msgid "E34: No previous command"
+msgstr "E34: Neniu antaŭa komando"
 
-#~ msgid "Replace All"
-#~ msgstr "Anstataŭigi ĉiujn"
+msgid "E35: No previous regular expression"
+msgstr "E35: Neniu antaŭa regulesprimo"
 
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "Vim: Ricevis peton \"die\" (morti) el la seanca administrilo\n"
+msgid "E481: No range allowed"
+msgstr "E481: Amplekso nepermesebla"
 
-#~ msgid "Close tab"
-#~ msgstr "Fermi langeton"
+msgid "E36: Not enough room"
+msgstr "E36: Ne sufiĉe da spaco"
 
-#~ msgid "New tab"
-#~ msgstr "Nova langeto"
+#, c-format
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: neniu registrita servilo nomita \"%s\""
 
-#~ msgid "Open Tab..."
-#~ msgstr "Malfermi langeton..."
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: Ne eblas krei dosieron %s"
 
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim: Ĉefa fenestro neatendite detruiĝis\n"
+msgid "E483: Can't get temp file name"
+msgstr "E483: Ne eblas akiri provizoran dosiernomon"
 
-#~ msgid "&Filter"
-#~ msgstr "&Filtri"
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: Ne eblas malfermi dosieron %s"
 
-#~ msgid "&Cancel"
-#~ msgstr "&Rezigni"
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: Ne eblas legi dosieron %s"
 
-#~ msgid "Directories"
-#~ msgstr "Dosierujoj"
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: Neniu skribo de post lasta ŝanĝo (aldonu ! por transpasi)"
 
-#~ msgid "Filter"
-#~ msgstr "Filtri"
+msgid "E37: No write since last change"
+msgstr "E37: Neniu skribo de post lasta ŝanĝo"
 
-#~ msgid "&Help"
-#~ msgstr "&Helpo"
+msgid "E38: Null argument"
+msgstr "E38: Nula argumento"
 
-#~ msgid "Files"
-#~ msgstr "Dosieroj"
+msgid "E39: Number expected"
+msgstr "E39: Nombro atendita"
 
-#~ msgid "&OK"
-#~ msgstr "&Bone"
+#, c-format
+msgid "E40: Can't open errorfile %s"
+msgstr "E40: Ne eblas malfermi eraran dosieron %s"
 
-#~ msgid "Selection"
-#~ msgstr "Apartigo"
+msgid "E233: cannot open display"
+msgstr "E233: ne eblas malfermi vidigon"
 
-#~ msgid "Find &Next"
-#~ msgstr "Trovi &Sekvanta"
+msgid "E41: Out of memory!"
+msgstr "E41: Ne plu restas memoro!"
 
-#~ msgid "&Replace"
-#~ msgstr "&Anstataŭigi"
+msgid "Pattern not found"
+msgstr "Ŝablono ne trovita"
 
-#~ msgid "Replace &All"
-#~ msgstr "Anstataŭigi ĉi&on"
+#, c-format
+msgid "E486: Pattern not found: %s"
+msgstr "E486: Ŝablono ne trovita: %s"
 
-#~ msgid "&Undo"
-#~ msgstr "&Malfari"
+msgid "E487: Argument must be positive"
+msgstr "E487: La argumento devas esti pozitiva"
 
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: Ne eblas trovi titolon de fenestro \"%s\""
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: Ne eblas reiri al antaŭa dosierujo"
 
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: Ne subtenata argumento: \"-%s\"; Uzu la version OLE."
+msgid "E42: No Errors"
+msgstr "E42: Neniu eraro"
 
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: Ne eblas malfermi fenestron interne de aplikaĵo MDI"
+msgid "E776: No location list"
+msgstr "E776: Neniu listo de lokoj"
 
-#~ msgid "Open tab..."
-#~ msgstr "Malfermi langeton..."
+msgid "E43: Damaged match string"
+msgstr "E43: Difekta kongruenda ĉeno"
 
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "Trovi ĉenon (uzu '\\\\' por trovi '\\')"
+msgid "E44: Corrupted regexp program"
+msgstr "E44: Difekta programo de regulesprimo"
 
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "Trovi kaj anstataŭigi (uzu '\\\\' por trovi '\\')"
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: La opcio 'readonly' estas ŝaltita '(aldonu ! por transpasi)"
 
-#~ msgid "Not Used"
-#~ msgstr "Ne uzata"
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: Ne eblas ŝanĝi nurlegeblan variablon \"%s\""
 
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "Dosierujo\t*.nenio\n"
+#, c-format
+msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgstr "E794: Ne eblas agordi variablon en la sabloludejo: \"%s\""
 
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr ""
-#~ "Vim E458: Ne eblas disponigi rikordon de kolormapo, iuj koloroj estas "
-#~ "eble neĝustaj"
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Ne eblas uzi malplenan ŝlosilon de Vortaro"
 
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr "E250: Tiparoj de tiuj signaroj mankas en aro de tiparo %s:"
+msgid "E715: Dictionary required"
+msgstr "E715: Vortaro bezonata"
 
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: Nomo de tiparo: %s"
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: indekso de listo ekster limoj: %ld"
 
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "Tiparo '%s' ne estas egallarĝa"
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: Tro da argumentoj por funkcio: %s"
 
-#~ msgid "E253: Fontset name: %s\n"
-#~ msgstr "E253: Nomo de tiparo: %s\n"
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: Ŝlosilo malekzistas en Vortaro: %s"
 
-#~ msgid "Font0: %s\n"
-#~ msgstr "Font0: %s\n"
+msgid "E714: List required"
+msgstr "E714: Listo bezonata"
 
-#~ msgid "Font1: %s\n"
-#~ msgstr "Font1: %s\n"
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: Argumento de %s devas esti Listo aŭ Vortaro"
 
-#~ msgid "Font%<PRId64> width is not twice that of font0\n"
-#~ msgstr "Font%<PRId64> ne estas duoble pli larĝa ol font0\n"
+msgid "E47: Error while reading errorfile"
+msgstr "E47: Eraro dum legado de erardosiero"
 
-#~ msgid "Font0 width: %<PRId64>\n"
-#~ msgstr "Larĝo de font0: %<PRId64>\n"
+msgid "E48: Not allowed in sandbox"
+msgstr "E48: Nepermesebla en sabloludejo"
 
-#~ msgid ""
-#~ "Font1 width: %<PRId64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Larĝo de Font1: %<PRId64>\n"
-#~ "\n"
+msgid "E523: Not allowed here"
+msgstr "E523: Nepermesebla tie"
 
-#~ msgid "Invalid font specification"
-#~ msgstr "Nevalida tiparo specifita"
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: Reĝimo de ekrano ne subtenata"
 
-#~ msgid "&Dismiss"
-#~ msgstr "&Forlasi"
+msgid "E49: Invalid scroll size"
+msgstr "E49: Nevalida grando de rulumo"
 
-#~ msgid "no specific match"
-#~ msgstr "Neniu specifa kongruo"
+msgid "E91: 'shell' option is empty"
+msgstr "E91: La opcio 'shell' estas malplena"
 
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Vim - Elektilo de tiparo"
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: Ne eblis legi datumojn de simboloj!"
 
-#~ msgid "Name:"
-#~ msgstr "Nomo:"
+msgid "E72: Close error on swap file"
+msgstr "E72: Eraro dum malfermo de permutodosiero .swp"
 
-#~ msgid "Show size in Points"
-#~ msgstr "Montri grandon en punktoj"
+msgid "E73: tag stack empty"
+msgstr "E73: malplena stako de etikedo"
 
-#~ msgid "Encoding:"
-#~ msgstr "Kodoprezento:"
+msgid "E74: Command too complex"
+msgstr "E74: Komando tro kompleksa"
 
-#~ msgid "Font:"
-#~ msgstr "Tiparo:"
+msgid "E75: Name too long"
+msgstr "E75: Nomo tro longa"
 
-#~ msgid "Style:"
-#~ msgstr "Stilo:"
+msgid "E76: Too many ["
+msgstr "E76: Tro da ["
 
-#~ msgid "Size:"
-#~ msgstr "Grando:"
+msgid "E77: Too many file names"
+msgstr "E77: Tro da dosiernomoj"
 
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: ERARO en aŭtomato de korea alfabeto"
+msgid "E488: Trailing characters"
+msgstr "E488: Vostaj signoj"
 
-#~ msgid "E563: stat error"
-#~ msgstr "E563: Eraro de stat"
+msgid "E78: Unknown mark"
+msgstr "E78: Nekonata marko"
 
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: ne eblas malfermi datumbazon de cscope: %s"
+msgid "E79: Cannot expand wildcards"
+msgstr "E79: Ne eblas malvolvi ĵokerojn"
 
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: ne eblas akiri informojn pri la datumbazo de cscope"
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' ne rajtas esti malpli ol 'winminheight'"
 
-#~ msgid "Lua library cannot be loaded."
-#~ msgstr "La biblioteko Lua no ŝargeblis."
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' ne rajtas esti malpli ol 'winminwidth'"
 
-#~ msgid "cannot save undo information"
-#~ msgstr "ne eblas konservi informojn de malfaro"
+msgid "E80: Error while writing"
+msgstr "E80: Eraro dum skribado"
 
-#~ msgid ""
-#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
-#~ "be loaded."
-#~ msgstr ""
-#~ "E815: Bedaŭrinde, tiu komando estas malŝaltita, ne eblis ŝargi la "
-#~ "bibliotekojn."
+msgid "Zero count"
+msgstr "Nul kvantoro"
 
-#~ msgid "invalid expression"
-#~ msgstr "nevalida esprimo"
+msgid "E81: Using <SID> not in a script context"
+msgstr "E81: Uzo de <SID> ekster kunteksto de skripto"
 
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "esprimoj malŝaltitaj dum kompilado"
+msgid "E449: Invalid expression received"
+msgstr "E449: Nevalida esprimo ricevita"
 
-#~ msgid "hidden option"
-#~ msgstr "kaŝita opcio"
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: Regiono estas gardita, ne eblas ŝanĝi"
 
-#~ msgid "unknown option"
-#~ msgstr "nekonata opcio"
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans ne permesas ŝanĝojn en nurlegeblaj dosieroj"
 
-#~ msgid "window index is out of range"
-#~ msgstr "indekso de fenestro estas ekster limoj"
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: ŝablono uzas pli da memoro ol 'maxmempattern'"
 
-#~ msgid "couldn't open buffer"
-#~ msgstr "ne eblis malfermi bufron"
+msgid "E749: empty buffer"
+msgstr "E749: malplena bufro"
 
-#~ msgid "cannot delete line"
-#~ msgstr "ne eblas forviŝi linion"
+#, c-format
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: La bufro %ld ne ekzistas"
 
-#~ msgid "cannot replace line"
-#~ msgstr "ne eblas anstataŭigi linion"
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: Nevalida serĉa ŝablono aŭ disigilo"
 
-#~ msgid "cannot insert line"
-#~ msgstr "ne eblas enmeti linion"
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: Dosiero estas ŝargita en alia bufro"
 
-#~ msgid "string cannot contain newlines"
-#~ msgstr "ĉeno ne rajtas enhavi liniavancojn"
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: La opcio '%s' ne estas ŝaltita"
 
-#~ msgid "error converting Scheme values to Vim"
-#~ msgstr "eraro dum konverto de Scheme-valoro al Vim"
+msgid "E850: Invalid register name"
+msgstr "E850: Nevalida nomo de reĝistro"
 
-#~ msgid "Vim error: ~a"
-#~ msgstr "Eraro de Vim: ~a"
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: Dosierujo ne trovita en '%s': \"%s\""
 
-#~ msgid "Vim error"
-#~ msgstr "Eraro de Vim"
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "serĉo atingis SUPRON, daŭrigonte al SUBO"
 
-#~ msgid "buffer is invalid"
-#~ msgstr "bufro estas nevalida"
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "serĉo atingis SUBON, daŭrigonte al SUPRO"
 
-#~ msgid "window is invalid"
-#~ msgstr "fenestro estas nevalida"
+#, c-format
+msgid "Need encryption key for \"%s\""
+msgstr "Ŝlosilo de ĉifrado bezonata por \"%s\""
 
-#~ msgid "linenr out of range"
-#~ msgstr "numero de linio ekster limoj"
+msgid "empty keys are not allowed"
+msgstr "malplenaj ŝlosiloj nepermeseblaj"
 
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "nepermesebla en sabloludejo de Vim"
+msgid "dictionary is locked"
+msgstr "vortaro estas ŝlosita"
 
-#~ msgid "E836: This Vim cannot execute :python after using :py3"
-#~ msgstr "E836: Vim ne povas plenumi :python post uzo de :py3"
+msgid "list is locked"
+msgstr "listo estas ŝlosita"
 
-#~ msgid "only string keys are allowed"
-#~ msgstr "nur ĉenaj ŝlosiloj estas permeseblaj"
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "aldono de ŝlosilo '%s' al vortaro malsukcesis"
 
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E263: Bedaŭrinde tiu komando estas malŝaltita: la biblioteko de Pitono ne "
-#~ "ŝargeblis."
+#, c-format
+msgid "index must be int or slice, not %s"
+msgstr "indekso devas esti 'int' aŭ 'slice', ne %s"
 
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: Ne eblas alvoki Pitonon rekursie"
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "atendis aperon de str() aŭ unicode(), sed ricevis %s"
 
-#~ msgid "E837: This Vim cannot execute :py3 after using :python"
-#~ msgstr "E837: Vim ne povas plenumi :py3  post uzo de :python"
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "atendis aperon de bytes() aŭ str(), sed ricevis %s"
 
-#~ msgid "index must be int or slice"
-#~ msgstr "indekso devas esti 'int' aŭ 'slice'"
+#, c-format
+msgid ""
+"expected int(), long() or something supporting coercing to long(), but got %s"
+msgstr "atendis int(), long() aŭ ion konverteblan al long(), sed ricevis %s"
 
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr "E265: $_ devas esti apero de Ĉeno"
+#, c-format
+msgid "expected int() or something supporting coercing to int(), but got %s"
+msgstr "atendis int() aŭ ion konverteblan al int(), sed ricevis %s"
 
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E266: Bedaŭrinde tiu komando estas malŝaltita, la biblioteko Ruby ne "
-#~ "ŝargeblis."
+msgid "value is too large to fit into C int type"
+msgstr "valoro estas tro grada por C-tipo 'int'"
 
-#~ msgid "E267: unexpected return"
-#~ msgstr "E267: \"return\" neatendita"
+msgid "value is too small to fit into C int type"
+msgstr "valoro estas tro malgranda por C-tipo 'int'"
 
-#~ msgid "E268: unexpected next"
-#~ msgstr "E268: \"next\" neatendita"
+msgid "number must be greater than zero"
+msgstr "nombro devas esti pli granda ol nul"
 
-#~ msgid "E269: unexpected break"
-#~ msgstr "E269: \"break\" neatendita"
+msgid "number must be greater or equal to zero"
+msgstr "nombro devas esti egala aŭ pli granda ol nul"
 
-#~ msgid "E270: unexpected redo"
-#~ msgstr "E270: \"redo\" neatendita"
+msgid "can't delete OutputObject attributes"
+msgstr "ne eblas forviŝi atributojn de OutputObject"
 
-#~ msgid "E271: retry outside of rescue clause"
-#~ msgstr "E271: \"retry\" ekster klaŭzo \"rescue\""
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "nevalida atributo: %s"
 
-#~ msgid "E272: unhandled exception"
-#~ msgstr "E272: netraktita escepto"
+msgid "E264: Python: Error initialising I/O objects"
+msgstr "E264: Pitono: Eraro de pravalorizo de eneligaj objektoj"
 
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: nekonata stato de longjmp: %d"
+msgid "failed to change directory"
+msgstr "malsukcesis ŝanĝi dosierujon"
 
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "Baskuligi realigon/difinon"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got %s"
+msgstr "atendis 3-opon kiel rezulto de imp.find_module(), sed ricevis %s"
 
-#~ msgid "Show base class of"
-#~ msgstr "Vidigi bazan klason de"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr "atendis 3-opon kiel rezulto de imp.find_module(), sed ricevis %d-opon"
 
-#~ msgid "Show overridden member function"
-#~ msgstr "Montri anajn homonimigajn funkciojn"
+msgid "internal error: imp.find_module returned tuple with NULL"
+msgstr "interna eraro: imp.find_module liveris opon kun NULL"
 
-#~ msgid "Retrieve from file"
-#~ msgstr "Rekuperi el dosiero"
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "ne eblas forviŝi atributojn de 'vim.Dictionary'"
 
-#~ msgid "Retrieve from project"
-#~ msgstr "Rekuperi el projekto"
+msgid "cannot modify fixed dictionary"
+msgstr "ne eblas ŝanĝi fiksan vortaron"
 
-#~ msgid "Retrieve from all projects"
-#~ msgstr "Rekuperi de ĉiuj projektoj"
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "ne eblas agordi atributon %s"
 
-#~ msgid "Retrieve"
-#~ msgstr "Rekuperi"
+msgid "hashtab changed during iteration"
+msgstr "hakettabelo ŝanĝiĝis dum iteracio"
 
-#~ msgid "Show source of"
-#~ msgstr "Vidigi fonton de"
+#, c-format
+msgid "expected sequence element of size 2, but got sequence of size %d"
+msgstr "atendis 2-longan sekvencon, sed ricevis %d-longan sekvencon"
 
-#~ msgid "Find symbol"
-#~ msgstr "Trovi simbolon"
+msgid "list constructor does not accept keyword arguments"
+msgstr "konstruilo de listo ne akceptas ŝlosilvortajn argumentojn"
 
-#~ msgid "Browse class"
-#~ msgstr "Foliumi klasojn"
+msgid "list index out of range"
+msgstr "indekso de listo ekster limoj"
 
-#~ msgid "Show class in hierarchy"
-#~ msgstr "Montri klason en hierarkio"
+#. No more suitable format specifications in python-2.3
+#, c-format
+msgid "internal error: failed to get vim list item %d"
+msgstr "interna eraro: obteno de vim-a listero %d malsukcesis"
 
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "Montri klason en hierarkio restriktita"
+msgid "slice step cannot be zero"
+msgstr "paŝo de sekco ne povas esti nul"
 
-# todo
-#~ msgid "Xref refers to"
-#~ msgstr "Xref ligas al"
+#, c-format
+msgid "attempt to assign sequence of size greater than %d to extended slice"
+msgstr "provis valorizi sekvencon kun pli ol %d eroj en etendita sekco"
 
-#~ msgid "Xref referred by"
-#~ msgstr "Xref ligiĝas de"
+#, c-format
+msgid "internal error: no vim list item %d"
+msgstr "interna eraro: neniu vim-a listero %d"
 
-#~ msgid "Xref has a"
-#~ msgstr "Xref havas"
+msgid "internal error: not enough list items"
+msgstr "interna eraro: ne sufiĉaj listeroj"
 
-#~ msgid "Xref used by"
-#~ msgstr "Xref uzita de"
+msgid "internal error: failed to add item to list"
+msgstr "interna eraro: aldono de listero malsukcesis"
 
-# DP: mi ne certas pri kio temas
-#~ msgid "Show docu of"
-#~ msgstr "Vidigi dokumentaron de"
+#, c-format
+msgid "attempt to assign sequence of size %d to extended slice of size %d"
+msgstr "provis valorizi sekvencon kun %d eroj al etendita sekco kun %d eroj"
 
-#~ msgid "Generate docu for"
-#~ msgstr "Krei dokumentaron de"
+msgid "failed to add item to list"
+msgstr "aldono de listero malsukcesis"
 
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "Konekto al SNiFF+ neeblas. Kontrolu medion (sniffemacs trovendas en "
-#~ "$PATH).\n"
+msgid "cannot delete vim.List attributes"
+msgstr "ne eblas forviŝi atributojn de 'vim.List'"
 
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff: Eraro dum lego. Malkonektita"
+msgid "cannot modify fixed list"
+msgstr "ne eblas ŝanĝi fiksan liston"
 
-# DP: Tiuj 3 mesaĝoj estas kune
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "SNiFF+ estas aktuale "
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "sennoma funkcio %s ne ekzistas"
 
-#~ msgid "not "
-#~ msgstr "ne "
+#, c-format
+msgid "function %s does not exist"
+msgstr "funkcio %s ne ekzistas"
 
-#~ msgid "connected"
-#~ msgstr "konektita"
+#, c-format
+msgid "failed to run function %s"
+msgstr "malsukcesis ruli funkcion %s"
 
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: Nekonata peto de SNiFF+: %s"
+msgid "unable to get option value"
+msgstr "malsukcesis akiri valoron de opcio"
 
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: Eraro dum konekto al SNiFF+"
+msgid "internal error: unknown option type"
+msgstr "interna eraro: nekonata tipo de opcio"
 
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: SNiFF+ ne estas konektita"
+msgid "problem while switching windows"
+msgstr "problemo dum salto al vindozoj"
 
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: Ne estas bufro SNiFF+"
+#, c-format
+msgid "unable to unset global option %s"
+msgstr "ne povis malŝalti mallokan opcion %s"
 
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff: Eraro dum skribo. Malkonektita"
+#, c-format
+msgid "unable to unset option %s which does not have global value"
+msgstr "ne povis malŝalti opcion %s, kiu ne havas mallokan valoron"
 
-#~ msgid "invalid buffer number"
-#~ msgstr "nevalida numero de bufro"
+msgid "attempt to refer to deleted tab page"
+msgstr "provo de referenco al forviŝita langeto"
 
-#~ msgid "not implemented yet"
-#~ msgstr "ankoraŭ ne realigita"
+msgid "no such tab page"
+msgstr "ne estas tia langeto"
 
-#~ msgid "cannot set line(s)"
-#~ msgstr "ne eblas meti la linio(j)n"
+msgid "attempt to refer to deleted window"
+msgstr "provo de referenco al forviŝita fenestro"
 
-#~ msgid "invalid mark name"
-#~ msgstr "nevalida nomo de marko"
+msgid "readonly attribute: buffer"
+msgstr "nurlegebla atributo: buffer"
 
-#~ msgid "mark not set"
-#~ msgstr "marko ne estas metita"
+msgid "cursor position outside buffer"
+msgstr "kursoro poziciita ekster bufro"
 
-#~ msgid "row %d column %d"
-#~ msgstr "linio %d kolumno %d"
+msgid "no such window"
+msgstr "ne estas tia fenestro"
 
-#~ msgid "cannot insert/append line"
-#~ msgstr "ne eblas enmeti/postaldoni linion"
+msgid "attempt to refer to deleted buffer"
+msgstr "provo de referenco al forviŝita bufro"
 
-#~ msgid "line number out of range"
-#~ msgstr "numero de linio ekster limoj"
+msgid "failed to rename buffer"
+msgstr "malsukcesis renomi bufron"
 
-#~ msgid "unknown flag: "
-#~ msgstr "nekonata flago: "
+msgid "mark name must be a single character"
+msgstr "nomo de marko devas esti unuopa signo"
 
-# DP: ĉu traduki vimOption
-#~ msgid "unknown vimOption"
-#~ msgstr "nekonata vimOption"
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "atendis objekton vim.Buffer, sed ricevis %s"
 
-#~ msgid "keyboard interrupt"
-#~ msgstr "klavara interrompo"
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "salto al la bufro %d malsukcesis"
 
-#~ msgid "vim error"
-#~ msgstr "eraro de Vim"
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "atendis objekton vim.window, sed ricevis %s"
 
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr ""
-#~ "ne eblas krei komandon de bufro/fenestro: objekto estas forviŝiĝanta"
+msgid "failed to find window in the current tab page"
+msgstr "malsukcesis trovi vindozon en la nuna langeto"
 
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr ""
-#~ "ne eblas registri postalvokan komandon: bufro/fenestro estas jam "
-#~ "forviŝiĝanta"
+msgid "did not switch to the specified window"
+msgstr "ne saltis al la specifita vindozo"
 
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr ""
-#~ "E280: NERIPAREBLA TCL-ERARO: reflist difekta!? Bv. retpoŝti al vim-"
-#~ "dev@vim.org"
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "atendis objekton vim.TabPage, sed ricevis %s"
 
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr ""
-#~ "ne eblas registri postalvokan komandon: referenco de bufro/fenestro ne "
-#~ "troveblas"
+msgid "did not switch to the specified tab page"
+msgstr "ne saltis al la specifita langeto"
 
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E571: Bedaŭrinde tiu komando estas malŝaltita: la biblioteko Tcl ne "
-#~ "ŝargeblis."
+msgid "failed to run the code"
+msgstr "malsukcesis ruli la kodon"
 
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: elira kodo %d"
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: Eval ne revenis kun valida python-objekto"
 
-#~ msgid "cannot get line"
-#~ msgstr "ne eblas akiri linion"
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: Konverto de revena python-objekto al vim-valoro malsukcesis"
 
-#~ msgid "Unable to register a command server name"
-#~ msgstr "Ne eblas registri nomon de komanda servilo"
+#, c-format
+msgid "unable to convert %s to vim dictionary"
+msgstr "ne povis konverti %s al vim-vortaro"
 
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: Sendo de komando al cela programo fiaskis"
+#, c-format
+msgid "unable to convert %s to vim list"
+msgstr "ne povis konverti %s al vim-listo"
 
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: Nevalida identigilo de servilo uzita: %s"
+#, c-format
+msgid "unable to convert %s to vim structure"
+msgstr "ne povis konverti %s al vim-strukturo"
 
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr ""
-#~ "E251: Ecoj de registro de apero de VIM estas nevalide formata. Forviŝita!"
+msgid "internal error: NULL reference passed"
+msgstr "interna eraro: NULL-referenco argumento"
 
-#~ msgid "netbeans is not supported with this GUI\n"
-#~ msgstr "netbeans ne estas subtenata kun tiu grafika interfaco\n"
+msgid "internal error: invalid value type"
+msgstr "interna eraro: nevalida tipo de valoro"
 
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "Tiu Vim ne estis kompilita kun la kompara eblo."
+msgid ""
+"Failed to set path hook: sys.path_hooks is not a list\n"
+"You should now do the following:\n"
+"- append vim.path_hook to sys.path_hooks\n"
+"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgstr ""
+"Valorizo de sys.path_hooks malsukcesis: sys.path_hooks ne estas listo\n"
+"Vi nun devas fari tion:\n"
+"- postaldoni vim.path_hook al sys.path_hooks\n"
+"- postaldoni vim.VIM_SPECIAL_PATH al sys.path\n"
 
-#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
-#~ msgstr "'-nb' ne uzeblas: malŝaltita dum kompilado\n"
-
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim: Eraro: Fiaskis lanĉi gvim el NetBeans\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Where case is ignored prepend / to make flag upper case"
-#~ msgstr ""
-#~ "\n"
-#~ "Kie uskleco estas ignorita antaŭaldonu / por igi flagon majuskla"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\tRegistri tiun gvim al OLE"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\tMalregistri gvim de OLE"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\tRuli per grafika interfaco (kiel \"gvim\")"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr "-f  aŭ  --nofork\tMalfono: ne forki kiam lanĉas grafikan interfacon"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\tNe uzi newcli por malfermi fenestrojn"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <aparatdosiero>\t\tUzi <aparatdosiero>-n por eneligo"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\t\tUzi <gvimrc> anstataŭ iun ajn .gvimrc"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\tRedakti ĉifradan dosieron"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <ekrano>\tKonekti Vim al tiu X-servilo"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\tNe konekti al X-servilo"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr "--remote <dosieroj>\tRedakti <dosieroj>-n en Vim-servilo se eblas"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-silent <dosieroj>  Same, sed ne plendi se ne estas servilo"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr ""
-#~ "--remote-wait <dosieroj>  Kiel --remote sed atendi ĝis dosieroj estas "
-#~ "redaktitaj"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-wait-silent <dosieroj> Same, sed ne plendi se ne estas servilo"
-
-#~ msgid ""
-#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
-#~ "file"
-#~ msgstr ""
-#~ "--remote-tab[-wait][-silent] <dosieroj> Kiel --remote sed uzi langeton "
-#~ "por ĉiu dosiero"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr "--remote-send <klavoj> Sendi <klavoj>-n al Vim-servilo kaj eliri"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr ""
-#~ "--remote-expr <espr>\tKomputi <espr> en Vim-servilo kaj afiŝi rezulton"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr "--serverlist\t\tListigi haveblajn nomojn de Vim-serviloj kaj eliri"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <nomo>\tSendu al/iĝi la Vim-servilo <nomo>"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumentoj agnoskitaj de gvim (versio Motif):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumentoj agnoskitaj de gvim (versio neXtaw):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumentoj agnoskitaj de gvim (versio Athena):\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <ekrano>\tLanĉi vim sur <ekrano>"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\tLanĉi vim piktograme"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr ""
-#~ "-background <koloro>\tUzi <koloro>-n por la fona koloro (ankaŭ: -bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr ""
-#~ "-foreground <koloro>\tUzi <koloro>-n por la malfona koloro (ankaŭ: -fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr "-font <tiparo>\tUzi <tiparo>-n por normala teksto (ankaŭ: -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <tiparo>\tUzi <tiparo>-n por grasa teksto"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <tiparo>\tUzi <tiparo>-n por kursiva teksto"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr "-geometry <geom>\tUzi <geom> kiel komenca geometrio (ankaŭ: -geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr ""
-#~ "-borderwidth <larĝo>\tUzi <larĝo>-n kiel larĝo de bordero (ankaŭ: -bw)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr ""
-#~ "-scrollbarwidth <larĝo>  Uzi <larĝo>-n kiel larĝo de rulumskalo (ankaŭ: -"
-#~ "sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr ""
-#~ "-menuheight <alto>\tUzi <alto>-n kiel alto de menuzona alto (ankaŭ: -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\tUzi inversan videon (ankaŭ: -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\tNe uzi inversan videon (ankaŭ: +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <rimedo>\tAgordi la specifitan <rimedo>-n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Argumentoj agnoskitaj de gvim (versio GTK+):\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr "-display <ekrano>\tLanĉi Vim sur tiu <ekrano> (ankaŭ: --display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr "--role <rolo>\tDoni unikan rolon por identigi la ĉefan fenestron"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\tMalfermi Vim en alia GTK fenestraĵo"
-
-#~ msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
-#~ msgstr "--echo-wid\t\tIgas gvim afiŝi la identigilon de vindozo sur stdout"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <gepatra titolo>\tMalfermi Vim en gepatra aplikaĵo"
-
-#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-#~ msgstr "--windowid <HWND>\tMalfermi Vim en alia win32 fenestraĵo"
-
-#~ msgid "No display"
-#~ msgstr "Neniu ekrano"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr ": Sendo fiaskis.\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": Sendo fiaskis. Provo de loka plenumo\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "%d de %d redaktita(j)"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "Neniu ekrano: Sendado de esprimo fiaskis.\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": Sendado de esprimo fiaskis.\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: Nevalida kodpaĝo"
-
-#~ msgid "E284: Cannot set IC values"
-#~ msgstr "E284: Ne eblas agordi valorojn de IC"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: Ne eblis krei enigan kuntekston"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: Ne eblis malfermi enigan metodon"
-
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr "E287: Averto: Ne eblis agordi detruan reagfunkcion al IM"
-
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: eniga metodo subtenas neniun stilon"
-
-# DP: mi ne scias, kio estas "preedit"
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr "E289: eniga metodo ne subtenas mian antaŭredaktan tipon"
-
-#~ msgid "E843: Error while updating swap file crypt"
-#~ msgstr "E843: Eraro dum ĝisdatigo de ĉifrada permutodosiero .swp"
-
-#~ msgid ""
-#~ "E833: %s is encrypted and this version of Vim does not support encryption"
-#~ msgstr "E833: %s estas ĉifrata kaj tiu versio de Vim ne subtenas ĉifradon"
-
-#~ msgid "Swap file is encrypted: \"%s\""
-#~ msgstr "Perumutodosiero .swp estas ĉifrata: \"%s\""
-
-#~ msgid ""
-#~ "\n"
-#~ "If you entered a new crypt key but did not write the text file,"
-#~ msgstr ""
-#~ "\n"
-#~ "Se vi tajpis novan ŝlosilon de ĉifrado sed ne skribis la tekstan dosieron,"
-
-#~ msgid ""
-#~ "\n"
-#~ "enter the new crypt key."
-#~ msgstr ""
-#~ "\n"
-#~ "tajpu la novan ŝlosilon de ĉifrado."
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wrote the text file after changing the crypt key press enter"
-#~ msgstr ""
-#~ "\n"
-#~ "Se vi skribis la tekstan dosieron post ŝanĝo de la ŝlosilo de ĉifrado, "
-#~ "premu enenklavon"
-
-#~ msgid ""
-#~ "\n"
-#~ "to use the same key for text file and swap file"
-#~ msgstr ""
-#~ "\n"
-#~ "por uzi la saman ŝlosilon por la teksta dosiero kaj permuto dosiero .swp"
-
-#~ msgid "Using crypt key from swap file for the text file.\n"
-#~ msgstr ""
-#~ "Uzas ŝlosilon de ĉifrado el permuto dosiero .swp por la teksta dosiero.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [ne uzebla per tiu versio de Vim]"
-
-#~ msgid "Tear off this menu"
-#~ msgstr "Disigi tiun menuon"
-
-#~ msgid "Select Directory dialog"
-#~ msgstr "Dialogujo de dosiera elekto"
-
-#~ msgid "Save File dialog"
-#~ msgstr "Dialogujo de dosiera konservo"
-
-#~ msgid "Open File dialog"
-#~ msgstr "Dialogujo de dosiera malfermo"
-
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr "E338: Bedaŭrinde ne estas dosierfoliumilo en konzola reĝimo"
-
-#~ msgid "Vim: preserving files...\n"
-#~ msgstr "Vim: konservo de dosieroj...\n"
-
-#~ msgid "Vim: Finished.\n"
-#~ msgstr "Vim: Finita.\n"
-
-#~ msgid "ERROR: "
-#~ msgstr "ERARO: "
-
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[bajtoj] totalaj disponigitaj/maldisponigitaj %<PRIu64>-%<PRIu64>, nun "
-#~ "uzataj %<PRIu64>, kulmina uzo %<PRIu64>\n"
-
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[alvokoj] totalaj re/malloc() %<PRIu64>, totalaj free() %<PRIu64>\n"
-#~ "\n"
-
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: Linio iĝas tro longa"
-
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: Interna eraro: lalloc(%<PRId64>, )"
-
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: Nevalida formo de muskursoro"
-
-#~ msgid "Enter encryption key: "
-#~ msgstr "Tajpu la ŝlosilon de ĉifrado: "
-
-#~ msgid "Enter same key again: "
-#~ msgstr "Tajpu la ŝlosilon denove: "
-
-#~ msgid "Keys don't match!"
-#~ msgstr "Ŝlosiloj ne kongruas!"
-
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "Ne eblas konekti al Netbeans n-ro 2"
-
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "Ne eblas konekti al Netbeans"
-
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
-#~ "E668: Nevalida permeso de dosiero de informo de konekto NetBeans: \"%s\""
-
-#~ msgid "read from Netbeans socket"
-#~ msgstr "lego el kontaktoskatolo de Netbeans"
-
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: Konekto de NetBeans perdita por bufro %<PRId64>"
-
-#~ msgid "E838: netbeans is not supported with this GUI"
-#~ msgstr "E838: netbeans ne estas subtenata kun tiu grafika interfaco"
-
-#~ msgid "E511: netbeans already connected"
-#~ msgstr "E511: nebeans jam konektata"
-
-#~ msgid "E505: %s is read-only (add ! to override)"
-#~ msgstr "E505: %s estas nurlegebla (aldonu ! por transpasi)"
-
-# DP: ĉu Eval devas esti tradukita?
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: Eval eblo ne disponeblas"
-
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "malokupas %<PRId64> liniojn"
-
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: term ne ŝanĝeblas en grafika interfaco"
-
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: Uzu \":gui\" por lanĉi la grafikan interfacon"
-
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: Ne ŝanĝeblas en la grafika interfaco GTK+ 2"
-
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: Nevalida(j) tiparo(j)"
-
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: ne eblas elekti tiparon"
-
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: Nevalida tiparo"
-
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: ne eblas elekti larĝan tiparon"
-
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: Nevalida larĝa tiparo"
-
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: Neniu muso subtenata"
-
-#~ msgid "cannot open "
-#~ msgstr "ne eblas malfermi "
-
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM: Ne eblas malfermi fenestron!\n"
-
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "Bezonas version 2.04 de Amigados aŭ pli novan\n"
-
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "Bezonas %s-on versio %<PRId64>\n"
-
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "Ne eblas malfermi NIL:\n"
-
-#~ msgid "Cannot create "
-#~ msgstr "Ne eblas krei "
-
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vim eliras kun %d\n"
-
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "ne eblas ŝanĝi reĝimon de konzolo?!\n"
-
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: ne estas konzolo??\n"
-
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: Ne eblas plenumi ŝelon kun opcio -f"
-
-#~ msgid "Cannot execute "
-#~ msgstr "Ne eblas plenumi "
-
-#~ msgid "shell "
-#~ msgstr "ŝelo "
-
-#~ msgid " returned\n"
-#~ msgstr " liveris\n"
-
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE tro malgranda."
-
-#~ msgid "I/O ERROR"
-#~ msgstr "ERARO DE ENIGO/ELIGO"
-
-#~ msgid "Message"
-#~ msgstr "Mesaĝo"
-
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr "'columns' ne estas 80, ne eblas plenumi eksternajn komandojn"
-
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: Elekto de presilo fiaskis"
-
-#~ msgid "to %s on %s"
-#~ msgstr "al %s de %s"
-
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: Nekonata tiparo de presilo: %s"
-
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: Eraro de presado: %s"
-
-#~ msgid "Printing '%s'"
-#~ msgstr "Presas '%s'"
-
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr "E244: Nevalida nomo de signaro \"%s\" en nomo de tiparo \"%s\""
-
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: Nevalida signo '%c' en nomo de tiparo \"%s\""
-
-#~ msgid "Vim: Double signal, exiting\n"
-#~ msgstr "Vim: Duobla signalo, eliranta\n"
-
-#~ msgid "Vim: Caught deadly signal %s\n"
-#~ msgstr "Vim: Kaptis mortigantan signalon %s\n"
-
-#~ msgid "Vim: Caught deadly signal\n"
-#~ msgstr "Vim: Kaptis mortigantan signalon\n"
-
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "Malfermo de vidigo X daŭris %<PRId64> msek"
-
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim: Alvenis X eraro\n"
-
-#~ msgid "Testing the X display failed"
-#~ msgstr "Testo de la vidigo X fiaskis"
-
-#~ msgid "Opening the X display timed out"
-#~ msgstr "Tempolimo okazis dum malfermo de vidigo X"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ne eblas plenumi ŝelon sh\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ne eblas krei duktojn\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ne eblas forki\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Komando terminigita\n"
-
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP perdis la konekton ICE"
-
-#~ msgid "Opening the X display failed"
-#~ msgstr "Malfermo de vidigo X fiaskis"
-
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP: traktado de peto konservi-mem"
-
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP: malfermo de konekto"
-
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "XSMP: kontrolo de konekto ICE fiaskis"
-
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP: SmcOpenConnection fiaskis: %s"
-
-#~ msgid "At line"
-#~ msgstr "Ĉe linio"
-
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "Ne eblis ŝargi vim32.dll!"
-
-#~ msgid "VIM Error"
-#~ msgstr "Eraro de VIM"
-
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "Ne eblis ripari referencojn de funkcioj al la DLL!"
-
-#~ msgid "shell returned %d"
-#~ msgstr "la ŝelo liveris %d"
-
-# DP: la eventoj estas tiuj, kiuj estas en la sekvantaj ĉenoj
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim: Kaptis eventon %s\n"
-
-#~ msgid "close"
-#~ msgstr "fermo"
-
-#~ msgid "logoff"
-#~ msgstr "elsaluto"
-
-#~ msgid "shutdown"
-#~ msgstr "sistemfermo"
-
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: Netrovebla komando"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "VIMRUN.EXE ne troveblas en via $PATH.\n"
-#~ "Eksteraj komandoj ne paŭzos post kompletigo.\n"
-#~ "Vidu  :help win32-vimrun  por pliaj informoj."
-
-#~ msgid "Vim Warning"
-#~ msgstr "Averto de Vim"
-
-#~ msgid "Error file"
-#~ msgstr "Erara Dosiero"
-
-#~ msgid "E868: Error building NFA with equivalence class!"
-#~ msgstr "E868: Eraro dum prekomputado de NFA kun ekvivalentoklaso!"
-
-#~ msgid "E999: (NFA regexp internal error) Should not process NOT node !"
-#~ msgstr ""
-#~ "E999: (interna eraro de NFA-regulesprimo) Ne devus procezi nodon 'NOT'!"
-
-#~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
-#~ msgstr "E878: (NFA) Ne povis asigni memoron por traigi branĉojn!"
-
-#~ msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-#~ msgstr "Averto: Ne eblas trovi vortliston \"%s_%s.spl\" aŭ \"%s_ascii.spl\""
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "Konverto en %s nesubtenata"
-
-#~ msgid "E845: Insufficient memory, word list will be incomplete"
-#~ msgstr "E845: Ne sufiĉe da memoro, vortlisto estos nekompleta."
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: Vojo de etikeda dosiero trunkita por %s\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "nova ŝelo lanĉita\n"
-
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "Uzis CUT_BUFFER0 anstataŭ malplenan apartigon"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "Malfaro neebla; daŭrigi tamene"
-
-#~ msgid "E832: Non-encrypted file has encrypted undo file: %s"
-#~ msgstr "E832: Ne ĉifrata dosiero havas ĉifratan malfaran dosieron: %s"
-
-#~ msgid "E826: Undo file decryption failed: %s"
-#~ msgstr "E826: Malĉifrado de malfara dosiero fiaskis: %s"
-
-#~ msgid "E827: Undo file is encrypted: %s"
-#~ msgstr "E827: Malfara dosiero estas ĉifrata: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "Grafika versio MS-Vindozo 16/32-bitoj"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "Grafika versio MS-Vindozo 64-bitoj"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "Grafika versio MS-Vindozo 32-bitoj"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " en reĝimo Win32s"
-
-#~ msgid " with OLE support"
-#~ msgstr " kun subteno de OLE"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio konzola MS-Vindozo 64-bitoj"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio konzola MS-Vindozo 32-bitoj"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio MS-Vindozo 16-bitoj"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio MS-DOS 32-bitoj"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio MS-DOS 16-bitoj"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio Mak OS X (unikso)"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio Mak OS X"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio Mak OS"
-
-#~ msgid ""
-#~ "\n"
-#~ "OpenVMS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Versio OpenVMS"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "Granda versio "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "Normala versio "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "Malgranda versio "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "Malgrandega versio "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "kun grafika interfaco GTK2-GNOME."
-
-#~ msgid "with GTK2 GUI."
-#~ msgstr "kun grafika interfaco GTK2."
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "kun grafika interfaco X11-Motif."
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "kun grafika interfaco X11-neXtaw."
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "kun grafika interfaco X11-Athena."
-
-#~ msgid "with Photon GUI."
-#~ msgstr "kun grafika interfaco Photon."
-
-#~ msgid "with GUI."
-#~ msgstr "sen grafika interfaco."
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "kun grafika interfaco Carbon."
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "kun grafika interfaco Cocoa."
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "kun (klasika) grafika interfaco."
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "         sistema dosiero gvimrc: \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "       dosiero gvimrc de uzanto: \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "   2-a dosiero gvimrc de uzanto: \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "   3-a dosiero gvimrc de uzanto: \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr "       dosiero de sistema menuo: \""
-
-#~ msgid "Compiler: "
-#~ msgstr "Kompililo: "
-
-# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "menuo  Help->Orfinoj              por pliaj informoj   "
-
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "Ruliĝas senreĝime, tajpita teksto estas enmetita"
-
-# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "menuo Redakti->Mallokaj Agordoj->Baskuligi Enmetan Reĝimon"
-
-# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#~ msgid "                              for two modes      "
-#~ msgstr "                                  por du reĝimoj       "
-
-# DP: tiu ĉeno pli longas (mi ne volas igi ĉiujn aliajn ĉenojn
-#     pli longajn)
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr "menuo Redakti->Mallokaj Agordoj->Baskuligi Reĝimon Kongruan kun Vi"
-
-# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "                                  por defaŭltoj de Vim "
-
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "AVERTO: Trovis Vindozon 95/98/ME"
-
-# DP: atentu al la spacetoj: ĉiuj ĉenoj devas havi la saman longon
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr "tajpu  :help windows95<Enenklavo> por pliaj informoj   "
-
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: Ne eblis ŝargi bibliotekon %s"
-
-#~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr ""
-#~ "Bedaŭrinde tiu komando estas malŝaltita: la biblioteko de Perl ne "
-#~ "ŝargeblis."
-
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr ""
-#~ "E299: Plenumo de Perl esprimoj malpermesata en sabloludejo sen la modulo "
-#~ "Safe"
-
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "Redakti per &pluraj Vim-oj"
-
-#~ msgid "Edit with single &Vim"
-#~ msgstr "Redakti per unuopa &Vim"
-
-#~ msgid "Diff with Vim"
-#~ msgstr "Kompari per Vim"
-
-#~ msgid "Edit with &Vim"
-#~ msgstr "Redakti per &Vim"
-
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "Redakti per ekzistanta Vim - "
-
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "Redakti la apartigita(j)n dosiero(j)n per Vim"
-
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr "Eraro dum kreo de procezo: Kontrolu ĉu gvim estas en via serĉvojo!"
-
-#~ msgid "gvimext.dll error"
-#~ msgstr "Eraro de gvimext.dll"
-
-#~ msgid "Path length too long!"
-#~ msgstr "Serĉvojo estas tro longa!"
-
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: Nekonata familio de tiparo: %s"
-
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: Nekonata tiparo: %s"
-
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: La tiparo \"%s\" ne estas egallarĝa"
-
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: Ne eblis ŝargi bibliotekan funkcion %s"
-
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr "E26: La hebrea ne uzeblas: Malŝaltita dum kompilado\n"
-
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: La persa ne uzeblas: Malŝaltita dum kompilado\n"
-
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr "E800: La araba ne uzeblas: Malŝaltita dum kompilado\n"
-
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: neniu registrita servilo nomita \"%s\""
-
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: ne eblas malfermi vidigon"
-
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: Nevalida esprimo ricevita"
-
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: Regiono estas gardita, ne eblas ŝanĝi"
-
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr "E744: NetBeans ne permesas ŝanĝojn en nurlegeblaj dosieroj"
-
-#~ msgid "Need encryption key for \"%s\""
-#~ msgstr "Ŝlosilo de ĉifrado bezonata por \"%s\""
-
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "ne eblas forviŝi atributojn de OutputObject"
-
-#~ msgid "softspace must be an integer"
-#~ msgstr "malmolspaceto (softspace) devas esti entjero"
-
-#~ msgid "invalid attribute"
-#~ msgstr "nevalida atributo"
-
-#~ msgid "writelines() requires list of strings"
-#~ msgstr "writelines() bezonas liston de ĉenoj"
-
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Pitono: Eraro de pravalorizo de eneligaj objektoj"
-
-#~ msgid "empty keys are not allowed"
-#~ msgstr "malplenaj ŝlosiloj nepermeseblaj"
-
-#~ msgid "Cannot delete DictionaryObject attributes"
-#~ msgstr "ne eblas forviŝi atributojn de DictionaryObject"
-
-#~ msgid "Cannot modify fixed dictionary"
-#~ msgstr "Ne eblas ŝanĝi fiksan vortaron"
-
-#~ msgid "Cannot set this attribute"
-#~ msgstr "Ne eblas agordi tiun atributon"
-
-#~ msgid "dict is locked"
-#~ msgstr "vortaro estas ŝlosita"
-
-#~ msgid "failed to add key to dictionary"
-#~ msgstr "aldono de ŝlosilo al vortaro fiaskis"
-
-#~ msgid "list index out of range"
-#~ msgstr "indekso de listo ekster limoj"
-
-#~ msgid "internal error: failed to get vim list item"
-#~ msgstr "interna eraro: obteno de vim-a listero fiaskis"
-
-#~ msgid "list is locked"
-#~ msgstr "listo estas ŝlosita"
-
-#~ msgid "Failed to add item to list"
-#~ msgstr "Aldono de listero fiaskis"
-
-#~ msgid "can only assign lists to slice"
-#~ msgstr "nur eblas pravalorizi listojn al segmento"
-
-#~ msgid "internal error: failed to add item to list"
-#~ msgstr "interna eraro: aldono de listero fiaskis"
-
-#~ msgid "can only concatenate with lists"
-#~ msgstr "eblas nur kunmeti kun listoj"
-
-#~ msgid "cannot delete vim.dictionary attributes"
-#~ msgstr "ne eblas forviŝi atributojn de 'vim.dictionary'"
-
-#~ msgid "cannot modify fixed list"
-#~ msgstr "ne eblas ŝanĝi fiksan liston"
-
-#~ msgid "cannot set this attribute"
-#~ msgstr "ne eblas agordi tiun atributon"
-
-#~ msgid "'self' argument must be a dictionary"
-#~ msgstr "argumento 'self' devas esti vortaro"
-
-#~ msgid "failed to run function"
-#~ msgstr "fiaskis ruli funkcion"
-
-#~ msgid "unable to unset global option"
-#~ msgstr "ne povis malŝalti mallokan opcion"
-
-#~ msgid "unable to unset option without global value"
-#~ msgstr "ne povis malŝalti opcion sen malloka valoro"
-
-#~ msgid "object must be integer"
-#~ msgstr "objekto devas esti entjero."
-
-#~ msgid "object must be string"
-#~ msgstr "objekto devas esti ĉeno"
-
-#~ msgid "attempt to refer to deleted tab page"
-#~ msgstr "provo de referenco al forviŝita langeto"
-
-#~ msgid "<tabpage object (deleted) at %p>"
-#~ msgstr "<langeta objekto (forviŝita) ĉe %p>"
-
-#~ msgid "<tabpage object (unknown) at %p>"
-#~ msgstr "<langeta objekto (nekonata) ĉe %p>"
-
-#~ msgid "<tabpage %d>"
-#~ msgstr "<langeto %d>"
-
-#~ msgid "no such tab page"
-#~ msgstr "ne estas tia langeto"
-
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "provo de referenco al forviŝita fenestro"
-
-#~ msgid "readonly attribute"
-#~ msgstr "nurlegebla atributo"
-
-#~ msgid "cursor position outside buffer"
-#~ msgstr "kursoro poziciita ekster bufro"
-
-#~ msgid "<window object (deleted) at %p>"
-#~ msgstr "<fenestra objekto (forviŝita) ĉe %p>"
-
-#~ msgid "<window object (unknown) at %p>"
-#~ msgstr "<objekta fenestro (nekonata) ĉe %p>"
-
-#~ msgid "<window %d>"
-#~ msgstr "<fenestro %d>"
-
-#~ msgid "no such window"
-#~ msgstr "ne estas tia fenestro"
-
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "provo de referenco al forviŝita bufro"
-
-#~ msgid "<buffer object (deleted) at %p>"
-#~ msgstr "<bufra objekto (forviŝita) ĉe %p>"
-
-#~ msgid "key must be integer"
-#~ msgstr "ŝlosilo devas esti entjero."
-
-#~ msgid "expected vim.buffer object"
-#~ msgstr "atendis objekton vim.buffer"
-
-#~ msgid "failed to switch to given buffer"
-#~ msgstr "ne povis salti al la specifita bufro"
-
-#~ msgid "expected vim.window object"
-#~ msgstr "atendis objekton vim.window"
-
-#~ msgid "failed to find window in the current tab page"
-#~ msgstr "ne povis trovi vindozon en la nuna langeto"
-
-#~ msgid "did not switch to the specified window"
-#~ msgstr "ne saltis al la specifita vindozo"
-
-#~ msgid "expected vim.tabpage object"
-#~ msgstr "atendis objekton vim.tabpage"
-
-#~ msgid "did not switch to the specified tab page"
-#~ msgstr "ne saltis al la specifita langeto"
-
-#~ msgid "failed to run the code"
-#~ msgstr "fiaskis ruli la kodon"
-
-#~ msgid "E858: Eval did not return a valid python object"
-#~ msgstr "E858: Eval ne revenis kun valida python-objekto"
-
-#~ msgid "E859: Failed to convert returned python object to vim value"
-#~ msgstr "E859: Konverto de revena python-objekto al vim-valoro fiaskis"
-
-#~ msgid "unable to convert to vim structure"
-#~ msgstr "ne povis konverti al vim-strukturo"
-
-#~ msgid "NULL reference passed"
-#~ msgstr "NULL-referenco argumento"
-
-#~ msgid "internal error: invalid value type"
-#~ msgstr "interna eraro: nevalida tipo de valoro"
-
-#~ msgid "E863: return value must be an instance of str"
-#~ msgstr "E863: elira valoro devas esti apero de str"
-
-#~ msgid "E860: Eval did not return a valid python 3 object"
-#~ msgstr "E860: Eval ne revenis kun valida python3-objekto"
-
-#~ msgid "E861: Failed to convert returned python 3 object to vim value"
-#~ msgstr "E861: Konverto de revena python3-objekto al vim-valoro fiaskis"
-
-#~ msgid "Only boolean objects are allowed"
-#~ msgstr "Nur buleaj objektoj estas permeseblaj"
-
-#~ msgid "no such key in dictionary"
-#~ msgstr "tiu ŝlosilo ne ekzistas en vortaro"
+msgid ""
+"Failed to set path: sys.path is not a list\n"
+"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgstr ""
+"Agordo de serĉvojo malsukcesis: sys.path ne estas listo\n"
+"Vi nun devas aldoni vim.VIM_SPECIAL_PATH al sys.path"
diff --git a/src/nvim/po/fr.po b/src/nvim/po/fr.po
index 4b1b0476ca..c0df5f2170 100644
--- a/src/nvim/po/fr.po
+++ b/src/nvim/po/fr.po
@@ -1,3 +1,4 @@
+
 # French Translation for Vim
 #
 # Do ":help uganda"  in Vim to read copying and usage conditions.
@@ -6,7 +7,7 @@
 #  FIRST AUTHOR  DindinX         <David.Odin@bigfoot.com>     2000.
 # SECOND AUTHOR  Adrien Beau     <version.francaise@free.fr>  2002, 2003.
 #  THIRD AUTHOR  David Blanchet  <david.blanchet@free.fr>     2006, 2008.
-# FOURTH AUTHOR  Dominique Pell� <dominique.pelle@gmail.com>  2008, 2015.
+# FOURTH AUTHOR  Dominique Pell� <dominique.pelle@gmail.com>  2008, 2017.
 #
 # Latest translation available at:
 #   http://dominique.pelle.free.fr/vim-fr.php
@@ -15,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim(Fran�ais)\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-08-26 20:54+0200\n"
-"PO-Revision-Date: 2016-08-26 20:34+0200\n"
+"POT-Creation-Date: 2017-01-16 00:30+0100\n"
+"PO-Revision-Date: 2017-01-16 00:51+0100\n"
 "Last-Translator: Dominique Pell� <dominique.pelle@gmail.com>\n"
 "Language-Team: \n"
 "Language: fr\n"
@@ -24,13 +25,20 @@ msgstr ""
 "Content-Type: text/plain; charset=ISO_8859-15\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#, fuzzy
-#~ msgid "Unable to get option value"
-#~ msgstr "impossible d'obtenir la valeur d'une option"
+msgid "E831: bf_key_init() called with empty password"
+msgstr "E831: bf_key_init() appel�e avec un mot de passe vide"
 
-#, fuzzy
-#~ msgid "internal error: unknown option type"
-#~ msgstr "erreur interne : pas d'�l�ment de liste vim"
+msgid "E820: sizeof(uint32_t) != 4"
+msgstr "E820: sizeof(uint32_t) != 4"
+
+msgid "E817: Blowfish big/little endian use wrong"
+msgstr "E817: petit/gros boutisme incorrect dans blowfish"
+
+msgid "E818: sha256 test failed"
+msgstr "E818: le test de sha256 a �chou�"
+
+msgid "E819: Blowfish test failed"
+msgstr "E819: le test de blowfish a �chou�"
 
 # DB - TODO : Trouver une traduction valable et attest�e pour "location".
 msgid "[Location List]"
@@ -56,6 +64,9 @@ msgstr ""
 msgid "E931: Buffer cannot be registered"
 msgstr "E931: Le tampon ne peut pas �tre enregistr�"
 
+msgid "E937: Attempt to delete a buffer that is in use"
+msgstr "E937: Tentative de suppression d'un tampon en cours d'utilisation"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: Aucun tampon n'a �t� d�charg�"
 
@@ -106,20 +117,18 @@ msgid "E88: Cannot go before first buffer"
 msgstr "E88: Impossible d'aller avant le premier tampon"
 
 #, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr ""
-"E89: Le tampon %<PRId64> n'a pas �t� enregistr� (ajoutez ! pour passer outre)"
+"E89: Le tampon %ld n'a pas �t� enregistr� (ajoutez ! pour passer outre)"
 
-#. wrap around (may cause duplicates)
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Alerte : La liste des noms de fichier d�borde"
 
 # AB - Vu le code source, la version fran�aise est meilleure que la
 #      version anglaise. Ce message est similaire au message E86.
 #, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: Le tampon %<PRId64> n'existe pas"
+msgid "E92: Buffer %ld not found"
+msgstr "E92: Le tampon %ld n'existe pas"
 
 # AB - Il faut respecter l'esprit plus que la lettre.
 #, c-format
@@ -131,8 +140,8 @@ msgid "E94: No matching buffer for %s"
 msgstr "E94: Aucun tampon ne correspond � %s"
 
 #, c-format
-msgid "line %<PRId64>"
-msgstr "ligne %<PRId64>"
+msgid "line %ld"
+msgstr "ligne %ld"
 
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: Un tampon porte d�j� ce nom"
@@ -163,14 +172,14 @@ msgid "1 line --%d%%--"
 msgstr "1 ligne --%d%%--"
 
 #, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> lignes --%d%%--"
+msgid "%ld lines --%d%%--"
+msgstr "%ld lignes --%d%%--"
 
 # AB - Faut-il remplacer "sur" par "de" ?
 # DB - Mon avis : oui.
 #, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "ligne %<PRId64> sur %<PRId64> --%d%%-- col "
+msgid "line %ld of %ld --%d%%-- col "
+msgstr "ligne %ld sur %ld --%d%%-- col "
 
 # DB - Je trouvais [Aucun fichier] (VO : [No file]) plus naturel
 #      lors du lancement de Vim en mode graphique (ce message
@@ -223,6 +232,13 @@ msgstr ""
 msgid "Signs for %s:"
 msgstr "Symboles dans %s :"
 
+#, c-format
+msgid "    line=%ld  id=%d  name=%s"
+msgstr "    ligne=%ld  id=%d  nom=%s"
+
+msgid "E902: Cannot connect to port"
+msgstr "E902: Impossible de se connecter au port"
+
 msgid "E901: gethostbyname() in channel_open()"
 msgstr "E901: gethostbyname() dans channel_open()"
 
@@ -230,7 +246,7 @@ msgid "E898: socket() in channel_open()"
 msgstr "E898: socket() dans channel_open()"
 
 msgid "E903: received command with non-string argument"
-msgstr "E903: commande re�ue avec une argument qui n'est pas une cha�ne"
+msgstr "E903: commande re�ue avec un argument qui n'est pas une cha�ne"
 
 msgid "E904: last argument for expr/call must be a number"
 msgstr "E904: le dernier argument de expr/call doit �tre un nombre"
@@ -251,28 +267,72 @@ msgid "E631: %s(): write failed"
 msgstr "E631: %s() : erreur d'�criture"
 
 #, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    ligne=%<PRId64>  id=%d  nom=%s"
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: Impossible d'utiliser un callback avec %s()"
 
-msgid "E545: Missing colon"
-msgstr "E545: ':' manquant"
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr ""
+"E912: Impossible d'utiliser ch_evalexpr()/ch_sendexpr() avec un canal brut "
+"ou nl"
 
-msgid "E546: Illegal mode"
-msgstr "E546: Mode non autoris�"
+msgid "E906: not an open channel"
+msgstr "E906: pas un canal ouvert"
 
-msgid "E548: digit expected"
-msgstr "E548: chiffre attendu"
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: fichier _io n�cessite _name"
 
-msgid "E549: Illegal percentage"
-msgstr "E549: Pourcentage non autoris�"
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: tampon in_io n�cessite in_buf ou in_name "
 
-# AB - Je n'ai pas trouv� de traduction satisfaisante au verbe "diff". Comme
-#      Vim fait en pratique appel au programme "diff" pour evaluer les
-#      diff�rences entre fichiers, "to diff" a �t� traduit par "utiliser diff"
-#      et d'autres expressions appropri�es.
 #, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: Impossible d'utiliser diff sur plus de %<PRId64> tampons"
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: le tampon doit �tre charg� : %s"
+
+msgid "E821: File is encrypted with unknown method"
+msgstr "E821: Le fichier est chiffr� avec une m�thode inconnue"
+
+msgid "Warning: Using a weak encryption method; see :help 'cm'"
+msgstr ""
+"Alerte : utilisation d'une m�thode de chiffrage faible ; consultez :help 'cm'"
+
+msgid "Enter encryption key: "
+msgstr "Tapez la cl� de chiffrement : "
+
+msgid "Enter same key again: "
+msgstr "Tapez la cl� � nouveau : "
+
+msgid "Keys don't match!"
+msgstr "Les cl�s ne correspondent pas !"
+
+msgid "[crypted]"
+msgstr "[chiffr�]"
+
+#, c-format
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Il manque ':' dans le Dictionnaire %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Cl� dupliqu�e dans le Dictionnaire : %s"
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Il manque une virgule dans le Dictionnaire : %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: Il manque '}' � la fin du Dictionnaire : %s"
+
+msgid "extend() argument"
+msgstr "argument de extend()"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: La cl� existe d�j� : %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
+msgstr "E96: Impossible d'utiliser diff sur plus de %ld tampons"
 
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: Impossible de lire ou �crire des fichiers temporaires"
@@ -281,6 +341,9 @@ msgstr "E810: Impossible de lire ou 
 msgid "E97: Cannot create diffs"
 msgstr "E97: diff ne fonctionne pas"
 
+msgid "Patch file"
+msgstr "Fichier rustine"
+
 msgid "E816: Cannot read patch output"
 msgstr "E816: Le fichier interm�diaire produit par patch n'a pu �tre lu"
 
@@ -459,13 +522,10 @@ msgstr "Correspondance %d sur %d"
 msgid "match %d"
 msgstr "Correspondance %d"
 
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: Caract�res inattendus avant '='"
 
-#, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: index de Liste hors limites : %<PRId64> au-del� de la fin"
-
 #, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: Variable non d�finie : %s"
@@ -473,45 +533,6 @@ msgstr "E121: Variable non d
 msgid "E111: Missing ']'"
 msgstr "E111: ']' manquant"
 
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: L'argument de %s doit �tre une Liste"
-
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: L'argument de %s doit �tre une Liste ou un Dictionnaire"
-
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: Impossible d'utiliser une cl� vide dans un Dictionnaire"
-
-msgid "E714: List required"
-msgstr "E714: Liste requise"
-
-msgid "E715: Dictionary required"
-msgstr "E715: Dictionnaire requis"
-
-msgid "E928: String required"
-msgstr "E928: Chaine requis"
-
-# DB : Suggestion
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: La fonction %s a re�u trop d'arguments"
-
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: La cl� %s n'existe pas dans le Dictionnaire"
-
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: La fonction %s existe d�j� (ajoutez ! pour la remplacer)"
-
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: Une entr�e du Dictionnaire porte d�j� ce nom"
-
-msgid "E718: Funcref required"
-msgstr "E718: R�f�rence de fonction (Funcref) requise"
-
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: Utilisation de [:] impossible avec un Dictionnaire"
 
@@ -548,7 +569,7 @@ msgid "E708: [:] must come last"
 msgstr "E708: [:] ne peut �tre sp�cifi� qu'en dernier"
 
 msgid "E709: [:] requires a List value"
-msgstr "E709: [:] n?cessite une Liste"
+msgstr "E709: [:] n�cessite une Liste"
 
 msgid "E710: List value has more items than target"
 msgstr "E710: La Liste a plus d'�l�ments que la destination"
@@ -574,8 +595,8 @@ msgstr "E109: Il manque ':' apr
 msgid "E691: Can only compare List with List"
 msgstr "E691: Une Liste ne peut �tre compar�e qu'avec une Liste"
 
-msgid "E692: Invalid operation for Lists"
-msgstr "E692: Op�ration invalide avec les Listes"
+msgid "E692: Invalid operation for List"
+msgstr "E692: Op�ration invalide avec les Liste"
 
 msgid "E735: Can only compare Dictionary with Dictionary"
 msgstr "E735: Un Dictionnaire ne peut �tre compar� qu'avec un Dictionnaire"
@@ -583,10 +604,6 @@ msgstr "E735: Un Dictionnaire ne peut 
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: Op�ration invalide avec les Dictionnaires"
 
-# DB - todo : Traduction valable (et courte) pour Funcref ?
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: Une Funcref ne peut �tre compar�e qu'� une Funcref"
-
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: Op�ration invalide avec les Funcrefs"
 
@@ -599,6 +616,9 @@ msgstr "E110: ')' manquant"
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: Impossible d'indexer une Funcref"
 
+msgid "E909: Cannot index a special variable"
+msgstr "E909: Impossible d'indexer une variable sp�ciale"
+
 # AB - La version fran�aise est meilleure que la version anglaise.
 #, c-format
 msgid "E112: Option name missing: %s"
@@ -745,30 +765,39 @@ msgstr "E785: complete() n'est utilisable que dans le mode Insertion"
 
 # AB - Texte par d�faut du bouton de la bo�te de dialogue affich�e par la
 #      fonction confirm().
+#.
+#. * Yes this is ugly, I don't particularly like it either.  But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all.  See below what 'ok' and 'ync' are used for.
+#.
 msgid "&Ok"
 msgstr "&Ok"
 
-msgid "extend() argument"
-msgstr "argument de extend()"
-
 #, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: un mappage existe d�j� pour %s"
-
-msgid "map() argument"
-msgstr "argument de map()"
-
-msgid "filter() argument"
-msgstr "argument de filter()"
-
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld lignes : "
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld ligne : "
+msgstr[1] "+-%s%3ld lignes : "
 
 #, c-format
 msgid "E700: Unknown function: %s"
 msgstr "E700: Fonction inconnue : %s"
 
+msgid "E922: expected a dict"
+msgstr "E922: dictionnaire attendu"
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr ""
+"E923: Le second argument de function() doit �tre une liste ou un dictionnaire"
+
+# AB - Textes des boutons de la bo�te de dialogue affich�e par inputdialog().
+msgid ""
+"&OK\n"
+"&Cancel"
+msgstr ""
+"&Ok\n"
+"&Annuler"
+
 # AB - La version fran�aise est meilleure que la version anglaise.
 msgid "called inputrestore() more often than inputsave()"
 msgstr "inputrestore() a �t� appel� plus de fois qu'inputsave()"
@@ -779,6 +808,9 @@ msgstr "argument de insert()"
 msgid "E786: Range not allowed"
 msgstr "E786: Les plages ne sont pas autoris�es"
 
+msgid "E916: not a valid job"
+msgstr "E916: t�che invalide"
+
 msgid "E701: Invalid type for len()"
 msgstr "E701: Type invalide avec len()"
 
@@ -795,6 +827,19 @@ msgstr "E727: D
 msgid "<empty>"
 msgstr "<vide>"
 
+# AB - � mon avis, la version anglaise est erron�e.
+# DB : V�rifier
+msgid "E240: No connection to Vim server"
+msgstr "E240: Pas de connexion au serveur X"
+
+# AB - La version fran�aise est meilleure que la version anglaise.
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: L'envoi au serveur %s a �chou�"
+
+msgid "E277: Unable to read a server reply"
+msgstr "E277: Impossible de lire la r�ponse du serveur"
+
 msgid "remove() argument"
 msgstr "argument de remove()"
 
@@ -804,6 +849,10 @@ msgstr "E655: Trop de liens symboliques (cycle ?)"
 msgid "reverse() argument"
 msgstr "argument de reverse()"
 
+# AB - La version fran�aise est meilleure que la version anglaise.
+msgid "E258: Unable to send to client"
+msgstr "E258: La r�ponse n'a pas pu �tre envoy�e au client"
+
 #, c-format
 msgid "E927: Invalid action: '%s'"
 msgstr "E927: Action invalide : � %s �"
@@ -811,185 +860,27 @@ msgstr "E927: Action invalide : 
 msgid "sort() argument"
 msgstr "argument de sort()"
 
-#, fuzzy
-#~ msgid "uniq() argument"
-#~ msgstr "argument de add()"
+msgid "uniq() argument"
+msgstr "argument de uniq()"
 
 msgid "E702: Sort compare function failed"
 msgstr "E702: La fonction de comparaison de sort() a �chou�"
 
-#, fuzzy
-#~ msgid "E882: Uniq compare function failed"
-#~ msgstr "E702: La fonction de comparaison de sort() a �chou�"
+msgid "E882: Uniq compare function failed"
+msgstr "E882: La fonction de comparaison de uniq() a �chou�"
 
 msgid "(Invalid)"
 msgstr "(Invalide)"
 
+#, c-format
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: num�ro de submatch invalide : %d"
+
 msgid "E677: Error writing temp file"
 msgstr "E677: Erreur lors de l'�criture du fichier temporaire"
 
-msgid "E805: Using a Float as a Number"
-msgstr "E805: Utilisation d'un Flottant comme un Nombre"
-
-msgid "E703: Using a Funcref as a Number"
-msgstr "E703: Utilisation d'une Funcref comme un Nombre"
-
-msgid "E745: Using a List as a Number"
-msgstr "E745: Utilisation d'une Liste comme un Nombre"
-
-msgid "E728: Using a Dictionary as a Number"
-msgstr "E728: Utilisation d'un Dictionnaire comme un Nombre"
-
-msgid "E729: using Funcref as a String"
-msgstr "E729: Utilisation d'une Funcref comme une Cha�ne"
-
-msgid "E730: using List as a String"
-msgstr "E730: Utilisation d'une Liste comme une Cha�ne"
-
-msgid "E731: using Dictionary as a String"
-msgstr "E731: Utilisation d'un Dictionnaire comme une Cha�ne"
-
-# DB : On doit pouvoir trouver nettement mieux que �a.
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: Type de variable incoh�rent pour %s"
-
-#, c-format
-msgid "E795: Cannot delete variable %s"
-msgstr "E795: Impossible de supprimer la variable %s"
-
-#, c-format
-msgid "E704: Funcref variable name must start with a capital: %s"
-msgstr "E704: Le nom d'une Funcref doit commencer par une majuscule : %s"
-
-#, c-format
-msgid "E705: Variable name conflicts with existing function: %s"
-msgstr "E705: Le nom d'une variable entre en conflit avec la fonction %s"
-
-#, c-format
-msgid "E741: Value is locked: %s"
-msgstr "E741: La valeur de %s est verrouill�e"
-
-msgid "Unknown"
-msgstr "Inconnu"
-
-#, c-format
-msgid "E742: Cannot change value of %s"
-msgstr "E742: Impossible de modifier la valeur de %s"
-
-msgid "E698: variable nested too deep for making a copy"
-msgstr "E698: variable trop imbriqu�e pour en faire une copie"
-
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: Fonction non d�finie : %s"
-
-# AB - La version fran�aise est plus consistante que la version anglaise.
-# AB - Je suis partag� entre la concision d'une traduction assez litt�rale et
-#      la lourdeur d'une traduction plus correcte.
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: Il manque '(' apr�s %s"
-
-msgid "E862: Cannot use g: here"
-msgstr "E862: Impossible d'utiliser g: ici"
-
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: Argument invalide : %s"
-
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: Nom d'argument dupliqu� : %s"
-
-msgid "E126: Missing :endfunction"
-msgstr "E126: Il manque :endfunction"
-
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: Le nom de fonction entre en conflit avec la variable : %s"
-
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: Impossible de red�finir fonction %s : d�j� utilis�e"
-
-# DB - Le contenu du "c-format" est le nom de la fonction.
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: Le nom de la fonction %s ne correspond pas le nom du script"
-
-msgid "E129: Function name required"
-msgstr "E129: Nom de fonction requis"
-
-#, fuzzy, c-format
-#~ msgid "E128: Function name must start with a capital or \"s:\": %s"
-#~ msgstr "E128: La fonction %s ne commence pas par une majuscule ou contient ':'"
-
-#, fuzzy, c-format
-#~ msgid "E884: Function name cannot contain a colon: %s"
-#~ msgstr "E128: La fonction %s ne commence pas par une majuscule ou contient ':'"
-
-# AB - Il est difficile de cr�er une version fran�aise qui fasse moins de 80
-#      caract�res de long, nom de la fonction compris : "It is in use" est une
-#      expression tr�s dense. Traductions possibles : "elle est utilis�e",
-#      "elle s'ex�cute" ou "elle est occup�e".
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: Impossible d'effacer %s : cette fonction est utilis�e"
-
-# AB - V�rifier dans la litt�rature technique s'il n'existe pas une meilleure
-#      traduction pour "function call depth".
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr ""
-"E132: La profondeur d'appel de fonction est sup�rieure � 'maxfuncdepth'"
-
-# AB - Ce texte fait partie d'un message de d�bogage.
-#, c-format
-msgid "calling %s"
-msgstr "appel de %s"
-
-# AB - V�rifier.
-#, c-format
-msgid "%s aborted"
-msgstr "%s annul�e"
-
-# AB - Ce texte fait partie d'un message de d�bogage.
-#, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s a retourn� #%<PRId64>"
-
-# AB - Ce texte fait partie d'un message de d�bogage.
-#, c-format
-msgid "%s returning %s"
-msgstr "%s a retourn� \"%s\""
-
-# AB - Ce texte fait partie d'un message de d�bogage.
-#, c-format
-msgid "continuing in %s"
-msgstr "de retour dans %s"
-
-msgid "E133: :return not inside a function"
-msgstr "E133: :return en dehors d'une fonction"
-
-# AB - La version fran�aise est capitalis�e pour �tre en accord avec les autres
-#      commentaires enregistr�s dans le fichier viminfo.
-msgid ""
-"\n"
-"# global variables:\n"
-msgstr ""
-"\n"
-"# Variables globales:\n"
-
-# DB - Plus pr�cis ("la derni�re fois") ?
-msgid ""
-"\n"
-"\tLast set from "
-msgstr ""
-"\n"
-"\tModifi� la derni�re fois dans "
-
-msgid "No old files"
-msgstr "Aucun vieux fichier"
+msgid "E921: Invalid callback argument"
+msgstr "E921: Argument de callback invalide"
 
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
@@ -1012,12 +903,12 @@ msgid "1 line moved"
 msgstr "1 ligne d�plac�e"
 
 #, c-format
-msgid "%<PRId64> lines moved"
-msgstr "%<PRId64> lignes d�plac�es"
+msgid "%ld lines moved"
+msgstr "%ld lignes d�plac�es"
 
 #, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "%<PRId64> lignes filtr�es"
+msgid "%ld lines filtered"
+msgstr "%ld lignes filtr�es"
 
 # AB - J'ai volontairement omis l'ast�risque initiale car je pense que le
 #      motif "Filter*" d�crit plus clairement les quatre autocommandes li�es
@@ -1079,6 +970,10 @@ msgstr " 
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: L'�criture dans le fichier %s est interdite"
 
+#, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: Trop de fichiers temporaires viminfo, comme %s!"
+
 # AB - Le point d'exclamation est superflu.
 # AB - Le mot "viminfo" a �t� retir� pour que le message ne d�passe pas 80
 #      caract�res dans le cas courant o� %s = /home/12345678/.viminfo
@@ -1091,6 +986,10 @@ msgstr "E138: Impossible d'
 msgid "Writing viminfo file \"%s\""
 msgstr "�criture du fichier viminfo \"%s\""
 
+#, c-format
+msgid "E886: Can't rename viminfo file to %s!"
+msgstr "E886: Impossible de renommer viminfo en %s"
+
 #. Write the info:
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
@@ -1112,6 +1011,19 @@ msgstr "# 'encoding' dans lequel ce fichier a 
 msgid "Illegal starting char"
 msgstr "Caract�re initial non valide"
 
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# Lignes commen�ant par |, copi�es litt�ralement :\n"
+
+# AB - Ceci est un titre de bo�te de dialogue. V�rifier que la version
+#      fran�aise est correcte pour les trois r�f�rences ; j'ai un doute quant
+#      � la troisi�me.
+msgid "Save As"
+msgstr "Enregistrer sous - Vim"
+
 # AB - Ceci est un contenu de bo�te de dialogue (�ventuellement en mode texte).
 # AB - La version fran�aise est meilleure que la version anglaise.
 msgid "Write partial file?"
@@ -1136,8 +1048,8 @@ msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: Le fichier d'�change %s existe d�j� (:silent! pour passer outre)"
 
 #, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: Pas de nom de fichier pour le tampon %<PRId64>"
+msgid "E141: No file name for buffer %ld"
+msgstr "E141: Pas de nom de fichier pour le tampon %ld"
 
 # AB - Il faut respecter l'esprit plus que la lettre.
 msgid "E142: File not written: Writing is disabled by 'write' option"
@@ -1168,6 +1080,10 @@ msgstr ""
 msgid "E505: \"%s\" is read-only (add ! to override)"
 msgstr "E505: \"%s\" est en lecture seule (ajoutez ! pour passer outre)"
 
+# AB - Ceci est un titre de bo�te de dialogue.
+msgid "Edit File"
+msgstr "Ouvrir un fichier - Vim"
+
 # AB - Il faut respecter l'esprit plus que la lettre.
 # AB - J'h�site � ajouter "� sa cr�ation" apr�s le nom du tampon. Ce message
 #      devrait n'�tre affich� qu'apr�s une tentative d'ouverture de fichier,
@@ -1205,19 +1121,19 @@ msgid "1 substitution"
 msgstr "1 substitution"
 
 #, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> correspondances"
+msgid "%ld matches"
+msgstr "%ld correspondances"
 
 #, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64> substitutions"
+msgid "%ld substitutions"
+msgstr "%ld substitutions"
 
 msgid " on 1 line"
 msgstr " sur 1 ligne"
 
 #, c-format
-msgid " on %<PRId64> lines"
-msgstr " sur %<PRId64> lignes"
+msgid " on %ld lines"
+msgstr " sur %ld lignes"
 
 # AB - Il faut respecter l'esprit plus que la lettre.
 # AB - Ce message devrait contenir une r�f�rence � :vglobal.
@@ -1270,10 +1186,6 @@ msgstr "E149: D
 msgid "Sorry, help file \"%s\" not found"
 msgstr "D�sol�, le fichier d'aide \"%s\" est introuvable"
 
-#, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: %s n'est pas un r�pertoire"
-
 #, c-format
 msgid "E151: No match: %s"
 msgstr "E151: Aucune correspondance : %s"
@@ -1299,6 +1211,10 @@ msgstr "E670: Encodages diff
 msgid "E154: Duplicate tag \"%s\" in file %s/%s"
 msgstr "E154: Marqueur \"%s\" dupliqu� dans le fichier %s/%s"
 
+#, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: %s n'est pas un r�pertoire"
+
 # AB - Il faut respecter l'esprit plus que la lettre.
 #, c-format
 msgid "E160: Unknown sign command: %s"
@@ -1337,8 +1253,15 @@ msgstr "E934: Impossible de sauter 
 # AB - Vu le code source, la version fran�aise est meilleure que la
 #      version anglaise.
 #, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: Le symbole %<PRId64> est introuvable"
+msgid "E157: Invalid sign ID: %ld"
+msgstr "E157: Le symbole %ld est introuvable"
+
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: Impossible de changer le symbole %s"
+
+msgid " (NOT FOUND)"
+msgstr "  (INTROUVABLE)"
 
 msgid " (not supported)"
 msgstr " (non support�)"
@@ -1355,16 +1278,23 @@ msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "Mode d�bogage activ�. Tapez \"cont\" pour continuer."
 
 #, c-format
-msgid "line %<PRId64>: %s"
-msgstr "ligne %<PRId64> : %s"
+msgid "line %ld: %s"
+msgstr "ligne %ld : %s"
 
 #, c-format
 msgid "cmd: %s"
 msgstr "cmde : %s"
 
+msgid "frame is zero"
+msgstr "le cadre de pile est z�ro"
+
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "Point d'arr�t dans %s%s ligne %<PRId64>"
+msgid "frame at highest level: %d"
+msgstr "cadre de pile au niveau le plus haut : %d"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "Point d'arr�t dans %s%s ligne %ld"
 
 #, c-format
 msgid "E161: Breakpoint not found: %s"
@@ -1376,8 +1306,8 @@ msgstr "Aucun point d'arr
 # AB - Le deuxi�me %s est remplac� par "func" ou "file" sans que l'on puisse
 #      traduire ces mots.
 #, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s  ligne %<PRId64>"
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  ligne %ld"
 
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: Utilisez d'abord \":profile start {nomfichier}\""
@@ -1427,6 +1357,9 @@ msgstr "Recherche de \"%s\""
 msgid "not found in '%s': \"%s\""
 msgstr "introuvable dans '%s' : \"%s\""
 
+msgid "Source Vim script"
+msgstr "Sourcer un script - Vim"
+
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "Impossible de sourcer un r�pertoire : \"%s\""
@@ -1436,16 +1369,16 @@ msgid "could not source \"%s\""
 msgstr "impossible de sourcer \"%s\""
 
 #, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "ligne %<PRId64> : impossible de sourcer \"%s\""
+msgid "line %ld: could not source \"%s\""
+msgstr "ligne %ld : impossible de sourcer \"%s\""
 
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "sourcement \"%s\""
 
 #, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "ligne %<PRId64> : sourcement de \"%s\""
+msgid "line %ld: sourcing \"%s\""
+msgstr "ligne %ld : sourcement de \"%s\""
 
 #, c-format
 msgid "finished sourcing %s"
@@ -1490,8 +1423,6 @@ msgstr "Langue courante pour %s : \"%s\""
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: Impossible de choisir la langue \"%s\""
 
-#. don't redisplay the window
-#. don't wait for return
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "Mode Ex activ�. Tapez \"visual\" pour passer en mode Normal."
 
@@ -1523,12 +1454,10 @@ msgstr "E493: La plage sp
 msgid "Backwards range given, OK to swap"
 msgstr "La plage sp�cifi�e est invers�e, OK pour l'inverser"
 
-#. append
-#. typed wrong
 msgid "E494: Use w or w>>"
 msgstr "E494: Utilisez w ou w>>"
 
-msgid "E319: The command is not available in this version"
+msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: D�sol�, cette commande n'est pas disponible dans cette version"
 
 msgid "E172: Only one file name allowed"
@@ -1545,8 +1474,8 @@ msgid "E173: 1 more file to edit"
 msgstr "E173: encore 1 fichier � �diter"
 
 #, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: encore %<PRId64> fichiers � �diter"
+msgid "E173: %ld more files to edit"
+msgstr "E173: encore %ld fichiers � �diter"
 
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: La commande existe d�j� : ajoutez ! pour la red�finir"
@@ -1609,7 +1538,10 @@ msgid "E468: Completion argument only allowed for custom completion"
 msgstr "E468: Seul le compl�tement personnalis� accepte un argument"
 
 msgid "E467: Custom completion requires a function argument"
-msgstr "E467: Le compl�tement personnalis� requiert une fonction en argument"
+msgstr "E467: Le compl�tement personnalis� n�cessite une fonction en argument"
+
+msgid "unknown"
+msgstr "inconnu"
 
 #, c-format
 msgid "E185: Cannot find color scheme '%s'"
@@ -1624,6 +1556,9 @@ msgstr "E784: Impossible de fermer le dernier onglet"
 msgid "Already only one tab page"
 msgstr "Il ne reste d�j� plus qu'un seul onglet"
 
+msgid "Edit File in new window"
+msgstr "Ouvrir un fichier dans une nouvelle fen�tre - Vim"
+
 #, c-format
 msgid "Tab page %d"
 msgstr "Onglet %d"
@@ -1631,6 +1566,9 @@ msgstr "Onglet %d"
 msgid "No swap file"
 msgstr "Pas de fichier d'�change"
 
+msgid "Append File"
+msgstr "Ajouter fichier"
+
 msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
 msgstr ""
 "E747: Tampon modifi� : impossible de changer de r�pertoire (ajoutez ! pour "
@@ -1643,7 +1581,11 @@ msgid "E187: Unknown"
 msgstr "E187: Inconnu"
 
 msgid "E465: :winsize requires two number arguments"
-msgstr "E465: :winsize requiert deux arguments num�riques"
+msgstr "E465: :winsize n�cessite deux arguments num�riques"
+
+#, c-format
+msgid "Window position: X %d, Y %d"
+msgstr "Position de la fen�tre : X %d, Y %d"
 
 # DB : Suggestion, sans doute perfectible.
 msgid "E188: Obtaining window position not implemented for this platform"
@@ -1651,7 +1593,22 @@ msgstr ""
 "E188: R�cup�rer la position de la fen�tre non impl�ment� dans cette version"
 
 msgid "E466: :winpos requires two number arguments"
-msgstr "E466: :winpos requiert deux arguments num�riques"
+msgstr "E466: :winpos n�cessite deux arguments num�riques"
+
+msgid "E930: Cannot use :redir inside execute()"
+msgstr "E930: Impossible d'utiliser :redir dans execute()"
+
+msgid "Save Redirection"
+msgstr "Enregistrer la redirection"
+
+msgid "Save View"
+msgstr "Enregistrer la vue - Vim"
+
+msgid "Save Session"
+msgstr "Enregistrer la session - Vim"
+
+msgid "Save Setup"
+msgstr "Enregistrer les r�glages - Vim"
 
 #, c-format
 msgid "E739: Cannot create directory: %s"
@@ -1672,6 +1629,9 @@ msgstr "E191: L'argument doit 
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: Appel r�cursif de :normal trop important"
 
+msgid "E809: #< is not available without the +eval feature"
+msgstr "E809: #< n'est pas disponible sans la fonctionnalit� +eval"
+
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: Aucun nom de fichier alternatif � substituer � '#'"
 
@@ -1690,7 +1650,7 @@ msgstr "E498: Aucun nom de fichier :source 
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: aucun num�ro de ligne � utiliser pour \"<slnum>\""
 
-#, c-format
+#, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr "E499: Nom de fichier vide pour '%' ou '#', ne marche qu'avec \":p:h\""
 
@@ -1700,6 +1660,9 @@ msgstr "E500: 
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: Impossible d'ouvrir le viminfo en lecture"
 
+msgid "E196: No digraphs in this version"
+msgstr "E196: Pas de digraphes dans cette version"
+
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: Impossible d'�mettre des exceptions avec 'Vim' comme pr�fixe"
 
@@ -1717,8 +1680,8 @@ msgid "Exception discarded: %s"
 msgstr "Exception �limin�e : %s"
 
 #, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s, ligne %<PRId64>"
+msgid "%s, line %ld"
+msgstr "%s, ligne %ld"
 
 #. always scroll up, don't overwrite
 #, c-format
@@ -1858,33 +1821,6 @@ msgstr "E198: cmd_pchar au-del
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: Fen�tre ou tampon actif effac�"
 
-msgid "E854: path too long for completion"
-msgstr "E854: chemin trop long pour compl�tement"
-
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: Chemin invalide : '**[nombre]' doit �tre � la fin du chemin ou �tre "
-"suivi de '%s'."
-
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: R�pertoire \"%s\" introuvable dans 'cdpath'"
-
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: Fichier \"%s\" introuvable dans 'path'"
-
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: Plus de r�pertoire \"%s\" dans 'cdpath'"
-
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: Plus de fichier \"%s\" dans 'path'"
-
 msgid "E812: Autocommands changed buffer or buffer name"
 msgstr "E812: Des autocommandes ont chang� le tampon ou le nom du tampon"
 
@@ -1897,6 +1833,9 @@ msgstr "est un r
 msgid "is not a file"
 msgstr "n'est pas un fichier"
 
+msgid "is a device (disabled with 'opendevice' option)"
+msgstr "est un p�riph�rique (d�sactiv� par l'option 'opendevice')"
+
 msgid "[New File]"
 msgstr "[Nouveau fichier]"
 
@@ -1917,26 +1856,25 @@ msgstr ""
 "E201: Autocommandes *ReadPre ne doivent pas modifier le contenu du tampon "
 "courant"
 
-msgid "Nvim: Reading from stdin...\n"
+msgid "Vim: Reading from stdin...\n"
 msgstr "Vim : Lecture de stdin...\n"
 
+msgid "Reading from stdin..."
+msgstr "Lecture de stdin..."
+
 #. Re-opening the original file failed!
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: La conversion a rendu le fichier illisible !"
 
-#. fifo or socket
 msgid "[fifo/socket]"
 msgstr "[fifo/socket]"
 
-#. fifo
 msgid "[fifo]"
 msgstr "[fifo]"
 
-#. or socket
 msgid "[socket]"
 msgstr "[socket]"
 
-#. or character special
 msgid "[character special]"
 msgstr "[caract�re sp�cial]"
 
@@ -1953,12 +1891,12 @@ msgid "[converted]"
 msgstr "[converti]"
 
 #, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[ERREUR DE CONVERSION � la ligne %<PRId64>]"
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[ERREUR DE CONVERSION � la ligne %ld]"
 
 #, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[OCTET INVALIDE � la ligne %<PRId64>]"
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[OCTET INVALIDE � la ligne %ld]"
 
 msgid "[READ ERRORS]"
 msgstr "[ERREURS DE LECTURE]"
@@ -1983,9 +1921,18 @@ msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr ""
 "E204: L'autocommande a modifi� le nombre de lignes de mani�re inattendue"
 
+msgid "NetBeans disallows writes of unmodified buffers"
+msgstr "NetBeans interdit l'�criture des tampons non modifi�s"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "Netbeans interdit l'�criture partielle de ses tampons"
+
 msgid "is not a file or writable device"
 msgstr "n'est pas un fichier ou un p�riph�rique inscriptible"
 
+msgid "writing to device disabled with 'opendevice' option"
+msgstr "�criture vers un p�riph�rique d�sactiv� par l'option 'opendevice'"
+
 msgid "is read-only (add ! to override)"
 msgstr "est en lecture seule (ajoutez ! pour passer outre)"
 
@@ -2008,7 +1955,10 @@ msgid "E510: Can't make backup file (add ! to override)"
 msgstr ""
 "E510: Impossible de g�n�rer la copie de secours (ajoutez ! pour passer outre)"
 
-#. Can't write without a tempfile!
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr ""
+"E460: Les ressources partag�es seraient perdues (ajoutez ! pour passer outre)"
+
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: Impossible de g�n�rer un fichier temporaire pour y �crire"
 
@@ -2033,11 +1983,11 @@ msgstr ""
 
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
+"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: Erreur d'�criture, �chec de conversion � la ligne %<PRId64> (videz "
-"'fenc' pour passer outre)"
+"E513: Erreur d'�criture, �chec de conversion � la ligne %ld (videz 'fenc' "
+"pour passer outre)"
 
 msgid "E514: write error (file system full?)"
 msgstr "E514: erreur d'�criture (syst�me de fichiers plein ?)"
@@ -2046,8 +1996,8 @@ msgid " CONVERSION ERROR"
 msgstr " ERREUR DE CONVERSION"
 
 #, c-format
-msgid " in line %<PRId64>;"
-msgstr " � la ligne %<PRId64>"
+msgid " in line %ld;"
+msgstr " � la ligne %ld"
 
 msgid "[Device]"
 msgstr "[P�riph.]"
@@ -2111,15 +2061,15 @@ msgid "1 line, "
 msgstr "1 ligne, "
 
 #, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> lignes, "
+msgid "%ld lines, "
+msgstr "%ld lignes, "
 
 msgid "1 character"
 msgstr "1 caract�re"
 
 #, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64> caract�res"
+msgid "%lld characters"
+msgstr "%lld caract�res"
 
 msgid "[noeol]"
 msgstr "[noeol]"
@@ -2204,6 +2154,9 @@ msgstr "E462: Impossible de pr
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: Impossible de recharger \"%s\""
 
+msgid "--Deleted--"
+msgstr "--Effac�--"
+
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "Autocommandes marqu�es pour auto-suppression : %s <tampon=%d>"
@@ -2213,12 +2166,12 @@ msgstr "Autocommandes marqu
 msgid "E367: No such group: \"%s\""
 msgstr "E367: Aucun groupe \"%s\""
 
+msgid "E936: Cannot delete the current group"
+msgstr "E936: Impossible de supprimer le groupe courant"
+
 msgid "W19: Deleting augroup that is still in use"
 msgstr "W19: Effacement d'augroup toujours en usage"
 
-msgid "--Deleted--"
-msgstr "--Effac�--"
-
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: Caract�re non valide apr�s * : %s"
@@ -2286,7 +2239,6 @@ msgid_plural "+--%3ld lines folded "
 msgstr[0] "+--%3ld ligne repli�e "
 msgstr[1] "+--%3ld lignes repli�es "
 
-#. buffer has already been read
 msgid "E222: Add to read buffer"
 msgstr "E222: Ajout au tampon de lecture"
 
@@ -2318,333 +2270,308 @@ msgstr "Aucun mappage trouv
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap : mode invalide"
 
-# msgstr "--Pas de lignes dans le tampon--"
-# DB - todo : ou encore : msgstr "--Aucune ligne dans le tampon--"
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-msgid "--No lines in buffer--"
-msgstr "--Le tampon est vide--"
-
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-msgid "E470: Command aborted"
-msgstr "E470: Commande annul�e"
-
-msgid "E471: Argument required"
-msgstr "E471: Argument requis"
-
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ devrait �tre suivi de /, ? ou &"
-
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgid "E851: Failed to create a new process for the GUI"
 msgstr ""
-"E11: Invalide dans la fen�tre ligne-de-commande ; <CR> ex�cute, CTRL-C quitte"
+"E851: �chec lors de la cr�ation d'un nouveau processus pour l'interface "
+"graphique"
 
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgid "E852: The child process failed to start the GUI"
 msgstr ""
-"E12: commande non autoris�e depuis un exrc/vimrc dans r�pertoire courant ou "
-"une recherche de marqueur"
+"E852: Le processus fils n'a pas r�ussi � d�marrer l'interface graphique"
 
-msgid "E171: Missing :endif"
-msgstr "E171: :endif manquant"
-
-msgid "E600: Missing :endtry"
-msgstr "E600: :endtry manquant"
-
-msgid "E170: Missing :endwhile"
-msgstr "E170: :endwhile manquant"
-
-msgid "E170: Missing :endfor"
-msgstr "E170: :endfor manquant"
-
-msgid "E588: :endwhile without :while"
-msgstr "E588: :endwhile sans :while"
-
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor sans :for"
-
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: Le fichier existe d�j� (ajoutez ! pour passer outre)"
-
-msgid "E472: Command failed"
-msgstr "E472: La commande a �chou�"
-
-msgid "E473: Internal error"
-msgstr "E473: Erreur interne"
-
-msgid "Interrupted"
-msgstr "Interrompu"
-
-msgid "E14: Invalid address"
-msgstr "E14: Adresse invalide"
-
-msgid "E474: Invalid argument"
-msgstr "E474: Argument invalide"
+msgid "E229: Cannot start the GUI"
+msgstr "E229: Impossible de d�marrer l'interface graphique"
 
 #, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: Argument invalide : %s"
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: Impossible de lire \"%s\""
 
-#, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: Expression invalide : %s"
-
-msgid "E16: Invalid range"
-msgstr "E16: Plage invalide"
-
-msgid "E476: Invalid command"
-msgstr "E476: Commande invalide"
-
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" est un r�pertoire"
-
-#, fuzzy
-#~ msgid "E900: Invalid job id"
-#~ msgstr "E49: Valeur de d�filement invalide"
-
-#~ msgid "E901: Job table is full"
-#~ msgstr ""
-
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: L'appel � la biblioth�que a �chou� pour \"%s()\""
-
-msgid "E19: Mark has invalid line number"
-msgstr "E19: La marque a un num�ro de ligne invalide"
-
-msgid "E20: Mark not set"
-msgstr "E20: Marque non positionn�e"
-
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: Impossible de modifier, 'modifiable' est d�sactiv�"
-
-msgid "E22: Scripts nested too deep"
-msgstr "E22: Trop de r�cursion dans les scripts"
-
-msgid "E23: No alternate file"
-msgstr "E23: Pas de fichier alternatif"
-
-msgid "E24: No such abbreviation"
-msgstr "E24: Cette abr�viation n'existe pas"
-
-msgid "E477: No ! allowed"
-msgstr "E477: Le ! n'est pas autoris�"
-
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: L'interface graphique n'a pas �t� compil�e dans cette version"
-
-#, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: Aucun nom de groupe de surbrillance %s"
-
-msgid "E29: No inserted text yet"
-msgstr "E29: Pas encore de texte ins�r�"
-
-msgid "E30: No previous command line"
-msgstr "E30: Aucune ligne de commande pr�c�dente"
-
-msgid "E31: No such mapping"
-msgstr "E31: Mappage inexistant"
-
-msgid "E479: No match"
-msgstr "E479: Aucune correspondance"
-
-#, c-format
-msgid "E480: No match: %s"
-msgstr "E480: Aucune correspondance : %s"
-
-msgid "E32: No file name"
-msgstr "E32: Aucun nom de fichier"
-
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: Aucune expression r�guli�re de substitution pr�c�dente"
-
-msgid "E34: No previous command"
-msgstr "E34: Aucune commande pr�c�dente"
-
-msgid "E35: No previous regular expression"
-msgstr "E35: Aucune expression r�guli�re pr�c�dente"
-
-msgid "E481: No range allowed"
-msgstr "E481: Les plages ne sont pas autoris�es"
-
-msgid "E36: Not enough room"
-msgstr "E36: Pas assez de place"
-
-#, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: Impossible de cr�er le fichier %s"
-
-msgid "E483: Can't get temp file name"
-msgstr "E483: Impossible d'obtenir un nom de fichier temporaire"
-
-#, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: Impossible d'ouvrir le fichier \"%s\""
-
-#, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: Impossible de lire le fichier %s"
-
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: Modifications non enregistr�es (ajoutez ! pour passer outre)"
-
-# AB - Il faut respecter l'esprit plus que la lettre. Dans le cas pr�sent,
-#      nettement plus.
-#, fuzzy
-#~ msgid "E37: No write since last change"
-#~ msgstr "[Attention : tout n'est pas enregistr�]\n"
-
-msgid "E38: Null argument"
-msgstr "E38: Argument null"
-
-msgid "E39: Number expected"
-msgstr "E39: Nombre attendu"
-
-#, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: Impossible d'ouvrir le fichier d'erreurs %s"
-
-msgid "E41: Out of memory!"
-msgstr "E41: M�moire �puis�e"
-
-msgid "Pattern not found"
-msgstr "Motif introuvable"
-
-#, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: Motif introuvable : %s"
-
-msgid "E487: Argument must be positive"
-msgstr "E487: L'argument doit �tre positif"
-
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: Impossible de retourner au r�pertoire pr�c�dent"
-
-msgid "E42: No Errors"
-msgstr "E42: Aucune erreur"
-
-# DB - TODO : trouver une traduction valable et attest�e pour "location".
-msgid "E776: No location list"
-msgstr "E776: Aucune liste d'emplacements"
-
-msgid "E43: Damaged match string"
-msgstr "E43: La cha�ne de recherche est endommag�e"
-
-msgid "E44: Corrupted regexp program"
-msgstr "E44: L'automate de regexp est corrompu"
-
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: L'option 'readonly' est activ�e (ajoutez ! pour passer outre)"
-
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: La variable \"%s\" est en lecture seule"
-
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgid "E665: Cannot start GUI, no valid font found"
 msgstr ""
-"E794: Impossible de modifier une variable depuis le bac � sable : \"%s\""
+"E665: Impossible de d�marrer l'IHM graphique, aucune police valide trouv�e"
 
-msgid "E47: Error while reading errorfile"
-msgstr "E47: Erreur lors de la lecture du fichier d'erreurs"
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: 'guifontwide' est invalide"
 
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: Op�ration interdite dans le bac � sable"
-
-msgid "E523: Not allowed here"
-msgstr "E523: Interdit � cet endroit"
-
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: Choix du mode d'�cran non support�"
-
-msgid "E49: Invalid scroll size"
-msgstr "E49: Valeur de d�filement invalide"
-
-msgid "E91: 'shell' option is empty"
-msgstr "E91: L'option 'shell' est vide"
-
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: Impossible de lire les donn�es du symbole !"
-
-msgid "E72: Close error on swap file"
-msgstr "E72: Erreur lors de la fermeture du fichier d'�change"
-
-msgid "E73: tag stack empty"
-msgstr "E73: La pile des marqueurs est vide"
-
-msgid "E74: Command too complex"
-msgstr "E74: Commande trop complexe"
-
-msgid "E75: Name too long"
-msgstr "E75: Nom trop long"
-
-msgid "E76: Too many ["
-msgstr "E76: Trop de ["
-
-msgid "E77: Too many file names"
-msgstr "E77: Trop de noms de fichiers"
-
-msgid "E488: Trailing characters"
-msgstr "E488: Caract�res surnum�raires"
-
-msgid "E78: Unknown mark"
-msgstr "E78: Marque inconnue"
-
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: Impossible de d�velopper les m�tacaract�res"
-
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' ne peut pas �tre plus petit que 'winminheight'"
-
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' ne peut pas �tre plus petit que 'winminwidth'"
-
-msgid "E80: Error while writing"
-msgstr "E80: Erreur lors de l'�criture"
-
-msgid "Zero count"
-msgstr "Le quantificateur est nul"
-
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: <SID> utilis� en dehors d'un script"
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: Valeur de 'imactivatekey' invalide"
 
 #, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: Erreur interne : %s"
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: Impossible d'allouer la couleur %s"
 
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: le motif utilise plus de m�moire que 'maxmempattern'"
+msgid "No match at cursor, finding next"
+msgstr "Aucune correspondance sous le curseur, recherche de la suivante"
 
-msgid "E749: empty buffer"
-msgstr "E749: tampon vide"
+msgid "<cannot open> "
+msgstr "<impossible d'ouvrir> "
 
 #, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: Le tampon %<PRId64> n'existe pas"
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile : impossible d'obtenir la police %s"
 
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: D�limiteur ou motif de recherche invalide"
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile : impossible de revenir dans le r�pertoire courant"
 
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: Le fichier est charg� dans un autre tampon"
+msgid "Pathname:"
+msgstr "Chemin :"
+
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile : impossible d'obtenir le r�pertoire courant"
+
+msgid "OK"
+msgstr "Ok"
+
+msgid "Cancel"
+msgstr "Annuler"
+
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+msgstr "Widget scrollbar : Impossible d'obtenir la g�om�trie du pixmap 'thumb'"
+
+msgid "Vim dialog"
+msgstr "Vim"
+
+msgid "E232: Cannot create BalloonEval with both message and callback"
+msgstr "E232: Impossible de cr�er un BalloonEval avec message ET callback"
+
+msgid "_Cancel"
+msgstr "_Annuler"
+
+msgid "_Save"
+msgstr "_Enregistrer"
+
+msgid "_Open"
+msgstr "_Ouvrir"
+
+msgid "_OK"
+msgstr "_Ok"
+
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
+msgstr ""
+"&Oui\n"
+"&Non\n"
+"&Annuler"
+
+msgid "Yes"
+msgstr "Oui"
+
+msgid "No"
+msgstr "Non"
+
+# todo '_' is for hotkey, i guess?
+msgid "Input _Methods"
+msgstr "_M�thodes de saisie"
+
+msgid "VIM - Search and Replace..."
+msgstr "Remplacer - Vim"
+
+msgid "VIM - Search..."
+msgstr "Rechercher - Vim"
+
+msgid "Find what:"
+msgstr "Rechercher :"
+
+msgid "Replace with:"
+msgstr "Remplacer par :"
+
+#. whole word only button
+msgid "Match whole word only"
+msgstr "Mots entiers seulement"
+
+#. match case button
+msgid "Match case"
+msgstr "Respecter la casse"
+
+msgid "Direction"
+msgstr "Direction"
+
+#. 'Up' and 'Down' buttons
+msgid "Up"
+msgstr "Haut"
+
+msgid "Down"
+msgstr "Bas"
+
+msgid "Find Next"
+msgstr "Suivant"
+
+msgid "Replace"
+msgstr "Remplacer"
+
+msgid "Replace All"
+msgstr "Remplacer tout"
+
+msgid "_Close"
+msgstr "_Fermer"
+
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim : Une requ�te \"die\" a �t� re�ue par le gestionnaire de session\n"
+
+msgid "Close tab"
+msgstr "Fermer l'onglet"
+
+msgid "New tab"
+msgstr "Nouvel onglet"
+
+# DB - todo : un peu long. Cet entr�e de menu permet d'ouvrir un fichier
+#      dans un nouvel onglet via le s�lecteur de fichiers graphique.
+msgid "Open Tab..."
+msgstr "Ouvrir dans un onglet..."
+
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim : Fen�tre principale d�truite inopin�ment\n"
+
+msgid "&Filter"
+msgstr "&Filtrer"
+
+msgid "&Cancel"
+msgstr "&Annuler"
+
+msgid "Directories"
+msgstr "R�pertoires"
+
+msgid "Filter"
+msgstr "Filtre"
+
+msgid "&Help"
+msgstr "&Aide"
+
+msgid "Files"
+msgstr "Fichiers"
+
+msgid "&OK"
+msgstr "&Ok"
+
+msgid "Selection"
+msgstr "S�lection"
+
+msgid "Find &Next"
+msgstr "Suiva&nt"
+
+msgid "&Replace"
+msgstr "&Remplacer"
+
+msgid "Replace &All"
+msgstr "Rempl&acer tout"
+
+msgid "&Undo"
+msgstr "Ann&uler"
+
+msgid "Open tab..."
+msgstr "Ouvrir dans un onglet..."
+
+msgid "Find string (use '\\\\' to find  a '\\')"
+msgstr "Chercher une cha�ne (utilisez '\\\\' pour chercher un '\\')"
+
+msgid "Find & Replace (use '\\\\' to find  a '\\')"
+msgstr "Chercher et remplacer (utilisez '\\\\' pour trouver un '\\')"
+
+# DB - Traduction non indispensable puisque le code indique qu'il s'agit d'un
+#      param�trage bidon afin de s�lectionner un r�pertoire plut�t qu'un
+#      fichier.
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+msgid "Not Used"
+msgstr "Non utilis�"
+
+# DB - Traduction non indispensable puisque le code indique qu'il s'agit d'un
+#      param�trage bidon afin de s�lectionner un r�pertoire plut�t qu'un
+#      fichier.
+msgid "Directory\t*.nothing\n"
+msgstr "R�pertoire\t*.rien\n"
 
 #, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: L'option '%s' n'est pas activ�e"
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: Titre de fen�tre \"%s\" introuvable"
 
-msgid "E850: Invalid register name"
-msgstr "E850: Nom de registre invalide"
+#, c-format
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: Argument non support� : \"-%s\" ; Utilisez la version OLE."
 
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "La recherche a atteint le HAUT, et continue en BAS"
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: Impossible d'ouvrir une fen�tre dans une application MDI"
 
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "La recherche a atteint le BAS, et continue en HAUT"
+# DB - todo : perfectible.
+msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
+msgstr ""
+"Vim E458: Erreur d'allocation de couleurs, couleurs possiblement incorrectes"
+
+# DB - todo : La VF est-elle compr�hensible ?
+#, c-format
+msgid "E250: Fonts for the following charsets are missing in fontset %s:"
+msgstr ""
+"E250: Des polices manquent dans %s pour les jeux de caract�res suivants :"
+
+#, c-format
+msgid "E252: Fontset name: %s"
+msgstr "E252: Nom du jeu de polices : %s"
+
+#, c-format
+msgid "Font '%s' is not fixed-width"
+msgstr "La police '%s' n'a pas une largeur fixe"
+
+#, c-format
+msgid "E253: Fontset name: %s"
+msgstr "E253: Nom du jeu de polices : %s"
+
+#, c-format
+msgid "Font0: %s"
+msgstr "Font0: %s"
+
+#, c-format
+msgid "Font1: %s"
+msgstr "Font1: %s"
+
+#, c-format
+msgid "Font%ld width is not twice that of font0"
+msgstr "La largeur de Font%ld n'est pas le double de celle de Font0"
+
+#, c-format
+msgid "Font0 width: %ld"
+msgstr "Largeur de Font0 : %ld"
+
+#, c-format
+msgid "Font1 width: %ld"
+msgstr "Largeur de Font1 : %ld"
+
+# DB - todo : Pas certain de mon coup, ici...
+msgid "Invalid font specification"
+msgstr "La sp�cification de la police est invalide"
+
+msgid "&Dismiss"
+msgstr "Aban&donner"
+
+# DB - todo : Pas certain de mon coup, ici...
+msgid "no specific match"
+msgstr "aucune correspondance particuli�re"
+
+msgid "Vim - Font Selector"
+msgstr "Choisir une police - Vim"
+
+msgid "Name:"
+msgstr "Nom :"
+
+#. create toggle button
+msgid "Show size in Points"
+msgstr "Afficher la taille en Points"
+
+msgid "Encoding:"
+msgstr "Encodage :"
+
+msgid "Font:"
+msgstr "Police :"
+
+msgid "Style:"
+msgstr "Style :"
+
+msgid "Size:"
+msgstr "Taille :"
+
+msgid "E256: Hangul automata ERROR"
+msgstr "E256: ERREUR dans l'automate Hangul"
 
 msgid "E550: Missing colon"
 msgstr "E550: ':' manquant"
@@ -2778,6 +2705,9 @@ msgstr "E257: cstag : marqueur introuvable"
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: Erreur stat(%s) : %d"
 
+msgid "E563: stat error"
+msgstr "E563: Erreur stat"
+
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s n'est pas un r�pertoire ou une base de donn�es cscope valide"
@@ -2787,8 +2717,8 @@ msgid "Added cscope database %s"
 msgstr "Base de donn�es cscope %s ajout�e"
 
 #, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: erreur lors de la lecture de la connexion cscope %<PRId64>"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: erreur lors de la lecture de la connexion cscope %ld"
 
 msgid "E561: unknown cscope search type"
 msgstr "E561: type de recherche cscope inconnu"
@@ -2799,9 +2729,8 @@ msgstr "E566: Impossible de cr
 msgid "E622: Could not fork for cscope"
 msgstr "E622: Impossible de forker pour cscope"
 
-#, fuzzy
-#~ msgid "cs_create_connection setpgid failed"
-#~ msgstr "exec de cs_create_connection a �chou�"
+msgid "cs_create_connection setpgid failed"
+msgstr "cs_create_connection setpgid a �chou�"
 
 msgid "cs_create_connection exec failed"
 msgstr "exec de cs_create_connection a �chou�"
@@ -2857,6 +2786,14 @@ msgstr ""
 "       s: Trouver ce symbole C\n"
 "       t: Trouver cette cha�ne\n"
 
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: impossible d'ouvrir la base de donn�es cscope %s"
+
+msgid "E626: cannot get cscope database information"
+msgstr ""
+"E626: impossible d'obtenir des informations sur la base de donn�es cscope"
+
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: base de donn�es cscope redondante non ajout�e"
 
@@ -2900,6 +2837,221 @@ msgstr "aucune connexion cscope\n"
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    nom de la base de donn�es           chemin\n"
 
+msgid "Lua library cannot be loaded."
+msgstr "La biblioth�que Lua n'a pas pu �tre charg�e."
+
+msgid "cannot save undo information"
+msgstr "impossible d'enregistrer les informations d'annulation"
+
+msgid ""
+"E815: Sorry, this command is disabled, the MzScheme libraries could not be "
+"loaded."
+msgstr ""
+"E815: D�sol�, cette commande est d�sactiv�e : les biblioth�ques MzScheme "
+"n'ont pas pu �tre charg�es."
+
+msgid ""
+"E895: Sorry, this command is disabled, the MzScheme's racket/base module "
+"could not be loaded."
+msgstr ""
+"E895: D�sol�, cette commande est d�sactiv�e : le module MzScheme racket/base "
+"ne peut pas �tre charg�."
+
+msgid "invalid expression"
+msgstr "expression invalide"
+
+msgid "expressions disabled at compile time"
+msgstr "expressions d�sactiv�es lors de la compilation"
+
+msgid "hidden option"
+msgstr "option cach�e"
+
+msgid "unknown option"
+msgstr "option inconnue"
+
+msgid "window index is out of range"
+msgstr "num�ro de fen�tre hors limites"
+
+msgid "couldn't open buffer"
+msgstr "impossible d'ouvrir le tampon"
+
+msgid "cannot delete line"
+msgstr "impossible d'effacer la ligne"
+
+msgid "cannot replace line"
+msgstr "impossible de remplacer la ligne"
+
+msgid "cannot insert line"
+msgstr "impossible d'ins�rer la ligne"
+
+msgid "string cannot contain newlines"
+msgstr "une cha�ne ne peut pas contenir de saut-de-ligne"
+
+msgid "error converting Scheme values to Vim"
+msgstr "erreur lors de la conversion d'une valeur de Scheme � Vim"
+
+msgid "Vim error: ~a"
+msgstr "Erreur Vim : ~a"
+
+msgid "Vim error"
+msgstr "Erreur Vim"
+
+msgid "buffer is invalid"
+msgstr "tampon invalide"
+
+msgid "window is invalid"
+msgstr "fen�tre invalide"
+
+msgid "linenr out of range"
+msgstr "num�ro de ligne hors limites"
+
+msgid "not allowed in the Vim sandbox"
+msgstr "non autoris� dans le bac � sable"
+
+msgid "E836: This Vim cannot execute :python after using :py3"
+msgstr "E836: Vim ne peut pas ex�cuter :python apr�s avoir utilis� :py3"
+
+msgid ""
+"E263: Sorry, this command is disabled, the Python library could not be "
+"loaded."
+msgstr ""
+"E263: D�sol�, commande d�sactiv�e : la biblioth�que Python n'a pas pu �tre "
+"charg�e."
+
+msgid ""
+"E887: Sorry, this command is disabled, the Python's site module could not be "
+"loaded."
+msgstr ""
+"E887: D�sol�, commande d�sactiv�e : la biblioth�que Python n'a pas pu �tre "
+"charg�e."
+
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: Impossible d'invoquer Python r�cursivement"
+
+msgid "E837: This Vim cannot execute :py3 after using :python"
+msgstr "E837: Vim ne peut pas ex�cuter :py3 apr�s avoir utilis� :python"
+
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_ doit �tre une instance de cha�ne (String)"
+
+msgid ""
+"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
+msgstr ""
+"E266: D�sol�, commande d�sactiv�e : la biblioth�que Ruby n'a pas pu �tre "
+"charg�e."
+
+msgid "E267: unexpected return"
+msgstr "E267: � return � inattendu"
+
+msgid "E268: unexpected next"
+msgstr "E268: � next � inattendu"
+
+msgid "E269: unexpected break"
+msgstr "E269: � break � inattendu"
+
+msgid "E270: unexpected redo"
+msgstr "E270: � redo � inattendu"
+
+msgid "E271: retry outside of rescue clause"
+msgstr "E271: � retry � hors d'une clause � rescue �"
+
+msgid "E272: unhandled exception"
+msgstr "E272: Exception non prise en charge"
+
+# DB - todo
+#, c-format
+msgid "E273: unknown longjmp status %d"
+msgstr "E273: contexte de longjmp inconnu : %d"
+
+msgid "invalid buffer number"
+msgstr "num�ro de tampon invalide"
+
+msgid "not implemented yet"
+msgstr "pas encore impl�ment�"
+
+# DB - TODO : le contexte est celui d'une annulation.
+#. ???
+msgid "cannot set line(s)"
+msgstr "Impossible de remettre la/les ligne(s)"
+
+msgid "invalid mark name"
+msgstr "nom de marque invalide"
+
+msgid "mark not set"
+msgstr "marque non positionn�e"
+
+#, c-format
+msgid "row %d column %d"
+msgstr "ligne %d colonne %d"
+
+msgid "cannot insert/append line"
+msgstr "Impossible d'ins�rer/ajouter de lignes"
+
+msgid "line number out of range"
+msgstr "num�ro de ligne hors limites"
+
+msgid "unknown flag: "
+msgstr "drapeau inconnu : "
+
+msgid "unknown vimOption"
+msgstr "vimOption inconnue"
+
+msgid "keyboard interrupt"
+msgstr "interruption clavier"
+
+msgid "vim error"
+msgstr "erreur Vim"
+
+msgid "cannot create buffer/window command: object is being deleted"
+msgstr ""
+"Impossible de cr�er commande de tampon/fen�tre : objet en cours d'effacement"
+
+msgid ""
+"cannot register callback command: buffer/window is already being deleted"
+msgstr ""
+"Impossible d'inscrire la commande de rappel : tampon/fen�tre en effacement"
+
+#. This should never happen.  Famous last word?
+msgid ""
+"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
+"org"
+msgstr ""
+"E280: ERREUR FATALE TCL: reflist corrompue ?! Contactez vim-dev@vim.org, SVP."
+
+msgid "cannot register callback command: buffer/window reference not found"
+msgstr ""
+"Impossible d'inscrire la commande de rappel : r�f. tampon/fen�tre introuvable"
+
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
+msgstr ""
+"E571: D�sol�, commande d�sactiv�e: la biblioth�que Tcl n'a pas pu �tre "
+"charg�e."
+
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: code de sortie %d"
+
+msgid "cannot get line"
+msgstr "Impossible d'obtenir la ligne"
+
+msgid "Unable to register a command server name"
+msgstr "Impossible d'inscrire un nom de serveur de commande"
+
+msgid "E248: Failed to send command to the destination program"
+msgstr "E248: �chec de l'envoi de la commande au programme cible"
+
+#, c-format
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: Id utilis� pour le serveur invalide : %s"
+
+msgid "E251: VIM instance registry property is badly formed.  Deleted!"
+msgstr "E251: Entr�e registre de l'instance de Vim mal format�e. Suppression !"
+
+#, c-format
+msgid "E938: Duplicate key in JSON: \"%s\""
+msgstr "E938: Cl� dupliqu�e dans le document JSON : \"%s\""
+
 #, c-format
 msgid "E696: Missing comma in List: %s"
 msgstr "E696: Il manque une virgule dans la Liste %s"
@@ -2930,6 +3082,15 @@ msgstr "Argument invalide pour"
 msgid "%d files to edit\n"
 msgstr "%d fichiers � �diter\n"
 
+msgid "netbeans is not supported with this GUI\n"
+msgstr "netbeans n'est pas support� avec cette interface graphique\n"
+
+msgid "'-nb' cannot be used: not enabled at compile time\n"
+msgstr "'-nb' ne peut pas �tre utilis� : d�sactiv� � la compilation\n"
+
+msgid "This Vim was not compiled with the diff feature."
+msgstr "Ce Vim n'a pas �t� compil� avec la fonctionnalit� diff"
+
 msgid "Attempt to open script file again: \""
 msgstr "Nouvelle tentative pour ouvrir le script : \""
 
@@ -2939,6 +3100,14 @@ msgstr "Impossible d'ouvrir en lecture : \""
 msgid "Cannot open for script output: \""
 msgstr "Impossible d'ouvrir pour la sortie script : \""
 
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim : Erreur : Impossible de d�marrer gvim depuis NetBeans\n"
+
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr ""
+"Vim : Erreur : Cette version de Vim ne fonctionne pas dans un terminal "
+"Cygwin\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim : Alerte : La sortie ne s'effectue pas sur un terminal\n"
 
@@ -2991,6 +3160,15 @@ msgstr ""
 "\n"
 "    ou :"
 
+# DB - todo (VMS uniquement).
+msgid ""
+"\n"
+"Where case is ignored prepend / to make flag upper case"
+msgstr ""
+"\n"
+"pour lesquels la casse est indiff�rente (/ pour que le drapeau soit "
+"majuscule)"
+
 msgid ""
 "\n"
 "\n"
@@ -3006,6 +3184,20 @@ msgstr "--\t\tSeuls des noms de fichier sont sp
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\tNe pas d�velopper les m�tacaract�res"
 
+msgid "-register\t\tRegister this gvim for OLE"
+msgstr "-register\tInscrire ce gvim pour OLE"
+
+msgid "-unregister\t\tUnregister gvim for OLE"
+msgstr "-unregister\tD�sinscrire gvim de OLE"
+
+msgid "-g\t\t\tRun using GUI (like \"gvim\")"
+msgstr "-g\t\tLancer l'interface graphique (comme \"gvim\")"
+
+msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
+msgstr ""
+"-f, --nofork\tPremier-plan : ne pas d�tacher l'interface graphique du "
+"terminal"
+
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\tMode Vi (comme \"vi\")"
 
@@ -3066,6 +3258,12 @@ msgstr "-r <fichier>\tR
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\tComme -r"
 
+msgid "-f\t\t\tDon't use newcli to open window"
+msgstr "-f\t\tNe pas utiliser newcli pour l'ouverture des fen�tres"
+
+msgid "-dev <device>\t\tUse <device> for I/O"
+msgstr "-dev <p�riph>\tUtiliser <p�riph�rique> pour les E/S"
+
 msgid "-A\t\t\tstart in Arabic mode"
 msgstr "-A\t\tD�marrer en mode arabe"
 
@@ -3078,9 +3276,20 @@ msgstr "-F\t\tD
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <term>\tR�gler le type du terminal sur <terminal>"
 
+msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
+msgstr ""
+"--no-a-term\t\tAucun avertissement si l'entr�e/sortie n'est pas un terminal"
+
+msgid "--ttyfail\t\tExit if input or output is not a terminal"
+msgstr ""
+"--ttyfail\t\tQuitte si l'entr�e ou la sortie ne sont pas un terminal"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\tUtiliser <vimrc> au lieu du vimrc habituel"
 
+msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
+msgstr "-U <gvimrc>\tUtiliser <gvimrc> au lieu du gvimrc habituel"
+
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\tNe charger aucun greffon"
 
@@ -3118,6 +3327,53 @@ msgstr "-w <dest>\tAjouter toutes les commandes tap
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr "-W <dest>\t�crire toutes les commandes tap�es dans le fichier <dest>"
 
+msgid "-x\t\t\tEdit encrypted files"
+msgstr "-x\t\t\t�diter des fichiers chiffr�s"
+
+msgid "-display <display>\tConnect vim to this particular X-server"
+msgstr "-display <display>\tConnecter Vim au serveur X sp�cifi�"
+
+msgid "-X\t\t\tDo not connect to X server"
+msgstr "-X\t\t\tNe pas se connecter � un serveur X"
+
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <fich>\t�diter les <fichiers> dans un serveur Vim si possible"
+
+msgid "--remote-silent <files>  Same, don't complain if there is no server"
+msgstr ""
+"--remote-silent ...\tPareil, mais pas d'erreur s'il n'y a aucun serveur"
+
+msgid ""
+"--remote-wait <files>  As --remote but wait for files to have been edited"
+msgstr ""
+"--remote-wait <fich>\tComme --remote mais ne quitter qu'� la fin de l'�dition"
+
+msgid ""
+"--remote-wait-silent <files>  Same, don't complain if there is no server"
+msgstr ""
+"--remote-wait-silent\tPareil, mais pas d'erreur s'il n'y a aucun serveur"
+
+msgid ""
+"--remote-tab[-wait][-silent] <files>  As --remote but use tab page per file"
+msgstr ""
+"--remote-tab[-wait][-silent] <fich>\tComme --remote mais ouvrir un onglet "
+"pour chaque fichier"
+
+msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
+msgstr "--remote-send <tche>\tEnvoyer <touches> � un serveur Vim puis quitter"
+
+msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
+msgstr ""
+"--remote-expr <expr>\t�valuer <expr> dans un serveur Vim, afficher le "
+"r�sultat"
+
+msgid "--serverlist\t\tList available Vim server names and exit"
+msgstr ""
+"--serverlist\t\tLister les noms des serveurs Vim disponibles et quitter"
+
+msgid "--servername <name>\tSend to/become the Vim server <name>"
+msgstr "--servername <nom>\tEnvoyer au/devenir le serveur Vim nomm� <nom>"
+
 msgid "--startuptime <file>\tWrite startup timing messages to <file>"
 msgstr ""
 "--startuptime <fich>\t�crire les messages d'horodatage au d�marrage dans "
@@ -3132,6 +3388,120 @@ msgstr "-h ou --help\t\tAfficher l'aide (ce message) puis quitter"
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\tAfficher les informations de version et quitter"
 
+msgid ""
+"\n"
+"Arguments recognised by gvim (Motif version):\n"
+msgstr ""
+"\n"
+"Arguments reconnus par gvim (version Motif) :\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"Arguments reconnus par gvim (version neXtaw) :\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (Athena version):\n"
+msgstr ""
+"\n"
+"Arguments reconnus par gvim (version Athena) :\n"
+
+msgid "-display <display>\tRun vim on <display>"
+msgstr "-display <�cran>\tLancer Vim sur ce <display>"
+
+msgid "-iconic\t\tStart vim iconified"
+msgstr "-iconic\t\tIconifier Vim au d�marrage"
+
+msgid "-background <color>\tUse <color> for the background (also: -bg)"
+msgstr ""
+"-background <coul>\tUtiliser <couleur> pour l'arri�re-plan\t   (abrv : -bg)"
+
+msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
+msgstr ""
+"-foreground <coul>\tUtiliser <couleur> pour le texte normal\t   (abrv : -fg)"
+
+msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
+msgstr "-font <fonte>\tUtiliser <fonte> pour le texte normal\t   (abrv : -fn)"
+
+msgid "-boldfont <font>\tUse <font> for bold text"
+msgstr "-boldfont <fonte>\tUtiliser <fonte> pour le texte gras"
+
+msgid "-italicfont <font>\tUse <font> for italic text"
+msgstr "-italicfont <fonte>\tUtiliser <fonte> pour le texte italique"
+
+msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
+msgstr "-geometry <g�om>\tUtiliser cette <g�om�trie> initiale\t (abrv : -geom)"
+
+msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
+msgstr ""
+"-borderwidth <�pais>\tUtiliser cette <�paisseur> de bordure\t   (abrv : -bw)"
+
+msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
+msgstr ""
+"-scrollbarwidth <lg>\tUtiliser cette <largeur> de barre de d�fil. (abrv: -sw)"
+
+msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
+msgstr "-menuheight <haut>\tUtiliser cette <hauteur> de menu\t   (abrv : -mh)"
+
+msgid "-reverse\t\tUse reverse video (also: -rv)"
+msgstr "-reverse\t\tUtiliser la vid�o inverse\t\t   (abrv : -rv)"
+
+msgid "+reverse\t\tDon't use reverse video (also: +rv)"
+msgstr "+reverse\t\tNe pas utiliser de vid�o inverse\t   (abrv : +rv)"
+
+msgid "-xrm <resource>\tSet the specified resource"
+msgstr "-xrm <ressource>\tConfigurer la <ressource> sp�cifi�e"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (GTK+ version):\n"
+msgstr ""
+"\n"
+"Arguments reconnus par gvim (version GTK+) :\n"
+
+msgid "-display <display>\tRun vim on <display> (also: --display)"
+msgstr ""
+"-display <display>\tLancer Vim sur ce <display>\t(�galement : --display)"
+
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "--role <r�le>\tDonner un r�le pour identifier la fen�tre principale"
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\tOuvrir Vim dans un autre widget GTK"
+
+msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
+msgstr "--echo-wid\t\tGvim affiche l'ID de la fen�tre sur stdout"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <titre parent>\tOuvrir Vim dans une application parente"
+
+msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
+msgstr "--windowid <HWND>\tOuvrir Vim dans un autre widget win32"
+
+msgid "No display"
+msgstr "Aucun display"
+
+#. Failed to send, abort.
+msgid ": Send failed.\n"
+msgstr " : L'envoi a �chou�.\n"
+
+#. Let vim start normally.
+msgid ": Send failed. Trying to execute locally\n"
+msgstr " : L'envoi a �chou�. Tentative d'ex�cution locale\n"
+
+#, c-format
+msgid "%d of %d edited"
+msgstr "%d �dit�s sur %d"
+
+msgid "No display: Send expression failed.\n"
+msgstr "Aucun display : L'envoi de l'expression a �chou�.\n"
+
+msgid ": Send expression failed.\n"
+msgstr " : L'envoi de l'expression a �chou�.\n"
+
 msgid "No marks set"
 msgstr "Aucune marque positionn�e"
 
@@ -3188,6 +3558,30 @@ msgstr ""
 msgid "Missing '>'"
 msgstr "'>' manquant"
 
+msgid "E543: Not a valid codepage"
+msgstr "E543: Page de codes non valide"
+
+msgid "E284: Cannot set IC values"
+msgstr "E284: Impossible de r�gler les valeurs IC"
+
+msgid "E285: Failed to create input context"
+msgstr "E285: �chec de la cr�ation du contexte de saisie"
+
+msgid "E286: Failed to open input method"
+msgstr "E286: �chec de l'ouverture de la m�thode de saisie"
+
+msgid "E287: Warning: Could not set destroy callback to IM"
+msgstr ""
+"E287: Alerte : Impossible d'inscrire le callback de destruction dans la MS"
+
+msgid "E288: input method doesn't support any style"
+msgstr "E288: la m�thode de saisie ne supporte aucun style"
+
+msgid "E289: input method doesn't support my preedit type"
+msgstr ""
+"E289: le type de pr��dition de Vim n'est pas support� par la m�thode de "
+"saisie"
+
 msgid "E293: block was not locked"
 msgstr "E293: le bloc n'�tait pas verrouill�"
 
@@ -3215,6 +3609,9 @@ msgstr "E298: Bloc n
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: Bloc n�2 non r�cup�r� ?"
 
+msgid "E843: Error while updating swap file crypt"
+msgstr "E843: Erreur lors de la mise � jour du fichier d'�change crypt�"
+
 #. could not (re)open the swap file, what can we do????
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: Oups, le fichier d'�change a disparu !"
@@ -3229,7 +3626,6 @@ msgstr "E303: Impossible d'ouvrir fichier .swp pour \"%s\", r
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0() : bloc 0 non r�cup�r� ?!"
 
-#. no swap files found
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: Aucun fichier d'�change trouv� pour %s"
@@ -3275,6 +3671,12 @@ msgstr ""
 ",\n"
 "ou le fichier a �t� endommag�."
 
+#, c-format
+msgid ""
+"E833: %s is encrypted and this version of Vim does not support encryption"
+msgstr ""
+"E833: %s est chiffr� et cette version de Vim ne supporte pas le chiffrement"
+
 msgid " has been damaged (page size is smaller than minimum value).\n"
 msgstr " a �t� endommag� (taille de page inf�rieure � la valeur minimale).\n"
 
@@ -3289,6 +3691,40 @@ msgstr "Fichier original \"%s\""
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: Alerte : Le fichier original a pu �tre modifi�"
 
+#, c-format
+msgid "Swap file is encrypted: \"%s\""
+msgstr "Fichier d'�change chiffr� : \"%s\""
+
+msgid ""
+"\n"
+"If you entered a new crypt key but did not write the text file,"
+msgstr ""
+"\n"
+"Si vous avez tap� une nouvelle cl� de chiffrement mais n'avez pas enregistr� "
+"le fichier texte,"
+
+msgid ""
+"\n"
+"enter the new crypt key."
+msgstr ""
+"\n"
+"tapez la nouvelle cl� de chiffrement."
+
+msgid ""
+"\n"
+"If you wrote the text file after changing the crypt key press enter"
+msgstr ""
+"\n"
+"Si vous avez �crit le fichier texte apr�s avoir chang� la cl� de "
+"chiffrement, appuyez sur entr�e"
+
+msgid ""
+"\n"
+"to use the same key for text file and swap file"
+msgstr ""
+"\n"
+"afin d'utiliser la m�me cl� pour le fichier texte et le fichier d'�change"
+
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: Impossible de lire le bloc 1 de %s"
@@ -3360,6 +3796,11 @@ msgstr ""
 "Il est conseill� d'effacer maintenant le fichier .swp.\n"
 "\n"
 
+msgid "Using crypt key from swap file for the text file.\n"
+msgstr ""
+"Utilisation de la cl� de chiffrement du fichier d'�change pour le fichier "
+"texte.\n"
+
 #. use msg() to start the scrolling properly
 msgid "Swap files found:"
 msgstr "Fichiers d'�change trouv�s :"
@@ -3434,6 +3875,13 @@ msgstr ""
 msgid " (still running)"
 msgstr " (en cours d'ex�cution)"
 
+msgid ""
+"\n"
+"         [not usable with this version of Vim]"
+msgstr ""
+"\n"
+"         [inutilisable avec cette version de Vim]"
+
 msgid ""
 "\n"
 "         [not usable on this computer]"
@@ -3457,12 +3905,12 @@ msgid "E314: Preserve failed"
 msgstr "E314: �chec de la pr�servation"
 
 #, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get : num�ro de ligne invalide : %<PRId64>"
+msgid "E315: ml_get: invalid lnum: %ld"
+msgstr "E315: ml_get : num�ro de ligne invalide : %ld"
 
 #, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get : ligne %<PRId64> introuvable"
+msgid "E316: ml_get: cannot find line %ld"
+msgstr "E316: ml_get : ligne %ld introuvable"
 
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: mauvais id de pointeur de bloc 3"
@@ -3480,8 +3928,8 @@ msgid "deleted block 1?"
 msgstr "bloc 1 effac� ?"
 
 #, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: Ligne %<PRId64> introuvable"
+msgid "E320: Cannot find line %ld"
+msgstr "E320: Ligne %ld introuvable"
 
 msgid "E317: pointer block id wrong"
 msgstr "E317: mauvais id de pointeur de bloc"
@@ -3490,12 +3938,12 @@ msgid "pe_line_count is zero"
 msgstr "pe_line_count vaut z�ro"
 
 #, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: num�ro de ligne hors limites : %<PRId64> au-del� de la fin"
+msgid "E322: line number out of range: %ld past the end"
+msgstr "E322: num�ro de ligne hors limites : %ld au-del� de la fin"
 
 #, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: nombre de lignes erron� dans le bloc %<PRId64>"
+msgid "E323: line count wrong in block %ld"
+msgstr "E323: nombre de lignes erron� dans le bloc %ld"
 
 msgid "Stack size increases"
 msgstr "La taille de la pile s'accro�t"
@@ -3523,19 +3971,19 @@ msgstr "Lors de l'ouverture du fichier \""
 msgid "      NEWER than swap file!\n"
 msgstr "      PLUS R�CENT que le fichier d'�change !\n"
 
+#. Some of these messages are long to allow translation to
+#. * other languages.
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
 "    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
 "(1) Un autre programme est peut-�tre en train d'�diter ce fichier.\n"
 "    Si c'est le cas, faites attention � ne pas vous retrouver avec\n"
-"    deux versions diff�rentes du m�me fichier en faisant des modifications."
-
-msgid "  Quit, or continue with caution.\n"
-msgstr "  Quittez, ou continuez prudemment.\n"
+"    deux versions diff�rentes du m�me fichier en faisant des modifications.\n"
+"    Quitter ou continuer avec attention.\n"
 
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) Une session d'�dition de ce fichier a plant�.\n"
@@ -3600,21 +4048,9 @@ msgstr ""
 "&Quitter\n"
 "&Abandonner"
 
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
 msgid "E326: Too many swap files found"
 msgstr "E326: Trop de fichiers d'�change trouv�s"
 
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: M�moire �puis�e ! (allocation de %<PRIu64> octets)"
-
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: Une partie du chemin de l'�l�ment de menu n'est pas un sous-menu"
 
@@ -3649,6 +4085,9 @@ msgstr ""
 "\n"
 "--- Menus ---"
 
+msgid "Tear off this menu"
+msgstr "D�tacher ce menu"
+
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: Le chemin du menu doit conduire � un �l�ment de menu"
 
@@ -3679,6 +4118,9 @@ msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Nom de registre invalide : '%s'"
 
 # DB - todo : mettre � jour ?
+msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
+msgstr "Maintenance des messages : Dominique Pell� <dominique.pelle@gmail.com>"
+
 msgid "Interrupt: "
 msgstr "Interruption : "
 
@@ -3686,8 +4128,8 @@ msgid "Press ENTER or type command to continue"
 msgstr "Appuyez sur ENTR�E ou tapez une commande pour continuer"
 
 #, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s, ligne %<PRId64>"
+msgid "%s line %ld"
+msgstr "%s, ligne %ld"
 
 msgid "-- More --"
 msgstr "-- Plus --"
@@ -3706,15 +4148,6 @@ msgstr ""
 "&Oui\n"
 "&Non"
 
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"&Oui\n"
-"&Non\n"
-"&Annuler"
-
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -3728,6 +4161,21 @@ msgstr ""
 "Tout aban&donner\n"
 "&Annuler"
 
+# DB : Les trois messages qui suivent sont des titres de bo�tes
+#      de dialogue par d�faut.
+msgid "Select Directory dialog"
+msgstr "S�lecteur de r�pertoire"
+
+msgid "Save File dialog"
+msgstr "Enregistrer un fichier"
+
+msgid "Open File dialog"
+msgstr "Ouvrir un fichier"
+
+#. TODO: non-GUI file selector here
+msgid "E338: Sorry, no file browser in console mode"
+msgstr "E338: D�sol�, pas de s�lecteur de fichiers en mode console"
+
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: Pas assez d'arguments pour printf()"
 
@@ -3753,12 +4201,12 @@ msgid "1 line less"
 msgstr "1 ligne en moins"
 
 #, c-format
-msgid "%<PRId64> more lines"
-msgstr "%<PRId64> lignes en plus"
+msgid "%ld more lines"
+msgstr "%ld lignes en plus"
 
 #, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "%<PRId64> lignes en moins"
+msgid "%ld fewer lines"
+msgstr "%ld lignes en moins"
 
 msgid " (Interrupted)"
 msgstr " (Interrompu)"
@@ -3766,16 +4214,111 @@ msgstr " (Interrompu)"
 msgid "Beep!"
 msgstr "Bip !"
 
+msgid "ERROR: "
+msgstr "ERREUR : "
+
+#, c-format
+msgid ""
+"\n"
+"[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
+msgstr ""
+"\n"
+"[octets] total allou�-lib�r� %lu-%lu, utilis� %lu, pic %lu\n"
+
+#, c-format
+msgid ""
+"[calls] total re/malloc()'s %lu, total free()'s %lu\n"
+"\n"
+msgstr ""
+"[appels] total re/malloc() %lu, total free() %lu\n"
+"\n"
+
+msgid "E340: Line is becoming too long"
+msgstr "E340: La ligne devient trop longue"
+
+#, c-format
+msgid "E341: Internal error: lalloc(%ld, )"
+msgstr "E341: Erreur interne : lalloc(%ld, )"
+
+#, c-format
+msgid "E342: Out of memory!  (allocating %lu bytes)"
+msgstr "E342: M�moire �puis�e ! (allocation de %lu octets)"
+
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "Appel du shell pour ex�cuter : \"%s\""
 
+msgid "E545: Missing colon"
+msgstr "E545: ':' manquant"
+
+msgid "E546: Illegal mode"
+msgstr "E546: Mode non autoris�"
+
+msgid "E547: Illegal mouseshape"
+msgstr "E547: Forme de curseur invalide"
+
+msgid "E548: digit expected"
+msgstr "E548: chiffre attendu"
+
+msgid "E549: Illegal percentage"
+msgstr "E549: Pourcentage non autoris�"
+
+msgid "E854: path too long for completion"
+msgstr "E854: chemin trop long pour compl�tement"
+
+#, c-format
+msgid ""
+"E343: Invalid path: '**[number]' must be at the end of the path or be "
+"followed by '%s'."
+msgstr ""
+"E343: Chemin invalide : '**[nombre]' doit �tre � la fin du chemin ou �tre "
+"suivi de '%s'."
+
+#, c-format
+msgid "E344: Can't find directory \"%s\" in cdpath"
+msgstr "E344: R�pertoire \"%s\" introuvable dans 'cdpath'"
+
+#, c-format
+msgid "E345: Can't find file \"%s\" in path"
+msgstr "E345: Fichier \"%s\" introuvable dans 'path'"
+
+#, c-format
+msgid "E346: No more directory \"%s\" found in cdpath"
+msgstr "E346: Plus de r�pertoire \"%s\" dans 'cdpath'"
+
+#, c-format
+msgid "E347: No more file \"%s\" found in path"
+msgstr "E347: Plus de fichier \"%s\" dans 'path'"
+
+#, c-format
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr ""
+"E668: Mode d'acc�s incorrect au fichier d'infos de connexion NetBeans : \"%s"
+"\""
+
+#, c-format
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: Connexion NetBeans perdue pour le tampon %ld"
+
+msgid "E838: netbeans is not supported with this GUI"
+msgstr "E838: netbeans n'est pas support� avec cette interface graphique"
+
+msgid "E511: netbeans already connected"
+msgstr "E511: netbeans d�j� connect�"
+
+#, c-format
+msgid "E505: %s is read-only (add ! to override)"
+msgstr "E505: %s est en lecture seule (ajoutez ! pour passer outre)"
+
 msgid "E349: No identifier under cursor"
 msgstr "E349: Aucun identifiant sous le curseur"
 
 msgid "E774: 'operatorfunc' is empty"
 msgstr "E774: 'operatorfunc' est vide"
 
+msgid "E775: Eval feature not available"
+msgstr "E775: La fonctionnalit� d'�valuation n'est pas disponible"
+
 # DB : Il est ici question du mode Visuel.
 msgid "Warning: terminal cannot highlight"
 msgstr "Alerte : le terminal ne peut pas surligner"
@@ -3795,7 +4338,7 @@ msgstr "E662: Au d
 msgid "E663: At end of changelist"
 msgstr "E663: � la fin de la liste des modifications"
 
-msgid "Type  :quit<Enter>  to exit Nvim"
+msgid "Type  :quit<Enter>  to exit Vim"
 msgstr "tapez  :q<Entr�e>  pour quitter Vim"
 
 #, c-format
@@ -3807,23 +4350,23 @@ msgid "1 line %sed %d times"
 msgstr "1 ligne %s�e %d fois"
 
 #, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> lignes %s�es 1 fois"
+msgid "%ld lines %sed 1 time"
+msgstr "%ld lignes %s�es 1 fois"
 
 #, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> lignes %s�es %d fois"
+msgid "%ld lines %sed %d times"
+msgstr "%ld lignes %s�es %d fois"
 
 #, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "%<PRId64> lignes � indenter... "
+msgid "%ld lines to indent... "
+msgstr "%ld lignes � indenter... "
 
 msgid "1 line indented "
 msgstr "1 ligne indent�e "
 
 #, c-format
-msgid "%<PRId64> lines indented "
-msgstr "%<PRId64> lignes indent�es "
+msgid "%ld lines indented "
+msgstr "%ld lignes indent�es "
 
 msgid "E748: No previously used register"
 msgstr "E748: Aucun registre n'a �t� pr�c�demment utilis�"
@@ -3837,8 +4380,12 @@ msgid "1 line changed"
 msgstr "1 ligne modifi�e"
 
 #, c-format
-msgid "%<PRId64> lines changed"
-msgstr "%<PRId64> lignes modifi�es"
+msgid "%ld lines changed"
+msgstr "%ld lignes modifi�es"
+
+#, c-format
+msgid "freeing %ld lines"
+msgstr "lib�ration de %ld lignes"
 
 msgid "block of 1 line yanked"
 msgstr "bloc de 1 ligne copi�"
@@ -3847,12 +4394,12 @@ msgid "1 line yanked"
 msgstr "1 ligne copi�e"
 
 #, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "bloc de %<PRId64> lignes copi�"
+msgid "block of %ld lines yanked"
+msgstr "bloc de %ld lignes copi�"
 
 #, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "%<PRId64> lignes copi�es"
+msgid "%ld lines yanked"
+msgstr "%ld lignes copi�es"
 
 #, c-format
 msgid "E353: Nothing in register %s"
@@ -3880,45 +4427,47 @@ msgstr ""
 msgid "E574: Unknown register type %d"
 msgstr "E574: Type de registre %d inconnu"
 
+msgid ""
+"E883: search pattern and expression register may not contain two or more "
+"lines"
+msgstr ""
+"E883: le motif de recherche et le registre d'expression ne peuvent pas "
+"contenir deux lignes ou plus"
+
 #, c-format
-msgid "%<PRId64> Cols; "
-msgstr "%<PRId64> Colonnes ; "
+msgid "%ld Cols; "
+msgstr "%ld Colonnes ; "
+
+#, c-format
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+msgstr ""
+"%s%ld sur %ld Lignes ; %lld sur %lld Mots ; %lld sur %lld Octets s�lectionn�s"
 
 #, c-format
 msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
 msgstr ""
-"%s%<PRId64> sur %<PRId64> Lignes ; %<PRId64> sur %<PRId64> Mots ; %<PRId64> "
-"sur %<PRId64> Octets s�lectionn�s"
+"%s%ld sur %ld Lignes ; %lld sur %lld Mots ; %lld sur %lld Caract�res ; %lld "
+"sur %lld octets s�lectionn�s"
+
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+msgstr ""
+"Colonne %s sur %s ; Ligne %ld sur %ld ; Mot %lld sur %lld ; Octet %lld sur "
+"%lld"
 
 #, c-format
 msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
 msgstr ""
-"%s%<PRId64> sur %<PRId64> Lignes ; %<PRId64> sur %<PRId64> Mots ; %<PRId64> "
-"sur %<PRId64> Caract�res ; %<PRId64> sur %<PRId64> octets s�lectionn�s"
+"Colonne %s sur %s ; Ligne %ld sur %ld ; Mot %lld sur %lld ; Caract�re %lld "
+"sur %lld ; Octet %lld sur %lld"
 
 #, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
-msgstr ""
-"Colonne %s sur %s ; Ligne %<PRId64> sur %<PRId64> ; Mot %<PRId64> sur "
-"%<PRId64> ; Octet %<PRId64> sur %<PRId64>"
-
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
-msgstr ""
-"Colonne %s sur %s ; Ligne %<PRId64> sur %<PRId64> ; Mot %<PRId64> sur "
-"%<PRId64> ; Caract�re %<PRId64> sur %<PRId64> ; Octet %<PRId64> sur %<PRId64>"
-
-#, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr "(+%<PRId64> pour le BOM)"
+msgid "(+%ld for BOM)"
+msgstr "(+%ld pour le BOM)"
 
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Page %N"
@@ -3926,7 +4475,6 @@ msgstr "%<%f%h%m%=Page %N"
 msgid "Thanks for flying Vim"
 msgstr "Merci d'avoir choisi Vim"
 
-#. found a mismatch: skip
 msgid "E518: Unknown option"
 msgstr "E518: Option inconnue"
 
@@ -3956,6 +4504,12 @@ msgstr "Pour l'option %s"
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' ne doit pas �tre une cha�ne vide"
 
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: Impossible de modifier term dans l'interface graphique"
+
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: Utilisez \":gui\" pour d�marrer l'interface graphique"
+
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: 'backupext' et 'patchmode' sont �gaux"
 
@@ -3965,6 +4519,9 @@ msgstr "E834: Conflits avec la valeur de 'listchars'"
 msgid "E835: Conflicts with value of 'fillchars'"
 msgstr "E835: Conflits avec la valeur de 'fillchars'"
 
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: Non modifiable dans l'interface graphique GTK+ 2"
+
 msgid "E524: Missing colon"
 msgstr "E524: ':' manquant"
 
@@ -3984,6 +4541,21 @@ msgstr "E528: Une valeur ' doit 
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: contient des caract�res � largeur double non-imprimables"
 
+msgid "E596: Invalid font(s)"
+msgstr "E596: Police(s) invalide(s)"
+
+msgid "E597: can't select fontset"
+msgstr "E597: Impossible de s�lectionner un jeu de polices"
+
+msgid "E598: Invalid fontset"
+msgstr "E598: Jeu de polices invalide"
+
+msgid "E533: can't select wide font"
+msgstr "E533: Impossible de s�lectionner une police � largeur double"
+
+msgid "E534: Invalid wide font"
+msgstr "E534: Police � largeur double invalide"
+
 #, c-format
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: Caract�re invalide apr�s <%c>"
@@ -3995,6 +4567,9 @@ msgstr "E536: virgule requise"
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' doit �tre vide ou contenir %s"
 
+msgid "E538: No mouse support"
+msgstr "E538: La souris n'est pas support�e"
+
 # DB - Le code est sans ambigu�t� sur le caract�re manquant.
 #      � d�faut d'une traduction valable, au moins comprend-on
 #      ce qui se passe.
@@ -4011,7 +4586,7 @@ msgid "E590: A preview window already exists"
 msgstr "E590: Il existe d�j� une fen�tre de pr�visualisation"
 
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
-msgstr "W17: L'arabe requiert l'UTF-8, tapez ':set encoding=utf-8'"
+msgstr "W17: L'arabe n�cessite l'UTF-8, tapez ':set encoding=utf-8'"
 
 #, c-format
 msgid "E593: Need at least %d lines"
@@ -4071,19 +4646,105 @@ msgstr "E357: 'langmap' : Aucun caract
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap' : Caract�res surnum�raires apr�s point-virgule : %s"
 
-msgid ""
-"\n"
-"Cannot execute shell "
-msgstr ""
-"\n"
-"Impossible d'ex�cuter le shell "
+msgid "cannot open "
+msgstr "impossible d'ouvrir "
+
+msgid "VIM: Can't open window!\n"
+msgstr "VIM : Impossible d'ouvrir la fen�tre !\n"
+
+msgid "Need Amigados version 2.04 or later\n"
+msgstr "Amigados version 2.04 ou ult�rieure est n�cessaire\n"
+
+#, c-format
+msgid "Need %s version %ld\n"
+msgstr "%s version %ld est n�cessaire\n"
+
+msgid "Cannot open NIL:\n"
+msgstr "Impossible d'ouvrir NIL :\n"
+
+msgid "Cannot create "
+msgstr "Impossible de cr�er "
+
+#, c-format
+msgid "Vim exiting with %d\n"
+msgstr "Vim quitte avec %d\n"
+
+msgid "cannot change console mode ?!\n"
+msgstr "Impossible de modifier le mode de la console ?!\n"
+
+msgid "mch_get_shellsize: not a console??\n"
+msgstr "mch_get_shellsize : pas une console ?!\n"
+
+#. if Vim opened a window: Executing a shell may cause crashes
+msgid "E360: Cannot execute shell with -f option"
+msgstr "E360: Impossible d'ex�cuter un shell avec l'option -f"
+
+msgid "Cannot execute "
+msgstr "Impossible d'ex�cuter "
+
+msgid "shell "
+msgstr "le shell "
+
+msgid " returned\n"
+msgstr " a �t� retourn�\n"
+
+msgid "ANCHOR_BUF_SIZE too small."
+msgstr "ANCHOR_BUF_SIZE trop petit."
+
+msgid "I/O ERROR"
+msgstr "ERREUR d'E/S"
+
+msgid "Message"
+msgstr "Message"
+
+msgid "E237: Printer selection failed"
+msgstr "E237: La s�lection de l'imprimante a �chou�"
+
+# DB - Contenu des c-formats : Imprimante puis Port.
+#, c-format
+msgid "to %s on %s"
+msgstr "vers %s sur %s"
+
+#, c-format
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: Police d'imprimante inconnue : %s"
+
+#, c-format
+msgid "E238: Print error: %s"
+msgstr "E238: Erreur d'impression : %s"
+
+#, c-format
+msgid "Printing '%s'"
+msgstr "Impression de '%s'"
+
+#, c-format
+msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
+msgstr "E244: Jeu de caract�res \"%s\" invalide dans le nom de fonte \"%s\""
+
+#, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr "E244: Nom de qualit� \"%s\" invalide dans le nom de fonte \"%s\""
+
+#, c-format
+msgid "E245: Illegal char '%c' in font name \"%s\""
+msgstr "E245: Caract�re '%c' invalide dans le nom de fonte \"%s\""
+
+#, c-format
+msgid "Opening the X display took %ld msec"
+msgstr "L'ouverture du display X a pris %ld ms"
 
 msgid ""
 "\n"
-"shell returned "
+"Vim: Got X error\n"
 msgstr ""
 "\n"
-"le shell a retourn� "
+"Vim : R�ception d'une erreur X\n"
+
+msgid "Testing the X display failed"
+msgstr "Le test du display X a �chou�"
+
+msgid "Opening the X display timed out"
+msgstr "L'ouverture du display X a d�pass� le d�lai d'attente"
 
 msgid ""
 "\n"
@@ -4099,13 +4760,124 @@ msgstr ""
 "\n"
 "Impossible de modifier le contexte de s�curit� pour "
 
+#, c-format
+msgid "Could not set security context %s for %s"
+msgstr "Impossible d'initialiser le contexte de s�curit� %s pour %s"
+
+#, c-format
+msgid "Could not get security context %s for %s. Removing it!"
+msgstr ""
+"Impossible d'obtenir le contexte de s�curit� %s pour %s. Il sera supprim� !"
+
+msgid ""
+"\n"
+"Cannot execute shell sh\n"
+msgstr ""
+"\n"
+"Impossible d'ex�cuter le shell sh\n"
+
+msgid ""
+"\n"
+"shell returned "
+msgstr ""
+"\n"
+"le shell a retourn� "
+
+msgid ""
+"\n"
+"Cannot create pipes\n"
+msgstr ""
+"\n"
+"Impossible de cr�er des tuyaux (pipes)\n"
+
+msgid ""
+"\n"
+"Cannot fork\n"
+msgstr ""
+"\n"
+"Impossible de forker\n"
+
+msgid ""
+"\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"Impossible d'ex�cuter le shell "
+
+msgid ""
+"\n"
+"Command terminated\n"
+msgstr ""
+"\n"
+"Commande interrompue\n"
+
+msgid "XSMP lost ICE connection"
+msgstr "XSMP a perdu la connexion ICE"
+
 #, c-format
 msgid "dlerror = \"%s\""
 msgstr "dlerror = \"%s\""
 
+msgid "Opening the X display failed"
+msgstr "L'ouverture du display X a �chou�"
+
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP : prise en charge d'une requ�te save-yourself"
+
+msgid "XSMP opening connection"
+msgstr "XSMP : ouverture de la connexion"
+
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP : �chec de la surveillance de connexion ICE"
+
 #, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: Le fichier \"%s\" est introuvable dans 'path'"
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "XSMP : SmcOpenConnection a �chou� : %s"
+
+msgid "At line"
+msgstr "� la ligne"
+
+msgid "Could not load vim32.dll!"
+msgstr "Impossible de charger vim32.dll !"
+
+msgid "VIM Error"
+msgstr "Erreur VIM"
+
+msgid "Could not fix up function pointers to the DLL!"
+msgstr "Impossible d'initialiser les pointeurs de fonction vers la DLL !"
+
+# DB - Les �v�nements en question sont ceux des messages qui suivent.
+#, c-format
+msgid "Vim: Caught %s event\n"
+msgstr "Vim : �v�nement %s intercept�\n"
+
+msgid "close"
+msgstr "de fermeture"
+
+msgid "logoff"
+msgstr "de d�connexion"
+
+msgid "shutdown"
+msgstr "d'arr�t"
+
+msgid "E371: Command not found"
+msgstr "E371: Commande introuvable"
+
+msgid ""
+"VIMRUN.EXE not found in your $PATH.\n"
+"External commands will not pause after completion.\n"
+"See  :help win32-vimrun  for more information."
+msgstr ""
+"VIMRUN.EXE est introuvable votre $PATH.\n"
+"Les commandes externes ne feront pas de pause une fois termin�es.\n"
+"Consultez  :help win32-vimrun  pour plus d'informations."
+
+msgid "Vim Warning"
+msgstr "Alerte Vim"
+
+#, c-format
+msgid "shell returned %d"
+msgstr "le shell a retourn� %d"
 
 #, c-format
 msgid "E372: Too many %%%c in format string"
@@ -4140,6 +4912,15 @@ msgstr "E379: Nom de r
 msgid "E553: No more items"
 msgstr "E553: Plus d'�l�ments"
 
+msgid "E924: Current window was closed"
+msgstr "E924: La fen�tre courante doit �tre ferm�e"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: Le quickfix courant a chang�"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: La liste d'emplacements courante a chang�"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d sur %d)%s%s : "
@@ -4163,6 +4944,9 @@ msgstr "Aucune entr
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: �criture impossible, l'option 'buftype' est activ�e"
 
+msgid "Error file"
+msgstr "Fichier d'erreurs"
+
 msgid "E683: File name missing or invalid pattern"
 msgstr "E683: Nom de fichier manquant ou motif invalide"
 
@@ -4267,6 +5051,10 @@ msgstr "E554: Erreur de syntaxe dans %s{...}"
 msgid "External submatches:\n"
 msgstr "Sous-correspondances externes :\n"
 
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (regexp NFA) %s ne peut pas �tre r�p�t�"
+
 msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
 "used "
@@ -4274,6 +5062,9 @@ msgstr ""
 "E864: \\%#= peut �tre suivi uniquement de 0, 1 ou 2. Le moteur automatique "
 "sera utilis� "
 
+msgid "Switching to backtracking RE engine for pattern: "
+msgstr "Moteur RE avec backtracking utilis� pour le motif : "
+
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) Fin de regexp rencontr�e pr�matur�ment"
 
@@ -4281,17 +5072,21 @@ msgstr "E865: (NFA) Fin de regexp rencontr
 msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (regexp NFA) %c au mauvais endroit"
 
-#, fuzzy, c-format
-#~ msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-#~ msgstr "E877: (regexp NFA) Classe de caract�re invalide "
+#, c-format
+msgid "E877: (NFA regexp) Invalid character class: %ld"
+msgstr "E877: (regexp NFA) Classe de caract�re invalide : %ld"
 
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
 msgstr "E867: (NFA) Op�rateur inconnu '\\z%c'"
 
-#, fuzzy, c-format
-#~ msgid "E867: (NFA) Unknown operator '\\%%%c'"
-#~ msgstr "E867: (NFA) Op�rateur inconnu '\\z%c'"
+#, c-format
+msgid "E867: (NFA) Unknown operator '\\%%%c'"
+msgstr "E867: (NFA) Op�rateur inconnu '\\%%%c'"
+
+#. should never happen
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: Erreur lors de la construction du NFA avec classe d'�quivalence"
 
 #, c-format
 msgid "E869: (NFA) Unknown operator '\\@%c'"
@@ -4308,9 +5103,8 @@ msgstr "E871: (regexp NFA) Un multi ne peut pas suivre un multi !"
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (regexp NFA) Trop de '('"
 
-#, fuzzy
-#~ msgid "E879: (NFA regexp) Too many \\z("
-#~ msgstr "E872: (regexp NFA) Trop de '('"
+msgid "E879: (NFA regexp) Too many \\z("
+msgstr "E879: (regexp NFA) Trop de \\z("
 
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA regexp) erreur de terminaison"
@@ -4328,6 +5122,10 @@ msgstr ""
 msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
 msgstr "E876: (regexp NFA) Pas assez de m�moire pour stocker le NFA"
 
+msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+msgstr ""
+"E878: (NFA) Impossible d'allouer la m�moire pour parcourir les branches !"
+
 msgid ""
 "Could not open temporary log file for writing, displaying on stderr ... "
 msgstr ""
@@ -4526,13 +5324,6 @@ msgstr "E762: Un caract
 msgid "Compressing word tree..."
 msgstr "Compression de l'arbre des mots"
 
-msgid "E756: Spell checking is not enabled"
-msgstr "E756: La v�rification orthographique n'est pas activ�e"
-
-#, c-format
-msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
-msgstr "Alerte : Liste de mots \"%s.%s.spl\" ou \"%s.ascii.spl\" introuvable"
-
 #, c-format
 msgid "Reading spell file \"%s\""
 msgstr "Lecture du fichier orthographique \"%s\""
@@ -4581,6 +5372,10 @@ msgstr "
 msgid "Conversion in %s not supported: from %s to %s"
 msgstr "La conversion dans %s non support�e : de %s vers %s"
 
+#, c-format
+msgid "Conversion in %s not supported"
+msgstr "La conversion dans %s non support�e"
+
 #, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "Valeur de FLAG invalide dans %s ligne %d : %s"
@@ -4769,6 +5564,9 @@ msgstr "Drapeaux non reconnus dans %s ligne %d : %s"
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "%d mot(s) ignor�(s) avec des caract�res non-ASCII"
 
+msgid "E845: Insufficient memory, word list will be incomplete"
+msgstr "E845: m�moire insuffisante, liste de mots peut-�tre incompl�te"
+
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
 msgstr "%d noeuds compress�s sur %d ; %d (%d%%) restants "
@@ -4776,14 +5574,16 @@ msgstr "%d noeuds compress
 msgid "Reading back spell file..."
 msgstr "Relecture du fichier orthographique"
 
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
+#.
+#. * Go through the trie of good words, soundfold each word and add it to
+#. * the soundfold trie.
+#.
 msgid "Performing soundfolding..."
 msgstr "Analyse phon�tique en cours..."
 
 #, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "Nombre de mots apr�s l'analyse phon�tique : %<PRId64>"
+msgid "Number of words after soundfolding: %ld"
+msgstr "Nombre de mots apr�s l'analyse phon�tique : %ld"
 
 #, c-format
 msgid "Total number of words: %d"
@@ -4819,70 +5619,25 @@ msgstr "Termin
 
 # DB - todo : perfectible.
 #, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: 'spellfile' n'a pas %<PRId64> entr�es"
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' n'a pas %ld entr�es"
 
-#, fuzzy, c-format
-#~ msgid "Word '%.*s' removed from %s"
-#~ msgstr "Mot retir� de %s"
+#, c-format
+msgid "Word '%.*s' removed from %s"
+msgstr "Mot '%.*s' retir� de %s"
 
-#, fuzzy, c-format
-#~ msgid "Word '%.*s' added to %s"
-#~ msgstr "Mot ajout� dans %s"
+#, c-format
+msgid "Word '%.*s' added to %s"
+msgstr "Mot '%.*s' ajout� dans %s"
 
 msgid "E763: Word characters differ between spell files"
 msgstr ""
 "E763: Les caract�res de mots diff�rent entre les fichiers orthographiques"
 
-msgid "Sorry, no suggestions"
-msgstr "D�sol�, aucune suggestion"
-
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "D�sol�, seulement %<PRId64> suggestions"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "Remplacer \"%.*s\" par :"
-
-# DB - todo : l'int�r�t de traduire ce message m'�chappe.
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-msgid "E752: No previous spell replacement"
-msgstr "E752: Pas de suggestion orthographique pr�c�dente"
-
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: Introuvable : %s"
-
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: %s ne semble pas �tre un fichier .sug"
-
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: Fichier de suggestions obsol�te, mise � jour n�cessaire : %s"
-
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: Fichier .sug pr�vu pour une version de Vim plus r�cente : %s"
-
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: Le fichier .sug ne correspond pas au fichier .spl : %s"
-
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: Erreur lors de la lecture de fichier de suggestions : %s"
-
 #. This should have been checked when generating the .spl
-#. file.
+#. * file.
 msgid "E783: duplicate char in MAP entry"
-msgstr "E783: caract�res dupliqu� dans l'entr�e MAP"
+msgstr "E783: caract�re dupliqu� dans l'entr�e MAP"
 
 msgid "No Syntax items defined for this buffer"
 msgstr "Aucun �l�ment de syntaxe d�fini pour ce tampon"
@@ -4891,6 +5646,9 @@ msgstr "Aucun 
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Argument invalide : %s"
 
+msgid "syntax iskeyword "
+msgstr "syntaxe iskeyword "
+
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: Aucune grappe de syntaxe %s"
@@ -4970,6 +5728,10 @@ msgstr "E847: Trop d'inclusions de syntaxe"
 msgid "E789: Missing ']': %s"
 msgstr "E789: ']' manquant : %s"
 
+#, c-format
+msgid "E890: trailing char after ']': %s]%s"
+msgstr "E890: Caract�re surnum�raire apr�s ']': %s]%s"
+
 #, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: '=' manquant : %s"
@@ -4984,7 +5746,6 @@ msgstr "E848: Trop de grappes de syntaxe"
 msgid "E400: No cluster specified"
 msgstr "E400: Aucune grappe sp�cifi�e"
 
-#. end delimiter not found
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: D�limiteur de motif introuvable : %s"
@@ -5025,9 +5786,10 @@ msgstr "E409: Nom de groupe inconnu : %s"
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: Sous-commande de :syntax invalide : %s"
 
-#~ msgid ""
-#~ "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
-#~ msgstr ""
+msgid ""
+"  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
+msgstr ""
+"  TOTAL      NOMBRE MATCH   PLUS LENT   MOYEN     NOM                MOTIF"
 
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: boucle r�cursive lors du chargement de syncolor.vim"
@@ -5150,6 +5912,10 @@ msgstr ""
 msgid "Searching tags file %s"
 msgstr "Examen du fichier de marqueurs %s"
 
+#, c-format
+msgid "E430: Tag file path truncated for %s\n"
+msgstr "E430: Chemin de fichiers de marqueurs tronqu� pour %s\n"
+
 msgid "Ignoring long line in tags file"
 msgstr "Ignore longue ligne dans le fichier de marqueurs"
 
@@ -5158,8 +5924,8 @@ msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Erreur de format dans le fichier de marqueurs \"%s\""
 
 #, c-format
-msgid "Before byte %<PRId64>"
-msgstr "Avant l'octet %<PRId64>"
+msgid "Before byte %ld"
+msgstr "Avant l'octet %ld"
 
 #, c-format
 msgid "E432: Tags file not sorted: %s"
@@ -5210,14 +5976,28 @@ msgstr ""
 "\n"
 "--- Touches du terminal ---"
 
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "Impossible d'ouvrir $VIMRUNTIME/rgb.txt"
+
+msgid "new shell started\n"
+msgstr "nouveau shell d�marr�\n"
+
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim : Erreur lors de la lecture de l'entr�e, sortie...\n"
 
+# DB - Message de d�bogage.
+msgid "Used CUT_BUFFER0 instead of empty selection"
+msgstr "CUT_BUFFER0 utilis� plut�t qu'une s�lection vide"
+
 #. This happens when the FileChangedRO autocommand changes the
 #. * file in a way it becomes shorter.
-#, fuzzy
-#~ msgid "E881: Line count changed unexpectedly"
-#~ msgstr "E834: Le nombre de lignes a �t� chang� inopin�ment"
+msgid "E881: Line count changed unexpectedly"
+msgstr "E881: Le nombre de lignes a �t� chang� inopin�ment"
+
+# DB - Question O/N.
+#. must display the prompt
+msgid "No undo possible; continue anyway"
+msgstr "Annulation impossible ; continuer"
 
 #, c-format
 msgid "E828: Cannot open undo file for writing: %s"
@@ -5267,6 +6047,18 @@ msgstr "E822: Impossible d'ouvrir le fichier d'annulations en lecture : %s"
 msgid "E823: Not an undo file: %s"
 msgstr "E823: Ce n'est pas un fichier d'annulations : %s"
 
+#, c-format
+msgid "E832: Non-encrypted file has encrypted undo file: %s"
+msgstr "E832: Fichier non-chiffr� a un fichier d'annulations chiffr� : %s"
+
+#, c-format
+msgid "E826: Undo file decryption failed: %s"
+msgstr "E826: D�chiffrage du fichier d'annulation a �chou� : %s"
+
+#, c-format
+msgid "E827: Undo file is encrypted: %s"
+msgstr "E827: Le fichier d'annulations est chiffr� : %s"
+
 #, c-format
 msgid "E824: Incompatible undo file: %s"
 msgstr "E824: Fichier d'annulations incompatible : %s"
@@ -5287,8 +6079,8 @@ msgid "Already at newest change"
 msgstr "D�j� � la modification la plus r�cente"
 
 #, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "E830: Annulation n� %<PRId64> introuvable"
+msgid "E830: Undo number %ld not found"
+msgstr "E830: Annulation n� %ld introuvable"
 
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo : num�ros de ligne erron�s"
@@ -5312,8 +6104,8 @@ msgid "changes"
 msgstr "modifications"
 
 #, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s ; %s #%<PRId64> ; %s"
+msgid "%ld %s; %s #%ld  %s"
+msgstr "%ld %s ; %s #%ld ; %s"
 
 msgid "before"
 msgstr "avant"
@@ -5329,8 +6121,8 @@ msgid "number changes  when               saved"
 msgstr "num�ro modif.   instant            enregistr�"
 
 #, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "il y a %<PRId64> secondes"
+msgid "%ld seconds ago"
+msgstr "il y a %ld secondes"
 
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undojoin n'est pas autoris� apr�s une annulation"
@@ -5341,6 +6133,208 @@ msgstr "E439: la liste d'annulation est corrompue"
 msgid "E440: undo line missing"
 msgstr "E440: ligne d'annulation manquante"
 
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: La fonction %s existe d�j� (ajoutez ! pour la remplacer)"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: Une entr�e du Dictionnaire porte d�j� ce nom"
+
+msgid "E718: Funcref required"
+msgstr "E718: R�f�rence de fonction (Funcref) requise"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: Fonction inconnue : %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: Argument invalide : %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: Nom d'argument dupliqu� : %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: Trop d'arguments pour la fonction %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: Arguments invalides pour la fonction %s"
+
+# AB - V�rifier dans la litt�rature technique s'il n'existe pas une meilleure
+#      traduction pour "function call depth".
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr ""
+"E132: La profondeur d'appel de fonction est sup�rieure � 'maxfuncdepth'"
+
+# AB - Ce texte fait partie d'un message de d�bogage.
+#, c-format
+msgid "calling %s"
+msgstr "appel de %s"
+
+# AB - V�rifier.
+#, c-format
+msgid "%s aborted"
+msgstr "%s annul�e"
+
+# AB - Ce texte fait partie d'un message de d�bogage.
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s a retourn� #%ld"
+
+# AB - Ce texte fait partie d'un message de d�bogage.
+#, c-format
+msgid "%s returning %s"
+msgstr "%s a retourn� \"%s\""
+
+msgid "E699: Too many arguments"
+msgstr "E699: Trop d'arguments"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: Fonction inconnue : %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: La fonction a �t� effac�e: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: La fonction %s n'a pas re�u assez d'arguments"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: <SID> utilis� en dehors d'un script : %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: Appel d'une fonction � dict � sans Dictionnaire : %s"
+
+msgid "E129: Function name required"
+msgstr "E129: Nom de fonction requis"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr ""
+"E128: Le nom de la fonction doit commencer par une majuscule ou \"s:\": %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr ""
+"E884: Le nom de la fonction ne peut pas contenir le caract�re deux-points : "
+"%s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: Fonction non d�finie : %s"
+
+# AB - La version fran�aise est plus consistante que la version anglaise.
+# AB - Je suis partag� entre la concision d'une traduction assez litt�rale et
+#      la lourdeur d'une traduction plus correcte.
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: Il manque '(' apr�s %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: Impossible d'utiliser g: ici"
+
+#, c-format
+msgid "E932: Closure function should not be at top level: %s"
+msgstr ""
+"E932: une fonction fermeture ne devrait pas �tre au niveau principal : %s"
+
+msgid "E126: Missing :endfunction"
+msgstr "E126: Il manque :endfunction"
+
+#, c-format
+msgid "E707: Function name conflicts with variable: %s"
+msgstr "E707: Le nom de fonction entre en conflit avec la variable : %s"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr "E127: Impossible de red�finir fonction %s : d�j� utilis�e"
+
+# DB - Le contenu du "c-format" est le nom de la fonction.
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: Le nom de la fonction %s ne correspond pas le nom du script"
+
+# AB - Il est difficile de cr�er une version fran�aise qui fasse moins de 80
+#      caract�res de long, nom de la fonction compris : "It is in use" est une
+#      expression tr�s dense. Traductions possibles : "elle est utilis�e",
+#      "elle s'ex�cute" ou "elle est occup�e".
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: Impossible d'effacer %s : cette fonction est utilis�e"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: :return en dehors d'une fonction"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: Parenth�ses manquantes : %s"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit GUI version"
+msgstr ""
+"\n"
+"Version graphique MS-Windows 64 bits"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI version"
+msgstr ""
+"\n"
+"Version graphique MS-Windows 32 bits"
+
+msgid " with OLE support"
+msgstr " supportant l'OLE"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit console version"
+msgstr ""
+"\n"
+"Version console MS-Windows 64 bits"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit console version"
+msgstr ""
+"\n"
+"Version console MS-Windows 32 bits"
+
+msgid ""
+"\n"
+"MacOS X (unix) version"
+msgstr ""
+"\n"
+"Version MaxOS X (unix)"
+
+msgid ""
+"\n"
+"MacOS X version"
+msgstr ""
+"\n"
+"Version MacOS X"
+
+msgid ""
+"\n"
+"MacOS version"
+msgstr ""
+"\n"
+"Version MacOS"
+
+msgid ""
+"\n"
+"OpenVMS version"
+msgstr ""
+"\n"
+"Version OpenVMS"
+
 msgid ""
 "\n"
 "Included patches: "
@@ -5375,9 +6369,70 @@ msgstr ""
 "\n"
 "�norme version "
 
+msgid ""
+"\n"
+"Big version "
+msgstr ""
+"\n"
+"Grosse version "
+
+msgid ""
+"\n"
+"Normal version "
+msgstr ""
+"\n"
+"Version normale "
+
+msgid ""
+"\n"
+"Small version "
+msgstr ""
+"\n"
+"Petite version "
+
+msgid ""
+"\n"
+"Tiny version "
+msgstr ""
+"\n"
+"Version minuscule "
+
 msgid "without GUI."
 msgstr "sans interface graphique."
 
+msgid "with GTK3 GUI."
+msgstr "avec interface graphique GTK3."
+
+msgid "with GTK2-GNOME GUI."
+msgstr "avec interface graphique GTK2-GNOME."
+
+msgid "with GTK2 GUI."
+msgstr "avec interface graphique GTK2."
+
+msgid "with X11-Motif GUI."
+msgstr "avec interface graphique X11-Motif."
+
+msgid "with X11-neXtaw GUI."
+msgstr "avec interface graphique X11-neXtaw."
+
+msgid "with X11-Athena GUI."
+msgstr "avec interface graphique X11-Athena."
+
+msgid "with Photon GUI."
+msgstr "avec interface graphique Photon."
+
+msgid "with GUI."
+msgstr "avec une interface graphique."
+
+msgid "with Carbon GUI."
+msgstr "avec interface graphique Carbon."
+
+msgid "with Cocoa GUI."
+msgstr "avec interface graphique Cocoa."
+
+msgid "with (classic) GUI."
+msgstr "avec interface graphique (classic)."
+
 msgid "  Features included (+) or not (-):\n"
 msgstr "  Fonctionnalit�s incluses (+) ou non (-) :\n"
 
@@ -5399,6 +6454,24 @@ msgstr "      fichier exrc utilisateur : \""
 msgid "  2nd user exrc file: \""
 msgstr "  2me fichier exrc utilisateur : \""
 
+msgid "  system gvimrc file: \""
+msgstr "        fichier gvimrc syst�me : \""
+
+msgid "    user gvimrc file: \""
+msgstr "    fichier gvimrc utilisateur : \""
+
+msgid "2nd user gvimrc file: \""
+msgstr "2me fichier gvimrc utilisateur : \""
+
+msgid "3rd user gvimrc file: \""
+msgstr "3me fichier gvimrc utilisateur : \""
+
+msgid "       defaults file: \""
+msgstr " fichier de valeurs par d�faut : \""
+
+msgid "    system menu file: \""
+msgstr "          fichier menu syst�me : \""
+
 msgid "  fall-back for $VIM: \""
 msgstr "               $VIM par d�faut : \""
 
@@ -5408,6 +6481,9 @@ msgstr "        $VIMRUNTIME par d
 msgid "Compilation: "
 msgstr "Compilation : "
 
+msgid "Compiler: "
+msgstr "Compilateur : "
+
 msgid "Linking: "
 msgstr "�dition de liens : "
 
@@ -5429,26 +6505,17 @@ msgstr "Vim est un logiciel libre"
 msgid "Help poor children in Uganda!"
 msgstr "Aidez les enfants pauvres d'Ouganda !"
 
-msgid "type  :help nvim<Enter>       if you are new! "
-msgstr "tapez  :help nvim<Entr�e>       si vous �tes nouveau!             "
-
-msgid "type  :CheckHealth<Enter>     to optimize Nvim"
-msgstr "tapez  :CheckHealth<Entr�e>     pour optimiser Nvim               "
+msgid "type  :help iccf<Enter>       for information "
+msgstr "tapez  :help iccf<Entr�e>       pour plus d'informations          "
 
 msgid "type  :q<Enter>               to exit         "
 msgstr "tapez  :q<Entr�e>               pour sortir du programme          "
 
-msgid "type  :help<Enter>            for help        "
-msgstr "tapez  :help<Entr�e>            pour obtenir de l'aide            "
-
-msgid "type  :help iccf<Enter>       for information "
-msgstr "tapez  :help iccf<Entr�e>       pour plus d'informations          "
-
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "tapez  :help<Entr�e>  ou  <F1>  pour acc�der � l'aide en ligne    "
 
-msgid "type  :help version7<Enter>   for version info"
-msgstr "tapez  :help version7<Entr�e>   pour lire les notes de mise � jour"
+msgid "type  :help version8<Enter>   for version info"
+msgstr "tapez  :help version8<Entr�e>   pour lire les notes de mise � jour"
 
 # DB - Pour les trois messages qui suivent :
 #        :set cp
@@ -5462,6 +6529,27 @@ msgstr "tapez  :set nocp<Entr
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "tapez  :help cp-default<Entr�e>  pour plus d'info"
 
+msgid "menu  Help->Orphans           for information    "
+msgstr "menu  Aide->Orphelins            pour plus d'info"
+
+msgid "Running modeless, typed text is inserted"
+msgstr "Les modes sont d�sactiv�s, le texte saisi est ins�r�"
+
+msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
+msgstr "menu  �dition->R�glages Globaux->Insertion Permanente"
+
+# DB - todo
+msgid "                              for two modes      "
+msgstr "                                  pour les modes     "
+
+# DB - todo
+msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
+msgstr "menu  �dition->R�glages Globaux->Compatibilit� Vi"
+
+# DB - todo
+msgid "                              for Vim defaults   "
+msgstr "                                pour d�f. de Vim "
+
 msgid "Sponsor Vim development!"
 msgstr "Sponsorisez le d�veloppement de Vim !"
 
@@ -5506,1711 +6594,724 @@ msgstr "E445: Les modifications de l'autre fen
 msgid "E446: No file name under cursor"
 msgstr "E446: Aucun nom de fichier sous le curseur"
 
-#~ msgid "E831: bf_key_init() called with empty password"
-#~ msgstr "E831: bf_key_init() appel�e avec un mot de passe vide"
+#, c-format
+msgid "E447: Can't find file \"%s\" in path"
+msgstr "E447: Le fichier \"%s\" est introuvable dans 'path'"
 
-#~ msgid "E820: sizeof(uint32_t) != 4"
-#~ msgstr "E820: sizeof(uint32_t) != 4"
+#, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: ID invalide : %ld (doit �tre plus grand ou �gal � 1)"
 
-#~ msgid "E817: Blowfish big/little endian use wrong"
-#~ msgstr "E817: petit/gros boutisme incorrect dans blowfish"
+#, c-format
+msgid "E801: ID already taken: %ld"
+msgstr "E801: ID d�j� pris: %ld"
 
-#~ msgid "E818: sha256 test failed"
-#~ msgstr "E818: le test de sha256 a �chou�"
+msgid "List or number required"
+msgstr "Liste ou nombre requis"
 
-#~ msgid "E819: Blowfish test failed"
-#~ msgstr "E819: le test de blowfish a �chou�"
+#, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: ID invalide : %ld (doit �tre plus grand ou �gal � 1)"
 
-#~ msgid "Patch file"
-#~ msgstr "Fichier rustine"
+#, c-format
+msgid "E803: ID not found: %ld"
+msgstr "E803: ID introuvable : %ld"
 
-# AB - Textes des boutons de la bo�te de dialogue affich�e par inputdialog().
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "&Ok\n"
-#~ "&Annuler"
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: Impossible de charger la biblioth�que %s"
 
-# AB - � mon avis, la version anglaise est erron�e.
-# DB : V�rifier
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: Pas de connexion au serveur X"
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"D�sol�, commande d�sactiv�e : la biblioth�que Perl n'a pas pu �tre charg�e."
 
-# AB - La version fran�aise est meilleure que la version anglaise.
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: L'envoi au serveur %s � �chou�"
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr "E299: �valuation Perl interdite dans bac � sable sans le module Safe"
 
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: Impossible de lire la r�ponse du serveur"
+msgid "Edit with &multiple Vims"
+msgstr "�diter dans &plusieurs Vims"
 
-# AB - La version fran�aise est meilleure que la version anglaise.
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: La r�ponse n'a pas pu �tre envoy�e au client"
+msgid "Edit with single &Vim"
+msgstr "�diter dans un seul &Vim"
 
-# AB - Ceci est un titre de bo�te de dialogue. V�rifier que la version
-#      fran�aise est correcte pour les trois r�f�rences ; j'ai un doute quant
-#      � la troisi�me.
-#~ msgid "Save As"
-#~ msgstr "Enregistrer sous - Vim"
+msgid "Diff with Vim"
+msgstr "&Comparer avec Vim"
 
-# AB - Ceci est un titre de bo�te de dialogue.
-#~ msgid "Edit File"
-#~ msgstr "Ouvrir un fichier - Vim"
+msgid "Edit with &Vim"
+msgstr "�diter dans &Vim"
 
-#~ msgid " (NOT FOUND)"
-#~ msgstr "  (INTROUVABLE)"
+#. Now concatenate
+msgid "Edit with existing Vim - "
+msgstr "�diter dans le Vim existant - "
 
-#~ msgid "Source Vim script"
-#~ msgstr "Sourcer un script - Vim"
-
-#~ msgid "unknown"
-#~ msgstr "inconnu"
-
-#~ msgid "Edit File in new window"
-#~ msgstr "Ouvrir un fichier dans une nouvelle fen�tre - Vim"
-
-#~ msgid "Append File"
-#~ msgstr "Ajouter fichier"
-
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "Position de la fen�tre : X %d, Y %d"
-
-#~ msgid "Save Redirection"
-#~ msgstr "Enregistrer la redirection"
-
-#~ msgid "Save View"
-#~ msgstr "Enregistrer la vue - Vim"
-
-#~ msgid "Save Session"
-#~ msgstr "Enregistrer la session - Vim"
-
-#~ msgid "Save Setup"
-#~ msgstr "Enregistrer les r�glages - Vim"
-
-#~ msgid "E809: #< is not available without the +eval feature"
-#~ msgstr "E809: #< n'est pas disponible sans la fonctionnalit� +eval"
-
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: Pas de digraphes dans cette version"
-
-#~ msgid "is a device (disabled with 'opendevice' option)"
-#~ msgstr "est un p�riph�rique (d�sactiv� par l'option 'opendevice')"
-
-#~ msgid "Reading from stdin..."
-#~ msgstr "Lecture de stdin..."
-
-#~ msgid "[crypted]"
-#~ msgstr "[chiffr�]"
-
-#~ msgid "E821: File is encrypted with unknown method"
-#~ msgstr "E821: Le fichier est chiffr� avec une m�thode inconnue"
-
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeans interdit l'�criture des tampons non modifi�s"
-
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "Netbeans interdit l'�criture partielle de ses tampons"
-
-#~ msgid "writing to device disabled with 'opendevice' option"
-#~ msgstr "�criture vers un p�riph�rique d�sactiv� par l'option 'opendevice'"
-
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr ""
-#~ "E460: Les ressources partag�es seraient perdues (ajoutez ! pour passer "
-#~ "outre)"
-
-#~ msgid "E851: Failed to create a new process for the GUI"
-#~ msgstr ""
-#~ "E851: �chec lors de la cr�ation d'un nouveau processus pour l'interface "
-#~ "graphique"
-
-#~ msgid "E852: The child process failed to start the GUI"
-#~ msgstr ""
-#~ "E852: Le processus fils n'a pas r�ussi � d�marrer l'interface graphique"
-
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: Impossible de d�marrer l'interface graphique"
-
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: Impossible de lire \"%s\""
-
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr ""
-#~ "E665: Impossible de d�marrer l'IHM graphique, aucune police valide trouv�e"
-
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: 'guifontwide' est invalide"
-
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: Valeur de 'imactivatekey' invalide"
-
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: Impossible d'allouer la couleur %s"
-
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "Aucune correspondance sous le curseur, recherche de la suivante"
-
-#~ msgid "<cannot open> "
-#~ msgstr "<impossible d'ouvrir> "
-
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile : impossible d'obtenir la police %s"
-
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr ""
-#~ "E614: vim_SelFile : impossible de revenir dans le r�pertoire courant"
-
-#~ msgid "Pathname:"
-#~ msgstr "Chemin :"
-
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile : impossible d'obtenir le r�pertoire courant"
-
-#~ msgid "OK"
-#~ msgstr "Ok"
-
-#~ msgid "Cancel"
-#~ msgstr "Annuler"
-
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr ""
-#~ "Widget scrollbar : Impossible d'obtenir la g�om�trie du pixmap 'thumb'"
-
-#~ msgid "Vim dialog"
-#~ msgstr "Vim"
-
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr "E232: Impossible de cr�er un BalloonEval avec message ET callback"
-
-msgid "Yes"
-msgstr "Oui"
-
-msgid "No"
-msgstr "Non"
-
-# todo '_' is for hotkey, i guess?
-#~ msgid "Input _Methods"
-#~ msgstr "_M�thodes de saisie"
-
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "Remplacer - Vim"
-
-#~ msgid "VIM - Search..."
-#~ msgstr "Rechercher - Vim"
-
-#~ msgid "Find what:"
-#~ msgstr "Rechercher :"
-
-#~ msgid "Replace with:"
-#~ msgstr "Remplacer par :"
-
-#~ msgid "Match whole word only"
-#~ msgstr "Mots entiers seulement"
-
-#~ msgid "Match case"
-#~ msgstr "Respecter la casse"
-
-#~ msgid "Direction"
-#~ msgstr "Direction"
-
-#~ msgid "Up"
-#~ msgstr "Haut"
-
-#~ msgid "Down"
-#~ msgstr "Bas"
-
-#~ msgid "Find Next"
-#~ msgstr "Suivant"
-
-#~ msgid "Replace"
-#~ msgstr "Remplacer"
-
-#~ msgid "Replace All"
-#~ msgstr "Remplacer tout"
-
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr ""
-#~ "Vim : Une requ�te \"die\" a �t� re�ue par le gestionnaire de session\n"
-
-#~ msgid "Close tab"
-#~ msgstr "Fermer l'onglet"
-
-#~ msgid "New tab"
-#~ msgstr "Nouvel onglet"
-
-# DB - todo : un peu long. Cet entr�e de menu permet d'ouvrir un fichier
-#      dans un nouvel onglet via le s�lecteur de fichiers graphique.
-#~ msgid "Open Tab..."
-#~ msgstr "Ouvrir dans un onglet..."
-
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim : Fen�tre principale d�truite inopin�ment\n"
-
-#~ msgid "&Filter"
-#~ msgstr "&Filtrer"
-
-#~ msgid "&Cancel"
-#~ msgstr "&Annuler"
-
-#~ msgid "Directories"
-#~ msgstr "R�pertoires"
-
-#~ msgid "Filter"
-#~ msgstr "Filtre"
-
-#~ msgid "&Help"
-#~ msgstr "&Aide"
-
-#~ msgid "Files"
-#~ msgstr "Fichiers"
-
-#~ msgid "&OK"
-#~ msgstr "&Ok"
-
-#~ msgid "Selection"
-#~ msgstr "S�lection"
-
-#~ msgid "Find &Next"
-#~ msgstr "Suiva&nt"
-
-#~ msgid "&Replace"
-#~ msgstr "&Remplacer"
-
-#~ msgid "Replace &All"
-#~ msgstr "Rempl&acer tout"
-
-#~ msgid "&Undo"
-#~ msgstr "Ann&uler"
-
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: Titre de fen�tre \"%s\" introuvable"
-
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: Argument non support� : \"-%s\" ; Utilisez la version OLE."
-
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: Impossible d'ouvrir une fen�tre dans une application MDI"
-
-#~ msgid "Open tab..."
-#~ msgstr "Ouvrir dans un onglet..."
-
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "Chercher une cha�ne (utilisez '\\\\' pour chercher un '\\')"
-
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "Chercher et remplacer (utilisez '\\\\' pour trouver un '\\')"
-
-# DB - Traduction non indispensable puisque le code indique qu'il s'agit d'un
-#      param�trage bidon afin de s�lectionner un r�pertoire plut�t qu'un
-#      fichier.
-#~ msgid "Not Used"
-#~ msgstr "Non utilis�"
-
-# DB - Traduction non indispensable puisque le code indique qu'il s'agit d'un
-#      param�trage bidon afin de s�lectionner un r�pertoire plut�t qu'un
-#      fichier.
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "R�pertoire\t*.rien\n"
-
-# DB - todo : perfectible.
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr ""
-#~ "Vim E458: Erreur d'allocation de couleurs, couleurs possiblement "
-#~ "incorrectes"
-
-# DB - todo : La VF est-elle compr�hensible ?
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr ""
-#~ "E250: Des polices manquent dans %s pour les jeux de caract�res suivants :"
-
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: Nom du jeu de polices : %s"
-
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "La police '%s' n'a pas une largeur fixe"
-
-#~ msgid "E253: Fontset name: %s\n"
-#~ msgstr "E253: Nom du jeu de polices : %s\n"
-
-#~ msgid "Font0: %s\n"
-#~ msgstr "Font0: %s\n"
-
-#~ msgid "Font1: %s\n"
-#~ msgstr "Font1: %s\n"
-
-#~ msgid "Font%<PRId64> width is not twice that of font0\n"
-#~ msgstr "La largeur de Font%<PRId64> n'est pas le double de celle de Font0\n"
-
-#~ msgid "Font0 width: %<PRId64>\n"
-#~ msgstr "Largeur de Font0 : %<PRId64>\n"
-
-#~ msgid ""
-#~ "Font1 width: %<PRId64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Largeur de Font1 : %<PRId64>\n"
-#~ "\n"
-
-# DB - todo : Pas certain de mon coup, ici...
-#~ msgid "Invalid font specification"
-#~ msgstr "La sp�cification de la police est invalide"
-
-#~ msgid "&Dismiss"
-#~ msgstr "Aban&donner"
-
-# DB - todo : Pas certain de mon coup, ici...
-#~ msgid "no specific match"
-#~ msgstr "aucune correspondance particuli�re"
-
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Choisir une police - Vim"
-
-#~ msgid "Name:"
-#~ msgstr "Nom :"
-
-#~ msgid "Show size in Points"
-#~ msgstr "Afficher la taille en Points"
-
-#~ msgid "Encoding:"
-#~ msgstr "Encodage :"
-
-#~ msgid "Font:"
-#~ msgstr "Police :"
-
-#~ msgid "Style:"
-#~ msgstr "Style :"
-
-#~ msgid "Size:"
-#~ msgstr "Taille :"
-
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: ERREUR dans l'automate Hangul"
-
-#~ msgid "E563: stat error"
-#~ msgstr "E563: Erreur stat"
-
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: impossible d'ouvrir la base de donn�es cscope %s"
-
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr ""
-#~ "E626: impossible d'obtenir des informations sur la base de donn�es cscope"
-
-#~ msgid "Lua library cannot be loaded."
-#~ msgstr "La biblioth�que Lua n'a pas pu �tre charg�e."
-
-#~ msgid "cannot save undo information"
-#~ msgstr "impossible d'enregistrer les informations d'annulation"
-
-#~ msgid ""
-#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
-#~ "be loaded."
-#~ msgstr ""
-#~ "E815: D�sol�, cette commande est d�sactiv�e : les biblioth�ques MzScheme "
-#~ "n'ont pas pu �tre charg�es."
-
-#~ msgid "invalid expression"
-#~ msgstr "expression invalide"
-
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "expressions d�sactiv�e lors de la compilation"
-
-#~ msgid "hidden option"
-#~ msgstr "option cach�e"
-
-#~ msgid "unknown option"
-#~ msgstr "option inconnue"
-
-#~ msgid "window index is out of range"
-#~ msgstr "num�ro de fen�tre hors limites"
-
-#~ msgid "couldn't open buffer"
-#~ msgstr "impossible d'ouvrir le tampon"
-
-#~ msgid "cannot delete line"
-#~ msgstr "impossible d'effacer la ligne"
-
-#~ msgid "cannot replace line"
-#~ msgstr "impossible de remplacer la ligne"
-
-#~ msgid "cannot insert line"
-#~ msgstr "impossible d'ins�rer la ligne"
-
-#~ msgid "string cannot contain newlines"
-#~ msgstr "une cha�ne ne peut pas contenir de saut-de-ligne"
-
-#~ msgid "error converting Scheme values to Vim"
-#~ msgstr "erreur lors de la conversion d'une valeur de Scheme � Vim"
-
-#~ msgid "Vim error: ~a"
-#~ msgstr "Erreur Vim : ~a"
-
-#~ msgid "Vim error"
-#~ msgstr "Erreur Vim"
-
-#~ msgid "buffer is invalid"
-#~ msgstr "tampon invalide"
-
-#~ msgid "window is invalid"
-#~ msgstr "fen�tre invalide"
-
-#~ msgid "linenr out of range"
-#~ msgstr "num�ro de ligne hors limites"
-
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "non autoris� dans le bac � sable"
-
-#~ msgid "E836: This Vim cannot execute :python after using :py3"
-#~ msgstr "E836: Vim ne peut pas ex�cuter :python apr�s avoir utilis� :py3"
-
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E263: D�sol�, commande d�sactiv�e : la biblioth�que Python n'a pas pu "
-#~ "�tre charg�e."
-
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: Impossible d'invoquer Python r�cursivement"
-
-#~ msgid "E837: This Vim cannot execute :py3 after using :python"
-#~ msgstr "E837: Vim ne peut pas ex�cuter :py3 apr�s avoir utilis� :python"
-
-#~ msgid "index must be int or slice"
-#~ msgstr "index doit �tre int ou slice"
-
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr "E265: $_ doit �tre une instance de cha�ne (String)"
-
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E266: D�sol�, commande d�sactiv�e : la biblioth�que Ruby n'a pas pu �tre "
-#~ "charg�e."
-
-#~ msgid "E267: unexpected return"
-#~ msgstr "E267: � return � inattendu"
-
-#~ msgid "E268: unexpected next"
-#~ msgstr "E268: � next � inattendu"
-
-#~ msgid "E269: unexpected break"
-#~ msgstr "E269: � break � inattendu"
-
-#~ msgid "E270: unexpected redo"
-#~ msgstr "E270: � redo � inattendu"
-
-#~ msgid "E271: retry outside of rescue clause"
-#~ msgstr "E271: � retry � hors d'une clause � rescue �"
-
-#~ msgid "E272: unhandled exception"
-#~ msgstr "E272: Exception non prise en charge"
-
-# DB - todo
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: contexte de longjmp inconnu : %d"
-
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "Basculer impl�mentation/d�finition"
-
-#~ msgid "Show base class of"
-#~ msgstr "Montrer la classe de base de"
-
-#~ msgid "Show overridden member function"
-#~ msgstr "Montrer les fonctions membres surcharg�es"
-
-#~ msgid "Retrieve from file"
-#~ msgstr "R�cup�rer du fichier"
-
-#~ msgid "Retrieve from project"
-#~ msgstr "R�cup�rer du projet"
-
-#~ msgid "Retrieve from all projects"
-#~ msgstr "R�cup�rer de tous les projets"
-
-#~ msgid "Retrieve"
-#~ msgstr "R�cup�rer"
-
-#~ msgid "Show source of"
-#~ msgstr "Montrer source de"
-
-#~ msgid "Find symbol"
-#~ msgstr "Trouver symbole"
-
-#~ msgid "Browse class"
-#~ msgstr "Parcourir classe"
-
-#~ msgid "Show class in hierarchy"
-#~ msgstr "Montrer classe dans hi�rarchie"
-
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "Montrer classe dans hi�rarchie restreinte"
-
-# todo
-#~ msgid "Xref refers to"
-#~ msgstr "Xref r�f�rence"
-
-#~ msgid "Xref referred by"
-#~ msgstr "Xref est r�f�renc� par"
-
-#~ msgid "Xref has a"
-#~ msgstr "Xref a un(e)"
-
-#~ msgid "Xref used by"
-#~ msgstr "Xref utilis�e par"
-
-#~ msgid "Show docu of"
-#~ msgstr "Montrer doc de"
-
-#~ msgid "Generate docu for"
-#~ msgstr "G�n�rer la doc de"
-
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "Connexion � SNiFF+ impossible. V�rifiez l'environnement (sniffemacs doit "
-#~ "�tre dans le $PATH).\n"
-
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff : Erreur de lecture. D�connexion"
-
-# DB - Les trois messages suivants vont ensembles.
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "SNiFF+ est actuellement "
-
-#~ msgid "not "
-#~ msgstr "d�"
-
-#~ msgid "connected"
-#~ msgstr "connect�"
-
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: Requ�te SNiFF+ inconnue : %s"
-
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: Erreur lors de la connexion � SNiFF+"
-
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: SNiFF+ n'est pas connect�"
-
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: Ce tampon n'est pas un tampon SNiFF+"
-
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff : Erreur lors d'une �criture. D�connexion"
-
-#~ msgid "invalid buffer number"
-#~ msgstr "num�ro de tampon invalide"
-
-#~ msgid "not implemented yet"
-#~ msgstr "pas encore impl�ment�"
-
-# DB - TODO : le contexte est celui d'une annulation.
-#~ msgid "cannot set line(s)"
-#~ msgstr "Impossible de remettre la/les ligne(s)"
-
-#~ msgid "invalid mark name"
-#~ msgstr "nom de marque invalide"
-
-#~ msgid "mark not set"
-#~ msgstr "marque non positionn�e"
-
-#~ msgid "row %d column %d"
-#~ msgstr "ligne %d colonne %d"
-
-#~ msgid "cannot insert/append line"
-#~ msgstr "Impossible d'ins�rer/ajouter de lignes"
-
-#~ msgid "line number out of range"
-#~ msgstr "num�ro de ligne hors limites"
-
-#~ msgid "unknown flag: "
-#~ msgstr "drapeau inconnu : "
-
-#~ msgid "unknown vimOption"
-#~ msgstr "vimOption inconnue"
-
-#~ msgid "keyboard interrupt"
-#~ msgstr "interruption clavier"
-
-#~ msgid "vim error"
-#~ msgstr "erreur Vim"
-
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr ""
-#~ "Impossible de cr�er commande de tampon/fen�tre : objet en cours "
-#~ "d'effacement"
-
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr ""
-#~ "Impossible d'inscrire la commande de rappel : tampon/fen�tre en effacement"
-
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr ""
-#~ "E280: ERREUR FATALE TCL: reflist corrompue ?! Contactez vim-dev@vim.org, "
-#~ "SVP."
-
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr ""
-#~ "Impossible d'inscrire la commande de rappel : r�f. tampon/fen�tre "
-#~ "introuvable"
-
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E571: D�sol�, commande d�sactiv�e: la biblioth�que Tcl n'a pas pu �tre "
-#~ "charg�e."
-
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: code de sortie %d"
-
-#~ msgid "cannot get line"
-#~ msgstr "Impossible d'obtenir la ligne"
-
-#~ msgid "Unable to register a command server name"
-#~ msgstr "Impossible d'inscrire un nom de serveur de commande"
-
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: �chec de l'envoi de la commande au programme cible"
-
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: Id utilis� pour le serveur invalide : %s"
-
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr ""
-#~ "E251: Entr�e registre de l'instance de Vim mal format�e. Suppression !"
-
-#~ msgid "netbeans is not supported with this GUI\n"
-#~ msgstr "netbeans n'est pas support� avec cette interface graphique\n"
-
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "Ce Vim n'a pas �t� compil� avec la fonctionnalit� diff"
-
-#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
-#~ msgstr "'-nb' ne peut pas �tre utilis� : d�sactiv� � la compilation\n"
-
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim : Erreur : Impossible de d�marrer gvim depuis NetBeans\n"
-
-# DB - todo (VMS uniquement).
-#~ msgid ""
-#~ "\n"
-#~ "Where case is ignored prepend / to make flag upper case"
-#~ msgstr ""
-#~ "\n"
-#~ "pour lesquels la casse est indiff�rente (/ pour que le drapeau soit "
-#~ "majuscule)"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\tInscrire ce gvim pour OLE"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\tD�sinscrire gvim de OLE"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\tLancer l'interface graphique (comme \"gvim\")"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr ""
-#~ "-f, --nofork\tPremier-plan : ne pas d�tacher l'interface graphique du "
-#~ "terminal"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\tNe pas utiliser newcli pour l'ouverture des fen�tres"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <p�riph>\tUtiliser <p�riph�rique> pour les E/S"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\tUtiliser <gvimrc> au lieu du gvimrc habituel"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\t�diter des fichiers chiffr�s"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <display>\tConnecter Vim au serveur X sp�cifi�"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\tNe pas se connecter � un serveur X"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr ""
-#~ "--remote <fich>\t�diter les <fichiers> dans un serveur Vim si possible"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-silent ...\tPareil, mais pas d'erreur s'il n'y a aucun serveur"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr ""
-#~ "--remote-wait <fich>\tComme --remote mais ne quitter qu'� la fin de "
-#~ "l'�dition"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-wait-silent\tPareil, mais pas d'erreur s'il n'y a aucun serveur"
-
-#~ msgid ""
-#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
-#~ "file"
-#~ msgstr ""
-#~ "--remote-tab[-wait][-silent] <fich>\tComme --remote mais ouvrir un onglet "
-#~ "pour chaque fichier"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr ""
-#~ "--remote-send <tche>\tEnvoyer <touches> � un serveur Vim puis quitter"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr ""
-#~ "--remote-expr <expr>\t�valuer <expr> dans un serveur Vim, afficher le "
-#~ "r�sultat"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr ""
-#~ "--serverlist\t\tLister les noms des serveurs Vim disponibles et quitter"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <nom>\tEnvoyer au/devenir le serveur Vim nomm� <nom>"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Arguments reconnus par gvim (version Motif) :\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Arguments reconnus par gvim (version neXtaw) :\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Arguments reconnus par gvim (version Athena) :\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <�cran>\tLancer Vim sur ce <display>"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\tIconifier Vim au d�marrage"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr ""
-#~ "-background <coul>\tUtiliser <couleur> pour l'arri�re-plan\t   (abrv : -"
-#~ "bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr ""
-#~ "-foreground <coul>\tUtiliser <couleur> pour le texte normal\t   (abrv : -"
-#~ "fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr ""
-#~ "-font <fonte>\tUtiliser <fonte> pour le texte normal\t   (abrv : -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <fonte>\tUtiliser <fonte> pour le texte gras"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <fonte>\tUtiliser <fonte> pour le texte italique"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr ""
-#~ "-geometry <g�om>\tUtiliser cette <g�om�trie> initiale\t (abrv : -geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr ""
-#~ "-borderwidth <�pais>\tUtiliser cette <�paisseur> de bordure\t   (abrv : -"
-#~ "bw)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr ""
-#~ "-scrollbarwidth <lg>\tUtiliser cette <largeur> de barre de d�fil. (abrv: -"
-#~ "sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr ""
-#~ "-menuheight <haut>\tUtiliser cette <hauteur> de menu\t   (abrv : -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\tUtiliser la vid�o inverse\t\t   (abrv : -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\tNe pas utiliser de vid�o inverse\t   (abrv : +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <ressource>\tConfigurer la <ressource> sp�cifi�e"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Arguments reconnus par gvim (version GTK+) :\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr ""
-#~ "-display <display>\tLancer Vim sur ce <display>\t(�galement : --display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr "--role <r�le>\tDonner un r�le pour identifier la fen�tre principale"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\tOuvrir Vim dans un autre widget GTK"
-
-#~ msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
-#~ msgstr "--echo-wid\t\tGvim affiche l'ID de la fen�tre sur stdout"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <titre parent>\tOuvrir Vim dans une application parente"
-
-#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-#~ msgstr "--windowid <HWND>\tOuvrir Vim dans un autre widget win32"
-
-#~ msgid "No display"
-#~ msgstr "Aucun display"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr " : L'envoi a �chou�.\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr " : L'envoi a �chou�. Tentative d'ex�cution locale\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "%d �dit�s sur %d"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "Aucun display : L'envoi de l'expression a �chou�.\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr " : L'envoi de l'expression a �chou�.\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: Page de codes non valide"
-
-#~ msgid "E284: Cannot set IC values"
-#~ msgstr "E284: Impossible de r�gler les valeurs IC"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: �chec de la cr�ation du contexte de saisie"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: �chec de l'ouverture de la m�thode de saisie"
-
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr ""
-#~ "E287: Alerte : Impossible d'inscrire la callback de destruction dans la MS"
-
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: la m�thode de saisie ne supporte aucun style"
-
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr ""
-#~ "E289: le type de pr��dition de Vim n'est pas support� par la m�thode de "
-#~ "saisie"
-
-#~ msgid "E843: Error while updating swap file crypt"
-#~ msgstr "E843: Erreur lors de la mise � jour du fichier d'�change crypt�"
-
-#~ msgid ""
-#~ "E833: %s is encrypted and this version of Vim does not support encryption"
-#~ msgstr ""
-#~ "E833: %s est chiffr� et cette version de Vim ne supporte pas le "
-#~ "chiffrement"
-
-#~ msgid "Swap file is encrypted: \"%s\""
-#~ msgstr "Fichier d'�change chiffr� : \"%s\""
-
-#~ msgid ""
-#~ "\n"
-#~ "If you entered a new crypt key but did not write the text file,"
-#~ msgstr ""
-#~ "\n"
-#~ "Si vous avez tap� une nouvelle cl� de chiffrement mais n'avez pas "
-#~ "enregistr� le fichier texte,"
-
-#~ msgid ""
-#~ "\n"
-#~ "enter the new crypt key."
-#~ msgstr ""
-#~ "\n"
-#~ "tapez la nouvelle cl� de chiffrement."
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wrote the text file after changing the crypt key press enter"
-#~ msgstr ""
-#~ "\n"
-#~ "Si vous avez �crit le fichier texte apr�s avoir chang� la cl� de "
-#~ "chiffrement, appuyez sur entr�e"
-
-#~ msgid ""
-#~ "\n"
-#~ "to use the same key for text file and swap file"
-#~ msgstr ""
-#~ "\n"
-#~ "afin d'utiliser la m�me cl� pour le fichier texte et le fichier d'�change"
-
-#~ msgid "Using crypt key from swap file for the text file.\n"
-#~ msgstr ""
-#~ "Utilisation de la cl� de chiffrement du fichier d'�change pour le fichier "
-#~ "texte.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [inutilisable avec cette version de Vim]"
-
-#~ msgid "Tear off this menu"
-#~ msgstr "D�tacher ce menu"
-
-# DB : Les trois messages qui suivent sont des titres de bo�tes
-#      de dialogue par d�faut.
-#~ msgid "Select Directory dialog"
-#~ msgstr "S�lecteur de r�pertoire"
-
-#~ msgid "Save File dialog"
-#~ msgstr "Enregistrer un fichier"
-
-#~ msgid "Open File dialog"
-#~ msgstr "Ouvrir un fichier"
-
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr "E338: D�sol�, pas de s�lecteur de fichiers en mode console"
-
-#~ msgid "ERROR: "
-#~ msgstr "ERREUR : "
-
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[octets] total allou�-lib�r� %<PRIu64>-%<PRIu64>, utilis� %<PRIu64>, pic "
-#~ "%<PRIu64>\n"
-
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[appels] total re/malloc() %<PRIu64>, total free() %<PRIu64>\n"
-#~ "\n"
-
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: La ligne devient trop longue"
-
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: Erreur interne : lalloc(%<PRId64>, )"
-
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: Forme de curseur invalide"
-
-#~ msgid "Warning: Using a weak encryption method; see :help 'cm'"
-#~ msgstr ""
-#~ "Alerte : utilisation d'une m�thode de chiffrage faible ; consultez :help 'cm'"
-
-#~ msgid "Enter encryption key: "
-#~ msgstr "Tapez la cl� de chiffrement : "
-
-#~ msgid "Enter same key again: "
-#~ msgstr "Tapez la cl� � nouveau : "
-
-#~ msgid "Keys don't match!"
-#~ msgstr "Les cl�s ne correspondent pas !"
-
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "Impossible de se connecter � Netbeans n�2"
-
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "Impossible de se connecter � Netbeans"
-
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
-#~ "E668: Mode d'acc�s incorrect au fichier d'infos de connexion NetBeans : "
-#~ "\"%s\""
-
-# DB : message d'un appel � perror().
-#~ msgid "read from Netbeans socket"
-#~ msgstr "read sur la socket Netbeans"
-
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: Connexion NetBeans perdue pour le tampon %<PRId64>"
-
-#~ msgid "E838: netbeans is not supported with this GUI"
-#~ msgstr "E838: netbeans n'est pas support� avec cette interface graphique"
-
-#~ msgid "E511: netbeans already connected"
-#~ msgstr "E511: netbeans d�j� connect�"
-
-#~ msgid "E505: %s is read-only (add ! to override)"
-#~ msgstr "E505: %s est en lecture seule (ajoutez ! pour passer outre)"
-
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: La fonctionnalit� d'�valuation n'est pas disponible"
-
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "lib�ration de %<PRId64> lignes"
-
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: Impossible de modifier term dans l'interface graphique"
-
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: Utilisez \":gui\" pour d�marrer l'interface graphique"
-
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: Non modifiable dans l'interface graphique GTK+ 2"
-
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: Police(s) invalide(s)"
-
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: Impossible de s�lectionner un jeu de polices"
-
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: Jeu de polices invalide"
-
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: Impossible de s�lectionner une police � largeur double"
-
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: Police � largeur double invalide"
-
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: La souris n'est pas support�e"
-
-#~ msgid "cannot open "
-#~ msgstr "impossible d'ouvrir "
-
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM : Impossible d'ouvrir la fen�tre !\n"
-
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "Amigados version 2.04 ou ult�rieure est n�cessaire\n"
-
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "%s version %<PRId64> est n�cessaire\n"
-
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "Impossible d'ouvrir NIL :\n"
-
-#~ msgid "Cannot create "
-#~ msgstr "Impossible de cr�er "
-
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vim quitte avec %d\n"
-
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "Impossible de modifier le mode de la console ?!\n"
-
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize : pas une console ?!\n"
-
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: Impossible d'ex�cuter un shell avec l'option -f"
-
-#~ msgid "Cannot execute "
-#~ msgstr "Impossible d'ex�cuter "
-
-#~ msgid "shell "
-#~ msgstr "le shell "
-
-#~ msgid " returned\n"
-#~ msgstr " a �t� retourn�\n"
-
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE trop petit."
-
-#~ msgid "I/O ERROR"
-#~ msgstr "ERREUR d'E/S"
-
-#~ msgid "Message"
-#~ msgstr "Message"
-
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr ""
-#~ "'columns' ne vaut pas 80, impossible d'ex�cuter des commandes externes"
-
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: La s�lection de l'imprimante a �chou�"
-
-# DB - Contenu des c-formats : Imprimante puis Port.
-#~ msgid "to %s on %s"
-#~ msgstr "vers %s sur %s"
-
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: Police d'imprimante inconnue : %s"
-
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: Erreur d'impression : %s"
-
-#~ msgid "Printing '%s'"
-#~ msgstr "Impression de '%s'"
-
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr "E244: Jeu de caract�res \"%s\" invalide dans le nom de fonte \"%s\""
-
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: Caract�re '%c' invalide dans le nom de fonte \"%s\""
-
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "L'ouverture du display X a pris %<PRId64> ms"
-
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim : R�ception d'une erreur X\n"
-
-#~ msgid "Testing the X display failed"
-#~ msgstr "Le test du display X a �chou�"
-
-#~ msgid "Opening the X display timed out"
-#~ msgstr "L'ouverture du display X a d�pass� le d�lai d'attente"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Impossible d'ex�cuter le shell sh\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Impossible de cr�er des tuyaux (pipes)\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Impossible de forker\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Commande interrompue\n"
-
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP a perdu la connexion ICE"
-
-#~ msgid "Opening the X display failed"
-#~ msgstr "L'ouverture du display X a �chou�"
-
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP : prise en charge d'une requ�te save-yourself"
-
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP : ouverture de la connexion"
-
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "XSMP : �chec de la surveillance de connexion ICE"
-
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP : SmcOpenConnection a �chou� : %s"
-
-#~ msgid "At line"
-#~ msgstr "� la ligne"
-
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "Impossible de charger vim32.dll !"
-
-#~ msgid "VIM Error"
-#~ msgstr "Erreur VIM"
-
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "Impossible d'initialiser les pointeurs de fonction vers la DLL !"
-
-#~ msgid "shell returned %d"
-#~ msgstr "le shell a retourn� %d"
-
-# DB - Les �v�nements en question sont ceux des messages qui suivent.
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim : �v�nement %s intercept�\n"
-
-#~ msgid "close"
-#~ msgstr "de fermeture"
-
-#~ msgid "logoff"
-#~ msgstr "de d�connexion"
-
-#~ msgid "shutdown"
-#~ msgstr "d'arr�t"
-
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: Commande introuvable"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "VIMRUN.EXE est introuvable votre $PATH.\n"
-#~ "Les commandes externes ne feront pas de pause une fois termin�es.\n"
-#~ "Consultez  :help win32-vimrun  pour plus d'informations."
-
-#~ msgid "Vim Warning"
-#~ msgstr "Alerte Vim"
-
-#~ msgid "Error file"
-#~ msgstr "Fichier d'erreurs"
-
-#~ msgid "E868: Error building NFA with equivalence class!"
-#~ msgstr ""
-#~ "E868: Erreur lors de la construction du NFA avec classe d'�quivalence"
-
-#~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
-#~ msgstr ""
-#~ "E878: (NFA) Impossible d'allouer la m�moire pour parcourir les branches!"
-
-#~ msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-#~ msgstr ""
-#~ "Alerte : Liste de mots \"%s_%s.spl\" ou \"%s_ascii.spl\" introuvable"
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "La conversion dans %s non support�e"
-
-#~ msgid "E845: Insufficient memory, word list will be incomplete"
-#~ msgstr "E845: m�moire insuffisante, liste de mots peut-�tre incompl�te"
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: Chemin de fichiers de marqueurs tronqu� pour %s\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "nouveau shell d�marr�\n"
-
-# DB - Message de d�bogage.
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "CUT_BUFFER0 utilis� plut�t qu'une s�lection vide"
-
-# DB - Question O/N.
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "Annulation impossible ; continuer"
-
-#~ msgid "E832: Non-encrypted file has encrypted undo file: %s"
-#~ msgstr "E832: Fichier non-chiffr� a un fichier d'annulations chiffr� : %s"
-
-#~ msgid "E826: Undo file decryption failed: %s"
-#~ msgstr "E826: D�chiffrage du fichier d'annulation a �chou� : %s"
-
-#~ msgid "E827: Undo file is encrypted: %s"
-#~ msgstr "E827: Le fichier d'annulations est chiffr� : %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version graphique MS-Windows 16/32 bits"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version graphique MS-Windows 64 bits"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version graphique MS-Windows 32 bits"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " lanc�e en mode Win32s"
-
-#~ msgid " with OLE support"
-#~ msgstr " supportant l'OLE"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version console MS-Windows 64 bits"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version console MS-Windows 32 bits"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version MS-Windows 16 bits"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version MS-DOS 32 bits"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version MS-DOS 16 bits"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version MaxOS X (unix)"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version MacOS X"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version MacOS"
-
-#~ msgid ""
-#~ "\n"
-#~ "OpenVMS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Version OpenVMS"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "Grosse version "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "Version normale "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "Petite version "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "Version minuscule "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "avec interface graphique GTK2-GNOME."
-
-#~ msgid "with GTK2 GUI."
-#~ msgstr "avec interface graphique GTK2."
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "avec interface graphique X11-Motif."
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "avec interface graphique X11-neXtaw."
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "avec interface graphique X11-Athena."
-
-#~ msgid "with Photon GUI."
-#~ msgstr "avec interface graphique Photon."
-
-#~ msgid "with GUI."
-#~ msgstr "avec une interface graphique."
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "avec interface graphique Carbon."
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "avec interface graphique Cocoa."
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "avec interface graphique (classic)."
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "        fichier gvimrc syst�me : \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "    fichier gvimrc utilisateur : \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "2me fichier gvimrc utilisateur : \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "3me fichier gvimrc utilisateur : \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr "          fichier menu syst�me : \""
-
-#~ msgid "Compiler: "
-#~ msgstr "Compilateur : "
-
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "menu  Aide->Orphelins            pour plus d'info"
-
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "Les modes sont d�sactiv�s, le texte saisi est ins�r�"
-
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "menu  �dition->R�glages Globaux->Insertion Permanente"
-
-# DB - todo
-#~ msgid "                              for two modes      "
-#~ msgstr "                                  pour les modes     "
-
-# DB - todo
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr "menu  �dition->R�glages Globaux->Compatibilit� Vi"
-
-# DB - todo
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "                                pour d�f. de Vim "
-
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "ALERTE: Windows 95/98/ME d�tect�"
-
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr "tapez  :help windows95<Entr�e>  pour plus d'information"
-
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: Impossible de charger la biblioth�que %s"
-
-#~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr ""
-#~ "D�sol�, commande d�sactiv�e : la biblioth�que Perl n'a pas pu �tre "
-#~ "charg�e."
-
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr ""
-#~ "E299: �valuation Perl interdite dans bac � sable sans le module Safe"
-
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "�diter dans &plusieurs Vims"
-
-#~ msgid "Edit with single &Vim"
-#~ msgstr "�diter dans un seul &Vim"
-
-#~ msgid "Diff with Vim"
-#~ msgstr "&Comparer avec Vim"
-
-#~ msgid "Edit with &Vim"
-#~ msgstr "�diter dans &Vim"
-
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "�diter dans le Vim existant - "
-
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "�dites le(s) fichier(s) s�lectionn�(s) avec Vim"
+msgid "Edits the selected file(s) with Vim"
+msgstr "�dites le(s) fichier(s) s�lectionn�(s) avec Vim"
 
 # DB - MessageBox win32, la longueur n'est pas un probl�me !
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr ""
-#~ "Erreur de cr�ation du processus : v�rifiez que gvim est bien dans votre "
-#~ "chemin !"
+msgid "Error creating process: Check if gvim is in your path!"
+msgstr ""
+"Erreur de cr�ation du processus : v�rifiez que gvim est bien dans votre "
+"chemin !"
 
-#~ msgid "gvimext.dll error"
-#~ msgstr "Erreur de gvimext.dll"
+msgid "gvimext.dll error"
+msgstr "Erreur de gvimext.dll"
 
-#~ msgid "Path length too long!"
-#~ msgstr "Le chemin est trop long !"
+msgid "Path length too long!"
+msgstr "Le chemin est trop long !"
 
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: Jeu de police inconnu : %s"
+# msgstr "--Pas de lignes dans le tampon--"
+# DB - todo : ou encore : msgstr "--Aucune ligne dans le tampon--"
+msgid "--No lines in buffer--"
+msgstr "--Le tampon est vide--"
 
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: Police inconnue : %s"
+#.
+#. * The error messages that can be shared are included here.
+#. * Excluded are errors that are only used once and debugging messages.
+#.
+msgid "E470: Command aborted"
+msgstr "E470: Commande annul�e"
 
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: La police \"%s\" n'a pas une chasse (largeur) fixe"
+msgid "E471: Argument required"
+msgstr "E471: Argument requis"
 
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: Impossible de charger la fonction %s de la biblioth�que"
+msgid "E10: \\ should be followed by /, ? or &"
+msgstr "E10: \\ devrait �tre suivi de /, ? ou &"
 
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr ""
-#~ "E26: Le support de l'h�breu n'a pas �t� compil� dans cette version\n"
+msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgstr ""
+"E11: Invalide dans la fen�tre ligne-de-commande ; <CR> ex�cute, CTRL-C quitte"
 
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: Le support du farsi n'a pas �t� compil� dans cette version\n"
+msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgstr ""
+"E12: commande non autoris�e depuis un exrc/vimrc dans r�pertoire courant ou "
+"une recherche de marqueur"
 
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr ""
-#~ "E800: Le support de l'arabe n'a pas �t� compil� dans cette version\n"
+msgid "E171: Missing :endif"
+msgstr "E171: :endif manquant"
 
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: aucun serveur nomm� \"%s\" n'est enregistr�"
+msgid "E600: Missing :endtry"
+msgstr "E600: :endtry manquant"
 
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: ouverture du display impossible"
+msgid "E170: Missing :endwhile"
+msgstr "E170: :endwhile manquant"
 
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: Expression invalide re�ue"
+msgid "E170: Missing :endfor"
+msgstr "E170: :endfor manquant"
 
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: Cette zone est verrouill�e et ne peut pas �tre modifi�e"
+msgid "E588: :endwhile without :while"
+msgstr "E588: :endwhile sans :while"
 
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr ""
-#~ "E744: NetBeans n'autorise pas la modification des fichiers en lecture "
-#~ "seule"
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor sans :for"
 
-#~ msgid "Need encryption key for \"%s\""
-#~ msgstr "Besoin de la cl� de chiffrement pour \"%s\""
+msgid "E13: File exists (add ! to override)"
+msgstr "E13: Le fichier existe d�j� (ajoutez ! pour passer outre)"
 
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "impossible d'effacer les attributs d'OutputObject"
+msgid "E472: Command failed"
+msgstr "E472: La commande a �chou�"
 
-#~ msgid "invalid attribute"
-#~ msgstr "attribut invalide"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: Jeu de police inconnu : %s"
 
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Python : Erreur d'initialisation des objets d'E/S"
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: Police inconnue : %s"
 
-#~ msgid "empty keys are not allowed"
-#~ msgstr "les cl�s vides ne sont pas autoris�es"
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: La police \"%s\" n'a pas une chasse (largeur) fixe"
 
-#~ msgid "Cannot modify fixed dictionary"
-#~ msgstr "Impossible de modifier un dictionnaire fixe"
+msgid "E473: Internal error"
+msgstr "E473: Erreur interne"
 
-#~ msgid "dict is locked"
-#~ msgstr "dictionnaire est verrouill�"
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: Erreur interne : %s"
 
-#~ msgid "failed to add key to dictionary"
-#~ msgstr "l'ajout de cl� au dictionnaire a �chou�"
+msgid "Interrupted"
+msgstr "Interrompu"
 
-#~ msgid "list index out of range"
-#~ msgstr "index de liste hors limites"
+msgid "E14: Invalid address"
+msgstr "E14: Adresse invalide"
 
-#~ msgid "internal error: failed to get vim list item"
-#~ msgstr "erreur interne : acc�s � un �l�ment de liste a �chou�"
+msgid "E474: Invalid argument"
+msgstr "E474: Argument invalide"
 
-#~ msgid "list is locked"
-#~ msgstr "liste verrouill�e"
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: Argument invalide : %s"
 
-#~ msgid "Failed to add item to list"
-#~ msgstr "Ajout � la liste a �chou�"
+#, c-format
+msgid "E15: Invalid expression: %s"
+msgstr "E15: Expression invalide : %s"
 
-#~ msgid "internal error: failed to add item to list"
-#~ msgstr "erreur interne : ajout d'�l�ment � la liste a �chou�"
+msgid "E16: Invalid range"
+msgstr "E16: Plage invalide"
 
-#~ msgid "cannot delete vim.dictionary attributes"
-#~ msgstr "impossible d'effacer les attributs de vim.dictionary"
+msgid "E476: Invalid command"
+msgstr "E476: Commande invalide"
 
-#~ msgid "cannot modify fixed list"
-#~ msgstr "impossible de modifier une liste fixe"
+#, c-format
+msgid "E17: \"%s\" is a directory"
+msgstr "E17: \"%s\" est un r�pertoire"
 
-#~ msgid "cannot set this attribute"
-#~ msgstr "impossible d'initialiser cet attribut"
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: L'appel � la biblioth�que a �chou� pour \"%s()\""
 
-#~ msgid "failed to run function"
-#~ msgstr "ex�cution de la fonction a �chou�"
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: Impossible de charger la fonction %s de la biblioth�que"
 
-#~ msgid "unable to unset global option"
-#~ msgstr "impossible de d�sactiver une option globale"
+msgid "E19: Mark has invalid line number"
+msgstr "E19: La marque a un num�ro de ligne invalide"
 
-#~ msgid "unable to unset option without global value"
-#~ msgstr "impossible de d�sactiver une option sans une valeur globale"
+msgid "E20: Mark not set"
+msgstr "E20: Marque non positionn�e"
 
-#~ msgid "attempt to refer to deleted tab page"
-#~ msgstr "tentative de r�f�rencer un onglet effac�"
+msgid "E21: Cannot make changes, 'modifiable' is off"
+msgstr "E21: Impossible de modifier, 'modifiable' est d�sactiv�"
 
-#~ msgid "no such tab page"
-#~ msgstr "cet onglet n'existe pas"
+msgid "E22: Scripts nested too deep"
+msgstr "E22: Trop de r�cursion dans les scripts"
 
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "tentative de r�f�rencer une fen�tre effac�e"
+msgid "E23: No alternate file"
+msgstr "E23: Pas de fichier alternatif"
 
-#~ msgid "readonly attribute"
-#~ msgstr "attribut en lecture seule"
+msgid "E24: No such abbreviation"
+msgstr "E24: Cette abr�viation n'existe pas"
 
-#~ msgid "cursor position outside buffer"
-#~ msgstr "curseur positionn� en dehors du tampon"
+msgid "E477: No ! allowed"
+msgstr "E477: Le ! n'est pas autoris�"
 
-#~ msgid "no such window"
-#~ msgstr "Cette fen�tre n'existe pas"
+msgid "E25: GUI cannot be used: Not enabled at compile time"
+msgstr "E25: L'interface graphique n'a pas �t� compil�e dans cette version"
 
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "tentative de r�f�rencer un tampon effac�"
+msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
+msgstr "E26: Le support de l'h�breu n'a pas �t� compil� dans cette version\n"
 
-#~ msgid "expected vim.buffer object"
-#~ msgstr "objet vim.buffer attendu"
+msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
+msgstr "E27: Le support du farsi n'a pas �t� compil� dans cette version\n"
 
-#~ msgid "failed to switch to given buffer"
-#~ msgstr "impossible de se d�placer au tampon donn�"
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: Le support de l'arabe n'a pas �t� compil� dans cette version\n"
 
-#~ msgid "expected vim.window object"
-#~ msgstr "objet vim.window attendu"
+#, c-format
+msgid "E28: No such highlight group name: %s"
+msgstr "E28: Aucun nom de groupe de surbrillance %s"
 
-#~ msgid "failed to find window in the current tab page"
-#~ msgstr "impossible de trouver une fen�tre dans l'onglet courant"
+msgid "E29: No inserted text yet"
+msgstr "E29: Pas encore de texte ins�r�"
 
-#~ msgid "did not switch to the specified window"
-#~ msgstr "ne s'est pas d�plac� � la fen�tre sp�cifi�e"
+msgid "E30: No previous command line"
+msgstr "E30: Aucune ligne de commande pr�c�dente"
 
-#~ msgid "expected vim.tabpage object"
-#~ msgstr "objet vim.tabpage attendu"
+msgid "E31: No such mapping"
+msgstr "E31: Mappage inexistant"
 
-#~ msgid "did not switch to the specified tab page"
-#~ msgstr "impossible de se d�placer � l'onglet sp�cifi�"
+msgid "E479: No match"
+msgstr "E479: Aucune correspondance"
 
-#~ msgid "failed to run the code"
-#~ msgstr "ex�cution du code a �chou�"
+#, c-format
+msgid "E480: No match: %s"
+msgstr "E480: Aucune correspondance : %s"
 
-#~ msgid "E858: Eval did not return a valid python object"
-#~ msgstr "E858: Eval n'a pas retourn� un objet python valide"
+msgid "E32: No file name"
+msgstr "E32: Aucun nom de fichier"
 
-#~ msgid "E859: Failed to convert returned python object to vim value"
-#~ msgstr "E859: Conversion d'objet python � une valeur de vim a �chou�"
+msgid "E33: No previous substitute regular expression"
+msgstr "E33: Aucune expression r�guli�re de substitution pr�c�dente"
 
-#~ msgid "unable to convert to vim structure"
-#~ msgstr "conversion � une structure vim impossible"
+msgid "E34: No previous command"
+msgstr "E34: Aucune commande pr�c�dente"
 
-#~ msgid "NULL reference passed"
-#~ msgstr "r�f�rence NULL pass�e"
+msgid "E35: No previous regular expression"
+msgstr "E35: Aucune expression r�guli�re pr�c�dente"
 
-#~ msgid "internal error: invalid value type"
-#~ msgstr "erreur interne : type de valeur invalide"
+msgid "E481: No range allowed"
+msgstr "E481: Les plages ne sont pas autoris�es"
+
+msgid "E36: Not enough room"
+msgstr "E36: Pas assez de place"
+
+#, c-format
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: aucun serveur nomm� \"%s\" n'est enregistr�"
+
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: Impossible de cr�er le fichier %s"
+
+msgid "E483: Can't get temp file name"
+msgstr "E483: Impossible d'obtenir un nom de fichier temporaire"
+
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: Impossible d'ouvrir le fichier \"%s\""
+
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: Impossible de lire le fichier %s"
+
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: Modifications non enregistr�es (ajoutez ! pour passer outre)"
+
+msgid "E37: No write since last change"
+msgstr "E37: Modifications non enregistr�es"
+
+msgid "E38: Null argument"
+msgstr "E38: Argument null"
+
+msgid "E39: Number expected"
+msgstr "E39: Nombre attendu"
+
+#, c-format
+msgid "E40: Can't open errorfile %s"
+msgstr "E40: Impossible d'ouvrir le fichier d'erreurs %s"
+
+msgid "E233: cannot open display"
+msgstr "E233: ouverture du display impossible"
+
+msgid "E41: Out of memory!"
+msgstr "E41: M�moire �puis�e"
+
+msgid "Pattern not found"
+msgstr "Motif introuvable"
+
+#, c-format
+msgid "E486: Pattern not found: %s"
+msgstr "E486: Motif introuvable : %s"
+
+msgid "E487: Argument must be positive"
+msgstr "E487: L'argument doit �tre positif"
+
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: Impossible de retourner au r�pertoire pr�c�dent"
+
+msgid "E42: No Errors"
+msgstr "E42: Aucune erreur"
+
+# DB - TODO : trouver une traduction valable et attest�e pour "location".
+msgid "E776: No location list"
+msgstr "E776: Aucune liste d'emplacements"
+
+msgid "E43: Damaged match string"
+msgstr "E43: La cha�ne de recherche est endommag�e"
+
+msgid "E44: Corrupted regexp program"
+msgstr "E44: L'automate de regexp est corrompu"
+
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: L'option 'readonly' est activ�e (ajoutez ! pour passer outre)"
+
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: La variable \"%s\" est en lecture seule"
+
+#, c-format
+msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgstr ""
+"E794: Impossible de modifier une variable depuis le bac � sable : \"%s\""
+
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: Impossible d'utiliser une cl� vide dans un Dictionnaire"
+
+msgid "E715: Dictionary required"
+msgstr "E715: Dictionnaire requis"
+
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: index de Liste hors limites : %ld au-del� de la fin"
+
+# DB : Suggestion
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: La fonction %s a re�u trop d'arguments"
+
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: La cl� %s n'existe pas dans le Dictionnaire"
+
+msgid "E714: List required"
+msgstr "E714: Liste requise"
+
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: L'argument de %s doit �tre une Liste ou un Dictionnaire"
+
+msgid "E47: Error while reading errorfile"
+msgstr "E47: Erreur lors de la lecture du fichier d'erreurs"
+
+msgid "E48: Not allowed in sandbox"
+msgstr "E48: Op�ration interdite dans le bac � sable"
+
+msgid "E523: Not allowed here"
+msgstr "E523: Interdit � cet endroit"
+
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: Choix du mode d'�cran non support�"
+
+msgid "E49: Invalid scroll size"
+msgstr "E49: Valeur de d�filement invalide"
+
+msgid "E91: 'shell' option is empty"
+msgstr "E91: L'option 'shell' est vide"
+
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: Impossible de lire les donn�es du symbole !"
+
+msgid "E72: Close error on swap file"
+msgstr "E72: Erreur lors de la fermeture du fichier d'�change"
+
+msgid "E73: tag stack empty"
+msgstr "E73: La pile des marqueurs est vide"
+
+msgid "E74: Command too complex"
+msgstr "E74: Commande trop complexe"
+
+msgid "E75: Name too long"
+msgstr "E75: Nom trop long"
+
+msgid "E76: Too many ["
+msgstr "E76: Trop de ["
+
+msgid "E77: Too many file names"
+msgstr "E77: Trop de noms de fichiers"
+
+msgid "E488: Trailing characters"
+msgstr "E488: Caract�res surnum�raires"
+
+msgid "E78: Unknown mark"
+msgstr "E78: Marque inconnue"
+
+msgid "E79: Cannot expand wildcards"
+msgstr "E79: Impossible de d�velopper les m�tacaract�res"
+
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' ne peut pas �tre plus petit que 'winminheight'"
+
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' ne peut pas �tre plus petit que 'winminwidth'"
+
+msgid "E80: Error while writing"
+msgstr "E80: Erreur lors de l'�criture"
+
+msgid "Zero count"
+msgstr "Le quantificateur est nul"
+
+msgid "E81: Using <SID> not in a script context"
+msgstr "E81: <SID> utilis� en dehors d'un script"
+
+msgid "E449: Invalid expression received"
+msgstr "E449: Expression invalide re�ue"
+
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: Cette zone est verrouill�e et ne peut pas �tre modifi�e"
+
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr ""
+"E744: NetBeans n'autorise pas la modification des fichiers en lecture seule"
+
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: le motif utilise plus de m�moire que 'maxmempattern'"
+
+msgid "E749: empty buffer"
+msgstr "E749: tampon vide"
+
+#, c-format
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: Le tampon %ld n'existe pas"
+
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: D�limiteur ou motif de recherche invalide"
+
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: Le fichier est charg� dans un autre tampon"
+
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: L'option '%s' n'est pas activ�e"
+
+msgid "E850: Invalid register name"
+msgstr "E850: Nom de registre invalide"
+
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: R�pertoire introuvable dans '%s' : \"%s\""
+
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "La recherche a atteint le HAUT, et continue en BAS"
+
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "La recherche a atteint le BAS, et continue en HAUT"
+
+#, c-format
+msgid "Need encryption key for \"%s\""
+msgstr "Besoin de la cl� de chiffrement pour \"%s\""
+
+msgid "empty keys are not allowed"
+msgstr "les cl�s vides ne sont pas autoris�es"
+
+msgid "dictionary is locked"
+msgstr "dictionnaire est verrouill�"
+
+msgid "list is locked"
+msgstr "liste verrouill�e"
+
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "l'ajout de cl� '%s' au dictionnaire a �chou�"
+
+#, c-format
+msgid "index must be int or slice, not %s"
+msgstr "index doit �tre int ou slice, et non %s"
+
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "attendu instance de str() ou unicode(), mais re�u %s"
+
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "attendu instance de bytes() ou str(), mais re�u %s"
+
+#, c-format
+msgid ""
+"expected int(), long() or something supporting coercing to long(), but got %s"
+msgstr ""
+"attendu int(), long() ou quelque chose qui peut �tre transform� en long(), "
+"mais re�u %s"
+
+#, c-format
+msgid "expected int() or something supporting coercing to int(), but got %s"
+msgstr ""
+"attendu int() ou quelque chose qui peut �tre transform� en int(), mais re�u "
+"%s"
+
+msgid "value is too large to fit into C int type"
+msgstr "valeur trop grande pour �tre stock�e dans le type C int"
+
+msgid "value is too small to fit into C int type"
+msgstr "valeur trop petite pour �tre stock�e dans le type C int"
+
+msgid "number must be greater than zero"
+msgstr "le nombre doit �tre plus grand que z�ro"
+
+msgid "number must be greater or equal to zero"
+msgstr "le nombre doit �tre plus grand ou �gal � z�ro"
+
+msgid "can't delete OutputObject attributes"
+msgstr "impossible d'effacer les attributs d'OutputObject"
+
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "attribut invalide : %s"
+
+msgid "E264: Python: Error initialising I/O objects"
+msgstr "E264: Python : Erreur d'initialisation des objets d'E/S"
+
+msgid "failed to change directory"
+msgstr "changement de r�pertoire a �chou�"
+
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got %s"
+msgstr "attendu un 3-tuple comme r�sultat de imp.find_module(), mais re�u %s"
+
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr ""
+"attendu un 3-tuple comme r�sultat de imp.find_module(), mais re�u un tuple "
+"de taille %d"
+
+msgid "internal error: imp.find_module returned tuple with NULL"
+msgstr "erreur interne : imp.find_module a retourn� un tuple contenant NULL"
+
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "impossible d'effacer les attributs de vim.Dictionary"
+
+msgid "cannot modify fixed dictionary"
+msgstr "impossible de modifier un dictionnaire fixe"
+
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "impossible d'initialiser l'attribut %s"
+
+msgid "hashtab changed during iteration"
+msgstr "la table de hachage a �t� chang�e pendant une it�ration"
+
+#, c-format
+msgid "expected sequence element of size 2, but got sequence of size %d"
+msgstr ""
+"attendu une s�quence d'�l�ments de taille 2, mais re�u une s�quence de "
+"taille %d"
+
+msgid "list constructor does not accept keyword arguments"
+msgstr "le constructeur de liste n'accepte pas les arguments nomm�s"
+
+msgid "list index out of range"
+msgstr "index de liste hors limites"
+
+#. No more suitable format specifications in python-2.3
+#, c-format
+msgid "internal error: failed to get vim list item %d"
+msgstr "erreur interne : acc�s � un �l�ment %d de liste a �chou�"
+
+msgid "slice step cannot be zero"
+msgstr "le pas du d�coupage en tranche ne peut pas �tre z�ro"
+
+#, c-format
+msgid "attempt to assign sequence of size greater than %d to extended slice"
+msgstr ""
+"tentative d'assigner une s�quence de taille plus grande que %d � un "
+"d�coupage en tranche �tendu "
+
+#, c-format
+msgid "internal error: no vim list item %d"
+msgstr "erreur interne : pas d'�l�ment %d de liste vim"
+
+msgid "internal error: not enough list items"
+msgstr "erreur interne : pas assez d'�l�ments de liste"
+
+msgid "internal error: failed to add item to list"
+msgstr "erreur interne : ajout d'�l�ment � la liste a �chou�"
+
+#, c-format
+msgid "attempt to assign sequence of size %d to extended slice of size %d"
+msgstr ""
+"tentative d'assigner une s�quence de taille %d � un d�coupage en tranche "
+"�tendu de taille %d"
+
+msgid "failed to add item to list"
+msgstr "ajout � la liste a �chou�"
+
+msgid "cannot delete vim.List attributes"
+msgstr "impossible d'effacer les attributs de vim.List"
+
+msgid "cannot modify fixed list"
+msgstr "impossible de modifier une liste fixe"
+
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "la fonction sans nom %s n'existe pas"
+
+#, c-format
+msgid "function %s does not exist"
+msgstr "la fonction %s n'existe pas"
+
+#, c-format
+msgid "failed to run function %s"
+msgstr "ex�cution de la fonction %s a �chou�"
+
+msgid "unable to get option value"
+msgstr "impossible d'obtenir la valeur d'une option"
+
+msgid "internal error: unknown option type"
+msgstr "erreur interne : type d'option inconnu"
+
+msgid "problem while switching windows"
+msgstr "probl�me lors du changement de fen�tres"
+
+#, c-format
+msgid "unable to unset global option %s"
+msgstr "impossible de d�sactiver une option globale %s"
+
+#, c-format
+msgid "unable to unset option %s which does not have global value"
+msgstr "impossible de d�sactiver l'option %s qui n'a pas de valeur globale"
+
+msgid "attempt to refer to deleted tab page"
+msgstr "tentative de r�f�rencer un onglet effac�"
+
+msgid "no such tab page"
+msgstr "cet onglet n'existe pas"
+
+msgid "attempt to refer to deleted window"
+msgstr "tentative de r�f�rencer une fen�tre effac�e"
+
+msgid "readonly attribute: buffer"
+msgstr "attribut en lecture seule : tampon"
+
+msgid "cursor position outside buffer"
+msgstr "curseur positionn� en dehors du tampon"
+
+msgid "no such window"
+msgstr "Cette fen�tre n'existe pas"
+
+msgid "attempt to refer to deleted buffer"
+msgstr "tentative de r�f�rencer un tampon effac�"
+
+msgid "failed to rename buffer"
+msgstr "impossible de renommer le tampon"
+
+msgid "mark name must be a single character"
+msgstr "le nom de marque doit �tre un seul caract�re"
+
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "attendu un objet vim.Buffer, mais re�u %s"
+
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "impossible de se d�placer au tampon %d"
+
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "attendu un objet vim.Window, mais re�u %s"
+
+msgid "failed to find window in the current tab page"
+msgstr "impossible de trouver une fen�tre dans l'onglet courant"
+
+msgid "did not switch to the specified window"
+msgstr "ne s'est pas d�plac� � la fen�tre sp�cifi�e"
+
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "attendu un objet vim.TabPage, mais re�u %s"
+
+msgid "did not switch to the specified tab page"
+msgstr "impossible de se d�placer � l'onglet sp�cifi�"
+
+msgid "failed to run the code"
+msgstr "ex�cution du code a �chou�"
+
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: Eval n'a pas retourn� un objet python valide"
+
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: Conversion d'objet python � une valeur de vim a �chou�"
+
+#, c-format
+msgid "unable to convert %s to vim dictionary"
+msgstr "impossible de convertir %s � un dictionnaire vim"
+
+#, c-format
+msgid "unable to convert %s to vim list"
+msgstr "impossible de convertir %s � une liste de vim"
+
+#, c-format
+msgid "unable to convert %s to vim structure"
+msgstr "impossible de convertir %s � une structure de vim"
+
+msgid "internal error: NULL reference passed"
+msgstr "erreur interne : r�f�rence NULL pass�e"
+
+msgid "internal error: invalid value type"
+msgstr "erreur interne : type de valeur invalide"
+
+msgid ""
+"Failed to set path hook: sys.path_hooks is not a list\n"
+"You should now do the following:\n"
+"- append vim.path_hook to sys.path_hooks\n"
+"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgstr ""
+"Impossible d'initialiser sys.path_hook qui n'est pas un liste\n"
+"Vous devez maintenant :\n"
+"- ajouter vim.path_hook � sys.path_hooks\n"
+"- ajouter vim.VIM_SPECIAL_PATH � sys.path\n"
+
+msgid ""
+"Failed to set path: sys.path is not a list\n"
+"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgstr ""
+"Impossible d'initialiser le chemin : sys.math n'est pas une liste\n"
+"Vous devez maintenant ajouter vim.VIM_SPECIAL_PATH � sys.path"
diff --git a/src/nvim/po/ja.euc-jp.po b/src/nvim/po/ja.euc-jp.po
index c6425324b1..4b32096f1a 100644
--- a/src/nvim/po/ja.euc-jp.po
+++ b/src/nvim/po/ja.euc-jp.po
@@ -1,3 +1,4 @@
+
 # Japanese translation for Vim
 #
 # Do ":help uganda"  in Vim to read copying and usage conditions.
@@ -14,213 +15,176 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 09:02+0900\n"
-"PO-Revision-Date: 2016-02-01 09:08+0900\n"
+"POT-Creation-Date: 2016-09-10 21:10+0900\n"
+"PO-Revision-Date: 2016-09-10 21:20+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
 "Language: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=euc-jp\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../api/private/helpers.c:201
-#, fuzzy
-msgid "Unable to get option value"
-msgstr "���ץ������ͤϼ����Ǥ��ޤ���"
+msgid "E831: bf_key_init() called with empty password"
+msgstr "E831: bf_key_init() �����ѥ���ɤǸƤӽФ���ޤ���"
 
-#: ../api/private/helpers.c:204
-msgid "internal error: unknown option type"
-msgstr "�������顼: ̤�ΤΥ��ץ���󷿤Ǥ�"
+msgid "E820: sizeof(uint32_t) != 4"
+msgstr "E820: sizeof(uint32_t) != 4"
+
+msgid "E817: Blowfish big/little endian use wrong"
+msgstr "E817: Blowfish�Ź�Υӥå�/��ȥ륨��ǥ����󤬴ְ�äƤ��ޤ�"
+
+msgid "E818: sha256 test failed"
+msgstr "E818: sha256�Υƥ��Ȥ˼��Ԥ��ޤ���"
+
+msgid "E819: Blowfish test failed"
+msgstr "E819: Blowfish�Ź�Υƥ��Ȥ˼��Ԥ��ޤ���"
 
-#: ../buffer.c:92
 msgid "[Location List]"
 msgstr "[�����������ꥹ��]"
 
-#: ../buffer.c:93
 msgid "[Quickfix List]"
 msgstr "[Quickfix�ꥹ��]"
 
-#: ../buffer.c:94
 msgid "E855: Autocommands caused command to abort"
 msgstr "E855: autocommand�����ޥ�ɤ���ߤ�����������ޤ���"
 
-#: ../buffer.c:135
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: �Хåե���1�Ĥ�����Ǥ��ʤ��Τ�, ��λ���ޤ�..."
 
-#: ../buffer.c:138
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: �Хåե�������Ǥ��ʤ��Τ�, ¾�Τ���Ѥ��ޤ�..."
 
-#: ../buffer.c:763
+msgid "E931: Buffer cannot be registered"
+msgstr "E931: �Хåե�����Ͽ�Ǥ��ޤ���"
+
+msgid "E937: Attempt to delete a buffer that is in use"
+msgstr "E937: ������ΥХåե��������褦�Ȼ�ߤޤ���"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: �������줿�Хåե��Ϥ���ޤ���"
 
-#: ../buffer.c:765
 msgid "E516: No buffers were deleted"
 msgstr "E516: ������줿�Хåե��Ϥ���ޤ���"
 
-#: ../buffer.c:767
 msgid "E517: No buffers were wiped out"
 msgstr "E517: �˴����줿�Хåե��Ϥ���ޤ���"
 
-#: ../buffer.c:772
 msgid "1 buffer unloaded"
 msgstr "1 �ĤΥХåե�����������ޤ���"
 
-#: ../buffer.c:774
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "%d �ĤΥХåե�����������ޤ���"
 
-#: ../buffer.c:777
 msgid "1 buffer deleted"
 msgstr "1 �ĤΥХåե����������ޤ���"
 
-#: ../buffer.c:779
 #, c-format
 msgid "%d buffers deleted"
 msgstr "%d �ĤΥХåե����������ޤ���"
 
-#: ../buffer.c:782
 msgid "1 buffer wiped out"
 msgstr "1 �ĤΥХåե����˴�����ޤ���"
 
-#: ../buffer.c:784
 #, c-format
 msgid "%d buffers wiped out"
 msgstr "%d �ĤΥХåե����˴�����ޤ���"
 
-#: ../buffer.c:806
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: �Ǹ�ΥХåե��ϲ����Ǥ��ޤ���"
 
-#: ../buffer.c:874
 msgid "E84: No modified buffer found"
 msgstr "E84: �ѹ����줿�Хåե��Ϥ���ޤ���"
 
 #. back where we started, didn't find anything.
-#: ../buffer.c:903
 msgid "E85: There is no listed buffer"
 msgstr "E85: �ꥹ��ɽ�������Хåե��Ϥ���ޤ���"
 
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: �Хåե� %<PRId64> �Ϥ���ޤ���"
-
-#: ../buffer.c:915
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: �Ǹ�ΥХåե���ۤ��ư�ư�ϤǤ��ޤ���"
 
-#: ../buffer.c:917
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: �ǽ�ΥХåե�������ؤϰ�ư�Ǥ��ޤ���"
 
-#: ../buffer.c:945
 #, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
-msgstr "E89: �Хåե� %<PRId64> ���ѹ�����¸����Ƥ��ޤ��� (! ���ѹ����˴�)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgstr "E89: �Хåե� %ld ���ѹ�����¸����Ƥ��ޤ��� (! ���ѹ����˴�)"
 
-#. wrap around (may cause duplicates)
-#: ../buffer.c:1423
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: �ٹ�: �ե�����̾�Υꥹ�Ȥ�Ĺ�᤮�ޤ�"
 
-#: ../buffer.c:1555 ../quickfix.c:3361
 #, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: �Хåե� %<PRId64> �����Ĥ���ޤ���"
+msgid "E92: Buffer %ld not found"
+msgstr "E92: �Хåե� %ld �����Ĥ���ޤ���"
 
-#: ../buffer.c:1798
 #, c-format
 msgid "E93: More than one match for %s"
 msgstr "E93: %s ��ʣ���γ���������ޤ���"
 
-#: ../buffer.c:1800
 #, c-format
 msgid "E94: No matching buffer for %s"
 msgstr "E94: %s �˳�������Хåե��Ϥ���ޤ���Ǥ���"
 
-#: ../buffer.c:2161
 #, c-format
-msgid "line %<PRId64>"
-msgstr "�� %<PRId64>"
+msgid "line %ld"
+msgstr "�� %ld"
 
-#: ../buffer.c:2233
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: ����̾���ΥХåե��ϴ��ˤ���ޤ�"
 
-#: ../buffer.c:2498
 msgid " [Modified]"
 msgstr " [�ѹ�����]"
 
-#: ../buffer.c:2501
 msgid "[Not edited]"
 msgstr "[̤�Խ�]"
 
-#: ../buffer.c:2504
 msgid "[New file]"
 msgstr "[���ե�����]"
 
-#: ../buffer.c:2505
 msgid "[Read errors]"
 msgstr "[�ɹ����顼]"
 
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
 msgid "[RO]"
 msgstr "[����]"
 
-#: ../buffer.c:2507 ../fileio.c:1807
 msgid "[readonly]"
 msgstr "[�ɹ�����]"
 
-#: ../buffer.c:2524
 #, c-format
 msgid "1 line --%d%%--"
 msgstr "1 �� --%d%%--"
 
-#: ../buffer.c:2526
 #, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> �� --%d%%--"
+msgid "%ld lines --%d%%--"
+msgstr "%ld �� --%d%%--"
 
-#: ../buffer.c:2530
 #, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "�� %<PRId64> (���� %<PRId64>) --%d%%-- col "
+msgid "line %ld of %ld --%d%%-- col "
+msgstr "�� %ld (���� %ld) --%d%%-- col "
 
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
 msgid "[No Name]"
 msgstr "[̵̾]"
 
 #. must be a help buffer
-#: ../buffer.c:2667
 msgid "help"
 msgstr "�إ��"
 
-#: ../buffer.c:3225 ../screen.c:4883
 msgid "[Help]"
 msgstr "[�إ��]"
 
-#: ../buffer.c:3254 ../screen.c:4887
 msgid "[Preview]"
 msgstr "[�ץ�ӥ塼]"
 
-#: ../buffer.c:3528
 msgid "All"
 msgstr "����"
 
-#: ../buffer.c:3528
 msgid "Bot"
 msgstr "����"
 
-#: ../buffer.c:3531
 msgid "Top"
 msgstr "��Ƭ"
 
-#: ../buffer.c:4244
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -228,11 +192,9 @@ msgstr ""
 "\n"
 "# �Хåե��ꥹ��:\n"
 
-#: ../buffer.c:4289
 msgid "[Scratch]"
 msgstr "[����]"
 
-#: ../buffer.c:4529
 msgid ""
 "\n"
 "--- Signs ---"
@@ -240,200 +202,235 @@ msgstr ""
 "\n"
 "--- ������ ---"
 
-#: ../buffer.c:4538
 #, c-format
 msgid "Signs for %s:"
 msgstr "%s ������:"
 
-#: ../buffer.c:4543
 #, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    ��=%<PRId64>  ���̻�=%d  ̾��=%s"
+msgid "    line=%ld  id=%d  name=%s"
+msgstr "    ��=%ld  ���̻�=%d  ̾��=%s"
 
-#: ../cursor_shape.c:68
-msgid "E545: Missing colon"
-msgstr "E545: �����󤬤���ޤ���"
+msgid "E902: Cannot connect to port"
+msgstr "E902: �ݡ��Ȥ���³�Ǥ��ޤ���"
 
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
-msgid "E546: Illegal mode"
-msgstr "E546: �����ʥ⡼�ɤǤ�"
+msgid "E901: gethostbyname() in channel_open()"
+msgstr "E901: channel_open() ��� gethostbyname() �����Ԥ��ޤ���"
 
-#: ../cursor_shape.c:134
-msgid "E548: digit expected"
-msgstr "E548: ���ͤ�ɬ�פǤ�"
+msgid "E898: socket() in channel_open()"
+msgstr "E898: channel_open() ��� socket() �����Ԥ��ޤ���"
 
-#: ../cursor_shape.c:138
-msgid "E549: Illegal percentage"
-msgstr "E549: �����ʥѡ�����ơ����Ǥ�"
+msgid "E903: received command with non-string argument"
+msgstr "E903: ��ʸ����ΰ����Υ��ޥ�ɤ�������ޤ���"
+
+msgid "E904: last argument for expr/call must be a number"
+msgstr "E904: expr/call �κǸ�ΰ����Ͽ����Ǥʤ���Фʤ�ޤ���"
+
+msgid "E904: third argument for call must be a list"
+msgstr "E904: call ��3���ܤΰ����ϥꥹ�ȷ��Ǥʤ���Фʤ�ޤ���"
 
-#: ../diff.c:146
 #, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: %<PRId64> �ʾ�ΥХåե���diff�Ǥ��ޤ���"
+msgid "E905: received unknown command: %s"
+msgstr "E905: ̤�ΤΥ��ޥ�ɤ�������ޤ���: %s"
+
+#, c-format
+msgid "E630: %s(): write while not connected"
+msgstr "E630: %s(): ����³���֤ǽ񤭹��ߤޤ���"
+
+#, c-format
+msgid "E631: %s(): write failed"
+msgstr "E631: %s(): �񤭹��ߤ˼��Ԥ��ޤ���"
+
+#, c-format
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: %s() �˥�����Хå��ϻȤ��ޤ���"
+
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr "E912: ���� nl �����ͥ�� ch_evalexpr()/ch_sendexpr �ϻȤ��ޤ���"
+
+msgid "E906: not an open channel"
+msgstr "E906: �����Ƥ��ʤ������ͥ�Ǥ�"
+
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: _io �ե������ _name �����꤬ɬ�פǤ�"
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: in_io �Хåե��� in_buf �� in_name �����꤬ɬ�פǤ�"
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: �Хåե��������ɤ���Ƥʤ���Фʤ�ޤ���: %s"
+
+msgid "E821: File is encrypted with unknown method"
+msgstr "E821: �ե����뤬̤�Τ���ˡ�ǰŹ沽����Ƥ��ޤ�"
+
+msgid "Warning: Using a weak encryption method; see :help 'cm'"
+msgstr "�ٹ�: �夤�Ź���ˡ��ȤäƤ��ޤ�; :help 'cm' �򻲾Ȥ��Ƥ�������"
+
+msgid "Enter encryption key: "
+msgstr "�Ź沽�ѤΥ��������Ϥ��Ƥ�������: "
+
+msgid "Enter same key again: "
+msgstr "�⤦����Ʊ�����������Ϥ��Ƥ�������: "
+
+msgid "Keys don't match!"
+msgstr "���������פ��ޤ���"
+
+msgid "[crypted]"
+msgstr "[�Ź沽]"
+
+#, c-format
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: ���񷿤˥����󤬤���ޤ���: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: ���񷿤˽�ʣ����������ޤ�: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: ���񷿤˥���ޤ�����ޤ���: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: ���񷿤κǸ�� '}' ������ޤ���: %s"
+
+msgid "extend() argument"
+msgstr "extend() ���"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: �����ϴ���¸�ߤ��ޤ�: %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
+msgstr "E96: %ld �ʾ�ΥХåե���diff�Ǥ��ޤ���"
 
-#: ../diff.c:753
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: ����ե�������ɹ��⤷���Ͻ�����Ǥ��ޤ���"
 
-#: ../diff.c:755
 msgid "E97: Cannot create diffs"
 msgstr "E97: ��ʬ������Ǥ��ޤ���"
 
-#: ../diff.c:966
+msgid "Patch file"
+msgstr "�ѥå��ե�����"
+
 msgid "E816: Cannot read patch output"
 msgstr "E816: patch�ν��Ϥ��ɹ���ޤ���"
 
-#: ../diff.c:1220
 msgid "E98: Cannot read diff output"
 msgstr "E98: diff�ν��Ϥ��ɹ���ޤ���"
 
-#: ../diff.c:2081
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: ���ߤΥХåե��Ϻ�ʬ�⡼�ɤǤϤ���ޤ���"
 
-#: ../diff.c:2100
 msgid "E793: No other buffer in diff mode is modifiable"
 msgstr "E793: ��ʬ�⡼�ɤǤ���¾�ΥХåե����ѹ��Ǥ��ޤ���"
 
-#: ../diff.c:2102
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: ��ʬ�⡼�ɤǤ���¾�ΥХåե��Ϥ���ޤ���"
 
-#: ../diff.c:2112
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr ""
 "E101: ��ʬ�⡼�ɤΥХåե���2�İʾ夢��Τǡ��ɤ��Ȥ�������Ǥ��ޤ���"
 
-#: ../diff.c:2141
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: �Хåե� \"%s\" �����Ĥ���ޤ���"
 
-#: ../diff.c:2152
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: �Хåե� \"%s\" �Ϻ�ʬ�⡼�ɤǤϤ���ޤ���"
 
-#: ../diff.c:2193
 msgid "E787: Buffer changed unexpectedly"
 msgstr "E787: ͽ�������Хåե����ѹ��ѹ�����ޤ���"
 
-#: ../digraph.c:1598
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: �����Escape�ϻ��ѤǤ��ޤ���"
 
-#: ../digraph.c:1760
 msgid "E544: Keymap file not found"
 msgstr "E544: �����ޥåץե����뤬���Ĥ���ޤ���"
 
-#: ../digraph.c:1785
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: :source �Ǽ����ե�����ʳ��Ǥ� :loadkeymap ��Ȥ��ޤ���"
 
-#: ../digraph.c:1821
 msgid "E791: Empty keymap entry"
 msgstr "E791: ���Υ����ޥåץ���ȥ�"
 
-#: ../edit.c:82
 msgid " Keyword completion (^N^P)"
 msgstr " ��������䴰 (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
 msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 msgstr " ^X �⡼�� (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
-#: ../edit.c:85
 msgid " Whole line completion (^L^N^P)"
 msgstr " ��(����)�䴰 (^L^N^P)"
 
-#: ../edit.c:86
 msgid " File name completion (^F^N^P)"
 msgstr " �ե�����̾�䴰 (^F^N^P)"
 
-#: ../edit.c:87
 msgid " Tag completion (^]^N^P)"
 msgstr " �����䴰 (^]^N^P)"
 
-#: ../edit.c:88
 msgid " Path pattern completion (^N^P)"
 msgstr " �ѥ��ѥ������䴰 (^N^P)"
 
-#: ../edit.c:89
 msgid " Definition completion (^D^N^P)"
 msgstr " ����䴰 (^D^N^P)"
 
-#: ../edit.c:91
 msgid " Dictionary completion (^K^N^P)"
 msgstr " �����䴰 (^K^N^P)"
 
-#: ../edit.c:92
 msgid " Thesaurus completion (^T^N^P)"
 msgstr " �������饹�䴰 (^T^N^P)"
 
-#: ../edit.c:93
 msgid " Command-line completion (^V^N^P)"
 msgstr " ���ޥ�ɥ饤���䴰 (^V^N^P)"
 
-#: ../edit.c:94
 msgid " User defined completion (^U^N^P)"
 msgstr " �桼��������䴰 (^U^N^P)"
 
-#: ../edit.c:95
 msgid " Omni completion (^O^N^P)"
 msgstr " ������䴰 (^O^N^P)"
 
-#: ../edit.c:96
 msgid " Spelling suggestion (s^N^P)"
 msgstr " �֤꽤������ (s^N^P)"
 
-#: ../edit.c:97
 msgid " Keyword Local completion (^N^P)"
 msgstr " �ɽꥭ������䴰 (^N^P)"
 
-#: ../edit.c:100
 msgid "Hit end of paragraph"
 msgstr "����κǸ�˥ҥå�"
 
-#: ../edit.c:101
 msgid "E839: Completion function changed window"
 msgstr "E839: ��ִؿ���������ɥ����ѹ����ޤ���"
 
-#: ../edit.c:102
 msgid "E840: Completion function deleted text"
 msgstr "E840: �䴰�ؿ����ƥ����Ȥ������ޤ���"
 
-#: ../edit.c:1847
 msgid "'dictionary' option is empty"
 msgstr "'dictionary' ���ץ���󤬶��Ǥ�"
 
-#: ../edit.c:1848
 msgid "'thesaurus' option is empty"
 msgstr "'thesaurus' ���ץ���󤬶��Ǥ�"
 
-#: ../edit.c:2655
 #, c-format
 msgid "Scanning dictionary: %s"
 msgstr "����򥹥������: %s"
 
-#: ../edit.c:3079
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (����) ����������(^E/^Y)"
 
-#: ../edit.c:3081
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (�ִ�) ���������� (^E/^Y)"
 
-#: ../edit.c:3587
 #, c-format
 msgid "Scanning: %s"
 msgstr "���������: %s"
 
-#: ../edit.c:3614
 msgid "Scanning tags."
 msgstr "�����򥹥������."
 
-#: ../edit.c:4519
 msgid " Adding"
 msgstr " �ɲ���"
 
@@ -441,431 +438,161 @@ msgstr " 
 #. * be called before line = ml_get(), or when this address is no
 #. * longer needed.  -- Acevedo.
 #.
-#: ../edit.c:4562
 msgid "-- Searching..."
 msgstr "-- ������..."
 
-#: ../edit.c:4618
 msgid "Back at original"
 msgstr "�Ϥ�����"
 
-#: ../edit.c:4621
 msgid "Word from other line"
 msgstr "¾�ιԤ�ñ��"
 
-#: ../edit.c:4624
 msgid "The only match"
 msgstr "ͣ��γ���"
 
-#: ../edit.c:4680
 #, c-format
 msgid "match %d of %d"
 msgstr "%d ���ܤγ��� (������ %d ����)"
 
-#: ../edit.c:4684
 #, c-format
 msgid "match %d"
 msgstr "%d ���ܤγ���"
 
-#: ../eval.c:137
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: ͽ������ʸ���� :let �ˤ���ޤ���"
 
-#: ../eval.c:138
-#, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: �ꥹ�ȤΥ���ǥå������ϰϳ��Ǥ�: %<PRId64>"
-
-#: ../eval.c:139
 #, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: ̤������ѿ��Ǥ�: %s"
 
-#: ../eval.c:140
 msgid "E111: Missing ']'"
 msgstr "E111: ']' �����Ĥ���ޤ���"
 
-#: ../eval.c:141
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s �ΰ����ϥꥹ�ȷ��Ǥʤ���Фʤ�ޤ���"
-
-#: ../eval.c:143
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: %s �ΰ����ϥꥹ�ȷ��ޤ��ϼ��񷿤Ǥʤ���Фʤ�ޤ���"
-
-#: ../eval.c:144
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: ���񷿤˶��Υ�����Ȥ����ȤϤǤ��ޤ���"
-
-#: ../eval.c:145
-msgid "E714: List required"
-msgstr "E714: �ꥹ�ȷ���ɬ�פǤ�"
-
-#: ../eval.c:146
-msgid "E715: Dictionary required"
-msgstr "E715: ���񷿤�ɬ�פǤ�"
-
-#: ../eval.c:147
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: �ؿ��ΰ�����¿�᤮�ޤ�: %s"
-
-#: ../eval.c:148
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: ���񷿤˥�����¸�ߤ��ޤ���: %s"
-
-#: ../eval.c:150
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: �ؿ� %s ������ѤǤ�, ���������ˤ� ! ���ɲä��Ƥ�������"
-
-#: ../eval.c:151
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: ������˥���ȥ꤬����¸�ߤ��ޤ�"
-
-#: ../eval.c:152
-msgid "E718: Funcref required"
-msgstr "E718: �ؿ����ȷ����׵ᤵ��ޤ�"
-
-#: ../eval.c:153
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: [:] �򼭽񷿤��Ȥ߹�碌�ƤϻȤ��ޤ���"
 
-#: ../eval.c:154
 #, c-format
 msgid "E734: Wrong variable type for %s="
 msgstr "E734: �ۤʤä������ѿ��Ǥ� %s="
 
-#: ../eval.c:155
-#, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: ̤�Τδؿ��Ǥ�: %s"
-
-#: ../eval.c:156
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: �������ѿ�̾�Ǥ�: %s"
 
-#: ../eval.c:157
 msgid "E806: using Float as a String"
 msgstr "E806: ��ư����������ʸ����Ȥ��ư��äƤ��ޤ�"
 
-#: ../eval.c:1830
 msgid "E687: Less targets than List items"
 msgstr "E687: �������åȤ��ꥹ�ȷ�������Ǥ��⾯�ʤ��Ǥ�"
 
-#: ../eval.c:1834
 msgid "E688: More targets than List items"
 msgstr "E688: �������åȤ��ꥹ�ȷ�������Ǥ���¿���Ǥ�"
 
-#: ../eval.c:1906
 msgid "Double ; in list of variables"
 msgstr "�ꥹ�ȷ����ͤ�2�İʾ�� ; �����Ф���ޤ���"
 
-#: ../eval.c:2078
 #, c-format
 msgid "E738: Can't list variables for %s"
 msgstr "E738: %s ���ͤ����ɽ���Ǥ��ޤ���"
 
-#: ../eval.c:2391
 msgid "E689: Can only index a List or Dictionary"
 msgstr "E689: �ꥹ�ȷ��ȼ��񷿰ʳ��ϥ���ǥå�������Ǥ��ޤ���"
 
-#: ../eval.c:2396
 msgid "E708: [:] must come last"
 msgstr "E708: [:] �ϺǸ�Ǥʤ���Ф����ޤ���"
 
-#: ../eval.c:2439
 msgid "E709: [:] requires a List value"
 msgstr "E709: [:] �ˤϥꥹ�ȷ����ͤ�ɬ�פǤ�"
 
-#: ../eval.c:2674
 msgid "E710: List value has more items than target"
 msgstr "E710: �ꥹ�ȷ��ѿ��˥������åȤ���¿�����Ǥ�����ޤ�"
 
-#: ../eval.c:2678
 msgid "E711: List value has not enough items"
 msgstr "E711: �ꥹ�ȷ��ѿ��˽�ʬ�ʿ������Ǥ�����ޤ���"
 
 #
-#: ../eval.c:2867
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: :for �θ�� \"in\" ������ޤ���"
 
-#: ../eval.c:3063
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: ���å� '(' ������ޤ���: %s"
-
-#: ../eval.c:3263
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: �����ѿ��Ϥ���ޤ���: \"%s\""
 
-#: ../eval.c:3333
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: (����)���å�����ˤ��ѿ�������Ҥ����᤮�ޤ�"
 
-#: ../eval.c:3630
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' �θ�� ':' ������ޤ���"
 
-#: ../eval.c:3893
 msgid "E691: Can only compare List with List"
 msgstr "E691: �ꥹ�ȷ��ϥꥹ�ȷ��Ȥ�����ӤǤ��ޤ���"
 
-#: ../eval.c:3895
-msgid "E692: Invalid operation for Lists"
+msgid "E692: Invalid operation for List"
 msgstr "E692: �ꥹ�ȷ��ˤ�̵�������Ǥ�"
 
-#: ../eval.c:3915
 msgid "E735: Can only compare Dictionary with Dictionary"
 msgstr "E735: ���񷿤ϼ��񷿤Ȥ�����ӤǤ��ޤ���"
 
-#: ../eval.c:3917
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: ���񷿤ˤ�̵�������Ǥ�"
 
-#: ../eval.c:3932
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: �ؿ����ȷ��ϴؿ����ȷ��Ȥ�����ӤǤ��ޤ���"
-
-#: ../eval.c:3934
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: �ؿ����ȷ��ˤ�̵�������Ǥ�"
 
-#: ../eval.c:4277
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: '%' ����ư�����������Ȥ߹�碌�ƤϻȤ��ޤ���"
 
-#: ../eval.c:4478
 msgid "E110: Missing ')'"
 msgstr "E110: ')' �����Ĥ���ޤ���"
 
-#: ../eval.c:4609
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: �ؿ����ȷ��ϥ���ǥå����Ǥ��ޤ���"
 
-#: ../eval.c:4839
+msgid "E909: Cannot index a special variable"
+msgstr "E909: �ü��ѿ��ϥ���ǥå����Ǥ��ޤ���"
+
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: ���ץ����̾������ޤ���: %s"
 
-#: ../eval.c:4855
 #, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: ̤�ΤΥ��ץ����Ǥ�: %s"
 
-#: ../eval.c:4904
 #, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: ������ (\") ������ޤ���: %s"
 
-#: ../eval.c:5020
 #, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: ������ (') ������ޤ���: %s"
 
-#: ../eval.c:5084
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: �ꥹ�ȷ��˥���ޤ�����ޤ���: %s"
-
-#: ../eval.c:5091
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: �ꥹ�ȷ��κǸ�� ']' ������ޤ���: %s"
-
-#: ../eval.c:5807
 msgid "Not enough memory to set references, garbage collection aborted!"
 msgstr ""
 "�����٥å����쥯��������ߤ��ޤ���! ���Ȥ��������Τ˥��꤬��­���ޤ���"
 
-#: ../eval.c:6475
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: ���񷿤˥����󤬤���ޤ���: %s"
-
-#: ../eval.c:6499
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: ���񷿤˽�ʣ����������ޤ�: \"%s\""
-
-#: ../eval.c:6517
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: ���񷿤˥���ޤ�����ޤ���: %s"
-
-#: ../eval.c:6524
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: ���񷿤κǸ�� '}' ������ޤ���: %s"
-
-#: ../eval.c:6555
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: ɽ������ˤ��ѿ�������Ҥ����᤮�ޤ�"
 
-#: ../eval.c:7188
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: �ؿ��ΰ�����¿�᤮�ޤ�: %s"
-
-#: ../eval.c:7190
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: �ؿ���̵���ʰ����Ǥ�: %s"
-
-#: ../eval.c:7377
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: ̤�Τδؿ��Ǥ�: %s"
-
-#: ../eval.c:7383
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: �ؿ��ΰ�����­��ޤ���: %s"
-
-#: ../eval.c:7387
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: ������ץȰʳ���<SID>���Ȥ��ޤ���: %s"
-
-#: ../eval.c:7391
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: �����Ѵؿ����ƤФ�ޤ��������񤬤���ޤ���: %s"
-
-#: ../eval.c:7453
-msgid "E808: Number or Float required"
-msgstr "E808: ���ͤ���ư����������ɬ�פǤ�"
-
-#: ../eval.c:7503
-msgid "add() argument"
-msgstr "add() ���"
-
-#: ../eval.c:7907
-msgid "E699: Too many arguments"
-msgstr "E699: ������¿�᤮�ޤ�"
-
-#: ../eval.c:8073
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete() �������⡼�ɤǤ������ѤǤ��ޤ���"
-
-#: ../eval.c:8156
-msgid "&Ok"
-msgstr "&Ok"
-
-#: ../eval.c:8676
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: �����ϴ���¸�ߤ��ޤ�: %s"
-
-#: ../eval.c:8692
-msgid "extend() argument"
-msgstr "extend() ���"
-
-#: ../eval.c:8915
-msgid "map() argument"
-msgstr "map() ���"
-
-#: ../eval.c:8916
-msgid "filter() argument"
-msgstr "filter() ���"
-
-#: ../eval.c:9229
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld ��: "
-
-#: ../eval.c:9291
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700: ̤�Τδؿ��Ǥ�: %s"
-
-#: ../eval.c:10729
-msgid "called inputrestore() more often than inputsave()"
-msgstr "inputrestore() �� inputsave() ����¿���ƤФ�ޤ���"
-
-#: ../eval.c:10771
-msgid "insert() argument"
-msgstr "insert() ���"
-
-#: ../eval.c:10841
-msgid "E786: Range not allowed"
-msgstr "E786: �ϰϻ���ϵ��Ĥ���Ƥ��ޤ���"
-
-#: ../eval.c:11140
-msgid "E701: Invalid type for len()"
-msgstr "E701: len() �ˤ�̵���ʷ��Ǥ�"
-
-#: ../eval.c:11980
-msgid "E726: Stride is zero"
-msgstr "E726: ���ȥ饤��(������)�� 0 �Ǥ�"
-
-#: ../eval.c:11982
-msgid "E727: Start past end"
-msgstr "E727: ���ϰ��֤���λ���֤�ۤ��ޤ���"
-
-#: ../eval.c:12024 ../eval.c:15297
-msgid "<empty>"
-msgstr "<��>"
-
-#: ../eval.c:12282
-msgid "remove() argument"
-msgstr "remove() ���"
-
-# Added at 10-Mar-2004.
-#: ../eval.c:12466
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: ����ܥ�å���󥯤�¿�᤮�ޤ� (�۴Ĥ��Ƥ����ǽ��������ޤ�)"
-
-#: ../eval.c:12593
-msgid "reverse() argument"
-msgstr "reverse() ���"
-
-#: ../eval.c:13721
-msgid "sort() argument"
-msgstr "sort() ���"
-
-#: ../eval.c:13721
-msgid "uniq() argument"
-msgstr "uniq() ���"
-
-#: ../eval.c:13776
-msgid "E702: Sort compare function failed"
-msgstr "E702: �����Ȥ���Ӵؿ������Ԥ��ޤ���"
-
-#: ../eval.c:13806
-msgid "E882: Uniq compare function failed"
-msgstr "E882: Uniq ����Ӵؿ������Ԥ��ޤ���"
-
-#: ../eval.c:14085
-msgid "(Invalid)"
-msgstr "(̵��)"
-
-#: ../eval.c:14590
-msgid "E677: Error writing temp file"
-msgstr "E677: ����ե���������˥��顼��ȯ�����ޤ���"
-
-#: ../eval.c:16159
 msgid "E805: Using a Float as a Number"
 msgstr "E805: ��ư������������ͤȤ��ư��äƤ��ޤ�"
 
-#: ../eval.c:16162
 msgid "E703: Using a Funcref as a Number"
 msgstr "E703: �ؿ����ȷ�����ͤȤ��ư��äƤ��ޤ���"
 
-#: ../eval.c:16170
 msgid "E745: Using a List as a Number"
 msgstr "E745: �ꥹ�ȷ�����ͤȤ��ư��äƤ��ޤ�"
 
-#: ../eval.c:16173
 msgid "E728: Using a Dictionary as a Number"
 msgstr "E728: ���񷿤���ͤȤ��ư��äƤ��ޤ�"
 
+msgid "E910: Using a Job as a Number"
+msgstr "E910: ����֤���ͤȤ��ư��äƤ��ޤ�"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: �����ͥ����ͤȤ��ư��äƤ��ޤ���"
+
 msgid "E891: Using a Funcref as a Float"
 msgstr "E891: �ؿ����ȷ�����ư���������Ȥ��ư��äƤ��ޤ���"
 
@@ -878,152 +605,53 @@ msgstr "E893: 
 msgid "E894: Using a Dictionary as a Float"
 msgstr "E894: ���񷿤���ư���������Ȥ��ư��äƤ��ޤ�"
 
-#: ../eval.c:16259
+msgid "E907: Using a special value as a Float"
+msgstr "E907: �ü��ͤ���ư���������Ȥ��ư��äƤ��ޤ�"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: ����֤���ư���������Ȥ��ư��äƤ��ޤ�"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: �����ͥ����ư���������Ȥ��ư��äƤ��ޤ���"
+
 msgid "E729: using Funcref as a String"
 msgstr "E729: �ؿ����ȷ���ʸ����Ȥ��ư��äƤ��ޤ�"
 
-#: ../eval.c:16262
 msgid "E730: using List as a String"
 msgstr "E730: �ꥹ�ȷ���ʸ����Ȥ��ư��äƤ��ޤ�"
 
-#: ../eval.c:16265
 msgid "E731: using Dictionary as a String"
 msgstr "E731: ���񷿤�ʸ����Ȥ��ư��äƤ��ޤ�"
 
-#: ../eval.c:16619
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: �ѿ��η������פ��ޤ���: %s"
+msgid "E908: using an invalid value as a String"
+msgstr "E908: ̵�����ͤ�ʸ����Ȥ��ư��äƤ��ޤ�"
 
-#: ../eval.c:16705
 #, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: �ѿ� %s �����Ǥ��ޤ���"
 
-#: ../eval.c:16724
 #, c-format
 msgid "E704: Funcref variable name must start with a capital: %s"
 msgstr "E704: �ؿ����ȷ��ѿ�̾����ʸ���ǻϤޤ�ʤ���Фʤ�ޤ���: %s"
 
-#: ../eval.c:16732
 #, c-format
 msgid "E705: Variable name conflicts with existing function: %s"
 msgstr "E705: �ѿ�̾����¸�δؿ�̾�Ⱦ��ͤ��ޤ�: %s"
 
-#: ../eval.c:16763
 #, c-format
 msgid "E741: Value is locked: %s"
 msgstr "E741: �ͤ����å�����Ƥ��ޤ�: %s"
 
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
 msgid "Unknown"
 msgstr "����"
 
-#: ../eval.c:16768
 #, c-format
 msgid "E742: Cannot change value of %s"
 msgstr "E742: %s ���ͤ��ѹ��Ǥ��ޤ���"
 
-#: ../eval.c:16838
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: ���ԡ�����ˤ��ѿ�������Ҥ����᤮�ޤ�"
 
-#: ../eval.c:17249
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: ̤����δؿ��Ǥ�: %s"
-
-#: ../eval.c:17260
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: '(' ������ޤ���: %s"
-
-#: ../eval.c:17293
-msgid "E862: Cannot use g: here"
-msgstr "E862: �����Ǥ� g: �ϻȤ��ޤ���"
-
-#: ../eval.c:17312
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: �����ʰ����Ǥ�: %s"
-
-#: ../eval.c:17323
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: ����̾����ʣ���Ƥ��ޤ�: %s"
-
-#: ../eval.c:17416
-msgid "E126: Missing :endfunction"
-msgstr "E126: :endfunction ������ޤ���"
-
-#: ../eval.c:17537
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: �ؿ�̾���ѿ�̾�Ⱦ��ͤ��ޤ�: %s"
-
-#: ../eval.c:17549
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: �ؿ� %s �������Ǥ��ޤ���: ������Ǥ�"
-
-#: ../eval.c:17604
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: �ؿ�̾��������ץȤΥե�����̾�Ȱ��פ��ޤ���: %s"
-
-#: ../eval.c:17716
-msgid "E129: Function name required"
-msgstr "E129: �ؿ�̾���׵ᤵ��ޤ�"
-
-#: ../eval.c:17824
-#, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: �ؿ�̾����ʸ���� \"s:\" �ǻϤޤ�ʤ���Фʤ�ޤ���: %s"
-
-#: ../eval.c:17833
-#, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E884: �ؿ�̾�ˤϥ�����ϴޤ���ޤ���: %s"
-
-#: ../eval.c:18336
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: �ؿ� %s �����Ǥ��ޤ���: ������Ǥ�"
-
-#: ../eval.c:18441
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: �ؿ��ƽФ�����ҿ��� 'maxfuncdepth' ��Ķ���ޤ���"
-
-#: ../eval.c:18568
-#, c-format
-msgid "calling %s"
-msgstr "%s ��¹���Ǥ�"
-
-#: ../eval.c:18651
-#, c-format
-msgid "%s aborted"
-msgstr "%s �����Ǥ���ޤ���"
-
-#: ../eval.c:18653
-#, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s �� #%<PRId64> ���֤��ޤ���"
-
-#: ../eval.c:18670
-#, c-format
-msgid "%s returning %s"
-msgstr "%s �� %s ���֤��ޤ���"
-
-#: ../eval.c:18691 ../ex_cmds2.c:2695
-#, c-format
-msgid "continuing in %s"
-msgstr "%s �μ¹Ԥ��³��Ǥ�"
-
-#: ../eval.c:18795
-msgid "E133: :return not inside a function"
-msgstr "E133: �ؿ����� :return ������ޤ���"
-
-#: ../eval.c:19159
 msgid ""
 "\n"
 "# global variables:\n"
@@ -1031,112 +659,226 @@ msgstr ""
 "\n"
 "# �������Х��ѿ�:\n"
 
-#: ../eval.c:19254
 msgid ""
 "\n"
 "\tLast set from "
 msgstr ""
 "\n"
-"\tLast set from "
+"\t�Ǹ�˥��åȤ���������ץ�: "
 
-#: ../eval.c:19272
-msgid "No old files"
-msgstr "�Ť��ե�����Ϥ���ޤ���"
+msgid "map() argument"
+msgstr "map() ���"
+
+msgid "filter() argument"
+msgstr "filter() ���"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s �ΰ����ϥꥹ�ȷ��Ǥʤ���Фʤ�ޤ���"
+
+msgid "E928: String required"
+msgstr "E928: ʸ����ɬ�פǤ�"
+
+msgid "E808: Number or Float required"
+msgstr "E808: ���ͤ���ư����������ɬ�פǤ�"
+
+msgid "add() argument"
+msgstr "add() ���"
+
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() �������⡼�ɤǤ������ѤǤ��ޤ���"
+
+#.
+#. * Yes this is ugly, I don't particularly like it either.  But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all.  See below what 'ok' and 'ync' are used for.
+#.
+msgid "&Ok"
+msgstr "&Ok"
+
+#, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld ��: "
+
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: ̤�Τδؿ��Ǥ�: %s"
+
+msgid "E922: expected a dict"
+msgstr "E922: ���񤬴��Ԥ���Ƥ��ޤ�"
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: function() ���� 2 �����ϥꥹ�ȷ��ޤ��ϼ��񷿤Ǥʤ���Фʤ�ޤ���"
+
+msgid ""
+"&OK\n"
+"&Cancel"
+msgstr ""
+"����(&O)\n"
+"����󥻥�(&C)"
+
+msgid "called inputrestore() more often than inputsave()"
+msgstr "inputrestore() �� inputsave() ����¿���ƤФ�ޤ���"
+
+msgid "insert() argument"
+msgstr "insert() ���"
+
+msgid "E786: Range not allowed"
+msgstr "E786: �ϰϻ���ϵ��Ĥ���Ƥ��ޤ���"
+
+msgid "E916: not a valid job"
+msgstr "E916: ͭ���ʥ���֤ǤϤ���ޤ���"
+
+msgid "E701: Invalid type for len()"
+msgstr "E701: len() �ˤ�̵���ʷ��Ǥ�"
+
+#, c-format
+msgid "E798: ID is reserved for \":match\": %ld"
+msgstr "E798: ID �� \":match\" �Τ����ͽ�󤵤�Ƥ��ޤ�: %ld"
+
+msgid "E726: Stride is zero"
+msgstr "E726: ���ȥ饤��(������)�� 0 �Ǥ�"
+
+msgid "E727: Start past end"
+msgstr "E727: ���ϰ��֤���λ���֤�ۤ��ޤ���"
+
+msgid "<empty>"
+msgstr "<��>"
+
+msgid "E240: No connection to Vim server"
+msgstr "E240: Vim �����С��ؤ���³������ޤ���"
+
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: %s �����뤳�Ȥ��Ǥ��ޤ���"
+
+msgid "E277: Unable to read a server reply"
+msgstr "E277: �����С��α���������ޤ���"
+
+msgid "remove() argument"
+msgstr "remove() ���"
+
+# Added at 10-Mar-2004.
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: ����ܥ�å���󥯤�¿�᤮�ޤ� (�۴Ĥ��Ƥ����ǽ��������ޤ�)"
+
+msgid "reverse() argument"
+msgstr "reverse() ���"
+
+msgid "E258: Unable to send to client"
+msgstr "E258: ���饤����Ȥ����뤳�Ȥ��Ǥ��ޤ���"
+
+#, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: ̵�������Ǥ�: %s"
+
+msgid "sort() argument"
+msgstr "sort() ���"
+
+msgid "uniq() argument"
+msgstr "uniq() ���"
+
+msgid "E702: Sort compare function failed"
+msgstr "E702: �����Ȥ���Ӵؿ������Ԥ��ޤ���"
+
+msgid "E882: Uniq compare function failed"
+msgstr "E882: Uniq ����Ӵؿ������Ԥ��ޤ���"
+
+msgid "(Invalid)"
+msgstr "(̵��)"
+
+#, c-format
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: ̵���ʥ��֥ޥå��ֹ�: %d"
+
+msgid "E677: Error writing temp file"
+msgstr "E677: ����ե���������˥��顼��ȯ�����ޤ���"
+
+msgid "E921: Invalid callback argument"
+msgstr "E921: ̵���ʥ�����Хå������Ǥ�"
 
-#: ../ex_cmds.c:122
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  16�ʿ� %02x,  8�ʿ� %03o"
 
-#: ../ex_cmds.c:145
 #, c-format
 msgid "> %d, Hex %04x, Octal %o"
 msgstr "> %d, 16�ʿ� %04x, 8�ʿ� %o"
 
-#: ../ex_cmds.c:146
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, 16�ʿ� %08x, 8�ʿ� %o"
 
-#: ../ex_cmds.c:684
 msgid "E134: Move lines into themselves"
 msgstr "E134: �Ԥ򤽤켫�Ȥˤϰ�ư�Ǥ��ޤ���"
 
-#: ../ex_cmds.c:747
 msgid "1 line moved"
 msgstr "1 �Ԥ���ư����ޤ���"
 
-#: ../ex_cmds.c:749
 #, c-format
-msgid "%<PRId64> lines moved"
-msgstr "%<PRId64> �Ԥ���ư����ޤ���"
+msgid "%ld lines moved"
+msgstr "%ld �Ԥ���ư����ޤ���"
 
-#: ../ex_cmds.c:1175
 #, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "%<PRId64> �Ԥ��ե��륿��������ޤ���"
+msgid "%ld lines filtered"
+msgstr "%ld �Ԥ��ե��륿��������ޤ���"
 
-#: ../ex_cmds.c:1194
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *�ե��륿* autocommand�ϸ��ߤΥХåե����ѹ����ƤϤ����ޤ���"
 
-#: ../ex_cmds.c:1244
 msgid "[No write since last change]\n"
 msgstr "[�Ǹ���ѹ�����¸����Ƥ��ޤ���]\n"
 
-#: ../ex_cmds.c:1424
 #, c-format
 msgid "%sviminfo: %s in line: "
 msgstr "%sviminfo: %s ����: "
 
-#: ../ex_cmds.c:1431
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr "E136: viminfo: ���顼��¿�᤮��Τ�, �ʹߤϥ����åפ��ޤ�"
 
-#: ../ex_cmds.c:1458
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
 msgstr "viminfo�ե����� \"%s\"%s%s%s ���ɹ�����"
 
-#: ../ex_cmds.c:1460
 msgid " info"
 msgstr " ����"
 
-#: ../ex_cmds.c:1461
 msgid " marks"
 msgstr " �ޡ���"
 
-#: ../ex_cmds.c:1462
 msgid " oldfiles"
 msgstr " ��ե����뷲"
 
-#: ../ex_cmds.c:1463
 msgid " FAILED"
 msgstr " ����"
 
 #. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: viminfo�ե����뤬����ߤǤ��ޤ���: %s"
 
-#: ../ex_cmds.c:1626
+#, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: ���viminfo�ե����뤬¿�᤮�ޤ�! ��: %s"
+
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: viminfo�ե����� %s ����¸�Ǥ��ޤ���!"
 
-#: ../ex_cmds.c:1635
 #, c-format
 msgid "Writing viminfo file \"%s\""
 msgstr "viminfo�ե����� \"%s\" ��������"
 
+#, c-format
+msgid "E886: Can't rename viminfo file to %s!"
+msgstr "E886: viminfo�ե������ %s ��̾���ѹ��Ǥ��ޤ���!"
+
 #. Write the info:
-#: ../ex_cmds.c:1720
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# ���� viminfo �ե������ Vim %s �ˤ�ä���������ޤ���.\n"
 
-#: ../ex_cmds.c:1722
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -1144,47 +886,47 @@ msgstr ""
 "# �ѹ�����ݤˤϽ�ʬ���դ��Ƥ�������!\n"
 "\n"
 
-#: ../ex_cmds.c:1723
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# ���Υե����뤬�񤫤줿���� 'encoding' ����\n"
 
-#: ../ex_cmds.c:1800
 msgid "Illegal starting char"
 msgstr "��������Ƭʸ���Ǥ�"
 
-#: ../ex_cmds.c:2162
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# '|' �ǻϤޤ�ԤΡ�ʸ���̤�Υ��ԡ�:\n"
+
+msgid "Save As"
+msgstr "��̾����¸"
+
 msgid "Write partial file?"
 msgstr "�ե��������ʬŪ����¸���ޤ���?"
 
-#: ../ex_cmds.c:2166
 msgid "E140: Use ! to write partial buffer"
 msgstr "E140: �Хåե�����ʬŪ����¸����ˤ� ! ��ȤäƤ�������"
 
-#: ../ex_cmds.c:2281
 #, c-format
 msgid "Overwrite existing file \"%s\"?"
 msgstr "��¸�Υե����� \"%s\" ���񤭤��ޤ���?"
 
-#: ../ex_cmds.c:2317
 #, c-format
 msgid "Swap file \"%s\" exists, overwrite anyway?"
 msgstr "����åץե����� \"%s\" ��¸�ߤ��ޤ�. ��񤭤������ޤ���?"
 
-#: ../ex_cmds.c:2326
 #, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: ����åץե����뤬¸�ߤ��ޤ�: %s (:silent! ���ɲäǾ��)"
 
-#: ../ex_cmds.c:2381
 #, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: �Хåե� %<PRId64> �ˤ�̾��������ޤ���"
+msgid "E141: No file name for buffer %ld"
+msgstr "E141: �Хåե� %ld �ˤ�̾��������ޤ���"
 
-#: ../ex_cmds.c:2412
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: �ե��������¸����ޤ���Ǥ���: 'write' ���ץ����ˤ��̵���Ǥ�"
 
-#: ../ex_cmds.c:2434
 #, c-format
 msgid ""
 "'readonly' option is set for \"%s\".\n"
@@ -1193,7 +935,6 @@ msgstr ""
 "\"%s\" �ˤ� 'readonly' ���ץ�������ꤵ��Ƥ��ޤ�.\n"
 "��񤭶����򤷤ޤ���?"
 
-#: ../ex_cmds.c:2439
 #, c-format
 msgid ""
 "File permissions of \"%s\" are read-only.\n"
@@ -1204,83 +945,68 @@ msgstr ""
 "����Ǥⶲ�餯�񤭹��ळ�Ȥϲ�ǽ�Ǥ�.\n"
 "��³���ޤ���?"
 
-#: ../ex_cmds.c:2451
 #, c-format
 msgid "E505: \"%s\" is read-only (add ! to override)"
 msgstr "E505: \"%s\" ���ɹ����ѤǤ� (��������ˤ� ! ���ɲ�)"
 
-#: ../ex_cmds.c:3120
+msgid "Edit File"
+msgstr "�ե�������Խ�"
+
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: autocommand��ͽ�������������Хåե� %s �������ޤ���"
 
-#: ../ex_cmds.c:3313
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: ���ǤϤʤ������� :z ���Ϥ���ޤ���"
 
-#: ../ex_cmds.c:3404
 msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: rvim�Ǥϥ����륳�ޥ�ɤ�Ȥ��ޤ���"
 
-#: ../ex_cmds.c:3498
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: ����ɽ����ʸ���Ƕ��ڤ뤳�Ȥ��Ǥ��ޤ���"
 
-#: ../ex_cmds.c:3964
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "%s ���ִ����ޤ���? (y/n/a/q/l/^E/^Y)"
 
-#: ../ex_cmds.c:4379
 msgid "(Interrupted) "
 msgstr "(����ޤ�ޤ���) "
 
-#: ../ex_cmds.c:4384
 msgid "1 match"
 msgstr "1 �ս곺�����ޤ���"
 
-#: ../ex_cmds.c:4384
 msgid "1 substitution"
 msgstr "1 �ս��ִ����ޤ���"
 
-#: ../ex_cmds.c:4387
 #, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> �ս곺�����ޤ���"
+msgid "%ld matches"
+msgstr "%ld �ս곺�����ޤ���"
 
-#: ../ex_cmds.c:4388
 #, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64> �ս��ִ����ޤ���"
+msgid "%ld substitutions"
+msgstr "%ld �ս��ִ����ޤ���"
 
-#: ../ex_cmds.c:4392
 msgid " on 1 line"
 msgstr " (�� 1 ����)"
 
-#: ../ex_cmds.c:4395
 #, c-format
-msgid " on %<PRId64> lines"
-msgstr " (�� %<PRId64> ����)"
+msgid " on %ld lines"
+msgstr " (�� %ld ����)"
 
-#: ../ex_cmds.c:4438
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global ��Ƶ�Ū�ˤϻȤ��ޤ���"
 
-#: ../ex_cmds.c:4467
 msgid "E148: Regular expression missing from global"
 msgstr "E148: global���ޥ�ɤ�����ɽ�������ꤵ��Ƥ��ޤ���"
 
-#: ../ex_cmds.c:4508
 #, c-format
 msgid "Pattern found in every line: %s"
 msgstr "�ѥ��������ƤιԤǸ��Ĥ���ޤ���: %s"
 
-#: ../ex_cmds.c:4510
 #, c-format
 msgid "Pattern not found: %s"
 msgstr "�ѥ�����ϸ��Ĥ���ޤ���Ǥ���: %s"
 
-#: ../ex_cmds.c:4587
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -1290,110 +1016,102 @@ msgstr ""
 "# �Ǹ���ִ����줿ʸ����:\n"
 "$"
 
-#: ../ex_cmds.c:4679
 msgid "E478: Don't panic!"
 msgstr "E478: ���Ƥʤ��Ǥ�������"
 
-#: ../ex_cmds.c:4717
 #, c-format
 msgid "E661: Sorry, no '%s' help for %s"
 msgstr "E661: ��ǰ�Ǥ��� '%s' �Υإ�פ� %s �ˤϤ���ޤ���"
 
-#: ../ex_cmds.c:4719
 #, c-format
 msgid "E149: Sorry, no help for %s"
 msgstr "E149: ��ǰ�Ǥ��� %s �ˤϥإ�פ�����ޤ���"
 
-#: ../ex_cmds.c:4751
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
 msgstr "��ǰ�Ǥ����إ�ץե����� \"%s\" �����Ĥ���ޤ���"
 
-#: ../ex_cmds.c:5323
 #, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: �ǥ��쥯�ȥ�ǤϤ���ޤ���: %s"
+msgid "E151: No match: %s"
+msgstr "E151: �ޥå��Ϥ���ޤ���: %s"
 
-#: ../ex_cmds.c:5446
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: ������Ѥ� %s �򳫤��ޤ���"
 
-#: ../ex_cmds.c:5471
 #, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: �ɹ��Ѥ� %s �򳫤��ޤ���"
 
 # Added at 29-Apr-2004.
-#: ../ex_cmds.c:5500
 #, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
 msgstr "E670: 1�Ĥθ���Υإ�ץե������ʣ���Υ��󥳡��ɤ����ߤ��Ƥ��ޤ�: %s"
 
-#: ../ex_cmds.c:5565
 #, c-format
 msgid "E154: Duplicate tag \"%s\" in file %s/%s"
 msgstr "E154: ���� \"%s\" ���ե����� %s/%s �˽�ʣ���Ƥ��ޤ�"
 
-#: ../ex_cmds.c:5687
+#, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: �ǥ��쥯�ȥ�ǤϤ���ޤ���: %s"
+
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: ̤�Τ�sign���ޥ�ɤǤ�: %s"
 
-#: ../ex_cmds.c:5704
 msgid "E156: Missing sign name"
 msgstr "E156: sign̾������ޤ���"
 
-#: ../ex_cmds.c:5746
 msgid "E612: Too many signs defined"
 msgstr "E612: sign�������¿�����Ĥ���ޤ���"
 
-#: ../ex_cmds.c:5813
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: ̵����sign�Υƥ����ȤǤ�: %s"
 
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: ̤�Τ�sign�Ǥ�: %s"
 
-#: ../ex_cmds.c:5877
 msgid "E159: Missing sign number"
 msgstr "E159: sign���ֹ椬����ޤ���"
 
-#: ../ex_cmds.c:5971
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: ̵���ʥХåե�̾�Ǥ�: %s"
 
-#: ../ex_cmds.c:6008
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: ̾����̵���Хåե��ؤϥ����פǤ��ޤ���"
+
 #, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: ̵����sign���̻ҤǤ�: %<PRId64>"
+msgid "E157: Invalid sign ID: %ld"
+msgstr "E157: ̵����sign���̻ҤǤ�: %ld"
 
 #, c-format
 msgid "E885: Not possible to change sign %s"
 msgstr "E885: �ѹ��Ǥ��ʤ� sign �Ǥ�: %s"
 
-#: ../ex_cmds.c:6066
+# Added at 27-Jan-2004.
+msgid " (NOT FOUND)"
+msgstr " (���Ĥ���ޤ���)"
+
 msgid " (not supported)"
 msgstr " (�󥵥ݡ���)"
 
-#: ../ex_cmds.c:6169
 msgid "[Deleted]"
 msgstr "[�����]"
 
-#: ../ex_cmds2.c:139
+msgid "No old files"
+msgstr "�Ť��ե�����Ϥ���ޤ���"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "�ǥХå��⡼�ɤ�����ޤ�. ³����ˤ� \"cont\" �����Ϥ��Ƥ�������."
 
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
 #, c-format
-msgid "line %<PRId64>: %s"
-msgstr "�� %<PRId64>: %s"
+msgid "line %ld: %s"
+msgstr "�� %ld: %s"
 
-#: ../ex_cmds2.c:145
 #, c-format
 msgid "cmd: %s"
 msgstr "���ޥ��: %s"
@@ -1405,232 +1123,184 @@ msgstr "
 msgid "frame at highest level: %d"
 msgstr "�ǹ��٥�Υե졼��: %d"
 
-#: ../ex_cmds2.c:322
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "�֥졼���ݥ���� \"%s%s\" �� %<PRId64>"
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "�֥졼���ݥ���� \"%s%s\" �� %ld"
 
-#: ../ex_cmds2.c:581
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: �֥졼���ݥ���Ȥ����Ĥ���ޤ���: %s"
 
-#: ../ex_cmds2.c:611
 msgid "No breakpoints defined"
 msgstr "�֥졼���ݥ���Ȥ��������Ƥ��ޤ���"
 
-#: ../ex_cmds2.c:617
 #, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s  �� %<PRId64>"
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  �� %ld"
 
-#: ../ex_cmds2.c:942
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: ���� \":profile start {fname}\" ��¹Ԥ��Ƥ�������"
 
-#: ../ex_cmds2.c:1269
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "�ѹ��� \"%s\" ����¸���ޤ���?"
 
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
 msgid "Untitled"
 msgstr "̵��"
 
-#: ../ex_cmds2.c:1421
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: �Хåե� \"%s\" ���ѹ�����¸����Ƥ��ޤ���"
 
-#: ../ex_cmds2.c:1480
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "�ٹ�: ͽ������¾�Хåե��ذ�ư���ޤ��� (autocommands ��Ĵ�٤Ƥ�������)"
 
-#: ../ex_cmds2.c:1826
 msgid "E163: There is only one file to edit"
 msgstr "E163: �Խ�����ե������1�Ĥ�������ޤ���"
 
-#: ../ex_cmds2.c:1828
 msgid "E164: Cannot go before first file"
 msgstr "E164: �ǽ�Υե����������ˤϹԤ��ޤ���"
 
-#: ../ex_cmds2.c:1830
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: �Ǹ�Υե������ۤ��Ƹ�ˤϹԤ��ޤ���"
 
-#: ../ex_cmds2.c:2175
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: ���Υ���ѥ���ˤ��б����Ƥ��ޤ���: %s"
 
-#: ../ex_cmds2.c:2257
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
 msgstr "\"%s\" �� \"%s\" ���鸡����"
 
-#: ../ex_cmds2.c:2284
 #, c-format
 msgid "Searching for \"%s\""
 msgstr "\"%s\" �򸡺���"
 
-#: ../ex_cmds2.c:2307
 #, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "'runtimepath' ����ˤϸ��Ĥ���ޤ���: \"%s\""
+msgid "not found in '%s': \"%s\""
+msgstr "'%s' ����ˤϤ���ޤ���: \"%s\""
+
+msgid "Source Vim script"
+msgstr "Vim������ץȤμ����"
 
-#: ../ex_cmds2.c:2472
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "�ǥ��쥯�ȥ�ϼ����ޤ���: \"%s\""
 
-#: ../ex_cmds2.c:2518
 #, c-format
 msgid "could not source \"%s\""
 msgstr "\"%s\" ������ޤ���"
 
-#: ../ex_cmds2.c:2520
 #, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "�� %<PRId64>: \"%s\" ������ޤ���"
+msgid "line %ld: could not source \"%s\""
+msgstr "�� %ld: \"%s\" ������ޤ���"
 
-#: ../ex_cmds2.c:2535
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "\"%s\" ������"
 
-#: ../ex_cmds2.c:2537
 #, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "�� %<PRId64>: %s ������"
+msgid "line %ld: sourcing \"%s\""
+msgstr "�� %ld: %s ������"
 
-#: ../ex_cmds2.c:2693
 #, c-format
 msgid "finished sourcing %s"
 msgstr "%s �μ����λ"
 
-#: ../ex_cmds2.c:2765
+#, c-format
+msgid "continuing in %s"
+msgstr "%s �μ¹Ԥ��³��Ǥ�"
+
 msgid "modeline"
 msgstr "�⡼�ɹ�"
 
-#: ../ex_cmds2.c:2767
 msgid "--cmd argument"
 msgstr "--cmd ����"
 
-#: ../ex_cmds2.c:2769
 msgid "-c argument"
 msgstr "-c ����"
 
-#: ../ex_cmds2.c:2771
 msgid "environment variable"
 msgstr "�Ķ��ѿ�"
 
-#: ../ex_cmds2.c:2773
 msgid "error handler"
 msgstr "���顼�ϥ�ɥ�"
 
-#: ../ex_cmds2.c:3020
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr "W15: �ٹ�: �Զ��ڤ������Ǥ�. ^M ���ʤ��ΤǤ��礦"
 
-#: ../ex_cmds2.c:3139
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding �����������ץȰʳ��ǻ��Ѥ���ޤ���"
 
-#: ../ex_cmds2.c:3166
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish �����������ץȰʳ��ǻ��Ѥ���ޤ���"
 
-#: ../ex_cmds2.c:3389
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "���ߤ� %s����: \"%s\""
 
-#: ../ex_cmds2.c:3404
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: ����� \"%s\" ������Ǥ��ޤ���"
 
-#. don't redisplay the window
-#. don't wait for return
-#: ../ex_docmd.c:387
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr ""
 "Ex�⡼�ɤ�����ޤ�. �Ρ��ޥ�⡼�ɤ����ˤ�\"visual\"�����Ϥ��Ƥ�������."
 
-#: ../ex_docmd.c:428
 msgid "E501: At end-of-file"
 msgstr "E501: �ե�����ν�λ����"
 
-#: ../ex_docmd.c:513
 msgid "E169: Command too recursive"
 msgstr "E169: ���ޥ�ɤ��Ƶ�Ū�᤮�ޤ�"
 
-#: ../ex_docmd.c:1006
 #, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: �㳰����ª����ޤ���Ǥ���: %s"
 
-#: ../ex_docmd.c:1085
 msgid "End of sourced file"
 msgstr "����ե�����κǸ�Ǥ�"
 
-#: ../ex_docmd.c:1086
 msgid "End of function"
 msgstr "�ؿ��κǸ�Ǥ�"
 
-#: ../ex_docmd.c:1628
 msgid "E464: Ambiguous use of user-defined command"
 msgstr "E464: �桼����������ޥ�ɤΤ����ޤ��ʻ��ѤǤ�"
 
-#: ../ex_docmd.c:1638
 msgid "E492: Not an editor command"
 msgstr "E492: ���ǥ����Υ��ޥ�ɤǤϤ���ޤ���"
 
-#: ../ex_docmd.c:1729
 msgid "E493: Backwards range given"
 msgstr "E493: �դ��ޤ��ϰϤ����ꤵ��ޤ���"
 
-#: ../ex_docmd.c:1733
 msgid "Backwards range given, OK to swap"
 msgstr "�դ��ޤ��ϰϤ����ꤵ��ޤ���, ���ؤ��ޤ���?"
 
-#. append
-#. typed wrong
-#: ../ex_docmd.c:1787
 msgid "E494: Use w or w>>"
 msgstr "E494: w �⤷���� w>> ����Ѥ��Ƥ�������"
 
-#: ../ex_docmd.c:3454
-msgid "E319: The command is not available in this version"
+msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: ���ΥС������ǤϤ��Υ��ޥ�ɤ����ѤǤ��ޤ���, �����ʤ���"
 
-#: ../ex_docmd.c:3752
 msgid "E172: Only one file name allowed"
 msgstr "E172: �ե�����̾�� 1 �Ĥˤ��Ƥ�������"
 
-#: ../ex_docmd.c:4238
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "�Խ����٤��ե����뤬 1 �Ĥ���ޤ���, ��λ���ޤ���?"
 
-#: ../ex_docmd.c:4242
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "�Խ����٤��ե����뤬���� %d �Ĥ���ޤ���, ��λ���ޤ���?"
 
-#: ../ex_docmd.c:4248
 msgid "E173: 1 more file to edit"
 msgstr "E173: �Խ����٤��ե����뤬 1 �Ĥ���ޤ�"
 
-#: ../ex_docmd.c:4250
 #, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: �Խ����٤��ե����뤬���� %<PRId64> �Ĥ���ޤ�"
+msgid "E173: %ld more files to edit"
+msgstr "E173: �Խ����٤��ե����뤬���� %ld �Ĥ���ޤ�"
 
-#: ../ex_docmd.c:4320
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: ���ޥ�ɤ����ˤ���ޤ�: ���������ˤ� ! ���ɲä��Ƥ�������"
 
-#: ../ex_docmd.c:4432
 msgid ""
 "\n"
 "    Name        Args       Address   Complete  Definition"
@@ -1638,51 +1308,40 @@ msgstr ""
 "\n"
 "    ̾��        ����       ���ɥ쥹  �䴰      ���"
 
-#: ../ex_docmd.c:4516
 msgid "No user-defined commands found"
 msgstr "�桼����������ޥ�ɤ����Ĥ���ޤ���Ǥ���"
 
-#: ../ex_docmd.c:4538
 msgid "E175: No attribute specified"
 msgstr "E175: °�����������Ƥ��ޤ���"
 
-#: ../ex_docmd.c:4583
 msgid "E176: Invalid number of arguments"
 msgstr "E176: �����ο���̵���Ǥ�"
 
-#: ../ex_docmd.c:4594
 msgid "E177: Count cannot be specified twice"
 msgstr "E177: ������Ȥ�2�Ż��ꤹ�뤳�ȤϤǤ��ޤ���"
 
-#: ../ex_docmd.c:4603
 msgid "E178: Invalid default value for count"
 msgstr "E178: ������Ȥξ�ά�ͤ�̵���Ǥ�"
 
-#: ../ex_docmd.c:4625
 msgid "E179: argument required for -complete"
 msgstr "E179: -complete �ˤϰ�����ɬ�פǤ�"
 
 msgid "E179: argument required for -addr"
 msgstr "E179: -addr �ˤϰ�����ɬ�פǤ�"
 
-#: ../ex_docmd.c:4635
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: ̵����°���Ǥ�: %s"
 
-#: ../ex_docmd.c:4678
 msgid "E182: Invalid command name"
 msgstr "E182: ̵���ʥ��ޥ��̾�Ǥ�"
 
-#: ../ex_docmd.c:4691
 msgid "E183: User defined commands must start with an uppercase letter"
-msgstr "E183: �桼��������ޥ�ɤϱ���ʸ���ǻϤޤ�ʤ���Фʤ�ޤ���"
+msgstr "E183: �桼����������ޥ�ɤϱ���ʸ���ǻϤޤ�ʤ���Фʤ�ޤ���"
 
-#: ../ex_docmd.c:4696
 msgid "E841: Reserved name, cannot be used for user defined command"
 msgstr "E841: ͽ��̾�ʤΤ�, �桼����������ޥ�ɤ����ѤǤ��ޤ���"
 
-#: ../ex_docmd.c:4751
 #, c-format
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: ���Υ桼����������ޥ�ɤϤ���ޤ���: %s"
@@ -1691,293 +1350,261 @@ msgstr "E184: 
 msgid "E180: Invalid address type value: %s"
 msgstr "E180: ̵���ʥ��ɥ쥹�������ͤǤ�: %s"
 
-#: ../ex_docmd.c:5219
 #, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: ̵�����䴰����Ǥ�: %s"
 
-#: ../ex_docmd.c:5225
 msgid "E468: Completion argument only allowed for custom completion"
 msgstr "E468: �䴰�����ϥ��������䴰�Ǥ������ѤǤ��ޤ���"
 
-#: ../ex_docmd.c:5231
 msgid "E467: Custom completion requires a function argument"
 msgstr "E467: ���������䴰�ˤϰ����Ȥ��ƴؿ���ɬ�פǤ�"
 
-#: ../ex_docmd.c:5257
+msgid "unknown"
+msgstr "����"
+
 #, c-format
 msgid "E185: Cannot find color scheme '%s'"
 msgstr "E185: ���顼�������� '%s' �����Ĥ���ޤ���"
 
-#: ../ex_docmd.c:5263
 msgid "Greetings, Vim user!"
 msgstr "Vim �Ȥ����󡢤䤢!"
 
-#: ../ex_docmd.c:5431
 msgid "E784: Cannot close last tab page"
 msgstr "E784: �Ǹ�Υ��֥ڡ������Ĥ��뤳�ȤϤǤ��ޤ���"
 
-#: ../ex_docmd.c:5462
 msgid "Already only one tab page"
 msgstr "���˥��֥ڡ�����1�Ĥ�������ޤ���"
 
-#: ../ex_docmd.c:6004
+msgid "Edit File in new window"
+msgstr "������������ɥ��ǥե�������Խ����ޤ�"
+
 #, c-format
 msgid "Tab page %d"
 msgstr "���֥ڡ��� %d"
 
-#: ../ex_docmd.c:6295
 msgid "No swap file"
 msgstr "����åץե����뤬����ޤ���"
 
-#: ../ex_docmd.c:6478
+msgid "Append File"
+msgstr "�ɲåե�����"
+
 msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
 msgstr ""
 "E747: �Хåե�����������Ƥ���Τ�, �ǥ��쥯�ȥ���ѹ��Ǥ��ޤ��� (! ���ɲä�"
 "���)"
 
-#: ../ex_docmd.c:6485
 msgid "E186: No previous directory"
 msgstr "E186: ���Υǥ��쥯�ȥ�Ϥ���ޤ���"
 
-#: ../ex_docmd.c:6530
 msgid "E187: Unknown"
 msgstr "E187: ̤��"
 
-#: ../ex_docmd.c:6610
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: :winsize �ˤ�2�Ĥο��ͤΰ�����ɬ�פǤ�"
 
-#: ../ex_docmd.c:6655
+#, c-format
+msgid "Window position: X %d, Y %d"
+msgstr "������ɥ�����: X %d, Y %d"
+
 msgid "E188: Obtaining window position not implemented for this platform"
 msgstr ""
 "E188: ���Υץ�åȥۡ���ˤϥ�����ɥ����֤μ�����ǽ�ϼ�������Ƥ��ޤ���"
 
-#: ../ex_docmd.c:6662
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos �ˤ�2�Ĥο��ͤΰ�����ɬ�פǤ�"
 
-#: ../ex_docmd.c:7241
+msgid "E930: Cannot use :redir inside execute()"
+msgstr "E930: execute() ����Ǥ� :redir �ϻȤ��ޤ���"
+
+msgid "Save Redirection"
+msgstr "������쥯�Ȥ���¸���ޤ�"
+
+msgid "Save View"
+msgstr "�ӥ塼����¸���ޤ�"
+
+msgid "Save Session"
+msgstr "���å����������¸���ޤ�"
+
+msgid "Save Setup"
+msgstr "�������¸���ޤ�"
+
 #, c-format
 msgid "E739: Cannot create directory: %s"
 msgstr "E739: �ǥ��쥯�ȥ������Ǥ��ޤ���: %s"
 
-#: ../ex_docmd.c:7268
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
 msgstr "E189: \"%s\" ��¸�ߤ��ޤ� (��񤹤�ˤ� ! ���ɲä��Ƥ�������)"
 
-#: ../ex_docmd.c:7273
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: \"%s\" �������ѤȤ��Ƴ����ޤ���"
 
 #. set mark
-#: ../ex_docmd.c:7294
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: ������1ʸ���αѻ��������� (' �� `) �Ǥʤ���Ф����ޤ���"
 
-#: ../ex_docmd.c:7333
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: :normal �κƵ����Ѥ������ʤ�᤮�ޤ���"
 
-#: ../ex_docmd.c:7807
+msgid "E809: #< is not available without the +eval feature"
+msgstr "E809: #< �� +eval ��ǽ��̵�������ѤǤ��ޤ���"
+
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: '#'���֤����������ե������̾��������ޤ���"
 
-#: ../ex_docmd.c:7841
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
 msgstr "E495: \"<afile>\"���֤�������autocommand�Υե�����̾������ޤ���"
 
-#: ../ex_docmd.c:7850
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
 msgstr "E496: \"<abuf>\"���֤�������autocommand�Хåե��ֹ椬����ޤ���"
 
-#: ../ex_docmd.c:7861
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
 msgstr "E497: \"<amatch>\"���֤�������autocommand�γ���̾������ޤ���"
 
-#: ../ex_docmd.c:7870
 msgid "E498: no :source file name to substitute for \"<sfile>\""
 msgstr "E498: \"<sfile>\"���֤������� :source �оݥե�����̾������ޤ���"
 
-#: ../ex_docmd.c:7876
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: \"<slnum>\"���֤���������ֹ椬����ޤ���"
 
-#: ../ex_docmd.c:7903
-#, fuzzy, c-format
+#, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr ""
 "E499: '%' �� '#' ��̵̾�ե�����ʤΤ� \":p:h\" ��ȼ��ʤ��Ȥ����ϤǤ��ޤ���"
 
-#: ../ex_docmd.c:7905
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: ��ʸ����Ȥ���ɾ������ޤ���"
 
-#: ../ex_docmd.c:8838
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: viminfo�ե�������ɹ��ѤȤ��Ƴ����ޤ���"
 
-#: ../ex_eval.c:464
+msgid "E196: No digraphs in this version"
+msgstr "E196: ���ΥС������˹���Ϥ���ޤ���"
+
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: 'Vim' �ǻϤޤ��㳰�� :throw �Ǥ��ޤ���"
 
 #. always scroll up, don't overwrite
-#: ../ex_eval.c:496
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "�㳰��ȯ�����ޤ���: %s"
 
-#: ../ex_eval.c:545
 #, c-format
 msgid "Exception finished: %s"
 msgstr "�㳰����«���ޤ���: %s"
 
-#: ../ex_eval.c:546
 #, c-format
 msgid "Exception discarded: %s"
 msgstr "�㳰���˴�����ޤ���: %s"
 
-#: ../ex_eval.c:588 ../ex_eval.c:634
 #, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s, �� %<PRId64>"
+msgid "%s, line %ld"
+msgstr "%s, �� %ld"
 
 #. always scroll up, don't overwrite
-#: ../ex_eval.c:608
 #, c-format
 msgid "Exception caught: %s"
 msgstr "�㳰����ª����ޤ���: %s"
 
-#: ../ex_eval.c:676
 #, c-format
 msgid "%s made pending"
 msgstr "%s �ˤ��̤������֤������ޤ���"
 
-#: ../ex_eval.c:679
 #, c-format
 msgid "%s resumed"
 msgstr "%s ���Ƴ����ޤ���"
 
-#: ../ex_eval.c:683
 #, c-format
 msgid "%s discarded"
 msgstr "%s ���˴�����ޤ���"
 
-#: ../ex_eval.c:708
 msgid "Exception"
 msgstr "�㳰"
 
-#: ../ex_eval.c:713
 msgid "Error and interrupt"
 msgstr "���顼�ȳ����"
 
-#: ../ex_eval.c:715
 msgid "Error"
 msgstr "���顼"
 
 #. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
 msgid "Interrupt"
 msgstr "�����"
 
-#: ../ex_eval.c:795
 msgid "E579: :if nesting too deep"
 msgstr "E579: :if ������Ҥ����᤮�ޤ�"
 
-#: ../ex_eval.c:830
 msgid "E580: :endif without :if"
 msgstr "E580: :if �Τʤ� :endif ������ޤ�"
 
-#: ../ex_eval.c:873
 msgid "E581: :else without :if"
 msgstr "E581: :if �Τʤ� :else ������ޤ�"
 
-#: ../ex_eval.c:876
 msgid "E582: :elseif without :if"
 msgstr "E582: :if �Τʤ� :elseif ������ޤ�"
 
-#: ../ex_eval.c:880
 msgid "E583: multiple :else"
 msgstr "E583: ʣ���� :else ������ޤ�"
 
-#: ../ex_eval.c:883
 msgid "E584: :elseif after :else"
 msgstr "E584: :else �θ�� :elseif ������ޤ�"
 
-#: ../ex_eval.c:941
 msgid "E585: :while/:for nesting too deep"
 msgstr "E585: :while �� :for ������Ҥ����᤮�ޤ�"
 
-#: ../ex_eval.c:1028
 msgid "E586: :continue without :while or :for"
 msgstr "E586: :while �� :for �Τʤ� :continue ������ޤ�"
 
-#: ../ex_eval.c:1061
 msgid "E587: :break without :while or :for"
 msgstr "E587: :while �� :for �Τʤ� :break ������ޤ�"
 
-#: ../ex_eval.c:1102
 msgid "E732: Using :endfor with :while"
 msgstr "E732: :endfor �� :while ���Ȥ߹�碌�Ƥ��ޤ�"
 
-#: ../ex_eval.c:1104
 msgid "E733: Using :endwhile with :for"
 msgstr "E733: :endwhile �� :for ���Ȥ߹�碌�Ƥ��ޤ�"
 
-#: ../ex_eval.c:1247
 msgid "E601: :try nesting too deep"
 msgstr "E601: :try ������Ҥ����᤮�ޤ�"
 
-#: ../ex_eval.c:1317
 msgid "E603: :catch without :try"
 msgstr "E603: :try �Τʤ� :catch ������ޤ�"
 
 #. Give up for a ":catch" after ":finally" and ignore it.
 #. * Just parse.
-#: ../ex_eval.c:1332
 msgid "E604: :catch after :finally"
 msgstr "E604: :finally �θ�� :catch ������ޤ�"
 
-#: ../ex_eval.c:1451
 msgid "E606: :finally without :try"
 msgstr "E606: :try �Τʤ� :finally ������ޤ�"
 
 #. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
 msgid "E607: multiple :finally"
 msgstr "E607: ʣ���� :finally ������ޤ�"
 
-#: ../ex_eval.c:1571
 msgid "E602: :endtry without :try"
 msgstr "E602: :try �Τʤ� :endtry �Ǥ�"
 
-#: ../ex_eval.c:2026
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: �ؿ��γ��� :endfunction ������ޤ���"
 
-#: ../ex_getln.c:1643
 msgid "E788: Not allowed to edit another buffer now"
 msgstr "E788: ���ߤ�¾�ΥХåե����Խ����뤳�Ȥϵ�����ޤ���"
 
-#: ../ex_getln.c:1656
 msgid "E811: Not allowed to change buffer information now"
 msgstr "E811: ���ߤϥХåե�������ѹ����뤳�Ȥϵ�����ޤ���"
 
-#: ../ex_getln.c:3178
 msgid "tagname"
 msgstr "����̾"
 
-#: ../ex_getln.c:3181
 msgid " kind file\n"
 msgstr " �ե��������\n"
 
-#: ../ex_getln.c:4799
 msgid "'history' option is zero"
 msgstr "���ץ���� 'history' �������Ǥ�"
 
-#: ../ex_getln.c:5046
 #, c-format
 msgid ""
 "\n"
@@ -1986,303 +1613,224 @@ msgstr ""
 "\n"
 "# %s ���ܤ����� (��������Τ���Ť���Τ�):\n"
 
-#: ../ex_getln.c:5047
 msgid "Command Line"
 msgstr "���ޥ�ɥ饤��"
 
-#: ../ex_getln.c:5048
 msgid "Search String"
 msgstr "����ʸ����"
 
-#: ../ex_getln.c:5049
 msgid "Expression"
 msgstr "��"
 
-#: ../ex_getln.c:5050
 msgid "Input Line"
 msgstr "���Ϲ�"
 
-#: ../ex_getln.c:5117
+msgid "Debug Line"
+msgstr "�ǥХå���"
+
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar �����ޥ��Ĺ��Ķ���ޤ���"
 
-#: ../ex_getln.c:5279
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: �����ƥ��֤ʥ�����ɥ����Хåե����������ޤ���"
 
-#: ../file_search.c:203
-msgid "E854: path too long for completion"
-msgstr "E854: �ѥ���Ĺ�᤮���䴰�Ǥ��ޤ���"
-
-#: ../file_search.c:446
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: ̵���ʥѥ��Ǥ�: '**[����]' ��path�κǸ夫 '%s' ��³���Ƥʤ��Ȥ����ޤ�"
-"��."
-
-#: ../file_search.c:1505
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpath�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
-
-#: ../file_search.c:1508
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: path�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
-
-#: ../file_search.c:1512
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: cdpath�ˤϤ���ʾ� \"%s\" �Ȥ����ե����뤬����ޤ���"
-
-#: ../file_search.c:1515
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: �ѥ��ˤϤ���ʾ� \"%s\" �Ȥ����ե����뤬����ޤ���"
-
-#: ../fileio.c:137
 msgid "E812: Autocommands changed buffer or buffer name"
 msgstr "E812: autocommand���Хåե����Хåե�̾���ѹ����ޤ���"
 
-#: ../fileio.c:368
 msgid "Illegal file name"
 msgstr "�����ʥե�����̾"
 
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
 msgid "is a directory"
 msgstr "�ϥǥ��쥯�ȥ�Ǥ�"
 
-#: ../fileio.c:397
 msgid "is not a file"
 msgstr "�ϥե�����ǤϤ���ޤ���"
 
-#: ../fileio.c:508 ../fileio.c:3522
+msgid "is a device (disabled with 'opendevice' option)"
+msgstr "�ϥǥХ����Ǥ� ('opendevice' ���ץ����Dz���Ǥ��ޤ�)"
+
 msgid "[New File]"
 msgstr "[���ե�����]"
 
-#: ../fileio.c:511
 msgid "[New DIRECTORY]"
 msgstr "[�����ǥ��쥯�ȥ�]"
 
-#: ../fileio.c:529 ../fileio.c:532
 msgid "[File too big]"
 msgstr "[�ե��������]"
 
-#: ../fileio.c:534
 msgid "[Permission Denied]"
 msgstr "[���¤�����ޤ���]"
 
-#: ../fileio.c:653
 msgid "E200: *ReadPre autocommands made the file unreadable"
 msgstr "E200: *ReadPre autocommand ���ե�������ɹ��ԲĤˤ��ޤ���"
 
-#: ../fileio.c:655
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr "E201: *ReadPre autocommand �ϸ��ߤΥХåե����Ѥ����ޤ���"
 
-#: ../fileio.c:672
-msgid "Nvim: Reading from stdin...\n"
+msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: ɸ�����Ϥ����ɹ���...\n"
 
+msgid "Reading from stdin..."
+msgstr "ɸ�����Ϥ����ɹ�����..."
+
 #. Re-opening the original file failed!
-#: ../fileio.c:909
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: �Ѵ����ե�������ɹ��ԲĤˤ��ޤ���"
 
-#. fifo or socket
-#: ../fileio.c:1782
 msgid "[fifo/socket]"
 msgstr "[FIFO/�����å�]"
 
-#. fifo
-#: ../fileio.c:1788
 msgid "[fifo]"
 msgstr "[FIFO]"
 
-#. or socket
-#: ../fileio.c:1794
 msgid "[socket]"
 msgstr "[�����å�]"
 
-#. or character special
-#: ../fileio.c:1801
 msgid "[character special]"
 msgstr "[����饯�����ǥХ���]"
 
-#: ../fileio.c:1815
 msgid "[CR missing]"
 msgstr "[CR̵]"
 
-#: ../fileio.c:1819
 msgid "[long lines split]"
 msgstr "[Ĺ��ʬ��]"
 
-#: ../fileio.c:1823 ../fileio.c:3512
 msgid "[NOT converted]"
 msgstr "[̤�Ѵ�]"
 
-#: ../fileio.c:1826 ../fileio.c:3515
 msgid "[converted]"
 msgstr "[�Ѵ���]"
 
-#: ../fileio.c:1831
 #, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[%<PRId64> ���ܤ��Ѵ����顼]"
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[%ld ���ܤ��Ѵ����顼]"
 
-#: ../fileio.c:1835
 #, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[%<PRId64> ���ܤ������ʥХ���]"
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[%ld ���ܤ������ʥХ���]"
 
-#: ../fileio.c:1838
 msgid "[READ ERRORS]"
 msgstr "[�ɹ����顼]"
 
-#: ../fileio.c:2104
 msgid "Can't find temp file for conversion"
 msgstr "�Ѵ���ɬ�פʰ���ե����뤬���Ĥ���ޤ���"
 
-#: ../fileio.c:2110
 msgid "Conversion with 'charconvert' failed"
 msgstr "'charconvert' �ˤ���Ѵ������Ԥ��ޤ���"
 
-#: ../fileio.c:2113
 msgid "can't read output of 'charconvert'"
 msgstr "'charconvert' �ν��Ϥ��ɹ���ޤ���Ǥ���"
 
-#: ../fileio.c:2437
 msgid "E676: No matching autocommands for acwrite buffer"
 msgstr "E676: acwrite�Хåե��γ�������autocommand��¸�ߤ��ޤ���"
 
-#: ../fileio.c:2466
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr "E203: ��¸����Хåե���autocommand��������������ޤ���"
 
-#: ../fileio.c:2486
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr "E204: autocommand��ͽ��������ˡ�ǹԿ����ѹ����ޤ���"
 
-#: ../fileio.c:2548 ../fileio.c:2565
+# Added at 19-Jan-2004.
+msgid "NetBeans disallows writes of unmodified buffers"
+msgstr "NetBeans��̤�ѹ��ΥХåե����񤹤뤳�Ȥϵ��Ĥ��Ƥ��ޤ���"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "NetBeans�Хåե��ΰ�����񤭽Ф����ȤϤǤ��ޤ���"
+
 msgid "is not a file or writable device"
 msgstr "�ϥե�����Ǥ����߲�ǽ�ǥХ����Ǥ⤢��ޤ���"
 
-#: ../fileio.c:2601
+msgid "writing to device disabled with 'opendevice' option"
+msgstr "'opendevice' ���ץ����ˤ��ǥХ����ؤν񤭹��ߤϤǤ��ޤ���"
+
 msgid "is read-only (add ! to override)"
 msgstr "���ɹ����ѤǤ� (��������ˤ� ! ���ɲ�)"
 
-#: ../fileio.c:2886
 msgid "E506: Can't write to backup file (add ! to override)"
 msgstr "E506: �Хå����åץե��������¸�Ǥ��ޤ��� (! ���ɲäǶ�����¸)"
 
-#: ../fileio.c:2898
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr ""
 "E507: �Хå����åץե�������Ĥ���ݤ˥��顼��ȯ�����ޤ��� (! ���ɲäǶ���)"
 
-#: ../fileio.c:2901
 msgid "E508: Can't read file for backup (add ! to override)"
 msgstr "E508: �Хå����å��ѥե�������ɹ���ޤ��� (! ���ɲäǶ����ɹ�)"
 
-#: ../fileio.c:2923
 msgid "E509: Cannot create backup file (add ! to override)"
 msgstr "E509: �Хå����åץե��������ޤ��� (! ���ɲäǶ�������)"
 
-#: ../fileio.c:3008
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: �Хå����åץե��������ޤ��� (! ���ɲäǶ�������)"
 
-#. Can't write without a tempfile!
-#: ../fileio.c:3121
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr "E460: �꥽�����ե������������뤫�⤷��ޤ��� (! ���ɲäǶ���)"
+
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: ��¸�Ѱ���ե����뤬���Ĥ���ޤ���"
 
-#: ../fileio.c:3134
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: �Ѵ��Ǥ��ޤ��� (! ���ɲä��Ѵ���������¸)"
 
-#: ../fileio.c:3169
 msgid "E166: Can't open linked file for writing"
 msgstr "E166: ��󥯤��줿�ե�����˽����ޤ���"
 
-#: ../fileio.c:3173
 msgid "E212: Can't open file for writing"
 msgstr "E212: ������Ѥ˥ե�����򳫤��ޤ���"
 
-#: ../fileio.c:3363
 msgid "E667: Fsync failed"
 msgstr "E667: fsync �˼��Ԥ��ޤ���"
 
-#: ../fileio.c:3398
 msgid "E512: Close failed"
 msgstr "E512: �Ĥ��뤳�Ȥ˼���"
 
-#: ../fileio.c:3436
 msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
 msgstr "E513: ����ߥ��顼, �Ѵ����� (��񤹤�ˤ� 'fenc' ����ˤ��Ƥ�������)"
 
-#: ../fileio.c:3441
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
+"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: ����ߥ��顼, �Ѵ�����, �Կ� %<PRId64> (��񤹤�ˤ� 'fenc' ����ˤ���"
-"��������)"
+"E513: ����ߥ��顼, �Ѵ�����, �Կ� %ld (��񤹤�ˤ� 'fenc' ����ˤ��Ƥ�����"
+"��)"
 
-#: ../fileio.c:3448
 msgid "E514: write error (file system full?)"
 msgstr "E514: ����ߥ��顼, (�ե����륷���ƥब����?)"
 
-#: ../fileio.c:3506
 msgid " CONVERSION ERROR"
 msgstr " �Ѵ����顼"
 
-#: ../fileio.c:3509
 #, c-format
-msgid " in line %<PRId64>;"
-msgstr " �� %<PRId64>;"
+msgid " in line %ld;"
+msgstr " �� %ld;"
 
-#: ../fileio.c:3519
 msgid "[Device]"
 msgstr "[�ǥХ���]"
 
-#: ../fileio.c:3522
 msgid "[New]"
 msgstr "[��]"
 
-#: ../fileio.c:3535
 msgid " [a]"
 msgstr " [a]"
 
-#: ../fileio.c:3535
 msgid " appended"
 msgstr " �ɲ�"
 
-#: ../fileio.c:3537
 msgid " [w]"
 msgstr " [w]"
 
-#: ../fileio.c:3537
 msgid " written"
 msgstr " �����"
 
-#: ../fileio.c:3579
 msgid "E205: Patchmode: can't save original file"
 msgstr "E205: patchmode: ���ܥե��������¸�Ǥ��ޤ���"
 
-#: ../fileio.c:3602
 msgid "E206: patchmode: can't touch empty original file"
 msgstr "E206: patchmode: ���θ��ܥե������touch�Ǥ��ޤ���"
 
-#: ../fileio.c:3616
 msgid "E207: Can't delete backup file"
 msgstr "E207: �Хå����åץե������ä��ޤ���"
 
-#: ../fileio.c:3672
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
@@ -2290,134 +1838,105 @@ msgstr ""
 "\n"
 "�ٹ�: ���ܥե����뤬����줿���ѹ�����ޤ���\n"
 
-#: ../fileio.c:3675
 msgid "don't quit the editor until the file is successfully written!"
 msgstr "�ե��������¸����������ޤǥ��ǥ�����λ���ʤ��Ǥ�������!"
 
-#: ../fileio.c:3795
 msgid "[dos]"
 msgstr "[dos]"
 
-#: ../fileio.c:3795
 msgid "[dos format]"
 msgstr "[dos�ե����ޥå�]"
 
-#: ../fileio.c:3801
 msgid "[mac]"
 msgstr "[mac]"
 
-#: ../fileio.c:3801
 msgid "[mac format]"
 msgstr "[mac�ե����ޥå�]"
 
-#: ../fileio.c:3807
 msgid "[unix]"
 msgstr "[unix]"
 
-#: ../fileio.c:3807
 msgid "[unix format]"
 msgstr "[unix�ե����ޥå�]"
 
-#: ../fileio.c:3831
 msgid "1 line, "
 msgstr "1 ��, "
 
-#: ../fileio.c:3833
 #, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> ��, "
+msgid "%ld lines, "
+msgstr "%ld ��, "
 
-#: ../fileio.c:3836
 msgid "1 character"
 msgstr "1 ʸ��"
 
-#: ../fileio.c:3838
 #, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64> ʸ��"
+msgid "%lld characters"
+msgstr "%lld ʸ��"
 
-#: ../fileio.c:3849
 msgid "[noeol]"
 msgstr "[noeol]"
 
-#: ../fileio.c:3849
 msgid "[Incomplete last line]"
 msgstr "[�ǽ��Ԥ��Դ���]"
 
 #. don't overwrite messages here
 #. must give this prompt
 #. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "�ٹ�: �ɹ������˥ե�������ѹ�������ޤ���!!!"
 
-#: ../fileio.c:3867
 msgid "Do you really want to write to it"
 msgstr "�����˾�񤭤��ޤ���"
 
-#: ../fileio.c:4648
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: \"%s\" ��������Υ��顼�Ǥ�"
 
-#: ../fileio.c:4655
 #, c-format
 msgid "E209: Error closing \"%s\""
 msgstr "E209: \"%s\" ���Ĥ�����˥��顼�Ǥ�"
 
-#: ../fileio.c:4657
 #, c-format
 msgid "E210: Error reading \"%s\""
 msgstr "E210: \"%s\" ���ɹ���Υ��顼�Ǥ�"
 
-#: ../fileio.c:4883
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: autocommand �� FileChangedShell ���Хåե��������ޤ���"
 
-#: ../fileio.c:4894
 #, c-format
 msgid "E211: File \"%s\" no longer available"
 msgstr "E211: �ե����� \"%s\" �ϴ���¸�ߤ��ޤ���"
 
-#: ../fileio.c:4906
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
 msgstr "W12: �ٹ�: �ե����� \"%s\" ���ѹ�����Vim�ΥХåե����ѹ�����ޤ���"
 
-#: ../fileio.c:4907
 msgid "See \":help W12\" for more info."
 msgstr "�ܺ٤� \":help W12\" �򻲾Ȥ��Ƥ�������"
 
-#: ../fileio.c:4910
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
 msgstr "W11: �ٹ�: �ե����� \"%s\" ���Խ����ϸ���ѹ�����ޤ���"
 
-#: ../fileio.c:4911
 msgid "See \":help W11\" for more info."
 msgstr "�ܺ٤� \":help W11\" �򻲾Ȥ��Ƥ�������"
 
-#: ../fileio.c:4914
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr "W16: �ٹ�: �ե����� \"%s\" �Υ⡼�ɤ��Խ����ϸ���ѹ�����ޤ���"
 
-#: ../fileio.c:4915
 msgid "See \":help W16\" for more info."
 msgstr "�ܺ٤� \":help W16\" �򻲾Ȥ��Ƥ�������"
 
-#: ../fileio.c:4927
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr "W13: �ٹ�: �ե����� \"%s\" ���Խ����ϸ�˺�������ޤ���"
 
-#: ../fileio.c:4947
 msgid "Warning"
 msgstr "�ٹ�"
 
-#: ../fileio.c:4948
 msgid ""
 "&OK\n"
 "&Load File"
@@ -2425,48 +1944,45 @@ msgstr ""
 "&OK\n"
 "�ե������ɹ�(&L)"
 
-#: ../fileio.c:5065
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
 msgstr "E462: \"%s\" �������ɤ���������Ǥ��ޤ���Ǥ���"
 
-#: ../fileio.c:5078
 #, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" �ϥ�����ɤǤ��ޤ���Ǥ���"
 
-#: ../fileio.c:5601
 msgid "--Deleted--"
 msgstr "--�����--"
 
-#: ../fileio.c:5732
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "autocommand: %s <�Хåե�=%d> ����ưŪ�˺������ޤ�"
 
 #. the group doesn't exist
-#: ../fileio.c:5772
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: ���Υ��롼�פϤ���ޤ���: \"%s\""
 
-#: ../fileio.c:5897
+msgid "E936: Cannot delete the current group"
+msgstr "E936: ���ߤΥ��롼�פϺ���Ǥ��ޤ���"
+
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: ������� augroup ��ä����Ȥ��Ƥ��ޤ�"
+
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * �θ��������ʸ��������ޤ���: %s"
 
-#: ../fileio.c:5905
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: ���Τ褦�ʥ��٥�ȤϤ���ޤ���: %s"
 
-#: ../fileio.c:5907
 #, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: ���Τ褦�ʥ��롼�פ⤷���ϥ��٥�ȤϤ���ޤ���: %s"
 
 #. Highlight title
-#: ../fileio.c:6090
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@@ -2474,756 +1990,555 @@ msgstr ""
 "\n"
 "--- Auto-Commands ---"
 
-#: ../fileio.c:6293
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
 msgstr "E680: <�Хåե�=%d>: ̵���ʥХåե��ֹ�Ǥ� "
 
-#: ../fileio.c:6370
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: ���ƤΥ��٥�Ȥ��Ф��Ƥ�autocommand�ϼ¹ԤǤ��ޤ���"
 
-#: ../fileio.c:6393
 msgid "No matching autocommands"
 msgstr "��������autocommand��¸�ߤ��ޤ���"
 
-#: ../fileio.c:6831
 msgid "E218: autocommand nesting too deep"
 msgstr "E218: autocommand������Ҥ����᤮�ޤ�"
 
-#: ../fileio.c:7143
 #, c-format
 msgid "%s Auto commands for \"%s\""
 msgstr "%s Auto commands for \"%s\""
 
-#: ../fileio.c:7149
 #, c-format
 msgid "Executing %s"
 msgstr "%s ��¹Ԥ��Ƥ��ޤ�"
 
-#: ../fileio.c:7211
 #, c-format
 msgid "autocommand %s"
 msgstr "autocommand %s"
 
-#: ../fileio.c:7795
 msgid "E219: Missing {."
 msgstr "E219: { ������ޤ���."
 
-#: ../fileio.c:7797
 msgid "E220: Missing }."
 msgstr "E220: } ������ޤ���."
 
-#: ../fold.c:93
 msgid "E490: No fold found"
 msgstr "E490: �޾��ߤ�����ޤ���"
 
-#: ../fold.c:544
 msgid "E350: Cannot create fold with current 'foldmethod'"
 msgstr "E350: ���ߤ� 'foldmethod' �Ǥ��޾��ߤ�����Ǥ��ޤ���"
 
-#: ../fold.c:546
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: ���ߤ� 'foldmethod' �Ǥ��޾��ߤ����Ǥ��ޤ���"
 
-#: ../fold.c:1784
 #, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld �Ԥ��޾��ޤ�ޤ��� "
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld �Ԥ��޾��ޤ�ޤ��� "
 
-#. buffer has already been read
-#: ../getchar.c:273
 msgid "E222: Add to read buffer"
 msgstr "E222: �ɹ��Хåե����ɲ�"
 
-#: ../getchar.c:2040
 msgid "E223: recursive mapping"
 msgstr "E223: �Ƶ�Ū�ޥåԥ�"
 
-#: ../getchar.c:2849
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: %s �Ȥ����������Х�û�����Ϥϴ���¸�ߤ��ޤ�"
 
-#: ../getchar.c:2852
 #, c-format
 msgid "E225: global mapping already exists for %s"
 msgstr "E225: %s �Ȥ����������Х�ޥåԥ󥰤ϴ���¸�ߤ��ޤ�"
 
-#: ../getchar.c:2952
 #, c-format
 msgid "E226: abbreviation already exists for %s"
 msgstr "E226: %s �Ȥ���û�����Ϥϴ���¸�ߤ��ޤ�"
 
-#: ../getchar.c:2955
 #, c-format
 msgid "E227: mapping already exists for %s"
 msgstr "E227: %s �Ȥ����ޥåԥ󥰤ϴ���¸�ߤ��ޤ�"
 
-#: ../getchar.c:3008
 msgid "No abbreviation found"
 msgstr "û�����Ϥϸ��Ĥ���ޤ���Ǥ���"
 
-#: ../getchar.c:3010
 msgid "No mapping found"
 msgstr "�ޥåԥ󥰤ϸ��Ĥ���ޤ���Ǥ���"
 
-#: ../getchar.c:3974
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: �����ʥ⡼��"
 
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-#: ../globals.h:924
-msgid "--No lines in buffer--"
-msgstr "--�Хåե��˹Ԥ�����ޤ���--"
+msgid "E851: Failed to create a new process for the GUI"
+msgstr "E851: GUI�ѤΥץ������ε�ư�˼��Ԥ��ޤ���"
 
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-#: ../globals.h:996
-msgid "E470: Command aborted"
-msgstr "E470: ���ޥ�ɤ����Ǥ���ޤ���"
+msgid "E852: The child process failed to start the GUI"
+msgstr "E852: �ҥץ�������GUI�ε�ư�˼��Ԥ��ޤ���"
 
-#: ../globals.h:997
-msgid "E471: Argument required"
-msgstr "E471: ������ɬ�פǤ�"
+msgid "E229: Cannot start the GUI"
+msgstr "E229: GUI�򳫻ϤǤ��ޤ���"
 
-#: ../globals.h:998
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ �θ�� / �� ? �� & �Ǥʤ���Фʤ�ޤ���"
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: \"%s\"�����ɹ��ळ�Ȥ��Ǥ��ޤ���"
 
-#: ../globals.h:1000
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: ���ޥ�ɥ饤��Ǥ�̵���Ǥ�; <CR>�Ǽ¹�, CTRL-C�Ǥ���"
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: ͭ���ʥե���Ȥ����Ĥ���ʤ��Τ�, GUI�򳫻ϤǤ��ޤ���"
 
-#: ../globals.h:1002
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: 'guifontwide' ��̵���Ǥ�"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' �����ꤵ�줿�ͤ�̵���Ǥ�"
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: %s �ο��������Ƥ��ޤ���"
+
+msgid "No match at cursor, finding next"
+msgstr "��������ΰ��֤˥ޥå��Ϥ���ޤ���, ���򸡺����Ƥ��ޤ�"
+
+msgid "<cannot open> "
+msgstr "<�����ޤ���> "
+
+#, c-format
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: �ե���� %s ������Ǥ��ޤ���"
+
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile: ���ߤΥǥ��쥯�ȥ�����ޤ���"
+
+msgid "Pathname:"
+msgstr "�ѥ�̾:"
+
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: ���ߤΥǥ��쥯�ȥ������Ǥ��ޤ���"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Cancel"
+msgstr "����󥻥�"
+
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+msgstr "����������С�: ����������Ǥ��ޤ���Ǥ���."
+
+msgid "Vim dialog"
+msgstr "Vim ����������"
+
+msgid "E232: Cannot create BalloonEval with both message and callback"
+msgstr "E232: ��å������ȥ�����Хå��Τ��� BalloonEval ������Ǥ��ޤ���"
+
+msgid "_Cancel"
+msgstr "����󥻥�(_C)"
+
+msgid "_Save"
+msgstr "��¸(_S)"
+
+msgid "_Open"
+msgstr "����(_O)"
+
+msgid "_OK"
+msgstr "_OK"
+
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
 msgstr ""
-"E12: ���ߤΥǥ��쥯�ȥ�䥿�������Ǥ�exrc/vimrc�Υ��ޥ�ɤϵ��Ĥ���ޤ���"
+"�Ϥ�(&Y)\n"
+"������(&N)\n"
+"����󥻥�(&C)"
 
-#: ../globals.h:1003
-msgid "E171: Missing :endif"
-msgstr "E171: :endif ������ޤ���"
+msgid "Yes"
+msgstr "�Ϥ�"
 
-#: ../globals.h:1004
-msgid "E600: Missing :endtry"
-msgstr "E600: :endtry ������ޤ���"
+msgid "No"
+msgstr "������"
 
-#: ../globals.h:1005
-msgid "E170: Missing :endwhile"
-msgstr "E170: :endwhile ������ޤ���"
+msgid "Input _Methods"
+msgstr "����ץåȥ᥽�å�"
 
-#: ../globals.h:1006
-msgid "E170: Missing :endfor"
-msgstr "E170: :endfor ������ޤ���"
+msgid "VIM - Search and Replace..."
+msgstr "VIM - �������ִ�..."
 
-#: ../globals.h:1007
-msgid "E588: :endwhile without :while"
-msgstr "E588: :while �Τʤ� :endwhile ������ޤ�"
+msgid "VIM - Search..."
+msgstr "VIM - ����..."
 
-#: ../globals.h:1008
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor �Τʤ� :for ������ޤ�"
+msgid "Find what:"
+msgstr "����ʸ����:"
 
-#: ../globals.h:1009
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: �ե����뤬¸�ߤ��ޤ� (! ���ɲäǾ��)"
+msgid "Replace with:"
+msgstr "�ִ�ʸ����:"
 
-#: ../globals.h:1010
-msgid "E472: Command failed"
-msgstr "E472: ���ޥ�ɤ����Ԥ��ޤ���"
+#. whole word only button
+msgid "Match whole word only"
+msgstr "���Τ˳��������Τ���"
 
-#: ../globals.h:1011
-msgid "E473: Internal error"
-msgstr "E473: �������顼�Ǥ�"
+#. match case button
+msgid "Match case"
+msgstr "��ʸ��/��ʸ������̤���"
 
-#: ../globals.h:1012
-msgid "Interrupted"
-msgstr "����ޤ�ޤ���"
+msgid "Direction"
+msgstr "����"
 
-#: ../globals.h:1013
-msgid "E14: Invalid address"
-msgstr "E14: ̵���ʥ��ɥ쥹�Ǥ�"
+#. 'Up' and 'Down' buttons
+msgid "Up"
+msgstr "��"
 
-#: ../globals.h:1014
-msgid "E474: Invalid argument"
-msgstr "E474: ̵���ʰ����Ǥ�"
+msgid "Down"
+msgstr "��"
+
+msgid "Find Next"
+msgstr "���򸡺�"
+
+msgid "Replace"
+msgstr "�ִ�"
+
+msgid "Replace All"
+msgstr "�����ִ�"
+
+msgid "_Close"
+msgstr "�Ĥ���(_C)"
+
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: ���å����ޥ͡����㤫�� \"die\" �׵��������ޤ���\n"
+
+msgid "Close tab"
+msgstr "���֥ڡ������Ĥ���"
+
+msgid "New tab"
+msgstr "�������֥ڡ���"
+
+msgid "Open Tab..."
+msgstr "���֥ڡ����򳫤�..."
+
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim: �ᥤ�󥦥���ɥ����԰դ��˲�����ޤ���\n"
+
+msgid "&Filter"
+msgstr "�ե��륿(&F)"
+
+msgid "&Cancel"
+msgstr "����󥻥�(&C)"
+
+msgid "Directories"
+msgstr "�ǥ��쥯�ȥ�"
+
+msgid "Filter"
+msgstr "�ե��륿"
+
+msgid "&Help"
+msgstr "�إ��(&H)"
+
+msgid "Files"
+msgstr "�ե�����"
+
+msgid "&OK"
+msgstr "&OK"
+
+msgid "Selection"
+msgstr "����"
+
+msgid "Find &Next"
+msgstr "���򸡺�(&N)"
+
+msgid "&Replace"
+msgstr "�ִ�(&R)"
+
+msgid "Replace &All"
+msgstr "�����ִ�(&A)"
+
+msgid "&Undo"
+msgstr "����ɥ�(&U)"
+
+msgid "Open tab..."
+msgstr "���֥ڡ����򳫤�"
+
+msgid "Find string (use '\\\\' to find  a '\\')"
+msgstr "����ʸ���� ('\\' �򸡺�����ˤ� '\\\\')"
+
+msgid "Find & Replace (use '\\\\' to find  a '\\')"
+msgstr "�������ִ� ('\\' �򸡺�����ˤ� '\\\\')"
+
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+msgid "Not Used"
+msgstr "�Ȥ��ޤ���"
+
+msgid "Directory\t*.nothing\n"
+msgstr "�ǥ��쥯�ȥ�\t*.nothing\n"
 
-#: ../globals.h:1015
 #, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: ̵���ʰ����Ǥ�: %s"
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: �����ȥ뤬 \"%s\" �Υ�����ɥ��ϸ��Ĥ���ޤ���"
 
-#: ../globals.h:1016
 #, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: ̵���ʼ��Ǥ�: %s"
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: �����ϥ��ݡ��Ȥ���ޤ���: \"-%s\"; OLE�Ǥ���Ѥ��Ƥ�������."
 
-#: ../globals.h:1017
-msgid "E16: Invalid range"
-msgstr "E16: ̵�����ϰϤǤ�"
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDI���ץ����Ǥϥ�����ɥ��򳫤��ޤ���"
 
-#: ../globals.h:1018
-msgid "E476: Invalid command"
-msgstr "E476: ̵���ʥ��ޥ�ɤǤ�"
+msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
+msgstr "Vim E458: �����꤬�������ʤ��Τǥ���ȥ�������Ƥ��ޤ���"
 
-#: ../globals.h:1019
 #, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" �ϥǥ��쥯�ȥ�Ǥ�"
+msgid "E250: Fonts for the following charsets are missing in fontset %s:"
+msgstr "E250: �ʲ���ʸ�����åȤΥե���Ȥ�����ޤ��� %s:"
 
-#: ../globals.h:1020
-#, fuzzy
-msgid "E900: Invalid job id"
-msgstr "E49: ̵���ʥ����������̤Ǥ�"
-
-#: ../globals.h:1021
-msgid "E901: Job table is full"
-msgstr ""
-
-#: ../globals.h:1024
 #, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: \"%s\"() �Υ饤�֥��ƽФ˼��Ԥ��ޤ���"
+msgid "E252: Fontset name: %s"
+msgstr "E252: �ե���ȥ��å�̾: %s"
 
-#: ../globals.h:1026
-msgid "E19: Mark has invalid line number"
-msgstr "E19: �ޡ�����̵���ʹ��ֹ椬���ꤵ��Ƥ��ޤ���"
-
-#: ../globals.h:1027
-msgid "E20: Mark not set"
-msgstr "E20: �ޡ��������ꤵ��Ƥ��ޤ���"
-
-#: ../globals.h:1029
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: 'modifiable' �����դʤΤ�, �ѹ��Ǥ��ޤ���"
-
-#: ../globals.h:1030
-msgid "E22: Scripts nested too deep"
-msgstr "E22: ������ץȤ�����Ҥ����᤮�ޤ�"
-
-#: ../globals.h:1031
-msgid "E23: No alternate file"
-msgstr "E23: ���ե�����Ϥ���ޤ���"
-
-#: ../globals.h:1032
-msgid "E24: No such abbreviation"
-msgstr "E24: ���Τ褦��û�����ϤϤ���ޤ���"
-
-#: ../globals.h:1033
-msgid "E477: No ! allowed"
-msgstr "E477: ! �ϵ��Ĥ���Ƥ��ޤ���"
-
-#: ../globals.h:1035
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: GUI�ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�"
-
-#: ../globals.h:1036
 #, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: ���Τ褦��̾�Υϥ��饤�ȥ��롼�פϤ���ޤ���: %s"
+msgid "Font '%s' is not fixed-width"
+msgstr "�ե���� '%s' �ϸ������ǤϤ���ޤ���"
 
-#: ../globals.h:1037
-msgid "E29: No inserted text yet"
-msgstr "E29: �ޤ��ƥ����Ȥ���������Ƥ��ޤ���"
-
-#: ../globals.h:1038
-msgid "E30: No previous command line"
-msgstr "E30: �����˥��ޥ�ɹԤ�����ޤ���"
-
-#: ../globals.h:1039
-msgid "E31: No such mapping"
-msgstr "E31: ���Τ褦�ʥޥåԥ󥰤Ϥ���ޤ���"
-
-#: ../globals.h:1040
-msgid "E479: No match"
-msgstr "E479: �����Ϥ���ޤ���"
-
-#: ../globals.h:1041
 #, c-format
-msgid "E480: No match: %s"
-msgstr "E480: �����Ϥ���ޤ���: %s"
+msgid "E253: Fontset name: %s"
+msgstr "E253: �ե���ȥ��å�̾: %s"
 
-#: ../globals.h:1042
-msgid "E32: No file name"
-msgstr "E32: �ե�����̾������ޤ���"
-
-#: ../globals.h:1044
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: ����ɽ���ִ����ޤ��¹Ԥ���Ƥ��ޤ���"
-
-#: ../globals.h:1045
-msgid "E34: No previous command"
-msgstr "E34: ���ޥ�ɤ��ޤ��¹Ԥ���Ƥ��ޤ���"
-
-#: ../globals.h:1046
-msgid "E35: No previous regular expression"
-msgstr "E35: ����ɽ�����ޤ��¹Ԥ���Ƥ��ޤ���"
-
-#: ../globals.h:1047
-msgid "E481: No range allowed"
-msgstr "E481: �ϰϻ���ϵ��Ĥ���Ƥ��ޤ���"
-
-#: ../globals.h:1048
-msgid "E36: Not enough room"
-msgstr "E36: ������ɥ��˽�ʬ�ʹ⤵�⤷������������ޤ���"
-
-#: ../globals.h:1049
 #, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: �ե����� %s ������Ǥ��ޤ���"
+msgid "Font0: %s"
+msgstr "�ե����0: %s"
 
-#: ../globals.h:1050
-msgid "E483: Can't get temp file name"
-msgstr "E483: ����ե������̾��������Ǥ��ޤ���"
-
-#: ../globals.h:1051
 #, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: �ե����� \"%s\" �򳫤��ޤ���"
+msgid "Font1: %s"
+msgstr "�ե����1: %s"
 
-#: ../globals.h:1052
 #, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: �ե����� %s ���ɹ���ޤ���"
+msgid "Font%ld width is not twice that of font0"
+msgstr "�ե����%ld �������ե����0��2�ܤǤϤ���ޤ���"
 
-#: ../globals.h:1054
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: �Ǹ���ѹ�����¸����Ƥ��ޤ��� (! ���ɲä��ѹ����˴�)"
-
-#: ../globals.h:1055
-msgid "E37: No write since last change"
-msgstr "E37: �Ǹ���ѹ�����¸����Ƥ��ޤ���"
-
-#: ../globals.h:1056
-msgid "E38: Null argument"
-msgstr "E38: ���������Ǥ�"
-
-#: ../globals.h:1057
-msgid "E39: Number expected"
-msgstr "E39: ���ͤ��׵ᤵ��Ƥ��ޤ�"
-
-#: ../globals.h:1058
 #, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: ���顼�ե����� %s �򳫤��ޤ���"
+msgid "Font0 width: %ld"
+msgstr "�ե����0����: %ld"
 
-#: ../globals.h:1059
-msgid "E41: Out of memory!"
-msgstr "E41: ���꤬�Ԥ��̤Ƥޤ���!"
-
-#: ../globals.h:1060
-msgid "Pattern not found"
-msgstr "�ѥ�����ϸ��Ĥ���ޤ���Ǥ���"
-
-#: ../globals.h:1061
 #, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: �ѥ�����ϸ��Ĥ���ޤ���Ǥ���: %s"
+msgid "Font1 width: %ld"
+msgstr "�ե����1����: %ld"
 
-#: ../globals.h:1062
-msgid "E487: Argument must be positive"
-msgstr "E487: �����������ͤǤʤ���Фʤ�ޤ���"
+msgid "Invalid font specification"
+msgstr "̵���ʥե���Ȼ���Ǥ�"
 
-#: ../globals.h:1064
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: ���Υǥ��쥯�ȥ�����ޤ���"
+msgid "&Dismiss"
+msgstr "�Ѳ�����(&D)"
 
-#: ../globals.h:1066
-msgid "E42: No Errors"
-msgstr "E42: ���顼�Ϥ���ޤ���"
+msgid "no specific match"
+msgstr "�ޥå������Τ�����ޤ���"
 
-#: ../globals.h:1067
-msgid "E776: No location list"
-msgstr "E776: �����������ꥹ�ȤϤ���ޤ���"
+msgid "Vim - Font Selector"
+msgstr "Vim - �ե��������"
 
-#: ../globals.h:1068
-msgid "E43: Damaged match string"
-msgstr "E43: ����ʸ������»���Ƥ��ޤ�"
+msgid "Name:"
+msgstr "̾��:"
 
-#: ../globals.h:1069
-msgid "E44: Corrupted regexp program"
-msgstr "E44: ����������ɽ���ץ������Ǥ�"
+#. create toggle button
+msgid "Show size in Points"
+msgstr "��������ݥ���Ȥ�ɽ������"
 
-#: ../globals.h:1071
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: 'readonly' ���ץ�������ꤵ��Ƥ��ޤ� (! ���ɲäǾ��)"
+msgid "Encoding:"
+msgstr "���󥳡���:"
 
-#: ../globals.h:1073
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: �ɼ������ѿ� \"%s\" �ˤ��ͤ�����Ǥ��ޤ���"
+msgid "Font:"
+msgstr "�ե����:"
 
-#: ../globals.h:1075
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: ����ɥܥå����Ǥ��ѿ� \"%s\" ���ͤ�����Ǥ��ޤ���"
+msgid "Style:"
+msgstr "��������:"
 
-#: ../globals.h:1076
-msgid "E47: Error while reading errorfile"
-msgstr "E47: ���顼�ե�������ɹ���˥��顼��ȯ�����ޤ���"
+msgid "Size:"
+msgstr "������:"
 
-#: ../globals.h:1078
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: ����ɥܥå����Ǥϵ�����ޤ���"
+msgid "E256: Hangul automata ERROR"
+msgstr "E256: �ϥ󥰥륪���ȥޥȥ󥨥顼"
 
-#: ../globals.h:1080
-msgid "E523: Not allowed here"
-msgstr "E523: �����Ǥϵ��Ĥ���ޤ���"
-
-#: ../globals.h:1082
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: �����꡼��⡼�ɤ�����ˤ��б����Ƥ��ޤ���"
-
-#: ../globals.h:1083
-msgid "E49: Invalid scroll size"
-msgstr "E49: ̵���ʥ����������̤Ǥ�"
-
-#: ../globals.h:1084
-msgid "E91: 'shell' option is empty"
-msgstr "E91: 'shell' ���ץ���󤬶��Ǥ�"
-
-#: ../globals.h:1085
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: sign �Υǡ������ɹ���ޤ���Ǥ���"
-
-#: ../globals.h:1086
-msgid "E72: Close error on swap file"
-msgstr "E72: ����åץե�����Υ������������顼�Ǥ�"
-
-#: ../globals.h:1087
-msgid "E73: tag stack empty"
-msgstr "E73: ���������å������Ǥ�"
-
-#: ../globals.h:1088
-msgid "E74: Command too complex"
-msgstr "E74: ���ޥ�ɤ�ʣ���᤮�ޤ�"
-
-#: ../globals.h:1089
-msgid "E75: Name too long"
-msgstr "E75: ̾����Ĺ�᤮�ޤ�"
-
-#: ../globals.h:1090
-msgid "E76: Too many ["
-msgstr "E76: [ ��¿�᤮�ޤ�"
-
-#: ../globals.h:1091
-msgid "E77: Too many file names"
-msgstr "E77: �ե�����̾��¿�᤮�ޤ�"
-
-#: ../globals.h:1092
-msgid "E488: Trailing characters"
-msgstr "E488: ;ʬ��ʸ��������ˤ���ޤ�"
-
-#: ../globals.h:1093
-msgid "E78: Unknown mark"
-msgstr "E78: ̤�ΤΥޡ���"
-
-#: ../globals.h:1094
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: �磻��ɥ����ɤ�Ÿ���Ǥ��ޤ���"
-
-#: ../globals.h:1096
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' �� 'winminheight' ��꾮�����Ǥ��ޤ���"
-
-#: ../globals.h:1098
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' �� 'winminwidth' ��꾮�����Ǥ��ޤ���"
-
-#: ../globals.h:1099
-msgid "E80: Error while writing"
-msgstr "E80: �������Υ��顼"
-
-#: ../globals.h:1100
-msgid "Zero count"
-msgstr "�����������"
-
-#: ../globals.h:1101
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: ������ץȰʳ���<SID>���Ȥ��ޤ���"
-
-#: ../globals.h:1102
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: �������顼�Ǥ�: %s"
-
-#: ../globals.h:1104
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: �ѥ����� 'maxmempattern' �ʾ�Υ������Ѥ��ޤ�"
-
-#: ../globals.h:1105
-msgid "E749: empty buffer"
-msgstr "E749: �Хåե������Ǥ�"
-
-#: ../globals.h:1108
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: �����ѥ����󤫶��ڤ국�椬�����Ǥ�"
-
-#: ../globals.h:1109
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: Ʊ��̾���Υե����뤬¾�ΥХåե����ɹ��ޤ�Ƥ��ޤ�"
-
-#: ../globals.h:1110
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: ���ץ���� '%s' �����ꤵ��Ƥ��ޤ���"
-
-#: ../globals.h:1111
-msgid "E850: Invalid register name"
-msgstr "E850: ̵���ʥ쥸����̾�Ǥ�"
-
-#: ../globals.h:1114
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "��ޤǸ��������ΤDz������ޤ�"
-
-#: ../globals.h:1115
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "���ޤǸ��������ΤǾ�����ޤ�"
-
-#: ../hardcopy.c:240
 msgid "E550: Missing colon"
 msgstr "E550: �����󤬤���ޤ���"
 
-#: ../hardcopy.c:252
 msgid "E551: Illegal component"
 msgstr "E551: �����ʹ�ʸ���ǤǤ�"
 
-#: ../hardcopy.c:259
 msgid "E552: digit expected"
 msgstr "E552: ���ͤ�ɬ�פǤ�"
 
-#: ../hardcopy.c:473
 #, c-format
 msgid "Page %d"
 msgstr "%d �ڡ���"
 
-#: ../hardcopy.c:597
 msgid "No text to be printed"
 msgstr "��������ƥ����Ȥ�����ޤ���"
 
-#: ../hardcopy.c:668
 #, c-format
 msgid "Printing page %d (%d%%)"
 msgstr "������: �ڡ��� %d (%d%%)"
 
-#: ../hardcopy.c:680
 #, c-format
 msgid " Copy %d of %d"
 msgstr " ���ԡ� %d (�� %d ��)"
 
-#: ../hardcopy.c:733
 #, c-format
 msgid "Printed: %s"
 msgstr "�������ޤ���: %s"
 
-#: ../hardcopy.c:740
 msgid "Printing aborted"
 msgstr "��������ߤ���ޤ���"
 
-#: ../hardcopy.c:1365
 msgid "E455: Error writing to PostScript output file"
 msgstr "E455: PostScript���ϥե�����ν���ߥ��顼�Ǥ�"
 
-#: ../hardcopy.c:1747
 #, c-format
 msgid "E624: Can't open file \"%s\""
 msgstr "E624: �ե����� \"%s\" �򳫤��ޤ���"
 
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
 msgstr "E457: PostScript�Υ꥽�����ե����� \"%s\" ���ɹ���ޤ���"
 
-#: ../hardcopy.c:1772
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
 msgstr "E618: �ե����� \"%s\" �� PostScript �꥽�����ե�����ǤϤ���ޤ���"
 
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
 msgstr "E619: �ե����� \"%s\" ���б����Ƥ��ʤ� PostScript �꥽�����ե�����Ǥ�"
 
-#: ../hardcopy.c:1856
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
 msgstr "E621: �꥽�����ե����� \"%s\" �ϥС�����󤬰ۤʤ�ޤ�"
 
-#: ../hardcopy.c:2225
 msgid "E673: Incompatible multi-byte encoding and character set."
 msgstr "E673: �ߴ�����̵���ޥ���Х��ȥ��󥳡��ǥ��󥰤�ʸ�����åȤǤ�"
 
-#: ../hardcopy.c:2238
 msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
 msgstr "E674: �ޥ���Х��ȥ��󥳡��ǥ��󥰤Ǥ� printmbcharset ����ˤǤ��ޤ���"
 
-#: ../hardcopy.c:2254
 msgid "E675: No default font specified for multi-byte printing."
 msgstr ""
 "E675: �ޥ���Х���ʸ����������뤿��Υǥե���ȥե���Ȥ����ꤵ��Ƥ��ޤ���"
 
-#: ../hardcopy.c:2426
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: PostScript�����ѤΥե�����򳫤��ޤ���"
 
-#: ../hardcopy.c:2458
 #, c-format
 msgid "E456: Can't open file \"%s\""
 msgstr "E456: �ե����� \"%s\" �򳫤��ޤ���"
 
-#: ../hardcopy.c:2583
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
 msgstr "E456: PostScript�Υ꥽�����ե����� \"prolog.ps\" �����Ĥ���ޤ���"
 
-#: ../hardcopy.c:2593
 msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
 msgstr "E456: PostScript�Υ꥽�����ե����� \"cidfont.ps\" �����Ĥ���ޤ���"
 
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
 msgstr "E456: PostScript�Υ꥽�����ե����� \"%s.ps\" �����Ĥ���ޤ���"
 
-#: ../hardcopy.c:2654
 #, c-format
 msgid "E620: Unable to convert to print encoding \"%s\""
 msgstr "E620: �������󥳡��� \"%s\" ���Ѵ��Ǥ��ޤ���"
 
-#: ../hardcopy.c:2877
 msgid "Sending to printer..."
 msgstr "�ץ�󥿤�������..."
 
-#: ../hardcopy.c:2881
 msgid "E365: Failed to print PostScript file"
 msgstr "E365: PostScript�ե�����ΰ����˼��Ԥ��ޤ���"
 
-#: ../hardcopy.c:2883
 msgid "Print job sent."
 msgstr "��������֤��������ޤ���."
 
-#: ../if_cscope.c:85
 msgid "Add a new database"
 msgstr "���ǡ����١������ɲ�"
 
-#: ../if_cscope.c:87
 msgid "Query for a pattern"
 msgstr "�ѥ�����Υ����꡼���ɲ�"
 
-#: ../if_cscope.c:89
 msgid "Show this message"
 msgstr "���Υ�å�������ɽ������"
 
-#: ../if_cscope.c:91
 msgid "Kill a connection"
 msgstr "��³��λ����"
 
-#: ../if_cscope.c:93
 msgid "Reinit all connections"
 msgstr "���Ƥ���³��ƽ��������"
 
-#: ../if_cscope.c:95
 msgid "Show connections"
 msgstr "��³��ɽ������"
 
-#: ../if_cscope.c:101
 #, c-format
 msgid "E560: Usage: cs[cope] %s"
 msgstr "E560: ������ˡ: cs[cope] %s"
 
-#: ../if_cscope.c:225
 msgid "This cscope command does not support splitting the window.\n"
 msgstr "����cscope���ޥ�ɤ�ʬ�䥦����ɥ��Ǥϥ��ݡ��Ȥ���ޤ���.\n"
 
-#: ../if_cscope.c:266
 msgid "E562: Usage: cstag <ident>"
 msgstr "E562: ����ˡ: cstag <ident>"
 
-#: ../if_cscope.c:313
 msgid "E257: cstag: tag not found"
 msgstr "E257: cstag: ���������Ĥ���ޤ���"
 
-#: ../if_cscope.c:461
 #, c-format
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: stat(%s) ���顼: %d"
 
-#: ../if_cscope.c:551
+msgid "E563: stat error"
+msgstr "E563: stat ���顼"
+
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s �ϥǥ��쥯�ȥ�ڤ�ͭ����cscope�Υǡ����١����ǤϤ���ޤ���"
 
-#: ../if_cscope.c:566
 #, c-format
 msgid "Added cscope database %s"
 msgstr "cscope�ǡ����١��� %s ���ɲ�"
 
-#: ../if_cscope.c:616
 #, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: cscope����³ %<PRId64> ���ɹ�����Υ��顼�Ǥ�"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: cscope����³ %ld ���ɹ�����Υ��顼�Ǥ�"
 
-#: ../if_cscope.c:711
 msgid "E561: unknown cscope search type"
 msgstr "E561: ̤�Τ�cscope�������Ǥ�"
 
-#: ../if_cscope.c:752 ../if_cscope.c:789
 msgid "E566: Could not create cscope pipes"
 msgstr "E566: cscope�ѥ��פ�����Ǥ��ޤ���Ǥ���"
 
-#: ../if_cscope.c:767
 msgid "E622: Could not fork for cscope"
 msgstr "E622: cscope�ε�ư����(fork)�˼��Ԥ��ޤ���"
 
-#: ../if_cscope.c:849
 msgid "cs_create_connection setpgid failed"
 msgstr "cs_create_connection �ؤ� setpgid �˼��Ԥ��ޤ���"
 
-#: ../if_cscope.c:853 ../if_cscope.c:889
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection �μ¹Ԥ˼��Ԥ��ޤ���"
 
-#: ../if_cscope.c:863 ../if_cscope.c:902
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: to_fp �� fdopen �˼��Ԥ��ޤ���"
 
-#: ../if_cscope.c:865 ../if_cscope.c:906
 msgid "cs_create_connection: fdopen for fr_fp failed"
 msgstr "cs_create_connection: fr_fp �� fdopen �˼��Ԥ��ޤ���"
 
-#: ../if_cscope.c:890
 msgid "E623: Could not spawn cscope process"
 msgstr "E623: cscope�ץ�������ư�Ǥ��ޤ���Ǥ���"
 
-#: ../if_cscope.c:932
 msgid "E567: no cscope connections"
 msgstr "E567: cscope��³�˼��Ԥ��ޤ���"
 
-#: ../if_cscope.c:1009
 #, c-format
 msgid "E469: invalid cscopequickfix flag %c for %c"
 msgstr "E469: ̵���� cscopequickfix �ե饰 %c �� %c �Ǥ�"
 
-#: ../if_cscope.c:1058
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
 msgstr "E259: cscope�����꡼ %s of %s �˳���������ޤ���Ǥ���"
 
-#: ../if_cscope.c:1142
 msgid "cscope commands:\n"
 msgstr "cscope���ޥ��:\n"
 
-#: ../if_cscope.c:1150
 #, c-format
 msgid "%-5s: %s%*s (Usage: %s)"
 msgstr "%-5s: %s%*s (����ˡ: %s)"
 
-#: ../if_cscope.c:1155
 msgid ""
 "\n"
+"       a: Find assignments to this symbol\n"
 "       c: Find functions calling this function\n"
 "       d: Find functions called by this function\n"
 "       e: Find this egrep pattern\n"
@@ -3234,6 +2549,7 @@ msgid ""
 "       t: Find this text string\n"
 msgstr ""
 "\n"
+"       a: ���Υ���ܥ���Ф���������õ��\n"
 "       c: ���δؿ���Ƥ�Ǥ���ؿ���õ��\n"
 "       d: ���δؿ�����Ƥ�Ǥ���ؿ���õ��\n"
 "       e: ����egrep�ѥ������õ��\n"
@@ -3243,31 +2559,32 @@ msgstr ""
 "       s: ����C����ܥ��õ��\n"
 "       t: ���Υƥ�����ʸ�����õ��\n"
 
-#: ../if_cscope.c:1226
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: cscope�ǡ����١���: %s �򳫤����Ȥ��Ǥ��ޤ���"
+
+msgid "E626: cannot get cscope database information"
+msgstr "E626: cscope�ǡ����١����ξ��������Ǥ��ޤ���"
+
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: ��ʣ����cscope�ǡ����١������ɲä���ޤ���Ǥ���"
 
-#: ../if_cscope.c:1335
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: cscope��³ %s �����Ĥ���ޤ���Ǥ���"
 
-#: ../if_cscope.c:1364
 #, c-format
 msgid "cscope connection %s closed"
 msgstr "cscope��³ %s ���Ĥ����ޤ���"
 
 #. should not reach here
-#: ../if_cscope.c:1486
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: cs_manage_matches ����̿Ū�ʥ��顼�Ǥ�"
 
-#: ../if_cscope.c:1693
 #, c-format
 msgid "Cscope tag: %s"
 msgstr "Cscope ����: %s"
 
-#: ../if_cscope.c:1711
 msgid ""
 "\n"
 "   #   line"
@@ -3275,87 +2592,300 @@ msgstr ""
 "\n"
 "   #   ���ֹ�"
 
-#: ../if_cscope.c:1713
 msgid "filename / context / line\n"
 msgstr "�ե�����̾ / ʸ̮ / ��\n"
 
-#: ../if_cscope.c:1809
 #, c-format
 msgid "E609: Cscope error: %s"
 msgstr "E609: cscope���顼: %s"
 
-#: ../if_cscope.c:2053
 msgid "All cscope databases reset"
 msgstr "���Ƥ�cscope�ǡ����١�����ꥻ�åȤ��ޤ�"
 
-#: ../if_cscope.c:2123
 msgid "no cscope connections\n"
 msgstr "cscope��³������ޤ���\n"
 
-#: ../if_cscope.c:2126
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    �ǡ����١���̾                      prepend �ѥ�\n"
 
-#: ../main.c:144
+msgid "Lua library cannot be loaded."
+msgstr "Lua�饤�֥�������ɤǤ��ޤ���."
+
+msgid "cannot save undo information"
+msgstr "����ɥ�������¸�Ǥ��ޤ���"
+
+msgid ""
+"E815: Sorry, this command is disabled, the MzScheme libraries could not be "
+"loaded."
+msgstr "E815: ���Υ��ޥ�ɤ�̵���Ǥ�. MzScheme �饤�֥�������ɤǤ��ޤ���."
+
+msgid ""
+"E895: Sorry, this command is disabled, the MzScheme's racket/base module "
+"could not be loaded."
+msgstr ""
+"E895: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���. MzScheme �� racket/base �⥸�塼��"
+"�������ɤǤ��ޤ���Ǥ���."
+
+msgid "invalid expression"
+msgstr "̵���ʼ��Ǥ�"
+
+msgid "expressions disabled at compile time"
+msgstr "���ϥ���ѥ������̵���ˤ���Ƥ��ޤ�"
+
+msgid "hidden option"
+msgstr "�������ץ����"
+
+msgid "unknown option"
+msgstr "̤�ΤΥ��ץ����Ǥ�"
+
+msgid "window index is out of range"
+msgstr "�ϰϳ��Υ�����ɥ��ֹ�Ǥ�"
+
+msgid "couldn't open buffer"
+msgstr "�Хåե��򳫤��ޤ���"
+
+msgid "cannot delete line"
+msgstr "�Ԥ�ä��ޤ���"
+
+msgid "cannot replace line"
+msgstr "�Ԥ��ִ��Ǥ��ޤ���"
+
+msgid "cannot insert line"
+msgstr "�Ԥ������Ǥ��ޤ���"
+
+msgid "string cannot contain newlines"
+msgstr "ʸ����ˤϲ���ʸ����ޤ���ޤ���"
+
+msgid "error converting Scheme values to Vim"
+msgstr "Scheme�ͤ�Vim�ؤ��Ѵ����顼"
+
+msgid "Vim error: ~a"
+msgstr "Vim ���顼: ~a"
+
+msgid "Vim error"
+msgstr "Vim ���顼"
+
+msgid "buffer is invalid"
+msgstr "�Хåե���̵���Ǥ�"
+
+msgid "window is invalid"
+msgstr "������ɥ���̵���Ǥ�"
+
+msgid "linenr out of range"
+msgstr "�ϰϳ��ι��ֹ�Ǥ�"
+
+msgid "not allowed in the Vim sandbox"
+msgstr "����ɥܥå����Ǥϵ�����ޤ���"
+
+msgid "E836: This Vim cannot execute :python after using :py3"
+msgstr "E836: ����Vim�Ǥ� :py3 ��Ȥä���� :python ��Ȥ��ޤ���"
+
+msgid ""
+"E263: Sorry, this command is disabled, the Python library could not be "
+"loaded."
+msgstr ""
+"E263: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���: Python�饤�֥�������ɤǤ��ޤ���"
+"�Ǥ���."
+
+msgid ""
+"E887: Sorry, this command is disabled, the Python's site module could not be "
+"loaded."
+msgstr ""
+"E887: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���. Python �� site �⥸�塼��������"
+"�Ǥ��ޤ���Ǥ���."
+
+# Added at 07-Feb-2004.
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: Python ��Ƶ�Ū�˼¹Ԥ��뤳�ȤϤǤ��ޤ���"
+
+msgid "E837: This Vim cannot execute :py3 after using :python"
+msgstr "E837: ����Vim�Ǥ� :python ��Ȥä���� :py3 ��Ȥ��ޤ���"
+
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_ ��ʸ����Υ��󥹥��󥹤Ǥʤ���Фʤ�ޤ���"
+
+msgid ""
+"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
+msgstr ""
+"E266: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���: Ruby�饤�֥�������ɤǤ��ޤ����"
+"����."
+
+msgid "E267: unexpected return"
+msgstr "E267: ͽ������ return �Ǥ�"
+
+msgid "E268: unexpected next"
+msgstr "E268: ͽ������ next �Ǥ�"
+
+msgid "E269: unexpected break"
+msgstr "E269: ͽ������ break �Ǥ�"
+
+msgid "E270: unexpected redo"
+msgstr "E270: ͽ������ redo �Ǥ�"
+
+msgid "E271: retry outside of rescue clause"
+msgstr "E271: rescue �γ��� retry �Ǥ�"
+
+msgid "E272: unhandled exception"
+msgstr "E272: ��갷���ʤ��ä��㳰������ޤ�"
+
+#, c-format
+msgid "E273: unknown longjmp status %d"
+msgstr "E273: ̤�Τ�longjmp����: %d"
+
+msgid "invalid buffer number"
+msgstr "̵���ʥХåե��ֹ�Ǥ�"
+
+msgid "not implemented yet"
+msgstr "�ޤ���������Ƥ��ޤ���"
+
+#. ???
+msgid "cannot set line(s)"
+msgstr "�Ԥ�����Ǥ��ޤ���"
+
+msgid "invalid mark name"
+msgstr "̵���ʥޡ���̾�Ǥ�"
+
+msgid "mark not set"
+msgstr "�ޡ��������ꤵ��Ƥ��ޤ���"
+
+#, c-format
+msgid "row %d column %d"
+msgstr "�� %d �� %d"
+
+msgid "cannot insert/append line"
+msgstr "�Ԥ�����/�ɲä�Ǥ��ޤ���"
+
+msgid "line number out of range"
+msgstr "�ϰϳ��ι��ֹ�Ǥ�"
+
+msgid "unknown flag: "
+msgstr "̤�ΤΥե饰: "
+
+msgid "unknown vimOption"
+msgstr "̤�Τ� vimOption �Ǥ�"
+
+msgid "keyboard interrupt"
+msgstr "�����ܡ��ɳ����"
+
+msgid "vim error"
+msgstr "vim ���顼"
+
+msgid "cannot create buffer/window command: object is being deleted"
+msgstr ""
+"�Хåե�/������ɥ��������ޥ�ɤ�����Ǥ��ޤ���: ���֥������Ȥ��õ��Ƥ���"
+"����"
+
+msgid ""
+"cannot register callback command: buffer/window is already being deleted"
+msgstr ""
+"������Хå����ޥ�ɤ���Ͽ�Ǥ��ޤ���: �Хåե�/������ɥ������˾õ��ޤ���"
+
+#. This should never happen.  Famous last word?
+msgid ""
+"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
+"org"
+msgstr ""
+"E280: TCL ��̿Ū���顼: reflist ����!? vim-dev@vim.org ����𤷤Ƥ�������"
+
+msgid "cannot register callback command: buffer/window reference not found"
+msgstr ""
+"������Хå����ޥ�ɤ���Ͽ�Ǥ��ޤ���: �Хåե�/������ɥ��λ��Ȥ����Ĥ���ޤ�"
+"��"
+
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
+msgstr ""
+"E571: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���: Tcl�饤�֥�������ɤǤ��ޤ����"
+"����."
+
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: ������� %d"
+
+msgid "cannot get line"
+msgstr "�Ԥ�����Ǥ��ޤ���"
+
+msgid "Unable to register a command server name"
+msgstr "̿�᥵���С���̾������Ͽ�Ǥ��ޤ���"
+
+msgid "E248: Failed to send command to the destination program"
+msgstr "E248: ��Ū�Υץ������ؤΥ��ޥ�������˼��Ԥ��ޤ���"
+
+#, c-format
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: ̵���ʥ����С�ID���Ȥ��ޤ���: %s"
+
+msgid "E251: VIM instance registry property is badly formed.  Deleted!"
+msgstr "E251: VIM ���Τ���Ͽ�ץ��ѥƥ��������Ǥ�. �õ�ޤ���!"
+
+#, c-format
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: �ꥹ�ȷ��˥���ޤ�����ޤ���: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: �ꥹ�ȷ��κǸ�� ']' ������ޤ���: %s"
+
 msgid "Unknown option argument"
 msgstr "̤�ΤΥ��ץ��������Ǥ�"
 
-#: ../main.c:146
 msgid "Too many edit arguments"
 msgstr "�Խ�������¿�᤮�ޤ�"
 
-#: ../main.c:148
 msgid "Argument missing after"
 msgstr "����������ޤ���"
 
-#: ../main.c:150
 msgid "Garbage after option argument"
 msgstr "���ץ��������θ�˥��ߤ�����ޤ�"
 
-#: ../main.c:152
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
 msgstr "\"+command\", \"-c command\", \"--cmd command\" �ΰ�����¿�᤮�ޤ�"
 
-#: ../main.c:154
 msgid "Invalid argument for"
 msgstr "̵���ʰ����Ǥ�: "
 
-#: ../main.c:294
 #, c-format
 msgid "%d files to edit\n"
 msgstr "%d �ĤΥե����뤬�Խ��򹵤��Ƥ��ޤ�\n"
 
-#: ../main.c:1342
+msgid "netbeans is not supported with this GUI\n"
+msgstr "netbeans �Ϥ���GUI�Ǥ����ѤǤ��ޤ���\n"
+
+msgid "'-nb' cannot be used: not enabled at compile time\n"
+msgstr "'-nb' �����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
+
+msgid "This Vim was not compiled with the diff feature."
+msgstr "����Vim�ˤ�diff��ǽ������ޤ���(����ѥ��������)."
+
 msgid "Attempt to open script file again: \""
 msgstr "������ץȥե������Ƥӳ����Ƥߤޤ�: \""
 
-#: ../main.c:1350
 msgid "Cannot open for reading: \""
 msgstr "�ɹ��ѤȤ��Ƴ����ޤ���"
 
-#: ../main.c:1393
 msgid "Cannot open for script output: \""
 msgstr "������ץȽ����Ѥ򳫤��ޤ���"
 
-#: ../main.c:1622
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: ���顼: NetBeans����gvim�򥹥����ȤǤ��ޤ���\n"
+
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr "Vim: ���顼: ���ΥС�������Vim��Cygwinü���Ǥ�ư��ޤ���\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: �ٹ�: ü���ؤν��ϤǤϤ���ޤ���\n"
 
-#: ../main.c:1624
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim: �ٹ�: ü����������ϤǤϤ���ޤ���\n"
 
 #. just in case..
-#: ../main.c:1891
 msgid "pre-vimrc command line"
 msgstr "vimrc���Υ��ޥ�ɥ饤��"
 
-#: ../main.c:1964
 #, c-format
 msgid "E282: Cannot read from \"%s\""
 msgstr "E282: \"%s\"�����ɹ��ळ�Ȥ��Ǥ��ޤ���"
 
-#: ../main.c:2149
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
@@ -3363,23 +2893,18 @@ msgstr ""
 "\n"
 "���ܺ٤ʾ����: \"vim -h\"\n"
 
-#: ../main.c:2178
 msgid "[file ..]       edit specified file(s)"
 msgstr "[�ե�����..]    ����ե�������Խ�����"
 
-#: ../main.c:2179
 msgid "-               read text from stdin"
 msgstr "-               ɸ�����Ϥ���ƥ����Ȥ��ɹ���"
 
-#: ../main.c:2180
 msgid "-t tag          edit file where tag is defined"
 msgstr "-t ����         ������������줿�Ȥ��������Խ�����"
 
-#: ../main.c:2181
 msgid "-q [errorfile]  edit file with first error"
 msgstr "-q [errorfile]  �ǽ�Υ��顼���Խ�����"
 
-#: ../main.c:2187
 msgid ""
 "\n"
 "\n"
@@ -3389,11 +2914,9 @@ msgstr ""
 "\n"
 "����ˡ:"
 
-#: ../main.c:2189
 msgid " vim [arguments] "
 msgstr " vim [����] "
 
-#: ../main.c:2193
 msgid ""
 "\n"
 "   or:"
@@ -3401,7 +2924,13 @@ msgstr ""
 "\n"
 "   �⤷����:"
 
-#: ../main.c:2196
+msgid ""
+"\n"
+"Where case is ignored prepend / to make flag upper case"
+msgstr ""
+"\n"
+"�羮ʸ����̵�뤵��������ʸ���ˤ��뤿��� / �����֤��Ƥ�������"
+
 msgid ""
 "\n"
 "\n"
@@ -3411,189 +2940,319 @@ msgstr ""
 "\n"
 "����:\n"
 
-#: ../main.c:2197
 msgid "--\t\t\tOnly file names after this"
 msgstr "--\t\t\t���Τ��Ȥˤϥե�����̾����"
 
-#: ../main.c:2199
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\t\t�磻��ɥ����ɤ�Ÿ�����ʤ�"
 
-#: ../main.c:2201
+msgid "-register\t\tRegister this gvim for OLE"
+msgstr "-register\t\t����gvim��OLE�Ȥ�����Ͽ����"
+
+msgid "-unregister\t\tUnregister gvim for OLE"
+msgstr "-unregister\t\tgvim��OLE��Ͽ��������"
+
+msgid "-g\t\t\tRun using GUI (like \"gvim\")"
+msgstr "-g\t\t\tGUI�ǵ�ư���� (\"gvim\" ��Ʊ��)"
+
+msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
+msgstr "-f or  --nofork\t�ե������饦���: GUI��Ϥ��Ȥ���fork���ʤ�"
+
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tVi�⡼�� (\"vi\" ��Ʊ��)"
 
-#: ../main.c:2202
 msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\t\tEx�⡼�� (\"ex\" ��Ʊ��)"
 
-#: ../main.c:2203
 msgid "-E\t\t\tImproved Ex mode"
 msgstr "-E\t\t\t����Ex�⡼��"
 
-#: ../main.c:2204
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
 msgstr "-s\t\t\t��������(�Хå�)�⡼�� (\"ex\" ����)"
 
-#: ../main.c:2205
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
 msgstr "-d\t\t\t��ʬ�⡼�� (\"vidiff\" ��Ʊ��)"
 
-#: ../main.c:2206
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
 msgstr "-y\t\t\t���������⡼�� (\"evim\" ��Ʊ��, �⡼��̵)"
 
-#: ../main.c:2207
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\t\t�ɹ����ѥ⡼�� (\"view\" ��Ʊ��)"
 
-#: ../main.c:2208
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\t���¥⡼�� (\"rvim\" ��Ʊ��)"
 
-#: ../main.c:2209
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\t�ѹ� (�ե�������¸��) ��Ǥ��ʤ��褦�ˤ���"
 
-#: ../main.c:2210
 msgid "-M\t\t\tModifications in text not allowed"
 msgstr "-M\t\t\t�ƥ����Ȥ��Խ���Ԥʤ��ʤ��褦�ˤ���"
 
-#: ../main.c:2211
 msgid "-b\t\t\tBinary mode"
 msgstr "-b\t\t\t�Х��ʥ�⡼��"
 
-#: ../main.c:2212
 msgid "-l\t\t\tLisp mode"
 msgstr "-l\t\t\tLisp�⡼��"
 
-#: ../main.c:2213
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
 msgstr "-C\t\t\tVi�ߴ��⡼��: 'compatible'"
 
-#: ../main.c:2214
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
 msgstr "-N\t\t\tVi��ߴ��⡼��: 'nocompatible"
 
-#: ../main.c:2215
 msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
 msgstr "-V[N][fname]\t\t������������ [��٥� N] [�����ե�����̾ fname]"
 
-#: ../main.c:2216
 msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\t\t�ǥХå��⡼��"
 
-#: ../main.c:2217
 msgid "-n\t\t\tNo swap file, use memory only"
 msgstr "-n\t\t\t����åץե��������Ѥ����������"
 
-#: ../main.c:2218
 msgid "-r\t\t\tList swap files and exit"
 msgstr "-r\t\t\t����åץե��������󤷽�λ"
 
-#: ../main.c:2219
 msgid "-r (with file name)\tRecover crashed session"
 msgstr "-r (�ե�����̾)\t����å��夷�����å���������"
 
-#: ../main.c:2220
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\t\t-r��Ʊ��"
 
-#: ../main.c:2221
+msgid "-f\t\t\tDon't use newcli to open window"
+msgstr "-f\t\t\t������ɥ��򳫤��Τ� newcli ����Ѥ��ʤ�"
+
+msgid "-dev <device>\t\tUse <device> for I/O"
+msgstr "-dev <device>\t\tI/O�� <device> ����Ѥ���"
+
 msgid "-A\t\t\tstart in Arabic mode"
 msgstr "-A\t\t\t����ӥ���⡼�ɤǵ�ư����"
 
-#: ../main.c:2222
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\t�إ֥饤��⡼�ɤǵ�ư����"
 
-#: ../main.c:2223
 msgid "-F\t\t\tStart in Farsi mode"
 msgstr "-F\t\t\t�ڥ륷����⡼�ɤǵ�ư����"
 
-#: ../main.c:2224
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\tü���� <terminal> �����ꤹ��"
 
-#: ../main.c:2225
+msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
+msgstr "--not-a-term\t\t�����Ϥ�ü���Ǥʤ��Ȥηٹ�򥹥��åפ���"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t.vimrc������� <vimrc> ��Ȥ�"
 
-#: ../main.c:2226
+msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
+msgstr "-U <gvimrc>\t\t.gvimrc������� <gvimrc> ��Ȥ�"
+
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\t�ץ饰���󥹥���ץȤ�����ɤ��ʤ�"
 
-#: ../main.c:2227
 msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
 msgstr "-p[N]\t\tN �ĥ��֥ڡ����򳫤�(��ά��: �ե�����ˤĤ�1��)"
 
-#: ../main.c:2228
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\tN �ĥ�����ɥ��򳫤�(��ά��: �ե�����ˤĤ�1��)"
 
-#: ../main.c:2229
 msgid "-O[N]\t\tLike -o but split vertically"
 msgstr "-O[N]\t\t-o��Ʊ��������ľʬ��"
 
-#: ../main.c:2230
 msgid "+\t\t\tStart at end of file"
 msgstr "+\t\t\t�ե�����κǸ夫��Ϥ����"
 
-#: ../main.c:2231
 msgid "+<lnum>\t\tStart at line <lnum>"
 msgstr "+<lnum>\t\t<lnum> �Ԥ���Ϥ����"
 
-#: ../main.c:2232
 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
 msgstr "--cmd <command>\tvimrc������ɤ������� <command> ��¹Ԥ���"
 
-#: ../main.c:2233
 msgid "-c <command>\t\tExecute <command> after loading the first file"
 msgstr "-c <command>\t\t�ǽ�Υե����������ɸ� <command> ��¹Ԥ���"
 
-#: ../main.c:2235
 msgid "-S <session>\t\tSource file <session> after loading the first file"
 msgstr "-S <session>\t\t�ǽ�Υե����������ɸ�ե����� <session> ������"
 
-#: ../main.c:2236
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
 msgstr "-s <scriptin>\t�ե����� <scriptin> ����Ρ��ޥ륳�ޥ�ɤ��ɹ���"
 
-#: ../main.c:2237
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
 msgstr "-w <scriptout>\t���Ϥ��������ޥ�ɤ�ե����� <scriptout> ���ɲä���"
 
-#: ../main.c:2238
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr "-W <scriptout>\t���Ϥ��������ޥ�ɤ�ե����� <scriptout> ����¸����"
 
-#: ../main.c:2240
+msgid "-x\t\t\tEdit encrypted files"
+msgstr "-x\t\t\t�Ź沽���줿�ե�������Խ�����"
+
+msgid "-display <display>\tConnect vim to this particular X-server"
+msgstr "-display <display>\tvim����ꤷ�� X �����С�����³����"
+
+msgid "-X\t\t\tDo not connect to X server"
+msgstr "-X\t\t\tX�����С�����³���ʤ�"
+
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <files>\t��ǽ�ʤ��Vim�����С��� <files> ���Խ�����"
+
+msgid "--remote-silent <files>  Same, don't complain if there is no server"
+msgstr "--remote-silent <files>  Ʊ��, �����С���̵���Ƥ�ٹ�ʸ����Ϥ��ʤ�"
+
+msgid ""
+"--remote-wait <files>  As --remote but wait for files to have been edited"
+msgstr "--remote-wait <files>\t--remote�� �ե�������Խ��������Τ��Ԥ�"
+
+msgid ""
+"--remote-wait-silent <files>  Same, don't complain if there is no server"
+msgstr ""
+"--remote-wait-silent <files>  Ʊ��, �����С���̵���Ƥ�ٹ�ʸ����Ϥ��ʤ�"
+
+msgid ""
+"--remote-tab[-wait][-silent] <files>  As --remote but use tab page per file"
+msgstr ""
+"--remote-tab[-wait][-silent] <files>  --remote�ǥե�����1�ĤˤĤ�1�ĤΥ���"
+"�ڡ����򳫤�"
+
+msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
+msgstr "--remote-send <keys>\tVim�����С��� <keys> ���������ƽ�λ����"
+
+msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
+msgstr "--remote-expr <expr>\t�����С��� <expr> ��¹Ԥ��Ʒ�̤�ɽ������"
+
+msgid "--serverlist\t\tList available Vim server names and exit"
+msgstr "--serverlist\t\tVim�����С�̾�ΰ�����ɽ�����ƽ�λ����"
+
+msgid "--servername <name>\tSend to/become the Vim server <name>"
+msgstr "--servername <name>\tVim�����С� <name> ������/̾�����ꤹ��"
+
 msgid "--startuptime <file>\tWrite startup timing messages to <file>"
 msgstr "--startuptime <file>\t��ư�ˤ����ä����֤ξܺ٤� <file> �ؽ��Ϥ���"
 
-#: ../main.c:2242
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\t.viminfo������� <viminfo> ��Ȥ�"
 
-#: ../main.c:2243
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h or  --help\t�إ��(���Υ�å�����)��ɽ������λ����"
 
-#: ../main.c:2244
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\t�С����������ɽ������λ����"
 
-#: ../mark.c:676
+msgid ""
+"\n"
+"Arguments recognised by gvim (Motif version):\n"
+msgstr ""
+"\n"
+"gvim�ˤ�äƲ�ᤵ������(Motif�С������):\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"gvim�ˤ�äƲ�ᤵ������(neXtaw�С������):\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (Athena version):\n"
+msgstr ""
+"\n"
+"gvim�ˤ�äƲ�ᤵ������(Athena�С������):\n"
+
+msgid "-display <display>\tRun vim on <display>"
+msgstr "-display <display>\t<display> ��vim��¹Ԥ���"
+
+msgid "-iconic\t\tStart vim iconified"
+msgstr "-iconic\t\t�Ǿ����������֤�vim��ư����"
+
+msgid "-background <color>\tUse <color> for the background (also: -bg)"
+msgstr "-background <color>\t�طʿ��� <color> ��Ȥ�(Ʊ��: -bg)"
+
+msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
+msgstr "-foreground <color>\t���ʿ��� <color> ��Ȥ�(Ʊ��: -fg)"
+
+msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
+msgstr "-font <font>\t\t�ƥ�����ɽ���� <font> ��Ȥ�(Ʊ��: -fn)"
+
+msgid "-boldfont <font>\tUse <font> for bold text"
+msgstr "-boldfont <font>\t������ <font> ��Ȥ�"
+
+msgid "-italicfont <font>\tUse <font> for italic text"
+msgstr "-italicfont <for>\t���λ��� <font> ��Ȥ�"
+
+msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
+msgstr "-geometry <geom>\t������֤� <geom> ��Ȥ�(Ʊ��: -geom)"
+
+msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
+msgstr "-borderwidth <width>\t���������� <width> �ˤ���(Ʊ��: -bw)"
+
+msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
+msgstr ""
+"-scrollbarwidth <width>  ����������С������� <width> �ˤ���(Ʊ��: -sw)"
+
+msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
+msgstr "-menuheight <height>\t��˥塼�С��ι⤵�� <height> �ˤ���(Ʊ��: -mh)"
+
+msgid "-reverse\t\tUse reverse video (also: -rv)"
+msgstr "-reverse\t\tȿž��������Ѥ���(Ʊ��: -rv)"
+
+msgid "+reverse\t\tDon't use reverse video (also: +rv)"
+msgstr "+reverse\t\tȿž��������Ѥ��ʤ�(Ʊ��: +rv)"
+
+msgid "-xrm <resource>\tSet the specified resource"
+msgstr "-xrm <resource>\t����Υ꥽��������Ѥ���"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (GTK+ version):\n"
+msgstr ""
+"\n"
+"gvim�ˤ�äƲ�ᤵ������(GTK+�С������):\n"
+
+msgid "-display <display>\tRun vim on <display> (also: --display)"
+msgstr "-display <display>\t<display> ��vim��¹Ԥ���(Ʊ��: --display)"
+
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "--role <role>\t�ᥤ�󥦥���ɥ����̤����դ����(role)�����ꤹ��"
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\t�ۤʤ�GTK widget��Vim�򳫤�"
+
+msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
+msgstr "--echo-wid\t\t������ɥ�ID��ɸ����Ϥ˽��Ϥ���"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <�ƤΥ����ȥ�>\tVim��ƥ��ץꥱ����������ǵ�ư����"
+
+msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
+msgstr "--windowid <HWND>\t�ۤʤ�Win32 widget��������Vim�򳫤�"
+
+msgid "No display"
+msgstr "�ǥ����ץ쥤�����Ĥ���ޤ���"
+
+#. Failed to send, abort.
+msgid ": Send failed.\n"
+msgstr ": �����˼��Ԥ��ޤ���.\n"
+
+#. Let vim start normally.
+msgid ": Send failed. Trying to execute locally\n"
+msgstr ": �����˼��Ԥ��ޤ���. ��������Ǥμ¹Ԥ��ߤƤ��ޤ�\n"
+
+#, c-format
+msgid "%d of %d edited"
+msgstr "%d �� (%d ����) �Υե�������Խ����ޤ���"
+
+msgid "No display: Send expression failed.\n"
+msgstr "�ǥ����ץ쥤������ޤ���: ���������˼��Ԥ��ޤ���.\n"
+
+msgid ": Send expression failed.\n"
+msgstr ": ���������˼��Ԥ��ޤ���.\n"
+
 msgid "No marks set"
 msgstr "�ޡ��������ꤵ��Ƥ��ޤ���"
 
-#: ../mark.c:678
 #, c-format
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: \"%s\" �˳�������ޡ���������ޤ���"
 
 #. Highlight title
-#: ../mark.c:687
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3602,7 +3261,6 @@ msgstr ""
 "mark   ��   �� �ե�����/�ƥ�����"
 
 #. Highlight title
-#: ../mark.c:789
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3611,7 +3269,6 @@ msgstr ""
 " jump   ��   �� �ե�����/�ƥ�����"
 
 #. Highlight title
-#: ../mark.c:831
 msgid ""
 "\n"
 "change line  col text"
@@ -3619,7 +3276,6 @@ msgstr ""
 "\n"
 "�ѹ�   ��    ��  �ƥ�����"
 
-#: ../mark.c:1238
 msgid ""
 "\n"
 "# File marks:\n"
@@ -3628,7 +3284,6 @@ msgstr ""
 "# �ե�����ޡ���:\n"
 
 #. Write the jumplist with -'
-#: ../mark.c:1271
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3636,7 +3291,6 @@ msgstr ""
 "\n"
 "# �����ץꥹ�� (��������Τ���):\n"
 
-#: ../mark.c:1352
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -3644,84 +3298,88 @@ msgstr ""
 "\n"
 "# �ե�������ޡ��������� (��������Τ���Ť����):\n"
 
-#: ../mark.c:1431
 msgid "Missing '>'"
 msgstr "'>' �����Ĥ���ޤ���"
 
-#: ../memfile.c:426
+msgid "E543: Not a valid codepage"
+msgstr "E543: ̵���ʥ����ɥڡ����Ǥ�"
+
+msgid "E284: Cannot set IC values"
+msgstr "E284: IC���ͤ�����Ǥ��ޤ���"
+
+msgid "E285: Failed to create input context"
+msgstr "E285: ����ץåȥ���ƥ����Ȥκ����˼��Ԥ��ޤ���"
+
+msgid "E286: Failed to open input method"
+msgstr "E286: ����ץåȥ᥽�åɤΥ����ץ�˼��Ԥ��ޤ���"
+
+msgid "E287: Warning: Could not set destroy callback to IM"
+msgstr "E287: �ٹ�: IM���˲�������Хå�������Ǥ��ޤ���Ǥ���"
+
+msgid "E288: input method doesn't support any style"
+msgstr "E288: ����ץåȥ᥽�åɤϤɤ�ʥ�������⥵�ݡ��Ȥ��ޤ���"
+
+msgid "E289: input method doesn't support my preedit type"
+msgstr "E289: ����ץåȥ᥽�åɤ� my preedit type �򥵥ݡ��Ȥ��ޤ���"
+
 msgid "E293: block was not locked"
 msgstr "E293: �֥��å������å�����Ƥ��ޤ���"
 
-#: ../memfile.c:799
 msgid "E294: Seek error in swap file read"
 msgstr "E294: ����åץե������ɹ����˥��������顼�Ǥ�"
 
-#: ../memfile.c:803
 msgid "E295: Read error in swap file"
 msgstr "E295: ����åץե�������ɹ��ߥ��顼�Ǥ�"
 
-#: ../memfile.c:849
 msgid "E296: Seek error in swap file write"
 msgstr "E296: ����åץե��������߻��˥��������顼�Ǥ�"
 
-#: ../memfile.c:865
 msgid "E297: Write error in swap file"
 msgstr "E297: ����åץե�����ν���ߥ��顼�Ǥ�"
 
-#: ../memfile.c:1036
 msgid "E300: Swap file already exists (symlink attack?)"
 msgstr "E300: ����åץե����뤬����¸�ߤ��ޤ� (symlink�ˤ�빶��?)"
 
-#: ../memline.c:318
 msgid "E298: Didn't get block nr 0?"
 msgstr "E298: �֥��å� 0 ������Ǥ��ޤ���?"
 
-#: ../memline.c:361
 msgid "E298: Didn't get block nr 1?"
 msgstr "E298: �֥��å� 1 ������Ǥ��ޤ���?"
 
-#: ../memline.c:377
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: �֥��å� 2 ������Ǥ��ޤ���?"
 
+msgid "E843: Error while updating swap file crypt"
+msgstr "E843: ����åץե�����ΰŹ�򹹿���˥��顼��ȯ�����ޤ���"
+
 #. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: ���ä�, ����åץե����뤬�����ޤ���!!!"
 
-#: ../memline.c:477
 msgid "E302: Could not rename swap file"
 msgstr "E302: ����åץե������̾�����Ѥ����ޤ���"
 
-#: ../memline.c:554
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr "E303: \"%s\" �Υ���åץե�����򳫤��ʤ��Τǥꥫ�Х���Բ�ǽ�Ǥ�"
 
-#: ../memline.c:666
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0(): �֥��å� 0 ������Ǥ��ޤ���Ǥ���??"
 
-#. no swap files found
-#: ../memline.c:830
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: %s �ˤϥ���åץե����뤬���Ĥ���ޤ���"
 
-#: ../memline.c:839
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "���Ѥ��륹��åץե�������ֹ�����Ϥ��Ƥ�������(0 �ǽ�λ): "
 
-#: ../memline.c:879
 #, c-format
 msgid "E306: Cannot open %s"
 msgstr "E306: %s �򳫤��ޤ���"
 
-#: ../memline.c:897
 msgid "Unable to read block 0 from "
 msgstr "�֥��å� 0 ���ɹ���ޤ��� "
 
-#: ../memline.c:900
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
@@ -3729,28 +3387,22 @@ msgstr ""
 "\n"
 "���餯�ѹ�������Ƥ��ʤ���Vim������åץե�����򹹿����Ƥ��ޤ���."
 
-#: ../memline.c:909
 msgid " cannot be used with this version of Vim.\n"
 msgstr " Vim�Τ��ΥС������Ǥϻ��ѤǤ��ޤ���.\n"
 
-#: ../memline.c:911
 msgid "Use Vim version 3.0.\n"
 msgstr "Vim�ΥС������3.0����Ѥ��Ƥ�������.\n"
 
-#: ../memline.c:916
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s ��Vim�Υ���åץե�����ǤϤʤ��褦�Ǥ�"
 
-#: ../memline.c:922
 msgid " cannot be used on this computer.\n"
 msgstr " ���Υ���ԥ塼���Ǥϻ��ѤǤ��ޤ���.\n"
 
-#: ../memline.c:924
 msgid "The file was created on "
 msgstr "���Υե�����ϼ��ξ��Ǻ���ޤ��� "
 
-#: ../memline.c:928
 msgid ""
 ",\n"
 "or the file has been damaged."
@@ -3758,85 +3410,104 @@ msgstr ""
 ",\n"
 "�⤷���ϥե����뤬»�����Ƥ��ޤ�."
 
-#: ../memline.c:945
+#, c-format
+msgid ""
+"E833: %s is encrypted and this version of Vim does not support encryption"
+msgstr ""
+"E833: %s �Ϥ��ΥС�������Vim�ǥ��ݡ��Ȥ��Ƥ��ʤ������ǰŹ沽����Ƥ��ޤ�"
+
 msgid " has been damaged (page size is smaller than minimum value).\n"
 msgstr " ��»�����Ƥ��ޤ� (�ڡ������������Ǿ��ͤ򲼲�äƤ��ޤ�).\n"
 
-#: ../memline.c:974
 #, c-format
 msgid "Using swap file \"%s\""
 msgstr "����åץե����� \"%s\" �������"
 
-#: ../memline.c:980
 #, c-format
 msgid "Original file \"%s\""
 msgstr "���ܥե����� \"%s\""
 
-#: ../memline.c:995
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: �ٹ�: ���ܥե����뤬�ѹ�����Ƥ��ޤ�"
 
-#: ../memline.c:1061
+#, c-format
+msgid "Swap file is encrypted: \"%s\""
+msgstr "����åץե�����ϰŹ沽����Ƥ��ޤ�: \"%s\""
+
+msgid ""
+"\n"
+"If you entered a new crypt key but did not write the text file,"
+msgstr ""
+"\n"
+"�������Ź業�������Ϥ������Ȥ˥ƥ����ȥե��������¸���Ƥ��ʤ�����,"
+
+msgid ""
+"\n"
+"enter the new crypt key."
+msgstr ""
+"\n"
+"�������Ź業�������Ϥ��Ƥ�������."
+
+msgid ""
+"\n"
+"If you wrote the text file after changing the crypt key press enter"
+msgstr ""
+"\n"
+"�Ź業�����Ѥ������Ȥ˥ƥ����ȥե��������¸��������, �ƥ����ȥե������"
+
+msgid ""
+"\n"
+"to use the same key for text file and swap file"
+msgstr ""
+"\n"
+"����åץե������Ʊ���Ź業����Ȥ������enter�����򲡤��Ƥ�������."
+
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: %s ����֥��å� 1 ���ɹ���ޤ���"
 
-#: ../memline.c:1065
 msgid "???MANY LINES MISSING"
 msgstr "???¿���ιԤ������Ƥ��ޤ�"
 
-#: ../memline.c:1076
 msgid "???LINE COUNT WRONG"
 msgstr "???�Կ����ְ�äƤ��ޤ�"
 
-#: ../memline.c:1082
 msgid "???EMPTY BLOCK"
 msgstr "???�֥��å������Ǥ�"
 
-#: ../memline.c:1103
 msgid "???LINES MISSING"
 msgstr "???�Ԥ������Ƥ��ޤ�"
 
-#: ../memline.c:1128
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: �֥��å� 1 ��ID���ְ�äƤ��ޤ�(%s ��.swp�ե�����Ǥʤ�?)"
 
-#: ../memline.c:1133
 msgid "???BLOCK MISSING"
 msgstr "???�֥��å�������ޤ���"
 
-#: ../memline.c:1147
 msgid "??? from here until ???END lines may be messed up"
 msgstr "??? �������� ???END �ޤǤιԤ��˲�����Ƥ���褦�Ǥ�"
 
-#: ../memline.c:1164
 msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr "??? �������� ???END �ޤǤιԤ�������������줿�褦�Ǥ�"
 
-#: ../memline.c:1181
 msgid "???END"
 msgstr "???END"
 
-#: ../memline.c:1238
 msgid "E311: Recovery Interrupted"
 msgstr "E311: �ꥫ�Х꤬����ޤ�ޤ���"
 
-#: ../memline.c:1243
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
 msgstr ""
 "E312: �ꥫ�Х�κ���˥��顼�����Ф���ޤ���; ???�ǻϤޤ�Ԥ򻲾Ȥ��Ƥ�������"
 
-#: ../memline.c:1245
 msgid "See \":help E312\" for more information."
 msgstr "�ܺ٤� \":help E312\" �򻲾Ȥ��Ƥ�������"
 
-#: ../memline.c:1249
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "�ꥫ�Х꤬��λ���ޤ���. ���Ƥ��������������å����Ƥ�������."
 
-#: ../memline.c:1251
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
@@ -3844,15 +3515,12 @@ msgstr ""
 "\n"
 "(�ѹ�������å����뤿���, ���Υե�������̤�̾������¸�������\n"
 
-#: ../memline.c:1252
 msgid "and run diff with the original file to check for changes)"
 msgstr "���ܥե�����Ȥ� diff ��¹Ԥ�����ɤ��Ǥ��礦)"
 
-#: ../memline.c:1254
 msgid "Recovery completed. Buffer contents equals file contents."
 msgstr "������λ. �Хåե������Ƥϥե������Ʊ���ˤʤ�ޤ���."
 
-#: ../memline.c:1255
 msgid ""
 "\n"
 "You may want to delete the .swp file now.\n"
@@ -3862,52 +3530,43 @@ msgstr ""
 "����.swp�ե�����Ϻ�����Ƥ⹽���ޤ���\n"
 "\n"
 
+msgid "Using crypt key from swap file for the text file.\n"
+msgstr "����åץե����뤫����������Ź業����ƥ����ȥե�����˻Ȥ��ޤ�.\n"
+
 #. use msg() to start the scrolling properly
-#: ../memline.c:1327
 msgid "Swap files found:"
 msgstr "����åץե����뤬ʣ�����Ĥ���ޤ���:"
 
-#: ../memline.c:1446
 msgid "   In current directory:\n"
 msgstr "   ���ߤΥǥ��쥯�ȥ�:\n"
 
-#: ../memline.c:1448
 msgid "   Using specified name:\n"
 msgstr "   �ʲ���̾���������:\n"
 
-#: ../memline.c:1450
 msgid "   In directory "
 msgstr "   �ǥ��쥯�ȥ� "
 
-#: ../memline.c:1465
 msgid "      -- none --\n"
 msgstr "      -- �ʤ� --\n"
 
-#: ../memline.c:1527
 msgid "          owned by: "
 msgstr "            ��ͭ��: "
 
-#: ../memline.c:1529
 msgid "   dated: "
 msgstr "   ����: "
 
-#: ../memline.c:1532 ../memline.c:3231
 msgid "             dated: "
 msgstr "             ����: "
 
-#: ../memline.c:1548
 msgid "         [from Vim version 3.0]"
 msgstr "         [from Vim version 3.0]"
 
-#: ../memline.c:1550
 msgid "         [does not look like a Vim swap file]"
 msgstr "         [Vim�Υ���åץե�����ǤϤʤ��褦�Ǥ�]"
 
-#: ../memline.c:1552
 msgid "         file name: "
 msgstr "        �ե�����̾: "
 
-#: ../memline.c:1558
 msgid ""
 "\n"
 "          modified: "
@@ -3915,15 +3574,12 @@ msgstr ""
 "\n"
 "          �ѹ�����: "
 
-#: ../memline.c:1559
 msgid "YES"
 msgstr "����"
 
-#: ../memline.c:1559
 msgid "no"
 msgstr "�ʤ�"
 
-#: ../memline.c:1562
 msgid ""
 "\n"
 "         user name: "
@@ -3931,11 +3587,9 @@ msgstr ""
 "\n"
 "        �桼����̾: "
 
-#: ../memline.c:1568
 msgid "   host name: "
 msgstr "   �ۥ���̾: "
 
-#: ../memline.c:1570
 msgid ""
 "\n"
 "         host name: "
@@ -3943,7 +3597,6 @@ msgstr ""
 "\n"
 "          �ۥ���̾: "
 
-#: ../memline.c:1575
 msgid ""
 "\n"
 "        process ID: "
@@ -3951,11 +3604,16 @@ msgstr ""
 "\n"
 "        �ץ�����ID: "
 
-#: ../memline.c:1579
 msgid " (still running)"
 msgstr " (�ޤ��¹���)"
 
-#: ../memline.c:1586
+msgid ""
+"\n"
+"         [not usable with this version of Vim]"
+msgstr ""
+"\n"
+"         [����Vim�С������Ǥϻ��ѤǤ��ޤ���]"
+
 msgid ""
 "\n"
 "         [not usable on this computer]"
@@ -3963,97 +3621,75 @@ msgstr ""
 "\n"
 "         [���Υ���ԥ塼���Ǥϻ��ѤǤ��ޤ���]"
 
-#: ../memline.c:1590
 msgid "         [cannot be read]"
 msgstr "         [�ɹ���ޤ���]"
 
-#: ../memline.c:1593
 msgid "         [cannot be opened]"
 msgstr "         [�����ޤ���]"
 
-#: ../memline.c:1698
 msgid "E313: Cannot preserve, there is no swap file"
 msgstr "E313: ����åץե����뤬̵���Τǰݻ��Ǥ��ޤ���"
 
-#: ../memline.c:1747
 msgid "File preserved"
 msgstr "�ե����뤬�ݻ�����ޤ�"
 
-#: ../memline.c:1749
 msgid "E314: Preserve failed"
 msgstr "E314: �ݻ��˼��Ԥ��ޤ���"
 
-#: ../memline.c:1819
 #, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get: ̵����lnum�Ǥ�: %<PRId64>"
+msgid "E315: ml_get: invalid lnum: %ld"
+msgstr "E315: ml_get: ̵����lnum�Ǥ�: %ld"
 
-#: ../memline.c:1851
 #, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get: �� %<PRId64> �򸫤Ĥ����ޤ���"
+msgid "E316: ml_get: cannot find line %ld"
+msgstr "E316: ml_get: �� %ld �򸫤Ĥ����ޤ���"
 
-#: ../memline.c:2236
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: �ݥ��󥿥֥��å���ID���ְ�äƤ��ޤ� 3"
 
-#: ../memline.c:2311
 msgid "stack_idx should be 0"
 msgstr "stack_idx �� 0 �Ǥ���٤��Ǥ�"
 
-#: ../memline.c:2369
 msgid "E318: Updated too many blocks?"
 msgstr "E318: �������줿�֥��å���¿�᤮�뤫��?"
 
-#: ../memline.c:2511
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: �ݥ��󥿥֥��å���ID���ְ�äƤ��ޤ� 4"
 
-#: ../memline.c:2536
 msgid "deleted block 1?"
 msgstr "�֥��å� 1 �Ͼä��줿?"
 
-#: ../memline.c:2707
 #, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: �� %<PRId64> �����Ĥ���ޤ���"
+msgid "E320: Cannot find line %ld"
+msgstr "E320: �� %ld �����Ĥ���ޤ���"
 
-#: ../memline.c:2916
 msgid "E317: pointer block id wrong"
 msgstr "E317: �ݥ��󥿥֥��å���ID���ְ�äƤ��ޤ�"
 
-#: ../memline.c:2930
 msgid "pe_line_count is zero"
 msgstr "pe_line_count �������Ǥ�"
 
-#: ../memline.c:2955
 #, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: ���ֹ椬�ϰϳ��Ǥ�: %<PRId64> Ķ���Ƥ��ޤ�"
+msgid "E322: line number out of range: %ld past the end"
+msgstr "E322: ���ֹ椬�ϰϳ��Ǥ�: %ld Ķ���Ƥ��ޤ�"
 
-#: ../memline.c:2959
 #, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: �֥��å� %<PRId64> �ιԥ�����Ȥ��ְ�äƤ��ޤ�"
+msgid "E323: line count wrong in block %ld"
+msgstr "E323: �֥��å� %ld �ιԥ�����Ȥ��ְ�äƤ��ޤ�"
 
-#: ../memline.c:2999
 msgid "Stack size increases"
 msgstr "�����å��������������ޤ�"
 
-#: ../memline.c:3038
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: �ݥ��󥿥֥��å���ID���ְ�äƤ��ޤ� 2"
 
-#: ../memline.c:3070
 #, c-format
 msgid "E773: Symlink loop for \"%s\""
 msgstr "E773: \"%s\" �Υ���ܥ�å���󥯤��롼�פˤʤäƤ��ޤ�"
 
-#: ../memline.c:3221
 msgid "E325: ATTENTION"
 msgstr "E325: ����"
 
-#: ../memline.c:3222
 msgid ""
 "\n"
 "Found a swap file by the name \""
@@ -4061,39 +3697,32 @@ msgstr ""
 "\n"
 "����̾���ǥ���åץե�����򸫤Ĥ��ޤ��� \""
 
-#: ../memline.c:3226
 msgid "While opening file \""
 msgstr "���Υե�����򳫤��Ƥ������ \""
 
-#: ../memline.c:3239
 msgid "      NEWER than swap file!\n"
 msgstr "      ����åץե�������⿷�����Ǥ�!\n"
 
-#: ../memline.c:3244
+#. Some of these messages are long to allow translation to
+#. * other languages.
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
 "    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
 "(1) �̤Υץ�����बƱ���ե�������Խ����Ƥ��뤫�⤷��ޤ���.\n"
 "    ���ξ��ˤ�, �ѹ��򤷤Ƥ��ޤ���1�ĤΥե�������Ф��ưۤʤ�2�Ĥ�\n"
-"    ���󥹥��󥹤��Ǥ��Ƥ��ޤ��Τ�, �������ʤ��褦�˵���Ĥ��Ƥ�������."
+"    ���󥹥��󥹤��Ǥ��Ƥ��ޤ��Τ�, �������ʤ��褦�˵���Ĥ��Ƥ�������.\n"
+"    ��λ���뤫, ���դ��ʤ���³���Ƥ�������.\n"
 
-#: ../memline.c:3245
-msgid "  Quit, or continue with caution.\n"
-msgstr "    ��λ���뤫, ���դ��ʤ���³���Ƥ�������.\n"
-
-#: ../memline.c:3246
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) ���Υե�������Խ����å���󤬥���å��夷��.\n"
 
-#: ../memline.c:3247
 msgid "    If this is the case, use \":recover\" or \"vim -r "
 msgstr "    ���ξ��ˤ� \":recover\" �� \"vim -r "
 
-#: ../memline.c:3249
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
@@ -4101,11 +3730,9 @@ msgstr ""
 "\"\n"
 "    ����Ѥ����ѹ���ꥫ�С����ޤ�(\":help recovery\" �򻲾�).\n"
 
-#: ../memline.c:3250
 msgid "    If you did this already, delete the swap file \""
 msgstr "    ���ˤ����Ԥʤä��Τʤ��, ����åץե����� \""
 
-#: ../memline.c:3252
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
@@ -4113,23 +3740,18 @@ msgstr ""
 "\"\n"
 "    ��ä��Ф��Υ�å����������Ǥ��ޤ�.\n"
 
-#: ../memline.c:3450 ../memline.c:3452
 msgid "Swap file \""
 msgstr "����åץե����� \""
 
-#: ../memline.c:3451 ../memline.c:3455
 msgid "\" already exists!"
 msgstr "\" �����ˤ���ޤ�!"
 
-#: ../memline.c:3457
 msgid "VIM - ATTENTION"
 msgstr "VIM - ����"
 
-#: ../memline.c:3459
 msgid "Swap file already exists!"
 msgstr "����åץե����뤬����¸�ߤ��ޤ�!"
 
-#: ../memline.c:3464
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4143,7 +3765,6 @@ msgstr ""
 "�����(&Q)\n"
 "��ߤ���(&A)"
 
-#: ../memline.c:3467
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4159,56 +3780,34 @@ msgstr ""
 "�����(&Q)\n"
 "��ߤ���(&A)"
 
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
-#: ../memline.c:3528
 msgid "E326: Too many swap files found"
 msgstr "E326: ����åץե����뤬¿�����Ĥ���ޤ���"
 
-#: ../memory.c:227
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: ���꤬­��ޤ���!  (%<PRIu64> �Х��Ȥ�����׵�)"
-
-#: ../menu.c:62
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: ��˥塼�����ƥ�Υѥ�����ʬ�����֥�˥塼�ǤϤ���ޤ���"
 
-#: ../menu.c:63
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: ��˥塼��¾�Υ⡼�ɤˤ�������ޤ�"
 
-#: ../menu.c:64
 #, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329: \"%s\" �Ȥ�����˥塼�Ϥ���ޤ���"
 
 #. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
 msgid "E792: Empty menu name"
 msgstr "E792: ��˥塼̾�����Ǥ�"
 
-#: ../menu.c:340
 msgid "E330: Menu path must not lead to a sub-menu"
 msgstr "E330: ��˥塼�ѥ��ϥ��֥�˥塼��������٤��ǤϤ���ޤ���"
 
-#: ../menu.c:365
 msgid "E331: Must not add menu items directly to menu bar"
 msgstr "E331: ��˥塼�С��ˤ�ľ�ܥ�˥塼�����ƥ���ɲäǤ��ޤ���"
 
-#: ../menu.c:370
 msgid "E332: Separator cannot be part of a menu path"
 msgstr "E332: ���ڤ�ϥ�˥塼�ѥ��ΰ����ǤϤ���ޤ���"
 
 #. Now we have found the matching menu, and we list the mappings
 #. Highlight title
-#: ../menu.c:762
 msgid ""
 "\n"
 "--- Menus ---"
@@ -4216,69 +3815,60 @@ msgstr ""
 "\n"
 "--- ��˥塼 ---"
 
-#: ../menu.c:1313
+msgid "Tear off this menu"
+msgstr "���Υ�˥塼���ڤ���"
+
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: ��˥塼�ѥ��ϥ�˥塼�����ƥ�������ʤ���Ф����ޤ���"
 
-#: ../menu.c:1330
 #, c-format
 msgid "E334: Menu not found: %s"
 msgstr "E334: ��˥塼�����Ĥ���ޤ���: %s"
 
-#: ../menu.c:1396
 #, c-format
 msgid "E335: Menu not defined for %s mode"
 msgstr "E335: %s �ˤϥ�˥塼���������Ƥ��ޤ���"
 
-#: ../menu.c:1426
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: ��˥塼�ѥ��ϥ��֥�˥塼�������ʤ���Ф����ޤ���"
 
-#: ../menu.c:1447
 msgid "E337: Menu not found - check menu names"
 msgstr "E337: ��˥塼�����Ĥ���ޤ��� - ��˥塼̾���ǧ���Ƥ�������"
 
-#: ../message.c:423
 #, c-format
 msgid "Error detected while processing %s:"
 msgstr "%s �ν�����˥��顼�����Ф���ޤ���:"
 
-#: ../message.c:445
 #, c-format
 msgid "line %4ld:"
 msgstr "�� %4ld:"
 
-#: ../message.c:617
 #, c-format
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: ̵���ʥ쥸����̾: '%s'"
 
-#: ../message.c:986
+msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
+msgstr "���ܸ��å���������/�ƽ�: ¼�� ��Ϻ <koron.kaoriya@gmail.com>"
+
 msgid "Interrupt: "
 msgstr "�����: "
 
-#: ../message.c:988
 msgid "Press ENTER or type command to continue"
 msgstr "³����ˤ�ENTER�򲡤������ޥ�ɤ����Ϥ��Ƥ�������"
 
-#: ../message.c:1843
 #, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s �� %<PRId64>"
+msgid "%s line %ld"
+msgstr "%s �� %ld"
 
-#: ../message.c:2392
 msgid "-- More --"
 msgstr "-- ��³ --"
 
-#: ../message.c:2398
 msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
 msgstr " SPACE/d/j: ����/�ڡ���/�� ��, b/u/k: ��, q: ��λ "
 
-#: ../message.c:3021 ../message.c:3031
 msgid "Question"
 msgstr "����"
 
-#: ../message.c:3023
 msgid ""
 "&Yes\n"
 "&No"
@@ -4286,17 +3876,6 @@ msgstr ""
 "�Ϥ�(&Y)\n"
 "������(&N)"
 
-#: ../message.c:3033
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"�Ϥ�(&Y)\n"
-"������(&N)\n"
-"����󥻥�(&C)"
-
-#: ../message.c:3045
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4310,175 +3889,247 @@ msgstr ""
 "��������(&D)\n"
 "����󥻥�(&C)"
 
-#: ../message.c:3058
+msgid "Select Directory dialog"
+msgstr "�ǥ��쥯�ȥ��������������"
+
+msgid "Save File dialog"
+msgstr "�ե�������¸����������"
+
+msgid "Open File dialog"
+msgstr "�ե������ɹ�����������"
+
+#. TODO: non-GUI file selector here
+msgid "E338: Sorry, no file browser in console mode"
+msgstr "E338: ���󥽡���⡼�ɤǤϥե�����֥饦����Ȥ��ޤ���, �����ʤ���"
+
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: printf() �ΰ������Խ�ʬ�Ǥ�"
 
-#: ../message.c:3119
 msgid "E807: Expected Float argument for printf()"
 msgstr "E807: printf() �ΰ����ˤ���ư�������������Ԥ���Ƥ��ޤ�"
 
-#: ../message.c:3873
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: printf() �ΰ�����¿�᤮�ޤ�"
 
-#: ../misc1.c:2256
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: �ٹ�: �ɹ����ѥե�������ѹ����ޤ�"
 
-#: ../misc1.c:2537
 msgid "Type number and <Enter> or click with mouse (empty cancels): "
 msgstr ""
 "�ֹ��<Enter>�����Ϥ��뤫�ޥ����ǥ���å����Ƥ������� (���ǥ���󥻥�): "
 
-#: ../misc1.c:2539
 msgid "Type number and <Enter> (empty cancels): "
 msgstr "�ֹ��<Enter>�����Ϥ��Ƥ������� (���ǥ���󥻥�): "
 
-#: ../misc1.c:2585
 msgid "1 more line"
 msgstr "1 �� �ɲä��ޤ���"
 
-#: ../misc1.c:2588
 msgid "1 line less"
 msgstr "1 �� ������ޤ���"
 
-#: ../misc1.c:2593
 #, c-format
-msgid "%<PRId64> more lines"
-msgstr "%<PRId64> �� �ɲä��ޤ���"
+msgid "%ld more lines"
+msgstr "%ld �� �ɲä��ޤ���"
 
-#: ../misc1.c:2596
 #, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "%<PRId64> �� ������ޤ���"
+msgid "%ld fewer lines"
+msgstr "%ld �� ������ޤ���"
 
-#: ../misc1.c:2599
 msgid " (Interrupted)"
 msgstr " (����ޤ�ޤ���)"
 
-#: ../misc1.c:2635
 msgid "Beep!"
 msgstr "�ӡ���!"
 
-#: ../misc2.c:738
+msgid "ERROR: "
+msgstr "���顼: "
+
+#, c-format
+msgid ""
+"\n"
+"[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
+msgstr ""
+"\n"
+"[����(�Х���)] ������-������ %lu-%lu, ������ %lu, �ԡ����� %lu\n"
+
+#, c-format
+msgid ""
+"[calls] total re/malloc()'s %lu, total free()'s %lu\n"
+"\n"
+msgstr ""
+"[�ƽ�] �� re/malloc() ��� %lu, �� free() ��� %lu\n"
+"\n"
+
+msgid "E340: Line is becoming too long"
+msgstr "E340: �Ԥ�Ĺ���ʤ�᤮�ޤ���"
+
+#, c-format
+msgid "E341: Internal error: lalloc(%ld, )"
+msgstr "E341: �������顼: lalloc(%ld,)"
+
+#, c-format
+msgid "E342: Out of memory!  (allocating %lu bytes)"
+msgstr "E342: ���꤬­��ޤ���!  (%lu �Х��Ȥ�����׵�)"
+
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "�¹ԤΤ���˥������ƽФ���: \"%s\""
 
-#: ../normal.c:183
+msgid "E545: Missing colon"
+msgstr "E545: �����󤬤���ޤ���"
+
+msgid "E546: Illegal mode"
+msgstr "E546: �����ʥ⡼�ɤǤ�"
+
+msgid "E547: Illegal mouseshape"
+msgstr "E547: ������ 'mouseshape' �Ǥ�"
+
+msgid "E548: digit expected"
+msgstr "E548: ���ͤ�ɬ�פǤ�"
+
+msgid "E549: Illegal percentage"
+msgstr "E549: �����ʥѡ�����ơ����Ǥ�"
+
+msgid "E854: path too long for completion"
+msgstr "E854: �ѥ���Ĺ�᤮���䴰�Ǥ��ޤ���"
+
+#, c-format
+msgid ""
+"E343: Invalid path: '**[number]' must be at the end of the path or be "
+"followed by '%s'."
+msgstr ""
+"E343: ̵���ʥѥ��Ǥ�: '**[����]' ��path�κǸ夫 '%s' ��³���Ƥʤ��Ȥ����ޤ�"
+"��."
+
+#, c-format
+msgid "E344: Can't find directory \"%s\" in cdpath"
+msgstr "E344: cdpath�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
+
+#, c-format
+msgid "E345: Can't find file \"%s\" in path"
+msgstr "E345: path�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
+
+#, c-format
+msgid "E346: No more directory \"%s\" found in cdpath"
+msgstr "E346: cdpath�ˤϤ���ʾ� \"%s\" �Ȥ����ե����뤬����ޤ���"
+
+#, c-format
+msgid "E347: No more file \"%s\" found in path"
+msgstr "E347: �ѥ��ˤϤ���ʾ� \"%s\" �Ȥ����ե����뤬����ޤ���"
+
+#, c-format
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr ""
+"E668: NetBeans����³����ե�����Υ��������⡼�ɤ����꤬����ޤ�: \"%s\""
+
+#, c-format
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: �Хåե� %ld �� NetBeans ��³�������ޤ���"
+
+msgid "E838: netbeans is not supported with this GUI"
+msgstr "E838: NetBeans�Ϥ���GUI�ˤ��б����Ƥ��ޤ���"
+
+msgid "E511: netbeans already connected"
+msgstr "E511: NetBeans�ϴ�����³���Ƥ��ޤ�"
+
+#, c-format
+msgid "E505: %s is read-only (add ! to override)"
+msgstr "E505: %s ���ɹ����ѤǤ� (��������ˤ� ! ���ɲ�)"
+
 msgid "E349: No identifier under cursor"
 msgstr "E349: ��������ΰ��֤ˤϼ��̻Ҥ�����ޤ���"
 
-#: ../normal.c:1866
 msgid "E774: 'operatorfunc' is empty"
 msgstr "E774: 'operatorfunc' ���ץ���󤬶��Ǥ�"
 
-#: ../normal.c:2637
+msgid "E775: Eval feature not available"
+msgstr "E775: ��ɾ����ǽ��̵���ˤʤäƤ��ޤ�"
+
 msgid "Warning: terminal cannot highlight"
 msgstr "�ٹ�: ���Ѥ��Ƥ���ü���ϥϥ��饤�ȤǤ��ޤ���"
 
-#: ../normal.c:2807
 msgid "E348: No string under cursor"
 msgstr "E348: ��������ΰ��֤ˤ�ʸ���󤬤���ޤ���"
 
-#: ../normal.c:3937
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr "E352: ���ߤ� 'foldmethod' �Ǥ��޾��ߤ�õ�Ǥ��ޤ���"
 
-#: ../normal.c:5897
 msgid "E664: changelist is empty"
 msgstr "E664: �ѹ��ꥹ�Ȥ����Ǥ�"
 
-#: ../normal.c:5899
 msgid "E662: At start of changelist"
 msgstr "E662: �ѹ��ꥹ�Ȥ���Ƭ"
 
-#: ../normal.c:5901
 msgid "E663: At end of changelist"
 msgstr "E663: �ѹ��ꥹ�Ȥ�����"
 
-#: ../normal.c:7053
-msgid "Type  :quit<Enter>  to exit Nvim"
+msgid "Type  :quit<Enter>  to exit Vim"
 msgstr "Vim��λ����ˤ� :quit<Enter> �����Ϥ��Ƥ�������"
 
-#: ../ops.c:248
 #, c-format
 msgid "1 line %sed 1 time"
 msgstr "1 �Ԥ� %s �� 1 ���������ޤ���"
 
-#: ../ops.c:250
 #, c-format
 msgid "1 line %sed %d times"
 msgstr "1 �Ԥ� %s �� %d ���������ޤ���"
 
-#: ../ops.c:253
 #, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> �Ԥ� %s �� 1 ���������ޤ���"
+msgid "%ld lines %sed 1 time"
+msgstr "%ld �Ԥ� %s �� 1 ���������ޤ���"
 
-#: ../ops.c:256
 #, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> �Ԥ� %s �� %d ���������ޤ���"
+msgid "%ld lines %sed %d times"
+msgstr "%ld �Ԥ� %s �� %d ���������ޤ���"
 
-#: ../ops.c:592
 #, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "%<PRId64> �Ԥ�����ǥ�Ȥ���ޤ�... "
+msgid "%ld lines to indent... "
+msgstr "%ld �Ԥ�����ǥ�Ȥ���ޤ�... "
 
-#: ../ops.c:634
 msgid "1 line indented "
 msgstr "1 �Ԥ򥤥�ǥ�Ȥ��ޤ��� "
 
-#: ../ops.c:636
 #, c-format
-msgid "%<PRId64> lines indented "
-msgstr "%<PRId64> �Ԥ򥤥�ǥ�Ȥ��ޤ��� "
+msgid "%ld lines indented "
+msgstr "%ld �Ԥ򥤥�ǥ�Ȥ��ޤ��� "
 
-#: ../ops.c:938
 msgid "E748: No previously used register"
 msgstr "E748: �ޤ��쥸��������Ѥ��Ƥ��ޤ���"
 
 #. must display the prompt
-#: ../ops.c:1433
 msgid "cannot yank; delete anyway"
 msgstr "��󥯤Ǥ��ޤ���; �Ȥˤ����õ�"
 
-#: ../ops.c:1929
 msgid "1 line changed"
 msgstr "1 �Ԥ��ѹ�����ޤ���"
 
-#: ../ops.c:1931
 #, c-format
-msgid "%<PRId64> lines changed"
-msgstr "%<PRId64> �Ԥ��ѹ�����ޤ���"
+msgid "%ld lines changed"
+msgstr "%ld �Ԥ��ѹ�����ޤ���"
+
+#, c-format
+msgid "freeing %ld lines"
+msgstr "%ld �Ԥ������"
 
-#: ../ops.c:2521
 msgid "block of 1 line yanked"
 msgstr "1 �ԤΥ֥��å�����󥯤���ޤ���"
 
-#: ../ops.c:2523
 msgid "1 line yanked"
 msgstr "1 �Ԥ���󥯤���ޤ���"
 
-#: ../ops.c:2525
 #, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "%<PRId64> �ԤΥ֥��å�����󥯤���ޤ���"
+msgid "block of %ld lines yanked"
+msgstr "%ld �ԤΥ֥��å�����󥯤���ޤ���"
 
-#: ../ops.c:2528
 #, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "%<PRId64> �Ԥ���󥯤���ޤ���"
+msgid "%ld lines yanked"
+msgstr "%ld �Ԥ���󥯤���ޤ���"
 
-#: ../ops.c:2710
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: �쥸���� %s �ˤϲ��⤢��ޤ���"
 
 #. Highlight title
-#: ../ops.c:3185
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4486,11 +4137,9 @@ msgstr ""
 "\n"
 "--- �쥸���� ---"
 
-#: ../ops.c:4455
 msgid "Illegal register name"
 msgstr "�����ʥ쥸����̾"
 
-#: ../ops.c:4533
 msgid ""
 "\n"
 "# Registers:\n"
@@ -4498,7 +4147,6 @@ msgstr ""
 "\n"
 "# �쥸����:\n"
 
-#: ../ops.c:4575
 #, c-format
 msgid "E574: Unknown register type %d"
 msgstr "E574: ̤�ΤΥ쥸������ %d �Ǥ�"
@@ -4508,86 +4156,61 @@ msgid ""
 "lines"
 msgstr "E883: �����ѥ�����ȼ��쥸�����ˤ�2�԰ʾ��ޤ���ޤ���"
 
-#: ../ops.c:5089
 #, c-format
-msgid "%<PRId64> Cols; "
-msgstr "%<PRId64> ��; "
+msgid "%ld Cols; "
+msgstr "%ld ��; "
+
+#, c-format
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+msgstr "���� %s%ld / %ld ��; %lld / %lld ñ��; %lld / %lld �Х���"
 
-#: ../ops.c:5097
 #, c-format
 msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
 msgstr ""
-"���� %s%<PRId64> / %<PRId64> ��; %<PRId64> / %<PRId64> ñ��; %<PRId64> / "
-"%<PRId64> ����"
+"���� %s%ld / %ld ��; %lld / %lld ñ��; %lld / %lld ʸ��; %lld / %lld �Х���"
+
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+msgstr "�� %s / %s; �� %ld of %ld; ñ�� %lld / %lld; �Х��� %lld / %lld"
 
-#: ../ops.c:5105
 #, c-format
 msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
 msgstr ""
-"���� %s%<PRId64> / %<PRId64> ��; %<PRId64> / %<PRId64> ñ��; %<PRId64> / "
-"%<PRId64> ʸ��; %<PRId64> / %<PRId64> �Х���"
+"�� %s / %s; �� %ld / %ld; ñ�� %lld / %lld; ʸ�� %lld / %lld; �Х��� %lld of "
+"%lld"
 
-#: ../ops.c:5123
 #, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
-msgstr ""
-"�� %s / %s; �� %<PRId64> of %<PRId64>; ñ�� %<PRId64> / %<PRId64>; �Х��� "
-"%<PRId64> / %<PRId64>"
+msgid "(+%ld for BOM)"
+msgstr "(+%ld for BOM)"
 
-#: ../ops.c:5133
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
-msgstr ""
-"�� %s / %s; �� %<PRId64> / %<PRId64>; ñ�� %<PRId64> / %<PRId64>; ʸ�� "
-"%<PRId64> / %<PRId64>; ���� %<PRId64> of %<PRId64>"
-
-#: ../ops.c:5146
-#, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr "(+%<PRId64> for BOM)"
-
-#: ../option.c:1238
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=%N �ڡ���"
 
-#: ../option.c:1574
 msgid "Thanks for flying Vim"
 msgstr "Vim ��ȤäƤ���Ƥ��꤬�Ȥ�"
 
-#. found a mismatch: skip
-#: ../option.c:2698
 msgid "E518: Unknown option"
 msgstr "E518: ̤�ΤΥ��ץ����Ǥ�"
 
-#: ../option.c:2709
 msgid "E519: Option not supported"
 msgstr "E519: ���ץ����ϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: ../option.c:2740
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: modeline �Ǥϵ��Ĥ���ޤ���"
 
-#: ../option.c:2815
 msgid "E846: Key code not set"
 msgstr "E846: ���������ɤ����ꤵ��Ƥ��ޤ���"
 
-#: ../option.c:2924
 msgid "E521: Number required after ="
 msgstr "E521: = �θ�ˤϿ�����ɬ�פǤ�"
 
-#: ../option.c:3226 ../option.c:3864
 msgid "E522: Not found in termcap"
 msgstr "E522: termcap ��˸��Ĥ���ޤ���"
 
-#: ../option.c:3335
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: ������ʸ���Ǥ� <%s>"
@@ -4596,93 +4219,99 @@ msgstr "E539: 
 msgid "For option %s"
 msgstr "���ץ����: %s"
 
-#: ../option.c:3862
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' �ˤ϶�ʸ���������Ǥ��ޤ���"
 
-#: ../option.c:3885
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: GUI�Ǥ� 'term' ���ѹ��Ǥ��ޤ���"
+
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: GUI�򥹥����Ȥ���ˤ� \":gui\" ����Ѥ��Ƥ�������"
+
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: 'backupext' �� 'patchmode' ��Ʊ���Ǥ�"
 
-#: ../option.c:3964
 msgid "E834: Conflicts with value of 'listchars'"
 msgstr "E834: 'listchars'���ͤ�̷�⤬����ޤ�"
 
-#: ../option.c:3966
 msgid "E835: Conflicts with value of 'fillchars'"
 msgstr "E835: 'fillchars'���ͤ�̷�⤬����ޤ�"
 
-#: ../option.c:4163
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: GTK+2 GUI�Ǥ��ѹ��Ǥ��ޤ���"
+
 msgid "E524: Missing colon"
 msgstr "E524: �����󤬤���ޤ���"
 
-#: ../option.c:4165
 msgid "E525: Zero length string"
 msgstr "E525: ʸ�����Ĺ���������Ǥ�"
 
-#: ../option.c:4220
 #, c-format
 msgid "E526: Missing number after <%s>"
 msgstr "E526: <%s> �θ�˿���������ޤ���"
 
-#: ../option.c:4232
 msgid "E527: Missing comma"
 msgstr "E527: ����ޤ�����ޤ���"
 
-#: ../option.c:4239
 msgid "E528: Must specify a ' value"
 msgstr "E528: ' ���ͤ���ꤷ�ʤ���Фʤ�ޤ���"
 
-#: ../option.c:4271
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: ɽ���Ǥ��ʤ�ʸ�����磻��ʸ����ޤ�Ǥ��ޤ�"
 
-#: ../option.c:4469
+msgid "E596: Invalid font(s)"
+msgstr "E596: ̵���ʥե���ȤǤ�"
+
+msgid "E597: can't select fontset"
+msgstr "E597: �ե���ȥ��åȤ�����Ǥ��ޤ���"
+
+msgid "E598: Invalid fontset"
+msgstr "E598: ̵���ʥե���ȥ��åȤǤ�"
+
+msgid "E533: can't select wide font"
+msgstr "E533: �磻�ɥե���Ȥ�����Ǥ��ޤ���"
+
+msgid "E534: Invalid wide font"
+msgstr "E534: ̵���ʥ磻�ɥե���ȤǤ�"
+
 #, c-format
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: <%c> �θ��������ʸ��������ޤ�"
 
-#: ../option.c:4534
 msgid "E536: comma required"
 msgstr "E536: ����ޤ�ɬ�פǤ�"
 
-#: ../option.c:4543
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' �϶��Ǥ��뤫 %s ��ޤ�ɬ�פ�����ޤ�"
 
-#: ../option.c:4928
+msgid "E538: No mouse support"
+msgstr "E538: �ޥ����ϥ��ݡ��Ȥ���ޤ���"
+
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: ������λ���Ƥ��ޤ���"
 
-#: ../option.c:4932
 msgid "E541: too many items"
 msgstr "E541: ���Ǥ�¿�᤮�ޤ�"
 
-#: ../option.c:4934
 msgid "E542: unbalanced groups"
 msgstr "E542: ���롼�פ���礤�ޤ���"
 
-#: ../option.c:5148
 msgid "E590: A preview window already exists"
 msgstr "E590: �ץ�ӥ塼������ɥ�������¸�ߤ��ޤ�"
 
-#: ../option.c:5311
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
 msgstr ""
 "W17: ����ӥ�ʸ���ˤ�UTF-8��ɬ�פʤΤ�, ':set encoding=utf-8' ���Ƥ�������"
 
-#: ../option.c:5623
 #, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593: ���� %d �ιԿ���ɬ�פǤ�"
 
-#: ../option.c:5631
 #, c-format
 msgid "E594: Need at least %d columns"
 msgstr "E594: ���� %d �Υ��������ɬ�פǤ�"
 
-#: ../option.c:6011
 #, c-format
 msgid "E355: Unknown option: %s"
 msgstr "E355: ̤�ΤΥ��ץ����Ǥ�: %s"
@@ -4690,12 +4319,10 @@ msgstr "E355: ̤
 #. There's another character after zeros or the string
 #. * is empty.  In both cases, we are trying to set a
 #. * num option using a string.
-#: ../option.c:6037
 #, c-format
 msgid "E521: Number required: &%s = '%s'"
 msgstr "E521: ������ɬ�פǤ�: &%s = '%s'"
 
-#: ../option.c:6149
 msgid ""
 "\n"
 "--- Terminal codes ---"
@@ -4703,7 +4330,6 @@ msgstr ""
 "\n"
 "--- ü�������� ---"
 
-#: ../option.c:6151
 msgid ""
 "\n"
 "--- Global option values ---"
@@ -4711,7 +4337,6 @@ msgstr ""
 "\n"
 "--- �������Х륪�ץ������ ---"
 
-#: ../option.c:6153
 msgid ""
 "\n"
 "--- Local option values ---"
@@ -4719,7 +4344,6 @@ msgstr ""
 "\n"
 "--- �������륪�ץ������ ---"
 
-#: ../option.c:6155
 msgid ""
 "\n"
 "--- Options ---"
@@ -4727,37 +4351,119 @@ msgstr ""
 "\n"
 "--- ���ץ���� ---"
 
-#: ../option.c:6816
 msgid "E356: get_varp ERROR"
 msgstr "E356: get_varp ���顼"
 
-#: ../option.c:7696
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap': %s ���б�����ʸ��������ޤ���"
 
-#: ../option.c:7715
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap': ���ߥ�����θ��;ʬ��ʸ��������ޤ�: %s"
 
-#: ../os/shell.c:194
+msgid "cannot open "
+msgstr "�����ޤ��� "
+
+msgid "VIM: Can't open window!\n"
+msgstr "VIM: ������ɥ��򳫤��ޤ���!\n"
+
+msgid "Need Amigados version 2.04 or later\n"
+msgstr "Amigados�ΥС������ 2.04������ʹߤ�ɬ�פǤ�\n"
+
+#, c-format
+msgid "Need %s version %ld\n"
+msgstr "%s �ΥС������ %ld ��ɬ�פǤ�\n"
+
+msgid "Cannot open NIL:\n"
+msgstr "NIL�򳫤��ޤ���:\n"
+
+msgid "Cannot create "
+msgstr "�����Ǥ��ޤ��� "
+
+#, c-format
+msgid "Vim exiting with %d\n"
+msgstr "Vim�� %d �ǽ�λ���ޤ�\n"
+
+msgid "cannot change console mode ?!\n"
+msgstr "���󥽡���⡼�ɤ��ѹ��Ǥ��ޤ���?!\n"
+
+msgid "mch_get_shellsize: not a console??\n"
+msgstr "mch_get_shellsize: ���󥽡���ǤϤʤ�??\n"
+
+#. if Vim opened a window: Executing a shell may cause crashes
+msgid "E360: Cannot execute shell with -f option"
+msgstr "E360: -f ���ץ����ǥ������¹ԤǤ��ޤ���"
+
+msgid "Cannot execute "
+msgstr "�¹ԤǤ��ޤ��� "
+
+msgid "shell "
+msgstr "������ "
+
+msgid " returned\n"
+msgstr " ���ޤ���\n"
+
+msgid "ANCHOR_BUF_SIZE too small."
+msgstr "ANCHOR_BUF_SIZE �������᤮�ޤ�."
+
+msgid "I/O ERROR"
+msgstr "�����ϥ��顼"
+
+msgid "Message"
+msgstr "������"
+
+msgid "'columns' is not 80, cannot execute external commands"
+msgstr "'columns' �� 80 �ǤϤʤ����ᡢ�������ޥ�ɤ�¹ԤǤ��ޤ���"
+
+msgid "E237: Printer selection failed"
+msgstr "E237: �ץ�󥿤�����˼��Ԥ��ޤ���"
+
+#, c-format
+msgid "to %s on %s"
+msgstr "%s �� (%s ���)"
+
+#, c-format
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: ̤�ΤΥץ�󥿥��ץ����Ǥ�: %s"
+
+#, c-format
+msgid "E238: Print error: %s"
+msgstr "E238: �������顼: %s"
+
+#, c-format
+msgid "Printing '%s'"
+msgstr "�������Ƥ��ޤ�: '%s'"
+
+#, c-format
+msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
+msgstr "E244: ʸ�����å�̾ \"%s\" �������Ǥ� (�ե����̾ \"%s\")"
+
+#, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr "E244: �ʼ�̾ \"%s\" �������Ǥ� (�ե����̾ \"%s\")"
+
+#, c-format
+msgid "E245: Illegal char '%c' in font name \"%s\""
+msgstr "E245: '%c' ��������ʸ���Ǥ� (�ե����̾ \"%s\")"
+
+#, c-format
+msgid "Opening the X display took %ld msec"
+msgstr "X�����С��ؤ���³�� %ld �ߥ��ä�����ޤ���"
+
 msgid ""
 "\n"
-"Cannot execute shell "
+"Vim: Got X error\n"
 msgstr ""
 "\n"
-"�������¹ԤǤ��ޤ��� "
+"Vim: X �Υ��顼�򸡽Ф��ޤ���r\n"
 
-#: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"�����뤬�ͤ��֤��ޤ��� "
+msgid "Testing the X display failed"
+msgstr "X display �Υ����å��˼��Ԥ��ޤ���"
+
+msgid "Opening the X display timed out"
+msgstr "X display �� open �������ॢ���Ȥ��ޤ���"
 
-#: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
 "\n"
 "Could not get security context for "
@@ -4765,7 +4471,6 @@ msgstr ""
 "\n"
 "�������ƥ�����ƥ����Ȥ�����Ǥ��ޤ��� "
 
-#: ../os_unix.c:479
 msgid ""
 "\n"
 "Could not set security context for "
@@ -4781,223 +4486,293 @@ msgstr "
 msgid "Could not get security context %s for %s. Removing it!"
 msgstr "�������ƥ�����ƥ����� %s �� %s ��������Ǥ��ޤ���. ������ޤ�!"
 
-#: ../os_unix.c:1558 ../os_unix.c:1647
+msgid ""
+"\n"
+"Cannot execute shell sh\n"
+msgstr ""
+"\n"
+"sh �������¹ԤǤ��ޤ���\n"
+
+msgid ""
+"\n"
+"shell returned "
+msgstr ""
+"\n"
+"�����뤬�ͤ��֤��ޤ��� "
+
+msgid ""
+"\n"
+"Cannot create pipes\n"
+msgstr ""
+"\n"
+"�ѥ��פ�����Ǥ��ޤ���\n"
+
+msgid ""
+"\n"
+"Cannot fork\n"
+msgstr ""
+"\n"
+"fork �Ǥ��ޤ���\n"
+
+msgid ""
+"\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"�������¹ԤǤ��ޤ��� "
+
+msgid ""
+"\n"
+"Command terminated\n"
+msgstr ""
+"\n"
+"���ޥ�ɤ����Ǥ��ޤ���\n"
+
+msgid "XSMP lost ICE connection"
+msgstr "XSMP ��ICE��³�򼺤��ޤ���"
+
 #, c-format
 msgid "dlerror = \"%s\""
 msgstr "dlerror = \"%s\""
 
-#: ../path.c:1449
-#, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: path�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
+msgid "Opening the X display failed"
+msgstr "X display �� open �˼��Ԥ��ޤ���"
+
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP ��save-yourself�׵��������Ƥ��ޤ�"
+
+msgid "XSMP opening connection"
+msgstr "XSMP ����³�򳫻Ϥ��Ƥ��ޤ�"
+
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP ICE��³�����Ԥ����褦�Ǥ�"
+
+#, c-format
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "XSMP SmcOpenConnection�����Ԥ��ޤ���: %s"
+
+msgid "At line"
+msgstr "��"
+
+msgid "Could not load vim32.dll!"
+msgstr "vim32.dll ������ɤǤ��ޤ���Ǥ���"
+
+msgid "VIM Error"
+msgstr "VIM���顼"
+
+msgid "Could not fix up function pointers to the DLL!"
+msgstr "DLL����ؿ��ݥ��󥿤�����Ǥ��ޤ���Ǥ���"
+
+#, c-format
+msgid "Vim: Caught %s event\n"
+msgstr "Vim: ���٥�� %s ����\n"
+
+msgid "close"
+msgstr "�Ĥ���"
+
+msgid "logoff"
+msgstr "��������"
+
+msgid "shutdown"
+msgstr "����åȥ�����"
+
+msgid "E371: Command not found"
+msgstr "E371: ���ޥ�ɤ�����ޤ���"
+
+msgid ""
+"VIMRUN.EXE not found in your $PATH.\n"
+"External commands will not pause after completion.\n"
+"See  :help win32-vimrun  for more information."
+msgstr ""
+"VIMRUN.EXE�� $PATH ����˸��Ĥ���ޤ���.\n"
+"�������ޥ�ɤν�λ��˰����ߤ򤷤ޤ���.\n"
+"�ܺ٤�  :help win32-vimrun  �򻲾Ȥ��Ƥ�������."
+
+msgid "Vim Warning"
+msgstr "Vim�ηٹ�"
+
+#, c-format
+msgid "shell returned %d"
+msgstr "�����뤬������ %d �ǽ�λ���ޤ���"
 
-#: ../quickfix.c:359
 #, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: �ե����ޥå�ʸ����� %%%c ��¿�᤮�ޤ�"
 
-#: ../quickfix.c:371
 #, c-format
 msgid "E373: Unexpected %%%c in format string"
 msgstr "E373: �ե����ޥå�ʸ�����ͽ������ %%%c ������ޤ���"
 
-#: ../quickfix.c:420
 msgid "E374: Missing ] in format string"
 msgstr "E374: �ե����ޥå�ʸ����� ] ������ޤ���"
 
-#: ../quickfix.c:431
 #, c-format
 msgid "E375: Unsupported %%%c in format string"
 msgstr "E375: �ե����ޥå�ʸ����Ǥ� %%%c �ϥ��ݡ��Ȥ���ޤ���"
 
-#: ../quickfix.c:448
 #, c-format
 msgid "E376: Invalid %%%c in format string prefix"
 msgstr "E376: �ե����ޥå�ʸ��������֤�̵���� %%%c ������ޤ�"
 
-#: ../quickfix.c:454
 #, c-format
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: �ե����ޥå�ʸ�����̵���� %%%c ������ޤ�"
 
 #. nothing found
-#: ../quickfix.c:477
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' �˥ѥ����󤬻��ꤵ��Ƥ��ޤ���"
 
-#: ../quickfix.c:695
 msgid "E379: Missing or empty directory name"
 msgstr "E379: �ǥ��쥯�ȥ�̾��̵�������Ǥ�"
 
-#: ../quickfix.c:1305
 msgid "E553: No more items"
 msgstr "E553: ���Ǥ��⤦����ޤ���"
 
-#: ../quickfix.c:1674
+msgid "E924: Current window was closed"
+msgstr "E924: ���ߤΥ�����ɥ����Ĥ����ޤ���"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: ���ߤ� quickfix ���ѹ�����ޤ���"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: ���ߤΥ����������ꥹ�Ȥ��ѹ�����ޤ���"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d of %d)%s%s: "
 
-#: ../quickfix.c:1676
 msgid " (line deleted)"
 msgstr " (�Ԥ��������ޤ���)"
 
-#: ../quickfix.c:1863
+#, c-format
+msgid "%serror list %d of %d; %d errors "
+msgstr "%s ���顼���� %d of %d; %d �ĥ��顼"
+
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: quickfix �����å��������Ǥ�"
 
-#: ../quickfix.c:1869
 msgid "E381: At top of quickfix stack"
 msgstr "E381: quickfix �����å�����Ƭ�Ǥ�"
 
-#: ../quickfix.c:1880
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "���顼���� %d of %d; %d �ĥ��顼"
+msgid "No entries"
+msgstr "����ȥ꤬����ޤ���"
 
-#: ../quickfix.c:2427
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 'buftype' ���ץ�������ꤵ��Ƥ���Τǽ���ߤޤ���"
 
-#: ../quickfix.c:2812
+msgid "Error file"
+msgstr "���顼�ե�����"
+
 msgid "E683: File name missing or invalid pattern"
 msgstr "E683: �ե�����̾��̵����̵���ʥѥ�����Ǥ�"
 
-#: ../quickfix.c:2911
 #, c-format
 msgid "Cannot open file \"%s\""
 msgstr "�ե����� \"%s\" �򳫤��ޤ���"
 
-#: ../quickfix.c:3429
 msgid "E681: Buffer is not loaded"
 msgstr "E681: �Хåե����ɤ߹��ޤ�ޤ���Ǥ���"
 
-#: ../quickfix.c:3487
 msgid "E777: String or List expected"
 msgstr "E777: ʸ���󤫥ꥹ�Ȥ�ɬ�פǤ�"
 
-#: ../regexp.c:359
 #, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: ̵���ʹ��ܤǤ�: %s%%[]"
 
 #
-#: ../regexp.c:374
 #, c-format
 msgid "E769: Missing ] after %s["
 msgstr "E769: %s[ �θ�� ] ������ޤ���"
 
-#: ../regexp.c:375
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: %s%%( ������äƤ��ޤ���"
 
-#: ../regexp.c:376
 #, c-format
 msgid "E54: Unmatched %s("
 msgstr "E54: %s( ������äƤ��ޤ���"
 
-#: ../regexp.c:377
 #, c-format
 msgid "E55: Unmatched %s)"
 msgstr "E55: %s) ������äƤ��ޤ���"
 
 #
-#: ../regexp.c:378
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( �ϥ����Ǥϵ��Ĥ���Ƥ��ޤ���"
 
 #
-#: ../regexp.c:379
 msgid "E67: \\z1 et al. not allowed here"
 msgstr "E67: \\z1 ����¾�ϥ����Ǥϵ��Ĥ���Ƥ��ޤ���"
 
 #
-#: ../regexp.c:380
 #, c-format
 msgid "E69: Missing ] after %s%%["
 msgstr "E69: %s%%[ �θ�� ] ������ޤ���"
 
-#: ../regexp.c:381
 #, c-format
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] �����Ǥ�"
 
-#: ../regexp.c:1209 ../regexp.c:1224
 msgid "E339: Pattern too long"
 msgstr "E339: �ѥ�����Ĺ�᤮�ޤ�"
 
-#: ../regexp.c:1371
 msgid "E50: Too many \\z("
 msgstr "E50: \\z( ��¿�᤮�ޤ�"
 
-#: ../regexp.c:1378
 #, c-format
 msgid "E51: Too many %s("
 msgstr "E51: %s( ��¿�᤮�ޤ�"
 
-#: ../regexp.c:1427
 msgid "E52: Unmatched \\z("
 msgstr "E52: \\z( ������äƤ��ޤ���"
 
-#: ../regexp.c:1637
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: %s@ �θ��������ʸ��������ޤ���"
 
-#: ../regexp.c:1672
 #, c-format
 msgid "E60: Too many complex %s{...}s"
 msgstr "E60: ʣ���� %s{...} ��¿�᤮�ޤ�"
 
-#: ../regexp.c:1687
 #, c-format
 msgid "E61: Nested %s*"
 msgstr "E61:%s* ������ҤˤʤäƤ��ޤ�"
 
-#: ../regexp.c:1690
 #, c-format
 msgid "E62: Nested %s%c"
 msgstr "E62:%s%c ������ҤˤʤäƤ��ޤ�"
 
 #
-#: ../regexp.c:1800
 msgid "E63: invalid use of \\_"
 msgstr "E63: \\_ ��̵���ʻ�����ˡ�Ǥ�"
 
-#: ../regexp.c:1850
 #, c-format
 msgid "E64: %s%c follows nothing"
 msgstr "E64:%s%c �θ�ˤʤˤ⤢��ޤ���"
 
 #
-#: ../regexp.c:1902
 msgid "E65: Illegal back reference"
 msgstr "E65: �����ʸ������ȤǤ�"
 
 #
-#: ../regexp.c:1943
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z �θ��������ʸ��������ޤ���"
 
 #
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
 #, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
 msgstr "E678: %s%%[dxouU] �θ��������ʸ��������ޤ���"
 
 #
-#: ../regexp.c:2107
 #, c-format
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: %s%% �θ��������ʸ��������ޤ���"
 
-#: ../regexp.c:3017
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: %s{...} ���ʸˡ���顼������ޤ�"
 
-#: ../regexp.c:3805
 msgid "External submatches:\n"
 msgstr "��������ʬ����:\n"
 
@@ -5005,7 +4780,6 @@ msgstr "
 msgid "E888: (NFA regexp) cannot repeat %s"
 msgstr "E888: (NFA ����ɽ��) �����֤��ޤ��� %s"
 
-#: ../regexp.c:7022
 msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
 "used "
@@ -5016,62 +4790,54 @@ msgstr ""
 msgid "Switching to backtracking RE engine for pattern: "
 msgstr "���Υѥ�����˥Хå��ȥ�å��� RE ���󥸥��Ŭ�Ѥ��ޤ�: "
 
-#: ../regexp_nfa.c:239
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) ���Ԥ���᤯����ɽ���ν�ü����ã���ޤ���"
 
-#: ../regexp_nfa.c:240
 #, c-format
 msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (NFA ����ɽ��) ���֤����äƤ��ޤ�: %c"
 
-#: ../regexp_nfa.c:242
+#
 #, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr "E877: (NFA ����ɽ��) ̵����ʸ�����饹: %<PRId64>"
+msgid "E877: (NFA regexp) Invalid character class: %ld"
+msgstr "E877: (NFA ����ɽ��) ̵����ʸ�����饹: %ld"
 
-#: ../regexp_nfa.c:1261
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
 msgstr "E867: (NFA) ̤�ΤΥ��ڥ졼���Ǥ�: '\\z%c'"
 
-#: ../regexp_nfa.c:1387
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\%%%c'"
 msgstr "E867: (NFA) ̤�ΤΥ��ڥ졼���Ǥ�: '\\%%%c'"
 
-#: ../regexp_nfa.c:1802
+#. should never happen
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: �������饹��ޤ�NFA���ۤ˼��Ԥ��ޤ���!"
+
 #, c-format
 msgid "E869: (NFA) Unknown operator '\\@%c'"
 msgstr "E869: (NFA) ̤�ΤΥ��ڥ졼���Ǥ�: '\\@%c'"
 
-#: ../regexp_nfa.c:1831
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFA ����ɽ��) �����֤������²�����ɹ���˥��顼"
 
 #. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
 msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
 msgstr "E871: (NFA ����ɽ��) �����֤� �θ�� �����֤� �ϤǤ��ޤ���!"
 
 #. Too many `('
-#: ../regexp_nfa.c:2037
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA ����ɽ��) '(' ��¿�᤮�ޤ�"
 
-#: ../regexp_nfa.c:2042
 msgid "E879: (NFA regexp) Too many \\z("
 msgstr "E879: (NFA ����ɽ��) \\z( ��¿�᤮�ޤ�"
 
-#: ../regexp_nfa.c:2066
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA ����ɽ��) ��ü���椬����ޤ���"
 
-#: ../regexp_nfa.c:2599
 msgid "E874: (NFA) Could not pop the stack !"
 msgstr "E874: (NFA) �����å���ݥåפǤ��ޤ���!"
 
-#: ../regexp_nfa.c:3298
 msgid ""
 "E875: (NFA regexp) (While converting from postfix to NFA), too many states "
 "left on stack"
@@ -5079,177 +4845,136 @@ msgstr ""
 "E875: (NFA ����ɽ��) (����ʸ�����NFA���Ѵ����) �����å��˻Ĥ��줿���ơ��Ȥ�"
 "¿�᤮�ޤ�"
 
-#: ../regexp_nfa.c:3302
 msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
 msgstr "E876: (NFA ����ɽ��) NFA���Τ���¸����ˤ϶������ڡ�����­��ޤ���"
 
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
+msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+msgstr "E878: (NFA) ���߲�����Υ֥����˽�ʬ�ʥ���������Ƥ��ޤ���!"
+
 msgid ""
 "Could not open temporary log file for writing, displaying on stderr ... "
 msgstr ""
 "NFA����ɽ�����󥸥��ѤΥ����ե���������ѤȤ��Ƴ����ޤ��󡣥�����ɸ����Ϥ�"
 "���Ϥ��ޤ���"
 
-#: ../regexp_nfa.c:4840
 #, c-format
 msgid "(NFA) COULD NOT OPEN %s !"
 msgstr "(NFA) �����ե����� %s �򳫤��ޤ���!"
 
-#: ../regexp_nfa.c:6049
 msgid "Could not open temporary log file for writing "
 msgstr "NFA����ɽ�����󥸥��ѤΥ����ե���������ѤȤ��Ƴ����ޤ���"
 
-#: ../screen.c:7435
 msgid " VREPLACE"
 msgstr " �����ִ�"
 
-#: ../screen.c:7437
 msgid " REPLACE"
 msgstr " �ִ�"
 
-#: ../screen.c:7440
 msgid " REVERSE"
 msgstr " ȿž"
 
-#: ../screen.c:7441
 msgid " INSERT"
 msgstr " ����"
 
-#: ../screen.c:7443
 msgid " (insert)"
 msgstr " (����)"
 
-#: ../screen.c:7445
 msgid " (replace)"
 msgstr " (�ִ�)"
 
-#: ../screen.c:7447
 msgid " (vreplace)"
 msgstr " (�����ִ�)"
 
-#: ../screen.c:7449
 msgid " Hebrew"
 msgstr " �إ֥饤"
 
-#: ../screen.c:7454
 msgid " Arabic"
 msgstr " ����ӥ�"
 
-#: ../screen.c:7456
-msgid " (lang)"
-msgstr " (����)"
-
-#: ../screen.c:7459
 msgid " (paste)"
 msgstr " (Ž���դ�)"
 
-#: ../screen.c:7469
 msgid " VISUAL"
 msgstr " �ӥ��奢��"
 
-#: ../screen.c:7470
 msgid " VISUAL LINE"
 msgstr " �ӥ��奢�� ��"
 
-#: ../screen.c:7471
 msgid " VISUAL BLOCK"
 msgstr " �ӥ��奢�� ���"
 
-#: ../screen.c:7472
 msgid " SELECT"
 msgstr " ���쥯��"
 
-#: ../screen.c:7473
 msgid " SELECT LINE"
 msgstr " �Իظ�����"
 
-#: ../screen.c:7474
 msgid " SELECT BLOCK"
 msgstr " �������"
 
-#: ../screen.c:7486 ../screen.c:7541
 msgid "recording"
 msgstr "��Ͽ��"
 
-#: ../search.c:487
 #, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: ̵���ʸ���ʸ����Ǥ�: %s"
 
-#: ../search.c:832
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
 msgstr "E384: ��ޤǸ������ޤ����������ս�Ϥ���ޤ���: %s"
 
-#: ../search.c:835
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
 msgstr "E385: ���ޤǸ������ޤ����������ս�Ϥ���ޤ���: %s"
 
-#: ../search.c:1200
 msgid "E386: Expected '?' or '/'  after ';'"
 msgstr "E386: ';' �Τ��Ȥˤ� '?' �� '/' �����Ԥ���Ƥ���"
 
-#: ../search.c:4085
 msgid " (includes previously listed match)"
 msgstr " (������󤷤������ս��ޤ�)"
 
 #. cursor at status line
-#: ../search.c:4104
 msgid "--- Included files "
 msgstr "--- ���󥯥롼�ɤ��줿�ե����� "
 
-#: ../search.c:4106
 msgid "not found "
 msgstr "���Ĥ���ޤ��� "
 
-#: ../search.c:4107
 msgid "in path ---\n"
 msgstr "�ѥ��� ----\n"
 
-#: ../search.c:4168
 msgid "  (Already listed)"
 msgstr "  (�������)"
 
-#: ../search.c:4170
 msgid "  NOT FOUND"
 msgstr "  ���Ĥ���ޤ���"
 
-#: ../search.c:4211
 #, c-format
 msgid "Scanning included file: %s"
 msgstr "���󥯥롼�ɤ��줿�ե�����򥹥������: %s"
 
-#: ../search.c:4216
 #, c-format
 msgid "Searching included file %s"
 msgstr "���󥯥롼�ɤ��줿�ե�����򥹥������ %s"
 
-#: ../search.c:4405
 msgid "E387: Match is on current line"
 msgstr "E387: ���߹Ԥ˳���������ޤ�"
 
-#: ../search.c:4517
 msgid "All included files were found"
 msgstr "���ƤΥ��󥯥롼�ɤ��줿�ե����뤬���Ĥ���ޤ���"
 
-#: ../search.c:4519
 msgid "No included files"
 msgstr "���󥯥롼�ɥե�����Ϥ���ޤ���"
 
-#: ../search.c:4527
 msgid "E388: Couldn't find definition"
 msgstr "E388: ����򸫤Ĥ����ޤ���"
 
-#: ../search.c:4529
 msgid "E389: Couldn't find pattern"
 msgstr "E389: �ѥ�����򸫤Ĥ����ޤ���"
 
-#: ../search.c:4668
 msgid "Substitute "
 msgstr "Substitute "
 
-#: ../search.c:4681
 #, c-format
 msgid ""
 "\n"
@@ -5260,99 +4985,131 @@ msgstr ""
 "# �Ǹ�� %s�����ѥ�����:\n"
 "~"
 
-#: ../spell.c:951
-msgid "E759: Format error in spell file"
-msgstr "E759: ���ڥ�ե�����ν񼰥��顼�Ǥ�"
-
-#: ../spell.c:952
-msgid "E758: Truncated spell file"
-msgstr "E758: ���ڥ�ե����뤬�ڼ���Ƥ���褦�Ǥ�"
-
-#: ../spell.c:953
-#, c-format
-msgid "Trailing text in %s line %d: %s"
-msgstr "%s (%d ����) ��³���ƥ�����: %s"
-
-#: ../spell.c:954
-#, c-format
-msgid "Affix name too long in %s line %d: %s"
-msgstr "%s (%d ����) �� affix ̾��Ĺ�᤮�ޤ�: %s"
-
-#: ../spell.c:955
-msgid "E761: Format error in affix file FOL, LOW or UPP"
-msgstr ""
-"E761: affix�ե������ FOL, LOW �⤷���� UPP �Υե����ޥåȤ˥��顼������ޤ�"
-
-#: ../spell.c:957
-msgid "E762: Character in FOL, LOW or UPP is out of range"
-msgstr "E762: FOL, LOW �⤷���� UPP ��ʸ�����ϰϳ��Ǥ�"
-
-#: ../spell.c:958
-msgid "Compressing word tree..."
-msgstr "ñ��ĥ꡼�򰵽̤��Ƥ��ޤ�..."
-
-#: ../spell.c:1951
 msgid "E756: Spell checking is not enabled"
 msgstr "E756: ���ڥ�����å���̵��������Ƥ��ޤ�"
 
-#: ../spell.c:2249
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr ""
+"�ٹ�: ñ��ꥹ�� \"%s_%s.spl\" ����� \"%s_ascii.spl\" �ϸ��Ĥ���ޤ���"
+
 #, c-format
 msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
 msgstr ""
 "�ٹ�: ñ��ꥹ�� \"%s.%s.spl\" ����� \"%s.ascii.spl\" �ϸ��Ĥ���ޤ���"
 
-#: ../spell.c:2473
-#, c-format
-msgid "Reading spell file \"%s\""
-msgstr "���ڥ�ե����� \"%s\" ���ɹ���"
+msgid "E797: SpellFileMissing autocommand deleted buffer"
+msgstr "E797: autocommand �� SpellFileMissing ���Хåե��������ޤ���"
 
-#: ../spell.c:2496
-msgid "E757: This does not look like a spell file"
-msgstr "E757: ���ڥ�ե�����ǤϤʤ��褦�Ǥ�"
-
-#: ../spell.c:2501
-msgid "E771: Old spell file, needs to be updated"
-msgstr "E771: �Ť����ڥ�ե�����ʤΤ�, ���åץǡ��Ȥ��Ƥ�������"
-
-#: ../spell.c:2504
-msgid "E772: Spell file is for newer version of Vim"
-msgstr "E772: ��꿷�����С������� Vim �ѤΥ��ڥ�ե�����Ǥ�"
-
-#: ../spell.c:2602
-msgid "E770: Unsupported section in spell file"
-msgstr "E770: ���ڥ�ե�����˥��ݡ��Ȥ��Ƥ��ʤ���������󤬤���ޤ�"
-
-#: ../spell.c:3762
 #, c-format
 msgid "Warning: region %s not supported"
 msgstr "�ٹ�9: %s �Ȥ����ϰϤϥ��ݡ��Ȥ���Ƥ��ޤ���"
 
-#: ../spell.c:4550
+msgid "Sorry, no suggestions"
+msgstr "��ǰ�Ǥ���, ��������Ϥ���ޤ���"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "��ǰ�Ǥ���, ��������� %ld �Ĥ�������ޤ���"
+
+#. for when 'cmdheight' > 1
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "\"%.*s\" �򼡤��Ѵ�:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: ���ڥ��ִ����ޤ��¹Ԥ���Ƥ��ޤ���"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: ���Ĥ���ޤ���: %s"
+
+msgid "E758: Truncated spell file"
+msgstr "E758: ���ڥ�ե����뤬�ڼ���Ƥ���褦�Ǥ�"
+
+#, c-format
+msgid "Trailing text in %s line %d: %s"
+msgstr "%s (%d ����) ��³���ƥ�����: %s"
+
+#, c-format
+msgid "Affix name too long in %s line %d: %s"
+msgstr "%s (%d ����) �� affix ̾��Ĺ�᤮�ޤ�: %s"
+
+msgid "E761: Format error in affix file FOL, LOW or UPP"
+msgstr ""
+"E761: affix�ե������ FOL, LOW �⤷���� UPP �Υե����ޥåȤ˥��顼������ޤ�"
+
+msgid "E762: Character in FOL, LOW or UPP is out of range"
+msgstr "E762: FOL, LOW �⤷���� UPP ��ʸ�����ϰϳ��Ǥ�"
+
+msgid "Compressing word tree..."
+msgstr "ñ��ĥ꡼�򰵽̤��Ƥ��ޤ�..."
+
+#, c-format
+msgid "Reading spell file \"%s\""
+msgstr "���ڥ�ե����� \"%s\" ���ɹ���"
+
+msgid "E757: This does not look like a spell file"
+msgstr "E757: ���ڥ�ե�����ǤϤʤ��褦�Ǥ�"
+
+msgid "E771: Old spell file, needs to be updated"
+msgstr "E771: �Ť����ڥ�ե�����ʤΤ�, ���åץǡ��Ȥ��Ƥ�������"
+
+msgid "E772: Spell file is for newer version of Vim"
+msgstr "E772: ��꿷�����С������� Vim �ѤΥ��ڥ�ե�����Ǥ�"
+
+msgid "E770: Unsupported section in spell file"
+msgstr "E770: ���ڥ�ե�����˥��ݡ��Ȥ��Ƥ��ʤ���������󤬤���ޤ�"
+
+#, c-format
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: .sug �ե�����ǤϤʤ��褦�Ǥ�: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: �Ť� .sug �ե�����ʤΤ�, ���åץǡ��Ȥ��Ƥ�������: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: ��꿷�����С������� Vim �Ѥ� .sug �ե�����Ǥ�: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: .sug �ե����뤬 .spl �ե�����Ȱ��פ��ޤ���: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: .sug �ե�������ɹ���˥��顼��ȯ�����ޤ���: %s"
+
 #, c-format
 msgid "Reading affix file %s ..."
 msgstr "affix �ե����� %s ���ɹ���..."
 
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
 msgstr "%s (%d ����) ��ñ����Ѵ��Ǥ��ޤ���Ǥ���: %s"
 
-#: ../spell.c:4630 ../spell.c:6170
 #, c-format
 msgid "Conversion in %s not supported: from %s to %s"
 msgstr "%s ��μ����Ѵ��ϥ��ݡ��Ȥ���Ƥ��ޤ���: %s ���� %s ��"
 
-#: ../spell.c:4642
+#, c-format
+msgid "Conversion in %s not supported"
+msgstr "%s ����Ѵ��ϥ��ݡ��Ȥ���Ƥ��ޤ���"
+
 #, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "%s ��� %d ���ܤ� FLAG ��̵�����ͤ�����ޤ�: %s"
 
-#: ../spell.c:4655
 #, c-format
 msgid "FLAG after using flags in %s line %d: %s"
 msgstr "%s ��� %d ���ܤ˥ե饰����Ż��Ѥ�����ޤ�: %s"
 
-#: ../spell.c:4723
 #, c-format
 msgid ""
 "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
@@ -5361,7 +5118,6 @@ msgstr ""
 "%s �� %d ���ܤ� PFX ���ܤθ�� COMPOUNDFORBIDFLAG ������ϸ��ä���̤�������"
 "���Ȥ�����ޤ�"
 
-#: ../spell.c:4731
 #, c-format
 msgid ""
 "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
@@ -5370,43 +5126,35 @@ msgstr ""
 "%s �� %d ���ܤ� PFX ���ܤθ�� COMPOUNDPERMITFLAG ������ϸ��ä���̤�������"
 "���Ȥ�����ޤ�"
 
-#: ../spell.c:4747
 #, c-format
 msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
 msgstr "COMPOUNDRULES ���ͤ˸��꤬����ޤ�. �ե����� %s �� %d ����: %s"
 
-#: ../spell.c:4771
 #, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� COMPOUNDWORDMAX ���ͤ˸��꤬����ޤ�: %s"
 
-#: ../spell.c:4777
 #, c-format
 msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� COMPOUNDMIN ���ͤ˸��꤬����ޤ�: %s"
 
-#: ../spell.c:4783
 #, c-format
 msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� COMPOUNDSYLMAX ���ͤ˸��꤬����ޤ�: %s"
 
-#: ../spell.c:4795
 #, c-format
 msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� CHECKCOMPOUNDPATTERN ���ͤ˸��꤬����ޤ�: %s"
 
-#: ../spell.c:4847
 #, c-format
 msgid "Different combining flag in continued affix block in %s line %d: %s"
 msgstr ""
 "%s �� %d ���ܤ� Ϣ³ affix �֥��å��Υե饰���ȹ礻�˰㤤������ޤ�: %s"
 
-#: ../spell.c:4850
 #, c-format
 msgid "Duplicate affix in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� ��ʣ���� affix �򸡽Ф��ޤ���: %s"
 
-#: ../spell.c:4871
 #, c-format
 msgid ""
 "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
@@ -5415,308 +5163,206 @@ msgstr ""
 "%s �� %d ���ܤ� affix �� BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST "
 "�˻��Ѥ��Ƥ�������: %s"
 
-#: ../spell.c:4893
 #, c-format
 msgid "Expected Y or N in %s line %d: %s"
 msgstr "%s �� %d ���ܤǤ� Y �� N ��ɬ�פǤ�: %s"
 
-#: ../spell.c:4968
 #, c-format
 msgid "Broken condition in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� ���ϲ���Ƥ��ޤ�: %s"
 
-#: ../spell.c:5091
 #, c-format
 msgid "Expected REP(SAL) count in %s line %d"
 msgstr "%s �� %d ���ܤˤ� REP(SAL) �β����ɬ�פǤ�"
 
-#: ../spell.c:5120
 #, c-format
 msgid "Expected MAP count in %s line %d"
 msgstr "%s �� %d ���ܤˤ� MAP �β����ɬ�פǤ�"
 
-#: ../spell.c:5132
 #, c-format
 msgid "Duplicate character in MAP in %s line %d"
 msgstr "%s �� %d ���ܤ� MAP �˽�ʣ����ʸ��������ޤ�"
 
-#: ../spell.c:5176
 #, c-format
 msgid "Unrecognized or duplicate item in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� ǧ���Ǥ��ʤ�����ʣ�������ܤ�����ޤ�: %s"
 
-#: ../spell.c:5197
 #, c-format
 msgid "Missing FOL/LOW/UPP line in %s"
 msgstr "%s ���ܤ� FOL/LOW/UPP ������ޤ���"
 
-#: ../spell.c:5220
 msgid "COMPOUNDSYLMAX used without SYLLABLE"
 msgstr "SYLLABLE �����ꤵ��ʤ� COMPOUNDSYLMAX"
 
-#: ../spell.c:5236
 msgid "Too many postponed prefixes"
 msgstr "�ٱ���ֻҤ�¿�᤮�ޤ�"
 
-#: ../spell.c:5238
 msgid "Too many compound flags"
 msgstr "ʣ��ե饰��¿�᤮�ޤ�"
 
-#: ../spell.c:5240
 msgid "Too many postponed prefixes and/or compound flags"
 msgstr "�ٱ���ֻ� ��/�⤷���� ʣ��ե饰��¿�᤮�ޤ�"
 
-#: ../spell.c:5250
 #, c-format
 msgid "Missing SOFO%s line in %s"
 msgstr "SOFO%s �Ԥ� %s �ˤ���ޤ���"
 
-#: ../spell.c:5253
 #, c-format
 msgid "Both SAL and SOFO lines in %s"
 msgstr "SAL�� �� SOFO�� �� %s ��ξ�����ꤵ��Ƥ��ޤ�"
 
-#: ../spell.c:5331
 #, c-format
 msgid "Flag is not a number in %s line %d: %s"
 msgstr "%s �� %d �Ԥ� �ե饰�����ͤǤϤ���ޤ���: %s"
 
-#: ../spell.c:5334
 #, c-format
 msgid "Illegal flag in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� �ե饰�������Ǥ�: %s"
 
-#: ../spell.c:5493 ../spell.c:5501
 #, c-format
 msgid "%s value differs from what is used in another .aff file"
 msgstr "�� %s ��¾�� .aff �ե�����ǻ��Ѥ��줿�ΤȰۤʤ�ޤ�"
 
-#: ../spell.c:5602
 #, c-format
 msgid "Reading dictionary file %s ..."
 msgstr "����ե����� %s �򥹥������..."
 
-#: ../spell.c:5611
 #, c-format
 msgid "E760: No word count in %s"
 msgstr "E760: %s �ˤ�ñ���������ޤ���"
 
-#: ../spell.c:5669
 #, c-format
 msgid "line %6d, word %6d - %s"
 msgstr "�� %6d, ñ�� %6d - %s"
 
-#: ../spell.c:5691
 #, c-format
 msgid "Duplicate word in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� ��ʣñ�줬���Ĥ���ޤ���: %s"
 
-#: ../spell.c:5694
 #, c-format
 msgid "First duplicate word in %s line %d: %s"
 msgstr "��ʣ�Τ����ǽ��ñ��� %s �� %d ���ܤǤ�: %s"
 
-#: ../spell.c:5746
 #, c-format
 msgid "%d duplicate word(s) in %s"
 msgstr "%d �Ĥ�ñ�줬���Ĥ���ޤ��� (%s ��)"
 
-#: ../spell.c:5748
 #, c-format
 msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "��ASCIIʸ����ޤ� %d �Ĥ�ñ���̵�뤷�ޤ��� (%s ��)"
 
-#: ../spell.c:6115
 #, c-format
 msgid "Reading word file %s ..."
 msgstr "ɸ�����Ϥ����ɹ����� %s ..."
 
-#: ../spell.c:6155
 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� ��ʣ���� /encoding= �Ԥ�̵�뤷�ޤ���: %s"
 
-#: ../spell.c:6159
 #, c-format
 msgid "/encoding= line after word ignored in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� ñ��θ�� /encoding= �Ԥ�̵�뤷�ޤ���: %s"
 
-#: ../spell.c:6180
 #, c-format
 msgid "Duplicate /regions= line ignored in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� ��ʣ���� /regions= �Ԥ�̵�뤷�ޤ���: %s"
 
-#: ../spell.c:6185
 #, c-format
 msgid "Too many regions in %s line %d: %s"
 msgstr "%s �� %d ����, �ϰϻ��꤬¿�᤮�ޤ�: %s"
 
-#: ../spell.c:6198
 #, c-format
 msgid "/ line ignored in %s line %d: %s"
 msgstr "%s �� %d ���ܤ� ��ʣ���� / �Ԥ�̵�뤷�ޤ���: %s"
 
-#: ../spell.c:6224
 #, c-format
 msgid "Invalid region nr in %s line %d: %s"
 msgstr "%s �� %d ���� ̵���� nr �ΰ�Ǥ�: %s"
 
-#: ../spell.c:6230
 #, c-format
 msgid "Unrecognized flags in %s line %d: %s"
 msgstr "%s �� %d ���� ǧ����ǽ�ʥե饰�Ǥ�: %s"
 
-#: ../spell.c:6257
 #, c-format
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "��ASCIIʸ����ޤ� %d �Ĥ�ñ���̵�뤷�ޤ���"
 
-#: ../spell.c:6656
+msgid "E845: Insufficient memory, word list will be incomplete"
+msgstr "E845: ���꤬­��ʤ��Τǡ�ñ��ꥹ�Ȥ��Դ����Ǥ�"
+
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
 msgstr "�Ρ��� %d ��(�� %d ����) �򰵽̤��ޤ���; �Ĥ� %d (%d%%)"
 
-#: ../spell.c:7340
 msgid "Reading back spell file..."
 msgstr "���ڥ�ե��������ɹ���"
 
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
-#: ../spell.c:7357
+#.
+#. * Go through the trie of good words, soundfold each word and add it to
+#. * the soundfold trie.
+#.
 msgid "Performing soundfolding..."
 msgstr "���������ߤ�¹���..."
 
-#: ../spell.c:7368
 #, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "���������߸����ñ���: %<PRId64>"
+msgid "Number of words after soundfolding: %ld"
+msgstr "���������߸����ñ���: %ld"
 
-#: ../spell.c:7476
 #, c-format
 msgid "Total number of words: %d"
 msgstr "���: %d"
 
-#: ../spell.c:7655
 #, c-format
 msgid "Writing suggestion file %s ..."
 msgstr "��������ե����� \"%s\" ��������..."
 
-#: ../spell.c:7707 ../spell.c:7927
 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
 msgstr "������������: %d ����"
 
-#: ../spell.c:7820
 msgid "E751: Output file name must not have region name"
 msgstr "E751: ���ϥե�����̾�ˤ��ϰ�̾��ޤ���ޤ���"
 
-#: ../spell.c:7822
 msgid "E754: Only up to 8 regions supported"
 msgstr "E754: �ϰϤ� 8 �ĤޤǤ������ݡ��Ȥ���Ƥ��ޤ���"
 
-#: ../spell.c:7846
 #, c-format
 msgid "E755: Invalid region in %s"
 msgstr "E755: ̵�����ϰϤǤ�: %s"
 
-#: ../spell.c:7907
 msgid "Warning: both compounding and NOBREAK specified"
 msgstr "�ٹ�: ʣ��ե饰�� NOBREAK ��ξ���Ȥ���ꤵ��ޤ���"
 
-#: ../spell.c:7920
 #, c-format
 msgid "Writing spell file %s ..."
 msgstr "���ڥ�ե����� %s ��������..."
 
-#: ../spell.c:7925
 msgid "Done!"
 msgstr "�¹Ԥ��ޤ���!"
 
-#: ../spell.c:8034
 #, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: 'spellfile' �ˤ� %<PRId64> �ĤΥ���ȥ�Ϥ���ޤ���"
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' �ˤ� %ld �ĤΥ���ȥ�Ϥ���ޤ���"
 
-#: ../spell.c:8074
 #, c-format
 msgid "Word '%.*s' removed from %s"
 msgstr "ñ�� '%.*s' �� %s ����������ޤ���"
 
-#: ../spell.c:8117
 #, c-format
 msgid "Word '%.*s' added to %s"
 msgstr "ñ�� '%.*s' �� %s ���ɲä���ޤ���"
 
-#: ../spell.c:8381
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: ñ���ʸ�������ڥ�ե�����Ȱۤʤ�ޤ�"
 
-#: ../spell.c:8684
-msgid "Sorry, no suggestions"
-msgstr "��ǰ�Ǥ���, ��������Ϥ���ޤ���"
-
-#: ../spell.c:8687
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "��ǰ�Ǥ���, ��������� %<PRId64> �Ĥ�������ޤ���"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#: ../spell.c:8704
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "\"%.*s\" �򼡤��Ѵ�:"
-
-#: ../spell.c:8737
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-#: ../spell.c:8882
-msgid "E752: No previous spell replacement"
-msgstr "E752: ���ڥ��ִ����ޤ��¹Ԥ���Ƥ��ޤ���"
-
-#: ../spell.c:8925
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: ���Ĥ���ޤ���: %s"
-
-#: ../spell.c:9276
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: .sug �ե�����ǤϤʤ��褦�Ǥ�: %s"
-
-#: ../spell.c:9282
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: �Ť� .sug �ե�����ʤΤ�, ���åץǡ��Ȥ��Ƥ�������: %s"
-
-#: ../spell.c:9286
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: ��꿷�����С������� Vim �Ѥ� .sug �ե�����Ǥ�: %s"
-
-#: ../spell.c:9295
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: .sug �ե����뤬 .spl �ե�����Ȱ��פ��ޤ���: %s"
-
-#: ../spell.c:9305
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: .sug �ե�������ɹ���˥��顼��ȯ�����ޤ���: %s"
-
 #. This should have been checked when generating the .spl
-#. file.
-#: ../spell.c:11575
+#. * file.
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: MAP ����ȥ�˽�ʣʸ����¸�ߤ��ޤ�"
 
-#: ../syntax.c:266
 msgid "No Syntax items defined for this buffer"
 msgstr "���ΥХåե���������줿��ʸ���ǤϤ���ޤ���"
 
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: �����ʰ����Ǥ�: %s"
@@ -5724,28 +5370,22 @@ msgstr "E390: 
 msgid "syntax iskeyword "
 msgstr "���󥿥å����� iskeyword "
 
-#: ../syntax.c:3299
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: ���Τ褦�ʹ�ʸ���饹���Ϥ���ޤ���: %s"
 
-#: ../syntax.c:3433
 msgid "syncing on C-style comments"
 msgstr "C�����������Ȥ���Ʊ����"
 
-#: ../syntax.c:3439
 msgid "no syncing"
 msgstr "��Ʊ��"
 
-#: ../syntax.c:3441
 msgid "syncing starts "
 msgstr "Ʊ������ "
 
-#: ../syntax.c:3443 ../syntax.c:3506
 msgid " lines before top line"
 msgstr " ����(�ȥå׹Ԥ���)"
 
-#: ../syntax.c:3448
 msgid ""
 "\n"
 "--- Syntax sync items ---"
@@ -5753,7 +5393,6 @@ msgstr ""
 "\n"
 "--- ��ʸƱ������ ---"
 
-#: ../syntax.c:3452
 msgid ""
 "\n"
 "syncing on items"
@@ -5761,7 +5400,6 @@ msgstr ""
 "\n"
 "���Ǿ��Ʊ����"
 
-#: ../syntax.c:3457
 msgid ""
 "\n"
 "--- Syntax items ---"
@@ -5769,53 +5407,41 @@ msgstr ""
 "\n"
 "--- ��ʸ���� ---"
 
-#: ../syntax.c:3475
 #, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: ���Τ褦�ʹ�ʸ���饹���Ϥ���ޤ���: %s"
 
-#: ../syntax.c:3497
 msgid "minimal "
 msgstr "minimal "
 
-#: ../syntax.c:3503
 msgid "maximal "
 msgstr "maximal "
 
-#: ../syntax.c:3513
 msgid "; match "
 msgstr "; ���� "
 
-#: ../syntax.c:3515
 msgid " line breaks"
 msgstr " �Ĥβ���"
 
-#: ../syntax.c:4076
 msgid "E395: contains argument not accepted here"
 msgstr "E395: ���ξ��Ǥϰ���contains�ϵ��Ĥ���Ƥ��ޤ���"
 
-#: ../syntax.c:4096
 msgid "E844: invalid cchar value"
 msgstr "E844: ̵����cchar���ͤǤ�"
 
-#: ../syntax.c:4107
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: �����Ǥϥ��롼�פϵ��Ĥ���ޤ���"
 
-#: ../syntax.c:4126
 #, c-format
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: %s ���ϰ����Ǥ����Ĥ���ޤ���"
 
-#: ../syntax.c:4188
 msgid "E397: Filename required"
 msgstr "E397: �ե�����̾��ɬ�פǤ�"
 
-#: ../syntax.c:4221
 msgid "E847: Too many syntax includes"
 msgstr "E847: ��ʸ�μ�����(include)��¿�᤮�ޤ�"
 
-#: ../syntax.c:4303
 #, c-format
 msgid "E789: Missing ']': %s"
 msgstr "E789: ']' ������ޤ���: %s"
@@ -5824,221 +5450,173 @@ msgstr "E789: ']' 
 msgid "E890: trailing char after ']': %s]%s"
 msgstr "E890: ']' �θ����;ʬ��ʸ��������ޤ�: %s]%s"
 
-#: ../syntax.c:4531
 #, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: '=' ������ޤ���: %s"
 
-#: ../syntax.c:4666
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: ������­��ޤ���: ��ʸ�ϰ� %s"
 
-#: ../syntax.c:4870
 msgid "E848: Too many syntax clusters"
 msgstr "E848: ��ʸ���饹����¿�᤮�ޤ�"
 
-#: ../syntax.c:4954
 msgid "E400: No cluster specified"
 msgstr "E400: ���饹�������ꤵ��Ƥ��ޤ���"
 
-#. end delimiter not found
-#: ../syntax.c:4986
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: �ѥ�������ڤ꤬���Ĥ���ޤ���: %s"
 
-#: ../syntax.c:5049
 #, c-format
 msgid "E402: Garbage after pattern: %s"
 msgstr "E402: �ѥ�����Τ��Ȥ˥��ߤ�����ޤ�: %s"
 
-#: ../syntax.c:5120
 msgid "E403: syntax sync: line continuations pattern specified twice"
 msgstr "E403: ��ʸƱ��: Ϣ³�ԥѥ�����2�ٻ��ꤵ��ޤ���"
 
-#: ../syntax.c:5169
 #, c-format
 msgid "E404: Illegal arguments: %s"
 msgstr "E404: �����ʰ����Ǥ�: %s"
 
-#: ../syntax.c:5217
 #, c-format
 msgid "E405: Missing equal sign: %s"
 msgstr "E405: ���椬����ޤ���: %s"
 
-#: ../syntax.c:5222
 #, c-format
 msgid "E406: Empty argument: %s"
 msgstr "E406: �����: %s"
 
-#: ../syntax.c:5240
 #, c-format
 msgid "E407: %s not allowed here"
 msgstr "E407: %s �ϥ����Ǥϵ��Ĥ���Ƥ��ޤ���"
 
-#: ../syntax.c:5246
 #, c-format
 msgid "E408: %s must be first in contains list"
 msgstr "E408: %s �����ƥꥹ�Ȥ���Ƭ�Ǥʤ���Фʤ�ʤ�"
 
-#: ../syntax.c:5304
 #, c-format
 msgid "E409: Unknown group name: %s"
 msgstr "E409: ̤�ΤΥ��롼��̾: %s"
 
-#: ../syntax.c:5512
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: ̵���� :syntax �Υ��֥��ޥ��: %s"
 
-#: ../syntax.c:5854
 msgid ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
 msgstr ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
 
-#: ../syntax.c:6146
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: syncolor.vim �κƵ��ƤӽФ��򸡽Ф��ޤ���"
 
-#: ../syntax.c:6256
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: �ϥ��饤�ȥ��롼�פ����Ĥ���ޤ���: %s"
 
-#: ../syntax.c:6278
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
 msgstr "E412: ��������ʬ�ǤϤʤ�: \":highlight link %s\""
 
-#: ../syntax.c:6284
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
 msgstr "E413: ������¿�᤮�ޤ�: \":highlight link %s\""
 
-#: ../syntax.c:6302
 msgid "E414: group has settings, highlight link ignored"
 msgstr "E414: ���롼�פ����ꤵ��Ƥ���Τǥϥ��饤�ȥ�󥯤�̵�뤵��ޤ�"
 
-#: ../syntax.c:6367
 #, c-format
 msgid "E415: unexpected equal sign: %s"
 msgstr "E415: ͽ����������Ǥ�: %s"
 
-#: ../syntax.c:6395
 #, c-format
 msgid "E416: missing equal sign: %s"
 msgstr "E416: ���椬����ޤ���: %s"
 
-#: ../syntax.c:6418
 #, c-format
 msgid "E417: missing argument: %s"
 msgstr "E417: ����������ޤ���: %s"
 
-#: ../syntax.c:6446
 #, c-format
 msgid "E418: Illegal value: %s"
 msgstr "E418: �������ͤǤ�: %s"
 
-#: ../syntax.c:6496
 msgid "E419: FG color unknown"
 msgstr "E419: ̤�Τ����ʿ��Ǥ�"
 
-#: ../syntax.c:6504
 msgid "E420: BG color unknown"
 msgstr "E420: ̤�Τ��طʿ��Ǥ�"
 
-#: ../syntax.c:6564
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: ���顼̾���ֹ��ǧ���Ǥ��ޤ���: %s"
 
-#: ../syntax.c:6714
 #, c-format
 msgid "E422: terminal code too long: %s"
 msgstr "E422: ��ü�����ɤ�Ĺ�᤮�ޤ�: %s"
 
-#: ../syntax.c:6753
 #, c-format
 msgid "E423: Illegal argument: %s"
 msgstr "E423: �����ʰ����Ǥ�: %s"
 
-#: ../syntax.c:6925
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: ¿���ΰۤʤ�ϥ��饤��°�����Ȥ��᤮�Ƥ��ޤ�"
 
-#: ../syntax.c:7427
 msgid "E669: Unprintable character in group name"
 msgstr "E669: ���롼��̾�˰����Բ�ǽ��ʸ��������ޤ�"
 
-#: ../syntax.c:7434
 msgid "W18: Invalid character in group name"
 msgstr "W18: ���롼��̾��������ʸ��������ޤ�"
 
-#: ../syntax.c:7448
 msgid "E849: Too many highlight and syntax groups"
 msgstr "E849: �ϥ��饤�Ȥȹ�ʸ���롼�פ�¿�᤮�ޤ�"
 
-#: ../tag.c:104
 msgid "E555: at bottom of tag stack"
 msgstr "E555: ���������å��������Ǥ�"
 
-#: ../tag.c:105
 msgid "E556: at top of tag stack"
 msgstr "E556: ���������å�����Ƭ�Ǥ�"
 
-#: ../tag.c:380
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: �ǽ�γ���������Ķ������뤳�ȤϤǤ��ޤ���"
 
-#: ../tag.c:504
 #, c-format
 msgid "E426: tag not found: %s"
 msgstr "E426: ���������Ĥ���ޤ���: %s"
 
-#: ../tag.c:528
 msgid "  # pri kind tag"
 msgstr "  # pri kind tag"
 
-#: ../tag.c:531
 msgid "file\n"
 msgstr "�ե�����\n"
 
-#: ../tag.c:829
 msgid "E427: There is only one matching tag"
 msgstr "E427: ����������1�Ĥ�����������ޤ���"
 
-#: ../tag.c:831
 msgid "E428: Cannot go beyond last matching tag"
 msgstr "E428: �Ǹ�˳������륿����Ķ���ƿʤळ�ȤϤǤ��ޤ���"
 
-#: ../tag.c:850
 #, c-format
 msgid "File \"%s\" does not exist"
 msgstr "�ե����� \"%s\" ������ޤ���"
 
 #. Give an indication of the number of matching tags
-#: ../tag.c:859
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "���� %d (��%d%s)"
 
-#: ../tag.c:862
 msgid " or more"
 msgstr " ������ʾ�"
 
-#: ../tag.c:864
 msgid "  Using tag with different case!"
 msgstr "  ������ۤʤ�case�ǻ��Ѥ��ޤ�!"
 
-#: ../tag.c:909
 #, c-format
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: �ե����� \"%s\" ������ޤ���"
 
 #. Highlight title
-#: ../tag.c:960
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -6046,79 +5624,66 @@ msgstr ""
 "\n"
 "  # TO ����        FROM ��    in file/text"
 
-#: ../tag.c:1303
 #, c-format
 msgid "Searching tags file %s"
 msgstr "�����ե����� %s �򸡺���"
 
-#: ../tag.c:1545
+#, c-format
+msgid "E430: Tag file path truncated for %s\n"
+msgstr "E430: �����ե�����Υѥ��� %s ���ڤ�ΤƤ��ޤ���\n"
+
 msgid "Ignoring long line in tags file"
 msgstr "�����ե��������Ĺ���Ԥ�̵�뤷�ޤ�"
 
-#: ../tag.c:1915
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: �����ե����� \"%s\" �Υե����ޥåȤ˥��顼������ޤ�"
 
-#: ../tag.c:1917
 #, c-format
-msgid "Before byte %<PRId64>"
-msgstr "ľ���� %<PRId64> �Х���"
+msgid "Before byte %ld"
+msgstr "ľ���� %ld �Х���"
 
-#: ../tag.c:1929
 #, c-format
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: �����ե����뤬�����Ȥ���Ƥ��ޤ���: %s"
 
 #. never opened any tags file
-#: ../tag.c:1960
 msgid "E433: No tags file"
 msgstr "E433: �����ե����뤬����ޤ���"
 
-#: ../tag.c:2536
 msgid "E434: Can't find tag pattern"
 msgstr "E434: �����ѥ�����򸫤Ĥ����ޤ���"
 
-#: ../tag.c:2544
 msgid "E435: Couldn't find tag, just guessing!"
 msgstr "E435: �����򸫤Ĥ����ʤ��Τ�ñ�˿�¬���ޤ�!"
 
-#: ../tag.c:2797
 #, c-format
 msgid "Duplicate field name: %s"
 msgstr "��ʣ�����ե������̾: %s"
 
-#: ../term.c:1442
 msgid "' not known. Available builtin terminals are:"
 msgstr "' ��̤�ΤǤ�. ���Ԥ��Ȥ߹���ü���ϼ��ΤȤ���Ǥ�:"
 
-#: ../term.c:1463
 msgid "defaulting to '"
 msgstr "��ά�ͤ򼡤Τ褦�����ꤷ�ޤ� '"
 
-#: ../term.c:1731
 msgid "E557: Cannot open termcap file"
 msgstr "E557: termcap�ե�����򳫤��ޤ���"
 
-#: ../term.c:1735
 msgid "E558: Terminal entry not found in terminfo"
 msgstr "E558: terminfo��ü������ȥ�򸫤Ĥ����ޤ���"
 
-#: ../term.c:1737
 msgid "E559: Terminal entry not found in termcap"
 msgstr "E559: termcap��ü������ȥ�򸫤Ĥ����ޤ���"
 
-#: ../term.c:1878
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
 msgstr "E436: termcap�� \"%s\" �Υ���ȥ꤬����ޤ���"
 
-#: ../term.c:2249
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: ü���� \"cm\" ��ǽ��ɬ�פǤ�"
 
 #. Highlight title
-#: ../term.c:4376
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -6126,168 +5691,347 @@ msgstr ""
 "\n"
 "--- ü������ ---"
 
-#: ../ui.c:481
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "$VIMRUNTIME/rgb.txt�򳫤��ޤ���"
+
+msgid "new shell started\n"
+msgstr "�������������ư���ޤ�\n"
+
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: ���Ϥ��ɹ�����Υ��顼�ˤ�꽪λ���ޤ�...\n"
 
+msgid "Used CUT_BUFFER0 instead of empty selection"
+msgstr "���������ΰ�Τ�����CUT_BUFFER0�����Ѥ���ޤ���"
+
 #. This happens when the FileChangedRO autocommand changes the
 #. * file in a way it becomes shorter.
-#: ../undo.c:379
 msgid "E881: Line count changed unexpectedly"
 msgstr "E881: ͽ�������ԥ�����Ȥ��Ѥ��ޤ���"
 
-#: ../undo.c:627
+#. must display the prompt
+msgid "No undo possible; continue anyway"
+msgstr "��ǽ�ʥ���ɥ��Ϥ���ޤ���: �Ȥꤢ����³���ޤ�"
+
 #, c-format
 msgid "E828: Cannot open undo file for writing: %s"
 msgstr "E828: ������Ѥ˥���ɥ��ե�����򳫤��ޤ���: %s"
 
-#: ../undo.c:717
 #, c-format
 msgid "E825: Corrupted undo file (%s): %s"
 msgstr "E825: ����ɥ��ե����뤬����Ƥ��ޤ� (%s): %s"
 
-#: ../undo.c:1039
 msgid "Cannot write undo file in any directory in 'undodir'"
 msgstr "'undodir'�Υǥ��쥯�ȥ�˥���ɥ��ե������񤭹���ޤ���"
 
-#: ../undo.c:1074
 #, c-format
 msgid "Will not overwrite with undo file, cannot read: %s"
 msgstr "����ɥ��ե�����Ȥ����ɤ߹���ʤ��ΤǾ�񤭤��ޤ���: %s"
 
-#: ../undo.c:1092
 #, c-format
 msgid "Will not overwrite, this is not an undo file: %s"
 msgstr "����ɥ��ե�����ǤϤʤ��ΤǾ�񤭤��ޤ���: %s"
 
-#: ../undo.c:1108
 msgid "Skipping undo file write, nothing to undo"
 msgstr "�оݤ��ʤ��Τǥ���ɥ��ե�����ν񤭹��ߤ򥹥��åפ��ޤ�"
 
-#: ../undo.c:1121
 #, c-format
 msgid "Writing undo file: %s"
 msgstr "����ɥ��ե�����񤭹�����: %s"
 
-#: ../undo.c:1213
 #, c-format
 msgid "E829: write error in undo file: %s"
 msgstr "E829: ����ɥ��ե�����ν񤭹��ߥ��顼�Ǥ�: %s"
 
-#: ../undo.c:1280
 #, c-format
 msgid "Not reading undo file, owner differs: %s"
 msgstr "�����ʡ����ۤʤ�Τǥ���ɥ��ե�������ɤ߹��ߤޤ���: %s"
 
-#: ../undo.c:1292
 #, c-format
 msgid "Reading undo file: %s"
 msgstr "����ɥ��ե������ɹ���: %s"
 
-#: ../undo.c:1299
 #, c-format
 msgid "E822: Cannot open undo file for reading: %s"
 msgstr "E822: ����ɥ��ե�������ɹ��ѤȤ��Ƴ����ޤ���: %s"
 
-#: ../undo.c:1308
 #, c-format
 msgid "E823: Not an undo file: %s"
 msgstr "E823: ����ɥ��ե�����ǤϤ���ޤ���: %s"
 
-#: ../undo.c:1313
+#, c-format
+msgid "E832: Non-encrypted file has encrypted undo file: %s"
+msgstr "E832: ��Ź沽�ե����뤬�Ź沽���줿����ɥ��ե������ȤäƤޤ�: %s"
+
+#, c-format
+msgid "E826: Undo file decryption failed: %s"
+msgstr "E826: �Ź沽���줿����ɥ��ե�����β��ɤ˼��Ԥ��ޤ���: %s"
+
+#, c-format
+msgid "E827: Undo file is encrypted: %s"
+msgstr "E827: ����ɥ��ե����뤬�Ź沽����Ƥ��ޤ�: %s"
+
 #, c-format
 msgid "E824: Incompatible undo file: %s"
 msgstr "E824: �ߴ�����̵������ɥ��ե�����Ǥ�: %s"
 
-#: ../undo.c:1328
 msgid "File contents changed, cannot use undo info"
 msgstr "�ե���������Ƥ��Ѥ�äƤ��뤿�ᡢ����ɥ���������ѤǤ��ޤ���"
 
-#: ../undo.c:1497
 #, c-format
 msgid "Finished reading undo file %s"
 msgstr "����ɥ��ե����� %s �μ����λ"
 
-#: ../undo.c:1586 ../undo.c:1812
 msgid "Already at oldest change"
 msgstr "���˰��ָŤ��ѹ��Ǥ�"
 
-#: ../undo.c:1597 ../undo.c:1814
 msgid "Already at newest change"
 msgstr "���˰��ֿ������ѹ��Ǥ�"
 
-#: ../undo.c:1806
 #, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "E830: ����ɥ��ֹ� %<PRId64> �ϸ��Ĥ���ޤ���"
+msgid "E830: Undo number %ld not found"
+msgstr "E830: ����ɥ��ֹ� %ld �ϸ��Ĥ���ޤ���"
 
-#: ../undo.c:1979
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: ���ֹ椬�ְ�äƤ��ޤ�"
 
-#: ../undo.c:2183
 msgid "more line"
 msgstr "�� �ɲä��ޤ���"
 
-#: ../undo.c:2185
 msgid "more lines"
 msgstr "�� �ɲä��ޤ���"
 
-#: ../undo.c:2187
 msgid "line less"
 msgstr "�� ������ޤ���"
 
-#: ../undo.c:2189
 msgid "fewer lines"
 msgstr "�� ������ޤ���"
 
-#: ../undo.c:2193
 msgid "change"
 msgstr "�ս��ѹ����ޤ���"
 
-#: ../undo.c:2195
 msgid "changes"
 msgstr "�ս��ѹ����ޤ���"
 
-#: ../undo.c:2225
 #, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
+msgid "%ld %s; %s #%ld  %s"
+msgstr "%ld %s; %s #%ld  %s"
 
-#: ../undo.c:2228
 msgid "before"
 msgstr "����"
 
-#: ../undo.c:2228
 msgid "after"
 msgstr "����"
 
-#: ../undo.c:2325
 msgid "Nothing to undo"
 msgstr "����ɥ��оݤ�����ޤ���"
 
-#: ../undo.c:2330
 msgid "number changes  when               saved"
 msgstr "����   �ѹ���   �ѹ�����           ��¸��"
 
-#: ../undo.c:2360
 #, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "%<PRId64> �÷вᤷ�Ƥ��ޤ�"
+msgid "%ld seconds ago"
+msgstr "%ld �÷вᤷ�Ƥ��ޤ�"
 
-#: ../undo.c:2372
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undo ��ľ��� undojoin �ϤǤ��ޤ���"
 
-#: ../undo.c:2466
 msgid "E439: undo list corrupt"
 msgstr "E439: ����ɥ��ꥹ�Ȥ�����Ƥ��ޤ�"
 
-#: ../undo.c:2495
 msgid "E440: undo line missing"
 msgstr "E440: ����ɥ��Ԥ�����ޤ���"
 
-#: ../version.c:600
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: �ؿ� %s ������ѤǤ�, ���������ˤ� ! ���ɲä��Ƥ�������"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: ������˥���ȥ꤬����¸�ߤ��ޤ�"
+
+msgid "E718: Funcref required"
+msgstr "E718: �ؿ����ȷ����׵ᤵ��ޤ�"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: ̤�Τδؿ��Ǥ�: %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: �����ʰ����Ǥ�: %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: ����̾����ʣ���Ƥ��ޤ�: %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: �ؿ��ΰ�����¿�᤮�ޤ�: %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: �ؿ���̵���ʰ����Ǥ�: %s"
+
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr "E132: �ؿ��ƽФ�����ҿ��� 'maxfuncdepth' ��Ķ���ޤ���"
+
+#, c-format
+msgid "calling %s"
+msgstr "%s ��¹���Ǥ�"
+
+#, c-format
+msgid "%s aborted"
+msgstr "%s �����Ǥ���ޤ���"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s �� #%ld ���֤��ޤ���"
+
+#, c-format
+msgid "%s returning %s"
+msgstr "%s �� %s ���֤��ޤ���"
+
+msgid "E699: Too many arguments"
+msgstr "E699: ������¿�᤮�ޤ�"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: ̤�Τδؿ��Ǥ�: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: �ؿ��Ϻ������ޤ���: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: �ؿ��ΰ�����­��ޤ���: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: ������ץȰʳ���<SID>���Ȥ��ޤ���: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: �����Ѵؿ����ƤФ�ޤ��������񤬤���ޤ���: %s"
+
+msgid "E129: Function name required"
+msgstr "E129: �ؿ�̾���׵ᤵ��ޤ�"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr "E128: �ؿ�̾����ʸ���� \"s:\" �ǻϤޤ�ʤ���Фʤ�ޤ���: %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr "E884: �ؿ�̾�ˤϥ�����ϴޤ���ޤ���: %s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: ̤����δؿ��Ǥ�: %s"
+
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: '(' ������ޤ���: %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: �����Ǥ� g: �ϻȤ��ޤ���"
+
+#, c-format
+msgid "E932: Closure function should not be at top level: %s"
+msgstr "E932: ���������㡼�ؿ��ϥȥåץ�٥�˵��ҤǤ��ޤ���: %s"
+
+msgid "E126: Missing :endfunction"
+msgstr "E126: :endfunction ������ޤ���"
+
+#, c-format
+msgid "E707: Function name conflicts with variable: %s"
+msgstr "E707: �ؿ�̾���ѿ�̾�Ⱦ��ͤ��ޤ�: %s"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr "E127: �ؿ� %s �������Ǥ��ޤ���: ������Ǥ�"
+
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: �ؿ�̾��������ץȤΥե�����̾�Ȱ��פ��ޤ���: %s"
+
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: �ؿ� %s �����Ǥ��ޤ���: ������Ǥ�"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: �ؿ����� :return ������ޤ���"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: ���å� '(' ������ޤ���: %s"
+
+#. Only MS VC 4.1 and earlier can do Win32s
+msgid ""
+"\n"
+"MS-Windows 16/32-bit GUI version"
+msgstr ""
+"\n"
+"MS-Windows 16/32 �ӥå� GUI ��"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit GUI version"
+msgstr ""
+"\n"
+"MS-Windows 64 �ӥå� GUI ��"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI version"
+msgstr ""
+"\n"
+"MS-Windows 32 �ӥå� GUI ��"
+
+msgid " with OLE support"
+msgstr " with OLE ���ݡ���"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit console version"
+msgstr ""
+"\n"
+"MS-Windows 64 �ӥå� ���󥽡��� ��"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit console version"
+msgstr ""
+"\n"
+"MS-Windows 32 �ӥå� ���󥽡��� ��"
+
+msgid ""
+"\n"
+"MacOS X (unix) version"
+msgstr ""
+"\n"
+"MacOS X (unix) ��"
+
+msgid ""
+"\n"
+"MacOS X version"
+msgstr ""
+"\n"
+"MacOS X ��"
+
+msgid ""
+"\n"
+"MacOS version"
+msgstr ""
+"\n"
+"MacOS ��"
+
+msgid ""
+"\n"
+"OpenVMS version"
+msgstr ""
+"\n"
+"OpenVMS ��"
+
 msgid ""
 "\n"
 "Included patches: "
@@ -6295,7 +6039,6 @@ msgstr ""
 "\n"
 "Ŭ�Ѻѥѥå�: "
 
-#: ../version.c:627
 msgid ""
 "\n"
 "Extra patches: "
@@ -6303,11 +6046,9 @@ msgstr ""
 "\n"
 "�ɲó�ĥ�ѥå�: "
 
-#: ../version.c:639 ../version.c:864
 msgid "Modified by "
 msgstr "Modified by "
 
-#: ../version.c:646
 msgid ""
 "\n"
 "Compiled "
@@ -6315,11 +6056,9 @@ msgstr ""
 "\n"
 "Compiled "
 
-#: ../version.c:649
 msgid "by "
 msgstr "by "
 
-#: ../version.c:660
 msgid ""
 "\n"
 "Huge version "
@@ -6327,1886 +6066,926 @@ msgstr ""
 "\n"
 "Huge �� "
 
-#: ../version.c:661
+msgid ""
+"\n"
+"Big version "
+msgstr ""
+"\n"
+"Big �� "
+
+msgid ""
+"\n"
+"Normal version "
+msgstr ""
+"\n"
+"�̾� �� "
+
+msgid ""
+"\n"
+"Small version "
+msgstr ""
+"\n"
+"Small �� "
+
+msgid ""
+"\n"
+"Tiny version "
+msgstr ""
+"\n"
+"Tiny �� "
+
 msgid "without GUI."
 msgstr "without GUI."
 
-#: ../version.c:662
+msgid "with GTK3 GUI."
+msgstr "with GTK3 GUI."
+
+msgid "with GTK2-GNOME GUI."
+msgstr "with GTK2-GNOME GUI."
+
+msgid "with GTK2 GUI."
+msgstr "with GTK2 GUI."
+
+msgid "with X11-Motif GUI."
+msgstr "with X11-Motif GUI."
+
+msgid "with X11-neXtaw GUI."
+msgstr "with X11-neXtaw GUI."
+
+msgid "with X11-Athena GUI."
+msgstr "with X11-Athena GUI."
+
+msgid "with Photon GUI."
+msgstr "with Photon GUI."
+
+msgid "with GUI."
+msgstr "with GUI."
+
+msgid "with Carbon GUI."
+msgstr "with Carbon GUI."
+
+msgid "with Cocoa GUI."
+msgstr "with Cocoa GUI."
+
+msgid "with (classic) GUI."
+msgstr "with (���饷�å�) GUI."
+
 msgid "  Features included (+) or not (-):\n"
 msgstr "  ��ǽ�ΰ��� ͭ��(+)/̵��(-)\n"
 
-#: ../version.c:667
 msgid "   system vimrc file: \""
 msgstr "      �����ƥ� vimrc: \""
 
-#: ../version.c:672
 msgid "     user vimrc file: \""
 msgstr "      �桼���� vimrc: \""
 
-#: ../version.c:677
 msgid " 2nd user vimrc file: \""
 msgstr "   ��2�桼���� vimrc: \""
 
-#: ../version.c:682
 msgid " 3rd user vimrc file: \""
 msgstr "   ��3�桼���� vimrc: \""
 
-#: ../version.c:687
 msgid "      user exrc file: \""
 msgstr "       �桼���� exrc: \""
 
-#: ../version.c:692
 msgid "  2nd user exrc file: \""
 msgstr "    ��2�桼���� exrc: \""
 
-#: ../version.c:699
+msgid "  system gvimrc file: \""
+msgstr "     �����ƥ� gvimrc: \""
+
+msgid "    user gvimrc file: \""
+msgstr "     �桼���� gvimrc: \""
+
+msgid "2nd user gvimrc file: \""
+msgstr "  ��2�桼���� gvimrc: \""
+
+msgid "3rd user gvimrc file: \""
+msgstr "  ��3�桼���� gvimrc: \""
+
+msgid "       defaults file: \""
+msgstr "  �ǥե���ȥե�����: \""
+
+msgid "    system menu file: \""
+msgstr "    �����ƥ��˥塼: \""
+
 msgid "  fall-back for $VIM: \""
 msgstr "       ������ $VIM: \""
 
-#: ../version.c:705
 msgid " f-b for $VIMRUNTIME: \""
 msgstr "������ $VIMRUNTIME: \""
 
-#: ../version.c:709
 msgid "Compilation: "
 msgstr "����ѥ���: "
 
-#: ../version.c:712
+msgid "Compiler: "
+msgstr "����ѥ���: "
+
 msgid "Linking: "
 msgstr "���: "
 
-#: ../version.c:717
 msgid "  DEBUG BUILD"
 msgstr "�ǥХå��ӥ��"
 
-#: ../version.c:767
 msgid "VIM - Vi IMproved"
 msgstr "VIM - Vi IMproved"
 
-#: ../version.c:769
 msgid "version "
 msgstr "version "
 
-#: ../version.c:770
 msgid "by Bram Moolenaar et al."
 msgstr "by Bram Moolenaar ¾."
 
-#: ../version.c:774
 msgid "Vim is open source and freely distributable"
 msgstr "Vim �ϥ����ץ󥽡����Ǥ��꼫ͳ�����۲�ǽ�Ǥ�"
 
-#: ../version.c:776
 msgid "Help poor children in Uganda!"
 msgstr "��������ηäޤ�ʤ��Ҷ������˱����!"
 
-#: ../version.c:777
 msgid "type  :help iccf<Enter>       for information "
 msgstr "�ܺ٤ʾ����           :help iccf<Enter>      "
 
-#: ../version.c:779
 msgid "type  :q<Enter>               to exit         "
 msgstr "��λ����ˤ�           :q<Enter>              "
 
-#: ../version.c:780
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "����饤��إ�פ�     :help<Enter> �� <F1>   "
 
-#: ../version.c:781
-msgid "type  :help version7<Enter>   for version info"
-msgstr "�����������       :help version7<Enter>  "
+msgid "type  :help version8<Enter>   for version info"
+msgstr "�����������       :help version8<Enter>  "
 
-#: ../version.c:784
 msgid "Running in Vi compatible mode"
 msgstr "Vi�ߴ��⡼�ɤ�ư����"
 
-#: ../version.c:785
 msgid "type  :set nocp<Enter>        for Vim defaults"
 msgstr "Vim�侩�ͤˤ���ˤ�    :set nocp<Enter>       "
 
-#: ../version.c:786
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "�ܺ٤ʾ����           :help cp-default<Enter>"
 
-#: ../version.c:827
+msgid "menu  Help->Orphans           for information    "
+msgstr "�ܺ٤ϥ�˥塼�� �إ��->�ɻ� �򻲾Ȥ��Ʋ�����   "
+
+msgid "Running modeless, typed text is inserted"
+msgstr "�⡼��̵�Ǽ¹���, �����פ���ʸ������������ޤ�"
+
+msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
+msgstr "��˥塼�� �Խ�->��������->����(�鿴��)�⡼������ "
+
+msgid "                              for two modes      "
+msgstr "                              �ǥ⡼��ͭ��       "
+
+msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
+msgstr "��˥塼�� �Խ�->��������->Vi�ߴ��⡼������      "
+
+msgid "                              for Vim defaults   "
+msgstr "                              ��Vim�Ȥ���ư��    "
+
 msgid "Sponsor Vim development!"
 msgstr "Vim�γ�ȯ����礷�Ƥ�������!"
 
-#: ../version.c:828
 msgid "Become a registered Vim user!"
 msgstr "Vim����Ͽ�桼�����ˤʤäƤ�������!"
 
-#: ../version.c:831
 msgid "type  :help sponsor<Enter>    for information "
 msgstr "�ܺ٤ʾ����           :help sponsor<Enter>   "
 
-#: ../version.c:832
 msgid "type  :help register<Enter>   for information "
 msgstr "�ܺ٤ʾ����           :help register<Enter>  "
 
-#: ../version.c:834
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "�ܺ٤ϥ�˥塼�� �إ��->���ݥ󥵡�/��Ͽ �򻲾Ȥ��Ʋ�����"
 
-#: ../window.c:119
+msgid "WARNING: Windows 95/98/ME detected"
+msgstr "�ٹ�: Windows 95/98/ME �򸡽Ф��ޤ���"
+
+msgid "type  :help windows95<Enter>  for info on this"
+msgstr "�ܺ٤ʾ����            :help windows95<Enter>"
+
 msgid "Already only one window"
 msgstr "���˥�����ɥ���1�Ĥ�������ޤ���"
 
-#: ../window.c:224
 msgid "E441: There is no preview window"
 msgstr "E441: �ץ�ӥ塼������ɥ�������ޤ���"
 
-#: ../window.c:559
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: ����ȱ�����Ʊ����ʬ�䤹�뤳�ȤϤǤ��ޤ���"
 
-#: ../window.c:1228
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: ¾�Υ�����ɥ���ʬ�䤵��Ƥ�����ˤϽ��Ǥ��ޤ���"
 
-#: ../window.c:1803
 msgid "E444: Cannot close last window"
 msgstr "E444: �Ǹ�Υ�����ɥ����Ĥ��뤳�ȤϤǤ��ޤ���"
 
-#: ../window.c:1810
 msgid "E813: Cannot close autocmd window"
 msgstr "E813: autocmd������ɥ����Ĥ����ޤ���"
 
-#: ../window.c:1814
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr "E814: autocmd������ɥ������Ĥ�ʤ����ᡢ������ɥ����Ĥ����ޤ���"
 
-#: ../window.c:2717
 msgid "E445: Other window contains changes"
 msgstr "E445: ¾�Υ�����ɥ��ˤ��ѹ�������ޤ�"
 
-#: ../window.c:4805
 msgid "E446: No file name under cursor"
 msgstr "E446: ��������β��˥ե�����̾������ޤ���"
 
+#, c-format
+msgid "E447: Can't find file \"%s\" in path"
+msgstr "E447: path�ˤ� \"%s\" �Ȥ����ե����뤬����ޤ���"
+
+#, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: ̵���� ID: %ld (1 �ʾ�Ǥʤ���Фʤ�ޤ���)"
+
+#, c-format
+msgid "E801: ID already taken: %ld"
+msgstr "E801: ID �Ϥ��Ǥ�������Ǥ�: %ld"
+
 msgid "List or number required"
 msgstr "�ꥹ�Ȥ����ͤ�ɬ�פǤ�"
 
-#~ msgid "E831: bf_key_init() called with empty password"
-#~ msgstr "E831: bf_key_init() �����ѥ���ɤǸƤӽФ���ޤ���"
+#, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: ̵���� ID: %ld (1 �ʾ�Ǥʤ���Фʤ�ޤ���)"
 
-#~ msgid "E820: sizeof(uint32_t) != 4"
-#~ msgstr "E820: sizeof(uint32_t) != 4"
+#, c-format
+msgid "E803: ID not found: %ld"
+msgstr "E803: ID �Ϥ���ޤ���: %ld"
 
-#~ msgid "E817: Blowfish big/little endian use wrong"
-#~ msgstr "E817: Blowfish�Ź�Υӥå�/��ȥ륨��ǥ����󤬴ְ�äƤ��ޤ�"
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: �饤�֥�� %s ������ɤǤ��ޤ���Ǥ���"
 
-#~ msgid "E818: sha256 test failed"
-#~ msgstr "E818: sha256�Υƥ��Ȥ˼��Ԥ��ޤ���"
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"���Υ��ޥ�ɤ�̵���Ǥ�, �����ʤ���: Perl�饤�֥�������ɤǤ��ޤ���Ǥ���."
 
-#~ msgid "E819: Blowfish test failed"
-#~ msgstr "E819: Blowfish�Ź�Υƥ��Ȥ˼��Ԥ��ޤ���"
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: ����ɥܥå����Ǥ� Safe �⥸�塼�����Ѥ��ʤ�Perl������ץȤ϶ؤ����"
+"�Ƥ��ޤ�"
 
-#~ msgid "Patch file"
-#~ msgstr "�ѥå��ե�����"
+msgid "Edit with &multiple Vims"
+msgstr "ʣ����Vim���Խ����� (&M)"
 
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "����(&O)\n"
-#~ "����󥻥�(&C)"
+msgid "Edit with single &Vim"
+msgstr "1�Ĥ�Vim���Խ����� (&V)"
 
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: Vim �����Фؤ���³������ޤ���"
+msgid "Diff with Vim"
+msgstr "Vim�Ǻ�ʬ��ɽ������"
 
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: %s �����뤳�Ȥ��Ǥ��ޤ���"
+msgid "Edit with &Vim"
+msgstr "Vim���Խ����� (&V)"
 
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: �����Фα���������ޤ���"
+#. Now concatenate
+msgid "Edit with existing Vim - "
+msgstr "��ư�Ѥ�Vim���Խ����� - "
 
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: ���饤����Ȥ����뤳�Ȥ��Ǥ��ޤ���"
+msgid "Edits the selected file(s) with Vim"
+msgstr "���򤷤��ե������Vim���Խ�����"
 
-#~ msgid "Save As"
-#~ msgstr "��̾����¸"
+msgid "Error creating process: Check if gvim is in your path!"
+msgstr "�ץ������κ����˼���: gvim���Ķ��ѿ�PATH��ˤ��뤫��ǧ���Ƥ�������!"
 
-#~ msgid "Edit File"
-#~ msgstr "�ե�������Խ�"
+msgid "gvimext.dll error"
+msgstr "gvimext.dll ���顼"
 
-# Added at 27-Jan-2004.
-#~ msgid " (NOT FOUND)"
-#~ msgstr "  (���Ĥ���ޤ���)"
+msgid "Path length too long!"
+msgstr "�ѥ���Ĺ�᤮�ޤ�!"
 
-#~ msgid "Source Vim script"
-#~ msgstr "Vim������ץȤμ����"
+msgid "--No lines in buffer--"
+msgstr "--�Хåե��˹Ԥ�����ޤ���--"
 
-#~ msgid "unknown"
-#~ msgstr "����"
+#.
+#. * The error messages that can be shared are included here.
+#. * Excluded are errors that are only used once and debugging messages.
+#.
+msgid "E470: Command aborted"
+msgstr "E470: ���ޥ�ɤ����Ǥ���ޤ���"
 
-#~ msgid "Edit File in new window"
-#~ msgstr "������������ɥ��ǥե�������Խ����ޤ�"
+msgid "E471: Argument required"
+msgstr "E471: ������ɬ�פǤ�"
 
-#~ msgid "Append File"
-#~ msgstr "�ɲåե�����"
+msgid "E10: \\ should be followed by /, ? or &"
+msgstr "E10: \\ �θ�� / �� ? �� & �Ǥʤ���Фʤ�ޤ���"
 
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "������ɥ�����: X %d, Y %d"
+msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgstr "E11: ���ޥ�ɥ饤��Ǥ�̵���Ǥ�; <CR>�Ǽ¹�, CTRL-C�Ǥ���"
 
-#~ msgid "Save Redirection"
-#~ msgstr "������쥯�Ȥ���¸���ޤ�"
+msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgstr ""
+"E12: ���ߤΥǥ��쥯�ȥ�䥿�������Ǥ�exrc/vimrc�Υ��ޥ�ɤϵ��Ĥ���ޤ���"
 
-#~ msgid "Save View"
-#~ msgstr "�ӥ塼����¸���ޤ�"
+msgid "E171: Missing :endif"
+msgstr "E171: :endif ������ޤ���"
 
-#~ msgid "Save Session"
-#~ msgstr "���å����������¸���ޤ�"
+msgid "E600: Missing :endtry"
+msgstr "E600: :endtry ������ޤ���"
 
-#~ msgid "Save Setup"
-#~ msgstr "�������¸���ޤ�"
+msgid "E170: Missing :endwhile"
+msgstr "E170: :endwhile ������ޤ���"
 
-#~ msgid "E809: #< is not available without the +eval feature"
-#~ msgstr "E809: #< �� +eval ��ǽ��̵�������ѤǤ��ޤ���"
+msgid "E170: Missing :endfor"
+msgstr "E170: :endfor ������ޤ���"
 
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: ���ΥС������˹���Ϥ���ޤ���"
+msgid "E588: :endwhile without :while"
+msgstr "E588: :while �Τʤ� :endwhile ������ޤ�"
 
-#~ msgid "is a device (disabled with 'opendevice' option)"
-#~ msgstr " �ϥǥХ����Ǥ� ('opendevice' ���ץ����Dz���Ǥ��ޤ�)"
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor �Τʤ� :for ������ޤ�"
 
-#~ msgid "Reading from stdin..."
-#~ msgstr "ɸ�����Ϥ����ɹ�����..."
+msgid "E13: File exists (add ! to override)"
+msgstr "E13: �ե����뤬¸�ߤ��ޤ� (! ���ɲäǾ��)"
 
-#~ msgid "[blowfish]"
-#~ msgstr "[blowfish�Ź沽]"
+msgid "E472: Command failed"
+msgstr "E472: ���ޥ�ɤ����Ԥ��ޤ���"
 
-#~ msgid "[crypted]"
-#~ msgstr "[�Ź沽]"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: ̤�ΤΥե���ȥ��å�: %s"
 
-#~ msgid "E821: File is encrypted with unknown method"
-#~ msgstr "E821: �ե����뤬̤�Τ���ˡ�ǰŹ沽����Ƥ��ޤ�"
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: ̤�ΤΥե����: %s"
 
-# Added at 19-Jan-2004.
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeans��̤�ѹ��ΥХåե����񤹤뤳�Ȥϵ��Ĥ��Ƥ��ޤ���"
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: �ե���� \"%s\" �ϸ������ǤϤ���ޤ���"
 
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "NetBeans�Хåե��ΰ�����񤭽Ф����ȤϤǤ��ޤ���"
+msgid "E473: Internal error"
+msgstr "E473: �������顼�Ǥ�"
 
-#~ msgid "writing to device disabled with 'opendevice' option"
-#~ msgstr "'opendevice' ���ץ����ˤ��ǥХ����ؤν񤭹��ߤϤǤ��ޤ���"
+msgid "Interrupted"
+msgstr "����ޤ�ޤ���"
 
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: �꥽�����ե������������뤫�⤷��ޤ��� (! ���ɲäǶ���)"
+msgid "E14: Invalid address"
+msgstr "E14: ̵���ʥ��ɥ쥹�Ǥ�"
 
-#~ msgid "E851: Failed to create a new process for the GUI"
-#~ msgstr "E851: GUI�ѤΥץ������ε�ư�˼��Ԥ��ޤ���"
+msgid "E474: Invalid argument"
+msgstr "E474: ̵���ʰ����Ǥ�"
 
-#~ msgid "E852: The child process failed to start the GUI"
-#~ msgstr "E852: �ҥץ�������GUI�ε�ư�˼��Ԥ��ޤ���"
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: ̵���ʰ����Ǥ�: %s"
 
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: GUI�򳫻ϤǤ��ޤ���"
+#, c-format
+msgid "E15: Invalid expression: %s"
+msgstr "E15: ̵���ʼ��Ǥ�: %s"
 
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: \"%s\"�����ɹ��ळ�Ȥ��Ǥ��ޤ���"
+msgid "E16: Invalid range"
+msgstr "E16: ̵�����ϰϤǤ�"
 
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr "E665: ͭ���ʥե���Ȥ����Ĥ���ʤ��Τ�, GUI�򳫻ϤǤ��ޤ���"
+msgid "E476: Invalid command"
+msgstr "E476: ̵���ʥ��ޥ�ɤǤ�"
 
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: 'guifontwide' ��̵���Ǥ�"
+#, c-format
+msgid "E17: \"%s\" is a directory"
+msgstr "E17: \"%s\" �ϥǥ��쥯�ȥ�Ǥ�"
 
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: 'imactivatekey' �����ꤵ�줿�ͤ�̵���Ǥ�"
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: \"%s\"() �Υ饤�֥��ƽФ˼��Ԥ��ޤ���"
 
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: %s �ο��������Ƥ��ޤ���"
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: �饤�֥��δؿ� %s ������ɤǤ��ޤ���Ǥ���"
 
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "��������ΰ��֤˥ޥå��Ϥ���ޤ���, ���򸡺����Ƥ��ޤ�"
+msgid "E19: Mark has invalid line number"
+msgstr "E19: �ޡ�����̵���ʹ��ֹ椬���ꤵ��Ƥ��ޤ���"
 
-#~ msgid "<cannot open> "
-#~ msgstr "<�����ޤ���> "
+msgid "E20: Mark not set"
+msgstr "E20: �ޡ��������ꤵ��Ƥ��ޤ���"
 
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: �ե���� %s ������Ǥ��ޤ���"
+msgid "E21: Cannot make changes, 'modifiable' is off"
+msgstr "E21: 'modifiable' �����դʤΤ�, �ѹ��Ǥ��ޤ���"
 
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr "E614: vim_SelFile: ���ߤΥǥ��쥯�ȥ�����ޤ���"
+msgid "E22: Scripts nested too deep"
+msgstr "E22: ������ץȤ�����Ҥ����᤮�ޤ�"
 
-#~ msgid "Pathname:"
-#~ msgstr "�ѥ�̾:"
+msgid "E23: No alternate file"
+msgstr "E23: ���ե�����Ϥ���ޤ���"
 
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: ���ߤΥǥ��쥯�ȥ������Ǥ��ޤ���"
+msgid "E24: No such abbreviation"
+msgstr "E24: ���Τ褦��û�����ϤϤ���ޤ���"
 
-#~ msgid "OK"
-#~ msgstr "OK"
+msgid "E477: No ! allowed"
+msgstr "E477: ! �ϵ��Ĥ���Ƥ��ޤ���"
 
-#~ msgid "Cancel"
-#~ msgstr "����󥻥�"
+msgid "E25: GUI cannot be used: Not enabled at compile time"
+msgstr "E25: GUI�ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�"
 
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr "����������С�: ����������Ǥ��ޤ���Ǥ���."
+msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
+msgstr "E26: �إ֥饤��ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
 
-#~ msgid "Vim dialog"
-#~ msgstr "Vim ����������"
+msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
+msgstr "E27: �ڥ륷����ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
 
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr "E232: ��å������ȥ�����Хå��Τ��� BalloonEval ������Ǥ��ޤ���"
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: ����ӥ���ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
 
-#~ msgid "Input _Methods"
-#~ msgstr "����ץåȥ᥽�å�"
+#, c-format
+msgid "E28: No such highlight group name: %s"
+msgstr "E28: ���Τ褦��̾�Υϥ��饤�ȥ��롼�פϤ���ޤ���: %s"
 
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "VIM - �������ִ�..."
+msgid "E29: No inserted text yet"
+msgstr "E29: �ޤ��ƥ����Ȥ���������Ƥ��ޤ���"
 
-#~ msgid "VIM - Search..."
-#~ msgstr "VIM - ����..."
+msgid "E30: No previous command line"
+msgstr "E30: �����˥��ޥ�ɹԤ�����ޤ���"
 
-#~ msgid "Find what:"
-#~ msgstr "����ʸ����:"
+msgid "E31: No such mapping"
+msgstr "E31: ���Τ褦�ʥޥåԥ󥰤Ϥ���ޤ���"
 
-#~ msgid "Replace with:"
-#~ msgstr "�ִ�ʸ����:"
+msgid "E479: No match"
+msgstr "E479: �����Ϥ���ޤ���"
 
-#~ msgid "Match whole word only"
-#~ msgstr "���Τ˳��������Τ���"
+#, c-format
+msgid "E480: No match: %s"
+msgstr "E480: �����Ϥ���ޤ���: %s"
 
-#~ msgid "Match case"
-#~ msgstr "��ʸ��/��ʸ������̤���"
+msgid "E32: No file name"
+msgstr "E32: �ե�����̾������ޤ���"
 
-#~ msgid "Direction"
-#~ msgstr "����"
+msgid "E33: No previous substitute regular expression"
+msgstr "E33: ����ɽ���ִ����ޤ��¹Ԥ���Ƥ��ޤ���"
 
-#~ msgid "Up"
-#~ msgstr "��"
+msgid "E34: No previous command"
+msgstr "E34: ���ޥ�ɤ��ޤ��¹Ԥ���Ƥ��ޤ���"
 
-#~ msgid "Down"
-#~ msgstr "��"
+msgid "E35: No previous regular expression"
+msgstr "E35: ����ɽ�����ޤ��¹Ԥ���Ƥ��ޤ���"
 
-#~ msgid "Find Next"
-#~ msgstr "���򸡺�"
+msgid "E481: No range allowed"
+msgstr "E481: �ϰϻ���ϵ��Ĥ���Ƥ��ޤ���"
 
-#~ msgid "Replace"
-#~ msgstr "�ִ�"
+msgid "E36: Not enough room"
+msgstr "E36: ������ɥ��˽�ʬ�ʹ⤵�⤷������������ޤ���"
 
-#~ msgid "Replace All"
-#~ msgstr "�����ִ�"
+#, c-format
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: %s �Ȥ���̾������Ͽ���줿�����С��Ϥ���ޤ���"
 
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "Vim: ���å����ޥ͡����㤫�� \"die\" �׵��������ޤ���\n"
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: �ե����� %s ������Ǥ��ޤ���"
 
-#~ msgid "Close"
-#~ msgstr "�Ĥ���"
+msgid "E483: Can't get temp file name"
+msgstr "E483: ����ե������̾��������Ǥ��ޤ���"
 
-#~ msgid "New tab"
-#~ msgstr "�������֥ڡ���"
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: �ե����� \"%s\" �򳫤��ޤ���"
 
-#~ msgid "Open Tab..."
-#~ msgstr "���֥ڡ����򳫤�..."
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: �ե����� %s ���ɹ���ޤ���"
 
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim: �ᥤ�󥦥���ɥ����԰դ��˲�����ޤ���\n"
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: �Ǹ���ѹ�����¸����Ƥ��ޤ��� (! ���ɲä��ѹ����˴�)"
 
-#~ msgid "&Filter"
-#~ msgstr "�ե��륿(&F)"
+msgid "E37: No write since last change"
+msgstr "E37: �Ǹ���ѹ�����¸����Ƥ��ޤ���"
 
-#~ msgid "&Cancel"
-#~ msgstr "����󥻥�(&C)"
+msgid "E38: Null argument"
+msgstr "E38: ���������Ǥ�"
 
-#~ msgid "Directories"
-#~ msgstr "�ǥ��쥯�ȥ�"
+msgid "E39: Number expected"
+msgstr "E39: ���ͤ��׵ᤵ��Ƥ��ޤ�"
 
-#~ msgid "Filter"
-#~ msgstr "�ե��륿"
+#, c-format
+msgid "E40: Can't open errorfile %s"
+msgstr "E40: ���顼�ե����� %s �򳫤��ޤ���"
 
-#~ msgid "&Help"
-#~ msgstr "�إ��(&H)"
+msgid "E233: cannot open display"
+msgstr "E233: �ǥ����ץ쥤�򳫤��ޤ���"
 
-#~ msgid "Files"
-#~ msgstr "�ե�����"
+msgid "E41: Out of memory!"
+msgstr "E41: ���꤬�Ԥ��̤Ƥޤ���!"
 
-#~ msgid "&OK"
-#~ msgstr "&OK"
+msgid "Pattern not found"
+msgstr "�ѥ�����ϸ��Ĥ���ޤ���Ǥ���"
 
-#~ msgid "Selection"
-#~ msgstr "����"
+#, c-format
+msgid "E486: Pattern not found: %s"
+msgstr "E486: �ѥ�����ϸ��Ĥ���ޤ���Ǥ���: %s"
 
-#~ msgid "Find &Next"
-#~ msgstr "���򸡺�(&N)"
+msgid "E487: Argument must be positive"
+msgstr "E487: �����������ͤǤʤ���Фʤ�ޤ���"
 
-#~ msgid "&Replace"
-#~ msgstr "�ִ�(&R)"
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: ���Υǥ��쥯�ȥ�����ޤ���"
 
-#~ msgid "Replace &All"
-#~ msgstr "�����ִ�(&A)"
+msgid "E42: No Errors"
+msgstr "E42: ���顼�Ϥ���ޤ���"
 
-#~ msgid "&Undo"
-#~ msgstr "����ɥ�(&U)"
+msgid "E776: No location list"
+msgstr "E776: �����������ꥹ�ȤϤ���ޤ���"
 
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: �����ȥ뤬 \"%s\" �Υ�����ɥ��ϸ��Ĥ���ޤ���"
+msgid "E43: Damaged match string"
+msgstr "E43: ����ʸ������»���Ƥ��ޤ�"
 
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: �����ϥ��ݡ��Ȥ���ޤ���: \"-%s\"; OLE�Ǥ���Ѥ��Ƥ�������."
+msgid "E44: Corrupted regexp program"
+msgstr "E44: ����������ɽ���ץ������Ǥ�"
 
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: MDI���ץ����Ǥϥ�����ɥ��򳫤��ޤ���"
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: 'readonly' ���ץ�������ꤵ��Ƥ��ޤ� (! ���ɲäǾ��)"
 
-#~ msgid "Close tab"
-#~ msgstr "���֥ڡ������Ĥ���"
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: �ɼ������ѿ� \"%s\" �ˤ��ͤ�����Ǥ��ޤ���"
 
-#~ msgid "Open tab..."
-#~ msgstr "���֥ڡ����򳫤�"
+#, c-format
+msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgstr "E794: ����ɥܥå����Ǥ��ѿ� \"%s\" ���ͤ�����Ǥ��ޤ���"
 
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "����ʸ���� ('\\' �򸡺�����ˤ� '\\\\')"
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: ���񷿤˶��Υ�����Ȥ����ȤϤǤ��ޤ���"
 
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "�������ִ� ('\\' �򸡺�����ˤ� '\\\\')"
+msgid "E715: Dictionary required"
+msgstr "E715: ���񷿤�ɬ�פǤ�"
 
-#~ msgid "Not Used"
-#~ msgstr "�Ȥ��ޤ���"
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: �ꥹ�ȤΥ���ǥå������ϰϳ��Ǥ�: %ld"
 
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "�ǥ��쥯�ȥ�\t*.nothing\n"
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: �ؿ��ΰ�����¿�᤮�ޤ�: %s"
 
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr "Vim E458: �����꤬�������ʤ��Τǥ���ȥ�������Ƥ��ޤ���"
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: ���񷿤˥�����¸�ߤ��ޤ���: %s"
 
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr "E250: �ʲ���ʸ�����åȤΥե���Ȥ�����ޤ��� %s:"
+msgid "E714: List required"
+msgstr "E714: �ꥹ�ȷ���ɬ�פǤ�"
 
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: �ե���ȥ��å�̾: %s"
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s �ΰ����ϥꥹ�ȷ��ޤ��ϼ��񷿤Ǥʤ���Фʤ�ޤ���"
 
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "�ե���� '%s' �ϸ������ǤϤ���ޤ���"
+msgid "E47: Error while reading errorfile"
+msgstr "E47: ���顼�ե�������ɹ���˥��顼��ȯ�����ޤ���"
 
-#~ msgid "E253: Fontset name: %s"
-#~ msgstr "E253: �ե���ȥ��å�̾: %s"
+msgid "E48: Not allowed in sandbox"
+msgstr "E48: ����ɥܥå����Ǥϵ�����ޤ���"
 
-#~ msgid "Font0: %s"
-#~ msgstr "�ե����0: %s"
+msgid "E523: Not allowed here"
+msgstr "E523: �����Ǥϵ��Ĥ���ޤ���"
 
-#~ msgid "Font1: %s"
-#~ msgstr "�ե����1: %s"
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: �����꡼��⡼�ɤ�����ˤ��б����Ƥ��ޤ���"
 
-#~ msgid "Font%<PRId64> width is not twice that of font0"
-#~ msgstr "�ե����%<PRId64> �������ե����0��2�ܤǤϤ���ޤ���"
+msgid "E49: Invalid scroll size"
+msgstr "E49: ̵���ʥ����������̤Ǥ�"
 
-#~ msgid "Font0 width: %<PRId64>"
-#~ msgstr "�ե����0����: %<PRId64>"
+msgid "E91: 'shell' option is empty"
+msgstr "E91: 'shell' ���ץ���󤬶��Ǥ�"
 
-#~ msgid "Font1 width: %<PRId64>"
-#~ msgstr "�ե����1����: %<PRId64>"
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: sign �Υǡ������ɹ���ޤ���Ǥ���"
 
-#~ msgid "Invalid font specification"
-#~ msgstr "̵���ʥե���Ȼ���Ǥ�"
+msgid "E72: Close error on swap file"
+msgstr "E72: ����åץե�����Υ������������顼�Ǥ�"
 
-#~ msgid "&Dismiss"
-#~ msgstr "�Ѳ�����(&D)"
+msgid "E73: tag stack empty"
+msgstr "E73: ���������å������Ǥ�"
 
-#~ msgid "no specific match"
-#~ msgstr "�ޥå������Τ�����ޤ���"
+msgid "E74: Command too complex"
+msgstr "E74: ���ޥ�ɤ�ʣ���᤮�ޤ�"
 
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Vim - �ե��������"
+msgid "E75: Name too long"
+msgstr "E75: ̾����Ĺ�᤮�ޤ�"
 
-#~ msgid "Name:"
-#~ msgstr "̾��:"
+msgid "E76: Too many ["
+msgstr "E76: [ ��¿�᤮�ޤ�"
 
-#~ msgid "Show size in Points"
-#~ msgstr "��������ݥ���Ȥ�ɽ������"
+msgid "E77: Too many file names"
+msgstr "E77: �ե�����̾��¿�᤮�ޤ�"
 
-#~ msgid "Encoding:"
-#~ msgstr "���󥳡���:"
+msgid "E488: Trailing characters"
+msgstr "E488: ;ʬ��ʸ��������ˤ���ޤ�"
 
-#~ msgid "Font:"
-#~ msgstr "�ե����:"
+msgid "E78: Unknown mark"
+msgstr "E78: ̤�ΤΥޡ���"
 
-#~ msgid "Style:"
-#~ msgstr "��������:"
+msgid "E79: Cannot expand wildcards"
+msgstr "E79: �磻��ɥ����ɤ�Ÿ���Ǥ��ޤ���"
 
-#~ msgid "Size:"
-#~ msgstr "������:"
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' �� 'winminheight' ��꾮�����Ǥ��ޤ���"
 
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: �ϥ󥰥륪���ȥޥȥ󥨥顼"
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' �� 'winminwidth' ��꾮�����Ǥ��ޤ���"
 
-#~ msgid "E563: stat error"
-#~ msgstr "E563: stat ���顼"
+msgid "E80: Error while writing"
+msgstr "E80: �������Υ��顼"
 
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: cscope�ǡ����١���: %s �򳫤����Ȥ��Ǥ��ޤ���"
+msgid "Zero count"
+msgstr "�����������"
 
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: cscope�ǡ����١����ξ��������Ǥ��ޤ���"
+msgid "E81: Using <SID> not in a script context"
+msgstr "E81: ������ץȰʳ���<SID>���Ȥ��ޤ���"
 
-#~ msgid "Lua library cannot be loaded."
-#~ msgstr "Lua�饤�֥�������ɤǤ��ޤ���."
+msgid "E449: Invalid expression received"
+msgstr "E449: ̵���ʼ���������ޤ���"
 
-#~ msgid "cannot save undo information"
-#~ msgstr "����ɥ�������¸�Ǥ��ޤ���"
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: �ΰ褬�ݸ��Ƥ���Τ�, �ѹ��Ǥ��ޤ���"
 
-#~ msgid ""
-#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
-#~ "be loaded."
-#~ msgstr ""
-#~ "E815: ���Υ��ޥ�ɤ�̵���Ǥ�. MzScheme �饤�֥�������ɤǤ��ޤ���."
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans ���ɹ����ѥե�������ѹ����뤳�Ȥ�����ޤ���"
 
-#~ msgid "invalid expression"
-#~ msgstr "̵���ʼ��Ǥ�"
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: �������顼�Ǥ�: %s"
 
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "���ϥ���ѥ������̵���ˤ���Ƥ��ޤ�"
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: �ѥ����� 'maxmempattern' �ʾ�Υ������Ѥ��ޤ�"
 
-#~ msgid "hidden option"
-#~ msgstr "�������ץ����"
+msgid "E749: empty buffer"
+msgstr "E749: �Хåե������Ǥ�"
 
-#~ msgid "unknown option"
-#~ msgstr "̤�ΤΥ��ץ����Ǥ�"
+#, c-format
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: �Хåե� %ld �Ϥ���ޤ���"
 
-#~ msgid "window index is out of range"
-#~ msgstr "�ϰϳ��Υ�����ɥ��ֹ�Ǥ�"
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: �����ѥ����󤫶��ڤ국�椬�����Ǥ�"
 
-#~ msgid "couldn't open buffer"
-#~ msgstr "�Хåե��򳫤��ޤ���"
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: Ʊ��̾���Υե����뤬¾�ΥХåե����ɹ��ޤ�Ƥ��ޤ�"
 
-#~ msgid "cannot delete line"
-#~ msgstr "�Ԥ�ä��ޤ���"
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: ���ץ���� '%s' �����ꤵ��Ƥ��ޤ���"
 
-#~ msgid "cannot replace line"
-#~ msgstr "�Ԥ��ִ��Ǥ��ޤ���"
+msgid "E850: Invalid register name"
+msgstr "E850: ̵���ʥ쥸����̾�Ǥ�"
 
-#~ msgid "cannot insert line"
-#~ msgstr "�Ԥ������Ǥ��ޤ���"
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: �ǥ��쥯�ȥ꤬ '%s' ����ˤ���ޤ���: \"%s\""
 
-#~ msgid "string cannot contain newlines"
-#~ msgstr "ʸ����ˤϲ���ʸ����ޤ���ޤ���"
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "��ޤǸ��������ΤDz������ޤ�"
 
-#~ msgid "error converting Scheme values to Vim"
-#~ msgstr "Scheme�ͤ�Vim�ؤ��Ѵ����顼"
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "���ޤǸ��������ΤǾ�����ޤ�"
 
-#~ msgid "Vim error: ~a"
-#~ msgstr "Vim ���顼: ~a"
+#, c-format
+msgid "Need encryption key for \"%s\""
+msgstr "�Ź業����ɬ�פǤ�: \"%s\""
 
-#~ msgid "Vim error"
-#~ msgstr "Vim ���顼"
+msgid "empty keys are not allowed"
+msgstr "���Υ����ϵ��Ĥ���Ƥ��ޤ���"
 
-#~ msgid "buffer is invalid"
-#~ msgstr "�Хåե���̵���Ǥ�"
+msgid "dictionary is locked"
+msgstr "����ϥ��å�����Ƥ��ޤ�"
 
-#~ msgid "window is invalid"
-#~ msgstr "������ɥ���̵���Ǥ�"
+msgid "list is locked"
+msgstr "�ꥹ�Ȥϥ��å�����Ƥ��ޤ�"
 
-#~ msgid "linenr out of range"
-#~ msgstr "�ϰϳ��ι��ֹ�Ǥ�"
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "����˥��� '%s' ���ɲä���Τ˼��Ԥ��ޤ���"
 
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "����ɥܥå����Ǥϵ�����ޤ���"
+#, c-format
+msgid "index must be int or slice, not %s"
+msgstr "����ǥå����� %s �ǤϤʤ����������饤���ˤ��Ƥ�������"
 
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: �饤�֥�� %s ������ɤǤ��ޤ���Ǥ���"
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "str() �⤷���� unicode() �Υ��󥹥��󥹤����Ԥ���Ƥ���Τ� %s �Ǥ���"
 
-#~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr ""
-#~ "���Υ��ޥ�ɤ�̵���Ǥ�, �����ʤ���: Perl�饤�֥�������ɤǤ��ޤ���Ǥ�"
-#~ "��."
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "bytes() �⤷���� str() �Υ��󥹥��󥹤����Ԥ���Ƥ���Τ� %s �Ǥ���"
 
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr ""
-#~ "E299: ����ɥܥå����Ǥ� Safe �⥸�塼�����Ѥ��ʤ�Perl������ץȤ϶ؤ���"
-#~ "��Ƥ��ޤ�"
+#, c-format
+msgid ""
+"expected int(), long() or something supporting coercing to long(), but got %s"
+msgstr "long() ��������Ѵ���ǽ�ʤ�Τ����Ԥ���Ƥ���Τ� %s �Ǥ���"
 
-#~ msgid "E836: This Vim cannot execute :python after using :py3"
-#~ msgstr "E836: ����Vim�Ǥ� :py3 ��Ȥä���� :python ��Ȥ��ޤ���"
+#, c-format
+msgid "expected int() or something supporting coercing to int(), but got %s"
+msgstr "int() ��������Ѵ���ǽ�ʤ�Τ����Ԥ���Ƥ���Τ� %s �Ǥ���"
 
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E263: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���: Python�饤�֥�������ɤǤ���"
-#~ "����Ǥ���."
+msgid "value is too large to fit into C int type"
+msgstr "C����� int ���Ȥ��Ƥ��ͤ��礭�᤮�ޤ�"
 
-# Added at 07-Feb-2004.
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: Python ��Ƶ�Ū�˼¹Ԥ��뤳�ȤϤǤ��ޤ���"
+msgid "value is too small to fit into C int type"
+msgstr "C����� int ���Ȥ��Ƥ��ͤ������᤮�ޤ�"
 
-#~ msgid "E837: This Vim cannot execute :py3 after using :python"
-#~ msgstr "E837: ����Vim�Ǥ� :python ��Ȥä���� :py3 ��Ȥ��ޤ���"
+msgid "number must be greater than zero"
+msgstr "���ͤ� 0 ����礭���ʤ���Фʤ�ޤ���"
 
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr "E265: $_ ��ʸ����Υ��󥹥��󥹤Ǥʤ���Фʤ�ޤ���"
+msgid "number must be greater or equal to zero"
+msgstr "���ͤ� 0 ������ʾ�Ǥʤ���Фʤ�ޤ���"
 
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E266: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���: Ruby�饤�֥�������ɤǤ��ޤ�"
-#~ "��Ǥ���."
+msgid "can't delete OutputObject attributes"
+msgstr "OutputObject°����ä��ޤ���"
 
-#~ msgid "E267: unexpected return"
-#~ msgstr "E267: ͽ������ return �Ǥ�"
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "̵����°���Ǥ�: %s"
 
-#~ msgid "E268: unexpected next"
-#~ msgstr "E268: ͽ������ next �Ǥ�"
+msgid "E264: Python: Error initialising I/O objects"
+msgstr "E264: Python: I/O���֥������Ȥν�������顼"
 
-#~ msgid "E269: unexpected break"
-#~ msgstr "E269: ͽ������ break �Ǥ�"
+msgid "failed to change directory"
+msgstr "������ѹ��˼��Ԥ��ޤ���"
 
-#~ msgid "E270: unexpected redo"
-#~ msgstr "E270: ͽ������ redo �Ǥ�"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got %s"
+msgstr "imp.find_module() �� %s ���֤��ޤ��� (������: 3 ���ǤΥ��ץ�)"
 
-#~ msgid "E271: retry outside of rescue clause"
-#~ msgstr "E271: rescue �γ��� retry �Ǥ�"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr "imp.find_module() �� %d ���ǤΥ��ץ���֤��ޤ��� (������: 3)"
 
-#~ msgid "E272: unhandled exception"
-#~ msgstr "E272: ��갷���ʤ��ä��㳰������ޤ�"
+msgid "internal error: imp.find_module returned tuple with NULL"
+msgstr "�������顼: imp.find_module �� NULL ��ޤॿ�ץ���֤��ޤ���"
 
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: ̤�Τ�longjmp����: %d"
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "vim.Dictionary°���Ͼä��ޤ���"
 
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "������������ڤ��ؤ���"
+msgid "cannot modify fixed dictionary"
+msgstr "���ꤵ�줿������ѹ��Ǥ��ޤ���"
 
-#~ msgid "Show base class of"
-#~ msgstr "���Υ��饹�δ����ɽ��"
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "°�� %s ������Ǥ��ޤ���"
 
-#~ msgid "Show overridden member function"
-#~ msgstr "�����С��饤�ɤ��줿���дؿ���ɽ��"
+msgid "hashtab changed during iteration"
+msgstr "���ƥ졼�������� hashtab ���ѹ�����ޤ���"
 
-#~ msgid "Retrieve from file"
-#~ msgstr "�ե����뤫���������"
+#, c-format
+msgid "expected sequence element of size 2, but got sequence of size %d"
+msgstr "�������󥹤����ǿ��ˤ� 2 �����Ԥ���Ƥ��ޤ����� %d �Ǥ���"
 
-#~ msgid "Retrieve from project"
-#~ msgstr "�ץ��������Ȥ����������"
+msgid "list constructor does not accept keyword arguments"
+msgstr "�ꥹ�ȤΥ��󥹥ȥ饯���ϥ�����ɰ���������դ��ޤ���"
 
-#~ msgid "Retrieve from all projects"
-#~ msgstr "���ƤΥץ��������Ȥ����������"
+msgid "list index out of range"
+msgstr "�ꥹ���ϰϳ��Υ���ǥå����Ǥ�"
 
-#~ msgid "Retrieve"
-#~ msgstr "����"
+#. No more suitable format specifications in python-2.3
+#, c-format
+msgid "internal error: failed to get vim list item %d"
+msgstr "�������顼: vim�Υꥹ������ %d �μ����˼��Ԥ��ޤ���"
 
-#~ msgid "Show source of"
-#~ msgstr "���Υ�������ɽ������"
+msgid "slice step cannot be zero"
+msgstr "���饤���Υ��ƥåפ� 0 �ϻ���Ǥ��ޤ���"
 
-#~ msgid "Find symbol"
-#~ msgstr "���Ĥ�������ܥ�"
+#, c-format
+msgid "attempt to assign sequence of size greater than %d to extended slice"
+msgstr "Ĺ�� %d �γ�ĥ���饤���ˡ����Ĺ�����饤���������Ƥ褦�Ȥ��ޤ���"
 
-#~ msgid "Browse class"
-#~ msgstr "���饹�򻲾�"
+#, c-format
+msgid "internal error: no vim list item %d"
+msgstr "�������顼: vim�Υꥹ������ %d �Ϥ���ޤ���"
 
-#~ msgid "Show class in hierarchy"
-#~ msgstr "���ؤǥ��饹��ɽ��"
+msgid "internal error: not enough list items"
+msgstr "�������顼: �ꥹ�Ȥ˽�ʬ�����Ǥ�����ޤ���"
 
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "���ꤵ�줿���ؤǥ��饹��ɽ��"
+msgid "internal error: failed to add item to list"
+msgstr "�������顼: �ꥹ�Ȥؤ������ɲä˼��Ԥ��ޤ���"
 
-#~ msgid "Xref refers to"
-#~ msgstr "Xref �����"
+#, c-format
+msgid "attempt to assign sequence of size %d to extended slice of size %d"
+msgstr "Ĺ�� %d �Υ��饤���� %d �γ�ĥ���饤���˳�����Ƥ褦�Ȥ��ޤ���"
 
-#~ msgid "Xref referred by"
-#~ msgstr "Xref �����Ȥ����"
+msgid "failed to add item to list"
+msgstr "�ꥹ�Ȥؤ������ɲä˼��Ԥ��ޤ���"
 
-#~ msgid "Xref has a"
-#~ msgstr "Xref �����Τ�Τ��äƤ��ޤ�"
+msgid "cannot delete vim.List attributes"
+msgstr "vim.List °���Ͼä��ޤ���"
 
-#~ msgid "Xref used by"
-#~ msgstr "Xref �����Ѥ����"
+msgid "cannot modify fixed list"
+msgstr "���ꤵ�줿�ꥹ�Ȥ��ѹ��Ǥ��ޤ���"
 
-#~ msgid "Show docu of"
-#~ msgstr "����ʸ�Ϥ�ɽ��"
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "̵̾�ؿ� %s ��¸�ߤ��ޤ���"
 
-#~ msgid "Generate docu for"
-#~ msgstr "����ʸ�Ϥ�����"
+#, c-format
+msgid "function %s does not exist"
+msgstr "�ؿ� %s ������ޤ���"
 
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "SNiFF+����³�Ǥ��ޤ���. �Ķ�������å����Ƥ�������(sniffemacs �� $PATH ��"
-#~ "�ʤ���Фʤ�ޤ���).\n"
+#, c-format
+msgid "failed to run function %s"
+msgstr "�ؿ� %s �μ¹Ԥ˼��Ԥ��ޤ���"
 
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff: �ɹ���˥��顼��ȯ�����ޤ���. ���Ǥ��ޤ���"
+msgid "unable to get option value"
+msgstr "���ץ������ͤϼ����Ǥ��ޤ���"
 
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "����SNiFF+ �ξ��֤ϡ�"
+msgid "internal error: unknown option type"
+msgstr "�������顼: ̤�ΤΥ��ץ���󷿤Ǥ�"
 
-#~ msgid "not "
-#~ msgstr "̤"
+msgid "problem while switching windows"
+msgstr "������ɥ����ڴ�������꤬ȯ�����ޤ���"
 
-#~ msgid "connected"
-#~ msgstr "��³�פǤ�"
+#, c-format
+msgid "unable to unset global option %s"
+msgstr "�������Х륪�ץ���� %s ���������ϤǤ��ޤ���"
 
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: ̤�Τ� SNiFF+ �ꥯ�����ȤǤ�: %s"
+#, c-format
+msgid "unable to unset option %s which does not have global value"
+msgstr "�������Х���ͤ�̵�����ץ���� %s ���������ϤǤ��ޤ���"
 
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: SNiFF+ �ؤ���³��Υ��顼�Ǥ�"
+msgid "attempt to refer to deleted tab page"
+msgstr "������줿���֤򻲾Ȥ��褦�Ȥ��ޤ���"
 
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: SNiFF+ ����³����Ƥ��ޤ���"
+msgid "no such tab page"
+msgstr "���Τ褦�ʥ��֥ڡ����Ϥ���ޤ���"
 
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: SNiFF+ �Хåե�������ޤ���"
+msgid "attempt to refer to deleted window"
+msgstr "������줿������ɥ��򻲾Ȥ��褦�Ȥ��ޤ���"
 
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff: �������˥��顼��ȯ�������Τ����Ǥ��ޤ���"
+msgid "readonly attribute: buffer"
+msgstr "�ɹ�����°��: �Хåե���"
 
-#~ msgid "invalid buffer number"
-#~ msgstr "̵���ʥХåե��ֹ�Ǥ�"
+msgid "cursor position outside buffer"
+msgstr "����������֤��Хåե��γ�¦�Ǥ�"
 
-#~ msgid "not implemented yet"
-#~ msgstr "�ޤ���������Ƥ��ޤ���"
+msgid "no such window"
+msgstr "���Τ褦�ʥ�����ɥ��Ϥ���ޤ���"
 
-#~ msgid "cannot set line(s)"
-#~ msgstr "�Ԥ�����Ǥ��ޤ���"
+msgid "attempt to refer to deleted buffer"
+msgstr "������줿�Хåե��򻲾Ȥ��褦�Ȥ��ޤ���"
 
-#~ msgid "invalid mark name"
-#~ msgstr "̵���ʥޡ���̾�Ǥ�"
+msgid "failed to rename buffer"
+msgstr "�Хåե�̾���ѹ��˼��Ԥ��ޤ���"
 
-#~ msgid "mark not set"
-#~ msgstr "�ޡ��������ꤵ��Ƥ��ޤ���"
+msgid "mark name must be a single character"
+msgstr "�ޡ���̾��1ʸ���Υ���ե��٥åȤǤʤ���Фʤ�ޤ���"
 
-#~ msgid "row %d column %d"
-#~ msgstr "�� %d �� %d"
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "vim.Buffer���֥������Ȥ����Ԥ���Ƥ���Τ� %s �Ǥ���"
 
-#~ msgid "cannot insert/append line"
-#~ msgstr "�Ԥ�����/�ɲä�Ǥ��ޤ���"
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "���ꤵ�줿�Хåե� %d �ؤ��ڤ��ؤ��˼��Ԥ��ޤ���"
 
-#~ msgid "line number out of range"
-#~ msgstr "�ϰϳ��ι��ֹ�Ǥ�"
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "vim.Window���֥������Ȥ����Ԥ���Ƥ���Τ� %s �Ǥ���"
 
-#~ msgid "unknown flag: "
-#~ msgstr "̤�ΤΥե饰: "
+msgid "failed to find window in the current tab page"
+msgstr "���ߤΥ��֤ˤϻ��ꤵ�줿������ɥ�������ޤ���Ǥ���"
 
-#~ msgid "unknown vimOption"
-#~ msgstr "̤�Τ� vimOption �Ǥ�"
+msgid "did not switch to the specified window"
+msgstr "���ꤵ�줿������ɥ����ڤ��ؤ��ޤ���Ǥ���"
 
-#~ msgid "keyboard interrupt"
-#~ msgstr "�����ܡ��ɳ����"
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "vim.TabPage���֥������Ȥ����Ԥ���Ƥ���Τ� %s �Ǥ���"
 
-#~ msgid "vim error"
-#~ msgstr "vim ���顼"
+msgid "did not switch to the specified tab page"
+msgstr "���ꤵ�줿���֥ڡ������ڤ��ؤ��ޤ���Ǥ���"
 
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr ""
-#~ "�Хåե�/������ɥ��������ޥ�ɤ�����Ǥ��ޤ���: ���֥������Ȥ��õ���"
-#~ "���ޤ���"
+msgid "failed to run the code"
+msgstr "�����ɤμ¹Ԥ˼��Ԥ��ޤ���"
 
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr ""
-#~ "������Хå����ޥ�ɤ���Ͽ�Ǥ��ޤ���: �Хåե�/������ɥ������˾õ���"
-#~ "����"
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: ��ɾ����ͭ����python���֥������Ȥ��֤��ޤ���Ǥ���"
 
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr ""
-#~ "E280: TCL ��̿Ū���顼: reflist ����!? vim-dev@vim.org ����𤷤Ƥ�������"
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: �֤��줿python���֥������Ȥ�vim���ͤ��Ѵ��Ǥ��ޤ���Ǥ���"
 
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr ""
-#~ "������Хå����ޥ�ɤ���Ͽ�Ǥ��ޤ���: �Хåե�/������ɥ��λ��Ȥ����Ĥ���"
-#~ "�ޤ���"
+#, c-format
+msgid "unable to convert %s to vim dictionary"
+msgstr "%s vim�μ��񷿤��Ѵ��Ǥ��ޤ���"
 
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E571: ���Υ��ޥ�ɤ�̵���Ǥ�,�����ʤ���: Tcl�饤�֥�������ɤǤ��ޤ���"
-#~ "�Ǥ���."
+#, c-format
+msgid "unable to convert %s to vim list"
+msgstr "%s ��vim�Υꥹ�Ȥ��Ѵ��Ǥ��ޤ���"
 
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: ������� %d"
+#, c-format
+msgid "unable to convert %s to vim structure"
+msgstr "%s ��vim�ι�¤�Τ��Ѵ��Ǥ��ޤ���"
 
-#~ msgid "cannot get line"
-#~ msgstr "�Ԥ�����Ǥ��ޤ���"
+msgid "internal error: NULL reference passed"
+msgstr "�������顼: NULL���Ȥ��Ϥ���ޤ���"
 
-#~ msgid "Unable to register a command server name"
-#~ msgstr "̿�᥵���Ф�̾������Ͽ�Ǥ��ޤ���"
+msgid "internal error: invalid value type"
+msgstr "�������顼: ̵�����ͷ��Ǥ�"
 
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: ��Ū�Υץ������ؤΥ��ޥ�������˼��Ԥ��ޤ���"
+msgid ""
+"Failed to set path hook: sys.path_hooks is not a list\n"
+"You should now do the following:\n"
+"- append vim.path_hook to sys.path_hooks\n"
+"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgstr ""
+"�ѥ��եå�������˼��Ԥ��ޤ���: sys.path_hooks ���ꥹ�ȤǤϤ���ޤ���\n"
+"�����˲�����»ܤ��Ƥ�������:\n"
+"- vim.path_hooks �� sys.path_hooks ���ɲ�\n"
+"- vim.VIM_SPECIAL_PATH �� sys.path ���ɲ�\n"
 
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: ̵���ʥ�����ID���Ȥ��ޤ���: %s"
-
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr "E251: VIM ���Τ���Ͽ�ץ��ѥƥ��������Ǥ�. �õ�ޤ���!"
-
-#~ msgid "netbeans is not supported with this GUI\n"
-#~ msgstr "netbeans �Ϥ���GUI�Ǥ����ѤǤ��ޤ���\n"
-
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "����Vim�ˤ�diff��ǽ������ޤ���(����ѥ��������)."
-
-#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
-#~ msgstr "'-nb' �����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
-
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim: ���顼: NetBeans����gvim�򥹥����ȤǤ��ޤ���\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Where case is ignored prepend / to make flag upper case"
-#~ msgstr ""
-#~ "\n"
-#~ "�羮ʸ����̵�뤵��������ʸ���ˤ��뤿��� / �����֤��Ƥ�������"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\t����gvim��OLE�Ȥ�����Ͽ����"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\tgvim��OLE��Ͽ��������"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\tGUI�ǵ�ư���� (\"gvim\" ��Ʊ��)"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr "-f or  --nofork\t�ե������饦���: GUI��Ϥ��Ȥ���fork���ʤ�"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\t������ɥ��򳫤��Τ� newcli ����Ѥ��ʤ�"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <device>\t\tI/O�� <device> ����Ѥ���"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\t\t.gvimrc������� <gvimrc> ��Ȥ�"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\t�Ź沽���줿�ե�������Խ�����"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <display>\tvim����ꤷ�� X �����Ф���³����"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\tX�����Ф���³���ʤ�"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr "--remote <files>\t��ǽ�ʤ��Vim�����Ф� <files> ���Խ�����"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-silent <files>  Ʊ��, �����Ф�̵���Ƥ�ٹ�ʸ����Ϥ��ʤ�"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr "--remote-wait <files>\t--remote�� �ե�������Խ��������Τ��Ԥ�"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-wait-silent <files>  Ʊ��, �����Ф�̵���Ƥ�ٹ�ʸ����Ϥ��ʤ�"
-
-#~ msgid ""
-#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
-#~ "file"
-#~ msgstr ""
-#~ "--remote-tab[-wait][-silent] <files>  --remote�ǥե�����1�ĤˤĤ�1�ĤΥ���"
-#~ "�ڡ����򳫤�"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr "--remote-send <keys>\tVim�����Ф� <keys> ���������ƽ�λ����"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr "--remote-expr <expr>\t�����Ф� <expr> ��¹Ԥ��Ʒ�̤�ɽ������"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr "--serverlist\t\tVim������̾�ΰ�����ɽ�����ƽ�λ����"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <name>\tVim������ <name> ������/̾�����ꤹ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim�ˤ�äƲ�ᤵ������(Motif�С������):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim�ˤ�äƲ�ᤵ������(neXtaw�С������):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim�ˤ�äƲ�ᤵ������(Athena�С������):\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <display>\t<display> ��vim��¹Ԥ���"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\t�Ǿ����������֤�vim��ư����"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr "-background <color>\t�طʿ��� <color> ��Ȥ�(Ʊ��: -bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr "-foreground <color>\t���ʿ��� <color> ��Ȥ�(Ʊ��: -fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr "-font <font>\t\t�ƥ�����ɽ���� <font> ��Ȥ�(Ʊ��: -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <font>\t������ <font> ��Ȥ�"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <for>\t���λ��� <font> ��Ȥ�"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr "-geometry <geom>\t������֤� <geom> ��Ȥ�(Ʊ��: -geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr "-borderwidth <width>\t���������� <width> �ˤ���(Ʊ��: -bw)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr ""
-#~ "-scrollbarwidth <width>  ����������С������� <width> �ˤ���(Ʊ��: -sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr ""
-#~ "-menuheight <height>\t��˥塼�С��ι⤵�� <height> �ˤ���(Ʊ��: -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\tȿž��������Ѥ���(Ʊ��: -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\tȿž��������Ѥ��ʤ�(Ʊ��: +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <resource>\t����Υ꥽��������Ѥ���"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvim�ˤ�äƲ�ᤵ������(GTK+�С������):\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr "-display <display>\t<display> ��vim��¹Ԥ���(Ʊ��: --display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr "--role <role>\t�ᥤ�󥦥���ɥ����̤����դ����(role)�����ꤹ��"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\t�ۤʤ�GTK widget��Vim�򳫤�"
-
-#~ msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
-#~ msgstr "--echo-wid\t\t������ɥ�ID��ɸ����Ϥ˽��Ϥ���"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <�ƤΥ����ȥ�>\tVim��ƥ��ץꥱ����������ǵ�ư����"
-
-#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-#~ msgstr "--windowid <HWND>\t�ۤʤ�Win32 widget��������Vim�򳫤�"
-
-#~ msgid "No display"
-#~ msgstr "�ǥ����ץ쥤�����Ĥ���ޤ���"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr ": �����˼��Ԥ��ޤ���.\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": �����˼��Ԥ��ޤ���. ��������Ǥμ¹Ԥ��ߤƤ��ޤ�\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "%d �� (%d ����) �Υե�������Խ����ޤ���"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "�ǥ����ץ쥤������ޤ���: ���������˼��Ԥ��ޤ���.\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": ���������˼��Ԥ��ޤ���.\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: ̵���ʥ����ɥڡ����Ǥ�"
-
-#~ msgid "E284: Cannot set IC values"
-#~ msgstr "E284: IC���ͤ�����Ǥ��ޤ���"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: ����ץåȥ���ƥ����Ȥκ����˼��Ԥ��ޤ���"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: ����ץåȥ᥽�åɤΥ����ץ�˼��Ԥ��ޤ���"
-
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr "E287: �ٹ�: IM���˲�������Хå�������Ǥ��ޤ���Ǥ���"
-
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: ����ץåȥ᥽�åɤϤɤ�ʥ�������⥵�ݡ��Ȥ��ޤ���"
-
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr "E289: ����ץåȥ᥽�åɤ� my preedit type �򥵥ݡ��Ȥ��ޤ���"
-
-#~ msgid "E843: Error while updating swap file crypt"
-#~ msgstr "E843: ����åץե�����ΰŹ�򹹿���˥��顼��ȯ�����ޤ���"
-
-#~ msgid ""
-#~ "E833: %s is encrypted and this version of Vim does not support encryption"
-#~ msgstr ""
-#~ "E833: %s �Ϥ��ΥС�������Vim�ǥ��ݡ��Ȥ��Ƥ��ʤ������ǰŹ沽����Ƥ��ޤ�"
-
-#~ msgid "Swap file is encrypted: \"%s\""
-#~ msgstr "����åץե�����ϰŹ沽����Ƥ��ޤ�: \"%s\""
-
-#~ msgid ""
-#~ "\n"
-#~ "If you entered a new crypt key but did not write the text file,"
-#~ msgstr ""
-#~ "\n"
-#~ "�������Ź業�������Ϥ������Ȥ˥ƥ����ȥե��������¸���Ƥ��ʤ�����,"
-
-#~ msgid ""
-#~ "\n"
-#~ "enter the new crypt key."
-#~ msgstr ""
-#~ "\n"
-#~ "�������Ź業�������Ϥ��Ƥ�������."
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wrote the text file after changing the crypt key press enter"
-#~ msgstr ""
-#~ "\n"
-#~ "�Ź業�����Ѥ������Ȥ˥ƥ����ȥե��������¸��������, �ƥ����ȥե������"
-
-#~ msgid ""
-#~ "\n"
-#~ "to use the same key for text file and swap file"
-#~ msgstr ""
-#~ "\n"
-#~ "����åץե������Ʊ���Ź業����Ȥ������enter�����򲡤��Ƥ�������."
-
-#~ msgid "Using crypt key from swap file for the text file.\n"
-#~ msgstr "����åץե����뤫����������Ź業����ƥ����ȥե�����˻Ȥ��ޤ�.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [����Vim�С������Ǥϻ��ѤǤ��ޤ���]"
-
-#~ msgid "Tear off this menu"
-#~ msgstr "���Υ�˥塼���ڤ���"
-
-#~ msgid "Select Directory dialog"
-#~ msgstr "�ǥ��쥯�ȥ��������������"
-
-#~ msgid "Save File dialog"
-#~ msgstr "�ե�������¸����������"
-
-#~ msgid "Open File dialog"
-#~ msgstr "�ե������ɹ�����������"
-
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr ""
-#~ "E338: ���󥽡���⡼�ɤǤϥե�����֥饦����Ȥ��ޤ���, �����ʤ���"
-
-#~ msgid "Vim: preserving files...\n"
-#~ msgstr "Vim: �ե��������¸��...\n"
-
-#~ msgid "Vim: Finished.\n"
-#~ msgstr "Vim: ��λ���ޤ���.\n"
-
-#~ msgid "ERROR: "
-#~ msgstr "���顼: "
-
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[����(�Х���)] ������-������ %<PRIu64>-%<PRIu64>, ������ %<PRIu64>, �ԡ�"
-#~ "���� %<PRIu64>\n"
-
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[�ƽ�] �� re/malloc() ��� %<PRIu64>, �� free() ��� %<PRIu64>\n"
-#~ "\n"
-
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: �Ԥ�Ĺ���ʤ�᤮�ޤ���"
-
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: �������顼: lalloc(%<PRId64>,)"
-
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: ������ 'mouseshape' �Ǥ�"
-
-#~ msgid "Enter encryption key: "
-#~ msgstr "�Ź沽�ѤΥ��������Ϥ��Ƥ�������: "
-
-#~ msgid "Enter same key again: "
-#~ msgstr "�⤦����Ʊ�����������Ϥ��Ƥ�������: "
-
-#~ msgid "Keys don't match!"
-#~ msgstr "���������פ��ޤ���"
-
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "Netbeans #2 ����³�Ǥ��ޤ���"
-
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "Netbeans ����³�Ǥ��ޤ���"
-
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
-#~ "E668: NetBeans����³����ե�����Υ��������⡼�ɤ����꤬����ޤ�: \"%s\""
-
-#~ msgid "read from Netbeans socket"
-#~ msgstr "Netbeans �Υ����åȤ��ɹ���"
-
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: �Хåե� %<PRId64> �� NetBeans ��³�������ޤ���"
-
-#~ msgid "E838: netbeans is not supported with this GUI"
-#~ msgstr "E838: NetBeans�Ϥ���GUI�ˤ��б����Ƥ��ޤ���"
-
-#~ msgid "E511: netbeans already connected"
-#~ msgstr "E511: NetBeans�ϴ�����³���Ƥ��ޤ�"
-
-#~ msgid "E505: %s is read-only (add ! to override)"
-#~ msgstr "E505: %s ���ɹ����ѤǤ� (��������ˤ� ! ���ɲ�)"
-
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: ��ɾ����ǽ��̵���ˤʤäƤ��ޤ�"
-
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "%<PRId64> �Ԥ������"
-
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: GUI�Ǥ� 'term' ���ѹ��Ǥ��ޤ���"
-
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: GUI�򥹥����Ȥ���ˤ� \":gui\" ����Ѥ��Ƥ�������"
-
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: GTK+2 GUI�Ǥ��ѹ��Ǥ��ޤ���"
-
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: ̵���ʥե���ȤǤ�"
-
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: �ե���ȥ��åȤ�����Ǥ��ޤ���"
-
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: ̵���ʥե���ȥ��åȤǤ�"
-
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: �磻�ɥե���Ȥ�����Ǥ��ޤ���"
-
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: ̵���ʥ磻�ɥե���ȤǤ�"
-
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: �ޥ����ϥ��ݡ��Ȥ���ޤ���"
-
-#~ msgid "cannot open "
-#~ msgstr "�����ޤ��� "
-
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM: ������ɥ��򳫤��ޤ���!\n"
-
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "Amigados�ΥС������ 2.04������ʹߤ�ɬ�פǤ�\n"
-
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "%s �ΥС������ %<PRId64> ��ɬ�פǤ�\n"
-
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "NIL�򳫤��ޤ���:\n"
-
-#~ msgid "Cannot create "
-#~ msgstr "�����Ǥ��ޤ��� "
-
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vim�� %d �ǽ�λ���ޤ�\n"
-
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "���󥽡���⡼�ɤ��ѹ��Ǥ��ޤ���?!\n"
-
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: ���󥽡���ǤϤʤ�??\n"
-
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: -f ���ץ����ǥ������¹ԤǤ��ޤ���"
-
-#~ msgid "Cannot execute "
-#~ msgstr "�¹ԤǤ��ޤ��� "
-
-#~ msgid "shell "
-#~ msgstr "������ "
-
-#~ msgid " returned\n"
-#~ msgstr " ���ޤ���\n"
-
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE �������᤮�ޤ�."
-
-#~ msgid "I/O ERROR"
-#~ msgstr "�����ϥ��顼"
-
-#~ msgid "Message"
-#~ msgstr "������"
-
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr "'columns' ��80�ǤϤʤ�����, �������ޥ�ɤ�¹ԤǤ��ޤ���"
-
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: �ץ�󥿤�����˼��Ԥ��ޤ���"
-
-#~ msgid "to %s on %s"
-#~ msgstr "%s �� (%s ���)"
-
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: ̤�ΤΥץ�󥿥��ץ����Ǥ�: %s"
-
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: �������顼: %s"
-
-#~ msgid "Printing '%s'"
-#~ msgstr "�������Ƥ��ޤ�: '%s'"
-
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr "E244: ʸ�����å�̾ \"%s\" �������Ǥ� (�ե����̾ \"%s\")"
-
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: '%c' ��������ʸ���Ǥ� (�ե����̾ \"%s\")"
-
-#~ msgid "Vim: Double signal, exiting\n"
-#~ msgstr "Vim: 2�ŤΥ����ʥ�Τ���, ��λ���ޤ�\n"
-
-#~ msgid "Vim: Caught deadly signal %s\n"
-#~ msgstr "Vim: ��̿Ū�����ʥ� %s ���Τ��ޤ���\n"
-
-#~ msgid "Vim: Caught deadly signal\n"
-#~ msgstr "Vim: ��̿Ū�����ʥ���Τ��ޤ���\n"
-
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "X�����Фؤ���³�� %<PRId64> �ߥ��ä�����ޤ���"
-
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim: X �Υ��顼�򸡽Ф��ޤ���r\n"
-
-#~ msgid "Testing the X display failed"
-#~ msgstr "X display �Υ����å��˼��Ԥ��ޤ���"
-
-#~ msgid "Opening the X display timed out"
-#~ msgstr "X display �� open �������ॢ���Ȥ��ޤ���"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "sh �������¹ԤǤ��ޤ���\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "�ѥ��פ�����Ǥ��ޤ���\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "fork �Ǥ��ޤ���\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "���ޥ�ɤ����Ǥ��ޤ���\n"
-
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP ��ICE��³�򼺤��ޤ���"
-
-#~ msgid "Opening the X display failed"
-#~ msgstr "X display �� open �˼��Ԥ��ޤ���"
-
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP ��save-yourself�׵��������Ƥ��ޤ�"
-
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP ����³�򳫻Ϥ��Ƥ��ޤ�"
-
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "XSMP ICE��³�����Ԥ����褦�Ǥ�"
-
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP SmcOpenConnection�����Ԥ��ޤ���: %s"
-
-#~ msgid "At line"
-#~ msgstr "��"
-
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "vim32.dll ������ɤǤ��ޤ���Ǥ���"
-
-#~ msgid "VIM Error"
-#~ msgstr "VIM���顼"
-
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "DLL����ؿ��ݥ��󥿤�����Ǥ��ޤ���Ǥ���"
-
-#~ msgid "shell returned %d"
-#~ msgstr "�����뤬������ %d �ǽ�λ���ޤ���"
-
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim: ���٥�� %s ����\n"
-
-#~ msgid "close"
-#~ msgstr "�Ĥ���"
-
-#~ msgid "logoff"
-#~ msgstr "��������"
-
-#~ msgid "shutdown"
-#~ msgstr "����åȥ�����"
-
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: ���ޥ�ɤ�����ޤ���"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "VIMRUN.EXE�� $PATH ����˸��Ĥ���ޤ���.\n"
-#~ "�������ޥ�ɤν�λ��˰����ߤ򤷤ޤ���.\n"
-#~ "�ܺ٤�  :help win32-vimrun  �򻲾Ȥ��Ƥ�������."
-
-#~ msgid "Vim Warning"
-#~ msgstr "Vim�ηٹ�"
-
-#~ msgid "Error file"
-#~ msgstr "���顼�ե�����"
-
-#~ msgid "E868: Error building NFA with equivalence class!"
-#~ msgstr "E868: �������饹��ޤ�NFA���ۤ˼��Ԥ��ޤ���!"
-
-#~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
-#~ msgstr "E878: (NFA) ���߲�����Υ֥����˽�ʬ�ʥ���������Ƥ��ޤ���!"
-
-#~ msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-#~ msgstr ""
-#~ "�ٹ�: ñ��ꥹ�� \"%s_%s.spl\" ����� \"%s_ascii.spl\" �ϸ��Ĥ���ޤ���"
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "%s ����Ѵ��ϥ��ݡ��Ȥ���Ƥ��ޤ���"
-
-#~ msgid "E845: Insufficient memory, word list will be incomplete"
-#~ msgstr "E845: ���꤬­��ʤ��Τǡ�ñ��ꥹ�Ȥ��Դ����Ǥ�"
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: �����ե�����Υѥ��� %s ���ڤ�ΤƤ��ޤ���\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "�������������ư���ޤ�\n"
-
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "���������ΰ�Τ�����CUT_BUFFER0�����Ѥ���ޤ���"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "��ǽ�ʥ���ɥ��Ϥ���ޤ���: �Ȥꤢ����³���ޤ�"
-
-#~ msgid "E832: Non-encrypted file has encrypted undo file: %s"
-#~ msgstr ""
-#~ "E832: ��Ź沽�ե����뤬�Ź沽���줿����ɥ��ե������ȤäƤޤ�: %s"
-
-#~ msgid "E826: Undo file decryption failed: %s"
-#~ msgstr "E826: �Ź沽���줿����ɥ��ե�����β��ɤ˼��Ԥ��ޤ���: %s"
-
-#~ msgid "E827: Undo file is encrypted: %s"
-#~ msgstr "E827: ����ɥ��ե����뤬�Ź沽����Ƥ��ޤ�: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16/32 �ӥå� GUI ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 64 �ӥå� GUI ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32 �ӥå� GUI ��"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " in Win32s �⡼��"
-
-#~ msgid " with OLE support"
-#~ msgstr " with OLE ���ݡ���"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 64 �ӥå� ���󥽡��� ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32 �ӥå� ���󥽡��� ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16 �ӥå� ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "32 �ӥå� MS-DOS ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "16 �ӥå� MS-DOS ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X (unix) ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "OpenVMS version"
-#~ msgstr ""
-#~ "\n"
-#~ "OpenVMS ��"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "Big �� "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "�̾� �� "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "Small �� "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "Tiny �� "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "with GTK2-GNOME GUI."
-
-#~ msgid "with GTK2 GUI."
-#~ msgstr "with GTK2 GUI."
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "with X11-Motif GUI."
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "with X11-neXtaw GUI."
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "with X11-Athena GUI."
-
-#~ msgid "with Photon GUI."
-#~ msgstr "with Photon GUI."
-
-#~ msgid "with GUI."
-#~ msgstr "with GUI."
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "with Carbon GUI."
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "with Cocoa GUI."
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "with (���饷�å�) GUI."
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "     �����ƥ� gvimrc: \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "       �桼�� gvimrc: \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "    ��2�桼�� gvimrc: \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "    ��3�桼�� gvimrc: \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr "    �����ƥ��˥塼: \""
-
-#~ msgid "Compiler: "
-#~ msgstr "����ѥ���: "
-
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "�ܺ٤ϥ�˥塼�� �إ�ע��ɻ� �򻲾Ȥ��Ʋ�����   "
-
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "�⡼��̵�Ǽ¹���, �����פ���ʸ������������ޤ�"
-
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "��˥塼�� �Խ����������ꢪ����(�鿴��)�⡼������ "
-
-#~ msgid "                              for two modes      "
-#~ msgstr "                              �ǥ⡼��ͭ��       "
-
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr "��˥塼�� �Խ����������ꢪVi�ߴ��⡼������      "
-
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "                              ��Vim�Ȥ���ư��    "
-
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "   �ٹ�: Windows 95/98/Me �򸡽�  "
-
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr " �ܺ٤ʾ����          :help windows95<Enter> "
-
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "ʣ����Vim���Խ����� (&M)"
-
-#~ msgid "Edit with single &Vim"
-#~ msgstr "1�Ĥ�Vim���Խ����� (&V)"
-
-#~ msgid "Diff with Vim"
-#~ msgstr "Vim�Ǻ�ʬ��ɽ������"
-
-#~ msgid "Edit with &Vim"
-#~ msgstr "Vim���Խ����� (&V)"
-
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "��ư�Ѥ�Vim���Խ����� - "
-
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "���򤷤��ե������Vim���Խ�����"
-
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr "�ץ������κ����˼���: gvim���Ķ��ѿ�PATH��ˤ��뤫��ǧ���Ƥ�������!"
-
-#~ msgid "gvimext.dll error"
-#~ msgstr "gvimext.dll ���顼"
-
-#~ msgid "Path length too long!"
-#~ msgstr "�ѥ���Ĺ�����ޤ�!"
-
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: ̤�ΤΥե���ȥ��å�: %s"
-
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: ̤�ΤΥե����: %s"
-
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: �ե���� \"%s\" �ϸ������ǤϤ���ޤ���"
-
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: �饤�֥��δؿ� %s ������ɤǤ��ޤ���Ǥ���"
-
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr "E26: �إ֥饤��ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
-
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: �ڥ륷����ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
-
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr ""
-#~ "E800: ����ӥ���ϻ����Բ�ǽ�Ǥ�: ����ѥ������̵���ˤ���Ƥ��ޤ�\n"
-
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: %s �Ȥ���̾������Ͽ���줿�����ФϤ���ޤ���"
-
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: �ǥ����ץ쥤�򳫤��ޤ���"
-
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: ̵���ʼ���������ޤ���"
-
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: �ΰ褬�ݸ��Ƥ���Τ�, �ѹ��Ǥ��ޤ���"
-
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr "E744: NetBeans ���ɹ����ѥե�������ѹ����뤳�Ȥ�����ޤ���"
-
-#~ msgid "Need encryption key for \"%s\""
-#~ msgstr "�Ź業����ɬ�פǤ�: \"%s\""
-
-#~ msgid "empty keys are not allowed"
-#~ msgstr "���Υ����ϵ��Ĥ���Ƥ��ޤ���"
-
-#~ msgid "dictionary is locked"
-#~ msgstr "����ϥ��å�����Ƥ��ޤ�"
-
-#~ msgid "list is locked"
-#~ msgstr "�ꥹ�Ȥϥ��å�����Ƥ��ޤ�"
-
-#~ msgid "failed to add key '%s' to dictionary"
-#~ msgstr "����˥��� '%s' ���ɲä���Τ˼��Ԥ��ޤ���"
-
-#~ msgid "index must be int or slice, not %s"
-#~ msgstr "����ǥå����� %s �ǤϤʤ����������饤���ˤ��Ƥ�������"
-
-#~ msgid "expected str() or unicode() instance, but got %s"
-#~ msgstr ""
-#~ "str() �⤷���� unicode() �Υ��󥹥��󥹤����Ԥ���Ƥ���Τ� %s �Ǥ���"
-
-#~ msgid "expected bytes() or str() instance, but got %s"
-#~ msgstr "bytes() �⤷���� str() �Υ��󥹥��󥹤����Ԥ���Ƥ���Τ� %s �Ǥ���"
-
-#~ msgid ""
-#~ "expected int(), long() or something supporting coercing to long(), but "
-#~ "got %s"
-#~ msgstr "long() ��������Ѵ���ǽ�ʤ�Τ����Ԥ���Ƥ���Τ� %s �Ǥ���"
-
-#~ msgid "expected int() or something supporting coercing to int(), but got %s"
-#~ msgstr "int() ��������Ѵ���ǽ�ʤ�Τ����Ԥ���Ƥ���Τ� %s �Ǥ���"
-
-#~ msgid "value is too large to fit into C int type"
-#~ msgstr "C����� int ���Ȥ��Ƥ��ͤ��礭�᤮�ޤ�"
-
-#~ msgid "value is too small to fit into C int type"
-#~ msgstr "C����� int ���Ȥ��Ƥ��ͤ������᤮�ޤ�"
-
-#~ msgid "number must be greater then zero"
-#~ msgstr "���ͤ� 0 ����礭���ʤ���Фʤ�ޤ���"
-
-#~ msgid "number must be greater or equal to zero"
-#~ msgstr "���ͤ� 0 ������ʾ�Ǥʤ���Фʤ�ޤ���"
-
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "OutputObject°����ä��ޤ���"
-
-#~ msgid "invalid attribute: %s"
-#~ msgstr "̵����°���Ǥ�: %s"
-
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Python: I/O���֥������Ȥν�������顼"
-
-#~ msgid "failed to change directory"
-#~ msgstr "������ѹ��˼��Ԥ��ޤ���"
-
-#~ msgid "expected 3-tuple as imp.find_module() result, but got %s"
-#~ msgstr "imp.find_module() �� %s ���֤��ޤ��� (������: 2 ���ǤΥ��ץ�)"
-
-#~ msgid ""
-#~ "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-#~ msgstr "impl.find_module() �� %d ���ǤΥ��ץ���֤��ޤ��� (������: 2)"
-
-#~ msgid "internal error: imp.find_module returned tuple with NULL"
-#~ msgstr "�������顼: imp.find_module �� NULL ��ޤॿ�ץ���֤��ޤ���"
-
-#~ msgid "cannot delete vim.Dictionary attributes"
-#~ msgstr "vim.Dictionary°���Ͼä��ޤ���"
-
-#~ msgid "cannot modify fixed dictionary"
-#~ msgstr "���ꤵ�줿������ѹ��Ǥ��ޤ���"
-
-#~ msgid "cannot set attribute %s"
-#~ msgstr "°�� %s ������Ǥ��ޤ���"
-
-#~ msgid "hashtab changed during iteration"
-#~ msgstr "���ƥ졼�������� hashtab ���ѹ�����ޤ���"
-
-#~ msgid "expected sequence element of size 2, but got sequence of size %d"
-#~ msgstr "�������󥹤����ǿ��ˤ� 2 �����Ԥ���Ƥ��ޤ����� %d �Ǥ���"
-
-#~ msgid "list constructor does not accept keyword arguments"
-#~ msgstr "�ꥹ�ȤΥ��󥹥ȥ饯���ϥ�����ɰ���������դ��ޤ���"
-
-#~ msgid "list index out of range"
-#~ msgstr "�ꥹ���ϰϳ��Υ���ǥå����Ǥ�"
-
-#~ msgid "internal error: failed to get vim list item %d"
-#~ msgstr "�������顼: vim�Υꥹ������ %d �μ����˼��Ԥ��ޤ���"
-
-#~ msgid "failed to add item to list"
-#~ msgstr "�ꥹ�Ȥؤ������ɲä˼��Ԥ��ޤ���"
-
-#~ msgid "internal error: no vim list item %d"
-#~ msgstr "�������顼: vim�Υꥹ������ %d �Ϥ���ޤ���"
-
-#~ msgid "internal error: failed to add item to list"
-#~ msgstr "�������顼: �ꥹ�Ȥؤ������ɲä˼��Ԥ��ޤ���"
-
-#~ msgid "cannot delete vim.List attributes"
-#~ msgstr "vim.List °���Ͼä��ޤ���"
-
-#~ msgid "cannot modify fixed list"
-#~ msgstr "���ꤵ�줿�ꥹ�Ȥ��ѹ��Ǥ��ޤ���"
-
-#~ msgid "unnamed function %s does not exist"
-#~ msgstr "̵̾�ؿ� %s ��¸�ߤ��ޤ���"
-
-#~ msgid "function %s does not exist"
-#~ msgstr "�ؿ� %s ������ޤ���"
-
-#~ msgid "function constructor does not accept keyword arguments"
-#~ msgstr "�ؿ��Υ��󥹥ȥ饯���ϥ�����ɰ���������դ��ޤ���"
-
-#~ msgid "failed to run function %s"
-#~ msgstr "�ؿ� %s �μ¹Ԥ˼��Ԥ��ޤ���"
-
-#~ msgid "problem while switching windows"
-#~ msgstr "������ɥ����ڴ�������꤬ȯ�����ޤ���"
-
-#~ msgid "unable to unset global option %s"
-#~ msgstr "�������Х륪�ץ���� %s ���������ϤǤ��ޤ���"
-
-#~ msgid "unable to unset option %s which does not have global value"
-#~ msgstr "�������Х���ͤ�̵�����ץ���� %s ���������ϤǤ��ޤ���"
-
-#~ msgid "attempt to refer to deleted tab page"
-#~ msgstr "������줿���֤򻲾Ȥ��褦�Ȥ��ޤ���"
-
-#~ msgid "no such tab page"
-#~ msgstr "���Τ褦�ʥ��֥ڡ����Ϥ���ޤ���"
-
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "������줿������ɥ��򻲾Ȥ��褦�Ȥ��ޤ���"
-
-#~ msgid "readonly attribute: buffer"
-#~ msgstr "�ɹ�����°��: �Хåե���"
-
-#~ msgid "cursor position outside buffer"
-#~ msgstr "����������֤��Хåե��γ�¦�Ǥ�"
-
-#~ msgid "no such window"
-#~ msgstr "���Τ褦�ʥ�����ɥ��Ϥ���ޤ���"
-
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "������줿�Хåե��򻲾Ȥ��褦�Ȥ��ޤ���"
-
-#~ msgid "failed to rename buffer"
-#~ msgstr "�Хåե�̾���ѹ��˼��Ԥ��ޤ���"
-
-#~ msgid "mark name must be a single character"
-#~ msgstr "�ޡ���̾��1ʸ���Υ���ե��٥åȤǤʤ���Фʤ�ޤ���"
-
-#~ msgid "expected vim.Buffer object, but got %s"
-#~ msgstr "vim.Buffer���֥������Ȥ����Ԥ���Ƥ���Τ� %s �Ǥ���"
-
-#~ msgid "failed to switch to buffer %d"
-#~ msgstr "���ꤵ�줿�Хåե� %d �ؤ��ڤ��ؤ��˼��Ԥ��ޤ���"
-
-#~ msgid "expected vim.Window object, but got %s"
-#~ msgstr "vim.Window���֥������Ȥ����Ԥ���Ƥ���Τ� %s �Ǥ���"
-
-#~ msgid "failed to find window in the current tab page"
-#~ msgstr "���ߤΥ��֤ˤϻ��ꤵ�줿������ɥ�������ޤ���Ǥ���"
-
-#~ msgid "did not switch to the specified window"
-#~ msgstr "���ꤵ�줿������ɥ����ڤ��ؤ��ޤ���Ǥ���"
-
-#~ msgid "expected vim.TabPage object, but got %s"
-#~ msgstr "vim.TabPage���֥������Ȥ����Ԥ���Ƥ���Τ� %s �Ǥ���"
-
-#~ msgid "did not switch to the specified tab page"
-#~ msgstr "���ꤵ�줿���֥ڡ������ڤ��ؤ��ޤ���Ǥ���"
-
-#~ msgid "failed to run the code"
-#~ msgstr "�����ɤμ¹Ԥ˼��Ԥ��ޤ���"
-
-#~ msgid "E858: Eval did not return a valid python object"
-#~ msgstr "E858: ��ɾ����ͭ����python���֥������Ȥ��֤��ޤ���Ǥ���"
-
-#~ msgid "E859: Failed to convert returned python object to vim value"
-#~ msgstr "E859: �֤��줿python���֥������Ȥ�vim���ͤ��Ѵ��Ǥ��ޤ���Ǥ���"
-
-#~ msgid "unable to convert %s to vim dictionary"
-#~ msgstr "%s vim�μ��񷿤��Ѵ��Ǥ��ޤ���"
-
-#~ msgid "unable to convert %s to vim structure"
-#~ msgstr "%s ��vim�ι�¤�Τ��Ѵ��Ǥ��ޤ���"
-
-#~ msgid "internal error: NULL reference passed"
-#~ msgstr "�������顼: NULL���Ȥ��Ϥ���ޤ���"
-
-#~ msgid "internal error: invalid value type"
-#~ msgstr "�������顼: ̵�����ͷ��Ǥ�"
-
-#~ msgid ""
-#~ "Failed to set path hook: sys.path_hooks is not a list\n"
-#~ "You should now do the following:\n"
-#~ "- append vim.path_hook to sys.path_hooks\n"
-#~ "- append vim.VIM_SPECIAL_PATH to sys.path\n"
-#~ msgstr ""
-#~ "�ѥ��եå�������˼��Ԥ��ޤ���: sys.path_hooks ���ꥹ�ȤǤϤ���ޤ���\n"
-#~ "�����˲�����»ܤ��Ƥ�������:\n"
-#~ "- vim.path_hooks �� sys.path_hooks ���ɲ�\n"
-#~ "- vim.VIM_SPECIAL_PATH �� sys.path ���ɲ�\n"
-
-#~ msgid ""
-#~ "Failed to set path: sys.path is not a list\n"
-#~ "You should now append vim.VIM_SPECIAL_PATH to sys.path"
-#~ msgstr ""
-#~ "�ѥ�������˼��Ԥ��ޤ���: sys.path ���ꥹ�ȤǤϤ���ޤ���\n"
-#~ "������ vim.VIM_SPECIAL_PATH �� sys.path ���ɲä��Ƥ�������"
+msgid ""
+"Failed to set path: sys.path is not a list\n"
+"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgstr ""
+"�ѥ�������˼��Ԥ��ޤ���: sys.path ���ꥹ�ȤǤϤ���ޤ���\n"
+"������ vim.VIM_SPECIAL_PATH �� sys.path ���ɲä��Ƥ�������"
diff --git a/src/nvim/po/ja.po b/src/nvim/po/ja.po
index e12cfb7e70..5cb789c93e 100644
--- a/src/nvim/po/ja.po
+++ b/src/nvim/po/ja.po
@@ -1,3 +1,4 @@
+
 # Japanese translation for Vim
 #
 # Do ":help uganda"  in Vim to read copying and usage conditions.
@@ -14,213 +15,176 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Vim 7.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-02-01 09:02+0900\n"
-"PO-Revision-Date: 2013-06-02-01 09:08+09n"
+"POT-Creation-Date: 2016-09-10 21:10+0900\n"
+"PO-Revision-Date: 2016-09-10 21:20+0900\n"
 "Last-Translator: MURAOKA Taro <koron.kaoriya@gmail.com>\n"
 "Language-Team: vim-jp (https://github.com/vim-jp/lang-ja)\n"
 "Language: Japanese\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../api/private/helpers.c:201
-#, fuzzy
-msgid "Unable to get option value"
-msgstr "オプションの値は取得できません"
+msgid "E831: bf_key_init() called with empty password"
+msgstr "E831: bf_key_init() が空パスワードで呼び出されました"
 
-#: ../api/private/helpers.c:204
-msgid "internal error: unknown option type"
-msgstr "内部エラー: 未知のオプション型です"
+msgid "E820: sizeof(uint32_t) != 4"
+msgstr "E820: sizeof(uint32_t) != 4"
+
+msgid "E817: Blowfish big/little endian use wrong"
+msgstr "E817: Blowfish暗号のビッグ/リトルエンディアンが間違っています"
+
+msgid "E818: sha256 test failed"
+msgstr "E818: sha256のテストに失敗しました"
+
+msgid "E819: Blowfish test failed"
+msgstr "E819: Blowfish暗号のテストに失敗しました"
 
-#: ../buffer.c:92
 msgid "[Location List]"
 msgstr "[ロケーションリスト]"
 
-#: ../buffer.c:93
 msgid "[Quickfix List]"
 msgstr "[Quickfixリスト]"
 
-#: ../buffer.c:94
 msgid "E855: Autocommands caused command to abort"
 msgstr "E855: autocommandがコマンドの停止を引き起こしました"
 
-#: ../buffer.c:135
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: バッファを1つも作成できないので, 終了します..."
 
-#: ../buffer.c:138
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: バッファを作成できないので, 他のを使用します..."
 
-#: ../buffer.c:763
+msgid "E931: Buffer cannot be registered"
+msgstr "E931: バッファを登録できません"
+
+msgid "E937: Attempt to delete a buffer that is in use"
+msgstr "E937: 使用中のバッファを削除しようと試みました"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: 解放されたバッファはありません"
 
-#: ../buffer.c:765
 msgid "E516: No buffers were deleted"
 msgstr "E516: 削除されたバッファはありません"
 
-#: ../buffer.c:767
 msgid "E517: No buffers were wiped out"
 msgstr "E517: 破棄されたバッファはありません"
 
-#: ../buffer.c:772
 msgid "1 buffer unloaded"
 msgstr "1 個のバッファが解放されました"
 
-#: ../buffer.c:774
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "%d 個のバッファが解放されました"
 
-#: ../buffer.c:777
 msgid "1 buffer deleted"
 msgstr "1 個のバッファが削除されました"
 
-#: ../buffer.c:779
 #, c-format
 msgid "%d buffers deleted"
 msgstr "%d 個のバッファが削除されました"
 
-#: ../buffer.c:782
 msgid "1 buffer wiped out"
 msgstr "1 個のバッファが破棄されました"
 
-#: ../buffer.c:784
 #, c-format
 msgid "%d buffers wiped out"
 msgstr "%d 個のバッファが破棄されました"
 
-#: ../buffer.c:806
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: 最後のバッファは解放できません"
 
-#: ../buffer.c:874
 msgid "E84: No modified buffer found"
 msgstr "E84: 変更されたバッファはありません"
 
 #. back where we started, didn't find anything.
-#: ../buffer.c:903
 msgid "E85: There is no listed buffer"
 msgstr "E85: リスト表示されるバッファはありません"
 
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: バッファ %<PRId64> はありません"
-
-#: ../buffer.c:915
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: 最後のバッファを越えて移動はできません"
 
-#: ../buffer.c:917
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: 最初のバッファより前へは移動できません"
 
-#: ../buffer.c:945
 #, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
-msgstr "E89: バッファ %<PRId64> の変更は保存されていません (! で変更を破棄)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
+msgstr "E89: バッファ %ld の変更は保存されていません (! で変更を破棄)"
 
-#. wrap around (may cause duplicates)
-#: ../buffer.c:1423
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: 警告: ファイル名のリストが長過ぎます"
 
-#: ../buffer.c:1555 ../quickfix.c:3361
 #, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: バッファ %<PRId64> が見つかりません"
+msgid "E92: Buffer %ld not found"
+msgstr "E92: バッファ %ld が見つかりません"
 
-#: ../buffer.c:1798
 #, c-format
 msgid "E93: More than one match for %s"
 msgstr "E93: %s に複数の該当がありました"
 
-#: ../buffer.c:1800
 #, c-format
 msgid "E94: No matching buffer for %s"
 msgstr "E94: %s に該当するバッファはありませんでした"
 
-#: ../buffer.c:2161
 #, c-format
-msgid "line %<PRId64>"
-msgstr "行 %<PRId64>"
+msgid "line %ld"
+msgstr "行 %ld"
 
-#: ../buffer.c:2233
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: この名前のバッファは既にあります"
 
-#: ../buffer.c:2498
 msgid " [Modified]"
 msgstr " [変更あり]"
 
-#: ../buffer.c:2501
 msgid "[Not edited]"
 msgstr "[未編集]"
 
-#: ../buffer.c:2504
 msgid "[New file]"
 msgstr "[新ファイル]"
 
-#: ../buffer.c:2505
 msgid "[Read errors]"
 msgstr "[読込エラー]"
 
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
 msgid "[RO]"
 msgstr "[読専]"
 
-#: ../buffer.c:2507 ../fileio.c:1807
 msgid "[readonly]"
 msgstr "[読込専用]"
 
-#: ../buffer.c:2524
 #, c-format
 msgid "1 line --%d%%--"
 msgstr "1 行 --%d%%--"
 
-#: ../buffer.c:2526
 #, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> 行 --%d%%--"
+msgid "%ld lines --%d%%--"
+msgstr "%ld 行 --%d%%--"
 
-#: ../buffer.c:2530
 #, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "行 %<PRId64> (全体 %<PRId64>) --%d%%-- col "
+msgid "line %ld of %ld --%d%%-- col "
+msgstr "行 %ld (全体 %ld) --%d%%-- col "
 
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
 msgid "[No Name]"
 msgstr "[無名]"
 
 #. must be a help buffer
-#: ../buffer.c:2667
 msgid "help"
 msgstr "ヘルプ"
 
-#: ../buffer.c:3225 ../screen.c:4883
 msgid "[Help]"
 msgstr "[ヘルプ]"
 
-#: ../buffer.c:3254 ../screen.c:4887
 msgid "[Preview]"
 msgstr "[プレビュー]"
 
-#: ../buffer.c:3528
 msgid "All"
 msgstr "全て"
 
-#: ../buffer.c:3528
 msgid "Bot"
 msgstr "末尾"
 
-#: ../buffer.c:3531
 msgid "Top"
 msgstr "先頭"
 
-#: ../buffer.c:4244
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -228,11 +192,9 @@ msgstr ""
 "\n"
 "# バッファリスト:\n"
 
-#: ../buffer.c:4289
 msgid "[Scratch]"
 msgstr "[下書き]"
 
-#: ../buffer.c:4529
 msgid ""
 "\n"
 "--- Signs ---"
@@ -240,200 +202,235 @@ msgstr ""
 "\n"
 "--- サイン ---"
 
-#: ../buffer.c:4538
 #, c-format
 msgid "Signs for %s:"
 msgstr "%s のサイン:"
 
-#: ../buffer.c:4543
 #, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    行=%<PRId64>  識別子=%d  名前=%s"
+msgid "    line=%ld  id=%d  name=%s"
+msgstr "    行=%ld  識別子=%d  名前=%s"
 
-#: ../cursor_shape.c:68
-msgid "E545: Missing colon"
-msgstr "E545: コロンがありません"
+msgid "E902: Cannot connect to port"
+msgstr "E902: ポートに接続できません"
 
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
-msgid "E546: Illegal mode"
-msgstr "E546: 不正なモードです"
+msgid "E901: gethostbyname() in channel_open()"
+msgstr "E901: channel_open() 内の gethostbyname() が失敗しました"
 
-#: ../cursor_shape.c:134
-msgid "E548: digit expected"
-msgstr "E548: 数値が必要です"
+msgid "E898: socket() in channel_open()"
+msgstr "E898: channel_open() 内の socket() が失敗しました"
 
-#: ../cursor_shape.c:138
-msgid "E549: Illegal percentage"
-msgstr "E549: 不正なパーセンテージです"
+msgid "E903: received command with non-string argument"
+msgstr "E903: 非文字列の引数のコマンドを受信しました"
+
+msgid "E904: last argument for expr/call must be a number"
+msgstr "E904: expr/call の最後の引数は数字でなければなりません"
+
+msgid "E904: third argument for call must be a list"
+msgstr "E904: call の3番目の引数はリスト型でなければなりません"
 
-#: ../diff.c:146
 #, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: %<PRId64> 以上のバッファはdiffできません"
+msgid "E905: received unknown command: %s"
+msgstr "E905: 未知のコマンドを受信しました: %s"
+
+#, c-format
+msgid "E630: %s(): write while not connected"
+msgstr "E630: %s(): 非接続状態で書き込みました"
+
+#, c-format
+msgid "E631: %s(): write failed"
+msgstr "E631: %s(): 書き込みに失敗しました"
+
+#, c-format
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: %s() にコールバックは使えません"
+
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr "E912: 生や nl チャンネルに ch_evalexpr()/ch_sendexpr は使えません"
+
+msgid "E906: not an open channel"
+msgstr "E906: 開いていないチャンネルです"
+
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: _io ファイルは _name の設定が必要です"
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: in_io バッファは in_buf か in_name の設定が必要です"
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: バッファがロードされてなければなりません: %s"
+
+msgid "E821: File is encrypted with unknown method"
+msgstr "E821: ファイルが未知の方法で暗号化されています"
+
+msgid "Warning: Using a weak encryption method; see :help 'cm'"
+msgstr "警告: 弱い暗号方法を使っています; :help 'cm' を参照してください"
+
+msgid "Enter encryption key: "
+msgstr "暗号化用のキーを入力してください: "
+
+msgid "Enter same key again: "
+msgstr "もう一度同じキーを入力してください: "
+
+msgid "Keys don't match!"
+msgstr "キーが一致しません"
+
+msgid "[crypted]"
+msgstr "[暗号化]"
+
+#, c-format
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: 辞書型にコロンがありません: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: 辞書型に重複キーがあります: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: 辞書型にカンマがありません: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: 辞書型の最後に '}' がありません: %s"
+
+msgid "extend() argument"
+msgstr "extend() の引数"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: キーは既に存在します: %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
+msgstr "E96: %ld 以上のバッファはdiffできません"
 
-#: ../diff.c:753
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: 一時ファイルの読込もしくは書込ができません"
 
-#: ../diff.c:755
 msgid "E97: Cannot create diffs"
 msgstr "E97: 差分を作成できません"
 
-#: ../diff.c:966
+msgid "Patch file"
+msgstr "パッチファイル"
+
 msgid "E816: Cannot read patch output"
 msgstr "E816: patchの出力を読込めません"
 
-#: ../diff.c:1220
 msgid "E98: Cannot read diff output"
 msgstr "E98: diffの出力を読込めません"
 
-#: ../diff.c:2081
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: 現在のバッファは差分モードではありません"
 
-#: ../diff.c:2100
 msgid "E793: No other buffer in diff mode is modifiable"
 msgstr "E793: 差分モードである他のバッファは変更できません"
 
-#: ../diff.c:2102
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: 差分モードである他のバッファはありません"
 
-#: ../diff.c:2112
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr ""
 "E101: 差分モードのバッファが2個以上あるので、どれを使うか特定できません"
 
-#: ../diff.c:2141
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: バッファ \"%s\" が見つかりません"
 
-#: ../diff.c:2152
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: バッファ \"%s\" は差分モードではありません"
 
-#: ../diff.c:2193
 msgid "E787: Buffer changed unexpectedly"
 msgstr "E787: 予期せずバッファが変更変更されました"
 
-#: ../digraph.c:1598
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: 合字にEscapeは使用できません"
 
-#: ../digraph.c:1760
 msgid "E544: Keymap file not found"
 msgstr "E544: キーマップファイルが見つかりません"
 
-#: ../digraph.c:1785
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: :source で取込むファイル以外では :loadkeymap を使えません"
 
-#: ../digraph.c:1821
 msgid "E791: Empty keymap entry"
 msgstr "E791: 空のキーマップエントリ"
 
-#: ../edit.c:82
 msgid " Keyword completion (^N^P)"
 msgstr " キーワード補完 (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
 msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 msgstr " ^X モード (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
-#: ../edit.c:85
 msgid " Whole line completion (^L^N^P)"
 msgstr " 行(全体)補完 (^L^N^P)"
 
-#: ../edit.c:86
 msgid " File name completion (^F^N^P)"
 msgstr " ファイル名補完 (^F^N^P)"
 
-#: ../edit.c:87
 msgid " Tag completion (^]^N^P)"
 msgstr " タグ補完 (^]^N^P)"
 
-#: ../edit.c:88
 msgid " Path pattern completion (^N^P)"
 msgstr " パスパターン補完 (^N^P)"
 
-#: ../edit.c:89
 msgid " Definition completion (^D^N^P)"
 msgstr " 定義補完 (^D^N^P)"
 
-#: ../edit.c:91
 msgid " Dictionary completion (^K^N^P)"
 msgstr " 辞書補完 (^K^N^P)"
 
-#: ../edit.c:92
 msgid " Thesaurus completion (^T^N^P)"
 msgstr " シソーラス補完 (^T^N^P)"
 
-#: ../edit.c:93
 msgid " Command-line completion (^V^N^P)"
 msgstr " コマンドライン補完 (^V^N^P)"
 
-#: ../edit.c:94
 msgid " User defined completion (^U^N^P)"
 msgstr " ユーザー定義補完 (^U^N^P)"
 
-#: ../edit.c:95
 msgid " Omni completion (^O^N^P)"
 msgstr " オムニ補完 (^O^N^P)"
 
-#: ../edit.c:96
 msgid " Spelling suggestion (s^N^P)"
 msgstr " 綴り修正候補 (s^N^P)"
 
-#: ../edit.c:97
 msgid " Keyword Local completion (^N^P)"
 msgstr " 局所キーワード補完 (^N^P)"
 
-#: ../edit.c:100
 msgid "Hit end of paragraph"
 msgstr "段落の最後にヒット"
 
-#: ../edit.c:101
 msgid "E839: Completion function changed window"
 msgstr "E839: 補間関数がウィンドウを変更しました"
 
-#: ../edit.c:102
 msgid "E840: Completion function deleted text"
 msgstr "E840: 補完関数がテキストを削除しました"
 
-#: ../edit.c:1847
 msgid "'dictionary' option is empty"
 msgstr "'dictionary' オプションが空です"
 
-#: ../edit.c:1848
 msgid "'thesaurus' option is empty"
 msgstr "'thesaurus' オプションが空です"
 
-#: ../edit.c:2655
 #, c-format
 msgid "Scanning dictionary: %s"
 msgstr "辞書をスキャン中: %s"
 
-#: ../edit.c:3079
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (挿入) スクロール(^E/^Y)"
 
-#: ../edit.c:3081
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (置換) スクロール (^E/^Y)"
 
-#: ../edit.c:3587
 #, c-format
 msgid "Scanning: %s"
 msgstr "スキャン中: %s"
 
-#: ../edit.c:3614
 msgid "Scanning tags."
 msgstr "タグをスキャン中."
 
-#: ../edit.c:4519
 msgid " Adding"
 msgstr " 追加中"
 
@@ -441,430 +438,161 @@ msgstr " 追加中"
 #. * be called before line = ml_get(), or when this address is no
 #. * longer needed.  -- Acevedo.
 #.
-#: ../edit.c:4562
 msgid "-- Searching..."
 msgstr "-- 検索中..."
 
-#: ../edit.c:4618
 msgid "Back at original"
 msgstr "始めに戻る"
 
-#: ../edit.c:4621
 msgid "Word from other line"
 msgstr "他の行の単語"
 
-#: ../edit.c:4624
 msgid "The only match"
 msgstr "唯一の該当"
 
-#: ../edit.c:4680
 #, c-format
 msgid "match %d of %d"
 msgstr "%d 番目の該当 (全該当 %d 個中)"
 
-#: ../edit.c:4684
 #, c-format
 msgid "match %d"
 msgstr "%d 番目の該当"
 
-#: ../eval.c:137
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: 予期せぬ文字が :let にありました"
 
-#: ../eval.c:138
-#, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: リストのインデックスが範囲外です: %<PRId64>"
-
-#: ../eval.c:139
 #, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: 未定義の変数です: %s"
 
-#: ../eval.c:140
 msgid "E111: Missing ']'"
 msgstr "E111: ']' が見つかりません"
 
-#: ../eval.c:141
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: %s の引数はリスト型でなければなりません"
-
-#: ../eval.c:143
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: %s の引数はリスト型または辞書型でなければなりません"
-
-#: ../eval.c:144
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: 辞書型に空のキーを使うことはできません"
-
-#: ../eval.c:145
-msgid "E714: List required"
-msgstr "E714: リスト型が必要です"
-
-#: ../eval.c:146
-msgid "E715: Dictionary required"
-msgstr "E715: 辞書型が必要です"
-
-#: ../eval.c:147
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: 関数の引数が多過ぎます: %s"
-
-#: ../eval.c:148
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: 辞書型にキーが存在しません: %s"
-
-#: ../eval.c:150
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: 関数 %s は定義済です, 再定義するには ! を追加してください"
-
-#: ../eval.c:151
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: 辞書型内にエントリが既に存在します"
-
-#: ../eval.c:152
-msgid "E718: Funcref required"
-msgstr "E718: 関数参照型が要求されます"
-
-#: ../eval.c:153
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: [:] を辞書型と組み合わせては使えません"
 
-#: ../eval.c:154
 #, c-format
 msgid "E734: Wrong variable type for %s="
 msgstr "E734: 異なった型の変数です %s="
 
-#: ../eval.c:155
-#, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: 未知の関数です: %s"
-
-#: ../eval.c:156
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: 不正な変数名です: %s"
 
-#: ../eval.c:157
 msgid "E806: using Float as a String"
 msgstr "E806: 浮動小数点数を文字列として扱っています"
 
-#: ../eval.c:1830
 msgid "E687: Less targets than List items"
 msgstr "E687: ターゲットがリスト型内の要素よりも少ないです"
 
-#: ../eval.c:1834
 msgid "E688: More targets than List items"
 msgstr "E688: ターゲットがリスト型内の要素よりも多いです"
 
-#: ../eval.c:1906
 msgid "Double ; in list of variables"
 msgstr "リスト型の値に2つ以上の ; が検出されました"
 
-#: ../eval.c:2078
 #, c-format
 msgid "E738: Can't list variables for %s"
 msgstr "E738: %s の値を一覧表示できません"
 
-#: ../eval.c:2391
 msgid "E689: Can only index a List or Dictionary"
 msgstr "E689: リスト型と辞書型以外はインデックス指定できません"
 
-#: ../eval.c:2396
 msgid "E708: [:] must come last"
 msgstr "E708: [:] は最後でなければいけません"
 
-#: ../eval.c:2439
 msgid "E709: [:] requires a List value"
 msgstr "E709: [:] にはリスト型の値が必要です"
 
-#: ../eval.c:2674
 msgid "E710: List value has more items than target"
 msgstr "E710: リスト型変数にターゲットよりも多い要素があります"
 
-#: ../eval.c:2678
 msgid "E711: List value has not enough items"
 msgstr "E711: リスト型変数に十分な数の要素がありません"
 
 #
-#: ../eval.c:2867
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: :for の後に \"in\" がありません"
 
-#: ../eval.c:3063
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: カッコ '(' がありません: %s"
-
-#: ../eval.c:3263
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: その変数はありません: \"%s\""
 
-#: ../eval.c:3333
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: (アン)ロックするには変数の入れ子が深過ぎます"
 
-#: ../eval.c:3630
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: '?' の後に ':' がありません"
 
-#: ../eval.c:3893
 msgid "E691: Can only compare List with List"
 msgstr "E691: リスト型はリスト型としか比較できません"
 
-#: ../eval.c:3895
-msgid "E692: Invalid operation for Lists"
+msgid "E692: Invalid operation for List"
 msgstr "E692: リスト型には無効な操作です"
 
-#: ../eval.c:3915
 msgid "E735: Can only compare Dictionary with Dictionary"
 msgstr "E735: 辞書型は辞書型としか比較できません"
 
-#: ../eval.c:3917
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: 辞書型には無効な操作です"
 
-#: ../eval.c:3932
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: 関数参照型は関数参照型としか比較できません"
-
-#: ../eval.c:3934
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: 関数参照型には無効な操作です"
 
-#: ../eval.c:4277
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: '%' を浮動小数点数と組み合わせては使えません"
 
-#: ../eval.c:4478
 msgid "E110: Missing ')'"
 msgstr "E110: ')' が見つかりません"
 
-#: ../eval.c:4609
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: 関数参照型はインデックスできません"
 
-#: ../eval.c:4839
+msgid "E909: Cannot index a special variable"
+msgstr "E909: 特殊変数はインデックスできません"
+
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: オプション名がありません: %s"
 
-#: ../eval.c:4855
 #, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: 未知のオプションです: %s"
 
-#: ../eval.c:4904
 #, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: 引用符 (\") がありません: %s"
 
-#: ../eval.c:5020
 #, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: 引用符 (') がありません: %s"
 
-#: ../eval.c:5084
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: リスト型にカンマがありません: %s"
-
-#: ../eval.c:5091
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: リスト型の最後に ']' がありません: %s"
-
 msgid "Not enough memory to set references, garbage collection aborted!"
 msgstr ""
 "ガーベッジコレクションを中止しました! 参照を作成するのにメモリが不足しました"
 
-#: ../eval.c:6475
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: 辞書型にコロンがありません: %s"
-
-#: ../eval.c:6499
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: 辞書型に重複キーがあります: \"%s\""
-
-#: ../eval.c:6517
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: 辞書型にカンマがありません: %s"
-
-#: ../eval.c:6524
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: 辞書型の最後に '}' がありません: %s"
-
-#: ../eval.c:6555
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: 表示するには変数の入れ子が深過ぎます"
 
-#: ../eval.c:7188
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: 関数の引数が多過ぎます: %s"
-
-#: ../eval.c:7190
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: 関数の無効な引数です: %s"
-
-#: ../eval.c:7377
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: 未知の関数です: %s"
-
-#: ../eval.c:7383
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: 関数の引数が足りません: %s"
-
-#: ../eval.c:7387
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: スクリプト以外で<SID>が使われました: %s"
-
-#: ../eval.c:7391
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: 辞書用関数が呼ばれましたが辞書がありません: %s"
-
-#: ../eval.c:7453
-msgid "E808: Number or Float required"
-msgstr "E808: 数値か浮動小数点数が必要です"
-
-#: ../eval.c:7503
-msgid "add() argument"
-msgstr "add() の引数"
-
-#: ../eval.c:7907
-msgid "E699: Too many arguments"
-msgstr "E699: 引数が多過ぎます"
-
-#: ../eval.c:8073
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: complete() は挿入モードでしか利用できません"
-
-#: ../eval.c:8156
-msgid "&Ok"
-msgstr "&Ok"
-
-#: ../eval.c:8676
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: キーは既に存在します: %s"
-
-#: ../eval.c:8692
-msgid "extend() argument"
-msgstr "extend() の引数"
-
-#: ../eval.c:8915
-msgid "map() argument"
-msgstr "map() の引数"
-
-#: ../eval.c:8916
-msgid "filter() argument"
-msgstr "filter() の引数"
-
-#: ../eval.c:9229
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld 行: "
-
-#: ../eval.c:9291
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700: 未知の関数です: %s"
-
-#: ../eval.c:10729
-msgid "called inputrestore() more often than inputsave()"
-msgstr "inputrestore() が inputsave() よりも多く呼ばれました"
-
-#: ../eval.c:10771
-msgid "insert() argument"
-msgstr "insert() の引数"
-
-#: ../eval.c:10841
-msgid "E786: Range not allowed"
-msgstr "E786: 範囲指定は許可されていません"
-
-#: ../eval.c:11140
-msgid "E701: Invalid type for len()"
-msgstr "E701: len() には無効な型です"
-
-#: ../eval.c:11980
-msgid "E726: Stride is zero"
-msgstr "E726: ストライド(前進量)が 0 です"
-
-#: ../eval.c:11982
-msgid "E727: Start past end"
-msgstr "E727: 開始位置が終了位置を越えました"
-
-#: ../eval.c:12024 ../eval.c:15297
-msgid "<empty>"
-msgstr "<空>"
-
-#: ../eval.c:12282
-msgid "remove() argument"
-msgstr "remove() の引数"
-
-# Added at 10-Mar-2004.
-#: ../eval.c:12466
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: シンボリックリンクが多過ぎます (循環している可能性があります)"
-
-#: ../eval.c:12593
-msgid "reverse() argument"
-msgstr "reverse() の引数"
-
-#: ../eval.c:13721
-msgid "sort() argument"
-msgstr "sort() の引数"
-
-#: ../eval.c:13721
-msgid "uniq() argument"
-msgstr "uniq() の引数"
-
-#: ../eval.c:13776
-msgid "E702: Sort compare function failed"
-msgstr "E702: ソートの比較関数が失敗しました"
-
-#: ../eval.c:13806
-msgid "E882: Uniq compare function failed"
-msgstr "E882: Uniq の比較関数が失敗しました"
-
-#: ../eval.c:14085
-msgid "(Invalid)"
-msgstr "(無効)"
-
-#: ../eval.c:14590
-msgid "E677: Error writing temp file"
-msgstr "E677: 一時ファイル書込中にエラーが発生しました"
-
-#: ../eval.c:16159
 msgid "E805: Using a Float as a Number"
 msgstr "E805: 浮動小数点数を数値として扱っています"
 
-#: ../eval.c:16162
 msgid "E703: Using a Funcref as a Number"
 msgstr "E703: 関数参照型を数値として扱っています。"
 
-#: ../eval.c:16170
 msgid "E745: Using a List as a Number"
 msgstr "E745: リスト型を数値として扱っています"
 
-#: ../eval.c:16173
 msgid "E728: Using a Dictionary as a Number"
 msgstr "E728: 辞書型を数値として扱っています"
 
+msgid "E910: Using a Job as a Number"
+msgstr "E910: ジョブを数値として扱っています"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: チャンネルを数値として扱っています。"
+
 msgid "E891: Using a Funcref as a Float"
 msgstr "E891: 関数参照型を浮動小数点数として扱っています。"
 
@@ -877,152 +605,53 @@ msgstr "E893: リスト型を浮動小数点数として扱っています"
 msgid "E894: Using a Dictionary as a Float"
 msgstr "E894: 辞書型を浮動小数点数として扱っています"
 
-#: ../eval.c:16259
+msgid "E907: Using a special value as a Float"
+msgstr "E907: 特殊値を浮動小数点数として扱っています"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: ジョブを浮動小数点数として扱っています"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: チャンネルを浮動小数点数として扱っています。"
+
 msgid "E729: using Funcref as a String"
 msgstr "E729: 関数参照型を文字列として扱っています"
 
-#: ../eval.c:16262
 msgid "E730: using List as a String"
 msgstr "E730: リスト型を文字列として扱っています"
 
-#: ../eval.c:16265
 msgid "E731: using Dictionary as a String"
 msgstr "E731: 辞書型を文字列として扱っています"
 
-#: ../eval.c:16619
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: 変数の型が一致しません: %s"
+msgid "E908: using an invalid value as a String"
+msgstr "E908: 無効な値を文字列として扱っています"
 
-#: ../eval.c:16705
 #, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: 変数 %s を削除できません"
 
-#: ../eval.c:16724
 #, c-format
 msgid "E704: Funcref variable name must start with a capital: %s"
 msgstr "E704: 関数参照型変数名は大文字で始まらなければなりません: %s"
 
-#: ../eval.c:16732
 #, c-format
 msgid "E705: Variable name conflicts with existing function: %s"
 msgstr "E705: 変数名が既存の関数名と衝突します: %s"
 
-#: ../eval.c:16763
 #, c-format
 msgid "E741: Value is locked: %s"
 msgstr "E741: 値がロックされています: %s"
 
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
 msgid "Unknown"
 msgstr "不明"
 
-#: ../eval.c:16768
 #, c-format
 msgid "E742: Cannot change value of %s"
 msgstr "E742: %s の値を変更できません"
 
-#: ../eval.c:16838
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: コピーを取るには変数の入れ子が深過ぎます"
 
-#: ../eval.c:17249
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: 未定義の関数です: %s"
-
-#: ../eval.c:17260
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: '(' がありません: %s"
-
-#: ../eval.c:17293
-msgid "E862: Cannot use g: here"
-msgstr "E862: ここでは g: は使えません"
-
-#: ../eval.c:17312
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: 不正な引数です: %s"
-
-#: ../eval.c:17323
-#, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E853: 引数名が重複しています: %s"
-
-#: ../eval.c:17416
-msgid "E126: Missing :endfunction"
-msgstr "E126: :endfunction がありません"
-
-#: ../eval.c:17537
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: 関数名が変数名と衝突します: %s"
-
-#: ../eval.c:17549
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr "E127: 関数 %s を再定義できません: 使用中です"
-
-#: ../eval.c:17604
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr "E746: 関数名がスクリプトのファイル名と一致しません: %s"
-
-#: ../eval.c:17716
-msgid "E129: Function name required"
-msgstr "E129: 関数名が要求されます"
-
-#: ../eval.c:17824
-#, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr "E128: 関数名は大文字か \"s:\" で始まらなければなりません: %s"
-
-#: ../eval.c:17833
-#, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr "E884: 関数名にはコロンは含められません: %s"
-
-#: ../eval.c:18336
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: 関数 %s を削除できません: 使用中です"
-
-#: ../eval.c:18441
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: 関数呼出の入れ子数が 'maxfuncdepth' を超えました"
-
-#: ../eval.c:18568
-#, c-format
-msgid "calling %s"
-msgstr "%s を実行中です"
-
-#: ../eval.c:18651
-#, c-format
-msgid "%s aborted"
-msgstr "%s が中断されました"
-
-#: ../eval.c:18653
-#, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s が #%<PRId64> を返しました"
-
-#: ../eval.c:18670
-#, c-format
-msgid "%s returning %s"
-msgstr "%s が %s を返しました"
-
-#: ../eval.c:18691 ../ex_cmds2.c:2695
-#, c-format
-msgid "continuing in %s"
-msgstr "%s の実行を継続中です"
-
-#: ../eval.c:18795
-msgid "E133: :return not inside a function"
-msgstr "E133: 関数外に :return がありました"
-
-#: ../eval.c:19159
 msgid ""
 "\n"
 "# global variables:\n"
@@ -1030,112 +659,226 @@ msgstr ""
 "\n"
 "# グローバル変数:\n"
 
-#: ../eval.c:19254
 msgid ""
 "\n"
 "\tLast set from "
 msgstr ""
 "\n"
-"\tLast set from "
+"\t最後にセットしたスクリプト: "
 
-#: ../eval.c:19272
-msgid "No old files"
-msgstr "古いファイルはありません"
+msgid "map() argument"
+msgstr "map() の引数"
+
+msgid "filter() argument"
+msgstr "filter() の引数"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: %s の引数はリスト型でなければなりません"
+
+msgid "E928: String required"
+msgstr "E928: 文字列が必要です"
+
+msgid "E808: Number or Float required"
+msgstr "E808: 数値か浮動小数点数が必要です"
+
+msgid "add() argument"
+msgstr "add() の引数"
+
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: complete() は挿入モードでしか利用できません"
+
+#.
+#. * Yes this is ugly, I don't particularly like it either.  But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all.  See below what 'ok' and 'ync' are used for.
+#.
+msgid "&Ok"
+msgstr "&Ok"
+
+#, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld 行: "
+
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: 未知の関数です: %s"
+
+msgid "E922: expected a dict"
+msgstr "E922: 辞書が期待されています"
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: function() の第 2 引数はリスト型または辞書型でなければなりません"
+
+msgid ""
+"&OK\n"
+"&Cancel"
+msgstr ""
+"決定(&O)\n"
+"キャンセル(&C)"
+
+msgid "called inputrestore() more often than inputsave()"
+msgstr "inputrestore() が inputsave() よりも多く呼ばれました"
+
+msgid "insert() argument"
+msgstr "insert() の引数"
+
+msgid "E786: Range not allowed"
+msgstr "E786: 範囲指定は許可されていません"
+
+msgid "E916: not a valid job"
+msgstr "E916: 有効なジョブではありません"
+
+msgid "E701: Invalid type for len()"
+msgstr "E701: len() には無効な型です"
+
+#, c-format
+msgid "E798: ID is reserved for \":match\": %ld"
+msgstr "E798: ID は \":match\" のために予約されています: %ld"
+
+msgid "E726: Stride is zero"
+msgstr "E726: ストライド(前進量)が 0 です"
+
+msgid "E727: Start past end"
+msgstr "E727: 開始位置が終了位置を越えました"
+
+msgid "<empty>"
+msgstr "<空>"
+
+msgid "E240: No connection to Vim server"
+msgstr "E240: Vim サーバーへの接続がありません"
+
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: %s へ送ることができません"
+
+msgid "E277: Unable to read a server reply"
+msgstr "E277: サーバーの応答がありません"
+
+msgid "remove() argument"
+msgstr "remove() の引数"
+
+# Added at 10-Mar-2004.
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: シンボリックリンクが多過ぎます (循環している可能性があります)"
+
+msgid "reverse() argument"
+msgstr "reverse() の引数"
+
+msgid "E258: Unable to send to client"
+msgstr "E258: クライアントへ送ることができません"
+
+#, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: 無効な操作です: %s"
+
+msgid "sort() argument"
+msgstr "sort() の引数"
+
+msgid "uniq() argument"
+msgstr "uniq() の引数"
+
+msgid "E702: Sort compare function failed"
+msgstr "E702: ソートの比較関数が失敗しました"
+
+msgid "E882: Uniq compare function failed"
+msgstr "E882: Uniq の比較関数が失敗しました"
+
+msgid "(Invalid)"
+msgstr "(無効)"
+
+#, c-format
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: 無効なサブマッチ番号: %d"
+
+msgid "E677: Error writing temp file"
+msgstr "E677: 一時ファイル書込中にエラーが発生しました"
+
+msgid "E921: Invalid callback argument"
+msgstr "E921: 無効なコールバック引数です"
 
-#: ../ex_cmds.c:122
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  16進数 %02x,  8進数 %03o"
 
-#: ../ex_cmds.c:145
 #, c-format
 msgid "> %d, Hex %04x, Octal %o"
 msgstr "> %d, 16進数 %04x, 8進数 %o"
 
-#: ../ex_cmds.c:146
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, 16進数 %08x, 8進数 %o"
 
-#: ../ex_cmds.c:684
 msgid "E134: Move lines into themselves"
 msgstr "E134: 行をそれ自身には移動できません"
 
-#: ../ex_cmds.c:747
 msgid "1 line moved"
 msgstr "1 行が移動されました"
 
-#: ../ex_cmds.c:749
 #, c-format
-msgid "%<PRId64> lines moved"
-msgstr "%<PRId64> 行が移動されました"
+msgid "%ld lines moved"
+msgstr "%ld 行が移動されました"
 
-#: ../ex_cmds.c:1175
 #, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "%<PRId64> 行がフィルタ処理されました"
+msgid "%ld lines filtered"
+msgstr "%ld 行がフィルタ処理されました"
 
-#: ../ex_cmds.c:1194
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr "E135: *フィルタ* autocommandは現在のバッファを変更してはいけません"
 
-#: ../ex_cmds.c:1244
 msgid "[No write since last change]\n"
 msgstr "[最後の変更が保存されていません]\n"
 
-#: ../ex_cmds.c:1424
 #, c-format
 msgid "%sviminfo: %s in line: "
 msgstr "%sviminfo: %s 行目: "
 
-#: ../ex_cmds.c:1431
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr "E136: viminfo: エラーが多過ぎるので, 以降はスキップします"
 
-#: ../ex_cmds.c:1458
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
 msgstr "viminfoファイル \"%s\"%s%s%s を読込み中"
 
-#: ../ex_cmds.c:1460
 msgid " info"
 msgstr " 情報"
 
-#: ../ex_cmds.c:1461
 msgid " marks"
 msgstr " マーク"
 
-#: ../ex_cmds.c:1462
 msgid " oldfiles"
 msgstr " 旧ファイル群"
 
-#: ../ex_cmds.c:1463
 msgid " FAILED"
 msgstr " 失敗"
 
 #. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: viminfoファイルが書込みできません: %s"
 
-#: ../ex_cmds.c:1626
+#, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: 一時viminfoファイルが多過ぎます! 例: %s"
+
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: viminfoファイル %s を保存できません!"
 
-#: ../ex_cmds.c:1635
 #, c-format
 msgid "Writing viminfo file \"%s\""
 msgstr "viminfoファイル \"%s\" を書込み中"
 
+#, c-format
+msgid "E886: Can't rename viminfo file to %s!"
+msgstr "E886: viminfoファイルを %s へ名前変更できません!"
+
 #. Write the info:
-#: ../ex_cmds.c:1720
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# この viminfo ファイルは Vim %s によって生成されました.\n"
 
-#: ../ex_cmds.c:1722
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -1143,47 +886,47 @@ msgstr ""
 "# 変更する際には十分注意してください!\n"
 "\n"
 
-#: ../ex_cmds.c:1723
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# このファイルが書かれた時の 'encoding' の値\n"
 
-#: ../ex_cmds.c:1800
 msgid "Illegal starting char"
 msgstr "不正な先頭文字です"
 
-#: ../ex_cmds.c:2162
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# '|' で始まる行の、文字通りのコピー:\n"
+
+msgid "Save As"
+msgstr "別名で保存"
+
 msgid "Write partial file?"
 msgstr "ファイルを部分的に保存しますか?"
 
-#: ../ex_cmds.c:2166
 msgid "E140: Use ! to write partial buffer"
 msgstr "E140: バッファを部分的に保存するには ! を使ってください"
 
-#: ../ex_cmds.c:2281
 #, c-format
 msgid "Overwrite existing file \"%s\"?"
 msgstr "既存のファイル \"%s\" を上書きしますか?"
 
-#: ../ex_cmds.c:2317
 #, c-format
 msgid "Swap file \"%s\" exists, overwrite anyway?"
 msgstr "スワップファイル \"%s\" が存在します. 上書きを強制しますか?"
 
-#: ../ex_cmds.c:2326
 #, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: スワップファイルが存在します: %s (:silent! を追加で上書)"
 
-#: ../ex_cmds.c:2381
 #, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: バッファ %<PRId64> には名前がありません"
+msgid "E141: No file name for buffer %ld"
+msgstr "E141: バッファ %ld には名前がありません"
 
-#: ../ex_cmds.c:2412
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: ファイルは保存されませんでした: 'write' オプションにより無効です"
 
-#: ../ex_cmds.c:2434
 #, c-format
 msgid ""
 "'readonly' option is set for \"%s\".\n"
@@ -1192,7 +935,6 @@ msgstr ""
 "\"%s\" には 'readonly' オプションが設定されています.\n"
 "上書き強制をしますか?"
 
-#: ../ex_cmds.c:2439
 #, c-format
 msgid ""
 "File permissions of \"%s\" are read-only.\n"
@@ -1203,83 +945,68 @@ msgstr ""
 "それでも恐らく書き込むことは可能です.\n"
 "継続しますか?"
 
-#: ../ex_cmds.c:2451
 #, c-format
 msgid "E505: \"%s\" is read-only (add ! to override)"
 msgstr "E505: \"%s\" は読込専用です (強制書込には ! を追加)"
 
-#: ../ex_cmds.c:3120
+msgid "Edit File"
+msgstr "ファイルを編集"
+
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: autocommandが予期せず新しいバッファ %s を削除しました"
 
-#: ../ex_cmds.c:3313
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: 数ではない引数が :z に渡されました"
 
-#: ../ex_cmds.c:3404
 msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: rvimではシェルコマンドを使えません"
 
-#: ../ex_cmds.c:3498
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr "E146: 正規表現は文字で区切ることができません"
 
-#: ../ex_cmds.c:3964
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "%s に置換しますか? (y/n/a/q/l/^E/^Y)"
 
-#: ../ex_cmds.c:4379
 msgid "(Interrupted) "
 msgstr "(割込まれました) "
 
-#: ../ex_cmds.c:4384
 msgid "1 match"
 msgstr "1 箇所該当しました"
 
-#: ../ex_cmds.c:4384
 msgid "1 substitution"
 msgstr "1 箇所置換しました"
 
-#: ../ex_cmds.c:4387
 #, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> 箇所該当しました"
+msgid "%ld matches"
+msgstr "%ld 箇所該当しました"
 
-#: ../ex_cmds.c:4388
 #, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64> 箇所置換しました"
+msgid "%ld substitutions"
+msgstr "%ld 箇所置換しました"
 
-#: ../ex_cmds.c:4392
 msgid " on 1 line"
 msgstr " (計 1 行内)"
 
-#: ../ex_cmds.c:4395
 #, c-format
-msgid " on %<PRId64> lines"
-msgstr " (計 %<PRId64> 行内)"
+msgid " on %ld lines"
+msgstr " (計 %ld 行内)"
 
-#: ../ex_cmds.c:4438
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: :global を再帰的には使えません"
 
-#: ../ex_cmds.c:4467
 msgid "E148: Regular expression missing from global"
 msgstr "E148: globalコマンドに正規表現が指定されていません"
 
-#: ../ex_cmds.c:4508
 #, c-format
 msgid "Pattern found in every line: %s"
 msgstr "パターンが全ての行で見つかりました: %s"
 
-#: ../ex_cmds.c:4510
 #, c-format
 msgid "Pattern not found: %s"
 msgstr "パターンは見つかりませんでした: %s"
 
-#: ../ex_cmds.c:4587
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -1289,110 +1016,102 @@ msgstr ""
 "# 最後に置換された文字列:\n"
 "$"
 
-#: ../ex_cmds.c:4679
 msgid "E478: Don't panic!"
 msgstr "E478: 慌てないでください"
 
-#: ../ex_cmds.c:4717
 #, c-format
 msgid "E661: Sorry, no '%s' help for %s"
 msgstr "E661: 残念ですが '%s' のヘルプが %s にはありません"
 
-#: ../ex_cmds.c:4719
 #, c-format
 msgid "E149: Sorry, no help for %s"
 msgstr "E149: 残念ですが %s にはヘルプがありません"
 
-#: ../ex_cmds.c:4751
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
 msgstr "残念ですがヘルプファイル \"%s\" が見つかりません"
 
-#: ../ex_cmds.c:5323
 #, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: ディレクトリではありません: %s"
+msgid "E151: No match: %s"
+msgstr "E151: マッチはありません: %s"
 
-#: ../ex_cmds.c:5446
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: 書込み用に %s を開けません"
 
-#: ../ex_cmds.c:5471
 #, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: 読込用に %s を開けません"
 
 # Added at 29-Apr-2004.
-#: ../ex_cmds.c:5500
 #, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
 msgstr "E670: 1つの言語のヘルプファイルに複数のエンコードが混在しています: %s"
 
-#: ../ex_cmds.c:5565
 #, c-format
 msgid "E154: Duplicate tag \"%s\" in file %s/%s"
 msgstr "E154: タグ \"%s\" がファイル %s/%s に重複しています"
 
-#: ../ex_cmds.c:5687
+#, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: ディレクトリではありません: %s"
+
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: 未知のsignコマンドです: %s"
 
-#: ../ex_cmds.c:5704
 msgid "E156: Missing sign name"
 msgstr "E156: sign名がありません"
 
-#: ../ex_cmds.c:5746
 msgid "E612: Too many signs defined"
 msgstr "E612: signの定義が多数見つかりました"
 
-#: ../ex_cmds.c:5813
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: 無効なsignのテキストです: %s"
 
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: 未知のsignです: %s"
 
-#: ../ex_cmds.c:5877
 msgid "E159: Missing sign number"
 msgstr "E159: signの番号がありません"
 
-#: ../ex_cmds.c:5971
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: 無効なバッファ名です: %s"
 
-#: ../ex_cmds.c:6008
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: 名前の無いバッファへはジャンプできません"
+
 #, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: 無効なsign識別子です: %<PRId64>"
+msgid "E157: Invalid sign ID: %ld"
+msgstr "E157: 無効なsign識別子です: %ld"
 
 #, c-format
 msgid "E885: Not possible to change sign %s"
 msgstr "E885: 変更できない sign です: %s"
 
-#: ../ex_cmds.c:6066
+# Added at 27-Jan-2004.
+msgid " (NOT FOUND)"
+msgstr " (見つかりません)"
+
 msgid " (not supported)"
 msgstr " (非サポート)"
 
-#: ../ex_cmds.c:6169
 msgid "[Deleted]"
 msgstr "[削除済]"
 
-#: ../ex_cmds2.c:139
+msgid "No old files"
+msgstr "古いファイルはありません"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "デバッグモードに入ります. 続けるには \"cont\" と入力してください."
 
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
 #, c-format
-msgid "line %<PRId64>: %s"
-msgstr "行 %<PRId64>: %s"
+msgid "line %ld: %s"
+msgstr "行 %ld: %s"
 
-#: ../ex_cmds2.c:145
 #, c-format
 msgid "cmd: %s"
 msgstr "コマンド: %s"
@@ -1404,232 +1123,184 @@ msgstr "フレームが 0 です"
 msgid "frame at highest level: %d"
 msgstr "最高レベルのフレーム: %d"
 
-#: ../ex_cmds2.c:322
 #, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "ブレークポイント \"%s%s\" 行 %<PRId64>"
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "ブレークポイント \"%s%s\" 行 %ld"
 
-#: ../ex_cmds2.c:581
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: ブレークポイントが見つかりません: %s"
 
-#: ../ex_cmds2.c:611
 msgid "No breakpoints defined"
 msgstr "ブレークポイントが定義されていません"
 
-#: ../ex_cmds2.c:617
 #, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s  行 %<PRId64>"
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  行 %ld"
 
-#: ../ex_cmds2.c:942
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: 初めに \":profile start {fname}\" を実行してください"
 
-#: ../ex_cmds2.c:1269
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "変更を \"%s\" に保存しますか?"
 
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
 msgid "Untitled"
 msgstr "無題"
 
-#: ../ex_cmds2.c:1421
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: バッファ \"%s\" の変更は保存されていません"
 
-#: ../ex_cmds2.c:1480
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "警告: 予期せず他バッファへ移動しました (autocommands を調べてください)"
 
-#: ../ex_cmds2.c:1826
 msgid "E163: There is only one file to edit"
 msgstr "E163: 編集するファイルは1つしかありません"
 
-#: ../ex_cmds2.c:1828
 msgid "E164: Cannot go before first file"
 msgstr "E164: 最初のファイルより前には行けません"
 
-#: ../ex_cmds2.c:1830
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: 最後のファイルを越えて後には行けません"
 
-#: ../ex_cmds2.c:2175
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: そのコンパイラには対応していません: %s"
 
-#: ../ex_cmds2.c:2257
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
 msgstr "\"%s\" を \"%s\" から検索中"
 
-#: ../ex_cmds2.c:2284
 #, c-format
 msgid "Searching for \"%s\""
 msgstr "\"%s\" を検索中"
 
-#: ../ex_cmds2.c:2307
 #, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "'runtimepath' の中には見つかりません: \"%s\""
+msgid "not found in '%s': \"%s\""
+msgstr "'%s' の中にはありません: \"%s\""
+
+msgid "Source Vim script"
+msgstr "Vimスクリプトの取込み"
 
-#: ../ex_cmds2.c:2472
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "ディレクトリは取込めません: \"%s\""
 
-#: ../ex_cmds2.c:2518
 #, c-format
 msgid "could not source \"%s\""
 msgstr "\"%s\" を取込めません"
 
-#: ../ex_cmds2.c:2520
 #, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "行 %<PRId64>: \"%s\" を取込めません"
+msgid "line %ld: could not source \"%s\""
+msgstr "行 %ld: \"%s\" を取込めません"
 
-#: ../ex_cmds2.c:2535
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "\"%s\" を取込中"
 
-#: ../ex_cmds2.c:2537
 #, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "行 %<PRId64>: %s を取込中"
+msgid "line %ld: sourcing \"%s\""
+msgstr "行 %ld: %s を取込中"
 
-#: ../ex_cmds2.c:2693
 #, c-format
 msgid "finished sourcing %s"
 msgstr "%s の取込を完了"
 
-#: ../ex_cmds2.c:2765
+#, c-format
+msgid "continuing in %s"
+msgstr "%s の実行を継続中です"
+
 msgid "modeline"
 msgstr "モード行"
 
-#: ../ex_cmds2.c:2767
 msgid "--cmd argument"
 msgstr "--cmd 引数"
 
-#: ../ex_cmds2.c:2769
 msgid "-c argument"
 msgstr "-c 引数"
 
-#: ../ex_cmds2.c:2771
 msgid "environment variable"
 msgstr "環境変数"
 
-#: ../ex_cmds2.c:2773
 msgid "error handler"
 msgstr "エラーハンドラ"
 
-#: ../ex_cmds2.c:3020
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr "W15: 警告: 行区切が不正です. ^M がないのでしょう"
 
-#: ../ex_cmds2.c:3139
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: :scriptencoding が取込スクリプト以外で使用されました"
 
-#: ../ex_cmds2.c:3166
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: :finish が取込スクリプト以外で使用されました"
 
-#: ../ex_cmds2.c:3389
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "現在の %s言語: \"%s\""
 
-#: ../ex_cmds2.c:3404
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: 言語を \"%s\" に設定できません"
 
-#. don't redisplay the window
-#. don't wait for return
-#: ../ex_docmd.c:387
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr ""
 "Exモードに入ります. ノーマルモードに戻るには\"visual\"と入力してください."
 
-#: ../ex_docmd.c:428
 msgid "E501: At end-of-file"
 msgstr "E501: ファイルの終了位置"
 
-#: ../ex_docmd.c:513
 msgid "E169: Command too recursive"
 msgstr "E169: コマンドが再帰的過ぎます"
 
-#: ../ex_docmd.c:1006
 #, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: 例外が捕捉されませんでした: %s"
 
-#: ../ex_docmd.c:1085
 msgid "End of sourced file"
 msgstr "取込ファイルの最後です"
 
-#: ../ex_docmd.c:1086
 msgid "End of function"
 msgstr "関数の最後です"
 
-#: ../ex_docmd.c:1628
 msgid "E464: Ambiguous use of user-defined command"
 msgstr "E464: ユーザー定義コマンドのあいまいな使用です"
 
-#: ../ex_docmd.c:1638
 msgid "E492: Not an editor command"
 msgstr "E492: エディタのコマンドではありません"
 
-#: ../ex_docmd.c:1729
 msgid "E493: Backwards range given"
 msgstr "E493: 逆さまの範囲が指定されました"
 
-#: ../ex_docmd.c:1733
 msgid "Backwards range given, OK to swap"
 msgstr "逆さまの範囲が指定されました, 入替えますか?"
 
-#. append
-#. typed wrong
-#: ../ex_docmd.c:1787
 msgid "E494: Use w or w>>"
 msgstr "E494: w もしくは w>> を使用してください"
 
-#: ../ex_docmd.c:3454
-msgid "E319: The command is not available in this version"
+msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: このバージョンではこのコマンドは利用できません, ごめんなさい"
 
-#: ../ex_docmd.c:3752
 msgid "E172: Only one file name allowed"
 msgstr "E172: ファイル名は 1 つにしてください"
 
-#: ../ex_docmd.c:4238
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "編集すべきファイルが 1 個ありますが, 終了しますか?"
 
-#: ../ex_docmd.c:4242
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "編集すべきファイルがあと %d 個ありますが, 終了しますか?"
 
-#: ../ex_docmd.c:4248
 msgid "E173: 1 more file to edit"
 msgstr "E173: 編集すべきファイルが 1 個あります"
 
-#: ../ex_docmd.c:4250
 #, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: 編集すべきファイルがあと %<PRId64> 個あります"
+msgid "E173: %ld more files to edit"
+msgstr "E173: 編集すべきファイルがあと %ld 個あります"
 
-#: ../ex_docmd.c:4320
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: コマンドが既にあります: 再定義するには ! を追加してください"
 
-#: ../ex_docmd.c:4432
 msgid ""
 "\n"
 "    Name        Args       Address   Complete  Definition"
@@ -1637,51 +1308,40 @@ msgstr ""
 "\n"
 "    名前        引数       アドレス  補完      定義"
 
-#: ../ex_docmd.c:4516
 msgid "No user-defined commands found"
 msgstr "ユーザー定義コマンドが見つかりませんでした"
 
-#: ../ex_docmd.c:4538
 msgid "E175: No attribute specified"
 msgstr "E175: 属性は定義されていません"
 
-#: ../ex_docmd.c:4583
 msgid "E176: Invalid number of arguments"
 msgstr "E176: 引数の数が無効です"
 
-#: ../ex_docmd.c:4594
 msgid "E177: Count cannot be specified twice"
 msgstr "E177: カウントを2重指定することはできません"
 
-#: ../ex_docmd.c:4603
 msgid "E178: Invalid default value for count"
 msgstr "E178: カウントの省略値が無効です"
 
-#: ../ex_docmd.c:4625
 msgid "E179: argument required for -complete"
 msgstr "E179: -complete には引数が必要です"
 
 msgid "E179: argument required for -addr"
 msgstr "E179: -addr には引数が必要です"
 
-#: ../ex_docmd.c:4635
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: 無効な属性です: %s"
 
-#: ../ex_docmd.c:4678
 msgid "E182: Invalid command name"
 msgstr "E182: 無効なコマンド名です"
 
-#: ../ex_docmd.c:4691
 msgid "E183: User defined commands must start with an uppercase letter"
 msgstr "E183: ユーザー定義コマンドは英大文字で始まらなければなりません"
 
-#: ../ex_docmd.c:4696
 msgid "E841: Reserved name, cannot be used for user defined command"
 msgstr "E841: 予約名なので, ユーザー定義コマンドに利用できません"
 
-#: ../ex_docmd.c:4751
 #, c-format
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: そのユーザー定義コマンドはありません: %s"
@@ -1690,293 +1350,261 @@ msgstr "E184: そのユーザー定義コマンドはありません: %s"
 msgid "E180: Invalid address type value: %s"
 msgstr "E180: 無効なアドレスタイプ値です: %s"
 
-#: ../ex_docmd.c:5219
 #, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: 無効な補完指定です: %s"
 
-#: ../ex_docmd.c:5225
 msgid "E468: Completion argument only allowed for custom completion"
 msgstr "E468: 補完引数はカスタム補完でしか使用できません"
 
-#: ../ex_docmd.c:5231
 msgid "E467: Custom completion requires a function argument"
 msgstr "E467: カスタム補完には引数として関数が必要です"
 
-#: ../ex_docmd.c:5257
+msgid "unknown"
+msgstr "不明"
+
 #, c-format
 msgid "E185: Cannot find color scheme '%s'"
 msgstr "E185: カラースキーム '%s' が見つかりません"
 
-#: ../ex_docmd.c:5263
 msgid "Greetings, Vim user!"
 msgstr "Vim 使いさん、やあ!"
 
-#: ../ex_docmd.c:5431
 msgid "E784: Cannot close last tab page"
 msgstr "E784: 最後のタブページを閉じることはできません"
 
-#: ../ex_docmd.c:5462
 msgid "Already only one tab page"
 msgstr "既にタブページは1つしかありません"
 
-#: ../ex_docmd.c:6004
+msgid "Edit File in new window"
+msgstr "新しいウィンドウでファイルを編集します"
+
 #, c-format
 msgid "Tab page %d"
 msgstr "タブページ %d"
 
-#: ../ex_docmd.c:6295
 msgid "No swap file"
 msgstr "スワップファイルがありません"
 
-#: ../ex_docmd.c:6478
+msgid "Append File"
+msgstr "追加ファイル"
+
 msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
 msgstr ""
 "E747: バッファが修正されているので, ディレクトリを変更できません (! を追加で"
 "上書)"
 
-#: ../ex_docmd.c:6485
 msgid "E186: No previous directory"
 msgstr "E186: 前のディレクトリはありません"
 
-#: ../ex_docmd.c:6530
 msgid "E187: Unknown"
 msgstr "E187: 未知"
 
-#: ../ex_docmd.c:6610
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: :winsize には2つの数値の引数が必要です"
 
-#: ../ex_docmd.c:6655
+#, c-format
+msgid "Window position: X %d, Y %d"
+msgstr "ウィンドウ位置: X %d, Y %d"
+
 msgid "E188: Obtaining window position not implemented for this platform"
 msgstr ""
 "E188: このプラットホームにはウィンドウ位置の取得機能は実装されていません"
 
-#: ../ex_docmd.c:6662
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: :winpos には2つの数値の引数が必要です"
 
-#: ../ex_docmd.c:7241
+msgid "E930: Cannot use :redir inside execute()"
+msgstr "E930: execute() の中では :redir は使えません"
+
+msgid "Save Redirection"
+msgstr "リダイレクトを保存します"
+
+msgid "Save View"
+msgstr "ビューを保存します"
+
+msgid "Save Session"
+msgstr "セッション情報を保存します"
+
+msgid "Save Setup"
+msgstr "設定を保存します"
+
 #, c-format
 msgid "E739: Cannot create directory: %s"
 msgstr "E739: ディレクトリを作成できません: %s"
 
-#: ../ex_docmd.c:7268
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
 msgstr "E189: \"%s\" が存在します (上書するには ! を追加してください)"
 
-#: ../ex_docmd.c:7273
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: \"%s\" を書込み用として開けません"
 
 #. set mark
-#: ../ex_docmd.c:7294
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: 引数は1文字の英字か引用符 (' か `) でなければいけません"
 
-#: ../ex_docmd.c:7333
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: :normal の再帰利用が深くなり過ぎました"
 
-#: ../ex_docmd.c:7807
+msgid "E809: #< is not available without the +eval feature"
+msgstr "E809: #< は +eval 機能が無いと利用できません"
+
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: '#'を置き換える副ファイルの名前がありません"
 
-#: ../ex_docmd.c:7841
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
 msgstr "E495: \"<afile>\"を置き換えるautocommandのファイル名がありません"
 
-#: ../ex_docmd.c:7850
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
 msgstr "E496: \"<abuf>\"を置き換えるautocommandバッファ番号がありません"
 
-#: ../ex_docmd.c:7861
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
 msgstr "E497: \"<amatch>\"を置き換えるautocommandの該当名がありません"
 
-#: ../ex_docmd.c:7870
 msgid "E498: no :source file name to substitute for \"<sfile>\""
 msgstr "E498: \"<sfile>\"を置き換える :source 対象ファイル名がありません"
 
-#: ../ex_docmd.c:7876
 msgid "E842: no line number to use for \"<slnum>\""
 msgstr "E842: \"<slnum>\"を置き換える行番号がありません"
 
-#: ../ex_docmd.c:7903
-#, fuzzy, c-format
+#, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr ""
 "E499: '%' や '#' が無名ファイルなので \":p:h\" を伴わない使い方はできません"
 
-#: ../ex_docmd.c:7905
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: 空文字列として評価されました"
 
-#: ../ex_docmd.c:8838
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: viminfoファイルを読込用として開けません"
 
-#: ../ex_eval.c:464
+msgid "E196: No digraphs in this version"
+msgstr "E196: このバージョンに合字はありません"
+
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: 'Vim' で始まる例外は :throw できません"
 
 #. always scroll up, don't overwrite
-#: ../ex_eval.c:496
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "例外が発生しました: %s"
 
-#: ../ex_eval.c:545
 #, c-format
 msgid "Exception finished: %s"
 msgstr "例外が収束しました: %s"
 
-#: ../ex_eval.c:546
 #, c-format
 msgid "Exception discarded: %s"
 msgstr "例外が破棄されました: %s"
 
-#: ../ex_eval.c:588 ../ex_eval.c:634
 #, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s, 行 %<PRId64>"
+msgid "%s, line %ld"
+msgstr "%s, 行 %ld"
 
 #. always scroll up, don't overwrite
-#: ../ex_eval.c:608
 #, c-format
 msgid "Exception caught: %s"
 msgstr "例外が捕捉されました: %s"
 
-#: ../ex_eval.c:676
 #, c-format
 msgid "%s made pending"
 msgstr "%s により未決定状態が生じました"
 
-#: ../ex_eval.c:679
 #, c-format
 msgid "%s resumed"
 msgstr "%s が再開しました"
 
-#: ../ex_eval.c:683
 #, c-format
 msgid "%s discarded"
 msgstr "%s が破棄されました"
 
-#: ../ex_eval.c:708
 msgid "Exception"
 msgstr "例外"
 
-#: ../ex_eval.c:713
 msgid "Error and interrupt"
 msgstr "エラーと割込み"
 
-#: ../ex_eval.c:715
 msgid "Error"
 msgstr "エラー"
 
 #. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
 msgid "Interrupt"
 msgstr "割込み"
 
-#: ../ex_eval.c:795
 msgid "E579: :if nesting too deep"
 msgstr "E579: :if の入れ子が深過ぎます"
 
-#: ../ex_eval.c:830
 msgid "E580: :endif without :if"
 msgstr "E580: :if のない :endif があります"
 
-#: ../ex_eval.c:873
 msgid "E581: :else without :if"
 msgstr "E581: :if のない :else があります"
 
-#: ../ex_eval.c:876
 msgid "E582: :elseif without :if"
 msgstr "E582: :if のない :elseif があります"
 
-#: ../ex_eval.c:880
 msgid "E583: multiple :else"
 msgstr "E583: 複数の :else があります"
 
-#: ../ex_eval.c:883
 msgid "E584: :elseif after :else"
 msgstr "E584: :else の後に :elseif があります"
 
-#: ../ex_eval.c:941
 msgid "E585: :while/:for nesting too deep"
 msgstr "E585: :while や :for の入れ子が深過ぎます"
 
-#: ../ex_eval.c:1028
 msgid "E586: :continue without :while or :for"
 msgstr "E586: :while や :for のない :continue があります"
 
-#: ../ex_eval.c:1061
 msgid "E587: :break without :while or :for"
 msgstr "E587: :while や :for のない :break があります"
 
-#: ../ex_eval.c:1102
 msgid "E732: Using :endfor with :while"
 msgstr "E732: :endfor を :while と組み合わせています"
 
-#: ../ex_eval.c:1104
 msgid "E733: Using :endwhile with :for"
 msgstr "E733: :endwhile を :for と組み合わせています"
 
-#: ../ex_eval.c:1247
 msgid "E601: :try nesting too deep"
 msgstr "E601: :try の入れ子が深過ぎます"
 
-#: ../ex_eval.c:1317
 msgid "E603: :catch without :try"
 msgstr "E603: :try のない :catch があります"
 
 #. Give up for a ":catch" after ":finally" and ignore it.
 #. * Just parse.
-#: ../ex_eval.c:1332
 msgid "E604: :catch after :finally"
 msgstr "E604: :finally の後に :catch があります"
 
-#: ../ex_eval.c:1451
 msgid "E606: :finally without :try"
 msgstr "E606: :try のない :finally があります"
 
 #. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
 msgid "E607: multiple :finally"
 msgstr "E607: 複数の :finally があります"
 
-#: ../ex_eval.c:1571
 msgid "E602: :endtry without :try"
 msgstr "E602: :try のない :endtry です"
 
-#: ../ex_eval.c:2026
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: 関数の外に :endfunction がありました"
 
-#: ../ex_getln.c:1643
 msgid "E788: Not allowed to edit another buffer now"
 msgstr "E788: 現在は他のバッファを編集することは許されません"
 
-#: ../ex_getln.c:1656
 msgid "E811: Not allowed to change buffer information now"
 msgstr "E811: 現在はバッファ情報を変更することは許されません"
 
-#: ../ex_getln.c:3178
 msgid "tagname"
 msgstr "タグ名"
 
-#: ../ex_getln.c:3181
 msgid " kind file\n"
 msgstr " ファイル種類\n"
 
-#: ../ex_getln.c:4799
 msgid "'history' option is zero"
 msgstr "オプション 'history' がゼロです"
 
-#: ../ex_getln.c:5046
 #, c-format
 msgid ""
 "\n"
@@ -1985,303 +1613,224 @@ msgstr ""
 "\n"
 "# %s 項目の履歴 (新しいものから古いものへ):\n"
 
-#: ../ex_getln.c:5047
 msgid "Command Line"
 msgstr "コマンドライン"
 
-#: ../ex_getln.c:5048
 msgid "Search String"
 msgstr "検索文字列"
 
-#: ../ex_getln.c:5049
 msgid "Expression"
 msgstr "式"
 
-#: ../ex_getln.c:5050
 msgid "Input Line"
 msgstr "入力行"
 
-#: ../ex_getln.c:5117
+msgid "Debug Line"
+msgstr "デバッグ行"
+
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar がコマンド長を超えました"
 
-#: ../ex_getln.c:5279
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: アクティブなウィンドウかバッファが削除されました"
 
-#: ../file_search.c:203
-msgid "E854: path too long for completion"
-msgstr "E854: パスが長過ぎて補完できません"
-
-#: ../file_search.c:446
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: 無効なパスです: '**[数値]' はpathの最後か '%s' が続いてないといけませ"
-"ん."
-
-#: ../file_search.c:1505
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: cdpathには \"%s\" というファイルがありません"
-
-#: ../file_search.c:1508
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: pathには \"%s\" というファイルがありません"
-
-#: ../file_search.c:1512
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: cdpathにはこれ以上 \"%s\" というファイルがありません"
-
-#: ../file_search.c:1515
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: パスにはこれ以上 \"%s\" というファイルがありません"
-
-#: ../fileio.c:137
 msgid "E812: Autocommands changed buffer or buffer name"
 msgstr "E812: autocommandがバッファかバッファ名を変更しました"
 
-#: ../fileio.c:368
 msgid "Illegal file name"
 msgstr "不正なファイル名"
 
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
 msgid "is a directory"
 msgstr "はディレクトリです"
 
-#: ../fileio.c:397
 msgid "is not a file"
 msgstr "はファイルではありません"
 
-#: ../fileio.c:508 ../fileio.c:3522
+msgid "is a device (disabled with 'opendevice' option)"
+msgstr "はデバイスです ('opendevice' オプションで回避できます)"
+
 msgid "[New File]"
 msgstr "[新ファイル]"
 
-#: ../fileio.c:511
 msgid "[New DIRECTORY]"
 msgstr "[新規ディレクトリ]"
 
-#: ../fileio.c:529 ../fileio.c:532
 msgid "[File too big]"
 msgstr "[ファイル過大]"
 
-#: ../fileio.c:534
 msgid "[Permission Denied]"
 msgstr "[権限がありません]"
 
-#: ../fileio.c:653
 msgid "E200: *ReadPre autocommands made the file unreadable"
 msgstr "E200: *ReadPre autocommand がファイルを読込不可にしました"
 
-#: ../fileio.c:655
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr "E201: *ReadPre autocommand は現在のバッファを変えられません"
 
-#: ../fileio.c:672
-msgid "Nvim: Reading from stdin...\n"
+msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: 標準入力から読込中...\n"
 
+msgid "Reading from stdin..."
+msgstr "標準入力から読込み中..."
+
 #. Re-opening the original file failed!
-#: ../fileio.c:909
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: 変換がファイルを読込不可にしました"
 
-#. fifo or socket
-#: ../fileio.c:1782
 msgid "[fifo/socket]"
 msgstr "[FIFO/ソケット]"
 
-#. fifo
-#: ../fileio.c:1788
 msgid "[fifo]"
 msgstr "[FIFO]"
 
-#. or socket
-#: ../fileio.c:1794
 msgid "[socket]"
 msgstr "[ソケット]"
 
-#. or character special
-#: ../fileio.c:1801
 msgid "[character special]"
 msgstr "[キャラクタ・デバイス]"
 
-#: ../fileio.c:1815
 msgid "[CR missing]"
 msgstr "[CR無]"
 
-#: ../fileio.c:1819
 msgid "[long lines split]"
 msgstr "[長行分割]"
 
-#: ../fileio.c:1823 ../fileio.c:3512
 msgid "[NOT converted]"
 msgstr "[未変換]"
 
-#: ../fileio.c:1826 ../fileio.c:3515
 msgid "[converted]"
 msgstr "[変換済]"
 
-#: ../fileio.c:1831
 #, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[%<PRId64> 行目で変換エラー]"
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[%ld 行目で変換エラー]"
 
-#: ../fileio.c:1835
 #, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[%<PRId64> 行目の不正なバイト]"
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[%ld 行目の不正なバイト]"
 
-#: ../fileio.c:1838
 msgid "[READ ERRORS]"
 msgstr "[読込エラー]"
 
-#: ../fileio.c:2104
 msgid "Can't find temp file for conversion"
 msgstr "変換に必要な一時ファイルが見つかりません"
 
-#: ../fileio.c:2110
 msgid "Conversion with 'charconvert' failed"
 msgstr "'charconvert' による変換が失敗しました"
 
-#: ../fileio.c:2113
 msgid "can't read output of 'charconvert'"
 msgstr "'charconvert' の出力を読込めませんでした"
 
-#: ../fileio.c:2437
 msgid "E676: No matching autocommands for acwrite buffer"
 msgstr "E676: acwriteバッファの該当するautocommandは存在しません"
 
-#: ../fileio.c:2466
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr "E203: 保存するバッファをautocommandが削除か解放しました"
 
-#: ../fileio.c:2486
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr "E204: autocommandが予期せぬ方法で行数を変更しました"
 
-#: ../fileio.c:2548 ../fileio.c:2565
+# Added at 19-Jan-2004.
+msgid "NetBeans disallows writes of unmodified buffers"
+msgstr "NetBeansは未変更のバッファを上書することは許可していません"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "NetBeansバッファの一部を書き出すことはできません"
+
 msgid "is not a file or writable device"
 msgstr "はファイルでも書込み可能デバイスでもありません"
 
-#: ../fileio.c:2601
+msgid "writing to device disabled with 'opendevice' option"
+msgstr "'opendevice' オプションによりデバイスへの書き込みはできません"
+
 msgid "is read-only (add ! to override)"
 msgstr "は読込専用です (強制書込には ! を追加)"
 
-#: ../fileio.c:2886
 msgid "E506: Can't write to backup file (add ! to override)"
 msgstr "E506: バックアップファイルを保存できません (! を追加で強制保存)"
 
-#: ../fileio.c:2898
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr ""
 "E507: バックアップファイルを閉じる際にエラーが発生しました (! を追加で強制)"
 
-#: ../fileio.c:2901
 msgid "E508: Can't read file for backup (add ! to override)"
 msgstr "E508: バックアップ用ファイルを読込めません (! を追加で強制読込)"
 
-#: ../fileio.c:2923
 msgid "E509: Cannot create backup file (add ! to override)"
 msgstr "E509: バックアップファイルを作れません (! を追加で強制作成)"
 
-#: ../fileio.c:3008
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr "E510: バックアップファイルを作れません (! を追加で強制作成)"
 
-#. Can't write without a tempfile!
-#: ../fileio.c:3121
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr "E460: リソースフォークが失われるかもしれません (! を追加で強制)"
+
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: 保存用一時ファイルが見つかりません"
 
-#: ../fileio.c:3134
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: 変換できません (! を追加で変換せずに保存)"
 
-#: ../fileio.c:3169
 msgid "E166: Can't open linked file for writing"
 msgstr "E166: リンクされたファイルに書込めません"
 
-#: ../fileio.c:3173
 msgid "E212: Can't open file for writing"
 msgstr "E212: 書込み用にファイルを開けません"
 
-#: ../fileio.c:3363
 msgid "E667: Fsync failed"
 msgstr "E667: fsync に失敗しました"
 
-#: ../fileio.c:3398
 msgid "E512: Close failed"
 msgstr "E512: 閉じることに失敗"
 
-#: ../fileio.c:3436
 msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
 msgstr "E513: 書込みエラー, 変換失敗 (上書するには 'fenc' を空にしてください)"
 
-#: ../fileio.c:3441
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
+"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: 書込みエラー, 変換失敗, 行数 %<PRId64> (上書するには 'fenc' を空にして"
-"ください)"
+"E513: 書込みエラー, 変換失敗, 行数 %ld (上書するには 'fenc' を空にしてくださ"
+"い)"
 
-#: ../fileio.c:3448
 msgid "E514: write error (file system full?)"
 msgstr "E514: 書込みエラー, (ファイルシステムが満杯?)"
 
-#: ../fileio.c:3506
 msgid " CONVERSION ERROR"
 msgstr " 変換エラー"
 
-#: ../fileio.c:3509
 #, c-format
-msgid " in line %<PRId64>;"
-msgstr " 行 %<PRId64>;"
+msgid " in line %ld;"
+msgstr " 行 %ld;"
 
-#: ../fileio.c:3519
 msgid "[Device]"
 msgstr "[デバイス]"
 
-#: ../fileio.c:3522
 msgid "[New]"
 msgstr "[新]"
 
-#: ../fileio.c:3535
 msgid " [a]"
 msgstr " [a]"
 
-#: ../fileio.c:3535
 msgid " appended"
 msgstr " 追加"
 
-#: ../fileio.c:3537
 msgid " [w]"
 msgstr " [w]"
 
-#: ../fileio.c:3537
 msgid " written"
 msgstr " 書込み"
 
-#: ../fileio.c:3579
 msgid "E205: Patchmode: can't save original file"
 msgstr "E205: patchmode: 原本ファイルを保存できません"
 
-#: ../fileio.c:3602
 msgid "E206: patchmode: can't touch empty original file"
 msgstr "E206: patchmode: 空の原本ファイルをtouchできません"
 
-#: ../fileio.c:3616
 msgid "E207: Can't delete backup file"
 msgstr "E207: バックアップファイルを消せません"
 
-#: ../fileio.c:3672
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
@@ -2289,134 +1838,105 @@ msgstr ""
 "\n"
 "警告: 原本ファイルが失われたか変更されました\n"
 
-#: ../fileio.c:3675
 msgid "don't quit the editor until the file is successfully written!"
 msgstr "ファイルの保存に成功するまでエディタを終了しないでください!"
 
-#: ../fileio.c:3795
 msgid "[dos]"
 msgstr "[dos]"
 
-#: ../fileio.c:3795
 msgid "[dos format]"
 msgstr "[dosフォーマット]"
 
-#: ../fileio.c:3801
 msgid "[mac]"
 msgstr "[mac]"
 
-#: ../fileio.c:3801
 msgid "[mac format]"
 msgstr "[macフォーマット]"
 
-#: ../fileio.c:3807
 msgid "[unix]"
 msgstr "[unix]"
 
-#: ../fileio.c:3807
 msgid "[unix format]"
 msgstr "[unixフォーマット]"
 
-#: ../fileio.c:3831
 msgid "1 line, "
 msgstr "1 行, "
 
-#: ../fileio.c:3833
 #, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> 行, "
+msgid "%ld lines, "
+msgstr "%ld 行, "
 
-#: ../fileio.c:3836
 msgid "1 character"
 msgstr "1 文字"
 
-#: ../fileio.c:3838
 #, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64> 文字"
+msgid "%lld characters"
+msgstr "%lld 文字"
 
-#: ../fileio.c:3849
 msgid "[noeol]"
 msgstr "[noeol]"
 
-#: ../fileio.c:3849
 msgid "[Incomplete last line]"
 msgstr "[最終行が不完全]"
 
 #. don't overwrite messages here
 #. must give this prompt
 #. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "警告: 読込んだ後にファイルに変更がありました!!!"
 
-#: ../fileio.c:3867
 msgid "Do you really want to write to it"
 msgstr "本当に上書きしますか"
 
-#: ../fileio.c:4648
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: \"%s\" を書込み中のエラーです"
 
-#: ../fileio.c:4655
 #, c-format
 msgid "E209: Error closing \"%s\""
 msgstr "E209: \"%s\" を閉じる時にエラーです"
 
-#: ../fileio.c:4657
 #, c-format
 msgid "E210: Error reading \"%s\""
 msgstr "E210: \"%s\" を読込中のエラーです"
 
-#: ../fileio.c:4883
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: autocommand の FileChangedShell がバッファを削除しました"
 
-#: ../fileio.c:4894
 #, c-format
 msgid "E211: File \"%s\" no longer available"
 msgstr "E211: ファイル \"%s\" は既に存在しません"
 
-#: ../fileio.c:4906
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
 "well"
 msgstr "W12: 警告: ファイル \"%s\" が変更されVimのバッファも変更されました"
 
-#: ../fileio.c:4907
 msgid "See \":help W12\" for more info."
 msgstr "詳細は \":help W12\" を参照してください"
 
-#: ../fileio.c:4910
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
 msgstr "W11: 警告: ファイル \"%s\" は編集開始後に変更されました"
 
-#: ../fileio.c:4911
 msgid "See \":help W11\" for more info."
 msgstr "詳細は \":help W11\" を参照してください"
 
-#: ../fileio.c:4914
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr "W16: 警告: ファイル \"%s\" のモードが編集開始後に変更されました"
 
-#: ../fileio.c:4915
 msgid "See \":help W16\" for more info."
 msgstr "詳細は \":help W16\" を参照してください"
 
-#: ../fileio.c:4927
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr "W13: 警告: ファイル \"%s\" は編集開始後に作成されました"
 
-#: ../fileio.c:4947
 msgid "Warning"
 msgstr "警告"
 
-#: ../fileio.c:4948
 msgid ""
 "&OK\n"
 "&Load File"
@@ -2424,48 +1944,45 @@ msgstr ""
 "&OK\n"
 "ファイル読込(&L)"
 
-#: ../fileio.c:5065
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
 msgstr "E462: \"%s\" をリロードする準備ができませんでした"
 
-#: ../fileio.c:5078
 #, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: \"%s\" はリロードできませんでした"
 
-#: ../fileio.c:5601
 msgid "--Deleted--"
 msgstr "--削除済--"
 
-#: ../fileio.c:5732
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "autocommand: %s <バッファ=%d> が自動的に削除されます"
 
 #. the group doesn't exist
-#: ../fileio.c:5772
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: そのグループはありません: \"%s\""
 
-#: ../fileio.c:5897
+msgid "E936: Cannot delete the current group"
+msgstr "E936: 現在のグループは削除できません"
+
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: 使用中の augroup を消そうとしています"
+
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: * の後に不正な文字がありました: %s"
 
-#: ../fileio.c:5905
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: そのようなイベントはありません: %s"
 
-#: ../fileio.c:5907
 #, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: そのようなグループもしくはイベントはありません: %s"
 
 #. Highlight title
-#: ../fileio.c:6090
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@@ -2473,756 +1990,555 @@ msgstr ""
 "\n"
 "--- Auto-Commands ---"
 
-#: ../fileio.c:6293
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
 msgstr "E680: <バッファ=%d>: 無効なバッファ番号です "
 
-#: ../fileio.c:6370
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: 全てのイベントに対してのautocommandは実行できません"
 
-#: ../fileio.c:6393
 msgid "No matching autocommands"
 msgstr "該当するautocommandは存在しません"
 
-#: ../fileio.c:6831
 msgid "E218: autocommand nesting too deep"
 msgstr "E218: autocommandの入れ子が深過ぎます"
 
-#: ../fileio.c:7143
 #, c-format
 msgid "%s Auto commands for \"%s\""
 msgstr "%s Auto commands for \"%s\""
 
-#: ../fileio.c:7149
 #, c-format
 msgid "Executing %s"
 msgstr "%s を実行しています"
 
-#: ../fileio.c:7211
 #, c-format
 msgid "autocommand %s"
 msgstr "autocommand %s"
 
-#: ../fileio.c:7795
 msgid "E219: Missing {."
 msgstr "E219: { がありません."
 
-#: ../fileio.c:7797
 msgid "E220: Missing }."
 msgstr "E220: } がありません."
 
-#: ../fold.c:93
 msgid "E490: No fold found"
 msgstr "E490: 折畳みがありません"
 
-#: ../fold.c:544
 msgid "E350: Cannot create fold with current 'foldmethod'"
 msgstr "E350: 現在の 'foldmethod' では折畳みを作成できません"
 
-#: ../fold.c:546
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: 現在の 'foldmethod' では折畳みを削除できません"
 
-#: ../fold.c:1784
 #, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld 行が折畳まれました "
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld 行が折畳まれました "
 
-#. buffer has already been read
-#: ../getchar.c:273
 msgid "E222: Add to read buffer"
 msgstr "E222: 読込バッファへ追加"
 
-#: ../getchar.c:2040
 msgid "E223: recursive mapping"
 msgstr "E223: 再帰的マッピング"
 
-#: ../getchar.c:2849
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: %s というグローバル短縮入力は既に存在します"
 
-#: ../getchar.c:2852
 #, c-format
 msgid "E225: global mapping already exists for %s"
 msgstr "E225: %s というグローバルマッピングは既に存在します"
 
-#: ../getchar.c:2952
 #, c-format
 msgid "E226: abbreviation already exists for %s"
 msgstr "E226: %s という短縮入力は既に存在します"
 
-#: ../getchar.c:2955
 #, c-format
 msgid "E227: mapping already exists for %s"
 msgstr "E227: %s というマッピングは既に存在します"
 
-#: ../getchar.c:3008
 msgid "No abbreviation found"
 msgstr "短縮入力は見つかりませんでした"
 
-#: ../getchar.c:3010
 msgid "No mapping found"
 msgstr "マッピングは見つかりませんでした"
 
-#: ../getchar.c:3974
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: 不正なモード"
 
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-#: ../globals.h:924
-msgid "--No lines in buffer--"
-msgstr "--バッファに行がありません--"
+msgid "E851: Failed to create a new process for the GUI"
+msgstr "E851: GUI用のプロセスの起動に失敗しました"
 
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-#: ../globals.h:996
-msgid "E470: Command aborted"
-msgstr "E470: コマンドが中断されました"
+msgid "E852: The child process failed to start the GUI"
+msgstr "E852: 子プロセスがGUIの起動に失敗しました"
 
-#: ../globals.h:997
-msgid "E471: Argument required"
-msgstr "E471: 引数が必要です"
+msgid "E229: Cannot start the GUI"
+msgstr "E229: GUIを開始できません"
 
-#: ../globals.h:998
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: \\ の後は / か ? か & でなければなりません"
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: \"%s\"から読込むことができません"
 
-#: ../globals.h:1000
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
-msgstr "E11: コマンドラインでは無効です; <CR>で実行, CTRL-Cでやめる"
+msgid "E665: Cannot start GUI, no valid font found"
+msgstr "E665: 有効なフォントが見つからないので, GUIを開始できません"
 
-#: ../globals.h:1002
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: 'guifontwide' が無効です"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: 'imactivatekey' に設定された値が無効です"
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: %s の色を割り当てられません"
+
+msgid "No match at cursor, finding next"
+msgstr "カーソルの位置にマッチはありません, 次を検索しています"
+
+msgid "<cannot open> "
+msgstr "<開けません> "
+
+#, c-format
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: フォント %s を取得できません"
+
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile: 現在のディレクトリに戻れません"
+
+msgid "Pathname:"
+msgstr "パス名:"
+
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: 現在のディレクトリを取得できません"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Cancel"
+msgstr "キャンセル"
+
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
+msgstr "スクロールバー: 画像を取得できませんでした."
+
+msgid "Vim dialog"
+msgstr "Vim ダイアログ"
+
+msgid "E232: Cannot create BalloonEval with both message and callback"
+msgstr "E232: メッセージとコールバックのある BalloonEval を作成できません"
+
+msgid "_Cancel"
+msgstr "キャンセル(_C)"
+
+msgid "_Save"
+msgstr "保存(_S)"
+
+msgid "_Open"
+msgstr "開く(_O)"
+
+msgid "_OK"
+msgstr "_OK"
+
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
 msgstr ""
-"E12: 現在のディレクトリやタグ検索ではexrc/vimrcのコマンドは許可されません"
+"はい(&Y)\n"
+"いいえ(&N)\n"
+"キャンセル(&C)"
 
-#: ../globals.h:1003
-msgid "E171: Missing :endif"
-msgstr "E171: :endif がありません"
+msgid "Yes"
+msgstr "はい"
 
-#: ../globals.h:1004
-msgid "E600: Missing :endtry"
-msgstr "E600: :endtry がありません"
+msgid "No"
+msgstr "いいえ"
 
-#: ../globals.h:1005
-msgid "E170: Missing :endwhile"
-msgstr "E170: :endwhile がありません"
+msgid "Input _Methods"
+msgstr "インプットメソッド"
 
-#: ../globals.h:1006
-msgid "E170: Missing :endfor"
-msgstr "E170: :endfor がありません"
+msgid "VIM - Search and Replace..."
+msgstr "VIM - 検索と置換..."
 
-#: ../globals.h:1007
-msgid "E588: :endwhile without :while"
-msgstr "E588: :while のない :endwhile があります"
+msgid "VIM - Search..."
+msgstr "VIM - 検索..."
 
-#: ../globals.h:1008
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor のない :for があります"
+msgid "Find what:"
+msgstr "検索文字列:"
 
-#: ../globals.h:1009
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: ファイルが存在します (! を追加で上書)"
+msgid "Replace with:"
+msgstr "置換文字列:"
 
-#: ../globals.h:1010
-msgid "E472: Command failed"
-msgstr "E472: コマンドが失敗しました"
+#. whole word only button
+msgid "Match whole word only"
+msgstr "正確に該当するものだけ"
 
-#: ../globals.h:1011
-msgid "E473: Internal error"
-msgstr "E473: 内部エラーです"
+#. match case button
+msgid "Match case"
+msgstr "大文字/小文字を区別する"
 
-#: ../globals.h:1012
-msgid "Interrupted"
-msgstr "割込まれました"
+msgid "Direction"
+msgstr "方向"
 
-#: ../globals.h:1013
-msgid "E14: Invalid address"
-msgstr "E14: 無効なアドレスです"
+#. 'Up' and 'Down' buttons
+msgid "Up"
+msgstr "上"
 
-#: ../globals.h:1014
-msgid "E474: Invalid argument"
-msgstr "E474: 無効な引数です"
+msgid "Down"
+msgstr "下"
+
+msgid "Find Next"
+msgstr "次を検索"
+
+msgid "Replace"
+msgstr "置換"
+
+msgid "Replace All"
+msgstr "全て置換"
+
+msgid "_Close"
+msgstr "閉じる(_C)"
+
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: セッションマネージャから \"die\" 要求を受け取りました\n"
+
+msgid "Close tab"
+msgstr "タブページを閉じる"
+
+msgid "New tab"
+msgstr "新規タブページ"
+
+msgid "Open Tab..."
+msgstr "タブページを開く..."
+
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim: メインウィンドウが不意に破壊されました\n"
+
+msgid "&Filter"
+msgstr "フィルタ(&F)"
+
+msgid "&Cancel"
+msgstr "キャンセル(&C)"
+
+msgid "Directories"
+msgstr "ディレクトリ"
+
+msgid "Filter"
+msgstr "フィルタ"
+
+msgid "&Help"
+msgstr "ヘルプ(&H)"
+
+msgid "Files"
+msgstr "ファイル"
+
+msgid "&OK"
+msgstr "&OK"
+
+msgid "Selection"
+msgstr "選択"
+
+msgid "Find &Next"
+msgstr "次を検索(&N)"
+
+msgid "&Replace"
+msgstr "置換(&R)"
+
+msgid "Replace &All"
+msgstr "全て置換(&A)"
+
+msgid "&Undo"
+msgstr "アンドゥ(&U)"
+
+msgid "Open tab..."
+msgstr "タブページを開く"
+
+msgid "Find string (use '\\\\' to find  a '\\')"
+msgstr "検索文字列 ('\\' を検索するには '\\\\')"
+
+msgid "Find & Replace (use '\\\\' to find  a '\\')"
+msgstr "検索・置換 ('\\' を検索するには '\\\\')"
+
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+msgid "Not Used"
+msgstr "使われません"
+
+msgid "Directory\t*.nothing\n"
+msgstr "ディレクトリ\t*.nothing\n"
 
-#: ../globals.h:1015
 #, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: 無効な引数です: %s"
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: タイトルが \"%s\" のウィンドウは見つかりません"
 
-#: ../globals.h:1016
 #, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: 無効な式です: %s"
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: 引数はサポートされません: \"-%s\"; OLE版を使用してください."
 
-#: ../globals.h:1017
-msgid "E16: Invalid range"
-msgstr "E16: 無効な範囲です"
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: MDIアプリの中ではウィンドウを開けません"
 
-#: ../globals.h:1018
-msgid "E476: Invalid command"
-msgstr "E476: 無効なコマンドです"
+msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
+msgstr "Vim E458: 色指定が正しくないのでエントリを割り当てられません"
 
-#: ../globals.h:1019
 #, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: \"%s\" はディレクトリです"
+msgid "E250: Fonts for the following charsets are missing in fontset %s:"
+msgstr "E250: 以下の文字セットのフォントがありません %s:"
 
-#: ../globals.h:1020
-#, fuzzy
-msgid "E900: Invalid job id"
-msgstr "E49: 無効なスクロール量です"
-
-#: ../globals.h:1021
-msgid "E901: Job table is full"
-msgstr ""
-
-#: ../globals.h:1024
 #, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: \"%s\"() のライブラリ呼出に失敗しました"
+msgid "E252: Fontset name: %s"
+msgstr "E252: フォントセット名: %s"
 
-#: ../globals.h:1026
-msgid "E19: Mark has invalid line number"
-msgstr "E19: マークに無効な行番号が指定されていました"
-
-#: ../globals.h:1027
-msgid "E20: Mark not set"
-msgstr "E20: マークは設定されていません"
-
-#: ../globals.h:1029
-msgid "E21: Cannot make changes, 'modifiable' is off"
-msgstr "E21: 'modifiable' がオフなので, 変更できません"
-
-#: ../globals.h:1030
-msgid "E22: Scripts nested too deep"
-msgstr "E22: スクリプトの入れ子が深過ぎます"
-
-#: ../globals.h:1031
-msgid "E23: No alternate file"
-msgstr "E23: 副ファイルはありません"
-
-#: ../globals.h:1032
-msgid "E24: No such abbreviation"
-msgstr "E24: そのような短縮入力はありません"
-
-#: ../globals.h:1033
-msgid "E477: No ! allowed"
-msgstr "E477: ! は許可されていません"
-
-#: ../globals.h:1035
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: GUIは使用不可能です: コンパイル時に無効にされています"
-
-#: ../globals.h:1036
 #, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: そのような名のハイライトグループはありません: %s"
+msgid "Font '%s' is not fixed-width"
+msgstr "フォント '%s' は固定幅ではありません"
 
-#: ../globals.h:1037
-msgid "E29: No inserted text yet"
-msgstr "E29: まだテキストが挿入されていません"
-
-#: ../globals.h:1038
-msgid "E30: No previous command line"
-msgstr "E30: 以前にコマンド行がありません"
-
-#: ../globals.h:1039
-msgid "E31: No such mapping"
-msgstr "E31: そのようなマッピングはありません"
-
-#: ../globals.h:1040
-msgid "E479: No match"
-msgstr "E479: 該当はありません"
-
-#: ../globals.h:1041
 #, c-format
-msgid "E480: No match: %s"
-msgstr "E480: 該当はありません: %s"
+msgid "E253: Fontset name: %s"
+msgstr "E253: フォントセット名: %s"
 
-#: ../globals.h:1042
-msgid "E32: No file name"
-msgstr "E32: ファイル名がありません"
-
-#: ../globals.h:1044
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: 正規表現置換がまだ実行されていません"
-
-#: ../globals.h:1045
-msgid "E34: No previous command"
-msgstr "E34: コマンドがまだ実行されていません"
-
-#: ../globals.h:1046
-msgid "E35: No previous regular expression"
-msgstr "E35: 正規表現がまだ実行されていません"
-
-#: ../globals.h:1047
-msgid "E481: No range allowed"
-msgstr "E481: 範囲指定は許可されていません"
-
-#: ../globals.h:1048
-msgid "E36: Not enough room"
-msgstr "E36: ウィンドウに十分な高さもしくは幅がありません"
-
-#: ../globals.h:1049
 #, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: ファイル %s を作成できません"
+msgid "Font0: %s"
+msgstr "フォント0: %s"
 
-#: ../globals.h:1050
-msgid "E483: Can't get temp file name"
-msgstr "E483: 一時ファイルの名前を取得できません"
-
-#: ../globals.h:1051
 #, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: ファイル \"%s\" を開けません"
+msgid "Font1: %s"
+msgstr "フォント1: %s"
 
-#: ../globals.h:1052
 #, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: ファイル %s を読込めません"
+msgid "Font%ld width is not twice that of font0"
+msgstr "フォント%ld の幅がフォント0の2倍ではありません"
 
-#: ../globals.h:1054
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: 最後の変更が保存されていません (! を追加で変更を破棄)"
-
-#: ../globals.h:1055
-msgid "E37: No write since last change"
-msgstr "E37: 最後の変更が保存されていません"
-
-#: ../globals.h:1056
-msgid "E38: Null argument"
-msgstr "E38: 引数が空です"
-
-#: ../globals.h:1057
-msgid "E39: Number expected"
-msgstr "E39: 数値が要求されています"
-
-#: ../globals.h:1058
 #, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: エラーファイル %s を開けません"
+msgid "Font0 width: %ld"
+msgstr "フォント0の幅: %ld"
 
-#: ../globals.h:1059
-msgid "E41: Out of memory!"
-msgstr "E41: メモリが尽き果てました!"
-
-#: ../globals.h:1060
-msgid "Pattern not found"
-msgstr "パターンは見つかりませんでした"
-
-#: ../globals.h:1061
 #, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: パターンは見つかりませんでした: %s"
+msgid "Font1 width: %ld"
+msgstr "フォント1の幅: %ld"
 
-#: ../globals.h:1062
-msgid "E487: Argument must be positive"
-msgstr "E487: 引数は正の値でなければなりません"
+msgid "Invalid font specification"
+msgstr "無効なフォント指定です"
 
-#: ../globals.h:1064
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: 前のディレクトリに戻れません"
+msgid "&Dismiss"
+msgstr "却下する(&D)"
 
-#: ../globals.h:1066
-msgid "E42: No Errors"
-msgstr "E42: エラーはありません"
+msgid "no specific match"
+msgstr "マッチするものがありません"
 
-#: ../globals.h:1067
-msgid "E776: No location list"
-msgstr "E776: ロケーションリストはありません"
+msgid "Vim - Font Selector"
+msgstr "Vim - フォント選択"
 
-#: ../globals.h:1068
-msgid "E43: Damaged match string"
-msgstr "E43: 該当文字列が破損しています"
+msgid "Name:"
+msgstr "名前:"
 
-#: ../globals.h:1069
-msgid "E44: Corrupted regexp program"
-msgstr "E44: 不正な正規表現プログラムです"
+#. create toggle button
+msgid "Show size in Points"
+msgstr "サイズをポイントで表示する"
 
-#: ../globals.h:1071
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: 'readonly' オプションが設定されています (! を追加で上書き)"
+msgid "Encoding:"
+msgstr "エンコード:"
 
-#: ../globals.h:1073
-#, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: 読取専用変数 \"%s\" には値を設定できません"
+msgid "Font:"
+msgstr "フォント:"
 
-#: ../globals.h:1075
-#, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: サンドボックスでは変数 \"%s\" に値を設定できません"
+msgid "Style:"
+msgstr "スタイル:"
 
-#: ../globals.h:1076
-msgid "E47: Error while reading errorfile"
-msgstr "E47: エラーファイルの読込中にエラーが発生しました"
+msgid "Size:"
+msgstr "サイズ:"
 
-#: ../globals.h:1078
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: サンドボックスでは許されません"
+msgid "E256: Hangul automata ERROR"
+msgstr "E256: ハングルオートマトンエラー"
 
-#: ../globals.h:1080
-msgid "E523: Not allowed here"
-msgstr "E523: ここでは許可されません"
-
-#: ../globals.h:1082
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: スクリーンモードの設定には対応していません"
-
-#: ../globals.h:1083
-msgid "E49: Invalid scroll size"
-msgstr "E49: 無効なスクロール量です"
-
-#: ../globals.h:1084
-msgid "E91: 'shell' option is empty"
-msgstr "E91: 'shell' オプションが空です"
-
-#: ../globals.h:1085
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: sign のデータを読込めませんでした"
-
-#: ../globals.h:1086
-msgid "E72: Close error on swap file"
-msgstr "E72: スワップファイルのクローズ時エラーです"
-
-#: ../globals.h:1087
-msgid "E73: tag stack empty"
-msgstr "E73: タグスタックが空です"
-
-#: ../globals.h:1088
-msgid "E74: Command too complex"
-msgstr "E74: コマンドが複雑過ぎます"
-
-#: ../globals.h:1089
-msgid "E75: Name too long"
-msgstr "E75: 名前が長過ぎます"
-
-#: ../globals.h:1090
-msgid "E76: Too many ["
-msgstr "E76: [ が多過ぎます"
-
-#: ../globals.h:1091
-msgid "E77: Too many file names"
-msgstr "E77: ファイル名が多過ぎます"
-
-#: ../globals.h:1092
-msgid "E488: Trailing characters"
-msgstr "E488: 余分な文字が後ろにあります"
-
-#: ../globals.h:1093
-msgid "E78: Unknown mark"
-msgstr "E78: 未知のマーク"
-
-#: ../globals.h:1094
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: ワイルドカードを展開できません"
-
-#: ../globals.h:1096
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: 'winheight' は 'winminheight' より小さくできません"
-
-#: ../globals.h:1098
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: 'winwidth' は 'winminwidth' より小さくできません"
-
-#: ../globals.h:1099
-msgid "E80: Error while writing"
-msgstr "E80: 書込み中のエラー"
-
-#: ../globals.h:1100
-msgid "Zero count"
-msgstr "ゼロカウント"
-
-#: ../globals.h:1101
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: スクリプト以外で<SID>が使われました"
-
-#: ../globals.h:1102
-#, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: 内部エラーです: %s"
-
-#: ../globals.h:1104
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: パターンが 'maxmempattern' 以上のメモリを使用します"
-
-#: ../globals.h:1105
-msgid "E749: empty buffer"
-msgstr "E749: バッファが空です"
-
-#: ../globals.h:1108
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: 検索パターンか区切り記号が不正です"
-
-#: ../globals.h:1109
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: 同じ名前のファイルが他のバッファで読込まれています"
-
-#: ../globals.h:1110
-#, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: オプション '%s' は設定されていません"
-
-#: ../globals.h:1111
-msgid "E850: Invalid register name"
-msgstr "E850: 無効なレジスタ名です"
-
-#: ../globals.h:1114
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "上まで検索したので下に戻ります"
-
-#: ../globals.h:1115
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "下まで検索したので上に戻ります"
-
-#: ../hardcopy.c:240
 msgid "E550: Missing colon"
 msgstr "E550: コロンがありません"
 
-#: ../hardcopy.c:252
 msgid "E551: Illegal component"
 msgstr "E551: 不正な構文要素です"
 
-#: ../hardcopy.c:259
 msgid "E552: digit expected"
 msgstr "E552: 数値が必要です"
 
-#: ../hardcopy.c:473
 #, c-format
 msgid "Page %d"
 msgstr "%d ページ"
 
-#: ../hardcopy.c:597
 msgid "No text to be printed"
 msgstr "印刷するテキストがありません"
 
-#: ../hardcopy.c:668
 #, c-format
 msgid "Printing page %d (%d%%)"
 msgstr "印刷中: ページ %d (%d%%)"
 
-#: ../hardcopy.c:680
 #, c-format
 msgid " Copy %d of %d"
 msgstr " コピー %d (全 %d 中)"
 
-#: ../hardcopy.c:733
 #, c-format
 msgid "Printed: %s"
 msgstr "印刷しました: %s"
 
-#: ../hardcopy.c:740
 msgid "Printing aborted"
 msgstr "印刷が中止されました"
 
-#: ../hardcopy.c:1365
 msgid "E455: Error writing to PostScript output file"
 msgstr "E455: PostScript出力ファイルの書込みエラーです"
 
-#: ../hardcopy.c:1747
 #, c-format
 msgid "E624: Can't open file \"%s\""
 msgstr "E624: ファイル \"%s\" を開けません"
 
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
 msgstr "E457: PostScriptのリソースファイル \"%s\" を読込めません"
 
-#: ../hardcopy.c:1772
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
 msgstr "E618: ファイル \"%s\" は PostScript リソースファイルではありません"
 
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
 msgstr "E619: ファイル \"%s\" は対応していない PostScript リソースファイルです"
 
-#: ../hardcopy.c:1856
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
 msgstr "E621: リソースファイル \"%s\" はバージョンが異なります"
 
-#: ../hardcopy.c:2225
 msgid "E673: Incompatible multi-byte encoding and character set."
 msgstr "E673: 互換性の無いマルチバイトエンコーディングと文字セットです"
 
-#: ../hardcopy.c:2238
 msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
 msgstr "E674: マルチバイトエンコーディングでは printmbcharset を空にできません"
 
-#: ../hardcopy.c:2254
 msgid "E675: No default font specified for multi-byte printing."
 msgstr ""
 "E675: マルチバイト文字を印刷するためのデフォルトフォントが指定されていません"
 
-#: ../hardcopy.c:2426
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: PostScript出力用のファイルを開けません"
 
-#: ../hardcopy.c:2458
 #, c-format
 msgid "E456: Can't open file \"%s\""
 msgstr "E456: ファイル \"%s\" を開けません"
 
-#: ../hardcopy.c:2583
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
 msgstr "E456: PostScriptのリソースファイル \"prolog.ps\" が見つかりません"
 
-#: ../hardcopy.c:2593
 msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
 msgstr "E456: PostScriptのリソースファイル \"cidfont.ps\" が見つかりません"
 
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
 msgstr "E456: PostScriptのリソースファイル \"%s.ps\" が見つかりません"
 
-#: ../hardcopy.c:2654
 #, c-format
 msgid "E620: Unable to convert to print encoding \"%s\""
 msgstr "E620: 印刷エンコード \"%s\" へ変換できません"
 
-#: ../hardcopy.c:2877
 msgid "Sending to printer..."
 msgstr "プリンタに送信中..."
 
-#: ../hardcopy.c:2881
 msgid "E365: Failed to print PostScript file"
 msgstr "E365: PostScriptファイルの印刷に失敗しました"
 
-#: ../hardcopy.c:2883
 msgid "Print job sent."
 msgstr "印刷ジョブを送信しました."
 
-#: ../if_cscope.c:85
 msgid "Add a new database"
 msgstr "新データベースを追加"
 
-#: ../if_cscope.c:87
 msgid "Query for a pattern"
 msgstr "パターンのクエリーを追加"
 
-#: ../if_cscope.c:89
 msgid "Show this message"
 msgstr "このメッセージを表示する"
 
-#: ../if_cscope.c:91
 msgid "Kill a connection"
 msgstr "接続を終了する"
 
-#: ../if_cscope.c:93
 msgid "Reinit all connections"
 msgstr "全ての接続を再初期化する"
 
-#: ../if_cscope.c:95
 msgid "Show connections"
 msgstr "接続を表示する"
 
-#: ../if_cscope.c:101
 #, c-format
 msgid "E560: Usage: cs[cope] %s"
 msgstr "E560: 使用方法: cs[cope] %s"
 
-#: ../if_cscope.c:225
 msgid "This cscope command does not support splitting the window.\n"
 msgstr "このcscopeコマンドは分割ウィンドウではサポートされません.\n"
 
-#: ../if_cscope.c:266
 msgid "E562: Usage: cstag <ident>"
 msgstr "E562: 使用法: cstag <ident>"
 
-#: ../if_cscope.c:313
 msgid "E257: cstag: tag not found"
 msgstr "E257: cstag: タグが見つかりません"
 
-#: ../if_cscope.c:461
 #, c-format
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: stat(%s) エラー: %d"
 
-#: ../if_cscope.c:551
+msgid "E563: stat error"
+msgstr "E563: stat エラー"
+
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: %s はディレクトリ及び有効なcscopeのデータベースではありません"
 
-#: ../if_cscope.c:566
 #, c-format
 msgid "Added cscope database %s"
 msgstr "cscopeデータベース %s を追加"
 
-#: ../if_cscope.c:616
 #, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: cscopeの接続 %<PRId64> を読込み中のエラーです"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: cscopeの接続 %ld を読込み中のエラーです"
 
-#: ../if_cscope.c:711
 msgid "E561: unknown cscope search type"
 msgstr "E561: 未知のcscope検索型です"
 
-#: ../if_cscope.c:752 ../if_cscope.c:789
 msgid "E566: Could not create cscope pipes"
 msgstr "E566: cscopeパイプを作成できませんでした"
 
-#: ../if_cscope.c:767
 msgid "E622: Could not fork for cscope"
 msgstr "E622: cscopeの起動準備(fork)に失敗しました"
 
-#: ../if_cscope.c:849
 msgid "cs_create_connection setpgid failed"
 msgstr "cs_create_connection への setpgid に失敗しました"
 
-#: ../if_cscope.c:853 ../if_cscope.c:889
 msgid "cs_create_connection exec failed"
 msgstr "cs_create_connection の実行に失敗しました"
 
-#: ../if_cscope.c:863 ../if_cscope.c:902
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: to_fp の fdopen に失敗しました"
 
-#: ../if_cscope.c:865 ../if_cscope.c:906
 msgid "cs_create_connection: fdopen for fr_fp failed"
 msgstr "cs_create_connection: fr_fp の fdopen に失敗しました"
 
-#: ../if_cscope.c:890
 msgid "E623: Could not spawn cscope process"
 msgstr "E623: cscopeプロセスを起動できませんでした"
 
-#: ../if_cscope.c:932
 msgid "E567: no cscope connections"
 msgstr "E567: cscope接続に失敗しました"
 
-#: ../if_cscope.c:1009
 #, c-format
 msgid "E469: invalid cscopequickfix flag %c for %c"
 msgstr "E469: 無効な cscopequickfix フラグ %c の %c です"
 
-#: ../if_cscope.c:1058
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
 msgstr "E259: cscopeクエリー %s of %s に該当がありませんでした"
 
-#: ../if_cscope.c:1142
 msgid "cscope commands:\n"
 msgstr "cscopeコマンド:\n"
 
-#: ../if_cscope.c:1150
 #, c-format
 msgid "%-5s: %s%*s (Usage: %s)"
 msgstr "%-5s: %s%*s (使用法: %s)"
 
-#: ../if_cscope.c:1155
 msgid ""
 "\n"
+"       a: Find assignments to this symbol\n"
 "       c: Find functions calling this function\n"
 "       d: Find functions called by this function\n"
 "       e: Find this egrep pattern\n"
@@ -3233,6 +2549,7 @@ msgid ""
 "       t: Find this text string\n"
 msgstr ""
 "\n"
+"       a: このシンボルに対する代入を探す\n"
 "       c: この関数を呼んでいる関数を探す\n"
 "       d: この関数から呼んでいる関数を探す\n"
 "       e: このegrepパターンを探す\n"
@@ -3242,31 +2559,32 @@ msgstr ""
 "       s: このCシンボルを探す\n"
 "       t: このテキスト文字列を探す\n"
 
-#: ../if_cscope.c:1226
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: cscopeデータベース: %s を開くことができません"
+
+msgid "E626: cannot get cscope database information"
+msgstr "E626: cscopeデータベースの情報を取得できません"
+
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: 重複するcscopeデータベースは追加されませんでした"
 
-#: ../if_cscope.c:1335
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: cscope接続 %s が見つかりませんでした"
 
-#: ../if_cscope.c:1364
 #, c-format
 msgid "cscope connection %s closed"
 msgstr "cscope接続 %s が閉じられました"
 
 #. should not reach here
-#: ../if_cscope.c:1486
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: cs_manage_matches で致命的なエラーです"
 
-#: ../if_cscope.c:1693
 #, c-format
 msgid "Cscope tag: %s"
 msgstr "Cscope タグ: %s"
 
-#: ../if_cscope.c:1711
 msgid ""
 "\n"
 "   #   line"
@@ -3274,87 +2592,300 @@ msgstr ""
 "\n"
 "   #   行番号"
 
-#: ../if_cscope.c:1713
 msgid "filename / context / line\n"
 msgstr "ファイル名 / 文脈 / 行\n"
 
-#: ../if_cscope.c:1809
 #, c-format
 msgid "E609: Cscope error: %s"
 msgstr "E609: cscopeエラー: %s"
 
-#: ../if_cscope.c:2053
 msgid "All cscope databases reset"
 msgstr "全てのcscopeデータベースをリセットします"
 
-#: ../if_cscope.c:2123
 msgid "no cscope connections\n"
 msgstr "cscope接続がありません\n"
 
-#: ../if_cscope.c:2126
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    データベース名                      prepend パス\n"
 
-#: ../main.c:144
+msgid "Lua library cannot be loaded."
+msgstr "Luaライブラリをロードできません."
+
+msgid "cannot save undo information"
+msgstr "アンドゥ情報が保存できません"
+
+msgid ""
+"E815: Sorry, this command is disabled, the MzScheme libraries could not be "
+"loaded."
+msgstr "E815: このコマンドは無効です. MzScheme ライブラリをロードできません."
+
+msgid ""
+"E895: Sorry, this command is disabled, the MzScheme's racket/base module "
+"could not be loaded."
+msgstr ""
+"E895: このコマンドは無効です,ごめんなさい. MzScheme の racket/base モジュール"
+"がロードできませんでした."
+
+msgid "invalid expression"
+msgstr "無効な式です"
+
+msgid "expressions disabled at compile time"
+msgstr "式はコンパイル時に無効にされています"
+
+msgid "hidden option"
+msgstr "隠しオプション"
+
+msgid "unknown option"
+msgstr "未知のオプションです"
+
+msgid "window index is out of range"
+msgstr "範囲外のウィンドウ番号です"
+
+msgid "couldn't open buffer"
+msgstr "バッファを開けません"
+
+msgid "cannot delete line"
+msgstr "行を消せません"
+
+msgid "cannot replace line"
+msgstr "行を置換できません"
+
+msgid "cannot insert line"
+msgstr "行を挿入できません"
+
+msgid "string cannot contain newlines"
+msgstr "文字列には改行文字を含められません"
+
+msgid "error converting Scheme values to Vim"
+msgstr "Scheme値のVimへの変換エラー"
+
+msgid "Vim error: ~a"
+msgstr "Vim エラー: ~a"
+
+msgid "Vim error"
+msgstr "Vim エラー"
+
+msgid "buffer is invalid"
+msgstr "バッファは無効です"
+
+msgid "window is invalid"
+msgstr "ウィンドウは無効です"
+
+msgid "linenr out of range"
+msgstr "範囲外の行番号です"
+
+msgid "not allowed in the Vim sandbox"
+msgstr "サンドボックスでは許されません"
+
+msgid "E836: This Vim cannot execute :python after using :py3"
+msgstr "E836: このVimでは :py3 を使った後に :python を使えません"
+
+msgid ""
+"E263: Sorry, this command is disabled, the Python library could not be "
+"loaded."
+msgstr ""
+"E263: このコマンドは無効です,ごめんなさい: Pythonライブラリをロードできません"
+"でした."
+
+msgid ""
+"E887: Sorry, this command is disabled, the Python's site module could not be "
+"loaded."
+msgstr ""
+"E887: このコマンドは無効です,ごめんなさい. Python の site モジュールをロード"
+"できませんでした."
+
+# Added at 07-Feb-2004.
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: Python を再帰的に実行することはできません"
+
+msgid "E837: This Vim cannot execute :py3 after using :python"
+msgstr "E837: このVimでは :python を使った後に :py3 を使えません"
+
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: $_ は文字列のインスタンスでなければなりません"
+
+msgid ""
+"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
+msgstr ""
+"E266: このコマンドは無効です,ごめんなさい: Rubyライブラリをロードできませんで"
+"した."
+
+msgid "E267: unexpected return"
+msgstr "E267: 予期せぬ return です"
+
+msgid "E268: unexpected next"
+msgstr "E268: 予期せぬ next です"
+
+msgid "E269: unexpected break"
+msgstr "E269: 予期せぬ break です"
+
+msgid "E270: unexpected redo"
+msgstr "E270: 予期せぬ redo です"
+
+msgid "E271: retry outside of rescue clause"
+msgstr "E271: rescue の外の retry です"
+
+msgid "E272: unhandled exception"
+msgstr "E272: 取り扱われなかった例外があります"
+
+#, c-format
+msgid "E273: unknown longjmp status %d"
+msgstr "E273: 未知のlongjmp状態: %d"
+
+msgid "invalid buffer number"
+msgstr "無効なバッファ番号です"
+
+msgid "not implemented yet"
+msgstr "まだ実装されていません"
+
+#. ???
+msgid "cannot set line(s)"
+msgstr "行を設定できません"
+
+msgid "invalid mark name"
+msgstr "無効なマーク名です"
+
+msgid "mark not set"
+msgstr "マークは設定されていません"
+
+#, c-format
+msgid "row %d column %d"
+msgstr "行 %d 列 %d"
+
+msgid "cannot insert/append line"
+msgstr "行の挿入/追加をできません"
+
+msgid "line number out of range"
+msgstr "範囲外の行番号です"
+
+msgid "unknown flag: "
+msgstr "未知のフラグ: "
+
+msgid "unknown vimOption"
+msgstr "未知の vimOption です"
+
+msgid "keyboard interrupt"
+msgstr "キーボード割込み"
+
+msgid "vim error"
+msgstr "vim エラー"
+
+msgid "cannot create buffer/window command: object is being deleted"
+msgstr ""
+"バッファ/ウィンドウ作成コマンドを作成できません: オブジェクトが消去されていま"
+"した"
+
+msgid ""
+"cannot register callback command: buffer/window is already being deleted"
+msgstr ""
+"コールバックコマンドを登録できません: バッファ/ウィンドウが既に消去されました"
+
+#. This should never happen.  Famous last word?
+msgid ""
+"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
+"org"
+msgstr ""
+"E280: TCL 致命的エラー: reflist 汚染!? vim-dev@vim.org に報告してください"
+
+msgid "cannot register callback command: buffer/window reference not found"
+msgstr ""
+"コールバックコマンドを登録できません: バッファ/ウィンドウの参照が見つかりませ"
+"ん"
+
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
+msgstr ""
+"E571: このコマンドは無効です,ごめんなさい: Tclライブラリをロードできませんで"
+"した."
+
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: 終了コード %d"
+
+msgid "cannot get line"
+msgstr "行を取得できません"
+
+msgid "Unable to register a command server name"
+msgstr "命令サーバーの名前を登録できません"
+
+msgid "E248: Failed to send command to the destination program"
+msgstr "E248: 目的のプログラムへのコマンド送信に失敗しました"
+
+#, c-format
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: 無効なサーバーIDが使われました: %s"
+
+msgid "E251: VIM instance registry property is badly formed.  Deleted!"
+msgstr "E251: VIM 実体の登録プロパティが不正です. 消去しました!"
+
+#, c-format
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: リスト型にカンマがありません: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: リスト型の最後に ']' がありません: %s"
+
 msgid "Unknown option argument"
 msgstr "未知のオプション引数です"
 
-#: ../main.c:146
 msgid "Too many edit arguments"
 msgstr "編集引数が多過ぎます"
 
-#: ../main.c:148
 msgid "Argument missing after"
 msgstr "引数がありません"
 
-#: ../main.c:150
 msgid "Garbage after option argument"
 msgstr "オプション引数の後にゴミがあります"
 
-#: ../main.c:152
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
 msgstr "\"+command\", \"-c command\", \"--cmd command\" の引数が多過ぎます"
 
-#: ../main.c:154
 msgid "Invalid argument for"
 msgstr "無効な引数です: "
 
-#: ../main.c:294
 #, c-format
 msgid "%d files to edit\n"
 msgstr "%d 個のファイルが編集を控えています\n"
 
-#: ../main.c:1342
+msgid "netbeans is not supported with this GUI\n"
+msgstr "netbeans はこのGUIでは利用できません\n"
+
+msgid "'-nb' cannot be used: not enabled at compile time\n"
+msgstr "'-nb' 使用不可能です: コンパイル時に無効にされています\n"
+
+msgid "This Vim was not compiled with the diff feature."
+msgstr "このVimにはdiff機能がありません(コンパイル時設定)."
+
 msgid "Attempt to open script file again: \""
 msgstr "スクリプトファイルを再び開いてみます: \""
 
-#: ../main.c:1350
 msgid "Cannot open for reading: \""
 msgstr "読込用として開けません"
 
-#: ../main.c:1393
 msgid "Cannot open for script output: \""
 msgstr "スクリプト出力用を開けません"
 
-#: ../main.c:1622
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: エラー: NetBeansからgvimをスタートできません\n"
+
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr "Vim: エラー: このバージョンのVimはCygwin端末では動作しません\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: 警告: 端末への出力ではありません\n"
 
-#: ../main.c:1624
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim: 警告: 端末からの入力ではありません\n"
 
 #. just in case..
-#: ../main.c:1891
 msgid "pre-vimrc command line"
 msgstr "vimrc前のコマンドライン"
 
-#: ../main.c:1964
 #, c-format
 msgid "E282: Cannot read from \"%s\""
 msgstr "E282: \"%s\"から読込むことができません"
 
-#: ../main.c:2149
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
@@ -3362,23 +2893,18 @@ msgstr ""
 "\n"
 "より詳細な情報は: \"vim -h\"\n"
 
-#: ../main.c:2178
 msgid "[file ..]       edit specified file(s)"
 msgstr "[ファイル..]    あるファイルを編集する"
 
-#: ../main.c:2179
 msgid "-               read text from stdin"
 msgstr "-               標準入力からテキストを読込む"
 
-#: ../main.c:2180
 msgid "-t tag          edit file where tag is defined"
 msgstr "-t タグ         タグが定義されたところから編集する"
 
-#: ../main.c:2181
 msgid "-q [errorfile]  edit file with first error"
 msgstr "-q [errorfile]  最初のエラーで編集する"
 
-#: ../main.c:2187
 msgid ""
 "\n"
 "\n"
@@ -3388,11 +2914,9 @@ msgstr ""
 "\n"
 "使用法:"
 
-#: ../main.c:2189
 msgid " vim [arguments] "
 msgstr " vim [引数] "
 
-#: ../main.c:2193
 msgid ""
 "\n"
 "   or:"
@@ -3400,7 +2924,13 @@ msgstr ""
 "\n"
 "   もしくは:"
 
-#: ../main.c:2196
+msgid ""
+"\n"
+"Where case is ignored prepend / to make flag upper case"
+msgstr ""
+"\n"
+"大小文字が無視される場合は大文字にするために / を前置してください"
+
 msgid ""
 "\n"
 "\n"
@@ -3410,189 +2940,319 @@ msgstr ""
 "\n"
 "引数:\n"
 
-#: ../main.c:2197
 msgid "--\t\t\tOnly file names after this"
 msgstr "--\t\t\tこのあとにはファイル名だけ"
 
-#: ../main.c:2199
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\t\tワイルドカードを展開しない"
 
-#: ../main.c:2201
+msgid "-register\t\tRegister this gvim for OLE"
+msgstr "-register\t\tこのgvimをOLEとして登録する"
+
+msgid "-unregister\t\tUnregister gvim for OLE"
+msgstr "-unregister\t\tgvimのOLE登録を解除する"
+
+msgid "-g\t\t\tRun using GUI (like \"gvim\")"
+msgstr "-g\t\t\tGUIで起動する (\"gvim\" と同じ)"
+
+msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
+msgstr "-f or  --nofork\tフォアグラウンド: GUIを始めるときにforkしない"
+
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tViモード (\"vi\" と同じ)"
 
-#: ../main.c:2202
 msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\t\tExモード (\"ex\" と同じ)"
 
-#: ../main.c:2203
 msgid "-E\t\t\tImproved Ex mode"
 msgstr "-E\t\t\t改良Exモード"
 
-#: ../main.c:2204
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
 msgstr "-s\t\t\tサイレント(バッチ)モード (\"ex\" 専用)"
 
-#: ../main.c:2205
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
 msgstr "-d\t\t\t差分モード (\"vidiff\" と同じ)"
 
-#: ../main.c:2206
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
 msgstr "-y\t\t\tイージーモード (\"evim\" と同じ, モード無)"
 
-#: ../main.c:2207
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\t\t読込専用モード (\"view\" と同じ)"
 
-#: ../main.c:2208
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\t制限モード (\"rvim\" と同じ)"
 
-#: ../main.c:2209
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\t変更 (ファイル保存時) をできないようにする"
 
-#: ../main.c:2210
 msgid "-M\t\t\tModifications in text not allowed"
 msgstr "-M\t\t\tテキストの編集を行なえないようにする"
 
-#: ../main.c:2211
 msgid "-b\t\t\tBinary mode"
 msgstr "-b\t\t\tバイナリモード"
 
-#: ../main.c:2212
 msgid "-l\t\t\tLisp mode"
 msgstr "-l\t\t\tLispモード"
 
-#: ../main.c:2213
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
 msgstr "-C\t\t\tVi互換モード: 'compatible'"
 
-#: ../main.c:2214
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
 msgstr "-N\t\t\tVi非互換モード: 'nocompatible"
 
-#: ../main.c:2215
 msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
 msgstr "-V[N][fname]\t\tログ出力設定 [レベル N] [ログファイル名 fname]"
 
-#: ../main.c:2216
 msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\t\tデバッグモード"
 
-#: ../main.c:2217
 msgid "-n\t\t\tNo swap file, use memory only"
 msgstr "-n\t\t\tスワップファイルを使用せずメモリだけ"
 
-#: ../main.c:2218
 msgid "-r\t\t\tList swap files and exit"
 msgstr "-r\t\t\tスワップファイルを列挙し終了"
 
-#: ../main.c:2219
 msgid "-r (with file name)\tRecover crashed session"
 msgstr "-r (ファイル名)\tクラッシュしたセッションを復帰"
 
-#: ../main.c:2220
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\t\t-rと同じ"
 
-#: ../main.c:2221
+msgid "-f\t\t\tDon't use newcli to open window"
+msgstr "-f\t\t\tウィンドウを開くのに newcli を使用しない"
+
+msgid "-dev <device>\t\tUse <device> for I/O"
+msgstr "-dev <device>\t\tI/Oに <device> を使用する"
+
 msgid "-A\t\t\tstart in Arabic mode"
 msgstr "-A\t\t\tアラビア語モードで起動する"
 
-#: ../main.c:2222
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\tヘブライ語モードで起動する"
 
-#: ../main.c:2223
 msgid "-F\t\t\tStart in Farsi mode"
 msgstr "-F\t\t\tペルシア語モードで起動する"
 
-#: ../main.c:2224
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <terminal>\t端末を <terminal> に設定する"
 
-#: ../main.c:2225
+msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
+msgstr "--not-a-term\t\t入出力が端末でないとの警告をスキップする"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t.vimrcの代わりに <vimrc> を使う"
 
-#: ../main.c:2226
+msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
+msgstr "-U <gvimrc>\t\t.gvimrcの代わりに <gvimrc> を使う"
+
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\tプラグインスクリプトをロードしない"
 
-#: ../main.c:2227
 msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
 msgstr "-p[N]\t\tN 個タブページを開く(省略値: ファイルにつき1個)"
 
-#: ../main.c:2228
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\tN 個ウィンドウを開く(省略値: ファイルにつき1個)"
 
-#: ../main.c:2229
 msgid "-O[N]\t\tLike -o but split vertically"
 msgstr "-O[N]\t\t-oと同じだが垂直分割"
 
-#: ../main.c:2230
 msgid "+\t\t\tStart at end of file"
 msgstr "+\t\t\tファイルの最後からはじめる"
 
-#: ../main.c:2231
 msgid "+<lnum>\t\tStart at line <lnum>"
 msgstr "+<lnum>\t\t<lnum> 行からはじめる"
 
-#: ../main.c:2232
 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
 msgstr "--cmd <command>\tvimrcをロードする前に <command> を実行する"
 
-#: ../main.c:2233
 msgid "-c <command>\t\tExecute <command> after loading the first file"
 msgstr "-c <command>\t\t最初のファイルをロード後 <command> を実行する"
 
-#: ../main.c:2235
 msgid "-S <session>\t\tSource file <session> after loading the first file"
 msgstr "-S <session>\t\t最初のファイルをロード後ファイル <session> を取込む"
 
-#: ../main.c:2236
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
 msgstr "-s <scriptin>\tファイル <scriptin> からノーマルコマンドを読込む"
 
-#: ../main.c:2237
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
 msgstr "-w <scriptout>\t入力した全コマンドをファイル <scriptout> に追加する"
 
-#: ../main.c:2238
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr "-W <scriptout>\t入力した全コマンドをファイル <scriptout> に保存する"
 
-#: ../main.c:2240
+msgid "-x\t\t\tEdit encrypted files"
+msgstr "-x\t\t\t暗号化されたファイルを編集する"
+
+msgid "-display <display>\tConnect vim to this particular X-server"
+msgstr "-display <display>\tvimを指定した X サーバーに接続する"
+
+msgid "-X\t\t\tDo not connect to X server"
+msgstr "-X\t\t\tXサーバーに接続しない"
+
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr "--remote <files>\t可能ならばVimサーバーで <files> を編集する"
+
+msgid "--remote-silent <files>  Same, don't complain if there is no server"
+msgstr "--remote-silent <files>  同上, サーバーが無くても警告文を出力しない"
+
+msgid ""
+"--remote-wait <files>  As --remote but wait for files to have been edited"
+msgstr "--remote-wait <files>\t--remote後 ファイルの編集が終わるのを待つ"
+
+msgid ""
+"--remote-wait-silent <files>  Same, don't complain if there is no server"
+msgstr ""
+"--remote-wait-silent <files>  同上, サーバーが無くても警告文を出力しない"
+
+msgid ""
+"--remote-tab[-wait][-silent] <files>  As --remote but use tab page per file"
+msgstr ""
+"--remote-tab[-wait][-silent] <files>  --remoteでファイル1つにつき1つのタブ"
+"ページを開く"
+
+msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
+msgstr "--remote-send <keys>\tVimサーバーに <keys> を送信して終了する"
+
+msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
+msgstr "--remote-expr <expr>\tサーバーで <expr> を実行して結果を表示する"
+
+msgid "--serverlist\t\tList available Vim server names and exit"
+msgstr "--serverlist\t\tVimサーバー名の一覧を表示して終了する"
+
+msgid "--servername <name>\tSend to/become the Vim server <name>"
+msgstr "--servername <name>\tVimサーバー <name> に送信/名前設定する"
+
 msgid "--startuptime <file>\tWrite startup timing messages to <file>"
 msgstr "--startuptime <file>\t起動にかかった時間の詳細を <file> へ出力する"
 
-#: ../main.c:2242
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\t.viminfoの代わりに <viminfo> を使う"
 
-#: ../main.c:2243
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h or  --help\tヘルプ(このメッセージ)を表示し終了する"
 
-#: ../main.c:2244
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\tバージョン情報を表示し終了する"
 
-#: ../mark.c:676
+msgid ""
+"\n"
+"Arguments recognised by gvim (Motif version):\n"
+msgstr ""
+"\n"
+"gvimによって解釈される引数(Motifバージョン):\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"gvimによって解釈される引数(neXtawバージョン):\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (Athena version):\n"
+msgstr ""
+"\n"
+"gvimによって解釈される引数(Athenaバージョン):\n"
+
+msgid "-display <display>\tRun vim on <display>"
+msgstr "-display <display>\t<display> でvimを実行する"
+
+msgid "-iconic\t\tStart vim iconified"
+msgstr "-iconic\t\t最小化した状態でvimを起動する"
+
+msgid "-background <color>\tUse <color> for the background (also: -bg)"
+msgstr "-background <color>\t背景色に <color> を使う(同義: -bg)"
+
+msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
+msgstr "-foreground <color>\t前景色に <color> を使う(同義: -fg)"
+
+msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
+msgstr "-font <font>\t\tテキスト表示に <font> を使う(同義: -fn)"
+
+msgid "-boldfont <font>\tUse <font> for bold text"
+msgstr "-boldfont <font>\t太字に <font> を使う"
+
+msgid "-italicfont <font>\tUse <font> for italic text"
+msgstr "-italicfont <for>\t斜体字に <font> を使う"
+
+msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
+msgstr "-geometry <geom>\t初期配置に <geom> を使う(同義: -geom)"
+
+msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
+msgstr "-borderwidth <width>\t境界の幅を <width> にする(同義: -bw)"
+
+msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
+msgstr ""
+"-scrollbarwidth <width>  スクロールバーの幅を <width> にする(同義: -sw)"
+
+msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
+msgstr "-menuheight <height>\tメニューバーの高さを <height> にする(同義: -mh)"
+
+msgid "-reverse\t\tUse reverse video (also: -rv)"
+msgstr "-reverse\t\t反転映像を使用する(同義: -rv)"
+
+msgid "+reverse\t\tDon't use reverse video (also: +rv)"
+msgstr "+reverse\t\t反転映像を使用しない(同義: +rv)"
+
+msgid "-xrm <resource>\tSet the specified resource"
+msgstr "-xrm <resource>\t特定のリソースを使用する"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (GTK+ version):\n"
+msgstr ""
+"\n"
+"gvimによって解釈される引数(GTK+バージョン):\n"
+
+msgid "-display <display>\tRun vim on <display> (also: --display)"
+msgstr "-display <display>\t<display> でvimを実行する(同義: --display)"
+
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "--role <role>\tメインウィンドウを識別する一意な役割(role)を設定する"
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\t異なるGTK widgetでVimを開く"
+
+msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
+msgstr "--echo-wid\t\tウィンドウIDを標準出力に出力する"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <親のタイトル>\tVimを親アプリケーションの中で起動する"
+
+msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
+msgstr "--windowid <HWND>\t異なるWin32 widgetの内部にVimを開く"
+
+msgid "No display"
+msgstr "ディスプレイが見つかりません"
+
+#. Failed to send, abort.
+msgid ": Send failed.\n"
+msgstr ": 送信に失敗しました.\n"
+
+#. Let vim start normally.
+msgid ": Send failed. Trying to execute locally\n"
+msgstr ": 送信に失敗しました. ローカルでの実行を試みています\n"
+
+#, c-format
+msgid "%d of %d edited"
+msgstr "%d 個 (%d 個中) のファイルを編集しました"
+
+msgid "No display: Send expression failed.\n"
+msgstr "ディスプレイがありません: 式の送信に失敗しました.\n"
+
+msgid ": Send expression failed.\n"
+msgstr ": 式の送信に失敗しました.\n"
+
 msgid "No marks set"
 msgstr "マークが設定されていません"
 
-#: ../mark.c:678
 #, c-format
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: \"%s\" に該当するマークがありません"
 
 #. Highlight title
-#: ../mark.c:687
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3601,7 +3261,6 @@ msgstr ""
 "mark   行   列 ファイル/テキスト"
 
 #. Highlight title
-#: ../mark.c:789
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3610,7 +3269,6 @@ msgstr ""
 " jump   行   列 ファイル/テキスト"
 
 #. Highlight title
-#: ../mark.c:831
 msgid ""
 "\n"
 "change line  col text"
@@ -3618,7 +3276,6 @@ msgstr ""
 "\n"
 "変更   行    列  テキスト"
 
-#: ../mark.c:1238
 msgid ""
 "\n"
 "# File marks:\n"
@@ -3627,7 +3284,6 @@ msgstr ""
 "# ファイルマーク:\n"
 
 #. Write the jumplist with -'
-#: ../mark.c:1271
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3635,7 +3291,6 @@ msgstr ""
 "\n"
 "# ジャンプリスト (新しいものが先):\n"
 
-#: ../mark.c:1352
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -3643,84 +3298,88 @@ msgstr ""
 "\n"
 "# ファイル内マークの履歴 (新しいものから古いもの):\n"
 
-#: ../mark.c:1431
 msgid "Missing '>'"
 msgstr "'>' が見つかりません"
 
-#: ../memfile.c:426
+msgid "E543: Not a valid codepage"
+msgstr "E543: 無効なコードページです"
+
+msgid "E284: Cannot set IC values"
+msgstr "E284: ICの値を設定できません"
+
+msgid "E285: Failed to create input context"
+msgstr "E285: インプットコンテキストの作成に失敗しました"
+
+msgid "E286: Failed to open input method"
+msgstr "E286: インプットメソッドのオープンに失敗しました"
+
+msgid "E287: Warning: Could not set destroy callback to IM"
+msgstr "E287: 警告: IMの破壊コールバックを設定できませんでした"
+
+msgid "E288: input method doesn't support any style"
+msgstr "E288: インプットメソッドはどんなスタイルもサポートしません"
+
+msgid "E289: input method doesn't support my preedit type"
+msgstr "E289: インプットメソッドは my preedit type をサポートしません"
+
 msgid "E293: block was not locked"
 msgstr "E293: ブロックがロックされていません"
 
-#: ../memfile.c:799
 msgid "E294: Seek error in swap file read"
 msgstr "E294: スワップファイル読込時にシークエラーです"
 
-#: ../memfile.c:803
 msgid "E295: Read error in swap file"
 msgstr "E295: スワップファイルの読込みエラーです"
 
-#: ../memfile.c:849
 msgid "E296: Seek error in swap file write"
 msgstr "E296: スワップファイル書込み時にシークエラーです"
 
-#: ../memfile.c:865
 msgid "E297: Write error in swap file"
 msgstr "E297: スワップファイルの書込みエラーです"
 
-#: ../memfile.c:1036
 msgid "E300: Swap file already exists (symlink attack?)"
 msgstr "E300: スワップファイルが既に存在します (symlinkによる攻撃?)"
 
-#: ../memline.c:318
 msgid "E298: Didn't get block nr 0?"
 msgstr "E298: ブロック 0 を取得できません?"
 
-#: ../memline.c:361
 msgid "E298: Didn't get block nr 1?"
 msgstr "E298: ブロック 1 を取得できません?"
 
-#: ../memline.c:377
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: ブロック 2 を取得できません?"
 
+msgid "E843: Error while updating swap file crypt"
+msgstr "E843: スワップファイルの暗号を更新中にエラーが発生しました"
+
 #. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: おっと, スワップファイルが失われました!!!"
 
-#: ../memline.c:477
 msgid "E302: Could not rename swap file"
 msgstr "E302: スワップファイルの名前を変えられません"
 
-#: ../memline.c:554
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr "E303: \"%s\" のスワップファイルを開けないのでリカバリは不可能です"
 
-#: ../memline.c:666
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0(): ブロック 0 を取得できませんでした??"
 
-#. no swap files found
-#: ../memline.c:830
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: %s にはスワップファイルが見つかりません"
 
-#: ../memline.c:839
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "使用するスワップファイルの番号を入力してください(0 で終了): "
 
-#: ../memline.c:879
 #, c-format
 msgid "E306: Cannot open %s"
 msgstr "E306: %s を開けません"
 
-#: ../memline.c:897
 msgid "Unable to read block 0 from "
 msgstr "ブロック 0 を読込めません "
 
-#: ../memline.c:900
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
@@ -3728,28 +3387,22 @@ msgstr ""
 "\n"
 "恐らく変更がされていないかVimがスワップファイルを更新していません."
 
-#: ../memline.c:909
 msgid " cannot be used with this version of Vim.\n"
 msgstr " Vimのこのバージョンでは使用できません.\n"
 
-#: ../memline.c:911
 msgid "Use Vim version 3.0.\n"
 msgstr "Vimのバージョン3.0を使用してください.\n"
 
-#: ../memline.c:916
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: %s はVimのスワップファイルではないようです"
 
-#: ../memline.c:922
 msgid " cannot be used on this computer.\n"
 msgstr " このコンピュータでは使用できません.\n"
 
-#: ../memline.c:924
 msgid "The file was created on "
 msgstr "このファイルは次の場所で作られました "
 
-#: ../memline.c:928
 msgid ""
 ",\n"
 "or the file has been damaged."
@@ -3757,85 +3410,104 @@ msgstr ""
 ",\n"
 "もしくはファイルが損傷しています."
 
-#: ../memline.c:945
+#, c-format
+msgid ""
+"E833: %s is encrypted and this version of Vim does not support encryption"
+msgstr ""
+"E833: %s はこのバージョンのVimでサポートしていない形式で暗号化されています"
+
 msgid " has been damaged (page size is smaller than minimum value).\n"
 msgstr " は損傷しています (ページサイズが最小値を下回っています).\n"
 
-#: ../memline.c:974
 #, c-format
 msgid "Using swap file \"%s\""
 msgstr "スワップファイル \"%s\" を使用中"
 
-#: ../memline.c:980
 #, c-format
 msgid "Original file \"%s\""
 msgstr "原本ファイル \"%s\""
 
-#: ../memline.c:995
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: 警告: 原本ファイルが変更されています"
 
-#: ../memline.c:1061
+#, c-format
+msgid "Swap file is encrypted: \"%s\""
+msgstr "スワップファイルは暗号化されています: \"%s\""
+
+msgid ""
+"\n"
+"If you entered a new crypt key but did not write the text file,"
+msgstr ""
+"\n"
+"新しい暗号キーを入力したあとにテキストファイルを保存していない場合は,"
+
+msgid ""
+"\n"
+"enter the new crypt key."
+msgstr ""
+"\n"
+"新しい暗号キーを入力してください."
+
+msgid ""
+"\n"
+"If you wrote the text file after changing the crypt key press enter"
+msgstr ""
+"\n"
+"暗号キーを変えたあとにテキストファイルを保存した場合は, テキストファイルと"
+
+msgid ""
+"\n"
+"to use the same key for text file and swap file"
+msgstr ""
+"\n"
+"スワップファイルに同じ暗号キーを使うためにenterだけを押してください."
+
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: %s からブロック 1 を読込めません"
 
-#: ../memline.c:1065
 msgid "???MANY LINES MISSING"
 msgstr "???多くの行が失われています"
 
-#: ../memline.c:1076
 msgid "???LINE COUNT WRONG"
 msgstr "???行数が間違っています"
 
-#: ../memline.c:1082
 msgid "???EMPTY BLOCK"
 msgstr "???ブロックが空です"
 
-#: ../memline.c:1103
 msgid "???LINES MISSING"
 msgstr "???行が失われています"
 
-#: ../memline.c:1128
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: ブロック 1 のIDが間違っています(%s が.swpファイルでない?)"
 
-#: ../memline.c:1133
 msgid "???BLOCK MISSING"
 msgstr "???ブロックがありません"
 
-#: ../memline.c:1147
 msgid "??? from here until ???END lines may be messed up"
 msgstr "??? ここから ???END までの行が破壊されているようです"
 
-#: ../memline.c:1164
 msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr "??? ここから ???END までの行が挿入か削除されたようです"
 
-#: ../memline.c:1181
 msgid "???END"
 msgstr "???END"
 
-#: ../memline.c:1238
 msgid "E311: Recovery Interrupted"
 msgstr "E311: リカバリが割込まれました"
 
-#: ../memline.c:1243
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
 msgstr ""
 "E312: リカバリの最中にエラーが検出されました; ???で始まる行を参照してください"
 
-#: ../memline.c:1245
 msgid "See \":help E312\" for more information."
 msgstr "詳細は \":help E312\" を参照してください"
 
-#: ../memline.c:1249
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "リカバリが終了しました. 全てが正しいかチェックしてください."
 
-#: ../memline.c:1251
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
@@ -3843,15 +3515,12 @@ msgstr ""
 "\n"
 "(変更をチェックするために, このファイルを別の名前で保存した上で\n"
 
-#: ../memline.c:1252
 msgid "and run diff with the original file to check for changes)"
 msgstr "原本ファイルとの diff を実行すると良いでしょう)"
 
-#: ../memline.c:1254
 msgid "Recovery completed. Buffer contents equals file contents."
 msgstr "復元完了. バッファの内容はファイルと同じになりました."
 
-#: ../memline.c:1255
 msgid ""
 "\n"
 "You may want to delete the .swp file now.\n"
@@ -3861,52 +3530,43 @@ msgstr ""
 "元の.swpファイルは削除しても構いません\n"
 "\n"
 
+msgid "Using crypt key from swap file for the text file.\n"
+msgstr "スワップファイルから取得した暗号キーをテキストファイルに使います.\n"
+
 #. use msg() to start the scrolling properly
-#: ../memline.c:1327
 msgid "Swap files found:"
 msgstr "スワップファイルが複数見つかりました:"
 
-#: ../memline.c:1446
 msgid "   In current directory:\n"
 msgstr "   現在のディレクトリ:\n"
 
-#: ../memline.c:1448
 msgid "   Using specified name:\n"
 msgstr "   以下の名前を使用中:\n"
 
-#: ../memline.c:1450
 msgid "   In directory "
 msgstr "   ディレクトリ "
 
-#: ../memline.c:1465
 msgid "      -- none --\n"
 msgstr "      -- なし --\n"
 
-#: ../memline.c:1527
 msgid "          owned by: "
 msgstr "            所有者: "
 
-#: ../memline.c:1529
 msgid "   dated: "
 msgstr "   日付: "
 
-#: ../memline.c:1532 ../memline.c:3231
 msgid "             dated: "
 msgstr "             日付: "
 
-#: ../memline.c:1548
 msgid "         [from Vim version 3.0]"
 msgstr "         [from Vim version 3.0]"
 
-#: ../memline.c:1550
 msgid "         [does not look like a Vim swap file]"
 msgstr "         [Vimのスワップファイルではないようです]"
 
-#: ../memline.c:1552
 msgid "         file name: "
 msgstr "        ファイル名: "
 
-#: ../memline.c:1558
 msgid ""
 "\n"
 "          modified: "
@@ -3914,15 +3574,12 @@ msgstr ""
 "\n"
 "          変更状態: "
 
-#: ../memline.c:1559
 msgid "YES"
 msgstr "あり"
 
-#: ../memline.c:1559
 msgid "no"
 msgstr "なし"
 
-#: ../memline.c:1562
 msgid ""
 "\n"
 "         user name: "
@@ -3930,11 +3587,9 @@ msgstr ""
 "\n"
 "        ユーザー名: "
 
-#: ../memline.c:1568
 msgid "   host name: "
 msgstr "   ホスト名: "
 
-#: ../memline.c:1570
 msgid ""
 "\n"
 "         host name: "
@@ -3942,7 +3597,6 @@ msgstr ""
 "\n"
 "          ホスト名: "
 
-#: ../memline.c:1575
 msgid ""
 "\n"
 "        process ID: "
@@ -3950,11 +3604,16 @@ msgstr ""
 "\n"
 "        プロセスID: "
 
-#: ../memline.c:1579
 msgid " (still running)"
 msgstr " (まだ実行中)"
 
-#: ../memline.c:1586
+msgid ""
+"\n"
+"         [not usable with this version of Vim]"
+msgstr ""
+"\n"
+"         [このVimバージョンでは使用できません]"
+
 msgid ""
 "\n"
 "         [not usable on this computer]"
@@ -3962,97 +3621,75 @@ msgstr ""
 "\n"
 "         [このコンピュータでは使用できません]"
 
-#: ../memline.c:1590
 msgid "         [cannot be read]"
 msgstr "         [読込めません]"
 
-#: ../memline.c:1593
 msgid "         [cannot be opened]"
 msgstr "         [開けません]"
 
-#: ../memline.c:1698
 msgid "E313: Cannot preserve, there is no swap file"
 msgstr "E313: スワップファイルが無いので維持できません"
 
-#: ../memline.c:1747
 msgid "File preserved"
 msgstr "ファイルが維持されます"
 
-#: ../memline.c:1749
 msgid "E314: Preserve failed"
 msgstr "E314: 維持に失敗しました"
 
-#: ../memline.c:1819
 #, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get: 無効なlnumです: %<PRId64>"
+msgid "E315: ml_get: invalid lnum: %ld"
+msgstr "E315: ml_get: 無効なlnumです: %ld"
 
-#: ../memline.c:1851
 #, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get: 行 %<PRId64> を見つけられません"
+msgid "E316: ml_get: cannot find line %ld"
+msgstr "E316: ml_get: 行 %ld を見つけられません"
 
-#: ../memline.c:2236
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: ポインタブロックのIDが間違っています 3"
 
-#: ../memline.c:2311
 msgid "stack_idx should be 0"
 msgstr "stack_idx は 0 であるべきです"
 
-#: ../memline.c:2369
 msgid "E318: Updated too many blocks?"
 msgstr "E318: 更新されたブロックが多過ぎるかも?"
 
-#: ../memline.c:2511
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: ポインタブロックのIDが間違っています 4"
 
-#: ../memline.c:2536
 msgid "deleted block 1?"
 msgstr "ブロック 1 は消された?"
 
-#: ../memline.c:2707
 #, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: 行 %<PRId64> が見つかりません"
+msgid "E320: Cannot find line %ld"
+msgstr "E320: 行 %ld が見つかりません"
 
-#: ../memline.c:2916
 msgid "E317: pointer block id wrong"
 msgstr "E317: ポインタブロックのIDが間違っています"
 
-#: ../memline.c:2930
 msgid "pe_line_count is zero"
 msgstr "pe_line_count がゼロです"
 
-#: ../memline.c:2955
 #, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: 行番号が範囲外です: %<PRId64> 超えています"
+msgid "E322: line number out of range: %ld past the end"
+msgstr "E322: 行番号が範囲外です: %ld 超えています"
 
-#: ../memline.c:2959
 #, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: ブロック %<PRId64> の行カウントが間違っています"
+msgid "E323: line count wrong in block %ld"
+msgstr "E323: ブロック %ld の行カウントが間違っています"
 
-#: ../memline.c:2999
 msgid "Stack size increases"
 msgstr "スタックサイズが増えます"
 
-#: ../memline.c:3038
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: ポインタブロックのIDが間違っています 2"
 
-#: ../memline.c:3070
 #, c-format
 msgid "E773: Symlink loop for \"%s\""
 msgstr "E773: \"%s\" のシンボリックリンクがループになっています"
 
-#: ../memline.c:3221
 msgid "E325: ATTENTION"
 msgstr "E325: 注意"
 
-#: ../memline.c:3222
 msgid ""
 "\n"
 "Found a swap file by the name \""
@@ -4060,39 +3697,32 @@ msgstr ""
 "\n"
 "次の名前でスワップファイルを見つけました \""
 
-#: ../memline.c:3226
 msgid "While opening file \""
 msgstr "次のファイルを開いている最中 \""
 
-#: ../memline.c:3239
 msgid "      NEWER than swap file!\n"
 msgstr "      スワップファイルよりも新しいです!\n"
 
-#: ../memline.c:3244
+#. Some of these messages are long to allow translation to
+#. * other languages.
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
 "    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
 "(1) 別のプログラムが同じファイルを編集しているかもしれません.\n"
 "    この場合には, 変更をしてしまうと1つのファイルに対して異なる2つの\n"
-"    インスタンスができてしまうので, そうしないように気をつけてください."
+"    インスタンスができてしまうので, そうしないように気をつけてください.\n"
+"    終了するか, 注意しながら続けてください.\n"
 
-#: ../memline.c:3245
-msgid "  Quit, or continue with caution.\n"
-msgstr "    終了するか, 注意しながら続けてください.\n"
-
-#: ../memline.c:3246
 msgid "(2) An edit session for this file crashed.\n"
 msgstr "(2) このファイルの編集セッションがクラッシュした.\n"
 
-#: ../memline.c:3247
 msgid "    If this is the case, use \":recover\" or \"vim -r "
 msgstr "    この場合には \":recover\" か \"vim -r "
 
-#: ../memline.c:3249
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
@@ -4100,11 +3730,9 @@ msgstr ""
 "\"\n"
 "    を使用して変更をリカバーします(\":help recovery\" を参照).\n"
 
-#: ../memline.c:3250
 msgid "    If you did this already, delete the swap file \""
 msgstr "    既にこれを行なったのならば, スワップファイル \""
 
-#: ../memline.c:3252
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
@@ -4112,23 +3740,18 @@ msgstr ""
 "\"\n"
 "    を消せばこのメッセージを回避できます.\n"
 
-#: ../memline.c:3450 ../memline.c:3452
 msgid "Swap file \""
 msgstr "スワップファイル \""
 
-#: ../memline.c:3451 ../memline.c:3455
 msgid "\" already exists!"
 msgstr "\" が既にあります!"
 
-#: ../memline.c:3457
 msgid "VIM - ATTENTION"
 msgstr "VIM - 注意"
 
-#: ../memline.c:3459
 msgid "Swap file already exists!"
 msgstr "スワップファイルが既に存在します!"
 
-#: ../memline.c:3464
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4142,7 +3765,6 @@ msgstr ""
 "終了する(&Q)\n"
 "中止する(&A)"
 
-#: ../memline.c:3467
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4158,56 +3780,34 @@ msgstr ""
 "終了する(&Q)\n"
 "中止する(&A)"
 
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
-#: ../memline.c:3528
 msgid "E326: Too many swap files found"
 msgstr "E326: スワップファイルが多数見つかりました"
 
-#: ../memory.c:227
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: メモリが足りません!  (%<PRIu64> バイトを割当要求)"
-
-#: ../menu.c:62
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: メニューアイテムのパスの部分がサブメニューではありません"
 
-#: ../menu.c:63
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: メニューは他のモードにだけあります"
 
-#: ../menu.c:64
 #, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329: \"%s\" というメニューはありません"
 
 #. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
 msgid "E792: Empty menu name"
 msgstr "E792: メニュー名が空です"
 
-#: ../menu.c:340
 msgid "E330: Menu path must not lead to a sub-menu"
 msgstr "E330: メニューパスはサブメニューを生じるべきではありません"
 
-#: ../menu.c:365
 msgid "E331: Must not add menu items directly to menu bar"
 msgstr "E331: メニューバーには直接メニューアイテムを追加できません"
 
-#: ../menu.c:370
 msgid "E332: Separator cannot be part of a menu path"
 msgstr "E332: 区切りはメニューパスの一部ではありません"
 
 #. Now we have found the matching menu, and we list the mappings
 #. Highlight title
-#: ../menu.c:762
 msgid ""
 "\n"
 "--- Menus ---"
@@ -4215,69 +3815,60 @@ msgstr ""
 "\n"
 "--- メニュー ---"
 
-#: ../menu.c:1313
+msgid "Tear off this menu"
+msgstr "このメニューを切り取る"
+
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: メニューパスはメニューアイテムを生じなければいけません"
 
-#: ../menu.c:1330
 #, c-format
 msgid "E334: Menu not found: %s"
 msgstr "E334: メニューが見つかりません: %s"
 
-#: ../menu.c:1396
 #, c-format
 msgid "E335: Menu not defined for %s mode"
 msgstr "E335: %s にはメニューが定義されていません"
 
-#: ../menu.c:1426
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: メニューパスはサブメニューを生じなければいけません"
 
-#: ../menu.c:1447
 msgid "E337: Menu not found - check menu names"
 msgstr "E337: メニューが見つかりません - メニュー名を確認してください"
 
-#: ../message.c:423
 #, c-format
 msgid "Error detected while processing %s:"
 msgstr "%s の処理中にエラーが検出されました:"
 
-#: ../message.c:445
 #, c-format
 msgid "line %4ld:"
 msgstr "行 %4ld:"
 
-#: ../message.c:617
 #, c-format
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: 無効なレジスタ名: '%s'"
 
-#: ../message.c:986
+msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
+msgstr "日本語メッセージ翻訳/監修: 村岡 太郎 <koron.kaoriya@gmail.com>"
+
 msgid "Interrupt: "
 msgstr "割込み: "
 
-#: ../message.c:988
 msgid "Press ENTER or type command to continue"
 msgstr "続けるにはENTERを押すかコマンドを入力してください"
 
-#: ../message.c:1843
 #, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s 行 %<PRId64>"
+msgid "%s line %ld"
+msgstr "%s 行 %ld"
 
-#: ../message.c:2392
 msgid "-- More --"
 msgstr "-- 継続 --"
 
-#: ../message.c:2398
 msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
 msgstr " SPACE/d/j: 画面/ページ/行 下, b/u/k: 上, q: 終了 "
 
-#: ../message.c:3021 ../message.c:3031
 msgid "Question"
 msgstr "質問"
 
-#: ../message.c:3023
 msgid ""
 "&Yes\n"
 "&No"
@@ -4285,17 +3876,6 @@ msgstr ""
 "はい(&Y)\n"
 "いいえ(&N)"
 
-#: ../message.c:3033
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"はい(&Y)\n"
-"いいえ(&N)\n"
-"キャンセル(&C)"
-
-#: ../message.c:3045
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4309,175 +3889,247 @@ msgstr ""
 "全て放棄(&D)\n"
 "キャンセル(&C)"
 
-#: ../message.c:3058
+msgid "Select Directory dialog"
+msgstr "ディレクトリ選択ダイアログ"
+
+msgid "Save File dialog"
+msgstr "ファイル保存ダイアログ"
+
+msgid "Open File dialog"
+msgstr "ファイル読込ダイアログ"
+
+#. TODO: non-GUI file selector here
+msgid "E338: Sorry, no file browser in console mode"
+msgstr "E338: コンソールモードではファイルブラウザを使えません, ごめんなさい"
+
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: printf() の引数が不十分です"
 
-#: ../message.c:3119
 msgid "E807: Expected Float argument for printf()"
 msgstr "E807: printf() の引数には浮動少数点数が期待されています"
 
-#: ../message.c:3873
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: printf() の引数が多過ぎます"
 
-#: ../misc1.c:2256
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: 警告: 読込専用ファイルを変更します"
 
-#: ../misc1.c:2537
 msgid "Type number and <Enter> or click with mouse (empty cancels): "
 msgstr ""
 "番号と<Enter>を入力するかマウスでクリックしてください (空でキャンセル): "
 
-#: ../misc1.c:2539
 msgid "Type number and <Enter> (empty cancels): "
 msgstr "番号と<Enter>を入力してください (空でキャンセル): "
 
-#: ../misc1.c:2585
 msgid "1 more line"
 msgstr "1 行 追加しました"
 
-#: ../misc1.c:2588
 msgid "1 line less"
 msgstr "1 行 削除しました"
 
-#: ../misc1.c:2593
 #, c-format
-msgid "%<PRId64> more lines"
-msgstr "%<PRId64> 行 追加しました"
+msgid "%ld more lines"
+msgstr "%ld 行 追加しました"
 
-#: ../misc1.c:2596
 #, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "%<PRId64> 行 削除しました"
+msgid "%ld fewer lines"
+msgstr "%ld 行 削除しました"
 
-#: ../misc1.c:2599
 msgid " (Interrupted)"
 msgstr " (割込まれました)"
 
-#: ../misc1.c:2635
 msgid "Beep!"
 msgstr "ビーッ!"
 
-#: ../misc2.c:738
+msgid "ERROR: "
+msgstr "エラー: "
+
+#, c-format
+msgid ""
+"\n"
+"[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
+msgstr ""
+"\n"
+"[メモリ(バイト)] 総割当-解放量 %lu-%lu, 使用量 %lu, ピーク時 %lu\n"
+
+#, c-format
+msgid ""
+"[calls] total re/malloc()'s %lu, total free()'s %lu\n"
+"\n"
+msgstr ""
+"[呼出] 総 re/malloc() 回数 %lu, 総 free() 回数 %lu\n"
+"\n"
+
+msgid "E340: Line is becoming too long"
+msgstr "E340: 行が長くなり過ぎました"
+
+#, c-format
+msgid "E341: Internal error: lalloc(%ld, )"
+msgstr "E341: 内部エラー: lalloc(%ld,)"
+
+#, c-format
+msgid "E342: Out of memory!  (allocating %lu bytes)"
+msgstr "E342: メモリが足りません!  (%lu バイトを割当要求)"
+
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "実行のためにシェルを呼出し中: \"%s\""
 
-#: ../normal.c:183
+msgid "E545: Missing colon"
+msgstr "E545: コロンがありません"
+
+msgid "E546: Illegal mode"
+msgstr "E546: 不正なモードです"
+
+msgid "E547: Illegal mouseshape"
+msgstr "E547: 不正な 'mouseshape' です"
+
+msgid "E548: digit expected"
+msgstr "E548: 数値が必要です"
+
+msgid "E549: Illegal percentage"
+msgstr "E549: 不正なパーセンテージです"
+
+msgid "E854: path too long for completion"
+msgstr "E854: パスが長過ぎて補完できません"
+
+#, c-format
+msgid ""
+"E343: Invalid path: '**[number]' must be at the end of the path or be "
+"followed by '%s'."
+msgstr ""
+"E343: 無効なパスです: '**[数値]' はpathの最後か '%s' が続いてないといけませ"
+"ん."
+
+#, c-format
+msgid "E344: Can't find directory \"%s\" in cdpath"
+msgstr "E344: cdpathには \"%s\" というファイルがありません"
+
+#, c-format
+msgid "E345: Can't find file \"%s\" in path"
+msgstr "E345: pathには \"%s\" というファイルがありません"
+
+#, c-format
+msgid "E346: No more directory \"%s\" found in cdpath"
+msgstr "E346: cdpathにはこれ以上 \"%s\" というファイルがありません"
+
+#, c-format
+msgid "E347: No more file \"%s\" found in path"
+msgstr "E347: パスにはこれ以上 \"%s\" というファイルがありません"
+
+#, c-format
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr ""
+"E668: NetBeansの接続情報ファイルのアクセスモードに問題があります: \"%s\""
+
+#, c-format
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: バッファ %ld の NetBeans 接続が失われました"
+
+msgid "E838: netbeans is not supported with this GUI"
+msgstr "E838: NetBeansはこのGUIには対応していません"
+
+msgid "E511: netbeans already connected"
+msgstr "E511: NetBeansは既に接続しています"
+
+#, c-format
+msgid "E505: %s is read-only (add ! to override)"
+msgstr "E505: %s は読込専用です (強制書込には ! を追加)"
+
 msgid "E349: No identifier under cursor"
 msgstr "E349: カーソルの位置には識別子がありません"
 
-#: ../normal.c:1866
 msgid "E774: 'operatorfunc' is empty"
 msgstr "E774: 'operatorfunc' オプションが空です"
 
-#: ../normal.c:2637
+msgid "E775: Eval feature not available"
+msgstr "E775: 式評価機能が無効になっています"
+
 msgid "Warning: terminal cannot highlight"
 msgstr "警告: 使用している端末はハイライトできません"
 
-#: ../normal.c:2807
 msgid "E348: No string under cursor"
 msgstr "E348: カーソルの位置には文字列がありません"
 
-#: ../normal.c:3937
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr "E352: 現在の 'foldmethod' では折畳みを消去できません"
 
-#: ../normal.c:5897
 msgid "E664: changelist is empty"
 msgstr "E664: 変更リストが空です"
 
-#: ../normal.c:5899
 msgid "E662: At start of changelist"
 msgstr "E662: 変更リストの先頭"
 
-#: ../normal.c:5901
 msgid "E663: At end of changelist"
 msgstr "E663: 変更リストの末尾"
 
-#: ../normal.c:7053
-msgid "Type  :quit<Enter>  to exit Nvim"
+msgid "Type  :quit<Enter>  to exit Vim"
 msgstr "Vimを終了するには :quit<Enter> と入力してください"
 
-#: ../ops.c:248
 #, c-format
 msgid "1 line %sed 1 time"
 msgstr "1 行が %s で 1 回処理されました"
 
-#: ../ops.c:250
 #, c-format
 msgid "1 line %sed %d times"
 msgstr "1 行が %s で %d 回処理されました"
 
-#: ../ops.c:253
 #, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> 行が %s で 1 回処理されました"
+msgid "%ld lines %sed 1 time"
+msgstr "%ld 行が %s で 1 回処理されました"
 
-#: ../ops.c:256
 #, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> 行が %s で %d 回処理されました"
+msgid "%ld lines %sed %d times"
+msgstr "%ld 行が %s で %d 回処理されました"
 
-#: ../ops.c:592
 #, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "%<PRId64> 行がインデントされます... "
+msgid "%ld lines to indent... "
+msgstr "%ld 行がインデントされます... "
 
-#: ../ops.c:634
 msgid "1 line indented "
 msgstr "1 行をインデントしました "
 
-#: ../ops.c:636
 #, c-format
-msgid "%<PRId64> lines indented "
-msgstr "%<PRId64> 行をインデントしました "
+msgid "%ld lines indented "
+msgstr "%ld 行をインデントしました "
 
-#: ../ops.c:938
 msgid "E748: No previously used register"
 msgstr "E748: まだレジスタを使用していません"
 
 #. must display the prompt
-#: ../ops.c:1433
 msgid "cannot yank; delete anyway"
 msgstr "ヤンクできません; とにかく消去"
 
-#: ../ops.c:1929
 msgid "1 line changed"
 msgstr "1 行が変更されました"
 
-#: ../ops.c:1931
 #, c-format
-msgid "%<PRId64> lines changed"
-msgstr "%<PRId64> 行が変更されました"
+msgid "%ld lines changed"
+msgstr "%ld 行が変更されました"
+
+#, c-format
+msgid "freeing %ld lines"
+msgstr "%ld 行を解放中"
 
-#: ../ops.c:2521
 msgid "block of 1 line yanked"
 msgstr "1 行のブロックがヤンクされました"
 
-#: ../ops.c:2523
 msgid "1 line yanked"
 msgstr "1 行がヤンクされました"
 
-#: ../ops.c:2525
 #, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "%<PRId64> 行のブロックがヤンクされました"
+msgid "block of %ld lines yanked"
+msgstr "%ld 行のブロックがヤンクされました"
 
-#: ../ops.c:2528
 #, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "%<PRId64> 行がヤンクされました"
+msgid "%ld lines yanked"
+msgstr "%ld 行がヤンクされました"
 
-#: ../ops.c:2710
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: レジスタ %s には何もありません"
 
 #. Highlight title
-#: ../ops.c:3185
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4485,11 +4137,9 @@ msgstr ""
 "\n"
 "--- レジスタ ---"
 
-#: ../ops.c:4455
 msgid "Illegal register name"
 msgstr "不正なレジスタ名"
 
-#: ../ops.c:4533
 msgid ""
 "\n"
 "# Registers:\n"
@@ -4497,7 +4147,6 @@ msgstr ""
 "\n"
 "# レジスタ:\n"
 
-#: ../ops.c:4575
 #, c-format
 msgid "E574: Unknown register type %d"
 msgstr "E574: 未知のレジスタ型 %d です"
@@ -4507,86 +4156,61 @@ msgid ""
 "lines"
 msgstr "E883: 検索パターンと式レジスタには2行以上を含められません"
 
-#: ../ops.c:5089
 #, c-format
-msgid "%<PRId64> Cols; "
-msgstr "%<PRId64> 列; "
+msgid "%ld Cols; "
+msgstr "%ld 列; "
+
+#, c-format
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+msgstr "選択 %s%ld / %ld 行; %lld / %lld 単語; %lld / %lld バイト"
 
-#: ../ops.c:5097
 #, c-format
 msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
 msgstr ""
-"選択 %s%<PRId64> / %<PRId64> 行; %<PRId64> / %<PRId64> 単語; %<PRId64> / "
-"%<PRId64> バイト"
+"選択 %s%ld / %ld 行; %lld / %lld 単語; %lld / %lld 文字; %lld / %lld バイト"
+
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+msgstr "列 %s / %s; 行 %ld of %ld; 単語 %lld / %lld; バイト %lld / %lld"
 
-#: ../ops.c:5105
 #, c-format
 msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
 msgstr ""
-"選択 %s%<PRId64> / %<PRId64> 行; %<PRId64> / %<PRId64> 単語; %<PRId64> / "
-"%<PRId64> 文字; %<PRId64> / %<PRId64> バイト"
+"列 %s / %s; 行 %ld / %ld; 単語 %lld / %lld; 文字 %lld / %lld; バイト %lld of "
+"%lld"
 
-#: ../ops.c:5123
 #, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
-msgstr ""
-"列 %s / %s; 行 %<PRId64> of %<PRId64>; 単語 %<PRId64> / %<PRId64>; バイト "
-"%<PRId64> / %<PRId64>"
+msgid "(+%ld for BOM)"
+msgstr "(+%ld for BOM)"
 
-#: ../ops.c:5133
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
-msgstr ""
-"列 %s / %s; 行 %<PRId64> / %<PRId64>; 単語 %<PRId64> / %<PRId64>; 文字 "
-"%<PRId64> / %<PRId64>; バイト %<PRId64> of %<PRId64>"
-
-#: ../ops.c:5146
-#, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr "(+%<PRId64> for BOM)"
-
-#: ../option.c:1238
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=%N ページ"
 
-#: ../option.c:1574
 msgid "Thanks for flying Vim"
 msgstr "Vim を使ってくれてありがとう"
 
-#. found a mismatch: skip
-#: ../option.c:2698
 msgid "E518: Unknown option"
 msgstr "E518: 未知のオプションです"
 
-#: ../option.c:2709
 msgid "E519: Option not supported"
 msgstr "E519: オプションはサポートされていません"
 
-#: ../option.c:2740
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: modeline では許可されません"
 
-#: ../option.c:2815
 msgid "E846: Key code not set"
 msgstr "E846: キーコードが設定されていません"
 
-#: ../option.c:2924
 msgid "E521: Number required after ="
 msgstr "E521: = の後には数字が必要です"
 
-#: ../option.c:3226 ../option.c:3864
 msgid "E522: Not found in termcap"
 msgstr "E522: termcap 内に見つかりません"
 
-#: ../option.c:3335
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: 不正な文字です <%s>"
@@ -4595,93 +4219,99 @@ msgstr "E539: 不正な文字です <%s>"
 msgid "For option %s"
 msgstr "オプション: %s"
 
-#: ../option.c:3862
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: 'term' には空文字列を設定できません"
 
-#: ../option.c:3885
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: GUIでは 'term' を変更できません"
+
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: GUIをスタートするには \":gui\" を使用してください"
+
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: 'backupext' と 'patchmode' が同じです"
 
-#: ../option.c:3964
 msgid "E834: Conflicts with value of 'listchars'"
 msgstr "E834: 'listchars'の値に矛盾があります"
 
-#: ../option.c:3966
 msgid "E835: Conflicts with value of 'fillchars'"
 msgstr "E835: 'fillchars'の値に矛盾があります"
 
-#: ../option.c:4163
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: GTK+2 GUIでは変更できません"
+
 msgid "E524: Missing colon"
 msgstr "E524: コロンがありません"
 
-#: ../option.c:4165
 msgid "E525: Zero length string"
 msgstr "E525: 文字列の長さがゼロです"
 
-#: ../option.c:4220
 #, c-format
 msgid "E526: Missing number after <%s>"
 msgstr "E526: <%s> の後に数字がありません"
 
-#: ../option.c:4232
 msgid "E527: Missing comma"
 msgstr "E527: カンマがありません"
 
-#: ../option.c:4239
 msgid "E528: Must specify a ' value"
 msgstr "E528: ' の値を指定しなければなりません"
 
-#: ../option.c:4271
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: 表示できない文字かワイド文字を含んでいます"
 
-#: ../option.c:4469
+msgid "E596: Invalid font(s)"
+msgstr "E596: 無効なフォントです"
+
+msgid "E597: can't select fontset"
+msgstr "E597: フォントセットを選択できません"
+
+msgid "E598: Invalid fontset"
+msgstr "E598: 無効なフォントセットです"
+
+msgid "E533: can't select wide font"
+msgstr "E533: ワイドフォントを選択できません"
+
+msgid "E534: Invalid wide font"
+msgstr "E534: 無効なワイドフォントです"
+
 #, c-format
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: <%c> の後に不正な文字があります"
 
-#: ../option.c:4534
 msgid "E536: comma required"
 msgstr "E536: カンマが必要です"
 
-#: ../option.c:4543
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr "E537: 'commentstring' は空であるか %s を含む必要があります"
 
-#: ../option.c:4928
+msgid "E538: No mouse support"
+msgstr "E538: マウスはサポートされません"
+
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: 式が終了していません"
 
-#: ../option.c:4932
 msgid "E541: too many items"
 msgstr "E541: 要素が多過ぎます"
 
-#: ../option.c:4934
 msgid "E542: unbalanced groups"
 msgstr "E542: グループが釣合いません"
 
-#: ../option.c:5148
 msgid "E590: A preview window already exists"
 msgstr "E590: プレビューウィンドウが既に存在します"
 
-#: ../option.c:5311
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
 msgstr ""
 "W17: アラビア文字にはUTF-8が必要なので, ':set encoding=utf-8' してください"
 
-#: ../option.c:5623
 #, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593: 最低 %d の行数が必要です"
 
-#: ../option.c:5631
 #, c-format
 msgid "E594: Need at least %d columns"
 msgstr "E594: 最低 %d のカラム幅が必要です"
 
-#: ../option.c:6011
 #, c-format
 msgid "E355: Unknown option: %s"
 msgstr "E355: 未知のオプションです: %s"
@@ -4689,12 +4319,10 @@ msgstr "E355: 未知のオプションです: %s"
 #. There's another character after zeros or the string
 #. * is empty.  In both cases, we are trying to set a
 #. * num option using a string.
-#: ../option.c:6037
 #, c-format
 msgid "E521: Number required: &%s = '%s'"
 msgstr "E521: 数字が必要です: &%s = '%s'"
 
-#: ../option.c:6149
 msgid ""
 "\n"
 "--- Terminal codes ---"
@@ -4702,7 +4330,6 @@ msgstr ""
 "\n"
 "--- 端末コード ---"
 
-#: ../option.c:6151
 msgid ""
 "\n"
 "--- Global option values ---"
@@ -4710,7 +4337,6 @@ msgstr ""
 "\n"
 "--- グローバルオプション値 ---"
 
-#: ../option.c:6153
 msgid ""
 "\n"
 "--- Local option values ---"
@@ -4718,7 +4344,6 @@ msgstr ""
 "\n"
 "--- ローカルオプション値 ---"
 
-#: ../option.c:6155
 msgid ""
 "\n"
 "--- Options ---"
@@ -4726,37 +4351,119 @@ msgstr ""
 "\n"
 "--- オプション ---"
 
-#: ../option.c:6816
 msgid "E356: get_varp ERROR"
 msgstr "E356: get_varp エラー"
 
-#: ../option.c:7696
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap': %s に対応する文字がありません"
 
-#: ../option.c:7715
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap': セミコロンの後に余分な文字があります: %s"
 
-#: ../os/shell.c:194
+msgid "cannot open "
+msgstr "開けません "
+
+msgid "VIM: Can't open window!\n"
+msgstr "VIM: ウィンドウを開けません!\n"
+
+msgid "Need Amigados version 2.04 or later\n"
+msgstr "Amigadosのバージョン 2.04かそれ以降が必要です\n"
+
+#, c-format
+msgid "Need %s version %ld\n"
+msgstr "%s のバージョン %ld が必要です\n"
+
+msgid "Cannot open NIL:\n"
+msgstr "NILを開けません:\n"
+
+msgid "Cannot create "
+msgstr "作成できません "
+
+#, c-format
+msgid "Vim exiting with %d\n"
+msgstr "Vimは %d で終了します\n"
+
+msgid "cannot change console mode ?!\n"
+msgstr "コンソールモードを変更できません?!\n"
+
+msgid "mch_get_shellsize: not a console??\n"
+msgstr "mch_get_shellsize: コンソールではない??\n"
+
+#. if Vim opened a window: Executing a shell may cause crashes
+msgid "E360: Cannot execute shell with -f option"
+msgstr "E360: -f オプションでシェルを実行できません"
+
+msgid "Cannot execute "
+msgstr "実行できません "
+
+msgid "shell "
+msgstr "シェル "
+
+msgid " returned\n"
+msgstr " 戻りました\n"
+
+msgid "ANCHOR_BUF_SIZE too small."
+msgstr "ANCHOR_BUF_SIZE が小さ過ぎます."
+
+msgid "I/O ERROR"
+msgstr "入出力エラー"
+
+msgid "Message"
+msgstr "メッセージ"
+
+msgid "'columns' is not 80, cannot execute external commands"
+msgstr "'columns' が 80 ではないため、外部コマンドを実行できません"
+
+msgid "E237: Printer selection failed"
+msgstr "E237: プリンタの選択に失敗しました"
+
+#, c-format
+msgid "to %s on %s"
+msgstr "%s へ (%s 上の)"
+
+#, c-format
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: 未知のプリンタオプションです: %s"
+
+#, c-format
+msgid "E238: Print error: %s"
+msgstr "E238: 印刷エラー: %s"
+
+#, c-format
+msgid "Printing '%s'"
+msgstr "印刷しています: '%s'"
+
+#, c-format
+msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
+msgstr "E244: 文字セット名 \"%s\" は不正です (フォント名 \"%s\")"
+
+#, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr "E244: 品質名 \"%s\" は不正です (フォント名 \"%s\")"
+
+#, c-format
+msgid "E245: Illegal char '%c' in font name \"%s\""
+msgstr "E245: '%c' は不正な文字です (フォント名 \"%s\")"
+
+#, c-format
+msgid "Opening the X display took %ld msec"
+msgstr "Xサーバーへの接続に %ld ミリ秒かかりました"
+
 msgid ""
 "\n"
-"Cannot execute shell "
+"Vim: Got X error\n"
 msgstr ""
 "\n"
-"シェルを実行できません "
+"Vim: X のエラーを検出しましたr\n"
 
-#: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"シェルが値を返しました "
+msgid "Testing the X display failed"
+msgstr "X display のチェックに失敗しました"
+
+msgid "Opening the X display timed out"
+msgstr "X display の open がタイムアウトしました"
 
-#: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
 "\n"
 "Could not get security context for "
@@ -4764,7 +4471,6 @@ msgstr ""
 "\n"
 "セキュリティコンテキストを取得できません "
 
-#: ../os_unix.c:479
 msgid ""
 "\n"
 "Could not set security context for "
@@ -4780,223 +4486,293 @@ msgstr "セキュリティコンテキスト %s を %s に設定できません"
 msgid "Could not get security context %s for %s. Removing it!"
 msgstr "セキュリティコンテキスト %s を %s から取得できません. 削除します!"
 
-#: ../os_unix.c:1558 ../os_unix.c:1647
+msgid ""
+"\n"
+"Cannot execute shell sh\n"
+msgstr ""
+"\n"
+"sh シェルを実行できません\n"
+
+msgid ""
+"\n"
+"shell returned "
+msgstr ""
+"\n"
+"シェルが値を返しました "
+
+msgid ""
+"\n"
+"Cannot create pipes\n"
+msgstr ""
+"\n"
+"パイプを作成できません\n"
+
+msgid ""
+"\n"
+"Cannot fork\n"
+msgstr ""
+"\n"
+"fork できません\n"
+
+msgid ""
+"\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"シェルを実行できません "
+
+msgid ""
+"\n"
+"Command terminated\n"
+msgstr ""
+"\n"
+"コマンドを中断しました\n"
+
+msgid "XSMP lost ICE connection"
+msgstr "XSMP がICE接続を失いました"
+
 #, c-format
 msgid "dlerror = \"%s\""
 msgstr "dlerror = \"%s\""
 
-#: ../path.c:1449
-#, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: pathには \"%s\" というファイルがありません"
+msgid "Opening the X display failed"
+msgstr "X display の open に失敗しました"
+
+msgid "XSMP handling save-yourself request"
+msgstr "XSMP がsave-yourself要求を処理しています"
+
+msgid "XSMP opening connection"
+msgstr "XSMP が接続を開始しています"
+
+msgid "XSMP ICE connection watch failed"
+msgstr "XSMP ICE接続が失敗したようです"
+
+#, c-format
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "XSMP SmcOpenConnectionが失敗しました: %s"
+
+msgid "At line"
+msgstr "行"
+
+msgid "Could not load vim32.dll!"
+msgstr "vim32.dll をロードできませんでした"
+
+msgid "VIM Error"
+msgstr "VIMエラー"
+
+msgid "Could not fix up function pointers to the DLL!"
+msgstr "DLLから関数ポインタを取得できませんでした"
+
+#, c-format
+msgid "Vim: Caught %s event\n"
+msgstr "Vim: イベント %s を検知\n"
+
+msgid "close"
+msgstr "閉じる"
+
+msgid "logoff"
+msgstr "ログオフ"
+
+msgid "shutdown"
+msgstr "シャットダウン"
+
+msgid "E371: Command not found"
+msgstr "E371: コマンドがありません"
+
+msgid ""
+"VIMRUN.EXE not found in your $PATH.\n"
+"External commands will not pause after completion.\n"
+"See  :help win32-vimrun  for more information."
+msgstr ""
+"VIMRUN.EXEが $PATH の中に見つかりません.\n"
+"外部コマンドの終了後に一時停止をしません.\n"
+"詳細は  :help win32-vimrun  を参照してください."
+
+msgid "Vim Warning"
+msgstr "Vimの警告"
+
+#, c-format
+msgid "shell returned %d"
+msgstr "シェルがコード %d で終了しました"
 
-#: ../quickfix.c:359
 #, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: フォーマット文字列に %%%c が多過ぎます"
 
-#: ../quickfix.c:371
 #, c-format
 msgid "E373: Unexpected %%%c in format string"
 msgstr "E373: フォーマット文字列に予期せぬ %%%c がありました"
 
-#: ../quickfix.c:420
 msgid "E374: Missing ] in format string"
 msgstr "E374: フォーマット文字列に ] がありません"
 
-#: ../quickfix.c:431
 #, c-format
 msgid "E375: Unsupported %%%c in format string"
 msgstr "E375: フォーマット文字列では %%%c はサポートされません"
 
-#: ../quickfix.c:448
 #, c-format
 msgid "E376: Invalid %%%c in format string prefix"
 msgstr "E376: フォーマット文字列の前置に無効な %%%c があります"
 
-#: ../quickfix.c:454
 #, c-format
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: フォーマット文字列に無効な %%%c があります"
 
 #. nothing found
-#: ../quickfix.c:477
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: 'errorformat' にパターンが指定されていません"
 
-#: ../quickfix.c:695
 msgid "E379: Missing or empty directory name"
 msgstr "E379: ディレクトリ名が無いか空です"
 
-#: ../quickfix.c:1305
 msgid "E553: No more items"
 msgstr "E553: 要素がもうありません"
 
-#: ../quickfix.c:1674
+msgid "E924: Current window was closed"
+msgstr "E924: 現在のウィンドウが閉じられました"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: 現在の quickfix が変更されました"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: 現在のロケーションリストが変更されました"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d of %d)%s%s: "
 
-#: ../quickfix.c:1676
 msgid " (line deleted)"
 msgstr " (行が削除されました)"
 
-#: ../quickfix.c:1863
+#, c-format
+msgid "%serror list %d of %d; %d errors "
+msgstr "%s エラー一覧 %d of %d; %d 個エラー"
+
 msgid "E380: At bottom of quickfix stack"
 msgstr "E380: quickfix スタックの末尾です"
 
-#: ../quickfix.c:1869
 msgid "E381: At top of quickfix stack"
 msgstr "E381: quickfix スタックの先頭です"
 
-#: ../quickfix.c:1880
-#, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "エラー一覧 %d of %d; %d 個エラー"
+msgid "No entries"
+msgstr "エントリがありません"
 
-#: ../quickfix.c:2427
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: 'buftype' オプションが設定されているので書込みません"
 
-#: ../quickfix.c:2812
+msgid "Error file"
+msgstr "エラーファイル"
+
 msgid "E683: File name missing or invalid pattern"
 msgstr "E683: ファイル名が無いか無効なパターンです"
 
-#: ../quickfix.c:2911
 #, c-format
 msgid "Cannot open file \"%s\""
 msgstr "ファイル \"%s\" を開けません"
 
-#: ../quickfix.c:3429
 msgid "E681: Buffer is not loaded"
 msgstr "E681: バッファは読み込まれませんでした"
 
-#: ../quickfix.c:3487
 msgid "E777: String or List expected"
 msgstr "E777: 文字列かリストが必要です"
 
-#: ../regexp.c:359
 #, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: 無効な項目です: %s%%[]"
 
 #
-#: ../regexp.c:374
 #, c-format
 msgid "E769: Missing ] after %s["
 msgstr "E769: %s[ の後に ] がありません"
 
-#: ../regexp.c:375
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: %s%%( が釣り合っていません"
 
-#: ../regexp.c:376
 #, c-format
 msgid "E54: Unmatched %s("
 msgstr "E54: %s( が釣り合っていません"
 
-#: ../regexp.c:377
 #, c-format
 msgid "E55: Unmatched %s)"
 msgstr "E55: %s) が釣り合っていません"
 
 #
-#: ../regexp.c:378
 msgid "E66: \\z( not allowed here"
 msgstr "E66: \\z( はココでは許可されていません"
 
 #
-#: ../regexp.c:379
 msgid "E67: \\z1 et al. not allowed here"
 msgstr "E67: \\z1 その他はココでは許可されていません"
 
 #
-#: ../regexp.c:380
 #, c-format
 msgid "E69: Missing ] after %s%%["
 msgstr "E69: %s%%[ の後に ] がありません"
 
-#: ../regexp.c:381
 #, c-format
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] が空です"
 
-#: ../regexp.c:1209 ../regexp.c:1224
 msgid "E339: Pattern too long"
 msgstr "E339: パターンが長過ぎます"
 
-#: ../regexp.c:1371
 msgid "E50: Too many \\z("
 msgstr "E50: \\z( が多過ぎます"
 
-#: ../regexp.c:1378
 #, c-format
 msgid "E51: Too many %s("
 msgstr "E51: %s( が多過ぎます"
 
-#: ../regexp.c:1427
 msgid "E52: Unmatched \\z("
 msgstr "E52: \\z( が釣り合っていません"
 
-#: ../regexp.c:1637
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: %s@ の後に不正な文字がありました"
 
-#: ../regexp.c:1672
 #, c-format
 msgid "E60: Too many complex %s{...}s"
 msgstr "E60: 複雑な %s{...} が多過ぎます"
 
-#: ../regexp.c:1687
 #, c-format
 msgid "E61: Nested %s*"
 msgstr "E61:%s* が入れ子になっています"
 
-#: ../regexp.c:1690
 #, c-format
 msgid "E62: Nested %s%c"
 msgstr "E62:%s%c が入れ子になっています"
 
 #
-#: ../regexp.c:1800
 msgid "E63: invalid use of \\_"
 msgstr "E63: \\_ の無効な使用方法です"
 
-#: ../regexp.c:1850
 #, c-format
 msgid "E64: %s%c follows nothing"
 msgstr "E64:%s%c の後になにもありません"
 
 #
-#: ../regexp.c:1902
 msgid "E65: Illegal back reference"
 msgstr "E65: 不正な後方参照です"
 
 #
-#: ../regexp.c:1943
 msgid "E68: Invalid character after \\z"
 msgstr "E68: \\z の後に不正な文字がありました"
 
 #
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
 #, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
 msgstr "E678: %s%%[dxouU] の後に不正な文字がありました"
 
 #
-#: ../regexp.c:2107
 #, c-format
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: %s%% の後に不正な文字がありました"
 
-#: ../regexp.c:3017
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: %s{...} 内に文法エラーがあります"
 
-#: ../regexp.c:3805
 msgid "External submatches:\n"
 msgstr "外部の部分該当:\n"
 
@@ -5004,7 +4780,6 @@ msgstr "外部の部分該当:\n"
 msgid "E888: (NFA regexp) cannot repeat %s"
 msgstr "E888: (NFA 正規表現) 繰り返せません %s"
 
-#: ../regexp.c:7022
 msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
 "used "
@@ -5015,62 +4790,54 @@ msgstr ""
 msgid "Switching to backtracking RE engine for pattern: "
 msgstr "次のパターンにバックトラッキング RE エンジンを適用します: "
 
-#: ../regexp_nfa.c:239
 msgid "E865: (NFA) Regexp end encountered prematurely"
 msgstr "E865: (NFA) 期待より早く正規表現の終端に到達しました"
 
-#: ../regexp_nfa.c:240
 #, c-format
 msgid "E866: (NFA regexp) Misplaced %c"
 msgstr "E866: (NFA 正規表現) 位置が誤っています: %c"
 
-#: ../regexp_nfa.c:242
+#
 #, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr "E877: (NFA 正規表現) 無効な文字クラス: %<PRId64>"
+msgid "E877: (NFA regexp) Invalid character class: %ld"
+msgstr "E877: (NFA 正規表現) 無効な文字クラス: %ld"
 
-#: ../regexp_nfa.c:1261
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
 msgstr "E867: (NFA) 未知のオペレータです: '\\z%c'"
 
-#: ../regexp_nfa.c:1387
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\%%%c'"
 msgstr "E867: (NFA) 未知のオペレータです: '\\%%%c'"
 
-#: ../regexp_nfa.c:1802
+#. should never happen
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: 等価クラスを含むNFA構築に失敗しました!"
+
 #, c-format
 msgid "E869: (NFA) Unknown operator '\\@%c'"
 msgstr "E869: (NFA) 未知のオペレータです: '\\@%c'"
 
-#: ../regexp_nfa.c:1831
 msgid "E870: (NFA regexp) Error reading repetition limits"
 msgstr "E870: (NFA 正規表現) 繰り返しの制限回数を読込中にエラー"
 
 #. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
 msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
 msgstr "E871: (NFA 正規表現) 繰り返し の後に 繰り返し はできません!"
 
 #. Too many `('
-#: ../regexp_nfa.c:2037
 msgid "E872: (NFA regexp) Too many '('"
 msgstr "E872: (NFA 正規表現) '(' が多過ぎます"
 
-#: ../regexp_nfa.c:2042
 msgid "E879: (NFA regexp) Too many \\z("
 msgstr "E879: (NFA 正規表現) \\z( が多過ぎます"
 
-#: ../regexp_nfa.c:2066
 msgid "E873: (NFA regexp) proper termination error"
 msgstr "E873: (NFA 正規表現) 終端記号がありません"
 
-#: ../regexp_nfa.c:2599
 msgid "E874: (NFA) Could not pop the stack !"
 msgstr "E874: (NFA) スタックをポップできません!"
 
-#: ../regexp_nfa.c:3298
 msgid ""
 "E875: (NFA regexp) (While converting from postfix to NFA), too many states "
 "left on stack"
@@ -5078,177 +4845,136 @@ msgstr ""
 "E875: (NFA 正規表現) (後置文字列をNFAに変換中に) スタックに残されたステートが"
 "多過ぎます"
 
-#: ../regexp_nfa.c:3302
 msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
 msgstr "E876: (NFA 正規表現) NFA全体を保存するには空きスペースが足りません"
 
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
+msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+msgstr "E878: (NFA) 現在横断中のブランチに十分なメモリを割り当てられません!"
+
 msgid ""
 "Could not open temporary log file for writing, displaying on stderr ... "
 msgstr ""
 "NFA正規表現エンジン用のログファイルを書込用として開けません。ログは標準出力に"
 "出力します。"
 
-#: ../regexp_nfa.c:4840
 #, c-format
 msgid "(NFA) COULD NOT OPEN %s !"
 msgstr "(NFA) ログファイル %s を開けません!"
 
-#: ../regexp_nfa.c:6049
 msgid "Could not open temporary log file for writing "
 msgstr "NFA正規表現エンジン用のログファイルを書込用として開けません。"
 
-#: ../screen.c:7435
 msgid " VREPLACE"
 msgstr " 仮想置換"
 
-#: ../screen.c:7437
 msgid " REPLACE"
 msgstr " 置換"
 
-#: ../screen.c:7440
 msgid " REVERSE"
 msgstr " 反転"
 
-#: ../screen.c:7441
 msgid " INSERT"
 msgstr " 挿入"
 
-#: ../screen.c:7443
 msgid " (insert)"
 msgstr " (挿入)"
 
-#: ../screen.c:7445
 msgid " (replace)"
 msgstr " (置換)"
 
-#: ../screen.c:7447
 msgid " (vreplace)"
 msgstr " (仮想置換)"
 
-#: ../screen.c:7449
 msgid " Hebrew"
 msgstr " ヘブライ"
 
-#: ../screen.c:7454
 msgid " Arabic"
 msgstr " アラビア"
 
-#: ../screen.c:7456
-msgid " (lang)"
-msgstr " (言語)"
-
-#: ../screen.c:7459
 msgid " (paste)"
 msgstr " (貼り付け)"
 
-#: ../screen.c:7469
 msgid " VISUAL"
 msgstr " ビジュアル"
 
-#: ../screen.c:7470
 msgid " VISUAL LINE"
 msgstr " ビジュアル 行"
 
-#: ../screen.c:7471
 msgid " VISUAL BLOCK"
 msgstr " ビジュアル 矩形"
 
-#: ../screen.c:7472
 msgid " SELECT"
 msgstr " セレクト"
 
-#: ../screen.c:7473
 msgid " SELECT LINE"
 msgstr " 行指向選択"
 
-#: ../screen.c:7474
 msgid " SELECT BLOCK"
 msgstr " 矩形選択"
 
-#: ../screen.c:7486 ../screen.c:7541
 msgid "recording"
 msgstr "記録中"
 
-#: ../search.c:487
 #, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: 無効な検索文字列です: %s"
 
-#: ../search.c:832
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
 msgstr "E384: 上まで検索しましたが該当箇所はありません: %s"
 
-#: ../search.c:835
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
 msgstr "E385: 下まで検索しましたが該当箇所はありません: %s"
 
-#: ../search.c:1200
 msgid "E386: Expected '?' or '/'  after ';'"
 msgstr "E386: ';' のあとには '?' か '/' が期待されている"
 
-#: ../search.c:4085
 msgid " (includes previously listed match)"
 msgstr " (前に列挙した該当箇所を含む)"
 
 #. cursor at status line
-#: ../search.c:4104
 msgid "--- Included files "
 msgstr "--- インクルードされたファイル "
 
-#: ../search.c:4106
 msgid "not found "
 msgstr "見つかりません "
 
-#: ../search.c:4107
 msgid "in path ---\n"
 msgstr "パスに ----\n"
 
-#: ../search.c:4168
 msgid "  (Already listed)"
 msgstr "  (既に列挙)"
 
-#: ../search.c:4170
 msgid "  NOT FOUND"
 msgstr "  見つかりません"
 
-#: ../search.c:4211
 #, c-format
 msgid "Scanning included file: %s"
 msgstr "インクルードされたファイルをスキャン中: %s"
 
-#: ../search.c:4216
 #, c-format
 msgid "Searching included file %s"
 msgstr "インクルードされたファイルをスキャン中 %s"
 
-#: ../search.c:4405
 msgid "E387: Match is on current line"
 msgstr "E387: 現在行に該当があります"
 
-#: ../search.c:4517
 msgid "All included files were found"
 msgstr "全てのインクルードされたファイルが見つかりました"
 
-#: ../search.c:4519
 msgid "No included files"
 msgstr "インクルードファイルはありません"
 
-#: ../search.c:4527
 msgid "E388: Couldn't find definition"
 msgstr "E388: 定義を見つけられません"
 
-#: ../search.c:4529
 msgid "E389: Couldn't find pattern"
 msgstr "E389: パターンを見つけられません"
 
-#: ../search.c:4668
 msgid "Substitute "
 msgstr "Substitute "
 
-#: ../search.c:4681
 #, c-format
 msgid ""
 "\n"
@@ -5259,99 +4985,131 @@ msgstr ""
 "# 最後の %s検索パターン:\n"
 "~"
 
-#: ../spell.c:951
-msgid "E759: Format error in spell file"
-msgstr "E759: スペルファイルの書式エラーです"
-
-#: ../spell.c:952
-msgid "E758: Truncated spell file"
-msgstr "E758: スペルファイルが切取られているようです"
-
-#: ../spell.c:953
-#, c-format
-msgid "Trailing text in %s line %d: %s"
-msgstr "%s (%d 行目) に続くテキスト: %s"
-
-#: ../spell.c:954
-#, c-format
-msgid "Affix name too long in %s line %d: %s"
-msgstr "%s (%d 行目) の affix 名が長過ぎます: %s"
-
-#: ../spell.c:955
-msgid "E761: Format error in affix file FOL, LOW or UPP"
-msgstr ""
-"E761: affixファイルの FOL, LOW もしくは UPP のフォーマットにエラーがあります"
-
-#: ../spell.c:957
-msgid "E762: Character in FOL, LOW or UPP is out of range"
-msgstr "E762: FOL, LOW もしくは UPP の文字が範囲外です"
-
-#: ../spell.c:958
-msgid "Compressing word tree..."
-msgstr "単語ツリーを圧縮しています..."
-
-#: ../spell.c:1951
 msgid "E756: Spell checking is not enabled"
 msgstr "E756: スペルチェックは無効化されています"
 
-#: ../spell.c:2249
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr ""
+"警告: 単語リスト \"%s_%s.spl\" および \"%s_ascii.spl\" は見つかりません"
+
 #, c-format
 msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
 msgstr ""
 "警告: 単語リスト \"%s.%s.spl\" および \"%s.ascii.spl\" は見つかりません"
 
-#: ../spell.c:2473
-#, c-format
-msgid "Reading spell file \"%s\""
-msgstr "スペルファイル \"%s\" を読込中"
+msgid "E797: SpellFileMissing autocommand deleted buffer"
+msgstr "E797: autocommand の SpellFileMissing がバッファを削除しました"
 
-#: ../spell.c:2496
-msgid "E757: This does not look like a spell file"
-msgstr "E757: スペルファイルではないようです"
-
-#: ../spell.c:2501
-msgid "E771: Old spell file, needs to be updated"
-msgstr "E771: 古いスペルファイルなので, アップデートしてください"
-
-#: ../spell.c:2504
-msgid "E772: Spell file is for newer version of Vim"
-msgstr "E772: より新しいバージョンの Vim 用のスペルファイルです"
-
-#: ../spell.c:2602
-msgid "E770: Unsupported section in spell file"
-msgstr "E770: スペルファイルにサポートしていないセクションがあります"
-
-#: ../spell.c:3762
 #, c-format
 msgid "Warning: region %s not supported"
 msgstr "警告9: %s という範囲はサポートされていません"
 
-#: ../spell.c:4550
+msgid "Sorry, no suggestions"
+msgstr "残念ですが, 修正候補はありません"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "残念ですが, 修正候補は %ld 個しかありません"
+
+#. for when 'cmdheight' > 1
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "\"%.*s\" を次へ変換:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: スペル置換がまだ実行されていません"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: 見つかりません: %s"
+
+msgid "E758: Truncated spell file"
+msgstr "E758: スペルファイルが切取られているようです"
+
+#, c-format
+msgid "Trailing text in %s line %d: %s"
+msgstr "%s (%d 行目) に続くテキスト: %s"
+
+#, c-format
+msgid "Affix name too long in %s line %d: %s"
+msgstr "%s (%d 行目) の affix 名が長過ぎます: %s"
+
+msgid "E761: Format error in affix file FOL, LOW or UPP"
+msgstr ""
+"E761: affixファイルの FOL, LOW もしくは UPP のフォーマットにエラーがあります"
+
+msgid "E762: Character in FOL, LOW or UPP is out of range"
+msgstr "E762: FOL, LOW もしくは UPP の文字が範囲外です"
+
+msgid "Compressing word tree..."
+msgstr "単語ツリーを圧縮しています..."
+
+#, c-format
+msgid "Reading spell file \"%s\""
+msgstr "スペルファイル \"%s\" を読込中"
+
+msgid "E757: This does not look like a spell file"
+msgstr "E757: スペルファイルではないようです"
+
+msgid "E771: Old spell file, needs to be updated"
+msgstr "E771: 古いスペルファイルなので, アップデートしてください"
+
+msgid "E772: Spell file is for newer version of Vim"
+msgstr "E772: より新しいバージョンの Vim 用のスペルファイルです"
+
+msgid "E770: Unsupported section in spell file"
+msgstr "E770: スペルファイルにサポートしていないセクションがあります"
+
+#, c-format
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: .sug ファイルではないようです: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: 古い .sug ファイルなので, アップデートしてください: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: より新しいバージョンの Vim 用の .sug ファイルです: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: .sug ファイルが .spl ファイルと一致しません: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: .sug ファイルの読込中にエラーが発生しました: %s"
+
 #, c-format
 msgid "Reading affix file %s ..."
 msgstr "affix ファイル %s を読込中..."
 
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
 msgstr "%s (%d 行目) の単語を変換できませんでした: %s"
 
-#: ../spell.c:4630 ../spell.c:6170
 #, c-format
 msgid "Conversion in %s not supported: from %s to %s"
 msgstr "%s 内の次の変換はサポートされていません: %s から %s へ"
 
-#: ../spell.c:4642
+#, c-format
+msgid "Conversion in %s not supported"
+msgstr "%s 内の変換はサポートされていません"
+
 #, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "%s 内の %d 行目の FLAG に無効な値があります: %s"
 
-#: ../spell.c:4655
 #, c-format
 msgid "FLAG after using flags in %s line %d: %s"
 msgstr "%s 内の %d 行目にフラグの二重使用があります: %s"
 
-#: ../spell.c:4723
 #, c-format
 msgid ""
 "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
@@ -5360,7 +5118,6 @@ msgstr ""
 "%s の %d 行目の PFX 項目の後の COMPOUNDFORBIDFLAG の定義は誤った結果を生じる"
 "ことがあります"
 
-#: ../spell.c:4731
 #, c-format
 msgid ""
 "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
@@ -5369,43 +5126,35 @@ msgstr ""
 "%s の %d 行目の PFX 項目の後の COMPOUNDPERMITFLAG の定義は誤った結果を生じる"
 "ことがあります"
 
-#: ../spell.c:4747
 #, c-format
 msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
 msgstr "COMPOUNDRULES の値に誤りがあります. ファイル %s の %d 行目: %s"
 
-#: ../spell.c:4771
 #, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
 msgstr "%s の %d 行目の COMPOUNDWORDMAX の値に誤りがあります: %s"
 
-#: ../spell.c:4777
 #, c-format
 msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
 msgstr "%s の %d 行目の COMPOUNDMIN の値に誤りがあります: %s"
 
-#: ../spell.c:4783
 #, c-format
 msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
 msgstr "%s の %d 行目の COMPOUNDSYLMAX の値に誤りがあります: %s"
 
-#: ../spell.c:4795
 #, c-format
 msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
 msgstr "%s の %d 行目の CHECKCOMPOUNDPATTERN の値に誤りがあります: %s"
 
-#: ../spell.c:4847
 #, c-format
 msgid "Different combining flag in continued affix block in %s line %d: %s"
 msgstr ""
 "%s の %d 行目の 連続 affix ブロックのフラグの組合せに違いがあります: %s"
 
-#: ../spell.c:4850
 #, c-format
 msgid "Duplicate affix in %s line %d: %s"
 msgstr "%s の %d 行目に 重複した affix を検出しました: %s"
 
-#: ../spell.c:4871
 #, c-format
 msgid ""
 "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
@@ -5414,308 +5163,206 @@ msgstr ""
 "%s の %d 行目の affix は BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST "
 "に使用してください: %s"
 
-#: ../spell.c:4893
 #, c-format
 msgid "Expected Y or N in %s line %d: %s"
 msgstr "%s の %d 行目では Y か N が必要です: %s"
 
-#: ../spell.c:4968
 #, c-format
 msgid "Broken condition in %s line %d: %s"
 msgstr "%s の %d 行目の 条件は壊れています: %s"
 
-#: ../spell.c:5091
 #, c-format
 msgid "Expected REP(SAL) count in %s line %d"
 msgstr "%s の %d 行目には REP(SAL) の回数が必要です"
 
-#: ../spell.c:5120
 #, c-format
 msgid "Expected MAP count in %s line %d"
 msgstr "%s の %d 行目には MAP の回数が必要です"
 
-#: ../spell.c:5132
 #, c-format
 msgid "Duplicate character in MAP in %s line %d"
 msgstr "%s の %d 行目の MAP に重複した文字があります"
 
-#: ../spell.c:5176
 #, c-format
 msgid "Unrecognized or duplicate item in %s line %d: %s"
 msgstr "%s の %d 行目に 認識できないか重複した項目があります: %s"
 
-#: ../spell.c:5197
 #, c-format
 msgid "Missing FOL/LOW/UPP line in %s"
 msgstr "%s 行目に FOL/LOW/UPP がありません"
 
-#: ../spell.c:5220
 msgid "COMPOUNDSYLMAX used without SYLLABLE"
 msgstr "SYLLABLE が指定されない COMPOUNDSYLMAX"
 
-#: ../spell.c:5236
 msgid "Too many postponed prefixes"
 msgstr "遅延後置子が多過ぎます"
 
-#: ../spell.c:5238
 msgid "Too many compound flags"
 msgstr "複合フラグが多過ぎます"
 
-#: ../spell.c:5240
 msgid "Too many postponed prefixes and/or compound flags"
 msgstr "遅延後置子 と/もしくは 複合フラグが多過ぎます"
 
-#: ../spell.c:5250
 #, c-format
 msgid "Missing SOFO%s line in %s"
 msgstr "SOFO%s 行が %s にありません"
 
-#: ../spell.c:5253
 #, c-format
 msgid "Both SAL and SOFO lines in %s"
 msgstr "SAL行 と SOFO行 が %s で両方指定されています"
 
-#: ../spell.c:5331
 #, c-format
 msgid "Flag is not a number in %s line %d: %s"
 msgstr "%s の %d 行の フラグが数値ではありません: %s"
 
-#: ../spell.c:5334
 #, c-format
 msgid "Illegal flag in %s line %d: %s"
 msgstr "%s の %d 行目の フラグが不正です: %s"
 
-#: ../spell.c:5493 ../spell.c:5501
 #, c-format
 msgid "%s value differs from what is used in another .aff file"
 msgstr "値 %s は他の .aff ファイルで使用されたのと異なります"
 
-#: ../spell.c:5602
 #, c-format
 msgid "Reading dictionary file %s ..."
 msgstr "辞書ファイル %s をスキャン中..."
 
-#: ../spell.c:5611
 #, c-format
 msgid "E760: No word count in %s"
 msgstr "E760: %s には単語数がありません"
 
-#: ../spell.c:5669
 #, c-format
 msgid "line %6d, word %6d - %s"
 msgstr "行 %6d, 単語 %6d - %s"
 
-#: ../spell.c:5691
 #, c-format
 msgid "Duplicate word in %s line %d: %s"
 msgstr "%s の %d 行目で 重複単語が見つかりました: %s"
 
-#: ../spell.c:5694
 #, c-format
 msgid "First duplicate word in %s line %d: %s"
 msgstr "重複のうち最初の単語は %s の %d 行目です: %s"
 
-#: ../spell.c:5746
 #, c-format
 msgid "%d duplicate word(s) in %s"
 msgstr "%d 個の単語が見つかりました (%s 内)"
 
-#: ../spell.c:5748
 #, c-format
 msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "非ASCII文字を含む %d 個の単語を無視しました (%s 内)"
 
-#: ../spell.c:6115
 #, c-format
 msgid "Reading word file %s ..."
 msgstr "標準入力から読込み中 %s ..."
 
-#: ../spell.c:6155
 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
 msgstr "%s の %d 行目の 重複した /encoding= 行を無視しました: %s"
 
-#: ../spell.c:6159
 #, c-format
 msgid "/encoding= line after word ignored in %s line %d: %s"
 msgstr "%s の %d 行目の 単語の後の /encoding= 行を無視しました: %s"
 
-#: ../spell.c:6180
 #, c-format
 msgid "Duplicate /regions= line ignored in %s line %d: %s"
 msgstr "%s の %d 行目の 重複した /regions= 行を無視しました: %s"
 
-#: ../spell.c:6185
 #, c-format
 msgid "Too many regions in %s line %d: %s"
 msgstr "%s の %d 行目, 範囲指定が多過ぎます: %s"
 
-#: ../spell.c:6198
 #, c-format
 msgid "/ line ignored in %s line %d: %s"
 msgstr "%s の %d 行目の 重複した / 行を無視しました: %s"
 
-#: ../spell.c:6224
 #, c-format
 msgid "Invalid region nr in %s line %d: %s"
 msgstr "%s の %d 行目 無効な nr 領域です: %s"
 
-#: ../spell.c:6230
 #, c-format
 msgid "Unrecognized flags in %s line %d: %s"
 msgstr "%s の %d 行目 認識不能なフラグです: %s"
 
-#: ../spell.c:6257
 #, c-format
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "非ASCII文字を含む %d 個の単語を無視しました"
 
-#: ../spell.c:6656
+msgid "E845: Insufficient memory, word list will be incomplete"
+msgstr "E845: メモリが足りないので、単語リストは不完全です"
+
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
 msgstr "ノード %d 個(全 %d 個中) を圧縮しました; 残り %d (%d%%)"
 
-#: ../spell.c:7340
 msgid "Reading back spell file..."
 msgstr "スペルファイルを逆読込中"
 
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
-#: ../spell.c:7357
+#.
+#. * Go through the trie of good words, soundfold each word and add it to
+#. * the soundfold trie.
+#.
 msgid "Performing soundfolding..."
 msgstr "音声畳込みを実行中..."
 
-#: ../spell.c:7368
 #, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "音声畳込み後の総単語数: %<PRId64>"
+msgid "Number of words after soundfolding: %ld"
+msgstr "音声畳込み後の総単語数: %ld"
 
-#: ../spell.c:7476
 #, c-format
 msgid "Total number of words: %d"
 msgstr "総単語数: %d"
 
-#: ../spell.c:7655
 #, c-format
 msgid "Writing suggestion file %s ..."
 msgstr "修正候補ファイル \"%s\" を書込み中..."
 
-#: ../spell.c:7707 ../spell.c:7927
 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
 msgstr "推定メモリ使用量: %d バイト"
 
-#: ../spell.c:7820
 msgid "E751: Output file name must not have region name"
 msgstr "E751: 出力ファイル名には範囲名を含められません"
 
-#: ../spell.c:7822
 msgid "E754: Only up to 8 regions supported"
 msgstr "E754: 範囲は 8 個までしかサポートされていません"
 
-#: ../spell.c:7846
 #, c-format
 msgid "E755: Invalid region in %s"
 msgstr "E755: 無効な範囲です: %s"
 
-#: ../spell.c:7907
 msgid "Warning: both compounding and NOBREAK specified"
 msgstr "警告: 複合フラグと NOBREAK が両方とも指定されました"
 
-#: ../spell.c:7920
 #, c-format
 msgid "Writing spell file %s ..."
 msgstr "スペルファイル %s を書込み中..."
 
-#: ../spell.c:7925
 msgid "Done!"
 msgstr "実行しました!"
 
-#: ../spell.c:8034
 #, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: 'spellfile' には %<PRId64> 個のエントリはありません"
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: 'spellfile' には %ld 個のエントリはありません"
 
-#: ../spell.c:8074
 #, c-format
 msgid "Word '%.*s' removed from %s"
 msgstr "単語 '%.*s' が %s から削除されました"
 
-#: ../spell.c:8117
 #, c-format
 msgid "Word '%.*s' added to %s"
 msgstr "単語 '%.*s' が %s へ追加されました"
 
-#: ../spell.c:8381
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: 単語の文字がスペルファイルと異なります"
 
-#: ../spell.c:8684
-msgid "Sorry, no suggestions"
-msgstr "残念ですが, 修正候補はありません"
-
-#: ../spell.c:8687
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "残念ですが, 修正候補は %<PRId64> 個しかありません"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#: ../spell.c:8704
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "\"%.*s\" を次へ変換:"
-
-#: ../spell.c:8737
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-#: ../spell.c:8882
-msgid "E752: No previous spell replacement"
-msgstr "E752: スペル置換がまだ実行されていません"
-
-#: ../spell.c:8925
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: 見つかりません: %s"
-
-#: ../spell.c:9276
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: .sug ファイルではないようです: %s"
-
-#: ../spell.c:9282
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: 古い .sug ファイルなので, アップデートしてください: %s"
-
-#: ../spell.c:9286
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: より新しいバージョンの Vim 用の .sug ファイルです: %s"
-
-#: ../spell.c:9295
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: .sug ファイルが .spl ファイルと一致しません: %s"
-
-#: ../spell.c:9305
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: .sug ファイルの読込中にエラーが発生しました: %s"
-
 #. This should have been checked when generating the .spl
-#. file.
-#: ../spell.c:11575
+#. * file.
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: MAP エントリに重複文字が存在します"
 
-#: ../syntax.c:266
 msgid "No Syntax items defined for this buffer"
 msgstr "このバッファに定義された構文要素はありません"
 
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: 不正な引数です: %s"
@@ -5723,28 +5370,22 @@ msgstr "E390: 不正な引数です: %s"
 msgid "syntax iskeyword "
 msgstr "シンタックス用 iskeyword "
 
-#: ../syntax.c:3299
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: そのような構文クラスタはありません: %s"
 
-#: ../syntax.c:3433
 msgid "syncing on C-style comments"
 msgstr "C言語風コメントから同期中"
 
-#: ../syntax.c:3439
 msgid "no syncing"
 msgstr "非同期"
 
-#: ../syntax.c:3441
 msgid "syncing starts "
 msgstr "同期開始 "
 
-#: ../syntax.c:3443 ../syntax.c:3506
 msgid " lines before top line"
 msgstr " 行前(トップ行よりも)"
 
-#: ../syntax.c:3448
 msgid ""
 "\n"
 "--- Syntax sync items ---"
@@ -5752,7 +5393,6 @@ msgstr ""
 "\n"
 "--- 構文同期要素 ---"
 
-#: ../syntax.c:3452
 msgid ""
 "\n"
 "syncing on items"
@@ -5760,7 +5400,6 @@ msgstr ""
 "\n"
 "要素上で同期中"
 
-#: ../syntax.c:3457
 msgid ""
 "\n"
 "--- Syntax items ---"
@@ -5768,53 +5407,41 @@ msgstr ""
 "\n"
 "--- 構文要素 ---"
 
-#: ../syntax.c:3475
 #, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: そのような構文クラスタはありません: %s"
 
-#: ../syntax.c:3497
 msgid "minimal "
 msgstr "minimal "
 
-#: ../syntax.c:3503
 msgid "maximal "
 msgstr "maximal "
 
-#: ../syntax.c:3513
 msgid "; match "
 msgstr "; 該当 "
 
-#: ../syntax.c:3515
 msgid " line breaks"
 msgstr " 個の改行"
 
-#: ../syntax.c:4076
 msgid "E395: contains argument not accepted here"
 msgstr "E395: この場所では引数containsは許可されていません"
 
-#: ../syntax.c:4096
 msgid "E844: invalid cchar value"
 msgstr "E844: 無効なccharの値です"
 
-#: ../syntax.c:4107
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: ここではグループは許可されません"
 
-#: ../syntax.c:4126
 #, c-format
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: %s の範囲要素が見つかりません"
 
-#: ../syntax.c:4188
 msgid "E397: Filename required"
 msgstr "E397: ファイル名が必要です"
 
-#: ../syntax.c:4221
 msgid "E847: Too many syntax includes"
 msgstr "E847: 構文の取り込み(include)が多過ぎます"
 
-#: ../syntax.c:4303
 #, c-format
 msgid "E789: Missing ']': %s"
 msgstr "E789: ']' がありません: %s"
@@ -5823,221 +5450,173 @@ msgstr "E789: ']' がありません: %s"
 msgid "E890: trailing char after ']': %s]%s"
 msgstr "E890: ']' の後ろに余分な文字があります: %s]%s"
 
-#: ../syntax.c:4531
 #, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: '=' がありません: %s"
 
-#: ../syntax.c:4666
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: 引数が足りません: 構文範囲 %s"
 
-#: ../syntax.c:4870
 msgid "E848: Too many syntax clusters"
 msgstr "E848: 構文クラスタが多過ぎます"
 
-#: ../syntax.c:4954
 msgid "E400: No cluster specified"
 msgstr "E400: クラスタが指定されていません"
 
-#. end delimiter not found
-#: ../syntax.c:4986
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: パターン区切りが見つかりません: %s"
 
-#: ../syntax.c:5049
 #, c-format
 msgid "E402: Garbage after pattern: %s"
 msgstr "E402: パターンのあとにゴミがあります: %s"
 
-#: ../syntax.c:5120
 msgid "E403: syntax sync: line continuations pattern specified twice"
 msgstr "E403: 構文同期: 連続行パターンが2度指定されました"
 
-#: ../syntax.c:5169
 #, c-format
 msgid "E404: Illegal arguments: %s"
 msgstr "E404: 不正な引数です: %s"
 
-#: ../syntax.c:5217
 #, c-format
 msgid "E405: Missing equal sign: %s"
 msgstr "E405: 等号がありません: %s"
 
-#: ../syntax.c:5222
 #, c-format
 msgid "E406: Empty argument: %s"
 msgstr "E406: 空の引数: %s"
 
-#: ../syntax.c:5240
 #, c-format
 msgid "E407: %s not allowed here"
 msgstr "E407: %s はココでは許可されていません"
 
-#: ../syntax.c:5246
 #, c-format
 msgid "E408: %s must be first in contains list"
 msgstr "E408: %s は内容リストの先頭でなければならない"
 
-#: ../syntax.c:5304
 #, c-format
 msgid "E409: Unknown group name: %s"
 msgstr "E409: 未知のグループ名: %s"
 
-#: ../syntax.c:5512
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: 無効な :syntax のサブコマンド: %s"
 
-#: ../syntax.c:5854
 msgid ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
 msgstr ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
 
-#: ../syntax.c:6146
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: syncolor.vim の再帰呼び出しを検出しました"
 
-#: ../syntax.c:6256
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: ハイライトグループが見つかりません: %s"
 
-#: ../syntax.c:6278
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
 msgstr "E412: 引数が充分ではない: \":highlight link %s\""
 
-#: ../syntax.c:6284
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
 msgstr "E413: 引数が多過ぎます: \":highlight link %s\""
 
-#: ../syntax.c:6302
 msgid "E414: group has settings, highlight link ignored"
 msgstr "E414: グループが設定されているのでハイライトリンクは無視されます"
 
-#: ../syntax.c:6367
 #, c-format
 msgid "E415: unexpected equal sign: %s"
 msgstr "E415: 予期せぬ等号です: %s"
 
-#: ../syntax.c:6395
 #, c-format
 msgid "E416: missing equal sign: %s"
 msgstr "E416: 等号がありません: %s"
 
-#: ../syntax.c:6418
 #, c-format
 msgid "E417: missing argument: %s"
 msgstr "E417: 引数がありません: %s"
 
-#: ../syntax.c:6446
 #, c-format
 msgid "E418: Illegal value: %s"
 msgstr "E418: 不正な値です: %s"
 
-#: ../syntax.c:6496
 msgid "E419: FG color unknown"
 msgstr "E419: 未知の前景色です"
 
-#: ../syntax.c:6504
 msgid "E420: BG color unknown"
 msgstr "E420: 未知の背景色です"
 
-#: ../syntax.c:6564
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: カラー名や番号を認識できません: %s"
 
-#: ../syntax.c:6714
 #, c-format
 msgid "E422: terminal code too long: %s"
 msgstr "E422: 終端コードが長過ぎます: %s"
 
-#: ../syntax.c:6753
 #, c-format
 msgid "E423: Illegal argument: %s"
 msgstr "E423: 不正な引数です: %s"
 
-#: ../syntax.c:6925
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: 多くの異なるハイライト属性が使われ過ぎています"
 
-#: ../syntax.c:7427
 msgid "E669: Unprintable character in group name"
 msgstr "E669: グループ名に印刷不可能な文字があります"
 
-#: ../syntax.c:7434
 msgid "W18: Invalid character in group name"
 msgstr "W18: グループ名に不正な文字があります"
 
-#: ../syntax.c:7448
 msgid "E849: Too many highlight and syntax groups"
 msgstr "E849: ハイライトと構文グループが多過ぎます"
 
-#: ../tag.c:104
 msgid "E555: at bottom of tag stack"
 msgstr "E555: タグスタックの末尾です"
 
-#: ../tag.c:105
 msgid "E556: at top of tag stack"
 msgstr "E556: タグスタックの先頭です"
 
-#: ../tag.c:380
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: 最初の該当タグを超えて戻ることはできません"
 
-#: ../tag.c:504
 #, c-format
 msgid "E426: tag not found: %s"
 msgstr "E426: タグが見つかりません: %s"
 
-#: ../tag.c:528
 msgid "  # pri kind tag"
 msgstr "  # pri kind tag"
 
-#: ../tag.c:531
 msgid "file\n"
 msgstr "ファイル\n"
 
-#: ../tag.c:829
 msgid "E427: There is only one matching tag"
 msgstr "E427: 該当タグが1つだけしかありません"
 
-#: ../tag.c:831
 msgid "E428: Cannot go beyond last matching tag"
 msgstr "E428: 最後に該当するタグを超えて進むことはできません"
 
-#: ../tag.c:850
 #, c-format
 msgid "File \"%s\" does not exist"
 msgstr "ファイル \"%s\" がありません"
 
 #. Give an indication of the number of matching tags
-#: ../tag.c:859
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "タグ %d (全%d%s)"
 
-#: ../tag.c:862
 msgid " or more"
 msgstr " かそれ以上"
 
-#: ../tag.c:864
 msgid "  Using tag with different case!"
 msgstr "  タグを異なるcaseで使用します!"
 
-#: ../tag.c:909
 #, c-format
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: ファイル \"%s\" がありません"
 
 #. Highlight title
-#: ../tag.c:960
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -6045,79 +5624,66 @@ msgstr ""
 "\n"
 "  # TO タグ        FROM 行    in file/text"
 
-#: ../tag.c:1303
 #, c-format
 msgid "Searching tags file %s"
 msgstr "タグファイル %s を検索中"
 
-#: ../tag.c:1545
+#, c-format
+msgid "E430: Tag file path truncated for %s\n"
+msgstr "E430: タグファイルのパスが %s に切り捨てられました\n"
+
 msgid "Ignoring long line in tags file"
 msgstr "タグファイル内の長い行を無視します"
 
-#: ../tag.c:1915
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: タグファイル \"%s\" のフォーマットにエラーがあります"
 
-#: ../tag.c:1917
 #, c-format
-msgid "Before byte %<PRId64>"
-msgstr "直前の %<PRId64> バイト"
+msgid "Before byte %ld"
+msgstr "直前の %ld バイト"
 
-#: ../tag.c:1929
 #, c-format
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: タグファイルがソートされていません: %s"
 
 #. never opened any tags file
-#: ../tag.c:1960
 msgid "E433: No tags file"
 msgstr "E433: タグファイルがありません"
 
-#: ../tag.c:2536
 msgid "E434: Can't find tag pattern"
 msgstr "E434: タグパターンを見つけられません"
 
-#: ../tag.c:2544
 msgid "E435: Couldn't find tag, just guessing!"
 msgstr "E435: タグを見つけられないので単に推測します!"
 
-#: ../tag.c:2797
 #, c-format
 msgid "Duplicate field name: %s"
 msgstr "重複したフィールド名: %s"
 
-#: ../term.c:1442
 msgid "' not known. Available builtin terminals are:"
 msgstr "' は未知です. 現行の組み込み端末は次のとおりです:"
 
-#: ../term.c:1463
 msgid "defaulting to '"
 msgstr "省略値を次のように設定します '"
 
-#: ../term.c:1731
 msgid "E557: Cannot open termcap file"
 msgstr "E557: termcapファイルを開けません"
 
-#: ../term.c:1735
 msgid "E558: Terminal entry not found in terminfo"
 msgstr "E558: terminfoに端末エントリを見つけられません"
 
-#: ../term.c:1737
 msgid "E559: Terminal entry not found in termcap"
 msgstr "E559: termcapに端末エントリを見つけられません"
 
-#: ../term.c:1878
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
 msgstr "E436: termcapに \"%s\" のエントリがありません"
 
-#: ../term.c:2249
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: 端末に \"cm\" 機能が必要です"
 
 #. Highlight title
-#: ../term.c:4376
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -6125,168 +5691,347 @@ msgstr ""
 "\n"
 "--- 端末キー ---"
 
-#: ../ui.c:481
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "$VIMRUNTIME/rgb.txtを開けません"
+
+msgid "new shell started\n"
+msgstr "新しいシェルを起動します\n"
+
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: 入力を読込み中のエラーにより終了します...\n"
 
+msgid "Used CUT_BUFFER0 instead of empty selection"
+msgstr "空の選択領域のかわりにCUT_BUFFER0が使用されました"
+
 #. This happens when the FileChangedRO autocommand changes the
 #. * file in a way it becomes shorter.
-#: ../undo.c:379
 msgid "E881: Line count changed unexpectedly"
 msgstr "E881: 予期せず行カウントが変わりました"
 
-#: ../undo.c:627
+#. must display the prompt
+msgid "No undo possible; continue anyway"
+msgstr "可能なアンドゥはありません: とりあえず続けます"
+
 #, c-format
 msgid "E828: Cannot open undo file for writing: %s"
 msgstr "E828: 書込み用にアンドゥファイルを開けません: %s"
 
-#: ../undo.c:717
 #, c-format
 msgid "E825: Corrupted undo file (%s): %s"
 msgstr "E825: アンドゥファイルが壊れています (%s): %s"
 
-#: ../undo.c:1039
 msgid "Cannot write undo file in any directory in 'undodir'"
 msgstr "'undodir'のディレクトリにアンドゥファイルを書き込めません"
 
-#: ../undo.c:1074
 #, c-format
 msgid "Will not overwrite with undo file, cannot read: %s"
 msgstr "アンドゥファイルとして読み込めないので上書きしません: %s"
 
-#: ../undo.c:1092
 #, c-format
 msgid "Will not overwrite, this is not an undo file: %s"
 msgstr "アンドゥファイルではないので上書きしません: %s"
 
-#: ../undo.c:1108
 msgid "Skipping undo file write, nothing to undo"
 msgstr "対象がないのでアンドゥファイルの書き込みをスキップします"
 
-#: ../undo.c:1121
 #, c-format
 msgid "Writing undo file: %s"
 msgstr "アンドゥファイル書き込み中: %s"
 
-#: ../undo.c:1213
 #, c-format
 msgid "E829: write error in undo file: %s"
 msgstr "E829: アンドゥファイルの書き込みエラーです: %s"
 
-#: ../undo.c:1280
 #, c-format
 msgid "Not reading undo file, owner differs: %s"
 msgstr "オーナーが異なるのでアンドゥファイルを読み込みません: %s"
 
-#: ../undo.c:1292
 #, c-format
 msgid "Reading undo file: %s"
 msgstr "アンドゥファイル読込中: %s"
 
-#: ../undo.c:1299
 #, c-format
 msgid "E822: Cannot open undo file for reading: %s"
 msgstr "E822: アンドゥファイルを読込用として開けません: %s"
 
-#: ../undo.c:1308
 #, c-format
 msgid "E823: Not an undo file: %s"
 msgstr "E823: アンドゥファイルではありません: %s"
 
-#: ../undo.c:1313
+#, c-format
+msgid "E832: Non-encrypted file has encrypted undo file: %s"
+msgstr "E832: 非暗号化ファイルが暗号化されたアンドゥファイルを使ってます: %s"
+
+#, c-format
+msgid "E826: Undo file decryption failed: %s"
+msgstr "E826: 暗号化されたアンドゥファイルの解読に失敗しました: %s"
+
+#, c-format
+msgid "E827: Undo file is encrypted: %s"
+msgstr "E827: アンドゥファイルが暗号化されています: %s"
+
 #, c-format
 msgid "E824: Incompatible undo file: %s"
 msgstr "E824: 互換性の無いアンドゥファイルです: %s"
 
-#: ../undo.c:1328
 msgid "File contents changed, cannot use undo info"
 msgstr "ファイルの内容が変わっているため、アンドゥ情報を利用できません"
 
-#: ../undo.c:1497
 #, c-format
 msgid "Finished reading undo file %s"
 msgstr "アンドゥファイル %s の取込を完了"
 
-#: ../undo.c:1586 ../undo.c:1812
 msgid "Already at oldest change"
 msgstr "既に一番古い変更です"
 
-#: ../undo.c:1597 ../undo.c:1814
 msgid "Already at newest change"
 msgstr "既に一番新しい変更です"
 
-#: ../undo.c:1806
 #, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "E830: アンドゥ番号 %<PRId64> は見つかりません"
+msgid "E830: Undo number %ld not found"
+msgstr "E830: アンドゥ番号 %ld は見つかりません"
 
-#: ../undo.c:1979
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: 行番号が間違っています"
 
-#: ../undo.c:2183
 msgid "more line"
 msgstr "行 追加しました"
 
-#: ../undo.c:2185
 msgid "more lines"
 msgstr "行 追加しました"
 
-#: ../undo.c:2187
 msgid "line less"
 msgstr "行 削除しました"
 
-#: ../undo.c:2189
 msgid "fewer lines"
 msgstr "行 削除しました"
 
-#: ../undo.c:2193
 msgid "change"
 msgstr "箇所変更しました"
 
-#: ../undo.c:2195
 msgid "changes"
 msgstr "箇所変更しました"
 
-#: ../undo.c:2225
 #, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
+msgid "%ld %s; %s #%ld  %s"
+msgstr "%ld %s; %s #%ld  %s"
 
-#: ../undo.c:2228
 msgid "before"
 msgstr "前方"
 
-#: ../undo.c:2228
 msgid "after"
 msgstr "後方"
 
-#: ../undo.c:2325
 msgid "Nothing to undo"
 msgstr "アンドゥ対象がありません"
 
-#: ../undo.c:2330
 msgid "number changes  when               saved"
 msgstr "通番   変更数   変更時期           保存済"
 
-#: ../undo.c:2360
 #, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "%<PRId64> 秒経過しています"
+msgid "%ld seconds ago"
+msgstr "%ld 秒経過しています"
 
-#: ../undo.c:2372
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: undo の直後に undojoin はできません"
 
-#: ../undo.c:2466
 msgid "E439: undo list corrupt"
 msgstr "E439: アンドゥリストが壊れています"
 
-#: ../undo.c:2495
 msgid "E440: undo line missing"
 msgstr "E440: アンドゥ行がありません"
 
-#: ../version.c:600
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: 関数 %s は定義済です, 再定義するには ! を追加してください"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: 辞書型内にエントリが既に存在します"
+
+msgid "E718: Funcref required"
+msgstr "E718: 関数参照型が要求されます"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: 未知の関数です: %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: 不正な引数です: %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: 引数名が重複しています: %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: 関数の引数が多過ぎます: %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: 関数の無効な引数です: %s"
+
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr "E132: 関数呼出の入れ子数が 'maxfuncdepth' を超えました"
+
+#, c-format
+msgid "calling %s"
+msgstr "%s を実行中です"
+
+#, c-format
+msgid "%s aborted"
+msgstr "%s が中断されました"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s が #%ld を返しました"
+
+#, c-format
+msgid "%s returning %s"
+msgstr "%s が %s を返しました"
+
+msgid "E699: Too many arguments"
+msgstr "E699: 引数が多過ぎます"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: 未知の関数です: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: 関数は削除されました: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: 関数の引数が足りません: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: スクリプト以外で<SID>が使われました: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: 辞書用関数が呼ばれましたが辞書がありません: %s"
+
+msgid "E129: Function name required"
+msgstr "E129: 関数名が要求されます"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr "E128: 関数名は大文字か \"s:\" で始まらなければなりません: %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr "E884: 関数名にはコロンは含められません: %s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: 未定義の関数です: %s"
+
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: '(' がありません: %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: ここでは g: は使えません"
+
+#, c-format
+msgid "E932: Closure function should not be at top level: %s"
+msgstr "E932: クロージャー関数はトップレベルに記述できません: %s"
+
+msgid "E126: Missing :endfunction"
+msgstr "E126: :endfunction がありません"
+
+#, c-format
+msgid "E707: Function name conflicts with variable: %s"
+msgstr "E707: 関数名が変数名と衝突します: %s"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr "E127: 関数 %s を再定義できません: 使用中です"
+
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr "E746: 関数名がスクリプトのファイル名と一致しません: %s"
+
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: 関数 %s を削除できません: 使用中です"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: 関数外に :return がありました"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: カッコ '(' がありません: %s"
+
+#. Only MS VC 4.1 and earlier can do Win32s
+msgid ""
+"\n"
+"MS-Windows 16/32-bit GUI version"
+msgstr ""
+"\n"
+"MS-Windows 16/32 ビット GUI 版"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit GUI version"
+msgstr ""
+"\n"
+"MS-Windows 64 ビット GUI 版"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI version"
+msgstr ""
+"\n"
+"MS-Windows 32 ビット GUI 版"
+
+msgid " with OLE support"
+msgstr " with OLE サポート"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit console version"
+msgstr ""
+"\n"
+"MS-Windows 64 ビット コンソール 版"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit console version"
+msgstr ""
+"\n"
+"MS-Windows 32 ビット コンソール 版"
+
+msgid ""
+"\n"
+"MacOS X (unix) version"
+msgstr ""
+"\n"
+"MacOS X (unix) 版"
+
+msgid ""
+"\n"
+"MacOS X version"
+msgstr ""
+"\n"
+"MacOS X 版"
+
+msgid ""
+"\n"
+"MacOS version"
+msgstr ""
+"\n"
+"MacOS 版"
+
+msgid ""
+"\n"
+"OpenVMS version"
+msgstr ""
+"\n"
+"OpenVMS 版"
+
 msgid ""
 "\n"
 "Included patches: "
@@ -6294,7 +6039,6 @@ msgstr ""
 "\n"
 "適用済パッチ: "
 
-#: ../version.c:627
 msgid ""
 "\n"
 "Extra patches: "
@@ -6302,11 +6046,9 @@ msgstr ""
 "\n"
 "追加拡張パッチ: "
 
-#: ../version.c:639 ../version.c:864
 msgid "Modified by "
 msgstr "Modified by "
 
-#: ../version.c:646
 msgid ""
 "\n"
 "Compiled "
@@ -6314,11 +6056,9 @@ msgstr ""
 "\n"
 "Compiled "
 
-#: ../version.c:649
 msgid "by "
 msgstr "by "
 
-#: ../version.c:660
 msgid ""
 "\n"
 "Huge version "
@@ -6326,1886 +6066,926 @@ msgstr ""
 "\n"
 "Huge 版 "
 
-#: ../version.c:661
+msgid ""
+"\n"
+"Big version "
+msgstr ""
+"\n"
+"Big 版 "
+
+msgid ""
+"\n"
+"Normal version "
+msgstr ""
+"\n"
+"通常 版 "
+
+msgid ""
+"\n"
+"Small version "
+msgstr ""
+"\n"
+"Small 版 "
+
+msgid ""
+"\n"
+"Tiny version "
+msgstr ""
+"\n"
+"Tiny 版 "
+
 msgid "without GUI."
 msgstr "without GUI."
 
-#: ../version.c:662
+msgid "with GTK3 GUI."
+msgstr "with GTK3 GUI."
+
+msgid "with GTK2-GNOME GUI."
+msgstr "with GTK2-GNOME GUI."
+
+msgid "with GTK2 GUI."
+msgstr "with GTK2 GUI."
+
+msgid "with X11-Motif GUI."
+msgstr "with X11-Motif GUI."
+
+msgid "with X11-neXtaw GUI."
+msgstr "with X11-neXtaw GUI."
+
+msgid "with X11-Athena GUI."
+msgstr "with X11-Athena GUI."
+
+msgid "with Photon GUI."
+msgstr "with Photon GUI."
+
+msgid "with GUI."
+msgstr "with GUI."
+
+msgid "with Carbon GUI."
+msgstr "with Carbon GUI."
+
+msgid "with Cocoa GUI."
+msgstr "with Cocoa GUI."
+
+msgid "with (classic) GUI."
+msgstr "with (クラシック) GUI."
+
 msgid "  Features included (+) or not (-):\n"
 msgstr "  機能の一覧 有効(+)/無効(-)\n"
 
-#: ../version.c:667
 msgid "   system vimrc file: \""
 msgstr "      システム vimrc: \""
 
-#: ../version.c:672
 msgid "     user vimrc file: \""
 msgstr "      ユーザー vimrc: \""
 
-#: ../version.c:677
 msgid " 2nd user vimrc file: \""
 msgstr "   第2ユーザー vimrc: \""
 
-#: ../version.c:682
 msgid " 3rd user vimrc file: \""
 msgstr "   第3ユーザー vimrc: \""
 
-#: ../version.c:687
 msgid "      user exrc file: \""
 msgstr "       ユーザー exrc: \""
 
-#: ../version.c:692
 msgid "  2nd user exrc file: \""
 msgstr "    第2ユーザー exrc: \""
 
-#: ../version.c:699
+msgid "  system gvimrc file: \""
+msgstr "     システム gvimrc: \""
+
+msgid "    user gvimrc file: \""
+msgstr "     ユーザー gvimrc: \""
+
+msgid "2nd user gvimrc file: \""
+msgstr "  第2ユーザー gvimrc: \""
+
+msgid "3rd user gvimrc file: \""
+msgstr "  第3ユーザー gvimrc: \""
+
+msgid "       defaults file: \""
+msgstr "  デフォルトファイル: \""
+
+msgid "    system menu file: \""
+msgstr "    システムメニュー: \""
+
 msgid "  fall-back for $VIM: \""
 msgstr "       省略時の $VIM: \""
 
-#: ../version.c:705
 msgid " f-b for $VIMRUNTIME: \""
 msgstr "省略時の $VIMRUNTIME: \""
 
-#: ../version.c:709
 msgid "Compilation: "
 msgstr "コンパイル: "
 
-#: ../version.c:712
+msgid "Compiler: "
+msgstr "コンパイラ: "
+
 msgid "Linking: "
 msgstr "リンク: "
 
-#: ../version.c:717
 msgid "  DEBUG BUILD"
 msgstr "デバッグビルド"
 
-#: ../version.c:767
 msgid "VIM - Vi IMproved"
 msgstr "VIM - Vi IMproved"
 
-#: ../version.c:769
 msgid "version "
 msgstr "version "
 
-#: ../version.c:770
 msgid "by Bram Moolenaar et al."
 msgstr "by Bram Moolenaar 他."
 
-#: ../version.c:774
 msgid "Vim is open source and freely distributable"
 msgstr "Vim はオープンソースであり自由に配布可能です"
 
-#: ../version.c:776
 msgid "Help poor children in Uganda!"
 msgstr "ウガンダの恵まれない子供たちに援助を!"
 
-#: ../version.c:777
 msgid "type  :help iccf<Enter>       for information "
 msgstr "詳細な情報は           :help iccf<Enter>      "
 
-#: ../version.c:779
 msgid "type  :q<Enter>               to exit         "
 msgstr "終了するには           :q<Enter>              "
 
-#: ../version.c:780
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "オンラインヘルプは     :help<Enter> か <F1>   "
 
-#: ../version.c:781
-msgid "type  :help version7<Enter>   for version info"
-msgstr "バージョン情報は       :help version7<Enter>  "
+msgid "type  :help version8<Enter>   for version info"
+msgstr "バージョン情報は       :help version8<Enter>  "
 
-#: ../version.c:784
 msgid "Running in Vi compatible mode"
 msgstr "Vi互換モードで動作中"
 
-#: ../version.c:785
 msgid "type  :set nocp<Enter>        for Vim defaults"
 msgstr "Vim推奨値にするには    :set nocp<Enter>       "
 
-#: ../version.c:786
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr "詳細な情報は           :help cp-default<Enter>"
 
-#: ../version.c:827
+msgid "menu  Help->Orphans           for information    "
+msgstr "詳細はメニューの ヘルプ->孤児 を参照して下さい   "
+
+msgid "Running modeless, typed text is inserted"
+msgstr "モード無で実行中, タイプした文字が挿入されます"
+
+msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
+msgstr "メニューの 編集->全体設定->挿入(初心者)モード切替 "
+
+msgid "                              for two modes      "
+msgstr "                              でモード有に       "
+
+msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
+msgstr "メニューの 編集->全体設定->Vi互換モード切替      "
+
+msgid "                              for Vim defaults   "
+msgstr "                              でVimとして動作    "
+
 msgid "Sponsor Vim development!"
 msgstr "Vimの開発を応援してください!"
 
-#: ../version.c:828
 msgid "Become a registered Vim user!"
 msgstr "Vimの登録ユーザーになってください!"
 
-#: ../version.c:831
 msgid "type  :help sponsor<Enter>    for information "
 msgstr "詳細な情報は           :help sponsor<Enter>   "
 
-#: ../version.c:832
 msgid "type  :help register<Enter>   for information "
 msgstr "詳細な情報は           :help register<Enter>  "
 
-#: ../version.c:834
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "詳細はメニューの ヘルプ->スポンサー/登録 を参照して下さい"
 
-#: ../window.c:119
+msgid "WARNING: Windows 95/98/ME detected"
+msgstr "警告: Windows 95/98/ME を検出しました"
+
+msgid "type  :help windows95<Enter>  for info on this"
+msgstr "詳細な情報は            :help windows95<Enter>"
+
 msgid "Already only one window"
 msgstr "既にウィンドウは1つしかありません"
 
-#: ../window.c:224
 msgid "E441: There is no preview window"
 msgstr "E441: プレビューウィンドウがありません"
 
-#: ../window.c:559
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: 左上と右下を同時に分割することはできません"
 
-#: ../window.c:1228
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: 他のウィンドウが分割されている時には順回できません"
 
-#: ../window.c:1803
 msgid "E444: Cannot close last window"
 msgstr "E444: 最後のウィンドウを閉じることはできません"
 
-#: ../window.c:1810
 msgid "E813: Cannot close autocmd window"
 msgstr "E813: autocmdウィンドウは閉じられません"
 
-#: ../window.c:1814
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr "E814: autocmdウィンドウしか残らないため、ウィンドウは閉じられません"
 
-#: ../window.c:2717
 msgid "E445: Other window contains changes"
 msgstr "E445: 他のウィンドウには変更があります"
 
-#: ../window.c:4805
 msgid "E446: No file name under cursor"
 msgstr "E446: カーソルの下にファイル名がありません"
 
+#, c-format
+msgid "E447: Can't find file \"%s\" in path"
+msgstr "E447: pathには \"%s\" というファイルがありません"
+
+#, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: 無効な ID: %ld (1 以上でなければなりません)"
+
+#, c-format
+msgid "E801: ID already taken: %ld"
+msgstr "E801: ID はすでに利用中です: %ld"
+
 msgid "List or number required"
 msgstr "リストか数値が必要です"
 
-#~ msgid "E831: bf_key_init() called with empty password"
-#~ msgstr "E831: bf_key_init() が空パスワードで呼び出されました"
+#, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: 無効な ID: %ld (1 以上でなければなりません)"
 
-#~ msgid "E820: sizeof(uint32_t) != 4"
-#~ msgstr "E820: sizeof(uint32_t) != 4"
+#, c-format
+msgid "E803: ID not found: %ld"
+msgstr "E803: ID はありません: %ld"
 
-#~ msgid "E817: Blowfish big/little endian use wrong"
-#~ msgstr "E817: Blowfish暗号のビッグ/リトルエンディアンが間違っています"
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: ライブラリ %s をロードできませんでした"
 
-#~ msgid "E818: sha256 test failed"
-#~ msgstr "E818: sha256のテストに失敗しました"
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"このコマンドは無効です, ごめんなさい: Perlライブラリをロードできませんでした."
 
-#~ msgid "E819: Blowfish test failed"
-#~ msgstr "E819: Blowfish暗号のテストに失敗しました"
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr ""
+"E299: サンドボックスでは Safe モジュールを使用しないPerlスクリプトは禁じられ"
+"ています"
 
-#~ msgid "Patch file"
-#~ msgstr "パッチファイル"
+msgid "Edit with &multiple Vims"
+msgstr "複数のVimで編集する (&M)"
 
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "決定(&O)\n"
-#~ "キャンセル(&C)"
+msgid "Edit with single &Vim"
+msgstr "1つのVimで編集する (&V)"
 
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: Vim サーバへの接続がありません"
+msgid "Diff with Vim"
+msgstr "Vimで差分を表示する"
 
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: %s へ送ることができません"
+msgid "Edit with &Vim"
+msgstr "Vimで編集する (&V)"
 
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: サーバの応答がありません"
+#. Now concatenate
+msgid "Edit with existing Vim - "
+msgstr "起動済のVimで編集する - "
 
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: クライアントへ送ることができません"
+msgid "Edits the selected file(s) with Vim"
+msgstr "選択したファイルをVimで編集する"
 
-#~ msgid "Save As"
-#~ msgstr "別名で保存"
+msgid "Error creating process: Check if gvim is in your path!"
+msgstr "プロセスの作成に失敗: gvimが環境変数PATH上にあるか確認してください!"
 
-#~ msgid "Edit File"
-#~ msgstr "ファイルを編集"
+msgid "gvimext.dll error"
+msgstr "gvimext.dll エラー"
 
-# Added at 27-Jan-2004.
-#~ msgid " (NOT FOUND)"
-#~ msgstr "  (見つかりません)"
+msgid "Path length too long!"
+msgstr "パスが長過ぎます!"
 
-#~ msgid "Source Vim script"
-#~ msgstr "Vimスクリプトの取込み"
+msgid "--No lines in buffer--"
+msgstr "--バッファに行がありません--"
 
-#~ msgid "unknown"
-#~ msgstr "不明"
+#.
+#. * The error messages that can be shared are included here.
+#. * Excluded are errors that are only used once and debugging messages.
+#.
+msgid "E470: Command aborted"
+msgstr "E470: コマンドが中断されました"
 
-#~ msgid "Edit File in new window"
-#~ msgstr "新しいウィンドウでファイルを編集します"
+msgid "E471: Argument required"
+msgstr "E471: 引数が必要です"
 
-#~ msgid "Append File"
-#~ msgstr "追加ファイル"
+msgid "E10: \\ should be followed by /, ? or &"
+msgstr "E10: \\ の後は / か ? か & でなければなりません"
 
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "ウィンドウ位置: X %d, Y %d"
+msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgstr "E11: コマンドラインでは無効です; <CR>で実行, CTRL-Cでやめる"
 
-#~ msgid "Save Redirection"
-#~ msgstr "リダイレクトを保存します"
+msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgstr ""
+"E12: 現在のディレクトリやタグ検索ではexrc/vimrcのコマンドは許可されません"
 
-#~ msgid "Save View"
-#~ msgstr "ビューを保存します"
+msgid "E171: Missing :endif"
+msgstr "E171: :endif がありません"
 
-#~ msgid "Save Session"
-#~ msgstr "セッション情報を保存します"
+msgid "E600: Missing :endtry"
+msgstr "E600: :endtry がありません"
 
-#~ msgid "Save Setup"
-#~ msgstr "設定を保存します"
+msgid "E170: Missing :endwhile"
+msgstr "E170: :endwhile がありません"
 
-#~ msgid "E809: #< is not available without the +eval feature"
-#~ msgstr "E809: #< は +eval 機能が無いと利用できません"
+msgid "E170: Missing :endfor"
+msgstr "E170: :endfor がありません"
 
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: このバージョンに合字はありません"
+msgid "E588: :endwhile without :while"
+msgstr "E588: :while のない :endwhile があります"
 
-#~ msgid "is a device (disabled with 'opendevice' option)"
-#~ msgstr " はデバイスです ('opendevice' オプションで回避できます)"
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor のない :for があります"
 
-#~ msgid "Reading from stdin..."
-#~ msgstr "標準入力から読込み中..."
+msgid "E13: File exists (add ! to override)"
+msgstr "E13: ファイルが存在します (! を追加で上書)"
 
-#~ msgid "[blowfish]"
-#~ msgstr "[blowfish暗号化]"
+msgid "E472: Command failed"
+msgstr "E472: コマンドが失敗しました"
 
-#~ msgid "[crypted]"
-#~ msgstr "[暗号化]"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: 未知のフォントセット: %s"
 
-#~ msgid "E821: File is encrypted with unknown method"
-#~ msgstr "E821: ファイルが未知の方法で暗号化されています"
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: 未知のフォント: %s"
 
-# Added at 19-Jan-2004.
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "NetBeansは未変更のバッファを上書することは許可していません"
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: フォント \"%s\" は固定幅ではありません"
 
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "NetBeansバッファの一部を書き出すことはできません"
+msgid "E473: Internal error"
+msgstr "E473: 内部エラーです"
 
-#~ msgid "writing to device disabled with 'opendevice' option"
-#~ msgstr "'opendevice' オプションによりデバイスへの書き込みはできません"
+msgid "Interrupted"
+msgstr "割込まれました"
 
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: リソースフォークが失われるかもしれません (! を追加で強制)"
+msgid "E14: Invalid address"
+msgstr "E14: 無効なアドレスです"
 
-#~ msgid "E851: Failed to create a new process for the GUI"
-#~ msgstr "E851: GUI用のプロセスの起動に失敗しました"
+msgid "E474: Invalid argument"
+msgstr "E474: 無効な引数です"
 
-#~ msgid "E852: The child process failed to start the GUI"
-#~ msgstr "E852: 子プロセスがGUIの起動に失敗しました"
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: 無効な引数です: %s"
 
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: GUIを開始できません"
+#, c-format
+msgid "E15: Invalid expression: %s"
+msgstr "E15: 無効な式です: %s"
 
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: \"%s\"から読込むことができません"
+msgid "E16: Invalid range"
+msgstr "E16: 無効な範囲です"
 
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr "E665: 有効なフォントが見つからないので, GUIを開始できません"
+msgid "E476: Invalid command"
+msgstr "E476: 無効なコマンドです"
 
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: 'guifontwide' が無効です"
+#, c-format
+msgid "E17: \"%s\" is a directory"
+msgstr "E17: \"%s\" はディレクトリです"
 
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: 'imactivatekey' に設定された値が無効です"
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: \"%s\"() のライブラリ呼出に失敗しました"
 
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: %s の色を割り当てられません"
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: ライブラリの関数 %s をロードできませんでした"
 
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "カーソルの位置にマッチはありません, 次を検索しています"
+msgid "E19: Mark has invalid line number"
+msgstr "E19: マークに無効な行番号が指定されていました"
 
-#~ msgid "<cannot open> "
-#~ msgstr "<開けません> "
+msgid "E20: Mark not set"
+msgstr "E20: マークは設定されていません"
 
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: フォント %s を取得できません"
+msgid "E21: Cannot make changes, 'modifiable' is off"
+msgstr "E21: 'modifiable' がオフなので, 変更できません"
 
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr "E614: vim_SelFile: 現在のディレクトリに戻れません"
+msgid "E22: Scripts nested too deep"
+msgstr "E22: スクリプトの入れ子が深過ぎます"
 
-#~ msgid "Pathname:"
-#~ msgstr "パス名:"
+msgid "E23: No alternate file"
+msgstr "E23: 副ファイルはありません"
 
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: 現在のディレクトリを取得できません"
+msgid "E24: No such abbreviation"
+msgstr "E24: そのような短縮入力はありません"
 
-#~ msgid "OK"
-#~ msgstr "OK"
+msgid "E477: No ! allowed"
+msgstr "E477: ! は許可されていません"
 
-#~ msgid "Cancel"
-#~ msgstr "キャンセル"
+msgid "E25: GUI cannot be used: Not enabled at compile time"
+msgstr "E25: GUIは使用不可能です: コンパイル時に無効にされています"
 
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr "スクロールバー: 画像を取得できませんでした."
+msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
+msgstr "E26: ヘブライ語は使用不可能です: コンパイル時に無効にされています\n"
 
-#~ msgid "Vim dialog"
-#~ msgstr "Vim ダイアログ"
+msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
+msgstr "E27: ペルシア語は使用不可能です: コンパイル時に無効にされています\n"
 
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr "E232: メッセージとコールバックのある BalloonEval を作成できません"
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr "E800: アラビア語は使用不可能です: コンパイル時に無効にされています\n"
 
-#~ msgid "Input _Methods"
-#~ msgstr "インプットメソッド"
+#, c-format
+msgid "E28: No such highlight group name: %s"
+msgstr "E28: そのような名のハイライトグループはありません: %s"
 
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "VIM - 検索と置換..."
+msgid "E29: No inserted text yet"
+msgstr "E29: まだテキストが挿入されていません"
 
-#~ msgid "VIM - Search..."
-#~ msgstr "VIM - 検索..."
+msgid "E30: No previous command line"
+msgstr "E30: 以前にコマンド行がありません"
 
-#~ msgid "Find what:"
-#~ msgstr "検索文字列:"
+msgid "E31: No such mapping"
+msgstr "E31: そのようなマッピングはありません"
 
-#~ msgid "Replace with:"
-#~ msgstr "置換文字列:"
+msgid "E479: No match"
+msgstr "E479: 該当はありません"
 
-#~ msgid "Match whole word only"
-#~ msgstr "正確に該当するものだけ"
+#, c-format
+msgid "E480: No match: %s"
+msgstr "E480: 該当はありません: %s"
 
-#~ msgid "Match case"
-#~ msgstr "大文字/小文字を区別する"
+msgid "E32: No file name"
+msgstr "E32: ファイル名がありません"
 
-#~ msgid "Direction"
-#~ msgstr "方向"
+msgid "E33: No previous substitute regular expression"
+msgstr "E33: 正規表現置換がまだ実行されていません"
 
-#~ msgid "Up"
-#~ msgstr "上"
+msgid "E34: No previous command"
+msgstr "E34: コマンドがまだ実行されていません"
 
-#~ msgid "Down"
-#~ msgstr "下"
+msgid "E35: No previous regular expression"
+msgstr "E35: 正規表現がまだ実行されていません"
 
-#~ msgid "Find Next"
-#~ msgstr "次を検索"
+msgid "E481: No range allowed"
+msgstr "E481: 範囲指定は許可されていません"
 
-#~ msgid "Replace"
-#~ msgstr "置換"
+msgid "E36: Not enough room"
+msgstr "E36: ウィンドウに十分な高さもしくは幅がありません"
 
-#~ msgid "Replace All"
-#~ msgstr "全て置換"
+#, c-format
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: %s という名前の登録されたサーバーはありません"
 
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "Vim: セッションマネージャから \"die\" 要求を受け取りました\n"
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: ファイル %s を作成できません"
 
-#~ msgid "Close"
-#~ msgstr "閉じる"
+msgid "E483: Can't get temp file name"
+msgstr "E483: 一時ファイルの名前を取得できません"
 
-#~ msgid "New tab"
-#~ msgstr "新規タブページ"
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: ファイル \"%s\" を開けません"
 
-#~ msgid "Open Tab..."
-#~ msgstr "タブページを開く..."
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: ファイル %s を読込めません"
 
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim: メインウィンドウが不意に破壊されました\n"
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: 最後の変更が保存されていません (! を追加で変更を破棄)"
 
-#~ msgid "&Filter"
-#~ msgstr "フィルタ(&F)"
+msgid "E37: No write since last change"
+msgstr "E37: 最後の変更が保存されていません"
 
-#~ msgid "&Cancel"
-#~ msgstr "キャンセル(&C)"
+msgid "E38: Null argument"
+msgstr "E38: 引数が空です"
 
-#~ msgid "Directories"
-#~ msgstr "ディレクトリ"
+msgid "E39: Number expected"
+msgstr "E39: 数値が要求されています"
 
-#~ msgid "Filter"
-#~ msgstr "フィルタ"
+#, c-format
+msgid "E40: Can't open errorfile %s"
+msgstr "E40: エラーファイル %s を開けません"
 
-#~ msgid "&Help"
-#~ msgstr "ヘルプ(&H)"
+msgid "E233: cannot open display"
+msgstr "E233: ディスプレイを開けません"
 
-#~ msgid "Files"
-#~ msgstr "ファイル"
+msgid "E41: Out of memory!"
+msgstr "E41: メモリが尽き果てました!"
 
-#~ msgid "&OK"
-#~ msgstr "&OK"
+msgid "Pattern not found"
+msgstr "パターンは見つかりませんでした"
 
-#~ msgid "Selection"
-#~ msgstr "選択"
+#, c-format
+msgid "E486: Pattern not found: %s"
+msgstr "E486: パターンは見つかりませんでした: %s"
 
-#~ msgid "Find &Next"
-#~ msgstr "次を検索(&N)"
+msgid "E487: Argument must be positive"
+msgstr "E487: 引数は正の値でなければなりません"
 
-#~ msgid "&Replace"
-#~ msgstr "置換(&R)"
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: 前のディレクトリに戻れません"
 
-#~ msgid "Replace &All"
-#~ msgstr "全て置換(&A)"
+msgid "E42: No Errors"
+msgstr "E42: エラーはありません"
 
-#~ msgid "&Undo"
-#~ msgstr "アンドゥ(&U)"
+msgid "E776: No location list"
+msgstr "E776: ロケーションリストはありません"
 
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: タイトルが \"%s\" のウィンドウは見つかりません"
+msgid "E43: Damaged match string"
+msgstr "E43: 該当文字列が破損しています"
 
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: 引数はサポートされません: \"-%s\"; OLE版を使用してください."
+msgid "E44: Corrupted regexp program"
+msgstr "E44: 不正な正規表現プログラムです"
 
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: MDIアプリの中ではウィンドウを開けません"
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: 'readonly' オプションが設定されています (! を追加で上書き)"
 
-#~ msgid "Close tab"
-#~ msgstr "タブページを閉じる"
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: 読取専用変数 \"%s\" には値を設定できません"
 
-#~ msgid "Open tab..."
-#~ msgstr "タブページを開く"
+#, c-format
+msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgstr "E794: サンドボックスでは変数 \"%s\" に値を設定できません"
 
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "検索文字列 ('\\' を検索するには '\\\\')"
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: 辞書型に空のキーを使うことはできません"
 
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "検索・置換 ('\\' を検索するには '\\\\')"
+msgid "E715: Dictionary required"
+msgstr "E715: 辞書型が必要です"
 
-#~ msgid "Not Used"
-#~ msgstr "使われません"
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: リストのインデックスが範囲外です: %ld"
 
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "ディレクトリ\t*.nothing\n"
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: 関数の引数が多過ぎます: %s"
 
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr "Vim E458: 色指定が正しくないのでエントリを割り当てられません"
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: 辞書型にキーが存在しません: %s"
 
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr "E250: 以下の文字セットのフォントがありません %s:"
+msgid "E714: List required"
+msgstr "E714: リスト型が必要です"
 
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: フォントセット名: %s"
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: %s の引数はリスト型または辞書型でなければなりません"
 
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "フォント '%s' は固定幅ではありません"
+msgid "E47: Error while reading errorfile"
+msgstr "E47: エラーファイルの読込中にエラーが発生しました"
 
-#~ msgid "E253: Fontset name: %s"
-#~ msgstr "E253: フォントセット名: %s"
+msgid "E48: Not allowed in sandbox"
+msgstr "E48: サンドボックスでは許されません"
 
-#~ msgid "Font0: %s"
-#~ msgstr "フォント0: %s"
+msgid "E523: Not allowed here"
+msgstr "E523: ここでは許可されません"
 
-#~ msgid "Font1: %s"
-#~ msgstr "フォント1: %s"
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: スクリーンモードの設定には対応していません"
 
-#~ msgid "Font%<PRId64> width is not twice that of font0"
-#~ msgstr "フォント%<PRId64> の幅がフォント0の2倍ではありません"
+msgid "E49: Invalid scroll size"
+msgstr "E49: 無効なスクロール量です"
 
-#~ msgid "Font0 width: %<PRId64>"
-#~ msgstr "フォント0の幅: %<PRId64>"
+msgid "E91: 'shell' option is empty"
+msgstr "E91: 'shell' オプションが空です"
 
-#~ msgid "Font1 width: %<PRId64>"
-#~ msgstr "フォント1の幅: %<PRId64>"
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: sign のデータを読込めませんでした"
 
-#~ msgid "Invalid font specification"
-#~ msgstr "無効なフォント指定です"
+msgid "E72: Close error on swap file"
+msgstr "E72: スワップファイルのクローズ時エラーです"
 
-#~ msgid "&Dismiss"
-#~ msgstr "却下する(&D)"
+msgid "E73: tag stack empty"
+msgstr "E73: タグスタックが空です"
 
-#~ msgid "no specific match"
-#~ msgstr "マッチするものがありません"
+msgid "E74: Command too complex"
+msgstr "E74: コマンドが複雑過ぎます"
 
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Vim - フォント選択"
+msgid "E75: Name too long"
+msgstr "E75: 名前が長過ぎます"
 
-#~ msgid "Name:"
-#~ msgstr "名前:"
+msgid "E76: Too many ["
+msgstr "E76: [ が多過ぎます"
 
-#~ msgid "Show size in Points"
-#~ msgstr "サイズをポイントで表示する"
+msgid "E77: Too many file names"
+msgstr "E77: ファイル名が多過ぎます"
 
-#~ msgid "Encoding:"
-#~ msgstr "エンコード:"
+msgid "E488: Trailing characters"
+msgstr "E488: 余分な文字が後ろにあります"
 
-#~ msgid "Font:"
-#~ msgstr "フォント:"
+msgid "E78: Unknown mark"
+msgstr "E78: 未知のマーク"
 
-#~ msgid "Style:"
-#~ msgstr "スタイル:"
+msgid "E79: Cannot expand wildcards"
+msgstr "E79: ワイルドカードを展開できません"
 
-#~ msgid "Size:"
-#~ msgstr "サイズ:"
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: 'winheight' は 'winminheight' より小さくできません"
 
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: ハングルオートマトンエラー"
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: 'winwidth' は 'winminwidth' より小さくできません"
 
-#~ msgid "E563: stat error"
-#~ msgstr "E563: stat エラー"
+msgid "E80: Error while writing"
+msgstr "E80: 書込み中のエラー"
 
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: cscopeデータベース: %s を開くことができません"
+msgid "Zero count"
+msgstr "ゼロカウント"
 
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: cscopeデータベースの情報を取得できません"
+msgid "E81: Using <SID> not in a script context"
+msgstr "E81: スクリプト以外で<SID>が使われました"
 
-#~ msgid "Lua library cannot be loaded."
-#~ msgstr "Luaライブラリをロードできません."
+msgid "E449: Invalid expression received"
+msgstr "E449: 無効な式を受け取りました"
 
-#~ msgid "cannot save undo information"
-#~ msgstr "アンドゥ情報が保存できません"
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: 領域が保護されているので, 変更できません"
 
-#~ msgid ""
-#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
-#~ "be loaded."
-#~ msgstr ""
-#~ "E815: このコマンドは無効です. MzScheme ライブラリをロードできません."
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: NetBeans は読込専用ファイルを変更することを許しません"
 
-#~ msgid "invalid expression"
-#~ msgstr "無効な式です"
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: 内部エラーです: %s"
 
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "式はコンパイル時に無効にされています"
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: パターンが 'maxmempattern' 以上のメモリを使用します"
 
-#~ msgid "hidden option"
-#~ msgstr "隠しオプション"
+msgid "E749: empty buffer"
+msgstr "E749: バッファが空です"
 
-#~ msgid "unknown option"
-#~ msgstr "未知のオプションです"
+#, c-format
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: バッファ %ld はありません"
 
-#~ msgid "window index is out of range"
-#~ msgstr "範囲外のウィンドウ番号です"
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: 検索パターンか区切り記号が不正です"
 
-#~ msgid "couldn't open buffer"
-#~ msgstr "バッファを開けません"
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: 同じ名前のファイルが他のバッファで読込まれています"
 
-#~ msgid "cannot delete line"
-#~ msgstr "行を消せません"
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: オプション '%s' は設定されていません"
 
-#~ msgid "cannot replace line"
-#~ msgstr "行を置換できません"
+msgid "E850: Invalid register name"
+msgstr "E850: 無効なレジスタ名です"
 
-#~ msgid "cannot insert line"
-#~ msgstr "行を挿入できません"
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: ディレクトリが '%s' の中にありません: \"%s\""
 
-#~ msgid "string cannot contain newlines"
-#~ msgstr "文字列には改行文字を含められません"
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "上まで検索したので下に戻ります"
 
-#~ msgid "error converting Scheme values to Vim"
-#~ msgstr "Scheme値のVimへの変換エラー"
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "下まで検索したので上に戻ります"
 
-#~ msgid "Vim error: ~a"
-#~ msgstr "Vim エラー: ~a"
+#, c-format
+msgid "Need encryption key for \"%s\""
+msgstr "暗号キーが必要です: \"%s\""
 
-#~ msgid "Vim error"
-#~ msgstr "Vim エラー"
+msgid "empty keys are not allowed"
+msgstr "空のキーは許可されていません"
 
-#~ msgid "buffer is invalid"
-#~ msgstr "バッファは無効です"
+msgid "dictionary is locked"
+msgstr "辞書はロックされています"
 
-#~ msgid "window is invalid"
-#~ msgstr "ウィンドウは無効です"
+msgid "list is locked"
+msgstr "リストはロックされています"
 
-#~ msgid "linenr out of range"
-#~ msgstr "範囲外の行番号です"
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "辞書にキー '%s' を追加するのに失敗しました"
 
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "サンドボックスでは許されません"
+#, c-format
+msgid "index must be int or slice, not %s"
+msgstr "インデックスは %s ではなく整数かスライスにしてください"
 
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: ライブラリ %s をロードできませんでした"
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "str() もしくは unicode() のインスタンスが期待されているのに %s でした"
 
-#~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr ""
-#~ "このコマンドは無効です, ごめんなさい: Perlライブラリをロードできませんでし"
-#~ "た."
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "bytes() もしくは str() のインスタンスが期待されているのに %s でした"
 
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr ""
-#~ "E299: サンドボックスでは Safe モジュールを使用しないPerlスクリプトは禁じら"
-#~ "れています"
+#, c-format
+msgid ""
+"expected int(), long() or something supporting coercing to long(), but got %s"
+msgstr "long() かそれへ変換可能なものが期待されているのに %s でした"
 
-#~ msgid "E836: This Vim cannot execute :python after using :py3"
-#~ msgstr "E836: このVimでは :py3 を使った後に :python を使えません"
+#, c-format
+msgid "expected int() or something supporting coercing to int(), but got %s"
+msgstr "int() かそれへ変換可能なものが期待されているのに %s でした"
 
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E263: このコマンドは無効です,ごめんなさい: Pythonライブラリをロードできま"
-#~ "せんでした."
+msgid "value is too large to fit into C int type"
+msgstr "C言語の int 型としては値が大き過ぎます"
 
-# Added at 07-Feb-2004.
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: Python を再帰的に実行することはできません"
+msgid "value is too small to fit into C int type"
+msgstr "C言語の int 型としては値が小さ過ぎます"
 
-#~ msgid "E837: This Vim cannot execute :py3 after using :python"
-#~ msgstr "E837: このVimでは :python を使った後に :py3 を使えません"
+msgid "number must be greater than zero"
+msgstr "数値は 0 より大きくなければなりません"
 
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr "E265: $_ は文字列のインスタンスでなければなりません"
+msgid "number must be greater or equal to zero"
+msgstr "数値は 0 かそれ以上でなければなりません"
 
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E266: このコマンドは無効です,ごめんなさい: Rubyライブラリをロードできませ"
-#~ "んでした."
+msgid "can't delete OutputObject attributes"
+msgstr "OutputObject属性を消せません"
 
-#~ msgid "E267: unexpected return"
-#~ msgstr "E267: 予期せぬ return です"
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "無効な属性です: %s"
 
-#~ msgid "E268: unexpected next"
-#~ msgstr "E268: 予期せぬ next です"
+msgid "E264: Python: Error initialising I/O objects"
+msgstr "E264: Python: I/Oオブジェクトの初期化エラー"
 
-#~ msgid "E269: unexpected break"
-#~ msgstr "E269: 予期せぬ break です"
+msgid "failed to change directory"
+msgstr "辞書の変更に失敗しました"
 
-#~ msgid "E270: unexpected redo"
-#~ msgstr "E270: 予期せぬ redo です"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got %s"
+msgstr "imp.find_module() が %s を返しました (期待値: 3 要素のタプル)"
 
-#~ msgid "E271: retry outside of rescue clause"
-#~ msgstr "E271: rescue の外の retry です"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr "imp.find_module() が %d 要素のタプルを返しました (期待値: 3)"
 
-#~ msgid "E272: unhandled exception"
-#~ msgstr "E272: 取り扱われなかった例外があります"
+msgid "internal error: imp.find_module returned tuple with NULL"
+msgstr "内部エラー: imp.find_module が NULL を含むタプルを返しました"
 
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: 未知のlongjmp状態: %d"
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "vim.Dictionary属性は消せません"
 
-#~ msgid "Toggle implementation/definition"
-#~ msgstr "実装と定義を切り替える"
+msgid "cannot modify fixed dictionary"
+msgstr "固定された辞書は変更できません"
 
-#~ msgid "Show base class of"
-#~ msgstr "次のクラスの基底を表示"
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "属性 %s は設定できません"
 
-#~ msgid "Show overridden member function"
-#~ msgstr "オーバーライドされたメンバ関数を表示"
+msgid "hashtab changed during iteration"
+msgstr "イテレーション中に hashtab が変更されました"
 
-#~ msgid "Retrieve from file"
-#~ msgstr "ファイルから回復する"
+#, c-format
+msgid "expected sequence element of size 2, but got sequence of size %d"
+msgstr "シーケンスの要素数には 2 が期待されていましたが %d でした"
 
-#~ msgid "Retrieve from project"
-#~ msgstr "プロジェクトから回復する"
+msgid "list constructor does not accept keyword arguments"
+msgstr "リストのコンストラクタはキーワード引数を受け付けません"
 
-#~ msgid "Retrieve from all projects"
-#~ msgstr "全てのプロジェクトから回復する"
+msgid "list index out of range"
+msgstr "リスト範囲外のインデックスです"
 
-#~ msgid "Retrieve"
-#~ msgstr "回復"
+#. No more suitable format specifications in python-2.3
+#, c-format
+msgid "internal error: failed to get vim list item %d"
+msgstr "内部エラー: vimのリスト要素 %d の取得に失敗しました"
 
-#~ msgid "Show source of"
-#~ msgstr "次のソースを表示する"
+msgid "slice step cannot be zero"
+msgstr "スライスのステップに 0 は指定できません"
 
-#~ msgid "Find symbol"
-#~ msgstr "見つけたシンボル"
+#, c-format
+msgid "attempt to assign sequence of size greater than %d to extended slice"
+msgstr "長さ %d の拡張スライスに、より長いスライスを割り当てようとしました"
 
-#~ msgid "Browse class"
-#~ msgstr "クラスを参照"
+#, c-format
+msgid "internal error: no vim list item %d"
+msgstr "内部エラー: vimのリスト要素 %d はありません"
 
-#~ msgid "Show class in hierarchy"
-#~ msgstr "階層でクラスを表示"
+msgid "internal error: not enough list items"
+msgstr "内部エラー: リストに十分な要素がありません"
 
-#~ msgid "Show class in restricted hierarchy"
-#~ msgstr "限定された階層でクラスを表示"
+msgid "internal error: failed to add item to list"
+msgstr "内部エラー: リストへの要素追加に失敗しました"
 
-#~ msgid "Xref refers to"
-#~ msgstr "Xref の参照先"
+#, c-format
+msgid "attempt to assign sequence of size %d to extended slice of size %d"
+msgstr "長さ %d のスライスを %d の拡張スライスに割り当てようとしました"
 
-#~ msgid "Xref referred by"
-#~ msgstr "Xref が参照される"
+msgid "failed to add item to list"
+msgstr "リストへの要素追加に失敗しました"
 
-#~ msgid "Xref has a"
-#~ msgstr "Xref が次のものをもっています"
+msgid "cannot delete vim.List attributes"
+msgstr "vim.List 属性は消せません"
 
-#~ msgid "Xref used by"
-#~ msgstr "Xref が使用される"
+msgid "cannot modify fixed list"
+msgstr "固定されたリストは変更できません"
 
-#~ msgid "Show docu of"
-#~ msgstr "次の文章を表示"
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "無名関数 %s は存在しません"
 
-#~ msgid "Generate docu for"
-#~ msgstr "次の文章を生成"
+#, c-format
+msgid "function %s does not exist"
+msgstr "関数 %s がありません"
 
-#~ msgid ""
-#~ "Cannot connect to SNiFF+. Check environment (sniffemacs must be found in "
-#~ "$PATH).\n"
-#~ msgstr ""
-#~ "SNiFF+に接続できません. 環境をチェックしてください(sniffemacs が $PATH に"
-#~ "なければなりません).\n"
+#, c-format
+msgid "failed to run function %s"
+msgstr "関数 %s の実行に失敗しました"
 
-#~ msgid "E274: Sniff: Error during read. Disconnected"
-#~ msgstr "E274: Sniff: 読込中にエラーが発生しました. 切断しました"
+msgid "unable to get option value"
+msgstr "オプションの値は取得できません"
 
-#~ msgid "SNiFF+ is currently "
-#~ msgstr "現在SNiFF+ の状態は「"
+msgid "internal error: unknown option type"
+msgstr "内部エラー: 未知のオプション型です"
 
-#~ msgid "not "
-#~ msgstr "未"
+msgid "problem while switching windows"
+msgstr "ウィンドウを切換中に問題が発生しました"
 
-#~ msgid "connected"
-#~ msgstr "接続」です"
+#, c-format
+msgid "unable to unset global option %s"
+msgstr "グローバルオプション %s の設定解除はできません"
 
-#~ msgid "E275: Unknown SNiFF+ request: %s"
-#~ msgstr "E275: 未知の SNiFF+ リクエストです: %s"
+#, c-format
+msgid "unable to unset option %s which does not have global value"
+msgstr "グローバルな値の無いオプション %s の設定解除はできません"
 
-#~ msgid "E276: Error connecting to SNiFF+"
-#~ msgstr "E276: SNiFF+ への接続中のエラーです"
+msgid "attempt to refer to deleted tab page"
+msgstr "削除されたタブを参照しようとしました"
 
-#~ msgid "E278: SNiFF+ not connected"
-#~ msgstr "E278: SNiFF+ に接続されていません"
+msgid "no such tab page"
+msgstr "そのようなタブページはありません"
 
-#~ msgid "E279: Not a SNiFF+ buffer"
-#~ msgstr "E279: SNiFF+ バッファがありません"
+msgid "attempt to refer to deleted window"
+msgstr "削除されたウィンドウを参照しようとしました"
 
-#~ msgid "Sniff: Error during write. Disconnected"
-#~ msgstr "Sniff: 書込み中にエラーが発生したので切断しました"
+msgid "readonly attribute: buffer"
+msgstr "読込専用属性: バッファー"
 
-#~ msgid "invalid buffer number"
-#~ msgstr "無効なバッファ番号です"
+msgid "cursor position outside buffer"
+msgstr "カーソル位置がバッファの外側です"
 
-#~ msgid "not implemented yet"
-#~ msgstr "まだ実装されていません"
+msgid "no such window"
+msgstr "そのようなウィンドウはありません"
 
-#~ msgid "cannot set line(s)"
-#~ msgstr "行を設定できません"
+msgid "attempt to refer to deleted buffer"
+msgstr "削除されたバッファを参照しようとしました"
 
-#~ msgid "invalid mark name"
-#~ msgstr "無効なマーク名です"
+msgid "failed to rename buffer"
+msgstr "バッファ名の変更に失敗しました"
 
-#~ msgid "mark not set"
-#~ msgstr "マークは設定されていません"
+msgid "mark name must be a single character"
+msgstr "マーク名は1文字のアルファベットでなければなりません"
 
-#~ msgid "row %d column %d"
-#~ msgstr "行 %d 列 %d"
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "vim.Bufferオブジェクトが期待されているのに %s でした"
 
-#~ msgid "cannot insert/append line"
-#~ msgstr "行の挿入/追加をできません"
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "指定されたバッファ %d への切り替えに失敗しました"
 
-#~ msgid "line number out of range"
-#~ msgstr "範囲外の行番号です"
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "vim.Windowオブジェクトが期待されているのに %s でした"
 
-#~ msgid "unknown flag: "
-#~ msgstr "未知のフラグ: "
+msgid "failed to find window in the current tab page"
+msgstr "現在のタブには指定されたウィンドウがありませんでした"
 
-#~ msgid "unknown vimOption"
-#~ msgstr "未知の vimOption です"
+msgid "did not switch to the specified window"
+msgstr "指定されたウィンドウに切り替えませんでした"
 
-#~ msgid "keyboard interrupt"
-#~ msgstr "キーボード割込み"
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "vim.TabPageオブジェクトが期待されているのに %s でした"
 
-#~ msgid "vim error"
-#~ msgstr "vim エラー"
+msgid "did not switch to the specified tab page"
+msgstr "指定されたタブページに切り替えませんでした"
 
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr ""
-#~ "バッファ/ウィンドウ作成コマンドを作成できません: オブジェクトが消去されて"
-#~ "いました"
+msgid "failed to run the code"
+msgstr "コードの実行に失敗しました"
 
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr ""
-#~ "コールバックコマンドを登録できません: バッファ/ウィンドウが既に消去されま"
-#~ "した"
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: 式評価は有効なpythonオブジェクトを返しませんでした"
 
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr ""
-#~ "E280: TCL 致命的エラー: reflist 汚染!? vim-dev@vim.org に報告してください"
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: 返されたpythonオブジェクトをvimの値に変換できませんでした"
 
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr ""
-#~ "コールバックコマンドを登録できません: バッファ/ウィンドウの参照が見つかり"
-#~ "ません"
+#, c-format
+msgid "unable to convert %s to vim dictionary"
+msgstr "%s vimの辞書型に変換できません"
 
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E571: このコマンドは無効です,ごめんなさい: Tclライブラリをロードできません"
-#~ "でした."
+#, c-format
+msgid "unable to convert %s to vim list"
+msgstr "%s をvimのリストに変換できません"
 
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: 終了コード %d"
+#, c-format
+msgid "unable to convert %s to vim structure"
+msgstr "%s をvimの構造体に変換できません"
 
-#~ msgid "cannot get line"
-#~ msgstr "行を取得できません"
+msgid "internal error: NULL reference passed"
+msgstr "内部エラー: NULL参照が渡されました"
 
-#~ msgid "Unable to register a command server name"
-#~ msgstr "命令サーバの名前を登録できません"
+msgid "internal error: invalid value type"
+msgstr "内部エラー: 無効な値型です"
 
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: 目的のプログラムへのコマンド送信に失敗しました"
+msgid ""
+"Failed to set path hook: sys.path_hooks is not a list\n"
+"You should now do the following:\n"
+"- append vim.path_hook to sys.path_hooks\n"
+"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgstr ""
+"パスフックの設定に失敗しました: sys.path_hooks がリストではありません\n"
+"すぐに下記を実施してください:\n"
+"- vim.path_hooks を sys.path_hooks へ追加\n"
+"- vim.VIM_SPECIAL_PATH を sys.path へ追加\n"
 
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: 無効なサーバIDが使われました: %s"
-
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr "E251: VIM 実体の登録プロパティが不正です. 消去しました!"
-
-#~ msgid "netbeans is not supported with this GUI\n"
-#~ msgstr "netbeans はこのGUIでは利用できません\n"
-
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "このVimにはdiff機能がありません(コンパイル時設定)."
-
-#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
-#~ msgstr "'-nb' 使用不可能です: コンパイル時に無効にされています\n"
-
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim: エラー: NetBeansからgvimをスタートできません\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Where case is ignored prepend / to make flag upper case"
-#~ msgstr ""
-#~ "\n"
-#~ "大小文字が無視される場合は大文字にするために / を前置してください"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\tこのgvimをOLEとして登録する"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\tgvimのOLE登録を解除する"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\tGUIで起動する (\"gvim\" と同じ)"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr "-f or  --nofork\tフォアグラウンド: GUIを始めるときにforkしない"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\tウィンドウを開くのに newcli を使用しない"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <device>\t\tI/Oに <device> を使用する"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\t\t.gvimrcの代わりに <gvimrc> を使う"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\t暗号化されたファイルを編集する"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <display>\tvimを指定した X サーバに接続する"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\tXサーバに接続しない"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr "--remote <files>\t可能ならばVimサーバで <files> を編集する"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr "--remote-silent <files>  同上, サーバが無くても警告文を出力しない"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr "--remote-wait <files>\t--remote後 ファイルの編集が終わるのを待つ"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-wait-silent <files>  同上, サーバが無くても警告文を出力しない"
-
-#~ msgid ""
-#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
-#~ "file"
-#~ msgstr ""
-#~ "--remote-tab[-wait][-silent] <files>  --remoteでファイル1つにつき1つのタブ"
-#~ "ページを開く"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr "--remote-send <keys>\tVimサーバに <keys> を送信して終了する"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr "--remote-expr <expr>\tサーバで <expr> を実行して結果を表示する"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr "--serverlist\t\tVimサーバ名の一覧を表示して終了する"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <name>\tVimサーバ <name> に送信/名前設定する"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvimによって解釈される引数(Motifバージョン):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvimによって解釈される引数(neXtawバージョン):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvimによって解釈される引数(Athenaバージョン):\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <display>\t<display> でvimを実行する"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\t最小化した状態でvimを起動する"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr "-background <color>\t背景色に <color> を使う(同義: -bg)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr "-foreground <color>\t前景色に <color> を使う(同義: -fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr "-font <font>\t\tテキスト表示に <font> を使う(同義: -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <font>\t太字に <font> を使う"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <for>\t斜体字に <font> を使う"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr "-geometry <geom>\t初期配置に <geom> を使う(同義: -geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr "-borderwidth <width>\t境界の幅を <width> にする(同義: -bw)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr ""
-#~ "-scrollbarwidth <width>  スクロールバーの幅を <width> にする(同義: -sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr ""
-#~ "-menuheight <height>\tメニューバーの高さを <height> にする(同義: -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\t反転映像を使用する(同義: -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\t反転映像を使用しない(同義: +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <resource>\t特定のリソースを使用する"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "gvimによって解釈される引数(GTK+バージョン):\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr "-display <display>\t<display> でvimを実行する(同義: --display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr "--role <role>\tメインウィンドウを識別する一意な役割(role)を設定する"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\t異なるGTK widgetでVimを開く"
-
-#~ msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
-#~ msgstr "--echo-wid\t\tウィンドウIDを標準出力に出力する"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <親のタイトル>\tVimを親アプリケーションの中で起動する"
-
-#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-#~ msgstr "--windowid <HWND>\t異なるWin32 widgetの内部にVimを開く"
-
-#~ msgid "No display"
-#~ msgstr "ディスプレイが見つかりません"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr ": 送信に失敗しました.\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": 送信に失敗しました. ローカルでの実行を試みています\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "%d 個 (%d 個中) のファイルを編集しました"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "ディスプレイがありません: 式の送信に失敗しました.\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": 式の送信に失敗しました.\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: 無効なコードページです"
-
-#~ msgid "E284: Cannot set IC values"
-#~ msgstr "E284: ICの値を設定できません"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: インプットコンテキストの作成に失敗しました"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: インプットメソッドのオープンに失敗しました"
-
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr "E287: 警告: IMの破壊コールバックを設定できませんでした"
-
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: インプットメソッドはどんなスタイルもサポートしません"
-
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr "E289: インプットメソッドは my preedit type をサポートしません"
-
-#~ msgid "E843: Error while updating swap file crypt"
-#~ msgstr "E843: スワップファイルの暗号を更新中にエラーが発生しました"
-
-#~ msgid ""
-#~ "E833: %s is encrypted and this version of Vim does not support encryption"
-#~ msgstr ""
-#~ "E833: %s はこのバージョンのVimでサポートしていない形式で暗号化されています"
-
-#~ msgid "Swap file is encrypted: \"%s\""
-#~ msgstr "スワップファイルは暗号化されています: \"%s\""
-
-#~ msgid ""
-#~ "\n"
-#~ "If you entered a new crypt key but did not write the text file,"
-#~ msgstr ""
-#~ "\n"
-#~ "新しい暗号キーを入力したあとにテキストファイルを保存していない場合は,"
-
-#~ msgid ""
-#~ "\n"
-#~ "enter the new crypt key."
-#~ msgstr ""
-#~ "\n"
-#~ "新しい暗号キーを入力してください."
-
-#~ msgid ""
-#~ "\n"
-#~ "If you wrote the text file after changing the crypt key press enter"
-#~ msgstr ""
-#~ "\n"
-#~ "暗号キーを変えたあとにテキストファイルを保存した場合は, テキストファイルと"
-
-#~ msgid ""
-#~ "\n"
-#~ "to use the same key for text file and swap file"
-#~ msgstr ""
-#~ "\n"
-#~ "スワップファイルに同じ暗号キーを使うためにenterだけを押してください."
-
-#~ msgid "Using crypt key from swap file for the text file.\n"
-#~ msgstr "スワップファイルから取得した暗号キーをテキストファイルに使います.\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [このVimバージョンでは使用できません]"
-
-#~ msgid "Tear off this menu"
-#~ msgstr "このメニューを切り取る"
-
-#~ msgid "Select Directory dialog"
-#~ msgstr "ディレクトリ選択ダイアログ"
-
-#~ msgid "Save File dialog"
-#~ msgstr "ファイル保存ダイアログ"
-
-#~ msgid "Open File dialog"
-#~ msgstr "ファイル読込ダイアログ"
-
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr ""
-#~ "E338: コンソールモードではファイルブラウザを使えません, ごめんなさい"
-
-#~ msgid "Vim: preserving files...\n"
-#~ msgstr "Vim: ファイルを保存中...\n"
-
-#~ msgid "Vim: Finished.\n"
-#~ msgstr "Vim: 終了しました.\n"
-
-#~ msgid "ERROR: "
-#~ msgstr "エラー: "
-
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[メモリ(バイト)] 総割当-解放量 %<PRIu64>-%<PRIu64>, 使用量 %<PRIu64>, ピー"
-#~ "ク時 %<PRIu64>\n"
-
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[呼出] 総 re/malloc() 回数 %<PRIu64>, 総 free() 回数 %<PRIu64>\n"
-#~ "\n"
-
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: 行が長くなり過ぎました"
-
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: 内部エラー: lalloc(%<PRId64>,)"
-
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: 不正な 'mouseshape' です"
-
-#~ msgid "Enter encryption key: "
-#~ msgstr "暗号化用のキーを入力してください: "
-
-#~ msgid "Enter same key again: "
-#~ msgstr "もう一度同じキーを入力してください: "
-
-#~ msgid "Keys don't match!"
-#~ msgstr "キーが一致しません"
-
-#~ msgid "Cannot connect to Netbeans #2"
-#~ msgstr "Netbeans #2 に接続できません"
-
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "Netbeans に接続できません"
-
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
-#~ "E668: NetBeansの接続情報ファイルのアクセスモードに問題があります: \"%s\""
-
-#~ msgid "read from Netbeans socket"
-#~ msgstr "Netbeans のソケットを読込み"
-
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: バッファ %<PRId64> の NetBeans 接続が失われました"
-
-#~ msgid "E838: netbeans is not supported with this GUI"
-#~ msgstr "E838: NetBeansはこのGUIには対応していません"
-
-#~ msgid "E511: netbeans already connected"
-#~ msgstr "E511: NetBeansは既に接続しています"
-
-#~ msgid "E505: %s is read-only (add ! to override)"
-#~ msgstr "E505: %s は読込専用です (強制書込には ! を追加)"
-
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: 式評価機能が無効になっています"
-
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "%<PRId64> 行を解放中"
-
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: GUIでは 'term' を変更できません"
-
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: GUIをスタートするには \":gui\" を使用してください"
-
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: GTK+2 GUIでは変更できません"
-
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: 無効なフォントです"
-
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: フォントセットを選択できません"
-
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: 無効なフォントセットです"
-
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: ワイドフォントを選択できません"
-
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: 無効なワイドフォントです"
-
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: マウスはサポートされません"
-
-#~ msgid "cannot open "
-#~ msgstr "開けません "
-
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM: ウィンドウを開けません!\n"
-
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "Amigadosのバージョン 2.04かそれ以降が必要です\n"
-
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "%s のバージョン %<PRId64> が必要です\n"
-
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "NILを開けません:\n"
-
-#~ msgid "Cannot create "
-#~ msgstr "作成できません "
-
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vimは %d で終了します\n"
-
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "コンソールモードを変更できません?!\n"
-
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: コンソールではない??\n"
-
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: -f オプションでシェルを実行できません"
-
-#~ msgid "Cannot execute "
-#~ msgstr "実行できません "
-
-#~ msgid "shell "
-#~ msgstr "シェル "
-
-#~ msgid " returned\n"
-#~ msgstr " 戻りました\n"
-
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE が小さ過ぎます."
-
-#~ msgid "I/O ERROR"
-#~ msgstr "入出力エラー"
-
-#~ msgid "Message"
-#~ msgstr "メッセージ"
-
-#~ msgid "'columns' is not 80, cannot execute external commands"
-#~ msgstr "'columns' が80ではないため, 外部コマンドを実行できません"
-
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: プリンタの選択に失敗しました"
-
-#~ msgid "to %s on %s"
-#~ msgstr "%s へ (%s 上の)"
-
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: 未知のプリンタオプションです: %s"
-
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: 印刷エラー: %s"
-
-#~ msgid "Printing '%s'"
-#~ msgstr "印刷しています: '%s'"
-
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr "E244: 文字セット名 \"%s\" は不正です (フォント名 \"%s\")"
-
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: '%c' は不正な文字です (フォント名 \"%s\")"
-
-#~ msgid "Vim: Double signal, exiting\n"
-#~ msgstr "Vim: 2重のシグナルのため, 終了します\n"
-
-#~ msgid "Vim: Caught deadly signal %s\n"
-#~ msgstr "Vim: 致命的シグナル %s を検知しました\n"
-
-#~ msgid "Vim: Caught deadly signal\n"
-#~ msgstr "Vim: 致命的シグナルを検知しました\n"
-
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "Xサーバへの接続に %<PRId64> ミリ秒かかりました"
-
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim: X のエラーを検出しましたr\n"
-
-#~ msgid "Testing the X display failed"
-#~ msgstr "X display のチェックに失敗しました"
-
-#~ msgid "Opening the X display timed out"
-#~ msgstr "X display の open がタイムアウトしました"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "sh シェルを実行できません\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "パイプを作成できません\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "fork できません\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "コマンドを中断しました\n"
-
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "XSMP がICE接続を失いました"
-
-#~ msgid "Opening the X display failed"
-#~ msgstr "X display の open に失敗しました"
-
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "XSMP がsave-yourself要求を処理しています"
-
-#~ msgid "XSMP opening connection"
-#~ msgstr "XSMP が接続を開始しています"
-
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "XSMP ICE接続が失敗したようです"
-
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "XSMP SmcOpenConnectionが失敗しました: %s"
-
-#~ msgid "At line"
-#~ msgstr "行"
-
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "vim32.dll をロードできませんでした"
-
-#~ msgid "VIM Error"
-#~ msgstr "VIMエラー"
-
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "DLLから関数ポインタを取得できませんでした"
-
-#~ msgid "shell returned %d"
-#~ msgstr "シェルがコード %d で終了しました"
-
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim: イベント %s を検知\n"
-
-#~ msgid "close"
-#~ msgstr "閉じる"
-
-#~ msgid "logoff"
-#~ msgstr "ログオフ"
-
-#~ msgid "shutdown"
-#~ msgstr "シャットダウン"
-
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: コマンドがありません"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "VIMRUN.EXEが $PATH の中に見つかりません.\n"
-#~ "外部コマンドの終了後に一時停止をしません.\n"
-#~ "詳細は  :help win32-vimrun  を参照してください."
-
-#~ msgid "Vim Warning"
-#~ msgstr "Vimの警告"
-
-#~ msgid "Error file"
-#~ msgstr "エラーファイル"
-
-#~ msgid "E868: Error building NFA with equivalence class!"
-#~ msgstr "E868: 等価クラスを含むNFA構築に失敗しました!"
-
-#~ msgid "E878: (NFA) Could not allocate memory for branch traversal!"
-#~ msgstr "E878: (NFA) 現在横断中のブランチに十分なメモリを割り当てられません!"
-
-#~ msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
-#~ msgstr ""
-#~ "警告: 単語リスト \"%s_%s.spl\" および \"%s_ascii.spl\" は見つかりません"
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "%s 内の変換はサポートされていません"
-
-#~ msgid "E845: Insufficient memory, word list will be incomplete"
-#~ msgstr "E845: メモリが足りないので、単語リストは不完全です"
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: タグファイルのパスが %s に切り捨てられました\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "新しいシェルを起動します\n"
-
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "空の選択領域のかわりにCUT_BUFFER0が使用されました"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "可能なアンドゥはありません: とりあえず続けます"
-
-#~ msgid "E832: Non-encrypted file has encrypted undo file: %s"
-#~ msgstr ""
-#~ "E832: 非暗号化ファイルが暗号化されたアンドゥファイルを使ってます: %s"
-
-#~ msgid "E826: Undo file decryption failed: %s"
-#~ msgstr "E826: 暗号化されたアンドゥファイルの解読に失敗しました: %s"
-
-#~ msgid "E827: Undo file is encrypted: %s"
-#~ msgstr "E827: アンドゥファイルが暗号化されています: %s"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16/32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16/32 ビット GUI 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 64 ビット GUI 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32 ビット GUI 版"
-
-#~ msgid " in Win32s mode"
-#~ msgstr " in Win32s モード"
-
-#~ msgid " with OLE support"
-#~ msgstr " with OLE サポート"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 64 ビット コンソール 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 32 ビット コンソール 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 16-bit version"
-#~ msgstr ""
-#~ "\n"
-#~ "MS-Windows 16 ビット 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "32-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "32 ビット MS-DOS 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "16-bit MS-DOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "16 ビット MS-DOS 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X (unix) 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS X version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS X 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
-#~ msgstr ""
-#~ "\n"
-#~ "MacOS 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "OpenVMS version"
-#~ msgstr ""
-#~ "\n"
-#~ "OpenVMS 版"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "Big 版 "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "通常 版 "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "Small 版 "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "Tiny 版 "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "with GTK2-GNOME GUI."
-
-#~ msgid "with GTK2 GUI."
-#~ msgstr "with GTK2 GUI."
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "with X11-Motif GUI."
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "with X11-neXtaw GUI."
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "with X11-Athena GUI."
-
-#~ msgid "with Photon GUI."
-#~ msgstr "with Photon GUI."
-
-#~ msgid "with GUI."
-#~ msgstr "with GUI."
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "with Carbon GUI."
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "with Cocoa GUI."
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "with (クラシック) GUI."
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "     システム gvimrc: \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "       ユーザ gvimrc: \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "    第2ユーザ gvimrc: \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "    第3ユーザ gvimrc: \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr "    システムメニュー: \""
-
-#~ msgid "Compiler: "
-#~ msgstr "コンパイラ: "
-
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "詳細はメニューの ヘルプ→孤児 を参照して下さい   "
-
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "モード無で実行中, タイプした文字が挿入されます"
-
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "メニューの 編集→全体設定→挿入(初心者)モード切替 "
-
-#~ msgid "                              for two modes      "
-#~ msgstr "                              でモード有に       "
-
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr "メニューの 編集→全体設定→Vi互換モード切替      "
-
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "                              でVimとして動作    "
-
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "   警告: Windows 95/98/Me を検出  "
-
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr " 詳細な情報は          :help windows95<Enter> "
-
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "複数のVimで編集する (&M)"
-
-#~ msgid "Edit with single &Vim"
-#~ msgstr "1つのVimで編集する (&V)"
-
-#~ msgid "Diff with Vim"
-#~ msgstr "Vimで差分を表示する"
-
-#~ msgid "Edit with &Vim"
-#~ msgstr "Vimで編集する (&V)"
-
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "起動済のVimで編集する - "
-
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "選択したファイルをVimで編集する"
-
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr "プロセスの作成に失敗: gvimが環境変数PATH上にあるか確認してください!"
-
-#~ msgid "gvimext.dll error"
-#~ msgstr "gvimext.dll エラー"
-
-#~ msgid "Path length too long!"
-#~ msgstr "パスが長すぎます!"
-
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: 未知のフォントセット: %s"
-
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: 未知のフォント: %s"
-
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: フォント \"%s\" は固定幅ではありません"
-
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: ライブラリの関数 %s をロードできませんでした"
-
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr "E26: ヘブライ語は使用不可能です: コンパイル時に無効にされています\n"
-
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr "E27: ペルシア語は使用不可能です: コンパイル時に無効にされています\n"
-
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr ""
-#~ "E800: アラビア語は使用不可能です: コンパイル時に無効にされています\n"
-
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: %s という名前の登録されたサーバはありません"
-
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: ディスプレイを開けません"
-
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: 無効な式を受け取りました"
-
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: 領域が保護されているので, 変更できません"
-
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr "E744: NetBeans は読込専用ファイルを変更することを許しません"
-
-#~ msgid "Need encryption key for \"%s\""
-#~ msgstr "暗号キーが必要です: \"%s\""
-
-#~ msgid "empty keys are not allowed"
-#~ msgstr "空のキーは許可されていません"
-
-#~ msgid "dictionary is locked"
-#~ msgstr "辞書はロックされています"
-
-#~ msgid "list is locked"
-#~ msgstr "リストはロックされています"
-
-#~ msgid "failed to add key '%s' to dictionary"
-#~ msgstr "辞書にキー '%s' を追加するのに失敗しました"
-
-#~ msgid "index must be int or slice, not %s"
-#~ msgstr "インデックスは %s ではなく整数かスライスにしてください"
-
-#~ msgid "expected str() or unicode() instance, but got %s"
-#~ msgstr ""
-#~ "str() もしくは unicode() のインスタンスが期待されているのに %s でした"
-
-#~ msgid "expected bytes() or str() instance, but got %s"
-#~ msgstr "bytes() もしくは str() のインスタンスが期待されているのに %s でした"
-
-#~ msgid ""
-#~ "expected int(), long() or something supporting coercing to long(), but "
-#~ "got %s"
-#~ msgstr "long() かそれへ変換可能なものが期待されているのに %s でした"
-
-#~ msgid "expected int() or something supporting coercing to int(), but got %s"
-#~ msgstr "int() かそれへ変換可能なものが期待されているのに %s でした"
-
-#~ msgid "value is too large to fit into C int type"
-#~ msgstr "C言語の int 型としては値が大き過ぎます"
-
-#~ msgid "value is too small to fit into C int type"
-#~ msgstr "C言語の int 型としては値が小さ過ぎます"
-
-#~ msgid "number must be greater then zero"
-#~ msgstr "数値は 0 より大きくなければなりません"
-
-#~ msgid "number must be greater or equal to zero"
-#~ msgstr "数値は 0 かそれ以上でなければなりません"
-
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "OutputObject属性を消せません"
-
-#~ msgid "invalid attribute: %s"
-#~ msgstr "無効な属性です: %s"
-
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Python: I/Oオブジェクトの初期化エラー"
-
-#~ msgid "failed to change directory"
-#~ msgstr "辞書の変更に失敗しました"
-
-#~ msgid "expected 3-tuple as imp.find_module() result, but got %s"
-#~ msgstr "imp.find_module() が %s を返しました (期待値: 2 要素のタプル)"
-
-#~ msgid ""
-#~ "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
-#~ msgstr "impl.find_module() が %d 要素のタプルを返しました (期待値: 2)"
-
-#~ msgid "internal error: imp.find_module returned tuple with NULL"
-#~ msgstr "内部エラー: imp.find_module が NULL を含むタプルを返しました"
-
-#~ msgid "cannot delete vim.Dictionary attributes"
-#~ msgstr "vim.Dictionary属性は消せません"
-
-#~ msgid "cannot modify fixed dictionary"
-#~ msgstr "固定された辞書は変更できません"
-
-#~ msgid "cannot set attribute %s"
-#~ msgstr "属性 %s は設定できません"
-
-#~ msgid "hashtab changed during iteration"
-#~ msgstr "イテレーション中に hashtab が変更されました"
-
-#~ msgid "expected sequence element of size 2, but got sequence of size %d"
-#~ msgstr "シーケンスの要素数には 2 が期待されていましたが %d でした"
-
-#~ msgid "list constructor does not accept keyword arguments"
-#~ msgstr "リストのコンストラクタはキーワード引数を受け付けません"
-
-#~ msgid "list index out of range"
-#~ msgstr "リスト範囲外のインデックスです"
-
-#~ msgid "internal error: failed to get vim list item %d"
-#~ msgstr "内部エラー: vimのリスト要素 %d の取得に失敗しました"
-
-#~ msgid "failed to add item to list"
-#~ msgstr "リストへの要素追加に失敗しました"
-
-#~ msgid "internal error: no vim list item %d"
-#~ msgstr "内部エラー: vimのリスト要素 %d はありません"
-
-#~ msgid "internal error: failed to add item to list"
-#~ msgstr "内部エラー: リストへの要素追加に失敗しました"
-
-#~ msgid "cannot delete vim.List attributes"
-#~ msgstr "vim.List 属性は消せません"
-
-#~ msgid "cannot modify fixed list"
-#~ msgstr "固定されたリストは変更できません"
-
-#~ msgid "unnamed function %s does not exist"
-#~ msgstr "無名関数 %s は存在しません"
-
-#~ msgid "function %s does not exist"
-#~ msgstr "関数 %s がありません"
-
-#~ msgid "function constructor does not accept keyword arguments"
-#~ msgstr "関数のコンストラクタはキーワード引数を受け付けません"
-
-#~ msgid "failed to run function %s"
-#~ msgstr "関数 %s の実行に失敗しました"
-
-#~ msgid "problem while switching windows"
-#~ msgstr "ウィンドウを切換中に問題が発生しました"
-
-#~ msgid "unable to unset global option %s"
-#~ msgstr "グローバルオプション %s の設定解除はできません"
-
-#~ msgid "unable to unset option %s which does not have global value"
-#~ msgstr "グローバルな値の無いオプション %s の設定解除はできません"
-
-#~ msgid "attempt to refer to deleted tab page"
-#~ msgstr "削除されたタブを参照しようとしました"
-
-#~ msgid "no such tab page"
-#~ msgstr "そのようなタブページはありません"
-
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "削除されたウィンドウを参照しようとしました"
-
-#~ msgid "readonly attribute: buffer"
-#~ msgstr "読込専用属性: バッファー"
-
-#~ msgid "cursor position outside buffer"
-#~ msgstr "カーソル位置がバッファの外側です"
-
-#~ msgid "no such window"
-#~ msgstr "そのようなウィンドウはありません"
-
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "削除されたバッファを参照しようとしました"
-
-#~ msgid "failed to rename buffer"
-#~ msgstr "バッファ名の変更に失敗しました"
-
-#~ msgid "mark name must be a single character"
-#~ msgstr "マーク名は1文字のアルファベットでなければなりません"
-
-#~ msgid "expected vim.Buffer object, but got %s"
-#~ msgstr "vim.Bufferオブジェクトが期待されているのに %s でした"
-
-#~ msgid "failed to switch to buffer %d"
-#~ msgstr "指定されたバッファ %d への切り替えに失敗しました"
-
-#~ msgid "expected vim.Window object, but got %s"
-#~ msgstr "vim.Windowオブジェクトが期待されているのに %s でした"
-
-#~ msgid "failed to find window in the current tab page"
-#~ msgstr "現在のタブには指定されたウィンドウがありませんでした"
-
-#~ msgid "did not switch to the specified window"
-#~ msgstr "指定されたウィンドウに切り替えませんでした"
-
-#~ msgid "expected vim.TabPage object, but got %s"
-#~ msgstr "vim.TabPageオブジェクトが期待されているのに %s でした"
-
-#~ msgid "did not switch to the specified tab page"
-#~ msgstr "指定されたタブページに切り替えませんでした"
-
-#~ msgid "failed to run the code"
-#~ msgstr "コードの実行に失敗しました"
-
-#~ msgid "E858: Eval did not return a valid python object"
-#~ msgstr "E858: 式評価は有効なpythonオブジェクトを返しませんでした"
-
-#~ msgid "E859: Failed to convert returned python object to vim value"
-#~ msgstr "E859: 返されたpythonオブジェクトをvimの値に変換できませんでした"
-
-#~ msgid "unable to convert %s to vim dictionary"
-#~ msgstr "%s vimの辞書型に変換できません"
-
-#~ msgid "unable to convert %s to vim structure"
-#~ msgstr "%s をvimの構造体に変換できません"
-
-#~ msgid "internal error: NULL reference passed"
-#~ msgstr "内部エラー: NULL参照が渡されました"
-
-#~ msgid "internal error: invalid value type"
-#~ msgstr "内部エラー: 無効な値型です"
-
-#~ msgid ""
-#~ "Failed to set path hook: sys.path_hooks is not a list\n"
-#~ "You should now do the following:\n"
-#~ "- append vim.path_hook to sys.path_hooks\n"
-#~ "- append vim.VIM_SPECIAL_PATH to sys.path\n"
-#~ msgstr ""
-#~ "パスフックの設定に失敗しました: sys.path_hooks がリストではありません\n"
-#~ "すぐに下記を実施してください:\n"
-#~ "- vim.path_hooks を sys.path_hooks へ追加\n"
-#~ "- vim.VIM_SPECIAL_PATH を sys.path へ追加\n"
-
-#~ msgid ""
-#~ "Failed to set path: sys.path is not a list\n"
-#~ "You should now append vim.VIM_SPECIAL_PATH to sys.path"
-#~ msgstr ""
-#~ "パスの設定に失敗しました: sys.path がリストではありません\n"
-#~ "すぐに vim.VIM_SPECIAL_PATH を sys.path に追加してください"
+msgid ""
+"Failed to set path: sys.path is not a list\n"
+"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgstr ""
+"パスの設定に失敗しました: sys.path がリストではありません\n"
+"すぐに vim.VIM_SPECIAL_PATH を sys.path に追加してください"

From 2648c3579a4d274ee46f83db1bd63af38fa9e0a7 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 21:33:15 +0200
Subject: [PATCH 183/257] vim-patch:abd468ed0fbc

Updated runtime files

https://github.com/vim/vim/commit/abd468ed0fbcba391e7833feeaa7de3ced841455
---
 runtime/doc/eval.txt        |  3 ++-
 runtime/doc/if_ruby.txt     |  3 +++
 runtime/ftplugin/python.vim | 34 +++++++++++++++++++++++-----------
 3 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index ffcd373ada..f35754e979 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -7595,7 +7595,8 @@ timer_start({time}, {callback} [, {options}])
 
 		{options} is a dictionary.  Supported entries:
 		   "repeat"	Number of times to repeat calling the
-		   		callback.  -1 means forever.
+				callback.  -1 means forever.  When not present
+				the callback will be called once.
 
 		Example: >
 			func MyHandler(timer)
diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt
index 2474039d82..e02ace67de 100644
--- a/runtime/doc/if_ruby.txt
+++ b/runtime/doc/if_ruby.txt
@@ -54,6 +54,9 @@ Example Vim script: >
 	EOF
 	endfunction
 <
+To see what version of Ruby you have: >
+	:ruby print RUBY_VERSION
+<
 
 						*:rubydo* *:rubyd* *E265*
 :[range]rubyd[o] {cmd}	Evaluate Ruby command {cmd} for each line in the
diff --git a/runtime/ftplugin/python.vim b/runtime/ftplugin/python.vim
index df5dab8afc..546e3bd560 100644
--- a/runtime/ftplugin/python.vim
+++ b/runtime/ftplugin/python.vim
@@ -2,7 +2,7 @@
 " Language:	python
 " Maintainer:	James Sully <sullyj3@gmail.com>
 " Previous Maintainer: Johannes Zellner <johannes@zellner.org>
-" Last Change:	Wed, 29 June 2016
+" Last Change:	Tue, 09 October 2016
 " https://github.com/sullyj3/vim-ftplugin-python
 
 if exists("b:did_ftplugin") | finish | endif
@@ -22,15 +22,25 @@ setlocal omnifunc=pythoncomplete#Complete
 
 set wildignore+=*.pyc
 
-nnoremap <silent> <buffer> ]] :call <SID>Python_jump('n', '\v%$\|^(class\|def)>', 'W')<cr>
-nnoremap <silent> <buffer> [[ :call <SID>Python_jump('n', '\v^(class\|def)>', 'Wb')<cr>
-nnoremap <silent> <buffer> ]m :call <SID>Python_jump('n', '\v%$\|^\s*(class\|def)>', 'W')<cr>
-nnoremap <silent> <buffer> [m :call <SID>Python_jump('n', '\v^\s*(class\|def)>', 'Wb')<cr>
+let b:next_toplevel='\v%$\|^(class\|def\|async def)>'
+let b:prev_toplevel='\v^(class\|def\|async def)>'
+let b:next='\v%$\|^\s*(class\|def\|async def)>'
+let b:prev='\v^\s*(class\|def\|async def)>'
 
-xnoremap <silent> <buffer> ]] :call <SID>Python_jump('x', '\v%$\|^(class\|def)>', 'W')<cr>
-xnoremap <silent> <buffer> [[ :call <SID>Python_jump('x', '\v^(class\|def)>', 'Wb')<cr>
-xnoremap <silent> <buffer> ]m :call <SID>Python_jump('x', '\v%$\|^\s*(class\|def)>', 'W')<cr>
-xnoremap <silent> <buffer> [m :call <SID>Python_jump('x', '\v^\s*(class\|def)>', 'Wb')<cr>
+execute "nnoremap <silent> <buffer> ]] :call <SID>Python_jump('n', '". b:next_toplevel."', 'W')<cr>"
+execute "nnoremap <silent> <buffer> [[ :call <SID>Python_jump('n', '". b:prev_toplevel."', 'Wb')<cr>"
+execute "nnoremap <silent> <buffer> ]m :call <SID>Python_jump('n', '". b:next."', 'W')<cr>"
+execute "nnoremap <silent> <buffer> [m :call <SID>Python_jump('n', '". b:prev."', 'Wb')<cr>"
+
+execute "onoremap <silent> <buffer> ]] :call <SID>Python_jump('o', '". b:next_toplevel."', 'W')<cr>"
+execute "onoremap <silent> <buffer> [[ :call <SID>Python_jump('o', '". b:prev_toplevel."', 'Wb')<cr>"
+execute "onoremap <silent> <buffer> ]m :call <SID>Python_jump('o', '". b:next."', 'W')<cr>"
+execute "onoremap <silent> <buffer> [m :call <SID>Python_jump('o', '". b:prev."', 'Wb')<cr>"
+
+execute "xnoremap <silent> <buffer> ]] :call <SID>Python_jump('x', '". b:next_toplevel."', 'W')<cr>"
+execute "xnoremap <silent> <buffer> [[ :call <SID>Python_jump('x', '". b:prev_toplevel."', 'Wb')<cr>"
+execute "xnoremap <silent> <buffer> ]m :call <SID>Python_jump('x', '". b:next."', 'W')<cr>"
+execute "xnoremap <silent> <buffer> [m :call <SID>Python_jump('x', '". b:prev."', 'Wb')<cr>"
 
 if !exists('*<SID>Python_jump')
   fun! <SID>Python_jump(mode, motion, flags) range
@@ -56,8 +66,10 @@ if has("browsefilter") && !exists("b:browsefilter")
                 \ "All Files (*.*)\t*.*\n"
 endif
 
-" As suggested by PEP8.
-setlocal expandtab shiftwidth=4 softtabstop=4 tabstop=8
+if !exists("g:python_recommended_style") || g:python_recommended_style != 0
+    " As suggested by PEP8.
+    setlocal expandtab shiftwidth=4 softtabstop=4 tabstop=8
+endif
 
 " First time: try finding "pydoc".
 if !exists('g:pydoc_executable')

From 9f7e1cec054a727695891d97ed40355e8dc30baf Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 21:38:29 +0200
Subject: [PATCH 184/257] vim-patch:7e1479b86c59

Updated runtime files, Japanese translations.

https://github.com/vim/vim/commit/7e1479b86c590a66b63a274c079b7f18907d45a4
---
 runtime/doc/change.txt   |   1 +
 runtime/doc/filetype.txt |  11 ++++
 runtime/doc/repeat.txt   |   2 +-
 runtime/doc/syntax.txt   | 118 +++++++++++++++++++++++++--------------
 runtime/doc/tabpage.txt  |   6 ++
 5 files changed, 96 insertions(+), 42 deletions(-)

diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index e0974b103c..c669d1792d 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -833,6 +833,7 @@ The numbering of "\1", "\2" etc. is done based on which "\(" comes first in
 the pattern (going left to right).  When a parentheses group matches several
 times, the last one will be used for "\1", "\2", etc.  Example: >
   :s/\(\(a[a-d] \)*\)/\2/      modifies "aa ab x" to "ab x"
+The "\2" is for "\(a[a-d] \)".  At first it matches "aa ", secondly "ab ".
 
 When using parentheses in combination with '|', like in \([ab]\)\|\([cd]\),
 either the first or second pattern in parentheses did not match, so either
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index 4c7360c88e..c03100460d 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -565,6 +565,17 @@ These maps can be disabled with >
 	:let g:no_pdf_maps = 1
 <
 
+PYTHON						*ft-python-plugin* *PEP8*
+
+By default the following options are set, in accordance with PEP8: >
+
+	setlocal expandtab shiftwidth=4 softtabstop=4 tabstop=8
+
+To disable this behaviour, set the following variable in your vimrc: >
+	
+	let g:python_recommended_style = 0
+
+
 RPM SPEC						*ft-spec-plugin*
 
 Since the text for this plugin is rather long it has been put in a separate
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index b34d081ba9..bfe689fb13 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -152,7 +152,7 @@ q			Stops recording.
 :[addr]@:		Repeat last command-line.  First set cursor at line
 			[addr] (default is current line).
 
-							*:@@*
+:[addr]@							*:@@*
 :[addr]@@		Repeat the previous :@{0-9a-z"}.  First set cursor at
 			line [addr] (default is current line).
 
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 3b54f9f268..f94dba8696 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -2656,7 +2656,76 @@ your vimrc:							*g:filetype_r*
 
 RUBY						*ruby.vim* *ft-ruby-syntax*
 
-There are a number of options to the Ruby syntax highlighting.
+    Ruby: Operator highlighting		|ruby_operators|
+    Ruby: Whitespace errors		|ruby_space_errors|
+    Ruby: Folding			|ruby_fold| |ruby_foldable_groups|
+    Ruby: Reducing expensive operations	|ruby_no_expensive| |ruby_minlines|
+    Ruby: Spellchecking strings		|ruby_spellcheck_strings|
+
+						*ruby_operators*
+ Ruby: Operator highlighting ~
+
+Operators can be highlighted by defining "ruby_operators": >
+
+	:let ruby_operators = 1
+<
+						*ruby_space_errors*
+ Ruby: Whitespace errors ~
+
+Whitespace errors can be highlighted by defining "ruby_space_errors": >
+
+	:let ruby_space_errors = 1
+<
+This will highlight trailing whitespace and tabs preceded by a space character
+as errors.  This can be refined by defining "ruby_no_trail_space_error" and
+"ruby_no_tab_space_error" which will ignore trailing whitespace and tabs after
+spaces respectively.
+
+					*ruby_fold* *ruby_foldable_groups*
+ Ruby: Folding ~
+
+Folding can be enabled by defining "ruby_fold": >
+
+	:let ruby_fold = 1
+<
+This will set the value of 'foldmethod' to "syntax" locally to the current
+buffer or window, which will enable syntax-based folding when editing Ruby
+filetypes.
+
+						*ruby_foldable_groups*
+Default folding is rather detailed, i.e., small syntax units like "if", "do",
+"%w[]" may create corresponding fold levels.
+
+You can set "ruby_foldable_groups" to restrict which groups are foldable: >
+
+        :let ruby_foldable_groups = 'if case %'
+<
+The value is a space-separated list of keywords:
+
+    keyword       meaning ~
+    --------  ------------------------------------- ~
+    ALL        Most block syntax (default)
+    NONE       Nothing
+    if         "if" or "unless" block
+    def        "def" block
+    class      "class" block
+    module     "module" block
+    do         "do" block
+    begin      "begin" block
+    case       "case" block
+    for        "for", "while", "until" loops
+    {          Curly bracket block or hash literal
+    [          Array literal
+    %          Literal with "%" notation, e.g.: %w(STRING), %!STRING!
+    /          Regexp
+    string     String and shell command output (surrounded by ', ", `)
+    :          Symbol
+    #          Multiline comment
+    <<         Here documents
+    __END__    Source code after "__END__" directive
+
+						*ruby_no_expensive*
+ Ruby: Reducing expensive operations ~
 
 By default, the "end" keyword is colorized according to the opening statement
 of the block it closes.  While useful, this feature can be expensive; if you
@@ -2667,6 +2736,8 @@ you may want to turn it off by defining the "ruby_no_expensive" variable: >
 <
 In this case the same color will be used for all control keywords.
 
+						*ruby_minlines*
+
 If you do want this feature enabled, but notice highlighting errors while
 scrolling backwards, which are fixed when redrawing with CTRL-L, try setting
 the "ruby_minlines" variable to a value larger than 50: >
@@ -2676,48 +2747,13 @@ the "ruby_minlines" variable to a value larger than 50: >
 Ideally, this value should be a number of lines large enough to embrace your
 largest class or module.
 
-Highlighting of special identifiers can be disabled by removing the
-rubyIdentifier highlighting: >
+						*ruby_spellcheck_strings*
+ Ruby: Spellchecking strings ~
 
-	:hi link rubyIdentifier NONE
-<
-This will prevent highlighting of special identifiers like "ConstantName",
-"$global_var", "@@class_var", "@instance_var", "| block_param |", and
-":symbol".
+Ruby syntax will perform spellchecking of strings if you define
+"ruby_spellcheck_strings": >
 
-Significant methods of Kernel, Module and Object are highlighted by default.
-This can be disabled by defining "ruby_no_special_methods": >
-
-	:let ruby_no_special_methods = 1
-<
-This will prevent highlighting of important methods such as "require", "attr",
-"private", "raise" and "proc".
-
-Ruby operators can be highlighted. This is enabled by defining
-"ruby_operators": >
-
-	:let ruby_operators = 1
-<
-Whitespace errors can be highlighted by defining "ruby_space_errors": >
-
-	:let ruby_space_errors = 1
-<
-This will highlight trailing whitespace and tabs preceded by a space character
-as errors.  This can be refined by defining "ruby_no_trail_space_error" and
-"ruby_no_tab_space_error" which will ignore trailing whitespace and tabs after
-spaces respectively.
-
-Folding can be enabled by defining "ruby_fold": >
-
-	:let ruby_fold = 1
-<
-This will set the 'foldmethod' option to "syntax" and allow folding of
-classes, modules, methods, code blocks, heredocs and comments.
-
-Folding of multiline comments can be disabled by defining
-"ruby_no_comment_fold": >
-
-	:let ruby_no_comment_fold = 1
+	:let ruby_spellcheck_strings = 1
 <
 
 SCHEME						*scheme.vim* *ft-scheme-syntax*
diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt
index c299d43927..c9635a9f6f 100644
--- a/runtime/doc/tabpage.txt
+++ b/runtime/doc/tabpage.txt
@@ -195,6 +195,12 @@ Other commands:
 :tabs		List the tab pages and the windows they contain.
 		Shows a ">" for the current window.
 		Shows a "+" for modified buffers.
+		For example:
+			Tab page 1 ~
+			  + tabpage.txt ~
+			    ex_docmd.c ~
+			Tab page 2 ~
+			>   main.c ~
 
 
 REORDERING TAB PAGES:

From 0d565d62ae857fd8e8f8c7f1457579156a76968d Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 21:40:21 +0200
Subject: [PATCH 185/257] vim-patch:220adb1e9f9e

A few more runtime updates.

https://github.com/vim/vim/commit/220adb1e9f9e0b27d28185167d2730bf2f93057d
---
 runtime/doc/pattern.txt | 4 ++--
 runtime/syntax/bib.vim  | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index 1d0f42c222..c951a58734 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -354,8 +354,8 @@ For starters, read chapter 27 of the user manual |usr_27.txt|.
 				*/\%#=* *two-engines* *NFA*
 Vim includes two regexp engines:
 1. An old, backtracking engine that supports everything.
-2. A new, NFA engine that works much faster on some patterns, but does not
-   support everything.
+2. A new, NFA engine that works much faster on some patterns, possibly slower
+   on some patterns.
 
 Vim will automatically select the right engine for you.  However, if you run
 into a problem or want to specifically select one engine or the other, you can
diff --git a/runtime/syntax/bib.vim b/runtime/syntax/bib.vim
index f96553ec8d..f2b99e961b 100644
--- a/runtime/syntax/bib.vim
+++ b/runtime/syntax/bib.vim
@@ -2,7 +2,7 @@
 " Language:	BibTeX (bibliographic database format for (La)TeX)
 " Maintainer:	Bernd Feige <Bernd.Feige@gmx.net>
 " Filenames:	*.bib
-" Last Change:	2016 May 31
+" Last Change:	2016 Sep 12
 
 " Thanks to those who pointed out problems with this file or supplied fixes!
 
@@ -71,7 +71,7 @@ syn keyword bibNSEntryKw contained	mrclass mrnumber mrreviewer fjournal coden
 
 " Clusters
 " ========
-syn cluster bibVarContents	contains=bibUnescapedSpecial,bibBrace,bibParen
+syn cluster bibVarContents	contains=bibUnescapedSpecial,bibBrace,bibParen,bibMath
 " This cluster is empty but things can be added externally:
 "syn cluster bibCommentContents
 
@@ -81,6 +81,7 @@ syn match bibUnescapedSpecial contained /[^\\][%&]/hs=s+1
 syn match bibKey contained /\s*[^ \t}="]\+,/hs=s,he=e-1 nextgroup=bibField
 syn match bibVariable contained /[^{}," \t=]/
 syn region bibComment start=/./ end=/^\s*@/me=e-1 contains=@bibCommentContents nextgroup=bibEntry
+syn region bibMath contained start=/\$/ end=/\$/ skip=/\(\\\$\)/
 syn region bibQuote contained start=/"/ end=/"/ skip=/\(\\"\)/ contains=@bibVarContents
 syn region bibBrace contained start=/{/ end=/}/ skip=/\(\\[{}]\)/ contains=@bibVarContents
 syn region bibParen contained start=/(/ end=/)/ skip=/\(\\[()]\)/ contains=@bibVarContents

From 00bdf9ae83086b8e2204332cd32f1a615d8a6528 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 22:25:44 +0200
Subject: [PATCH 186/257] vim-patch:8.0.0000

https://github.com/vim/vim/commit/bb76f24af2010943387ce696a7092175b4ecccf2

vim-patch:8.0.0001

Problem:    Intro screen still mentions version7. (Paul)
Solution:   Change it to version8.

https://github.com/vim/vim/commit/6401024869dcd722ee1b98b4ba58e6caa215201b
---
 runtime/doc/syntax.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index f94dba8696..123ae0cc72 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -2692,7 +2692,6 @@ This will set the value of 'foldmethod' to "syntax" locally to the current
 buffer or window, which will enable syntax-based folding when editing Ruby
 filetypes.
 
-						*ruby_foldable_groups*
 Default folding is rather detailed, i.e., small syntax units like "if", "do",
 "%w[]" may create corresponding fold levels.
 

From becde1745aa2ee84158b26ec14f14e1941fcc7d8 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 22:37:53 +0200
Subject: [PATCH 187/257] vim-patch:8.0.0002

Problem:    The netrw plugin does not work.
Solution:   Make it accept version 8.0.

https://github.com/vim/vim/commit/9e1e7afc1f29b67fe3721442b49af3b20644a3ee

vim-patch:b56e7ff0dbbf

Update translations for intro page.

https://github.com/vim/vim/commit/b56e7ff0dbbfa85361bdbc5b4a86ff8b57a7acbb
---
 runtime/autoload/netrw.vim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index de85844d5d..76485c2f38 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -22,8 +22,8 @@
 if &cp || exists("g:loaded_netrw")
   finish
 endif
-" netrw requires vim having patch 213; netrw will benefit from vim's having patch#656, too
-if v:version < 704 || !has("patch213")
+" netrw requires vim having patch 7.4.213; netrw will benefit from vim's having patch#656, too
+if v:version < 704 || (v:version == 704 && !has("patch213"))
  if !exists("s:needpatch213")
   unsilent echomsg "***sorry*** this version of netrw requires vim v7.4 with patch 213"
  endif

From 06879e2e890dd6cb7bbeb4ce6b78d0cf41500ab5 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 22:47:40 +0200
Subject: [PATCH 188/257] vim-patch:d07969093a9b

Updated runtime files.

https://github.com/vim/vim/commit/d07969093a9b3051511c478d71c36de6fc33c0d6
---
 runtime/autoload/zip.vim     | 70 ++++++++++++++++++++++++++++++++----
 runtime/doc/options.txt      |  6 ++--
 runtime/doc/pi_zip.txt       | 28 ++++++++++++++-
 runtime/doc/syntax.txt       |  4 +--
 runtime/filetype.vim         |  5 ++-
 runtime/plugin/zipPlugin.vim |  8 ++---
 runtime/syntax/python.vim    | 34 +++++++++---------
 7 files changed, 120 insertions(+), 35 deletions(-)

diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim
index 687500ebe3..824af01fe8 100644
--- a/runtime/autoload/zip.vim
+++ b/runtime/autoload/zip.vim
@@ -1,7 +1,7 @@
 " zip.vim: Handles browsing zipfiles
 "            AUTOLOAD PORTION
-" Date:		Jul 02, 2013
-" Version:	27
+" Date:		Sep 13, 2016
+" Version:	28
 " Maintainer:	Charles E Campbell <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
 " License:	Vim License  (see vim's :help license)
 " Copyright:    Copyright (C) 2005-2013 Charles E. Campbell {{{1
@@ -20,10 +20,10 @@
 if &cp || exists("g:loaded_zip")
  finish
 endif
-let g:loaded_zip= "v27"
+let g:loaded_zip= "v28"
 if v:version < 702
  echohl WarningMsg
- echo "***warning*** this version of zip needs vim 7.2"
+ echo "***warning*** this version of zip needs vim 7.2 or later"
  echohl Normal
  finish
 endif
@@ -53,6 +53,9 @@ endif
 if !exists("g:zip_unzipcmd")
  let g:zip_unzipcmd= "unzip"
 endif
+if !exists("g:zip_extractcmd")
+ let g:zip_extractcmd= g:zip_unzipcmd
+endif
 
 " ----------------
 "  Functions: {{{1
@@ -136,8 +139,10 @@ fun! zip#Browse(zipfile)
    return
   endif
 
+  " Maps associated with zip plugin
   setlocal noma nomod ro
-  noremap <silent> <buffer> <cr> :call <SID>ZipBrowseSelect()<cr>
+  noremap <silent> <buffer> <cr>	:call <SID>ZipBrowseSelect()<cr>
+  noremap <silent> <buffer> x		:call zip#Extract()<cr>
 
   let &report= repkeep
 "  call Dret("zip#Browse")
@@ -204,6 +209,15 @@ fun! zip#Read(fname,mode)
   endif
 "  call Decho("zipfile<".zipfile.">")
 "  call Decho("fname  <".fname.">")
+  " sanity check
+  if !executable(substitute(g:zip_unzipcmd,'\s\+.*$','',''))
+   redraw!
+   echohl Error | echo "***error*** (zip#Read) sorry, your system doesn't appear to have the ".g:zip_unzipcmd." program" | echohl None
+"   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
+   let &report= repkeep
+"   call Dret("zip#Write")
+   return
+  endif
 
   " the following code does much the same thing as
   "   exe "keepj sil! r! ".g:zip_unzipcmd." -p -- ".s:Escape(zipfile,1)." ".s:Escape(fnameescape(fname),1)
@@ -236,9 +250,9 @@ fun! zip#Write(fname)
   set report=10
 
   " sanity checks
-  if !executable(g:zip_zipcmd)
+  if !executable(substitute(g:zip_zipcmd,'\s\+.*$','',''))
    redraw!
-   echohl Error | echo "***error*** (zip#Write) sorry, your system doesn't appear to have the zip pgm" | echohl None
+   echohl Error | echo "***error*** (zip#Write) sorry, your system doesn't appear to have the ".g:zip_zipcmd." program" | echohl None
 "   call inputsave()|call input("Press <cr> to continue")|call inputrestore()
    let &report= repkeep
 "   call Dret("zip#Write")
@@ -344,6 +358,48 @@ fun! zip#Write(fname)
 "  call Dret("zip#Write")
 endfun
 
+" ---------------------------------------------------------------------
+" zip#Extract: extract a file from a zip archive {{{2
+fun! zip#Extract()
+"  call Dfunc("zip#Extract()")
+
+  let repkeep= &report
+  set report=10
+  let fname= getline(".")
+"  call Decho("fname<".fname.">")
+
+  " sanity check
+  if fname =~ '^"'
+   let &report= repkeep
+"   call Dret("zip#Extract")
+   return
+  endif
+  if fname =~ '/$'
+   redraw!
+   echohl Error | echo "***error*** (zip#Extract) Please specify a file, not a directory" | echohl None
+   let &report= repkeep
+"   call Dret("zip#Extract")
+   return
+  endif
+
+  " extract the file mentioned under the cursor
+"  call Decho("system(".g:zip_extractcmd." ".shellescape(b:zipfile)." ".shellescape(shell).")")
+  call system(g:zip_extractcmd." ".shellescape(b:zipfile)." ".shellescape(shell))
+"  call Decho("zipfile<".b:zipfile.">")
+  if v:shell_error != 0
+   echohl Error | echo "***error*** ".g:zip_extractcmd." ".b:zipfile." ".fname.": failed!" | echohl NONE
+  elseif !filereadable(fname)
+   echohl Error | echo "***error*** attempted to extract ".fname." but it doesn't appear to be present!"
+  else
+   echo "***note*** successfully extracted ".fname
+  endif
+
+  " restore option
+  let &report= repkeep
+
+"  call Dret("zip#Extract")
+endfun
+
 " ---------------------------------------------------------------------
 " s:Escape: {{{2
 fun! s:Escape(fname,isfilt)
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index cef01eb27b..266ceb9136 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2092,7 +2092,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	uhex		Show unprintable characters hexadecimal as <xx>
 			instead of using ^C and ~C.
 
-	When neither "lastline" or "truncate" is included, a last line that
+	When neither "lastline" nor "truncate" is included, a last line that
 	doesn't fit is replaced with "@" lines.
 
 						*'eadirection'* *'ead'*
@@ -4889,7 +4889,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 	   ordering.  This is for preferences to overrule or add to the 
 	   distributed defaults or system-wide settings (rarely needed).
 
-	More entries are added when using |packages|.
+	More entries are added when using |packages|.  If it gets very long
+	then `:set rtp` will be truncated, use `:echo &rtp` to see the full
+	string.
 
 	Note that, unlike 'path', no wildcards like "**" are allowed.  Normal
 	wildcards are allowed, but can significantly slow down searching for
diff --git a/runtime/doc/pi_zip.txt b/runtime/doc/pi_zip.txt
index 64f0be1a08..c20bda1fa1 100644
--- a/runtime/doc/pi_zip.txt
+++ b/runtime/doc/pi_zip.txt
@@ -6,7 +6,7 @@
 
 Author:  Charles E. Campbell  <NdrOchip@ScampbellPfamily.AbizM>
 	  (remove NOSPAM from Campbell's email first)
-Copyright: Copyright (C) 2005-2012 Charles E Campbell	 *zip-copyright*
+Copyright: Copyright (C) 2005-2015 Charles E Campbell	 *zip-copyright*
 	The VIM LICENSE (see |copyright|) applies to the files in this
 	package, including zipPlugin.vim, zip.vim, and pi_zip.vim.  except use
 	"zip.vim" instead of "VIM".  Like anything else that's free, zip.vim
@@ -33,6 +33,9 @@ Copyright: Copyright (C) 2005-2012 Charles E Campbell	 *zip-copyright*
    also write to the file.  Currently, one may not make a new file in
    zip archives via the plugin.
 
+								*zip-x*
+   x : may extract a listed file when the cursor is atop it
+
    OPTIONS
 
    							*g:zip_nomax*
@@ -60,6 +63,11 @@ Copyright: Copyright (C) 2005-2012 Charles E Campbell	 *zip-copyright*
    It's used during the writing (updating) of a file already in a zip
    file; by default: >
    	let g:zip_zipcmd= "zip"
+<
+							*g:zip_extractcmd*
+   This option specifies the program (and any options needed) used to
+   extract a file from a zip archive.  By default, >
+   	let g:zip_extractcmd= g:zip_unzipcmd
 <
    PREVENTING LOADING~
 
@@ -83,8 +91,26 @@ Copyright: Copyright (C) 2005-2012 Charles E Campbell	 *zip-copyright*
    One can simply extend this line to accommodate additional extensions that
    should be treated as zip files.
 
+   Alternatively, one may change *g:zipPlugin_ext* in one's .vimrc.
+   Currently (11/30/15) it holds: >
+
+	let g:zipPlugin_ext= '*.zip,*.jar,*.xpi,*.ja,*.war,*.ear,*.celzip,
+       \ *.oxt,*.kmz,*.wsz,*.xap,*.docx,*.docm,*.dotx,*.dotm,*.potx,*.potm,
+       \ *.ppsx,*.ppsm,*.pptx,*.pptm,*.ppam,*.sldx,*.thmx,*.xlam,*.xlsx,*.xlsm,
+       \ *.xlsb,*.xltx,*.xltm,*.xlam,*.crtx,*.vdw,*.glox,*.gcsx,*.gqsx,*.epub'
+
 ==============================================================================
 4. History							*zip-history* {{{1
+   v28 Oct 08, 2014 * changed the sanity checks for executables to reflect
+   		      the command actually to be attempted in zip#Read()
+		      and zip#Write()
+		    * added the extraction of a file capability
+       Nov 30, 2015 * added *.epub to the |g:zipPlugin_ext| list
+       Sep 13, 2016 * added *.apk to the |g:zipPlugin_ext| list and
+		      sorted the suffices.
+   v27 Jul 02, 2013 * sanity check: zipfile must have "PK" as its first
+		      two bytes.
+		    * modified to allow zipfile: entries in quickfix lists
    v26 Nov 15, 2012 * (Jason Spiro) provided a lot of new extensions that
 		      are synonyms for .zip
    v25 Jun 27, 2011 * using keepj with unzip -Z
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 123ae0cc72..e3da736489 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -3496,8 +3496,8 @@ SYNTAX ISKEYWORD SETTING				*:syn-iskeyword*
 	and also determines where |:syn-keyword| will be checked for a new
 	match.
 
-	It is recommended when writing syntax files, to use this command
-	to the correct value for the specific syntax language and not change
+	It is recommended when writing syntax files, to use this command to
+	set the correct value for the specific syntax language and not change
 	the 'iskeyword' option.
 
 DEFINING KEYWORDS					*:syn-keyword*
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 43155aa27e..d2b770d3af 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Aug 26
+" Last Change:	2016 Sep 15
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -672,6 +672,9 @@ au BufNewFile,BufRead *.dts,*.dtsi		setf dts
 " EDIF (*.edf,*.edif,*.edn,*.edo)
 au BufNewFile,BufRead *.ed\(f\|if\|n\|o\)	setf edif
 
+" EditorConfig (close enough to dosini)
+au BufNewFile,BufRead .editorconfig		setf dosini
+
 " Embedix Component Description
 au BufNewFile,BufRead *.ecd			setf ecd
 
diff --git a/runtime/plugin/zipPlugin.vim b/runtime/plugin/zipPlugin.vim
index e9bd0dc4bd..c04d5344b1 100644
--- a/runtime/plugin/zipPlugin.vim
+++ b/runtime/plugin/zipPlugin.vim
@@ -1,9 +1,9 @@
 " zipPlugin.vim: Handles browsing zipfiles
 "            PLUGIN PORTION
-" Date:			Jun 07, 2013
+" Date:			Sep 13, 2016
 " Maintainer:	Charles E Campbell <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
 " License:		Vim License  (see vim's :help license)
-" Copyright:    Copyright (C) 2005-2013 Charles E. Campbell {{{1
+" Copyright:    Copyright (C) 2005-2016 Charles E. Campbell {{{1
 "               Permission is hereby granted to use and distribute this code,
 "               with or without modifications, provided that this copyright
 "               notice is copied with it. Like anything else that's free,
@@ -20,14 +20,14 @@
 if &cp || exists("g:loaded_zipPlugin")
  finish
 endif
-let g:loaded_zipPlugin = "v27"
+let g:loaded_zipPlugin = "v28"
 let s:keepcpo          = &cpo
 set cpo&vim
 
 " ---------------------------------------------------------------------
 " Options: {{{1
 if !exists("g:zipPlugin_ext")
- let g:zipPlugin_ext= '*.zip,*.jar,*.xpi,*.ja,*.war,*.ear,*.celzip,*.oxt,*.kmz,*.wsz,*.xap,*.docx,*.docm,*.dotx,*.dotm,*.potx,*.potm,*.ppsx,*.ppsm,*.pptx,*.pptm,*.ppam,*.sldx,*.thmx,*.xlam,*.xlsx,*.xlsm,*.xlsb,*.xltx,*.xltm,*.xlam,*.crtx,*.vdw,*.glox,*.gcsx,*.gqsx'
+ let g:zipPlugin_ext='*.apk,*.celzip,*.crtx,*.docm,*.docx,*.dotm,*.dotx,*.ear,*.epub,*.gcsx,*.glox,*.gqsx,*.ja,*.jar,*.kmz,*.oxt,*.potm,*.potx,*.ppam,*.ppsm,*.ppsx,*.pptm,*.pptx,*.sldx,*.thmx,*.vdw,*.war,*.wsz,*.xap,*.xlam,*.xlam,*.xlsb,*.xlsm,*.xlsx,*.xltm,*.xltx,*.xpi,*.zip'
 endif
 
 " ---------------------------------------------------------------------
diff --git a/runtime/syntax/python.vim b/runtime/syntax/python.vim
index 38bea3eefe..f258184b52 100644
--- a/runtime/syntax/python.vim
+++ b/runtime/syntax/python.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Python
 " Maintainer:	Zvezdan Petkovic <zpetkovic@acm.org>
-" Last Change:	2016 Aug 14
+" Last Change:	2016 Sep 14
 " Credits:	Neil Schemenauer <nas@python.ca>
 "		Dmitry Vasiliev
 "
@@ -88,14 +88,14 @@ syn keyword pythonAsync		async await
 " followed by decorator name, optional parenthesized list of arguments,
 " and the next line with either def, class, or another decorator.
 syn match   pythonDecorator
-  \ "\%(\%(^\s*\)\%(\%(>>>\|\.\.\.\)\s\+\)\=\)\zs@\%(\s*\h\%(\w\|\.\)*\%(([^)]*)\)\=\s*\n\s*\%(\.\.\.\s\+\)\=\%(@\s*\h\|\%(def\|class\)\s\+\)\)\@="
+  \ "\%(\%(^\s*\)\%(\%(>>>\|\.\.\.\)\s\+\)\=\)\zs@\%(\s*\h\%(\w\|\.\)*\s*\%((\_\s\{-}[^)]\_.\{-})\s*\)\=\%(#.*\)\=\n\s*\%(\.\.\.\s\+\)\=\%(@\s*\h\|\%(def\|class\)\s\+\)\)\@="
   \ display nextgroup=pythonDecoratorName skipwhite
 
 " A dot must be allowed because of @MyClass.myfunc decorators.
 " It must be preceded by a decorator symbol and on a separate line from
 " a function/class it decorates.
 syn match   pythonDecoratorName
-  \ "\%(@\s*\)\@<=\h\%(\w\|\.\)*\%(\%(([^)]*)\)\=\s*\n\)\@="
+  \ "\%(@\s*\)\@<=\h\%(\w\|\.\)*\%(\s*\%((\_\s\{-}[^)]\_.\{-})\s*\)\=\%(#.*\)\=\n\)\@="
   \ contained display nextgroup=pythonFunction skipnl
 
 " The zero-length non-grouping match of def or class before the function
@@ -289,43 +289,41 @@ endif
 " Sync at the beginning of class, function, or method definition.
 syn sync match pythonSync grouphere NONE "^\s*\%(def\|class\)\s\+\h\w*\s*("
 
-
 " The default highlight links.  Can be overridden later.
-hi def link pythonStatement	Statement
-hi def link pythonConditional	Conditional
+hi def link pythonStatement		Statement
+hi def link pythonConditional		Conditional
 hi def link pythonRepeat		Repeat
 hi def link pythonOperator		Operator
-hi def link pythonException	Exception
+hi def link pythonException		Exception
 hi def link pythonInclude		Include
-hi def link pythonAsync		Statement
-hi def link pythonDecorator	Define
-hi def link pythonDecoratorName	Function
+hi def link pythonAsync			Statement
+hi def link pythonDecorator		Define
+hi def link pythonDecoratorName		Function
 hi def link pythonFunction		Function
 hi def link pythonComment		Comment
-hi def link pythonTodo		Todo
+hi def link pythonTodo			Todo
 hi def link pythonString		String
-hi def link pythonRawString	String
+hi def link pythonRawString		String
 hi def link pythonQuotes		String
-hi def link pythonTripleQuotes	pythonQuotes
+hi def link pythonTripleQuotes		pythonQuotes
 hi def link pythonEscape		Special
 if !exists("python_no_number_highlight")
   hi def link pythonNumber		Number
 endif
 if !exists("python_no_builtin_highlight")
-  hi def link pythonBuiltin	Function
+  hi def link pythonBuiltin		Function
 endif
 if !exists("python_no_exception_highlight")
-  hi def link pythonExceptions	Structure
+  hi def link pythonExceptions		Structure
 endif
 if exists("python_space_error_highlight")
-  hi def link pythonSpaceError	Error
+  hi def link pythonSpaceError		Error
 endif
 if !exists("python_no_doctest_highlight")
-  hi def link pythonDoctest	Special
+  hi def link pythonDoctest		Special
   hi def link pythonDoctestValue	Define
 endif
 
-
 let b:current_syntax = "python"
 
 let &cpo = s:cpo_save

From 2e64752250c89623ff5d6dc54e8a54038f32d78f Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 23:09:56 +0200
Subject: [PATCH 189/257] vim-patch:64d8e25bf6ef

Updated runtime files.

https://github.com/vim/vim/commit/64d8e25bf6efe5f18b032563521c3ce278c316ab

Closes #6611
---
 runtime/colors/koehler.vim |  3 ++-
 runtime/doc/autocmd.txt    | 16 +++++++++++-----
 runtime/doc/eval.txt       |  2 +-
 runtime/doc/if_pyth.txt    | 10 +++++++++-
 runtime/doc/message.txt    |  1 +
 runtime/doc/options.txt    |  9 +++++----
 runtime/doc/various.txt    |  2 +-
 runtime/ftplugin/scala.vim |  2 --
 runtime/syntax/awk.vim     | 12 +++++-------
 runtime/syntax/help.vim    |  4 +++-
 runtime/syntax/prolog.vim  |  6 ++++--
 runtime/syntax/uil.vim     |  4 +++-
 12 files changed, 45 insertions(+), 26 deletions(-)

diff --git a/runtime/colors/koehler.vim b/runtime/colors/koehler.vim
index a36f9f6972..250472a162 100644
--- a/runtime/colors/koehler.vim
+++ b/runtime/colors/koehler.vim
@@ -2,7 +2,7 @@
 " vim: tw=0 ts=4 sw=4
 " Vim color file
 " Maintainer:	Ron Aaron <ron@ronware.org>
-" Last Change:	2013 May 23
+" Last Change:	2016 Sep 04
 
 hi clear
 set background=dark
@@ -45,6 +45,7 @@ hi TabLineFill	  term=bold,reverse  cterm=bold ctermfg=lightblue ctermbg=white g
 hi TabLineSel	  term=reverse	ctermfg=white ctermbg=lightblue guifg=white guibg=blue
 hi Underlined	  term=underline cterm=bold,underline ctermfg=lightblue guifg=lightblue gui=bold,underline
 hi Ignore		  ctermfg=black ctermbg=black guifg=black guibg=black
+hi EndOfBuffer	  term=bold  cterm=bold  ctermfg=darkred guifg=#cc0000 gui=bold
 hi link IncSearch		Visual
 hi link String			Constant
 hi link Character		Constant
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index e7c7b0d71a..77015d35ee 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -422,8 +422,8 @@ BufUnload			Before unloading a buffer.  This is when the
 				NOTE: When this autocommand is executed, the
 				current buffer "%" may be different from the
 				buffer being unloaded "<afile>".
-				Don't change to another buffer, it will cause
-				problems.
+				Don't change to another buffer or window, it
+				will cause problems!
 				When exiting and v:dying is 2 or more this
 				event is not triggered.
 							*BufWinEnter*
@@ -794,7 +794,9 @@ QuickFixCmdPre			Before a quickfix command is run (|:make|,
 				|:vimgrepadd|, |:lvimgrepadd|, |:cscope|,
 				|:cfile|, |:cgetfile|, |:caddfile|, |:lfile|,
 				|:lgetfile|, |:laddfile|, |:helpgrep|,
-				|:lhelpgrep|).
+				|:lhelpgrep|, |:cexpr|, |:cgetexpr|,
+				|:caddexpr|, |:cbuffer|, |:cgetbuffer|,
+				|:caddbuffer|).
 				The pattern is matched against the command
 				being run.  When |:grep| is used but 'grepprg'
 				is set to "internal" it still matches "grep".
@@ -1086,6 +1088,9 @@ Note that for all systems the '/' character is used for path separator (even
 Windows). This was done because the backslash is difficult to use in a pattern
 and to make the autocommands portable across different systems.
 
+It is possible to use |pattern| items, but they may not work as expected,
+because of the translation done for the above.
+
 							*autocmd-changes*
 Matching with the pattern is done when an event is triggered.  Changing the
 buffer name in one of the autocommands, or even deleting the buffer, does not
@@ -1184,11 +1189,12 @@ name!
 				different from existing {event} names, as this
 				most likely will not do what you intended.
 
-						*:augroup-delete* *E367* *W19*
+					*:augroup-delete* *E367* *W19* *E936*
 :aug[roup]! {name}		Delete the autocmd group {name}.  Don't use
 				this if there is still an autocommand using
 				this group!  You will get a warning if doing
-				it anyway.
+				it anyway. when the group is the current group
+				you will get error E936.
 
 To enter autocommands for a specific group, use this method:
 1. Select the group with ":augroup {name}".
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index f35754e979..d65783cea0 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -107,7 +107,7 @@ To test for a non-empty string, use empty(): >
 							*non-zero-arg*
 Function arguments often behave slightly different from |TRUE|: If the
 argument is present and it evaluates to a non-zero Number, |v:true| or a
-non-empty String, then the value is considere to be TRUE.
+non-empty String, then the value is considered to be TRUE.
 Note that " " and "0" are also non-empty strings, thus cause the mode to be
 cleared.  A List, Dictionary or Float is not a Number or String, thus
 evaluates to FALSE.
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index 6321175420..8d6a3e1cfa 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -48,7 +48,11 @@ Example: >
 			print 'EAT ME'
 	EOF
 	endfunction
-<
+
+To see what version of Python you have: >
+	:python import sys
+	:python print(sys.version)
+
 Note: Python is very sensitive to the indenting.  Make sure the "class" line
 and "EOF" do not have any indent.
 
@@ -693,6 +697,10 @@ The `:py3` and `:python3` commands work similar to `:python`.  A simple check
 if the `:py3` command is working: >
 	:py3 print("Hello")
 <							*:py3file*
+To see what version of Python you have: >
+	:py3 import sys
+	:py3 print(sys.version)
+
 The `:py3file` command works similar to `:pyfile`.
 							*:py3do*
 The `:py3do` command works similar to `:pydo`.
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index 5c2dddc8b3..e619cfde30 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -39,6 +39,7 @@ back.
 Note: If the output has been stopped with "q" at the more prompt, it will only
 be displayed up to this point.
 The previous command output is cleared when another command produces output.
+The "g<" output is not redirected.
 
 If you want to find help on a specific (error) message, use the ID at the
 start of the message.  For example, to get help on the message: >
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 266ceb9136..7ca6612225 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3920,10 +3920,11 @@ A jump table for the options with a short description can be found at |Q_op|.
 			global
 	Changes the special characters that can be used in search patterns.
 	See |pattern|.
-	NOTE: To avoid portability problems with using patterns, always keep
-	this option at the default "on".  Only switch it off when working with
-	old Vi scripts.  In any other situation write patterns that work when
-	'magic' is on.  Include "\M" when you want to |/\M|.
+	WARNING: Switching this option off most likely breaks plugins!  That
+	is because many patterns assume it's on and will fail when it's off.
+	Only switch it off when working with old Vi scripts.  In any other
+	situation write patterns that work when 'magic' is on.  Include "\M"
+	when you want to |/\M|.
 
 						*'makeef'* *'mef'*
 'makeef' 'mef'		string	(default: "")
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index cee13c9ee8..1a93a4504f 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -369,7 +369,7 @@ N  *+statusline*	Options 'statusline', 'rulerformat' and special
 			formats of 'titlestring' and 'iconstring'
 N  *+syntax*		Syntax highlighting |syntax|
 N  *+tablineat*		'tabline' option recognizing %@Func@ items.
-N  *+tag_binary*	binary searching in tags file |tag-binary-search|
+T  *+tag_binary*	binary searching in tags file |tag-binary-search|
 N  *+tag_old_static*	old method for static tags |tag-old-static|
 m  *+tag_any_white*	any white space allowed in tags file |tag-any-white|
 B  *+termguicolors*	24-bit color in xterm-compatible terminals support
diff --git a/runtime/ftplugin/scala.vim b/runtime/ftplugin/scala.vim
index e409950107..18e16f1d5b 100644
--- a/runtime/ftplugin/scala.vim
+++ b/runtime/ftplugin/scala.vim
@@ -32,6 +32,4 @@ setlocal includeexpr='substitute(v:fname,"\\.","/","g")'
 setlocal path+=src/main/scala,src/test/scala
 setlocal suffixesadd=.scala
 
-compiler sbt
-
 " vim:set sw=2 sts=2 ts=8 et:
diff --git a/runtime/syntax/awk.vim b/runtime/syntax/awk.vim
index ae0f217580..7c0682ce9f 100644
--- a/runtime/syntax/awk.vim
+++ b/runtime/syntax/awk.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	awk, nawk, gawk, mawk
 " Maintainer:	Antonio Colombo <azc100@gmail.com>
-" Last Change:	2016 Jul 15
+" Last Change:	2016 Sep 05
 
 " AWK  ref. is: Alfred V. Aho, Brian W. Kernighan, Peter J. Weinberger
 " The AWK Programming Language, Addison-Wesley, 1988
@@ -71,6 +71,10 @@ syn keyword awkVariables	ARGC ARGV ARGIND ENVIRON ERRNO FILENAME
 syn keyword awkVariables	FNR NF FUNCTAB NR PROCINFO RLENGTH RSTART 
 syn keyword awkVariables	RT SYMTAB
 
+" Arithmetic operators: +, and - take care of ++, and --
+syn match   awkOperator		"+\|-\|\*\|/\|%\|="
+syn match   awkOperator		"+=\|-=\|\*=\|/=\|%="
+syn match   awkOperator		"\^\|\^="
 
 " Octal format character.
 syn match   awkSpecialCharacter display contained "\\[0-7]\{1,3\}"
@@ -124,11 +128,6 @@ syn case match
 
 "syn match  awkIdentifier	"\<[a-zA-Z_][a-zA-Z0-9_]*\>"
 
-" Arithmetic operators: +, and - take care of ++, and --
-syn match   awkOperator	"+\|-\|\*\|/\|%\|="
-syn match   awkOperator	"+=\|-=\|\*=\|/=\|%="
-syn match   awkOperator	"^\|^="
-
 " Comparison expressions.
 syn match   awkExpression	"==\|>=\|=>\|<=\|=<\|\!="
 syn match   awkExpression	"\~\|\!\~"
@@ -167,7 +166,6 @@ syn region awkArray		transparent start="\[" end="\]" contains=awkArray,awkArrayE
 syn sync ccomment awkArray maxlines=10
 
 " Define the default highlighting.
-" Only used when an item doesn't have highlighting yet
 hi def link awkConditional	Conditional
 hi def link awkFunction		Function
 hi def link awkRepeat		Repeat
diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim
index 41bb0b1938..d23aab9f7f 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:	2016 Apr 01
+" Last Change:	2016 Sep 02
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -50,6 +50,7 @@ else
   syn match helpIgnore		"." contained
 endif
 syn keyword helpNote		note Note NOTE note: Note: NOTE: Notes Notes:
+syn keyword helpWarning		WARNING: Warning:
 syn match helpSpecial		"\<N\>"
 syn match helpSpecial		"\<N\.$"me=e-1
 syn match helpSpecial		"\<N\.\s"me=e-2
@@ -161,6 +162,7 @@ hi def link helpExample		Comment
 hi def link helpOption		Type
 hi def link helpSpecial		Special
 hi def link helpNote		Todo
+hi def link helpWarning		Todo
 
 hi def link helpComment		Comment
 hi def link helpConstant	Constant
diff --git a/runtime/syntax/prolog.vim b/runtime/syntax/prolog.vim
index f8fb966b66..3b09bb3548 100644
--- a/runtime/syntax/prolog.vim
+++ b/runtime/syntax/prolog.vim
@@ -1,7 +1,9 @@
 " Vim syntax file
 " Language:    PROLOG
-" Maintainers: Thomas Koehler <jean-luc@picard.franken.de>
-" Last Change: 2013 May 23
+" Maintainer:  Thomas Koehler <jean-luc@picard.franken.de>
+"              Please be aware: I'm often slow to answer email due to a high
+"              non-computer related workload (sometimes 4-8 weeks)
+" Last Change: 2016 September 6
 " URL:         http://gott-gehabt.de/800_wer_wir_sind/thomas/Homepage/Computer/vim/syntax/prolog.vim
 
 " There are two sets of highlighting in here:
diff --git a/runtime/syntax/uil.vim b/runtime/syntax/uil.vim
index ccf07d5a24..088a0f6c86 100644
--- a/runtime/syntax/uil.vim
+++ b/runtime/syntax/uil.vim
@@ -1,7 +1,9 @@
 " Vim syntax file
 " Language:	Motif UIL (User Interface Language)
 " Maintainer:	Thomas Koehler <jean-luc@picard.franken.de>
-" Last Change:	2013 May 23
+"		Please be aware: I'm often slow to answer email due to a high
+"		non-computer related workload (sometimes 4-8 weeks)
+" Last Change:	2016 September 6
 " URL:		http://gott-gehabt.de/800_wer_wir_sind/thomas/Homepage/Computer/vim/syntax/uil.vim
 
 " quit when a syntax file was already loaded

From 59be0b42806c39131f76f89c554f0a24e82514a8 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <github@thequod.de>
Date: Fri, 28 Apr 2017 23:18:10 +0200
Subject: [PATCH 190/257] health.vim: syntax/style fixes (#6614)

---
 runtime/autoload/health/provider.vim | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim
index 2506c8216b..dccff12bae 100644
--- a/runtime/autoload/health/provider.vim
+++ b/runtime/autoload/health/provider.vim
@@ -31,9 +31,9 @@ endfunction
 
 " Handler for s:system() function.
 function! s:system_handler(jobid, data, event) dict abort
-  if a:event == 'stdout' || a:event == 'stderr'
+  if a:event ==# 'stdout' || a:event ==# 'stderr'
     let self.output .= join(a:data, '')
-  elseif a:event == 'exit'
+  elseif a:event ==# 'exit'
     let s:shell_error = a:data
   endif
 endfunction
@@ -55,7 +55,7 @@ function! s:system(cmd, ...) abort
 
   if jobid < 1
     call health#report_error(printf('Command error %d: %s', jobid,
-          \ type(a:cmd) == type([]) ? join(a:cmd) : a:cmd)))
+          \ type(a:cmd) == type([]) ? join(a:cmd) : a:cmd))
     let s:shell_error = 1
     return opts.output
   endif
@@ -70,7 +70,7 @@ function! s:system(cmd, ...) abort
           \ type(a:cmd) == type([]) ? join(a:cmd) : a:cmd))
     call jobstop(jobid)
   elseif s:shell_error != 0 && !ignore_error
-    call health#report_error(printf("Command error (%d) %s: %s", jobid,
+    call health#report_error(printf('Command error (%d) %s: %s', jobid,
           \ type(a:cmd) == type([]) ? join(a:cmd) : a:cmd,
           \ opts.output))
   endif
@@ -116,7 +116,7 @@ function! s:check_clipboard() abort
   let clipboard_tool = provider#clipboard#Executable()
   if empty(clipboard_tool)
     call health#report_warn(
-          \ "No clipboard tool found. Clipboard registers will not work.",
+          \ 'No clipboard tool found. Clipboard registers will not work.',
           \ [':help clipboard'])
   else
     call health#report_ok('Clipboard tool found: '. clipboard_tool)
@@ -169,7 +169,7 @@ function! s:version_info(python) abort
 
   " Assuming that multiple versions of a package are installed, sort them
   " numerically in descending order.
-  function! s:compare(metapath1, metapath2)
+  function! s:compare(metapath1, metapath2) abort
     let a = matchstr(fnamemodify(a:metapath1, ':p:h:t'), '[0-9.]\+')
     let b = matchstr(fnamemodify(a:metapath2, ':p:h:t'), '[0-9.]\+')
     return a == b ? 0 : a > b ? 1 : -1
@@ -429,8 +429,8 @@ function! s:check_ruby() abort
 
   if !executable('ruby') || !executable('gem')
     call health#report_warn(
-          \ "`ruby` and `gem` must be in $PATH.",
-          \ ["Install Ruby and verify that `ruby` and `gem` commands work."])
+          \ '`ruby` and `gem` must be in $PATH.',
+          \ ['Install Ruby and verify that `ruby` and `gem` commands work.'])
     return
   endif
   call health#report_info('Ruby: '. s:system('ruby -v'))
@@ -450,7 +450,7 @@ function! s:check_ruby() abort
   if s:shell_error || empty(latest_gem)
     call health#report_error('Failed to run: '. latest_gem_cmd,
           \ ["Make sure you're connected to the internet.",
-          \  "Are you behind a firewall or proxy?"])
+          \  'Are you behind a firewall or proxy?'])
     return
   endif
   let latest_gem = get(split(latest_gem, ' (\|, \|)$' ), 1, 'not found')
@@ -459,7 +459,7 @@ function! s:check_ruby() abort
   let current_gem = s:system(current_gem_cmd)
   if s:shell_error
     call health#report_error('Failed to run: '. current_gem_cmd,
-          \ ["Report this issue with the output of: ", current_gem_cmd])
+          \ ['Report this issue with the output of: ', current_gem_cmd])
     return
   endif
 

From a5e9974ed77621c224b2b8fa49f76cab954fb2c6 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 23:19:10 +0200
Subject: [PATCH 191/257] vim-patch:50ba526fbf3e

Updated runtime files.

https://github.com/vim/vim/commit/50ba526fbf3e9e5e0e6b0b3086a4d5df581ebc7e

vim-patch:20eeb6129d12
---
 runtime/doc/autocmd.txt |  2 +-
 runtime/doc/eval.txt    | 27 ++++++++++++++++++---------
 runtime/doc/if_pyth.txt |  4 ++--
 runtime/filetype.vim    |  6 +++++-
 4 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 77015d35ee..b27a1a8763 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -1004,7 +1004,7 @@ WinLeave			Before leaving a window.  If the window to be
 
 							*WinNew*
 WinNew				When a new window was created.  Not done for
-				the fist window, when Vim has just started.
+				the first window, when Vim has just started.
 				Before a WinEnter event.
 
 ==============================================================================
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index d65783cea0..c58396d889 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -939,7 +939,7 @@ expr8[expr1]		item of String or |List|	*expr-[]* *E111*
 
 If expr8 is a Number or String this results in a String that contains the
 expr1'th single byte from expr8.  expr8 is used as a String, expr1 as a
-Number.  This doesn't recognize multi-byte encodings, see |byteidx()| for
+Number.  This doesn't recognize multi-byte encodings, see `byteidx()` for
 an alternative, or use `split()` to turn the string into a list of characters.
 
 Index zero gives the first byte.  This is like it works in C.  Careful:
@@ -1222,7 +1222,7 @@ The arguments are optional.  Example: >
 <	error function
 							*closure*
 Lambda expressions can access outer scope variables and arguments.  This is
-often called a closure.  Example where "i" a and "a:arg" are used in a lambda
+often called a closure.  Example where "i" and "a:arg" are used in a lambda
 while they exist in the function scope.  They remain valid even after the
 function returns: >
 	:function Foo(arg)
@@ -2031,8 +2031,8 @@ expand({expr} [, {nosuf} [, {list}]])
 feedkeys({string} [, {mode}])	Number	add key sequence to typeahead buffer
 filereadable({file})		Number	|TRUE| if {file} is a readable file
 filewritable({file})		Number	|TRUE| if {file} is a writable file
-filter({expr}, {string})	List/Dict  remove items from {expr} where
-				{string} is 0
+filter({expr1}, {expr2})	List/Dict  remove items from {expr1} where
+					{expr2} is 0
 finddir({name}[, {path}[, {count}]])
 				String	find directory {name} in {path}
 findfile({name}[, {path}[, {count}]])
@@ -2056,7 +2056,7 @@ garbagecollect([{atexit}])	none	free memory, breaking cyclic references
 get({list}, {idx} [, {def}])	any	get item {idx} from {list} or {def}
 get({dict}, {key} [, {def}])	any	get item {key} from {dict} or {def}
 get({func}, {what})		any	get property of funcref/partial {func}
-getbufinfo( [{expr}])		List  	information about buffers
+getbufinfo([{expr}])		List	information about buffers
 getbufline({expr}, {lnum} [, {end}])
 				List	lines {lnum} to {end} of buffer {expr}
 getbufvar({expr}, {varname} [, {def}])
@@ -2155,7 +2155,7 @@ lispindent({lnum})		Number	Lisp indent for line {lnum}
 localtime()			Number	current time
 log({expr})			Float	natural logarithm (base e) of {expr}
 log10({expr})			Float	logarithm of Float {expr} to base 10
-map({expr}, {string})		List/Dict  change each item in {expr} to {expr}
+map({expr1}, {expr2})		List/Dict  change each item in {expr1} to {expr}
 maparg({name}[, {mode} [, {abbr} [, {dict}]]])
 				String or Dict
 					rhs of mapping {name} in mode {mode}
@@ -3488,9 +3488,10 @@ filter({expr1}, {expr2})					*filter()*
 		is zero remove the item from the |List| or |Dictionary|.
 		{expr2} must be a |string| or |Funcref|.
 
-		if {expr2} is a |string|, inside {expr2} |v:val| has the value
+		If {expr2} is a |string|, inside {expr2} |v:val| has the value
 		of the current item.  For a |Dictionary| |v:key| has the key
-		of the current item.
+		of the current item and for a |List| |v:key| has the index of
+		the current item.
 		For a |Dictionary| |v:key| has the key of the current item.
 		Examples: >
 			call filter(mylist, 'v:val !~ "OLD"')
@@ -3513,7 +3514,11 @@ filter({expr1}, {expr2})					*filter()*
 			  return a:idx % 2 == 1
 			endfunc
 			call filter(mylist, function('Odd'))
-<
+<		It is shorter when using a |lambda|: >
+			call filter(myList, {idx, val -> idx * val <= 42})
+<		If you do not use "val" you can leave it out: >
+			call filter(myList, {idx -> idx % 2 == 1})
+
 		The operation is done in-place.  If you want a |List| or
 		|Dictionary| to remain unmodified make a copy first: >
 			:let l = filter(copy(mylist), 'v:val =~ "KEEP"')
@@ -5150,6 +5155,10 @@ map({expr1}, {expr2})					*map()*
 			  return a:key . '-' . a:val
 			endfunc
 			call map(myDict, function('KeyValue'))
+<		It is shorter when using a |lambda|: >
+			call map(myDict, {key, val -> key . '-' . val})
+<		If you do not use "val" you can leave it out: >
+			call map(myDict, {key -> 'item: ' . key})
 <
 		The operation is done in-place.  If you want a |List| or
 		|Dictionary| to remain unmodified make a copy first: >
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index 8d6a3e1cfa..e19a80059a 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -696,11 +696,11 @@ functions to evaluate Python expressions and pass their values to VimL.
 The `:py3` and `:python3` commands work similar to `:python`.  A simple check
 if the `:py3` command is working: >
 	:py3 print("Hello")
-<							*:py3file*
+
 To see what version of Python you have: >
 	:py3 import sys
 	:py3 print(sys.version)
-
+<							*:py3file*
 The `:py3file` command works similar to `:pyfile`.
 							*:py3do*
 The `:py3do` command works similar to `:pydo`.
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index d2b770d3af..a909debf97 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Sep 15
+" Last Change:	2016 Sep 22
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -805,6 +805,10 @@ au BufNewFile,BufRead *.gp,.gprc		setf gp
 au BufNewFile,BufRead */.gnupg/options		setf gpg
 au BufNewFile,BufRead */.gnupg/gpg.conf		setf gpg
 au BufNewFile,BufRead */usr/*/gnupg/options.skel setf gpg
+if !empty($GNUPGHOME)
+  au BufNewFile,BufRead $GNUPGHOME/options	setf gpg
+  au BufNewFile,BufRead $GNUPGHOME/gpg.conf	setf gpg
+endif
 
 " gnash(1) configuration files
 au BufNewFile,BufRead gnashrc,.gnashrc,gnashpluginrc,.gnashpluginrc setf gnash

From 40fb96c76a46a85adb6a62ab8d83e83fc8e7aca7 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 23:27:35 +0200
Subject: [PATCH 192/257] vim-patch:3e496b0ea319

Updated runtime files.

https://github.com/vim/vim/commit/3e496b0ea31996b665824f45664dee1fdd73c4d0

NA patches:
vim-patch:8.0.0015
vim-patch:8.0.0016
vim-patch:177778575148
---
 runtime/autoload/phpcomplete.vim                   |  2 +-
 runtime/autoload/tar.vim                           |  2 +-
 runtime/autoload/zip.vim                           |  6 +++---
 runtime/doc/eval.txt                               |  1 +
 runtime/doc/intro.txt                              |  5 +----
 runtime/doc/pi_netrw.txt                           | 12 ++++++------
 runtime/indent/cdl.vim                             |  2 +-
 runtime/indent/html.vim                            |  2 +-
 runtime/pack/dist/opt/vimball/autoload/vimball.vim |  2 +-
 runtime/syntax/ave.vim                             |  2 +-
 runtime/syntax/fortran.vim                         | 14 +++++++-------
 runtime/syntax/sh.vim                              |  2 +-
 12 files changed, 25 insertions(+), 27 deletions(-)

diff --git a/runtime/autoload/phpcomplete.vim b/runtime/autoload/phpcomplete.vim
index 7f25d9df33..0d01bc8bf1 100644
--- a/runtime/autoload/phpcomplete.vim
+++ b/runtime/autoload/phpcomplete.vim
@@ -931,7 +931,7 @@ function! phpcomplete#EvaluateModifiers(modifiers, required_modifiers, prohibite
 		endfor
 
 		for modifier in a:modifiers
-			" if the modifier is prohibited its a no match
+			" if the modifier is prohibited it's a no match
 			if index(a:prohibited_modifiers, modifier) != -1
 				return 0
 			endif
diff --git a/runtime/autoload/tar.vim b/runtime/autoload/tar.vim
index 5e76870cce..9c518cb9d0 100644
--- a/runtime/autoload/tar.vim
+++ b/runtime/autoload/tar.vim
@@ -117,7 +117,7 @@ fun! tar#Browse(tarfile)
   if !filereadable(a:tarfile)
 "   call Decho('a:tarfile<'.a:tarfile.'> not filereadable')
    if a:tarfile !~# '^\a\+://'
-    " if its an url, don't complain, let url-handlers such as vim do its thing
+    " if it's an url, don't complain, let url-handlers such as vim do its thing
     redraw!
     echohl Error | echo "***error*** (tar#Browse) File not readable<".a:tarfile.">" | echohl None
    endif
diff --git a/runtime/autoload/zip.vim b/runtime/autoload/zip.vim
index 824af01fe8..ea086e0882 100644
--- a/runtime/autoload/zip.vim
+++ b/runtime/autoload/zip.vim
@@ -65,14 +65,14 @@ endif
 " zip#Browse: {{{2
 fun! zip#Browse(zipfile)
 "  call Dfunc("zip#Browse(zipfile<".a:zipfile.">)")
-  " sanity check: insure that the zipfile has "PK" as its first two letters
+  " sanity check: ensure that the zipfile has "PK" as its first two letters
   "               (zipped files have a leading PK as a "magic cookie")
   if !filereadable(a:zipfile) || readfile(a:zipfile, "", 1)[0] !~ '^PK'
    exe "noautocmd e ".fnameescape(a:zipfile)
 "   call Dret("zip#Browse : not a zipfile<".a:zipfile.">")
    return
 "  else        " Decho
-"   call Decho("zip#Browse: a:zipfile<".a:zipfile."> passed PK test - its a zip file")
+"   call Decho("zip#Browse: a:zipfile<".a:zipfile."> passed PK test - it's a zip file")
   endif
 
   let repkeep= &report
@@ -95,7 +95,7 @@ fun! zip#Browse(zipfile)
   endif
   if !filereadable(a:zipfile)
    if a:zipfile !~# '^\a\+://'
-    " if its an url, don't complain, let url-handlers such as vim do its thing
+    " if it's an url, don't complain, let url-handlers such as vim do its thing
     redraw!
     echohl Error | echo "***error*** (zip#Browse) File not readable<".a:zipfile.">" | echohl None
 "    call inputsave()|call input("Press <cr> to continue")|call inputrestore()
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index c58396d889..19c1f0c23d 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -4553,6 +4553,7 @@ histadd({history}, {item})				*histadd()*
 			"expr"	 or "="   typed expression history
 			"input"  or "@"	  input line history
 			"debug"  or ">"   debug command history
+			empty		  the current or last used history
 		The {history} string does not need to be the whole name, one
 		character is sufficient.
 		If {item} does already exist in the history, it will be
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index bc34b69508..e5a32041a5 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -126,10 +126,7 @@ http://www.vim.org/maillist.php
 
 Bug reports:				*bugs* *bug-reports* *bugreport.vim*
 
-Send bug reports to: Vim Developers <vim-dev@vim.org>
-This is a maillist, you need to become a member first and many people will see
-the message.  If you don't want that, e.g. because it is a security issue,
-send it to <bugs@vim.org>, this only goes to the Vim maintainer (that's Bram).
+Report bugs on GitHub: https://github.com/neovim/neovim/issues
 
 Please be brief; all the time that is spent on answering mail is subtracted
 from the time that is spent on improving Vim!  Always give a reproducible
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index d0cfa70582..3e19f0b4af 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -530,7 +530,7 @@ variable (ex. scp uses the variable g:netrw_scp_cmd, which is defaulted to
 	let g:netrw_sftp_cmd= '"c:\Program Files\PuTTY\psftp.exe"'
 <
 (note: it has been reported that windows 7 with putty v0.6's "-batch" option
-       doesn't work, so its best to leave it off for that system)
+       doesn't work, so it's best to leave it off for that system)
 
 See |netrw-p8| for more about putty, pscp, psftp, etc.
 
@@ -1204,7 +1204,7 @@ The :NetrwMB command is available outside of netrw buffers (once netrw has been
 invoked in the session).
 
 The file ".netrwbook" holds bookmarks when netrw (and vim) is not active.  By
-default, its stored on the first directory on the user's |'runtimepath'|.
+default, it's stored on the first directory on the user's |'runtimepath'|.
 
 Related Topics:
 	|netrw-gb| how to return (go) to a bookmark
@@ -1429,7 +1429,7 @@ be used in that count.
 						*.netrwhist*
 See |g:netrw_dirhistmax| for how to control the quantity of history stack
 slots.  The file ".netrwhist" holds history when netrw (and vim) is not
-active.  By default, its stored on the first directory on the user's
+active.  By default, it's stored on the first directory on the user's
 |'runtimepath'|.
 
 Related Topics:
@@ -3269,7 +3269,7 @@ The user function is passed one argument; it resembles >
 
 	fun! ExampleUserMapFunc(islocal)
 <
-where a:islocal is 1 if its a local-directory system call or 0 when
+where a:islocal is 1 if it's a local-directory system call or 0 when
 remote-directory system call.
 
 Use netrw#Expose("varname")          to access netrw-internal (script-local)
@@ -3593,7 +3593,7 @@ Example: Clear netrw's marked file list via a mapping on gu >
 
 								*netrw-p16*
 	P16. When editing remote files (ex. :e ftp://hostname/path/file),
-	     under Windows I get an |E303| message complaining that its unable
+	     under Windows I get an |E303| message complaining that it's unable
 	     to open a swap file.
 
 	     (romainl) It looks like you are starting Vim from a protected
@@ -3647,7 +3647,7 @@ Example: Clear netrw's marked file list via a mapping on gu >
 	P21. I've made a directory (or file) with an accented character, but
 		netrw isn't letting me enter that directory/read that file:
 
-		Its likely that the shell or o/s is using a different encoding
+		It's likely that the shell or o/s is using a different encoding
 		than you have vim (netrw) using.  A patch to vim supporting
 		"systemencoding" may address this issue in the future; for
 		now, just have netrw use the proper encoding.  For example: >
diff --git a/runtime/indent/cdl.vim b/runtime/indent/cdl.vim
index db2b9052b2..5ec2a7b21a 100644
--- a/runtime/indent/cdl.vim
+++ b/runtime/indent/cdl.vim
@@ -16,7 +16,7 @@ if exists("*CdlGetIndent")
     "finish
 endif
 
-" find out if an "...=..." expresion its an asignment (or a conditional)
+" find out if an "...=..." expresion is an assignment (or a conditional)
 " it scans 'line' first, and then the previos lines
 fun! CdlAsignment(lnum, line)
   let f = -1
diff --git a/runtime/indent/html.vim b/runtime/indent/html.vim
index 828bc3120b..13adaae54c 100644
--- a/runtime/indent/html.vim
+++ b/runtime/indent/html.vim
@@ -749,7 +749,7 @@ func! s:CssPrevNonComment(lnum, stopline)
   while 1
     let ccol = match(getline(lnum), '\*/')
     if ccol < 0
-      " No comment end thus its something else.
+      " No comment end thus it's something else.
       return lnum
     endif
     call cursor(lnum, ccol + 1)
diff --git a/runtime/pack/dist/opt/vimball/autoload/vimball.vim b/runtime/pack/dist/opt/vimball/autoload/vimball.vim
index 1af6b19c88..9c7dcbda0f 100644
--- a/runtime/pack/dist/opt/vimball/autoload/vimball.vim
+++ b/runtime/pack/dist/opt/vimball/autoload/vimball.vim
@@ -347,7 +347,7 @@ fun! vimball#Vimball(really,...)
 "   call Decho("exe tabn ".curtabnr)
     exe "tabn ".curtabnr
 
-    " set up help if its a doc/*.txt file
+    " set up help if it's a doc/*.txt file
 "   call Decho("didhelp<".didhelp."> fname<".fname.">")
     if a:really && didhelp == "" && fname =~ 'doc/[^/]\+\.\(txt\|..x\)$'
     	let didhelp= substitute(fname,'^\(.*\<doc\)[/\\][^.]*\.\(txt\|..x\)$','\1','')
diff --git a/runtime/syntax/ave.vim b/runtime/syntax/ave.vim
index 3e82a8bc9b..e63e7d2c30 100644
--- a/runtime/syntax/ave.vim
+++ b/runtime/syntax/ave.vim
@@ -34,7 +34,7 @@ syn match  aveNumber		"[+-]\=\<[0-9]\+\>"
 " Operator
 
 syn keyword aveOperator		or and max min xor mod by
-" 'not' is a kind of a problem: Its an Operator as well as a method
+" 'not' is a kind of a problem: It's an Operator as well as a method
 " 'not' is only marked as an Operator if not applied as method
 syn match aveOperator		"[^\.]not[^a-zA-Z]"
 
diff --git a/runtime/syntax/fortran.vim b/runtime/syntax/fortran.vim
index 0b56f5b3ad..9d9ab69a3a 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:	0.98
-" Last Change:	2016 Aug. 29
+" Version:	0.99
+" Last Change:	2016 Sep. 23
 " 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) 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 (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:
 "  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 and Vishnu V. Krishnan.
+"  Stefano Zaghi, Vishnu V. Krishnan and Judica�l Grasset
 
 if exists("b:current_syntax")
   finish
@@ -368,7 +368,7 @@ else
 endif
 
 syn match fortranComment	excludenl "!.*$" contains=@fortranCommentGroup,@spell
-syn match fortranOpenMP		excludenl 		"^\s*!\$\(OMP\)\=\s.*$"
+syn match fortranOpenMP		excludenl 		"^\s*!\$\(OMP\)\=&\=\s.*$"
 
 "cpp is often used with Fortran
 syn match	cPreProc		"^\s*#\s*\(define\|ifdef\)\>.*"
diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index 18da779764..6048aed4ec 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -381,7 +381,7 @@ ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc15 start="<<-\s*\\\z([^ \
 
 " Here Strings: {{{1
 " =============
-" available for: bash; ksh (really should be ksh93 only) but not if its a posix
+" available for: bash; ksh (really should be ksh93 only) but not if it's a posix
 if exists("b:is_bash") || (exists("b:is_kornshell") && !exists("g:is_posix"))
  syn match shHereString "<<<"	skipwhite	nextgroup=shCmdParenRegion
 endif

From 460d5971f6511fb3379029bbd77a732ba9b06df0 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 23:40:49 +0200
Subject: [PATCH 193/257] vim-patch:2ec618c9feac

Updated runtime files.

https://github.com/vim/vim/commit/2ec618c9feac4573b154510236ad8121c77d0eca
---
 runtime/autoload/gzip.vim     |   6 +-
 runtime/doc/autocmd.txt       |  17 +-
 runtime/doc/cmdline.txt       |   5 +-
 runtime/doc/editing.txt       |   3 +-
 runtime/doc/eval.txt          |   4 +-
 runtime/doc/index.txt         |   4 +-
 runtime/doc/options.txt       |   2 +-
 runtime/doc/syntax.txt        |   9 +-
 runtime/ftplugin/mf.vim       |  64 ++-
 runtime/ftplugin/mp.vim       |  67 ++-
 runtime/indent/fortran.vim    |  12 +-
 runtime/indent/mf.vim         |   6 +
 runtime/indent/mp.vim         | 500 ++++++++++++--------
 runtime/syntax/debsources.vim |   4 +-
 runtime/syntax/mf.vim         | 371 +++++++++------
 runtime/syntax/mp.vim         | 830 ++++++++++++++++++++++++++++++----
 16 files changed, 1475 insertions(+), 429 deletions(-)
 create mode 100644 runtime/indent/mf.vim

diff --git a/runtime/autoload/gzip.vim b/runtime/autoload/gzip.vim
index a6b4605b06..e4adec0947 100644
--- a/runtime/autoload/gzip.vim
+++ b/runtime/autoload/gzip.vim
@@ -1,6 +1,6 @@
 " Vim autoload file for editing compressed files.
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2014 Nov 05
+" Last Change: 2016 Sep 28
 
 " These functions are used by the gzip plugin.
 
@@ -63,6 +63,9 @@ fun gzip#read(cmd)
   " set 'modifiable'
   let ma_save = &ma
   setlocal ma
+  " set 'write'
+  let write_save = &write
+  set write
   " Reset 'foldenable', otherwise line numbers get adjusted.
   if has("folding")
     let fen_save = &fen
@@ -127,6 +130,7 @@ fun gzip#read(cmd)
   let &pm = pm_save
   let &cpo = cpo_save
   let &l:ma = ma_save
+  let &write = write_save
   if has("folding")
     let &l:fen = fen_save
   endif
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index b27a1a8763..f783438fc9 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -76,11 +76,15 @@ exception is that "<sfile>" is expanded when the autocmd is defined.  Example:
 
 Here Vim expands <sfile> to the name of the file containing this line.
 
-When your vimrc file is sourced twice, the autocommands will appear twice.
-To avoid this, put this command in your vimrc file, before defining
-autocommands: >
+`:autocmd` adds to the list of autocommands regardless of whether they are
+already present.  When your .vimrc file is sourced twice, the autocommands
+will appear twice.  To avoid this, define your autocommands in a group, so
+that you can easily clear them: >
 
-	:autocmd!	" Remove ALL autocommands for the current group.
+	augroup vimrc
+	  autocmd!	" Remove all vimrc autocommands
+	  au BufNewFile,BufRead *.html so <sfile>:h/html.vim
+	augroup END
 
 If you don't want to remove all autocommands, you can instead use a variable
 to ensure that Vim includes the autocommands only once: >
@@ -127,8 +131,13 @@ prompt.  When one command outputs two messages this can happen anyway.
 
 :au[tocmd]! [group] {event}
 			Remove ALL autocommands for {event}.
+			Warning: You should not do this without a group for
+			|BufRead| and other common events, it can break
+			plugins, syntax highlighting, etc.
 
 :au[tocmd]! [group]	Remove ALL autocommands.
+			Warning: You should normally not do this without a
+			group, it breaks plugins, syntax highlighting, etc.
 
 When the [group] argument is not given, Vim uses the current group (as defined
 with ":augroup"); otherwise, Vim uses the group defined with [group].
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 7277e1d22e..3e041c3b62 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -219,9 +219,10 @@ CTRL-Y		When there is a modeless selection, copy the selection into
 		the clipboard. |modeless-selection|
 		If there is no selection CTRL-Y is inserted as a character.
 
-CTRL-J					*c_CTRL-J* *c_<NL>* *c_<CR>* *c_CR*
+CTRL-M or CTRL-J		*c_CTRL-M* *c_CTRL-J* *c_<NL>* *c_<CR>* *c_CR*
 <CR> or <NL>	start entered command
-							*c_<Esc>* *c_Esc*
+
+CTRL-[						*c_CTRL-[* *c_<Esc>* *c_Esc*
 <Esc>		When typed and 'x' not present in 'cpoptions', quit
 		Command-line mode without executing.  In macros or when 'x'
 		present in 'cpoptions', start entered command.
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 57458b7b81..7007a89611 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -160,7 +160,8 @@ start editing another file, Vim will refuse this.  In order to overrule this
 protection, add a '!' to the command.  The changes will then be lost.  For
 example: ":q" will not work if the buffer was changed, but ":q!" will.  To see
 whether the buffer was changed use the "CTRL-G" command.  The message includes
-the string "[Modified]" if the buffer has been changed.
+the string "[Modified]" if the buffer has been changed, or "+" if the 'm' flag
+is in 'shortmess'.
 
 If you want to automatically save the changes without asking, switch on the
 'autowriteall' option.  'autowrite' is the associated Vi-compatible option
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 19c1f0c23d..2d6c6ee3a0 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1241,7 +1241,7 @@ Examples for using a lambda expression with |sort()|, |map()| and |filter()|: >
 	:echo sort([3,7,2,1,4], {a, b -> a - b})
 <	[1, 2, 3, 4, 7]
 
-The lambda expression is also useful for Channel, Job and timer: >
+The lambda expression is also useful for jobs and timers: >
 	:let timer = timer_start(500,
 			\ {-> execute("echo 'Handler called'", "")},
 			\ {'repeat': 3})
@@ -3518,7 +3518,7 @@ filter({expr1}, {expr2})					*filter()*
 			call filter(myList, {idx, val -> idx * val <= 42})
 <		If you do not use "val" you can leave it out: >
 			call filter(myList, {idx -> idx % 2 == 1})
-
+<
 		The operation is done in-place.  If you want a |List| or
 		|Dictionary| to remain unmodified make a copy first: >
 			:let l = filter(copy(mylist), 'v:val =~ "KEEP"')
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 7267a45d41..16e9d4a64d 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -1000,7 +1000,7 @@ tag		command	      action in Command-line editing mode	~
 |c_CTRL-L|	CTRL-L		do completion on the pattern in front of the
 				cursor and insert the longest common part
 |c_<CR>|	<CR>		execute entered command
-|c_<CR>|	CTRL-M		same as <CR>
+|c_CTRL-M|	CTRL-M		same as <CR>
 |c_CTRL-N|	CTRL-N		after using 'wildchar' with multiple matches:
 				go to next match, otherwise: same as <Down>
 		CTRL-O		not used
@@ -1024,7 +1024,7 @@ tag		command	      action in Command-line editing mode	~
 		CTRL-Y		copy (yank) modeless selection
 		CTRL-Z		not used (reserved for suspend)
 |c_<Esc>|	<Esc>		abandon command-line without executing it
-|c_<Esc>|	CTRL-[		same as <Esc>
+|c_CTRL-[|	CTRL-[		same as <Esc>
 |c_CTRL-\_CTRL-N| CTRL-\ CTRL-N	go to Normal mode, abandon command-line
 |c_CTRL-\_CTRL-G| CTRL-\ CTRL-G	go to mode specified with 'insertmode',
 				abandon command-line
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 7ca6612225..b0b47cc243 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -10,7 +10,7 @@ Options							*options*
 2. Automatically setting options	|auto-setting|
 3. Options summary			|option-summary|
 
-For an overview of options see help.txt |option-list|.
+For an overview of options see quickref.txt |option-list|.
 
 Vim has a number of internal variables and switches which can be set to
 achieve special effects.  These options come in three forms:
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index e3da736489..1ee35e19dd 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -3555,7 +3555,11 @@ DEFINING KEYWORDS					*:syn-keyword*
 
 DEFINING MATCHES					*:syn-match*
 
-:sy[ntax] match {group-name} [{options}] [excludenl] {pattern} [{options}]
+:sy[ntax] match {group-name} [{options}]
+		[excludenl]
+		[keepend]
+		{pattern}
+		[{options}]
 
 	This defines one match.
 
@@ -3564,6 +3568,9 @@ DEFINING MATCHES					*:syn-match*
 	[excludenl]		Don't make a pattern with the end-of-line "$"
 				extend a containing match or region.  Must be
 				given before the pattern. |:syn-excludenl|
+	keepend			Don't allow contained matches to go past a
+				match with the end pattern.  See
+				|:syn-keepend|.
 	{pattern}		The search pattern that defines the match.
 				See |:syn-pattern| below.
 				Note that the pattern may match more than one
diff --git a/runtime/ftplugin/mf.vim b/runtime/ftplugin/mf.vim
index fd1d3ce646..fa567368ea 100644
--- a/runtime/ftplugin/mf.vim
+++ b/runtime/ftplugin/mf.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
-" Language:         MetaFont
-" Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2008-07-09
+" Language:           METAFONT
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Former Maintainers: Nikolai Weibull <now@bitwi.se>
+" Latest Revision:    2016 Oct 1
 
 if exists("b:did_ftplugin")
   finish
@@ -11,9 +12,62 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
-let b:undo_ftplugin = "setl com< cms< fo<"
+let b:undo_ftplugin = "setl com< cms< fo< sua< inc< def< ofu<"
+      \ . "| unlet! b:match_ignorecase b:match_words b:match_skip"
 
-setlocal comments=:% commentstring=%\ %s formatoptions-=t formatoptions+=croql
+setlocal comments=:% commentstring=%\ %s formatoptions-=t formatoptions+=cjroql2
+setlocal suffixesadd=.mf
+let &l:include = '\<input\>'
+let &l:define = '\<\%(let\|newinternal\|interim\|def\|vardef\)\>\|\<\%(primary\|secondary\|tertiary\)def\>\s*[^ .]\+'
+setlocal omnifunc=syntaxcomplete#Complete
+let g:omni_syntax_group_include_mf = 'mf\w\+'
+let g:omni_syntax_group_exclude_mf = 'mfTodoComment'
+
+let s:mp_regex = {
+      \ 'beginsection' : '^\s*\%(\%(\|var\|primary\|secondary\|tertiary\)def\|beginchar\|beginlogochar\)\>',
+      \ 'endsection'   : '^\s*\%(enddef\|endchar\|endlogochar\)\>',
+      \ 'beginblock'   : '^\s*\%(begingroup\|if\|for\%(\|suffixes\|ever\)\)\>',
+      \ 'endblock'     : '^\s*\%(endgroup\|fi\|endfor\)\>'
+      \ }
+
+function! s:move_around(count, what, flags, visual)
+  if a:visual
+    exe "normal! gv"
+  endif
+  call search(s:mp_regex[a:what], a:flags.'s') " 's' sets previous context mark
+  for i in range(2, a:count)
+    call search(s:mp_regex[a:what], a:flags)
+  endfor
+endfunction
+
+
+" Move around macros.
+nnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:false) <CR>
+vnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:true)  <CR>
+nnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:false) <CR>
+vnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:true)  <CR>
+nnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:false) <CR>
+vnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:true)  <CR>
+nnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:false) <CR>
+vnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:true)  <CR>
+nnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:false) <CR>
+vnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:true)  <CR>
+nnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:false) <CR>
+vnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:true)  <CR>
+
+if exists("loaded_matchit")
+  let b:match_ignorecase = 0
+  let b:match_words =
+        \ '\<if\>:\<else\%[if]\>:\<fi\>,' .
+        \ '\<for\%(\|suffixes\|ever\)\>:\<exit\%(if\|unless\)\>:\<endfor\>,' .
+        \ '\<\%(\|var\|primary\|secondary\|tertiary\)def\>:\<enddef\>,' .
+        \ '\<begingroup\>:\<endgroup\>,' .
+        \ '\<beginchar\>:\<endchar\>' .
+        \ '\<beginlogochar\>:\<endlogochar\>'
+  " Ignore comments and strings
+  let b:match_skip = 'synIDattr(synID(line("."), col("."), 1), "name")
+        \ =~# "mf\\(Comment\\|String\\)$"'
+endif
 
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/ftplugin/mp.vim b/runtime/ftplugin/mp.vim
index 316fa9bb64..a3c9af342b 100644
--- a/runtime/ftplugin/mp.vim
+++ b/runtime/ftplugin/mp.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
-" Language:         MetaPost
-" Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2008-07-09
+" Language:           MetaPost
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Former Maintainers: Nikolai Weibull <now@bitwi.se>
+" Latest Revision:    2016 Oct 1
 
 if exists("b:did_ftplugin")
   finish
@@ -11,9 +12,16 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
-let b:undo_ftplugin = "setl com< cms< fo<"
+let b:undo_ftplugin = "setl com< cms< fo< sua< inc< def< ofu<"
+      \ . "| unlet! b:match_ignorecase b:match_words b:match_skip"
 
-setlocal comments=:% commentstring=%\ %s formatoptions-=t formatoptions+=croql
+setlocal comments=:% commentstring=%\ %s formatoptions-=t formatoptions+=cjroql2
+setlocal suffixesadd=.mp,.mpiv
+let &l:include = '\<\%(input\|loadmodule\)\>' " loadmodule is in MetaFun
+let &l:define = '\<\%(let\|newinternal\|interim\|def\|vardef\)\>\|\<\%(primary\|secondary\|tertiary\)def\>\s*[^ .]\+'
+setlocal omnifunc=syntaxcomplete#Complete
+let g:omni_syntax_group_include_mp = 'mf\w\+,mp\w\+'
+let g:omni_syntax_group_exclude_mp = 'mfTodoComment'
 
 if exists(":FixBeginfigs") != 2
   command -nargs=0 FixBeginfigs call s:fix_beginfigs()
@@ -24,5 +32,54 @@ if exists(":FixBeginfigs") != 2
   endfunction
 endif
 
+let s:mp_regex = {
+      \ 'beginsection' : '^\s*\%(\%(\|var\|primary\|secondary\|tertiary\)def\|begin\%(fig\|char\|logochar\|glyph\|graph\)\)\>',
+      \ 'endsection'   : '^\s*\%(enddef\|end\%(fig\|char\|logochar\|glyph\|graph\)\)\>',
+      \ 'beginblock'   : '^\s*\%(begingroup\|if\|for\%(\|suffixes\|ever\)\)\>',
+      \ 'endblock'     : '^\s*\%(endgroup\|fi\|endfor\)\>'
+      \ }
+
+function! s:move_around(count, what, flags, visual)
+  if a:visual
+    exe "normal! gv"
+  endif
+  call search(s:mp_regex[a:what], a:flags.'s') " 's' sets previous context mark
+  for i in range(2, a:count)
+    call search(s:mp_regex[a:what], a:flags)
+  endfor
+endfunction
+
+
+" Move around macros.
+nnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:false) <CR>
+vnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:true)  <CR>
+nnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:false) <CR>
+vnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:true)  <CR>
+nnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:false) <CR>
+vnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:true)  <CR>
+nnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:false) <CR>
+vnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:true)  <CR>
+nnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:false) <CR>
+vnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:true)  <CR>
+nnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:false) <CR>
+vnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:true)  <CR>
+
+if exists("loaded_matchit")
+  let b:match_ignorecase = 0
+  let b:match_words =
+        \ '\<if\>:\<else\%[if]\>:\<fi\>,' .
+        \ '\<for\%(\|suffixes\|ever\)\>:\<exit\%(if\|unless\)\>:\<endfor\>,' .
+        \ '\<\%(\|var\|primary\|secondary\|tertiary\)def\>:\<enddef\>,' .
+        \ '\<beginfig\>:\<endfig\>,' .
+        \ '\<begingroup\>:\<endgroup\>,' .
+        \ '\<beginchar\>:\<endchar\>' .
+        \ '\<beginlogochar\>:\<endlogochar\>' .
+        \ '\<beginglyph\>:\<endglyph\>' .
+        \ '\<begingraph\>:\<endgraph\>'
+  " Ignore comments and strings
+  let b:match_skip = 'synIDattr(synID(line("."), col("."), 1), "name")
+        \ =~# "^mf\\%(Comment\\|String\\|\\)$\\|^mpTeXinsert$"'
+endif
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/indent/fortran.vim b/runtime/indent/fortran.vim
index 00cced4c9c..c9bee78a6e 100644
--- a/runtime/indent/fortran.vim
+++ b/runtime/indent/fortran.vim
@@ -1,11 +1,12 @@
 " Vim indent file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
-" Version:	0.45
-" Last Change:	2016 Aug. 29
+" Version:	0.46
+" Last Change:	2016 Sep. 27
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
 " Usage:	For instructions, do :help fortran-indent from Vim
 " Credits:
-"  Useful suggestions were made by: Albert Oliver Serra and Takuya Fujiwara.
+"  Useful suggestions were made, in chronological order, by:
+"  Albert Oliver Serra, Takuya Fujiwara and Philipp Edelmann.
 
 " Only load this indent file when no other was loaded.
 if exists("b:did_indent")
@@ -121,7 +122,8 @@ function FortranGetIndent(lnum)
     let prefix='\(\(pure\|impure\|elemental\|recursive\)\s\+\)\{,2}'
     let type='\(\(integer\|real\|double\s\+precision\|complex\|logical'
           \.'\|character\|type\|class\)\s*\S*\s\+\)\='
-    if prevstat =~? '^\s*\(module\|contains\/submodule\|program\)\>'
+    if prevstat =~? '^\s*\(contains\|submodule\|program\)\>'
+            \ ||prevstat =~? '^\s*'.'module\>\(\s*\procedure\)\@!'
             \ ||prevstat =~? '^\s*'.prefix.'subroutine\>'
             \ ||prevstat =~? '^\s*'.prefix.type.'function\>'
             \ ||prevstat =~? '^\s*'.type.prefix.'function\>'
@@ -129,7 +131,7 @@ function FortranGetIndent(lnum)
     endif
     if getline(v:lnum) =~? '^\s*contains\>'
           \ ||getline(v:lnum)=~? '^\s*end\s*'
-          \ .'\(function\|subroutine\|module\/submodule\|program\)\>'
+          \ .'\(function\|subroutine\|module\|submodule\|program\)\>'
       let ind = ind - shiftwidth()
     endif
   endif
diff --git a/runtime/indent/mf.vim b/runtime/indent/mf.vim
new file mode 100644
index 0000000000..88737f4e9f
--- /dev/null
+++ b/runtime/indent/mf.vim
@@ -0,0 +1,6 @@
+" METAFONT indent file
+" Language:    METAFONT
+" Maintainer:  Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Last Change: 2016 Oct 1
+
+runtime! indent/mp.vim
diff --git a/runtime/indent/mp.vim b/runtime/indent/mp.vim
index a118eb8b60..c9639efed3 100644
--- a/runtime/indent/mp.vim
+++ b/runtime/indent/mp.vim
@@ -1,56 +1,19 @@
 " MetaPost indent file
-" Language:	MetaPost
-" Maintainer:	Eugene Minkovskii <emin@mccme.ru>
-" Last Change:	2012 May 18
-" Version: 0.1
-" ==========================================================================
+" Language:           MetaPost
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Former Maintainers: Eugene Minkovskii <emin@mccme.ru>
+" Last Change:        2016 Oct 01
+" Version: 0.2
 
-" Identation Rules: {{{1
-" First of all, MetaPost language don't expect any identation rules.
-" This screept need for you only if you (not MetaPost) need to do
-" exactly code. If you don't need to use indentation, see
-" :help filetype-indent-off
-"
-" Note: Every rules of identation in MetaPost or TeX languages (and in some
-" other of course) is very subjective. I can release only my vision of this
-" promlem.
-"
-" ..........................................................................
-" Example of correct (by me) identation {{{2
-" shiftwidth=4
-" ==========================================================================
-" for i=0 upto 99:
-"     z[i] = (0,1u) rotated (i*360/100);
-" endfor
-" draw z0 -- z10 -- z20
-"         withpen ...     % <- 2sw because breaked line
-"         withcolor ...;  % <- same as previous
-" draw z0 for i=1 upto 99:
-"             -- z[i]             % <- 1sw from left end of 'for' satement
-"         endfor withpen ...      % <- 0sw from left end of 'for' satement
-"                 withcolor ...;  % <- 2sw because breaked line
-" draw if One:     % <- This is internal if (like 'for' above)
-"          one
-"      elsif Other:
-"          other
-"      fi withpen ...;
-" if one:          % <- This is external if
-"     draw one;
-" elseif other:
-"     draw other;
-" fi
-" draw z0; draw z1;
-" }}}
-" }}}
-
-" Only load this indent file when no other was loaded.
 if exists("b:did_indent")
   finish
 endif
 let b:did_indent = 1
 
 setlocal indentexpr=GetMetaPostIndent()
-setlocal indentkeys+=;,<:>,=if,=for,=def,=end,=else,=fi
+setlocal indentkeys+==end,=else,=fi,=fill,0),0]
+
+let b:undo_indent = "setl indentkeys< indentexpr<"
 
 " Only define the function once.
 if exists("*GetMetaPostIndent")
@@ -59,151 +22,332 @@ endif
 let s:keepcpo= &cpo
 set cpo&vim
 
-" Auxiliary Definitions: {{{1
-function! MetaNextNonblankNoncomment(pos)
-  " Like nextnonblank() but ignore comment lines
-  let tmp = nextnonblank(a:pos)
-  while tmp && getline(tmp) =~ '^\s*%'
-    let tmp = nextnonblank(tmp+1)
+function GetMetaPostIndent()
+  let ignorecase_save = &ignorecase
+  try
+    let &ignorecase = 0
+    return GetMetaPostIndentIntern()
+  finally
+    let &ignorecase = ignorecase_save
+  endtry
+endfunc
+
+" Regexps {{{
+" Note: the next three variables are made global so that a user may add
+" further keywords.
+"
+" Example:
+"
+"    Put these in ~/.vim/after/indent/mp.vim
+"
+"    let g:mp_open_tag .= '\|\<begintest\>'
+"    let g:mp_close_tag .= '\|\<endtest\>'
+
+" Expressions starting indented blocks
+let g:mp_open_tag = ''
+      \ . '\<if\>'
+      \ . '\|\<else\%[if]\>'
+      \ . '\|\<for\%(\|ever\|suffixes\)\>'
+      \ . '\|\<begingroup\>'
+      \ . '\|\<\%(\|var\|primary\|secondary\|tertiary\)def\>'
+      \ . '\|^\s*\<begin\%(fig\|graph\|glyph\|char\|logochar\)\>'
+      \ . '\|[([{]'
+
+" Expressions ending indented blocks
+let g:mp_close_tag = ''
+      \ . '\<fi\>'
+      \ . '\|\<else\%[if]\>'
+      \ . '\|\<end\%(\|for\|group\|def\|fig\|char\|logochar\|glyph\|graph\)\>'
+      \ . '\|[)\]}]'
+
+" Statements that may span multiple lines and are ended by a semicolon. To
+" keep this list short, statements that are unlikely to be very long or are
+" not very common (e.g., keywords like `interim` or `showtoken`) are not
+" included.
+"
+" The regex for assignments and equations (the last branch) is tricky, because
+" it must not match things like `for i :=`, `if a=b`, `def...=`, etc... It is
+" not perfect, but it works reasonably well.
+let g:mp_statement = ''
+      \ . '\<\%(\|un\|cut\)draw\>'
+      \ . '\|\<\%(\|un\)fill\%[draw]\>'
+      \ . '\|\<draw\%(dbl\)\=arrow\>'
+      \ . '\|\<clip\>'
+      \ . '\|\<addto\>'
+      \ . '\|\<save\>'
+      \ . '\|\<setbounds\>'
+      \ . '\|\<message\>'
+      \ . '\|\<errmessage\>'
+      \ . '\|\<errhelp\>'
+      \ . '\|\<fontmapline\>'
+      \ . '\|\<pickup\>'
+      \ . '\|\<show\>'
+      \ . '\|\<special\>'
+      \ . '\|\<write\>'
+      \ . '\|\%(^\|;\)\%([^;=]*\%('.g:mp_open_tag.'\)\)\@!.\{-}:\=='
+
+" A line ends with zero or more spaces, possibly followed by a comment.
+let s:eol = '\s*\%($\|%\)'
+" }}}
+
+" Auxiliary functions {{{
+" Returns 1 if (0-based) position immediately preceding `pos` in `line` is
+" inside a string or a comment; returns 0 otherwise.
+
+" This is the function that is called more often when indenting, so it is
+" critical that it is efficient. The method we use is significantly faster
+" than using syntax attributes, and more general (it does not require
+" syntax_items). It is also faster than using a single regex matching an even
+" number of quotes. It helps that MetaPost strings cannot span more than one
+" line and cannot contain escaped quotes.
+function! s:CommentOrString(line, pos)
+  let in_string = 0
+  let q = stridx(a:line, '"')
+  let c = stridx(a:line, '%')
+  while q >= 0 && q < a:pos
+    if c >= 0 && c < q
+      if in_string " Find next percent symbol
+        let c = stridx(a:line, '%', q + 1)
+      else " Inside comment
+        return 1
+      endif
+    endif
+    let in_string = 1 - in_string
+    let q = stridx(a:line, '"', q + 1) " Find next quote
   endwhile
-  return tmp
+  return in_string || (c >= 0 && c <= a:pos)
 endfunction
 
-function! MetaPrevNonblankNoncomment(pos)
-  " Like prevnonblank() but ignore comment lines
-  let tmp = prevnonblank(a:pos)
-  while tmp && getline(tmp) =~ '^\s*%'
-    let tmp = prevnonblank(tmp-1)
+" Find the first non-comment non-blank line before the current line. Skip also
+" verbatimtex/btex... etex blocks.
+function! s:PrevNonBlankNonComment(lnum)
+  let l:lnum = prevnonblank(a:lnum - 1)
+  while getline(l:lnum) =~# '^\s*%' ||
+        \ synIDattr(synID(a:lnum, 1, 1), "name") =~# '^mpTeXinsert$\|^tex\|^Delimiter'
+    let l:lnum = prevnonblank(l:lnum - 1)
   endwhile
-  return tmp
+  return l:lnum
 endfunction
 
-function! MetaSearchNoncomment(pattern, ...)
-  " Like search() but ignore commented areas
-  if a:0
-    let flags = a:1
-  elseif &wrapscan
-    let flags = "w"
-  else
-    let flags = "W"
-  endif
-  let cl  = line(".")
-  let cc  = col(".")
-  let tmp = search(a:pattern, flags)
-  while tmp && synIDattr(synID(line("."), col("."), 1), "name") =~
-        \ 'm[fp]\(Comment\|TeXinsert\|String\)'
-    let tmp = search(a:pattern, flags)
+" Returns true if the last tag appearing in the line is an open tag; returns
+" false otherwise.
+function! s:LastTagIsOpen(line)
+  let o = s:LastValidMatchEnd(a:line, g:mp_open_tag, 0)
+  if o == - 1 | return v:false | endif
+  return s:LastValidMatchEnd(a:line, g:mp_close_tag, o) < 0
+endfunction
+
+" A simple, efficient and quite effective heuristics is used to test whether
+" a line should cause the next line to be indented: count the "opening tags"
+" (if, for, def, ...) in the line, count the "closing tags" (endif, endfor,
+" ...) in the line, and compute the difference. We call the result the
+" "weight" of the line. If the weight is positive, then the next line should
+" most likely be indented. Note that `else` and `elseif` are both opening and
+" closing tags, so they "cancel out" in almost all cases, the only exception
+" being a leading `else[if]`, which is counted as an opening tag, but not as
+" a closing tag (so that, for instance, a line containing a single `else:`
+" will have weight equal to one, not zero). We do not treat a trailing
+" `else[if]` in any special way, because lines ending with an open tag are
+" dealt with separately before this function is called (see
+" GetMetaPostIndentIntern()).
+"
+" Example:
+"
+"     forsuffixes $=a,b: if x.$ = y.$ : draw else: fill fi
+"       % This line will be indented because |{forsuffixes,if,else}| > |{else,fi}| (3 > 2)
+"     endfor
+
+function! s:Weight(line)
+  let [o, i] = [0, s:ValidMatchEnd(a:line, g:mp_open_tag, 0)]
+  while i > 0
+    let o += 1
+    let i = s:ValidMatchEnd(a:line, g:mp_open_tag, i)
   endwhile
-  if !tmp
-    call cursor(cl,cc)
+  let [c, i] = [0, matchend(a:line, '^\s*\<else\%[if]\>')] " Skip a leading else[if]
+  let i = s:ValidMatchEnd(a:line, g:mp_close_tag, i)
+  while i > 0
+    let c += 1
+    let i = s:ValidMatchEnd(a:line, g:mp_close_tag, i)
+  endwhile
+  return o - c
+endfunction
+
+" Similar to matchend(), but skips strings and comments.
+" line: a String
+function! s:ValidMatchEnd(line, pat, start)
+  let i = matchend(a:line, a:pat, a:start)
+  while i > 0 && s:CommentOrString(a:line, i)
+    let i = matchend(a:line, a:pat, i)
+  endwhile
+  return i
+endfunction
+
+" Like s:ValidMatchEnd(), but returns the end position of the last (i.e.,
+" rightmost) match.
+function! s:LastValidMatchEnd(line, pat, start)
+  let last_found = -1
+  let i = matchend(a:line, a:pat, a:start)
+  while i > 0
+    if !s:CommentOrString(a:line, i)
+      let last_found = i
+    endif
+    let i = matchend(a:line, a:pat, i)
+  endwhile
+  return last_found
+endfunction
+
+function! s:DecreaseIndentOnClosingTag(curr_indent)
+  let cur_text = getline(v:lnum)
+  if cur_text =~# '^\s*\%('.g:mp_close_tag.'\)'
+    return max([a:curr_indent - shiftwidth(), 0])
   endif
-  return tmp
+  return a:curr_indent
 endfunction
 " }}}
 
-function! GetMetaPostIndent()
-  " not indent in comment ???
-  if synIDattr(synID(line("."), col("."), 1), "name") =~
-        \ 'm[fp]\(Comment\|TeXinsert\|String\)'
-    return -1
-  endif
-  " Some RegExps: {{{1
-  " end_of_item: all of end by ';'
-  "            + all of end by :endfor, :enddef, :endfig, :endgroup, :fi
-  "            + all of start by :beginfig(num), :begingroup
-  "            + all of start by :for, :if, :else, :elseif and end by ':'
-  "            + all of start by :def, :vardef             and end by '='
-  let end_of_item = '\('                              .
-        \ ';\|'                                       .
-        \ '\<\(end\(for\|def\|fig\|group\)\|fi\)\>\|' .
-        \ '\<begin\(group\>\|fig\s*(\s*\d\+\s*)\)\|'  .
-        \ '\<\(for\|if\|else\(if\)\=\)\>.\+:\|'       .
-        \ '\<\(var\)\=def\>.\+='                      . '\)'
-  " }}}
-  " Save: current position {{{1
-  let cl = line   (".")
-  let cc = col    (".")
-  let cs = getline(".")
-  " if it is :beginfig or :endfig use zero indent
-  if  cs =~ '^\s*\(begin\|end\)fig\>'
-    return 0
-  endif
-  " }}}
-  " Initialise: ind variable {{{1
-  " search previous item not in current line
-  let p_semicol_l = MetaSearchNoncomment(end_of_item,"bW")
-  while p_semicol_l == cl
-    let p_semicol_l = MetaSearchNoncomment(end_of_item,"bW")
-  endwhile
-  " if this is first item in program use zero indent
-  if !p_semicol_l
-    return 0
-  endif
-  " if this is multiline item, remember first indent
-  if MetaNextNonblankNoncomment(p_semicol_l+1) < cl
-    let ind = indent(MetaNextNonblankNoncomment(p_semicol_l+1))
-  " else --- search pre-previous item for search first line in previous item
-  else
-    " search pre-previous item not in current line
-    let pp_semicol_l = MetaSearchNoncomment(end_of_item,"bW")
-    while pp_semicol_l == p_semicol_l
-      let pp_semicol_l = MetaSearchNoncomment(end_of_item,"bW")
-    endwhile
-    " if we find pre-previous item, remember indent of previous item
-    " else --- remember zero
-    if pp_semicol_l
-      let ind = indent(MetaNextNonblankNoncomment(line(".")+1))
-    else
-      let ind = 0
-    endif
-  endif
-  " }}}
-  " Increase Indent: {{{1
-  " if it is an internal/external :for or :if statements {{{2
-  let pnn_s = getline(MetaPrevNonblankNoncomment(cl-1))
-  if  pnn_s =~ '\<\(for\|if\)\>.\+:\s*\($\|%\)'
-    let ind = match(pnn_s, '\<\(for\|if\)\>.\+:\s*\($\|%\)') + &sw
-  " }}}
-  " if it is a :def, :vardef, :beginfig, :begingroup, :else, :elseif {{{2
-  elseif pnn_s =~ '^\s*\('                       .
-        \ '\(var\)\=def\|'                       .
-        \ 'begin\(group\|fig\s*(\s*\d\+\s*)\)\|' .
-        \ 'else\(if\)\='                         . '\)\>'
-    let ind = ind + &sw
-  " }}}
-  " if it is a broken line {{{2
-  elseif pnn_s !~ end_of_item.'\s*\($\|%\)'
-    let ind = ind + (2 * &sw)
-  endif
-  " }}}
-  " }}}
-  " Decrease Indent: {{{1
-  " if this is :endfor or :enddef statements {{{2
-  " this is correct because :def cannot be inside :for
-  if  cs  =~ '\<end\(for\|def\)\=\>'
-    call MetaSearchNoncomment('\<for\>.\+:\s*\($\|%\)' . '\|' .
-                            \ '^\s*\(var\)\=def\>',"bW")
-    if col(".") > 1
-      let ind = col(".") - 1
-    else
-      let ind = indent(".")
-    endif
-  " }}}
-  " if this is :fi, :else, :elseif statements {{{2
-  elseif cs =~ '\<\(else\(if\)\=\|fi\)\>'
-    call MetaSearchNoncomment('\<if\>.\+:\s*\($\|%\)',"bW")
-    let ind = col(".") - 1
-  " }}}
-  " if this is :endgroup statement {{{2
-  elseif cs =~ '^\s*endgroup\>'
-    let ind = ind - &sw
-  endif
-  " }}}
-  " }}}
-
-  return ind
-endfunction
+" Main function {{{
 "
+" Note: Every rule of indentation in MetaPost is very subjective. We might get
+" creative, but things get murky very soon (there are too many corner cases).
+" So, we provide a means for the user to decide what to do when this script
+" doesn't get it. We use a simple idea: use '%>', '%<' and '%=' to explicitly
+" control indentation. The '<' and '>' symbols may be repeated many times
+" (e.g., '%>>' will cause the next line to be indented twice).
+"
+" By using '%>...', '%<...' and '%=', the indentation the user wants is
+" preserved by commands like gg=G, even if it does not follow the rules of
+" this script.
+"
+" Example:
+"
+"    shiftwidth=4
+"    def foo =
+"        makepen(subpath(T-n,t) of r %>
+"            shifted .5down %>
+"                --subpath(t,T) of r shifted .5up -- cycle) %<<
+"        withcolor black
+"    enddef
+"
+" The default indentation of the previous example would be:
+"
+"    def foo =
+"        makepen(subpath(T-n,t) of r
+"        shifted .5down
+"        --subpath(t,T) of r shifted .5up -- cycle)
+"        withcolor black
+"    enddef
+"
+" Personally, I prefer the latter, but anyway...
+function! GetMetaPostIndentIntern()
+
+  " This is the reference line relative to which the current line is indented
+  " (but see below).
+  let lnum = s:PrevNonBlankNonComment(v:lnum)
+
+  " At the start of the file use zero indent.
+  if lnum == 0
+    return 0
+  endif
+
+  let prev_text = getline(lnum)
+
+  " User-defined overrides take precedence over anything else.
+  " See above for an example.
+  let j = match(prev_text, '%[<>=]')
+  if j > 0
+    let i = strlen(matchstr(prev_text, '%>\+', j)) - 1
+    if i > 0
+      return indent(lnum) + i * shiftwidth()
+    endif
+
+    let i = strlen(matchstr(prev_text, '%<\+', j)) - 1
+    if i > 0
+      return max([indent(lnum) - i * shiftwidth(), 0])
+    endif
+
+    if match(prev_text, '%=', j)
+      return indent(lnum)
+    endif
+  endif
+
+  " If the reference line ends with an open tag, indent.
+  "
+  " Example:
+  "
+  " if c:
+  "     0
+  " else:
+  "     1
+  " fi if c2: % Note that this line has weight equal to zero.
+  "     ...   % This line will be indented
+  if s:LastTagIsOpen(prev_text)
+    return s:DecreaseIndentOnClosingTag(indent(lnum) + shiftwidth())
+  endif
+
+  " Lines with a positive weight are unbalanced and should likely be indented.
+  "
+  " Example:
+  "
+  " def f = enddef for i = 1 upto 5: if x[i] > 0: 1 else: 2 fi
+  "     ... % This line will be indented (because of the unterminated `for`)
+  if s:Weight(prev_text) > 0
+    return s:DecreaseIndentOnClosingTag(indent(lnum) + shiftwidth())
+  endif
+
+  " Unterminated statements cause indentation to kick in.
+  "
+  " Example:
+  "
+  " draw unitsquare
+  "     withcolor black; % This line is indented because of `draw`.
+  " x := a + b + c
+  "     + d + e;         % This line is indented because of `:=`.
+  "
+  let i = s:LastValidMatchEnd(prev_text, g:mp_statement, 0)
+  if i >= 0 " Does the line contain a statement?
+    if s:ValidMatchEnd(prev_text, ';', i) < 0 " Is the statement unterminated?
+      return indent(lnum) + shiftwidth()
+    else
+      return s:DecreaseIndentOnClosingTag(indent(lnum))
+    endif
+  endif
+
+  " Deal with the special case of a statement spanning multiple lines. If the
+  " current reference line L ends with a semicolon, search backwards for
+  " another semicolon or a statement keyword. If the latter is found first,
+  " its line is used as the reference line for indenting the current line
+  " instead of L.
+  "
+  "  Example:
+  "
+  "  if cond:
+  "    draw if a: z0 else: z1 fi
+  "        shifted S
+  "        scaled T;      % L
+  "
+  "    for i = 1 upto 3:  % <-- Current line: this gets the same indent as `draw ...`
+  "
+  " NOTE: we get here if and only if L does not contain a statement (among
+  " those listed in g:mp_statement).
+  if s:ValidMatchEnd(prev_text, ';'.s:eol, 0) >= 0 " L ends with a semicolon
+    let stm_lnum = s:PrevNonBlankNonComment(lnum)
+    while stm_lnum > 0
+      let prev_text = getline(stm_lnum)
+      let sc_pos = s:LastValidMatchEnd(prev_text, ';', 0)
+      let stm_pos = s:ValidMatchEnd(prev_text, g:mp_statement, sc_pos)
+      if stm_pos > sc_pos
+        let lnum = stm_lnum
+        break
+      elseif sc_pos > stm_pos
+        break
+      endif
+      let stm_lnum = s:PrevNonBlankNonComment(stm_lnum)
+    endwhile
+  endif
+
+  return s:DecreaseIndentOnClosingTag(indent(lnum))
+endfunction
+" }}}
 
 let &cpo = s:keepcpo
 unlet s:keepcpo
diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
index 232e727e81..2777944971 100644
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,7 +2,7 @@
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2016 Aug 30
+" Last Change: 2016 Sep 27
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debsources.vim
 
 " Standard syntax initialization
@@ -39,7 +39,7 @@ let s:unsupported = [
 let &cpo=s:cpo
 
 " Match uri's
-syn match debsourcesUri            +\(http://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' 	<>"]\++
+syn match debsourcesUri            +\(https\?://\|ftp://\|[rs]sh://\|debtorrent://\|\(cdrom\|copy\|file\):\)[^' 	<>"]\++
 exe 'syn match debsourcesDistrKeyword   +\([[:alnum:]_./]*\)\('. join(s:supported, '\|'). '\)\([-[:alnum:]_./]*\)+'
 exe 'syn match debsourcesUnsupportedDistrKeyword +\([[:alnum:]_./]*\)\('. join(s:unsupported, '\|') .'\)\([-[:alnum:]_./]*\)+'
 
diff --git a/runtime/syntax/mf.vim b/runtime/syntax/mf.vim
index 5f600e2ebe..3589e4db3c 100644
--- a/runtime/syntax/mf.vim
+++ b/runtime/syntax/mf.vim
@@ -1,184 +1,295 @@
 " Vim syntax file
-" Language:	Metafont
-" Maintainer:	Andreas Scherer <andreas.scherer@pobox.com>
-" Last Change:	April 25, 2001
+" Language:           METAFONT
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Former Maintainers: Andreas Scherer <andreas.scherer@pobox.com>
+" Last Change:        2016 Oct 1
 
-" quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
 endif
 
-" Metafont 'primitives' as defined in chapter 25 of 'The METAFONTbook'
+syn iskeyword @,_
+
+" METAFONT 'primitives' as defined in chapter 25 of 'The METAFONTbook'
 " Page 210: 'boolean expressions'
-syn keyword mfBoolExp true false known unknown odd charexists not and or
+syn keyword mfBoolExp        and charexists false known not odd or true unknown
 
 " Page 210: 'numeric expression'
-syn keyword mfNumExp normaldeviate length ASCII oct hex angle turningnumber
-syn keyword mfNumExp totalweight directiontime xpart ypart xxpart xypart
-syn keyword mfNumExp yxpart yypart sqrt sind cosd mlog mexp floor
-syn keyword mfNumExp uniformdeviate
+syn keyword mfNumExp         ASCII angle cosd directiontime floor hex length
+syn keyword mfNumExp         mexp mlog normaldeviate oct sind sqrt totalweight
+syn keyword mfNumExp         turningnumber uniformdeviate xpart xxpart xypart
+syn keyword mfNumExp         ypart yxpart yypart
 
 " Page 211: 'internal quantities'
-syn keyword mfInternal tracingtitles tracingequations tracingcapsules
-syn keyword mfInternal tracingchoices tracingspecs tracingpens
-syn keyword mfInternal tracingcommands tracingrestores tracingmacros
-syn keyword mfInternal tracingedges tracingoutput tracingonline tracingstats
-syn keyword mfInternal pausing showstopping fontmaking proofing
-syn keyword mfInternal turningcheck warningcheck smoothing autorounding
-syn keyword mfInternal granularity fillin year month day time
-syn keyword mfInternal charcode charext charwd charht chardp charic
-syn keyword mfInternal chardx chardy designsize hppp vppp xoffset yoffset
-syn keyword mfInternal boundarychar
+syn keyword mfInternal       autorounding boundarychar charcode chardp chardx
+syn keyword mfInternal       chardy charext charht charic charwd day designsize
+syn keyword mfInternal       fillin fontmaking granularity hppp jobname month
+syn keyword mfInternal       pausing proofing showstopping smoothing time
+syn keyword mfInternal       tracingcapsules tracingchoices tracingcommands
+syn keyword mfInternal       tracingedges tracingequations tracingmacros
+syn keyword mfInternal       tracingonline tracingoutput tracingpens
+syn keyword mfInternal       tracingrestores tracingspecs tracingstats
+syn keyword mfInternal       tracingtitles turningcheck vppp warningcheck
+syn keyword mfInternal       xoffset year yoffset
 
 " Page 212: 'pair expressions'
-syn keyword mfPairExp point of precontrol postcontrol penoffset rotated
-syn keyword mfPairExp scaled shifted slanted transformed xscaled yscaled
-syn keyword mfPairExp zscaled
+syn keyword mfPairExp        of penoffset point postcontrol precontrol rotated
+syn keyword mfPairExp        scaled shifted slanted transformed xscaled yscaled
+syn keyword mfPairExp        zscaled
 
 " Page 213: 'path expressions'
-syn keyword mfPathExp makepath reverse subpath curl tension atleast
-syn keyword mfPathExp controls cycle
+syn keyword mfPathExp        atleast controls curl cycle makepath reverse
+syn keyword mfPathExp        subpath tension
 
 " Page 214: 'pen expressions'
-syn keyword mfPenExp nullpen pencircle makepen
+syn keyword mfPenExp         makepen nullpen pencircle
 
-" Page 214: 'picutre expressions'
-syn keyword mfPicExp nullpicture
+" Page 214: 'picture expressions'
+syn keyword mfPicExp         nullpicture
 
 " Page 214: 'string expressions'
-syn keyword mfStringExp jobname readstring str char decimal substring
+syn keyword mfStringExp      char decimal readstring str substring
 
 " Page 217: 'commands and statements'
-syn keyword mfCommand end dump save interim newinternal randomseed let
-syn keyword mfCommand delimiters outer everyjob show showvariable showtoken
-syn keyword mfCommand showdependencies showstats message errmessage errhelp
-syn keyword mfCommand batchmode nonstopmode scrollmode errorstopmode
-syn keyword mfCommand addto also contour doublepath withpen withweight cull
-syn keyword mfCommand keeping dropping display inwindow openwindow at from to
-syn keyword mfCommand shipout special numspecial
+syn keyword mfCommand        addto also at batchmode contour cull delimiters
+syn keyword mfCommand        display doublepath dropping dump end errhelp
+syn keyword mfCommand        errmessage errorstopmode everyjob from interim
+syn keyword mfCommand        inwindow keeping let message newinternal
+syn keyword mfCommand        nonstopmode numspecial openwindow outer randomseed
+syn keyword mfCommand        save scrollmode shipout show showdependencies
+syn keyword mfCommand        showstats showtoken showvariable special to withpen
+syn keyword mfCommand        withweight
 
 " Page 56: 'types'
-syn keyword mfType boolean numeric pair path pen picture string transform
+syn keyword mfType           boolean numeric pair path pen picture string
+syn keyword mfType           transform
 
 " Page 155: 'grouping'
-syn keyword mfStatement begingroup endgroup
+syn keyword mfStatement      begingroup endgroup
 
 " Page 165: 'definitions'
-syn keyword mfDefinition enddef def expr suffix text primary secondary
-syn keyword mfDefinition tertiary vardef primarydef secondarydef tertiarydef
+syn keyword mfDefinition     def enddef expr primary primarydef secondary
+syn keyword mfDefinition     secondarydef suffix tertiary tertiarydef text
+syn keyword mfDefinition     vardef
 
 " Page 169: 'conditions and loops'
-syn keyword mfCondition if fi else elseif endfor for forsuffixes forever
-syn keyword mfCondition step until exitif
+syn keyword mfCondition      else elseif endfor exitif fi for forever
+syn keyword mfCondition      forsuffixes if step until
 
 " Other primitives listed in the index
-syn keyword mfPrimitive charlist endinput expandafter extensible
-syn keyword mfPrimitive fontdimen headerbyte inner input intersectiontimes
-syn keyword mfPrimitive kern ligtable quote scantokens skipto
+syn keyword mfPrimitive      charlist endinput expandafter extensible fontdimen
+syn keyword mfPrimitive      headerbyte inner input intersectiontimes kern
+syn keyword mfPrimitive      ligtable quote scantokens skipto
+
+" Implicit suffix parameters
+syn match   mfSuffixParam    "@#\|#@\|@"
+
+" These are just tags, but given their special status, we
+" highlight them as variables
+syn keyword mfVariable       x y
 
 " Keywords defined by plain.mf (defined on pp.262-278)
-if !exists("plain_mf_macros")
-  let plain_mf_macros = 1 " Set this to '0' if your source gets too colourful
-			  " metapost.vim does so to turn off Metafont macros
+if get(g:, "plain_mf_macros", 1)
+  syn keyword mfDef          addto_currentpicture beginchar capsule_def
+  syn keyword mfDef          change_width clear_pen_memory clearit clearpen
+  syn keyword mfDef          clearxy culldraw cullit cutdraw
+  syn keyword mfDef          define_blacker_pixels define_corrected_pixels
+  syn keyword mfDef          define_good_x_pixels define_good_y_pixels
+  syn keyword mfDef          define_horizontal_corrected_pixels define_pixels
+  syn keyword mfDef          define_whole_blacker_pixels define_whole_pixels
+  syn keyword mfDef          define_whole_vertical_blacker_pixels
+  syn keyword mfDef          define_whole_vertical_pixels downto draw drawdot
+  syn keyword mfDef          endchar erase exitunless fill filldraw fix_units
+  syn keyword mfDef          flex font_coding_scheme font_extra_space
+  syn keyword mfDef          font_identifier font_normal_shrink
+  syn keyword mfDef          font_normal_space font_normal_stretch font_quad
+  syn keyword mfDef          font_size font_slant font_x_height gfcorners gobble
+  syn keyword mfDef          hide imagerules interact italcorr killtext
+  syn keyword mfDef          loggingall lowres_fix makebox makegrid maketicks
+  syn keyword mfDef          mode_def mode_setup nodisplays notransforms numtok
+  syn keyword mfDef          openit penrazor pensquare penstroke pickup
+  syn keyword mfDef          proofoffset proofrule range reflectedabout
+  syn keyword mfDef          rotatedaround screenchars screenrule screenstrokes
+  syn keyword mfDef          shipit showit smode stop superellipse takepower
+  syn keyword mfDef          tracingall tracingnone undraw undrawdot unfill
+  syn keyword mfDef          unfilldraw upto z
+  syn match   mfDef          "???"
+  syn keyword mfVardef       bot byte ceiling counterclockwise cutoff decr dir
+  syn keyword mfVardef       direction directionpoint grayfont hround incr
+  syn keyword mfVardef       interpath inverse labelfont labels lft magstep
+  " Note: nodot is not a vardef, it is used as in makelabel.lft.nodot("5",z5)
+  " (METAFONT only)
+  syn keyword mfVardef       makelabel max min nodot penlabels penpos
+  syn keyword mfVardef       proofrulethickness round rt savepen slantfont solve
+  syn keyword mfVardef       tensepath titlefont top unitvector vround whatever
+  syn match   mpVardef       "\<good\.\%(x\|y\|lft\|rt\|top\|bot\)\>"
+  syn keyword mfPrimaryDef   div dotprod gobbled mod
+  syn keyword mfSecondaryDef intersectionpoint
+  syn keyword mfTertiaryDef  softjoin thru
+  syn keyword mfNewInternal  blacker currentwindow displaying eps epsilon
+  syn keyword mfNewInternal  infinity join_radius number_of_modes o_correction
+  syn keyword mfNewInternal  pen_bot pen_lft pen_rt pen_top pixels_per_inch
+  syn keyword mfNewInternal  screen_cols screen_rows tolerance
+  " Predefined constants
+  syn keyword mfConstant     base_name base_version blankpicture ditto down
+  syn keyword mfConstant     fullcircle halfcircle identity left lowres origin
+  syn keyword mfConstant     penspeck proof quartercircle right rulepen smoke
+  syn keyword mfConstant     unitpixel unitsquare up
+  " Other predefined variables
+  syn keyword mfVariable     aspect_ratio currentpen extra_beginchar
+  syn keyword mfVariable     extra_endchar currentpen_path currentpicture
+  syn keyword mfVariable     currenttransform d extra_setup h localfont mag mode
+  syn keyword mfVariable     mode_name w
+  " let statements:
+  syn keyword mfnumExp       abs
+  syn keyword mfPairExp      rotatedabout
+  syn keyword mfCommand      bye relax
 endif
-if plain_mf_macros
-  syn keyword mfMacro abs addto_currentpicture aspect_ratio base_name
-  syn keyword mfMacro base_version beginchar blacker blankpicture bot bye byte
-  syn keyword mfMacro capsule_def ceiling change_width clear_pen_memory clearit
-  syn keyword mfMacro clearpen clearxy counterclockwise culldraw cullit
-  syn keyword mfMacro currentpen currentpen_path currentpicture
-  syn keyword mfMacro currenttransform currentwindow cutdraw cutoff d decr
-  syn keyword mfMacro define_blacker_pixels define_corrected_pixels
-  syn keyword mfMacro define_good_x_pixels define_good_y_pixels
-  syn keyword mfMacro define_horizontal_corrected_pixels define_pixels
-  syn keyword mfMacro define_whole_blacker_pixels define_whole_pixels
-  syn keyword mfMacro define_whole_vertical_blacker_pixels
-  syn keyword mfMacro define_whole_vertical_pixels dir direction directionpoint
-  syn keyword mfMacro displaying ditto div dotprod down downto draw drawdot
-  syn keyword mfMacro endchar eps epsilon extra_beginchar extra_endchar
-  syn keyword mfMacro extra_setup erase exitunless fill filldraw fix_units flex
-  syn keyword mfMacro font_coding_scheme font_extra_space font_identifier
-  syn keyword mfMacro font_normal_shrink font_normal_space font_normal_stretch
-  syn keyword mfMacro font_quad font_setup font_size font_slant font_x_height
-  syn keyword mfMacro fullcircle generate gfcorners gobble gobbled grayfont h
-  syn keyword mfMacro halfcircle hide hround identity image_rules incr infinity
-  syn keyword mfMacro interact interpath intersectionpoint inverse italcorr
-  syn keyword mfMacro join_radius killtext labelfont labels left lft localfont
-  syn keyword mfMacro loggingall lowres lowres_fix mag magstep makebox makegrid
-  syn keyword mfMacro makelabel maketicks max min mod mode mode_def mode_name
-  syn keyword mfMacro mode_setup nodisplays notransforms number_of_modes numtok
-  syn keyword mfMacro o_correction openit origin pen_bot pen_lft pen_rt pen_top
-  syn keyword mfMacro penlabels penpos penrazor penspeck pensquare penstroke
-  syn keyword mfMacro pickup pixels_per_inch proof proofoffset proofrule
-  syn keyword mfMacro proofrulethickness quartercircle range reflectedabout
-  syn keyword mfMacro relax right rotatedabout rotatedaround round rt rulepen
-  syn keyword mfMacro savepen screenchars screen_rows screen_cols screenrule
-  syn keyword mfMacro screenstrokes shipit showit slantfont smode smoke softjoin
-  syn keyword mfMacro solve stop superellipse takepower tensepath titlefont
-  syn keyword mfMacro tolerance top tracingall tracingnone undraw undrawdot
-  syn keyword mfMacro unfill unfilldraw unitpixel unitsquare unitvector up upto
-  syn keyword mfMacro vround w whatever
+
+" By default, METAFONT loads modes.mf, too
+if get(g:, "plain_mf_modes", 1)
+  syn keyword mfConstant     APSSixMed AgfaFourZeroZero AgfaThreeFourZeroZero
+  syn keyword mfConstant     AtariNineFive AtariNineSix AtariSLMEightZeroFour
+  syn keyword mfConstant     AtariSMOneTwoFour CItohEightFiveOneZero
+  syn keyword mfConstant     CItohThreeOneZero CanonBJCSixZeroZero CanonCX
+  syn keyword mfConstant     CanonEX CanonLBPLX CanonLBPTen CanonSX ChelgraphIBX
+  syn keyword mfConstant     CompugraphicEightSixZeroZero
+  syn keyword mfConstant     CompugraphicNineSixZeroZero DD DEClarge DECsmall
+  syn keyword mfConstant     DataDiscNew EightThree EpsonAction
+  syn keyword mfConstant     EpsonLQFiveZeroZeroLo EpsonLQFiveZeroZeroMed
+  syn keyword mfConstant     EpsonMXFX EpsonSQEightSevenZero EpsonStylusPro
+  syn keyword mfConstant     EpsonStylusProHigh EpsonStylusProLow
+  syn keyword mfConstant     EpsonStylusProMed FourFour GThreefax HPDeskJet
+  syn keyword mfConstant     HPLaserJetIIISi IBMFourTwoFiveZero IBMFourTwoOneSix
+  syn keyword mfConstant     IBMFourTwoThreeZero IBMFourZeroOneNine
+  syn keyword mfConstant     IBMFourZeroThreeNine IBMFourZeroTwoNine
+  syn keyword mfConstant     IBMProPrinter IBMSixOneFiveFour IBMSixSixSevenZero
+  syn keyword mfConstant     IBMThreeEightOneTwo IBMThreeEightTwoZero
+  syn keyword mfConstant     IBMThreeOneNineThree IBMThreeOneSevenNine
+  syn keyword mfConstant     IBMUlfHolleberg LASevenFive LNOthreR LNOthree
+  syn keyword mfConstant     LNZeroOne LNZeroThree LPSFourZero LPSTwoZero
+  syn keyword mfConstant     LexmarkFourZeroThreeNine LexmarkOptraR
+  syn keyword mfConstant     LexmarkOptraS LinotypeLThreeThreeZero
+  syn keyword mfConstant     LinotypeOneZeroZero LinotypeOneZeroZeroLo
+  syn keyword mfConstant     LinotypeThreeZeroZeroHi MacTrueSize NeXTprinter
+  syn keyword mfConstant     NeXTscreen NecTwoZeroOne Newgen NineOne
+  syn keyword mfConstant     OCESixSevenFiveZeroPS OneTwoZero OneZeroZero
+  syn keyword mfConstant     PrintwareSevenTwoZeroIQ Prism QMSOneSevenTwoFive
+  syn keyword mfConstant     QMSOneSevenZeroZero QMSTwoFourTwoFive RicohA
+  syn keyword mfConstant     RicohFortyEighty RicohFourZeroEightZero RicohLP
+  syn keyword mfConstant     SparcPrinter StarNLOneZero VAXstation VTSix
+  syn keyword mfConstant     VarityperFiveZeroSixZeroW
+  syn keyword mfConstant     VarityperFourThreeZeroZeroHi
+  syn keyword mfConstant     VarityperFourThreeZeroZeroLo
+  syn keyword mfConstant     VarityperFourTwoZeroZero VarityperSixZeroZero
+  syn keyword mfConstant     XeroxDocutech XeroxEightSevenNineZero
+  syn keyword mfConstant     XeroxFourZeroFiveZero XeroxNineSevenZeroZero
+  syn keyword mfConstant     XeroxPhaserSixTwoZeroZeroDP XeroxThreeSevenZeroZero
+  syn keyword mfConstant     Xerox_world agfafzz agfatfzz amiga aps apssixhi
+  syn keyword mfConstant     aselect atariezf atarinf atarins atariotf bitgraph
+  syn keyword mfConstant     bjtenex bjtzzex bjtzzl bjtzzs boise canonbjc
+  syn keyword mfConstant     canonex canonlbp cg cgl cgnszz citohtoz corona crs
+  syn keyword mfConstant     cthreeten cx datadisc declarge decsmall deskjet
+  syn keyword mfConstant     docutech dover dp dpdfezzz eighthre elvira epscszz
+  syn keyword mfConstant     epsdraft epsdrft epsdrftl epsfast epsfastl epshi
+  syn keyword mfConstant     epslo epsmed epsmedl epson epsonact epsonfx epsonl
+  syn keyword mfConstant     epsonlo epsonlol epsonlq epsonsq epstylus epstylwr
+  syn keyword mfConstant     epstyplo epstypmd epstypml epstypro epswlo epswlol
+  syn keyword mfConstant     esphi fourfour gpx gtfax gtfaxhi gtfaxl gtfaxlo
+  syn keyword mfConstant     gtfaxlol help hifax highfax hplaser hprugged ibm_a
+  syn keyword mfConstant     ibmd ibmega ibmegal ibmfzon ibmfztn ibmpp ibmppl
+  syn keyword mfConstant     ibmsoff ibmteot ibmtetz ibmtont ibmtosn ibmtosnl
+  syn keyword mfConstant     ibmvga ibx imagen imagewriter itoh itohl itohtoz
+  syn keyword mfConstant     itohtozl iw jetiiisi kyocera laserjet laserjetfive
+  syn keyword mfConstant     laserjetfivemp laserjetfour laserjetfourthousand
+  syn keyword mfConstant     laserjetfourzerozerozero laserjethi laserjetlo
+  syn keyword mfConstant     laserjettwoonezerozero
+  syn keyword mfConstant     laserjettwoonezerozerofastres lasermaster
+  syn keyword mfConstant     laserwriter lasf lexmarkr lexmarks lexmarku
+  syn keyword mfConstant     linohalf linohi linolo linolttz linoone linosuper
+  syn keyword mfConstant     linothree linothreelo linotzzh ljfive ljfivemp
+  syn keyword mfConstant     ljfour ljfzzz ljfzzzfr ljlo ljtozz ljtozzfr lmaster
+  syn keyword mfConstant     lnotr lnzo lps lpstz lqhires lqlores lqmed lqmedl
+  syn keyword mfConstant     lqmedres lview lviewl lwpro macmag mactrue modes_mf
+  syn keyword mfConstant     ncd nec nechi neclm nectzo newdd newddl nexthi
+  syn keyword mfConstant     nextscreen nextscrn nineone nullmode ocessfz
+  syn keyword mfConstant     okidata okidatal okifourten okifte okihi onetz
+  syn keyword mfConstant     onezz pcprevw pcscreen phaser phaserfs phasertf
+  syn keyword mfConstant     phasertfl phasertl pixpt printware prntware
+  syn keyword mfConstant     proprinter qms qmsesz qmsostf qmsoszz qmstftf ricoh
+  syn keyword mfConstant     ricoha ricohlp ricohsp sherpa sparcptr starnlt
+  syn keyword mfConstant     starnltl styletwo stylewr stylewri stylewriter sun
+  syn keyword mfConstant     supre swtwo toshiba ultre varityper vs vtftzz
+  syn keyword mfConstant     vtftzzhi vtftzzlo vtfzszw vtszz xpstzz xpstzzl
+  syn keyword mfConstant     xrxesnz xrxfzfz xrxnszz xrxtszz
+  syn keyword mfDef          BCPL_string coding_scheme font_face_byte
+  syn keyword mfDef          font_family landscape
+  syn keyword mfDef          mode_extra_info mode_help mode_param
+  syn keyword mfNewInternal  blacker_min
 endif
 
 " Some other basic macro names, e.g., from cmbase, logo, etc.
-if !exists("other_mf_macros")
-  let other_mf_macros = 1 " Set this to '0' if your code gets too colourful
-			  " metapost.vim does so to turn off Metafont macros
-endif
-if other_mf_macros
-  syn keyword mfMacro beginlogochar
+if get(g:, "other_mf_macros", 1)
+  syn keyword mfDef          beginlogochar
+  syn keyword mfDef          font_setup
+  syn keyword mfPrimitive    generate
 endif
 
 " Numeric tokens
-syn match mfNumeric	"[-]\=\d\+"
-syn match mfNumeric	"[-]\=\.\d\+"
-syn match mfNumeric	"[-]\=\d\+\.\d\+"
+syn match     mfNumeric      "[-]\=\d\+"
+syn match     mfNumeric      "[-]\=\.\d\+"
+syn match     mfNumeric      "[-]\=\d\+\.\d\+"
 
-" Metafont lengths
-syn match mfLength	"\<\(bp\|cc\|cm\|dd\|in\|mm\|pc\|pt\)\>"
-syn match mfLength	"\<[-]\=\d\+\(bp\|cc\|cm\|dd\|in\|mm\|pc\|pt\)\#\=\>"
-syn match mfLength	"\<[-]\=\.\d\+\(bp\|cc\|cm\|dd\|in\|mm\|pc\|pt\)\#\=\>"
-syn match mfLength	"\<[-]\=\d\+\.\d\+\(bp\|cc\|cm\|dd\|in\|mm\|pc\|pt\)\#\=\>"
-
-" Metafont coordinates and points
-syn match mfCoord	"\<[xy]\d\+\>"
-syn match mfPoint	"\<z\d\+\>"
+" METAFONT lengths
+syn match     mfLength       "\<\(bp\|cc\|cm\|dd\|in\|mm\|pc\|pt\)\>"
+syn match     mfLength       "[-]\=\d\+\(bp\|cc\|cm\|dd\|in\|mm\|pc\|pt\)\#\="
+syn match     mfLength       "[-]\=\.\d\+\(bp\|cc\|cm\|dd\|in\|mm\|pc\|pt\)\#\="
+syn match     mfLength       "[-]\=\d\+\.\d\+\(bp\|cc\|cm\|dd\|in\|mm\|pc\|pt\)\#\="
 
 " String constants
-syn region mfString	start=+"+ end=+"+
+syn match     mfOpenString   /"[^"]*/
+syn region    mfString       oneline keepend start=+"+ end=+"+
 
 " Comments:
-syn match mfComment	"%.*$"
+syn keyword   mfTodoComment  contained TODO FIXME XXX DEBUG NOTE
+syn match     mfComment      "%.*$" contains=mfTodoComment,@Spell
 
 " synchronizing
 syn sync maxlines=50
 
 " Define the default highlighting
-" Only when an item doesn't have highlighting yet
-
-hi def link mfBoolExp	Statement
-hi def link mfNumExp	Statement
-hi def link mfInternal	Identifier
-hi def link mfPairExp	Statement
-hi def link mfPathExp	Statement
-hi def link mfPenExp	Statement
-hi def link mfPicExp	Statement
-hi def link mfStringExp	Statement
-hi def link mfCommand	Statement
-hi def link mfType	Type
-hi def link mfStatement	Statement
-hi def link mfDefinition	Statement
-hi def link mfCondition	Conditional
-hi def link mfPrimitive	Statement
-hi def link mfMacro	Macro
-hi def link mfCoord	Identifier
-hi def link mfPoint	Identifier
-hi def link mfNumeric	Number
-hi def link mfLength	Number
-hi def link mfComment	Comment
-hi def link mfString	String
-
+hi def link mfBoolExp      Statement
+hi def link mfNumExp       Statement
+hi def link mfPairExp      Statement
+hi def link mfPathExp      Statement
+hi def link mfPenExp       Statement
+hi def link mfPicExp       Statement
+hi def link mfStringExp    Statement
+hi def link mfInternal     Identifier
+hi def link mfCommand      Statement
+hi def link mfType         Type
+hi def link mfStatement    Statement
+hi def link mfDefinition   Statement
+hi def link mfCondition    Conditional
+hi def link mfPrimitive    Statement
+hi def link mfDef          Function
+hi def link mfVardef       mfDef
+hi def link mfPrimaryDef   mfDef
+hi def link mfSecondaryDef mfDef
+hi def link mfTertiaryDef  mfDef
+hi def link mfCoord        Identifier
+hi def link mfPoint        Identifier
+hi def link mfNumeric      Number
+hi def link mfLength       Number
+hi def link mfComment      Comment
+hi def link mfString       String
+hi def link mfOpenString   Todo
+hi def link mfSuffixParam  Label
+hi def link mfNewInternal  mfInternal
+hi def link mfVariable     Identifier
+hi def link mfConstant     Constant
+hi def link mfTodoComment  Todo
 
 let b:current_syntax = "mf"
 
-" vim: ts=8
+" vim:sw=2
diff --git a/runtime/syntax/mp.vim b/runtime/syntax/mp.vim
index 3966b69a03..95723d0d97 100644
--- a/runtime/syntax/mp.vim
+++ b/runtime/syntax/mp.vim
@@ -1,115 +1,765 @@
 " Vim syntax file
-" Language:	MetaPost
-" Maintainer:	Andreas Scherer <andreas.scherer@pobox.com>
-" Last Change:	April 30, 2001
+" Language:           MetaPost
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Former Maintainers: Andreas Scherer <andreas.scherer@pobox.com>
+" Last Change:        2016 Oct 01
 
-" quit when a syntax file was already loaded
 if exists("b:current_syntax")
   finish
 endif
 
-let plain_mf_macros = 0 " plain.mf has no special meaning for MetaPost
-let other_mf_macros = 0 " cmbase.mf, logo.mf, ... neither
+let s:cpo_sav = &cpo
+set cpo&vim
 
-" Read the Metafont syntax to start with
+if exists("g:plain_mf_macros")
+  let s:plain_mf_macros = g:plain_mf_macros
+endif
+if exists("g:plain_mf_modes")
+  let s:plain_mf_modes = g:plain_mf_modes
+endif
+if exists("g:other_mf_macros")
+  let s:other_mf_macros = g:other_mf_macros
+endif
+
+let g:plain_mf_macros = 0 " plain.mf has no special meaning for MetaPost
+let g:plain_mf_modes  = 0 " No METAFONT modes
+let g:other_mf_macros = 0 " cmbase.mf, logo.mf, ... neither
+
+" Read the METAFONT syntax to start with
 runtime! syntax/mf.vim
+unlet b:current_syntax " Necessary for syn include below
 
-" MetaPost has TeX inserts for typeset labels
-" verbatimtex, btex, and etex will be treated as keywords
-syn match mpTeXbegin "\(verbatimtex\|btex\)"
-syn match mpTeXend "etex"
-syn region mpTeXinsert start="\(verbatimtex\|btex\)"hs=e+1 end="etex"he=s-1 contains=mpTeXbegin,mpTeXend keepend
+" Restore the value of existing global variables
+if exists("s:plain_mf_macros")
+  let g:plain_mf_macros = s:plain_mf_macros
+else
+  unlet g:plain_mf_macros
+endif
+if exists("s:plain_mf_modes")
+  let g:plain_mf_modes = s:plain_mf_modes
+else
+  unlet g:plain_mf_modes
+endif
+if exists("s:other_mf_macros")
+  let g:other_mf_macros = s:other_mf_macros
+else
+  unlet g:other_mf_macros
+endif
 
-" MetaPost primitives not found in Metafont
-syn keyword mpInternal bluepart clip color dashed fontsize greenpart infont
-syn keyword mpInternal linecap linejoin llcorner lrcorner miterlimit mpxbreak
-syn keyword mpInternal prologues redpart setbounds tracinglostchars
-syn keyword mpInternal truecorners ulcorner urcorner withcolor
+" Use TeX highlighting inside verbatimtex/btex... etex
+syn include @MPTeX syntax/tex.vim
+unlet b:current_syntax
+" These are defined as keywords rather than using matchgroup
+" in order to make them available to syntaxcomplete.
+syn keyword mpTeXdelim       btex etex verbatimtex contained
+syn region mpTeXinsert
+      \ start=/\<verbatimtex\>\|\<btex\>/rs=e+1
+      \ end=/\<etex\>/re=s-1 keepend
+      \ contains=@MPTeX,mpTeXdelim
 
-" Metafont primitives not found in MetaPost
-syn keyword notDefined autorounding chardx chardy fillin granularity hppp
-syn keyword notDefined proofing smoothing tracingedges tracingpens
-syn keyword notDefined turningcheck vppp xoffset yoffset
+" iskeyword must be set after the syn include above, because tex.vim sets `syn
+" iskeyword`. Note that keywords do not contain numbers (numbers are
+" subscripts)
+syntax iskeyword @,_
+
+" MetaPost primitives not found in METAFONT
+syn keyword mpBoolExp        bounded clipped filled stroked textual arclength
+syn keyword mpNumExp         arctime blackpart bluepart colormodel cyanpart
+syn keyword mpNumExp         fontsize greenpart greypart magentapart redpart
+syn keyword mpPairExp        yellowpart llcorner lrcorner ulcorner urcorner
+" envelope is seemingly undocumented, but it exists since mpost 1.003.
+" The syntax is: envelope <polygonal pen> of <path primary>. For example,
+"     path p;
+"     p := envelope pensquare of (up--left);
+" (Thanks to Daniel H. Luecking for the example!)
+syn keyword mpPathExp        envelope pathpart
+syn keyword mpPenExp         penpart
+syn keyword mpPicExp         dashpart glyph infont
+syn keyword mpStringExp      fontpart readfrom textpart
+syn keyword mpType           cmykcolor color rgbcolor
+" Other MetaPost primitives listed in the manual
+syn keyword mpPrimitive      mpxbreak within
+" Internal quantities not found in METAFONT
+" (Table 6 in MetaPost: A User's Manual)
+syn keyword mpInternal       defaultcolormodel hour minute linecap linejoin
+syn keyword mpInternal       miterlimit mpprocset mpversion numberprecision
+syn keyword mpInternal       numbersystem outputfilename outputformat
+syn keyword mpInternal       outputformatoptions outputtemplate prologues
+syn keyword mpInternal       restoreclipcolor tracinglostchars troffmode
+syn keyword mpInternal       truecorners
+" List of commands not found in METAFONT (from MetaPost: A User's Manual)
+syn keyword mpCommand        clip closefrom dashed filenametemplate fontmapfile
+syn keyword mpCommand        fontmapline setbounds withcmykcolor withcolor
+syn keyword mpCommand        withgreyscale withoutcolor withpostscript
+syn keyword mpCommand        withprescript withrgbcolor write
+" METAFONT internal variables not found in MetaPost
+syn keyword notDefined       autorounding chardx chardy fillin granularity
+syn keyword notDefined       proofing smoothing tracingedges tracingpens
+syn keyword notDefined       turningcheck xoffset yoffset
+" Suffix defined only in METAFONT:
+syn keyword notDefined       nodot
+" Other not implemented primitives (see MetaPost: A User's Manual, §C.1)
+syn keyword notDefined       cull display openwindow numspecial totalweight
+syn keyword notDefined       withweight
 
 " Keywords defined by plain.mp
-if !exists("plain_mp_macros")
-  let plain_mp_macros = 1 " Set this to '0' if your source gets too colourful
-endif
-if plain_mp_macros
-  syn keyword mpMacro ahangle ahlength background bbox bboxmargin beginfig
-  syn keyword mpMacro beveled black blue buildcycle butt center cutafter
-  syn keyword mpMacro cutbefore cuttings dashpattern defaultfont defaultpen
-  syn keyword mpMacro defaultscale dotlabel dotlabels drawarrow drawdblarrow
-  syn keyword mpMacro drawoptions endfig evenly extra_beginfig extra_endfig
-  syn keyword mpMacro green label labeloffset mitered red rounded squared
-  syn keyword mpMacro thelabel white base_name base_version
-  syn keyword mpMacro upto downto exitunless relax gobble gobbled
-  syn keyword mpMacro interact loggingall tracingall tracingnone
-  syn keyword mpMacro eps epsilon infinity right left up down origin
-  syn keyword mpMacro quartercircle halfcircle fullcircle unitsquare identity
-  syn keyword mpMacro blankpicture withdots ditto EOF pensquare penrazor
-  syn keyword mpMacro penspeck whatever abs round ceiling byte dir unitvector
-  syn keyword mpMacro inverse counterclockwise tensepath mod div dotprod
-  syn keyword mpMacro takepower direction directionpoint intersectionpoint
-  syn keyword mpMacro softjoin incr decr reflectedabout rotatedaround
-  syn keyword mpMacro rotatedabout min max flex superellipse interpath
-  syn keyword mpMacro magstep currentpen currentpen_path currentpicture
-  syn keyword mpMacro fill draw filldraw drawdot unfill undraw unfilldraw
-  syn keyword mpMacro undrawdot erase cutdraw image pickup numeric_pickup
-  syn keyword mpMacro pen_lft pen_rt pen_top pen_bot savepen clearpen
-  syn keyword mpMacro clear_pen_memory lft rt top bot ulft urt llft lrt
-  syn keyword mpMacro penpos penstroke arrowhead makelabel labels penlabel
-  syn keyword mpMacro range numtok thru clearxy clearit clearpen pickup
-  syn keyword mpMacro shipit bye hide stop solve
+if get(g:, "plain_mp_macros", 1) || get(g:, "mp_metafun_macros", 0)
+  syn keyword mpDef          beginfig clear_pen_memory clearit clearpen clearpen
+  syn keyword mpDef          clearxy colorpart cutdraw downto draw drawarrow
+  syn keyword mpDef          drawdblarrow drawdot drawoptions endfig erase
+  syn keyword mpDef          exitunless fill filldraw flex gobble hide interact
+  syn keyword mpDef          label loggingall makelabel numtok penstroke pickup
+  syn keyword mpDef          range reflectedabout rotatedaround shipit
+  syn keyword mpDef          stop superellipse takepower tracingall tracingnone
+  syn keyword mpDef          undraw undrawdot unfill unfilldraw upto
+  syn match   mpDef          "???"
+  syn keyword mpVardef       arrowhead bbox bot buildcycle byte ceiling center
+  syn keyword mpVardef       counterclockwise decr dir direction directionpoint
+  syn keyword mpVardef       dotlabel dotlabels image incr interpath inverse
+  syn keyword mpVardef       labels lft magstep max min penlabels penpos round
+  syn keyword mpVardef       rt savepen solve tensepath thelabel top unitvector
+  syn keyword mpVardef       whatever z
+  syn keyword mpPrimaryDef   div dotprod gobbled mod
+  syn keyword mpSecondaryDef intersectionpoint
+  syn keyword mpTertiaryDef  cutafter cutbefore softjoin thru
+  syn keyword mpNewInternal  ahangle ahlength bboxmargin beveled butt defaultpen
+  syn keyword mpNewInternal  defaultscale dotlabeldiam eps epsilon infinity
+  syn keyword mpNewInternal  join_radius labeloffset mitered pen_bot pen_lft
+  syn keyword mpNewInternal  pen_rt pen_top rounded squared tolerance
+  " Predefined constants
+  syn keyword mpConstant     EOF background base_name base_version black
+  syn keyword mpConstant     blankpicture blue ditto down evenly fullcircle
+  syn keyword mpConstant     green halfcircle identity left origin penrazor
+  syn keyword mpConstant     penspeck pensquare quartercircle red right
+  syn keyword mpConstant     unitsquare up white withdots
+  " Other predefined variables
+  syn keyword mpVariable     currentpen currentpen_path currentpicture cuttings
+  syn keyword mpVariable     defaultfont extra_beginfig extra_endfig
+  syn match   mpVariable     /\<\%(laboff\|labxf\|labyf\)\>/
+  syn match   mpVariable     /\<\%(laboff\|labxf\|labyf\)\.\%(lft\|rt\|bot\|top\|ulft\|urt\|llft\|lrt\)\>/
+  " let statements:
+  syn keyword mpnumExp       abs
+  syn keyword mpDef          rotatedabout
+  syn keyword mpCommand      bye relax
+  " on and off are not technically keywords, but it is nice to highlight them
+  " inside dashpattern().
+  syn keyword mpOnOff        off on contained
+  syn keyword mpDash         dashpattern contained
+  syn region  mpDashPattern
+        \ start="dashpattern\s*"
+        \ end=")"he=e-1
+        \ contains=mfNumeric,mfLength,mpOnOff,mpDash
 endif
 
 " Keywords defined by mfplain.mp
-if !exists("mfplain_mp_macros")
-  let mfplain_mp_macros = 0 " Set this to '1' to include these macro names
-endif
-if mfplain_mp_macros
-  syn keyword mpMacro beginchar blacker capsule_def change_width
-  syn keyword mpMacro define_blacker_pixels define_corrected_pixels
-  syn keyword mpMacro define_good_x_pixels define_good_y_pixels
-  syn keyword mpMacro define_horizontal_corrected_pixels
-  syn keyword mpMacro define_pixels define_whole_blacker_pixels
-  syn keyword mpMacro define_whole_vertical_blacker_pixels
-  syn keyword mpMacro define_whole_vertical_pixels endchar
-  syn keyword mpMacro extra_beginchar extra_endchar extra_setup
-  syn keyword mpMacro font_coding_scheme font_extra_space font_identifier
-  syn keyword mpMacro font_normal_shrink font_normal_space
-  syn keyword mpMacro font_normal_stretch font_quad font_size
-  syn keyword mpMacro font_slant font_x_height italcorr labelfont
-  syn keyword mpMacro makebox makegrid maketicks mode_def mode_setup
-  syn keyword mpMacro o_correction proofrule proofrulethickness rulepen smode
-
+if get(g:, "mfplain_mp_macros", 0)
+  syn keyword mpDef          beginchar capsule_def change_width
+  syn keyword mpDef          define_blacker_pixels define_corrected_pixels
+  syn keyword mpDef          define_good_x_pixels define_good_y_pixels
+  syn keyword mpDef          define_horizontal_corrected_pixels define_pixels
+  syn keyword mpDef          define_whole_blacker_pixels define_whole_pixels
+  syn keyword mpDef          define_whole_vertical_blacker_pixels
+  syn keyword mpDef          define_whole_vertical_pixels endchar
+  syn keyword mpDef          font_coding_scheme font_extra_space font_identifier
+  syn keyword mpDef          font_normal_shrink font_normal_space
+  syn keyword mpDef          font_normal_stretch font_quad font_size font_slant
+  syn keyword mpDef          font_x_height italcorr labelfont lowres_fix makebox
+  syn keyword mpDef          makegrid maketicks mode_def mode_setup proofrule
+  syn keyword mpDef          smode
+  syn keyword mpVardef       hround proofrulethickness vround
+  syn keyword mpNewInternal  blacker o_correction
+  syn keyword mpVariable     extra_beginchar extra_endchar extra_setup rulepen
   " plus some no-ops, also from mfplain.mp
-  syn keyword mpMacro cullit currenttransform gfcorners grayfont hround
-  syn keyword mpMacro imagerules lowres_fix nodisplays notransforms openit
-  syn keyword mpMacro proofoffset screenchars screenrule screenstrokes
-  syn keyword mpMacro showit slantfont titlefont unitpixel vround
+  syn keyword mpDef          cull cullit gfcorners imagerules nodisplays
+  syn keyword mpDef          notransforms openit proofoffset screenchars
+  syn keyword mpDef          screenrule screenstrokes showit
+  syn keyword mpVardef       grayfont slantfont titlefont
+  syn keyword mpVariable     currenttransform
+  syn keyword mpConstant     unitpixel
+  " These are not listed in the MetaPost manual, and some are ignored by
+  " MetaPost, but are nonetheless defined in mfplain.mp
+  syn keyword mpDef          killtext
+  syn match   mpVardef       "\<good\.\%(x\|y\|lft\|rt\|top\|bot\)\>"
+  syn keyword mpVariable     aspect_ratio localfont mag mode mode_name
+  syn keyword mpVariable     proofcolor
+  syn keyword mpConstant     lowres proof smoke
+  syn keyword mpNewInternal  autorounding bp_per_pixel granularity
+  syn keyword mpNewInternal  number_of_modes proofing smoothing turningcheck
 endif
 
-" Keywords defined by other macro packages, e.g., boxes.mp
-if !exists("other_mp_macros")
-  let other_mp_macros = 1 " Set this to '0' if your source gets too colourful
-endif
-if other_mp_macros
-  syn keyword mpMacro circmargin defaultdx defaultdy
-  syn keyword mpMacro boxit boxjoin bpath circleit drawboxed drawboxes
-  syn keyword mpMacro drawunboxed fixpos fixsize pic
+" Keywords defined by all base macro packages:
+" - (r)boxes.mp
+" - format.mp
+" - graph.mp
+" - marith.mp
+" - sarith.mp
+" - string.mp
+" - TEX.mp
+if get(g:, "other_mp_macros", 1)
+  " boxes and rboxes
+  syn keyword mpDef          boxjoin drawboxed drawboxes drawunboxed
+  syn keyword mpNewInternal  circmargin defaultdx defaultdy rbox_radius
+  syn keyword mpVardef       boxit bpath circleit fixpos fixsize generic_declare
+  syn keyword mpVardef       generic_redeclare generisize pic rboxit str_prefix
+  " format
+  syn keyword mpVardef       Mformat format init_numbers roundd
+  syn keyword mpVariable     Fe_base Fe_plus
+  syn keyword mpConstant     Ten_to
+  " graph
+  syn keyword mpDef          Gfor Gxyscale OUT auto begingraph endgraph gdata
+  syn keyword mpDef          gdraw gdrawarrow gdrawdblarrow gfill plot
+  syn keyword mpVardef       augment autogrid frame gdotlabel glabel grid itick
+  syn keyword mpVardef       otick
+  syn keyword mpVardef       Mreadpath setcoords setrange
+  syn keyword mpNewInternal  Gmarks Gminlog Gpaths linear log
+  syn keyword mpVariable     Autoform Gemarks Glmarks Gumarks
+  syn keyword mpConstant     Gtemplate
+  syn match   mpVariable     /Gmargin\.\%(low\|high\)/
+  " marith
+  syn keyword mpVardef       Mabs Meform Mexp Mexp_str Mlog Mlog_Str Mlog_str
+  syn keyword mpPrimaryDef   Mdiv Mmul
+  syn keyword mpSecondaryDef Madd Msub
+  syn keyword mpTertiaryDef  Mleq
+  syn keyword mpNewInternal  Mten Mzero
+  " sarith
+  syn keyword mpVardef       Sabs Scvnum
+  syn keyword mpPrimaryDef   Sdiv Smul
+  syn keyword mpSecondaryDef Sadd Ssub
+  syn keyword mpTertiaryDef  Sleq Sneq
+  " string
+  syn keyword mpVardef       cspan isdigit loptok
+  " TEX
+  syn keyword mpVardef       TEX TEXPOST TEXPRE
 endif
 
+" Up to date as of 23-Sep-2016.
+if get(g:, "mp_metafun_macros", 0)
+  " These keywords have been added manually.
+  syn keyword mpPrimitive runscript
+
+  " The following MetaFun keywords have been extracted automatically from
+  " ConTeXt source code. They include all "public" macros (where a macro is
+  " considered public if and only if it does not start with _, mfun_, mlib_, or
+  " do_, and it does not end with _), all "public" unsaved variables, and all
+  " `let` statements.
+
+  " mp-abck.mpiv
+  syn keyword mpDef          abck_grid_line anchor_box box_found boxfilloptions
+  syn keyword mpDef          boxgridoptions boxlineoptions draw_multi_pars
+  syn keyword mpDef          draw_multi_side draw_multi_side_path freeze_box
+  syn keyword mpDef          initialize_box initialize_box_pos
+  syn keyword mpDef          multi_side_draw_options show_multi_kind
+  syn keyword mpDef          show_multi_pars
+  syn keyword mpVardef       abck_baseline_grid abck_draw_path abck_graphic_grid
+  syn keyword mpVariable     boxdashtype boxfilloffset boxfilltype
+  syn keyword mpVariable     boxgriddirection boxgriddistance boxgridshift
+  syn keyword mpVariable     boxgridtype boxgridwidth boxlineoffset
+  syn keyword mpVariable     boxlineradius boxlinetype boxlinewidth multikind
+  syn keyword mpConstant     context_abck
+  " mp-apos.mpiv
+  syn keyword mpDef          anch_sidebars_draw boxfilloptions boxlineoptions
+  syn keyword mpDef          connect_positions
+  syn keyword mpConstant     context_apos
+  " mp-asnc.mpiv
+  syn keyword mpDef          FlushSyncTasks ProcessSyncTask ResetSyncTasks
+  syn keyword mpDef          SetSyncColor SetSyncThreshold SyncTask
+  syn keyword mpVardef       PrepareSyncTasks SyncBox TheSyncColor
+  syn keyword mpVardef       TheSyncThreshold
+  syn keyword mpVariable     CurrentSyncClass NOfSyncPaths SyncColor
+  syn keyword mpVariable     SyncLeftOffset SyncPaths SyncTasks SyncThreshold
+  syn keyword mpVariable     SyncThresholdMethod SyncWidth
+  syn keyword mpConstant     context_asnc
+  " mp-back.mpiv
+  syn keyword mpDef          some_double_back some_hash
+  syn keyword mpVariable     back_nillcolor
+  syn keyword mpConstant     context_back
+  " mp-bare.mpiv
+  syn keyword mpVardef       colordecimals rawtextext
+  syn keyword mpPrimaryDef   infont
+  syn keyword mpConstant     context_bare
+  " mp-base.mpiv
+  " This is essentially plain.mp with only a few keywords added
+  syn keyword mpNumExp       graypart
+  syn keyword mpType         graycolor greycolor
+  syn keyword mpConstant     cyan magenta yellow
+  " mp-butt.mpiv
+  syn keyword mpDef          predefinedbutton some_button
+  syn keyword mpConstant     context_butt
+  " mp-char.mpiv
+  syn keyword mpDef          flow_begin_chart flow_begin_sub_chart
+  syn keyword mpDef          flow_chart_draw_comment flow_chart_draw_exit
+  syn keyword mpDef          flow_chart_draw_label flow_chart_draw_text
+  syn keyword mpDef          flow_clip_chart flow_collapse_points
+  syn keyword mpDef          flow_connect_bottom_bottom flow_connect_bottom_left
+  syn keyword mpDef          flow_connect_bottom_right flow_connect_bottom_top
+  syn keyword mpDef          flow_connect_left_bottom flow_connect_left_left
+  syn keyword mpDef          flow_connect_left_right flow_connect_left_top
+  syn keyword mpDef          flow_connect_right_bottom flow_connect_right_left
+  syn keyword mpDef          flow_connect_right_right flow_connect_right_top
+  syn keyword mpDef          flow_connect_top_bottom flow_connect_top_left
+  syn keyword mpDef          flow_connect_top_right flow_connect_top_top
+  syn keyword mpDef          flow_draw_connection flow_draw_connection_point
+  syn keyword mpDef          flow_draw_midpoint flow_draw_shape
+  syn keyword mpDef          flow_draw_test_area flow_draw_test_shape
+  syn keyword mpDef          flow_draw_test_shapes flow_end_chart
+  syn keyword mpDef          flow_end_sub_chart flow_flush_connections
+  syn keyword mpDef          flow_flush_picture flow_flush_pictures
+  syn keyword mpDef          flow_flush_shape flow_flush_shapes
+  syn keyword mpDef          flow_initialize_grid flow_new_chart flow_new_shape
+  syn keyword mpDef          flow_scaled_to_grid flow_show_connection
+  syn keyword mpDef          flow_show_connections flow_show_shapes
+  syn keyword mpDef          flow_xy_offset flow_y_pos
+  syn keyword mpVardef       flow_connection_path flow_down_on_grid
+  syn keyword mpVardef       flow_down_to_grid flow_i_point flow_left_on_grid
+  syn keyword mpVardef       flow_left_to_grid flow_offset
+  syn keyword mpVardef       flow_points_initialized flow_right_on_grid
+  syn keyword mpVardef       flow_right_to_grid flow_smooth_connection
+  syn keyword mpVardef       flow_trim_points flow_trimmed flow_up_on_grid
+  syn keyword mpVardef       flow_up_to_grid flow_valid_connection
+  syn keyword mpVardef       flow_x_on_grid flow_xy_bottom flow_xy_left
+  syn keyword mpVardef       flow_xy_on_grid flow_xy_right flow_xy_top
+  syn keyword mpVardef       flow_y_on_grid
+  syn keyword mpVariable     flow_arrowtip flow_chart_background_color
+  syn keyword mpVariable     flow_chart_offset flow_comment_offset
+  syn keyword mpVariable     flow_connection_arrow_size
+  syn keyword mpVariable     flow_connection_dash_size
+  syn keyword mpVariable     flow_connection_line_color
+  syn keyword mpVariable     flow_connection_line_width
+  syn keyword mpVariable     flow_connection_smooth_size flow_connections
+  syn keyword mpVariable     flow_cpath flow_dash_pattern flow_dashline
+  syn keyword mpVariable     flow_exit_offset flow_forcevalid flow_grid_height
+  syn keyword mpVariable     flow_grid_width flow_label_offset flow_max_x
+  syn keyword mpVariable     flow_max_y flow_peepshape flow_reverse_connection
+  syn keyword mpVariable     flow_reverse_y flow_shape_action flow_shape_archive
+  syn keyword mpVariable     flow_shape_decision flow_shape_down
+  syn keyword mpVariable     flow_shape_fill_color flow_shape_height
+  syn keyword mpVariable     flow_shape_left flow_shape_line_color
+  syn keyword mpVariable     flow_shape_line_width flow_shape_loop
+  syn keyword mpVariable     flow_shape_multidocument flow_shape_node
+  syn keyword mpVariable     flow_shape_procedure flow_shape_product
+  syn keyword mpVariable     flow_shape_right flow_shape_singledocument
+  syn keyword mpVariable     flow_shape_subprocedure flow_shape_up
+  syn keyword mpVariable     flow_shape_wait flow_shape_width
+  syn keyword mpVariable     flow_show_all_points flow_show_con_points
+  syn keyword mpVariable     flow_show_mid_points flow_showcrossing flow_smooth
+  syn keyword mpVariable     flow_touchshape flow_xypoint flow_zfactor
+  syn keyword mpConstant     context_flow
+  " mp-chem.mpiv
+  syn keyword mpDef          chem_init_all chem_reset chem_start_structure
+  syn keyword mpDef          chem_transformed
+  syn keyword mpVardef       chem_ad chem_adj chem_align chem_arrow chem_au
+  syn keyword mpVardef       chem_b chem_bb chem_bd chem_bw chem_c chem_cc
+  syn keyword mpVardef       chem_ccd chem_cd chem_crz chem_cz chem_dash chem_db
+  syn keyword mpVardef       chem_diff chem_dir chem_do chem_dr chem_draw
+  syn keyword mpVardef       chem_drawarrow chem_eb chem_ed chem_ep chem_er
+  syn keyword mpVardef       chem_es chem_et chem_fill chem_hb chem_init_some
+  syn keyword mpVardef       chem_label chem_ldb chem_ldd chem_line chem_lr
+  syn keyword mpVardef       chem_lrb chem_lrbd chem_lrd chem_lrh chem_lrn
+  syn keyword mpVardef       chem_lrt chem_lrz chem_lsr chem_lsub chem_mark
+  syn keyword mpVardef       chem_marked chem_mid chem_mids chem_midz chem_mir
+  syn keyword mpVardef       chem_mov chem_move chem_number chem_oe chem_off
+  syn keyword mpVardef       chem_pb chem_pe chem_r chem_r_fragment chem_rb
+  syn keyword mpVardef       chem_rbd chem_rd chem_rdb chem_rdd chem_restore
+  syn keyword mpVardef       chem_rh chem_rm chem_rn chem_rot chem_rr chem_rrb
+  syn keyword mpVardef       chem_rrbd chem_rrd chem_rrh chem_rrn chem_rrt
+  syn keyword mpVardef       chem_rrz chem_rsr chem_rsub chem_rt chem_rz chem_s
+  syn keyword mpVardef       chem_save chem_sb chem_sd chem_set chem_sr chem_ss
+  syn keyword mpVardef       chem_start_component chem_stop_component
+  syn keyword mpVardef       chem_stop_structure chem_sub chem_symbol chem_tb
+  syn keyword mpVardef       chem_text chem_z chem_zln chem_zlt chem_zn chem_zrn
+  syn keyword mpVardef       chem_zrt chem_zt
+  syn keyword mpVariable     chem_mark_pair chem_stack_mirror chem_stack_origin
+  syn keyword mpVariable     chem_stack_p chem_stack_previous
+  syn keyword mpVariable     chem_stack_rotation chem_trace_boundingbox
+  syn keyword mpVariable     chem_trace_nesting chem_trace_text
+  syn keyword mpConstant     context_chem
+  " mp-core.mpiv
+  syn keyword mpDef          FlushSyncTasks ProcessSyncTask
+  syn keyword mpDef          RegisterLocalTextArea RegisterPlainTextArea
+  syn keyword mpDef          RegisterRegionTextArea RegisterTextArea
+  syn keyword mpDef          ResetLocalTextArea ResetSyncTasks ResetTextAreas
+  syn keyword mpDef          SaveTextAreas SetSyncColor SetSyncThreshold
+  syn keyword mpDef          SyncTask anchor_box box_found boxfilloptions
+  syn keyword mpDef          boxgridoptions boxlineoptions collapse_multi_pars
+  syn keyword mpDef          draw_box draw_multi_pars draw_par freeze_box
+  syn keyword mpDef          initialize_area initialize_area_par initialize_box
+  syn keyword mpDef          initialize_box_pos initialize_par
+  syn keyword mpDef          prepare_multi_pars relocate_multipars save_multipar
+  syn keyword mpDef          set_par_line_height show_multi_pars show_par
+  syn keyword mpDef          simplify_multi_pars sort_multi_pars
+  syn keyword mpVardef       InsideSavedTextArea InsideSomeSavedTextArea
+  syn keyword mpVardef       InsideSomeTextArea InsideTextArea PrepareSyncTasks
+  syn keyword mpVardef       SyncBox TextAreaH TextAreaW TextAreaWH TextAreaX
+  syn keyword mpVardef       TextAreaXY TextAreaY TheSyncColor TheSyncThreshold
+  syn keyword mpVardef       baseline_grid graphic_grid multi_par_at_top
+  syn keyword mpVariable     CurrentSyncClass NOfSavedTextAreas
+  syn keyword mpVariable     NOfSavedTextColumns NOfSyncPaths NOfTextAreas
+  syn keyword mpVariable     NOfTextColumns PlainTextArea RegionTextArea
+  syn keyword mpVariable     SavedTextColumns SyncColor SyncLeftOffset SyncPaths
+  syn keyword mpVariable     SyncTasks SyncThreshold SyncThresholdMethod
+  syn keyword mpVariable     SyncWidth TextAreas TextColumns
+  syn keyword mpVariable     auto_multi_par_hsize boxdashtype boxfilloffset
+  syn keyword mpVariable     boxfilltype boxgriddirection boxgriddistance
+  syn keyword mpVariable     boxgridshift boxgridtype boxgridwidth boxlineradius
+  syn keyword mpVariable     boxlinetype boxlinewidth check_multi_par_chain
+  syn keyword mpVariable     compensate_multi_par_topskip
+  syn keyword mpVariable     enable_multi_par_fallback force_multi_par_chain
+  syn keyword mpVariable     ignore_multi_par_page last_multi_par_shift lefthang
+  syn keyword mpVariable     local_multi_par_area multi_column_first_page_hack
+  syn keyword mpVariable     multi_par_pages multiloc multilocs multipar
+  syn keyword mpVariable     multipars multiref multirefs nofmultipars
+  syn keyword mpVariable     obey_multi_par_hang obey_multi_par_more
+  syn keyword mpVariable     one_piece_multi_par par_hang_after par_hang_indent
+  syn keyword mpVariable     par_indent par_left_skip par_line_height
+  syn keyword mpVariable     par_right_skip par_start_pos par_stop_pos
+  syn keyword mpVariable     par_strut_depth par_strut_height ppos righthang
+  syn keyword mpVariable     snap_multi_par_tops somehang span_multi_column_pars
+  syn keyword mpVariable     use_multi_par_region
+  syn keyword mpConstant     context_core
+  syn keyword LET            anchor_area anchor_par draw_area
+  " mp-cows.mpiv
+  syn keyword mpConstant     context_cows cow
+  " mp-crop.mpiv
+  syn keyword mpDef          page_marks_add_color page_marks_add_lines
+  syn keyword mpDef          page_marks_add_marking page_marks_add_number
+  syn keyword mpVardef       crop_color crop_gray crop_marks_cmyk
+  syn keyword mpVardef       crop_marks_cmykrgb crop_marks_gray crop_marks_lines
+  syn keyword mpVariable     crop_colors more page
+  syn keyword mpConstant     context_crop
+  " mp-figs.mpiv
+  syn keyword mpDef          naturalfigure registerfigure
+  syn keyword mpVardef       figuredimensions figureheight figuresize
+  syn keyword mpVardef       figurewidth
+  syn keyword mpConstant     context_figs
+  " mp-fobg.mpiv
+  syn keyword mpDef          DrawFoFrame
+  syn keyword mpVardef       equalpaths
+  syn keyword mpPrimaryDef   inset outset
+  syn keyword mpVariable     FoBackground FoBackgroundColor FoFrame FoLineColor
+  syn keyword mpVariable     FoLineStyle FoLineWidth FoSplit
+  syn keyword mpConstant     FoAll FoBottom FoDash FoDotted FoDouble FoGroove
+  syn keyword mpConstant     FoHidden FoInset FoLeft FoMedium FoNoColor FoNone
+  syn keyword mpConstant     FoOutset FoRidge FoRight FoSolid FoThick FoThin
+  syn keyword mpConstant     FoTop context_fobg
+  " mp-form.mpiv
+  syn keyword mpConstant     context_form
+  " mp-func.mpiv
+  syn keyword mpDef          constructedfunction constructedpairs
+  syn keyword mpDef          constructedpath curvedfunction curvedpairs
+  syn keyword mpDef          curvedpath function pathconnectors straightfunction
+  syn keyword mpDef          straightpairs straightpath
+  syn keyword mpConstant     context_func
+  " mp-grap.mpiv
+  syn keyword mpDef          Gfor OUT auto begingraph circles crosses diamonds
+  syn keyword mpDef          downtriangles endgraph gdata gdraw gdrawarrow
+  syn keyword mpDef          gdrawdblarrow gfill graph_addto
+  syn keyword mpDef          graph_addto_currentpicture graph_comma
+  syn keyword mpDef          graph_coordinate_multiplication graph_draw
+  syn keyword mpDef          graph_draw_label graph_errorbar_text graph_fill
+  syn keyword mpDef          graph_generate_exponents
+  syn keyword mpDef          graph_generate_label_position
+  syn keyword mpDef          graph_generate_numbers graph_label_location
+  syn keyword mpDef          graph_scan_mark graph_scan_marks graph_setbounds
+  syn keyword mpDef          graph_suffix graph_tick_label
+  syn keyword mpDef          graph_with_pen_and_color graph_withlist
+  syn keyword mpDef          graph_xyscale lefttriangles makefunctionpath plot
+  syn keyword mpDef          plotsymbol points rainbow righttriangles smoothpath
+  syn keyword mpDef          squares stars uptriangles witherrorbars
+  syn keyword mpVardef       addtopath augment autogrid constant_fit
+  syn keyword mpVardef       constant_function det escaped_format exp
+  syn keyword mpVardef       exponential_fit exponential_function format
+  syn keyword mpVardef       formatted frame functionpath gaussian_fit
+  syn keyword mpVardef       gaussian_function gdotlabel glabel graph_Feform
+  syn keyword mpVardef       graph_Meform graph_arrowhead_extent graph_bounds
+  syn keyword mpVardef       graph_clear_bounds
+  syn keyword mpVardef       graph_convert_user_path_to_internal graph_cspan
+  syn keyword mpVardef       graph_draw_arrowhead graph_error graph_errorbars
+  syn keyword mpVardef       graph_exp graph_factor_and_exponent_to_string
+  syn keyword mpVardef       graph_gridline_picture graph_is_null
+  syn keyword mpVardef       graph_label_convert_user_to_internal graph_loptok
+  syn keyword mpVardef       graph_match_exponents graph_mlog
+  syn keyword mpVardef       graph_modified_exponent_ypart graph_pair_adjust
+  syn keyword mpVardef       graph_picture_conversion graph_post_draw
+  syn keyword mpVardef       graph_read_line graph_readpath graph_remap
+  syn keyword mpVardef       graph_scan_path graph_select_exponent_mark
+  syn keyword mpVardef       graph_select_mark graph_set_bounds
+  syn keyword mpVardef       graph_set_default_bounds graph_shapesize
+  syn keyword mpVardef       graph_stash_label graph_tick_mark_spacing
+  syn keyword mpVardef       graph_unknown_pair_bbox grid isdigit itick
+  syn keyword mpVardef       linear_fit linear_function ln logten lorentzian_fit
+  syn keyword mpVardef       lorentzian_function otick polynomial_fit
+  syn keyword mpVardef       polynomial_function power_law_fit
+  syn keyword mpVardef       power_law_function powten setcoords setrange
+  syn keyword mpVardef       sortpath strfmt tick varfmt
+  syn keyword mpNewInternal  Mzero doubleinfinity graph_log_minimum
+  syn keyword mpNewInternal  graph_minimum_number_of_marks largestmantissa
+  syn keyword mpNewInternal  linear lntwo log mlogten singleinfinity
+  syn keyword mpVariable     Autoform determinant fit_chi_squared
+  syn keyword mpVariable     graph_errorbar_picture graph_exp_marks
+  syn keyword mpVariable     graph_frame_pair_a graph_frame_pair_b
+  syn keyword mpVariable     graph_lin_marks graph_log_marks graph_modified_bias
+  syn keyword mpVariable     graph_modified_higher graph_modified_lower
+  syn keyword mpVariable     graph_shape r_s resistance_color resistance_name
+  syn keyword mpConstant     context_grap
+  " mp-grid.mpiv
+  syn keyword mpDef          hlingrid hloggrid vlingrid vloggrid
+  syn keyword mpVardef       hlinlabel hlintext hlogtext linlin linlinpath
+  syn keyword mpVardef       linlog linlogpath loglin loglinpath loglog
+  syn keyword mpVardef       loglogpath processpath vlinlabel vlintext vlogtext
+  syn keyword mpVariable     fmt_initialize fmt_pictures fmt_precision
+  syn keyword mpVariable     fmt_separator fmt_zerocheck grid_eps
+  syn keyword mpConstant     context_grid
+  " mp-grph.mpiv
+  syn keyword mpDef          beginfig begingraphictextfig data_mpo_file
+  syn keyword mpDef          data_mpy_file doloadfigure draw endfig
+  syn keyword mpDef          endgraphictextfig fill fixedplace graphictext
+  syn keyword mpDef          loadfigure new_graphictext normalwithshade number
+  syn keyword mpDef          old_graphictext outlinefill protectgraphicmacros
+  syn keyword mpDef          resetfig reversefill withdrawcolor withfillcolor
+  syn keyword mpDef          withshade
+  syn keyword mpVariable     currentgraphictext figureshift
+  syn keyword mpConstant     context_grph
+  " mp-idea.mpiv
+  syn keyword mpVardef       bcomponent ccomponent gcomponent mcomponent
+  syn keyword mpVardef       rcomponent somecolor ycomponent
+  " mp-luas.mpiv
+  syn keyword mpDef          luacall message
+  syn keyword mpVardef       MP lua lualist
+  syn keyword mpConstant     context_luas
+  " mp-mlib.mpiv
+  syn keyword mpDef          autoalign bitmapimage circular_shade cmyk comment
+  syn keyword mpDef          defineshade eofill eofillup externalfigure figure
+  syn keyword mpDef          fillup label linear_shade multitonecolor namedcolor
+  syn keyword mpDef          nofill onlayer passarrayvariable passvariable
+  syn keyword mpDef          plain_label register resolvedcolor scantokens
+  syn keyword mpDef          set_circular_vector set_linear_vector shaded
+  syn keyword mpDef          spotcolor startpassingvariable stoppassingvariable
+  syn keyword mpDef          thelabel transparent[] usemetafunlabels
+  syn keyword mpDef          useplainlabels withcircularshade withlinearshade
+  syn keyword mpDef          withmask withproperties withshadecenter
+  syn keyword mpDef          withshadecolors withshadedirection withshadedomain
+  syn keyword mpDef          withshadefactor withshadefraction withshadeorigin
+  syn keyword mpDef          withshaderadius withshadestep withshadetransform
+  syn keyword mpDef          withshadevector withtransparency
+  syn keyword mpVardef       anchored checkbounds checkedbounds
+  syn keyword mpVardef       define_circular_shade define_linear_shade dotlabel
+  syn keyword mpVardef       escaped_format fmttext fontsize format formatted
+  syn keyword mpVardef       installlabel onetimefmttext onetimetextext
+  syn keyword mpVardef       outlinetext plain_thelabel properties rawfmttext
+  syn keyword mpVardef       rawtexbox rawtextext rule strfmt strut texbox
+  syn keyword mpVardef       textext thefmttext thelabel thetexbox thetextext
+  syn keyword mpVardef       tostring transparency_alternative_to_number
+  syn keyword mpVardef       validtexbox varfmt verbatim
+  syn keyword mpPrimaryDef   asgroup infont normalinfont shadedinto
+  syn keyword mpPrimaryDef   shownshadecenter shownshadedirection
+  syn keyword mpPrimaryDef   shownshadeorigin shownshadevector withshade
+  syn keyword mpPrimaryDef   withshademethod
+  syn keyword mpNewInternal  colorburntransparent colordodgetransparent
+  syn keyword mpNewInternal  colortransparent darkentransparent
+  syn keyword mpNewInternal  differencetransparent exclusiontransparent
+  syn keyword mpNewInternal  hardlighttransparent huetransparent
+  syn keyword mpNewInternal  lightentransparent luminositytransparent
+  syn keyword mpNewInternal  multiplytransparent normaltransparent
+  syn keyword mpNewInternal  overlaytransparent saturationtransparent
+  syn keyword mpNewInternal  screentransparent shadefactor softlighttransparent
+  syn keyword mpNewInternal  textextoffset
+  syn keyword mpType         property transparency
+  syn keyword mpVariable     currentoutlinetext shadeddown shadedleft
+  syn keyword mpVariable     shadedright shadedup shadeoffset trace_shades
+  syn keyword mpConstant     context_mlib
+  " mp-page.mpiv
+  syn keyword mpDef          BoundCoverAreas BoundPageAreas Enlarged FakeRule
+  syn keyword mpDef          FakeWord LoadPageState OverlayBox RuleColor
+  syn keyword mpDef          SetAreaVariables SetPageArea SetPageBackPage
+  syn keyword mpDef          SetPageCoverPage SetPageField SetPageFrontPage
+  syn keyword mpDef          SetPageHsize SetPageHstep SetPageLocation
+  syn keyword mpDef          SetPagePage SetPageSpine SetPageVariables
+  syn keyword mpDef          SetPageVsize SetPageVstep StartCover StartPage
+  syn keyword mpDef          StopCover StopPage SwapPageState innerenlarged
+  syn keyword mpDef          llEnlarged lrEnlarged outerenlarged ulEnlarged
+  syn keyword mpDef          urEnlarged
+  syn keyword mpVardef       BackPageHeight BackPageWidth BackSpace BaseLineSkip
+  syn keyword mpVardef       BodyFontSize BottomDistance BottomHeight
+  syn keyword mpVardef       BottomSpace CoverHeight CoverWidth CurrentColumn
+  syn keyword mpVardef       CurrentHeight CurrentWidth CutSpace EmWidth
+  syn keyword mpVardef       ExHeight FooterDistance FooterHeight
+  syn keyword mpVardef       FrontPageHeight FrontPageWidth HSize HeaderDistance
+  syn keyword mpVardef       HeaderHeight InPageBody InnerEdgeDistance
+  syn keyword mpVardef       InnerEdgeWidth InnerMarginDistance InnerMarginWidth
+  syn keyword mpVardef       InnerSpaceWidth LastPageNumber LayoutColumnDistance
+  syn keyword mpVardef       LayoutColumnWidth LayoutColumns LeftEdgeDistance
+  syn keyword mpVardef       LeftEdgeWidth LeftMarginDistance LeftMarginWidth
+  syn keyword mpVardef       LineHeight MakeupHeight MakeupWidth NOfColumns
+  syn keyword mpVardef       NOfPages OnOddPage OnRightPage OuterEdgeDistance
+  syn keyword mpVardef       OuterEdgeWidth OuterMarginDistance OuterMarginWidth
+  syn keyword mpVardef       OuterSpaceWidth OverlayDepth OverlayHeight
+  syn keyword mpVardef       OverlayLineWidth OverlayOffset OverlayWidth
+  syn keyword mpVardef       PageDepth PageFraction PageNumber PageOffset
+  syn keyword mpVardef       PaperBleed PaperHeight PaperWidth PrintPaperHeight
+  syn keyword mpVardef       PrintPaperWidth RealPageNumber RightEdgeDistance
+  syn keyword mpVardef       RightEdgeWidth RightMarginDistance RightMarginWidth
+  syn keyword mpVardef       SpineHeight SpineWidth StrutDepth StrutHeight
+  syn keyword mpVardef       TextHeight TextWidth TopDistance TopHeight TopSkip
+  syn keyword mpVardef       TopSpace VSize defaultcolormodel
+  syn keyword mpVariable     Area BackPage CoverPage CurrentLayout Field
+  syn keyword mpVariable     FrontPage HorPos Hsize Hstep Location Page
+  syn keyword mpVariable     PageStateAvailable RuleDepth RuleDirection
+  syn keyword mpVariable     RuleFactor RuleH RuleHeight RuleOffset RuleOption
+  syn keyword mpVariable     RuleThickness RuleV RuleWidth Spine VerPos Vsize
+  syn keyword mpVariable     Vstep
+  syn keyword mpConstant     context_page
+  " mp-shap.mpiv
+  syn keyword mpDef          drawline drawshape some_shape
+  syn keyword mpDef          start_predefined_shape_definition
+  syn keyword mpDef          stop_predefined_shape_definition
+  syn keyword mpVardef       drawpredefinedline drawpredefinedshape
+  syn keyword mpVardef       some_shape_path
+  syn keyword mpVariable     predefined_shapes predefined_shapes_xradius
+  syn keyword mpVariable     predefined_shapes_xxradius
+  syn keyword mpVariable     predefined_shapes_yradius
+  syn keyword mpVariable     predefined_shapes_yyradius
+  syn keyword mpConstant     context_shap
+  " mp-step.mpiv
+  syn keyword mpDef          initialize_step_variables midbottomboundary
+  syn keyword mpDef          midtopboundary step_begin_cell step_begin_chart
+  syn keyword mpDef          step_cell_ali step_cell_bot step_cell_top
+  syn keyword mpDef          step_cells step_end_cell step_end_chart
+  syn keyword mpDef          step_text_bot step_text_mid step_text_top
+  syn keyword mpDef          step_texts
+  syn keyword mpVariable     cell_distance_x cell_distance_y cell_fill_color
+  syn keyword mpVariable     cell_line_color cell_line_width cell_offset
+  syn keyword mpVariable     chart_align chart_category chart_vertical
+  syn keyword mpVariable     line_distance line_height line_line_color
+  syn keyword mpVariable     line_line_width line_offset nofcells
+  syn keyword mpVariable     text_distance_set text_fill_color text_line_color
+  syn keyword mpVariable     text_line_width text_offset
+  syn keyword mpConstant     context_cell
+  " mp-symb.mpiv
+  syn keyword mpDef          finishglyph prepareglyph
+  syn keyword mpConstant     lefttriangle midbar onebar righttriangle sidebar
+  syn keyword mpConstant     sublefttriangle subrighttriangle twobar
+  " mp-text.mpiv
+  syn keyword mpDef          build_parshape
+  syn keyword mpVardef       found_point
+  syn keyword mpVariable     trace_parshape
+  syn keyword mpConstant     context_text
+  " mp-tool.mpiv
+  syn keyword mpCommand      dump
+  syn keyword mpDef          addbackground b_color beginglyph break centerarrow
+  syn keyword mpDef          clearxy condition data_mpd_file detaileddraw
+  syn keyword mpDef          detailpaths dowithpath draw drawboundary
+  syn keyword mpDef          drawboundingbox drawcontrollines drawcontrolpoints
+  syn keyword mpDef          drawfill draworigin drawpath drawpathonly
+  syn keyword mpDef          drawpathwithpoints drawpoint drawpointlabels
+  syn keyword mpDef          drawpoints drawticks drawwholepath drawxticks
+  syn keyword mpDef          drawyticks endglyph fill finishsavingdata g_color
+  syn keyword mpDef          inner_boundingbox job_name leftarrow loadmodule
+  syn keyword mpDef          midarrowhead naturalizepaths newboolean newcolor
+  syn keyword mpDef          newnumeric newpair newpath newpicture newstring
+  syn keyword mpDef          newtransform normalcolors normaldraw normalfill
+  syn keyword mpDef          normalwithcolor outer_boundingbox pop_boundingbox
+  syn keyword mpDef          popboundingbox popcurrentpicture push_boundingbox
+  syn keyword mpDef          pushboundingbox pushcurrentpicture r_color readfile
+  syn keyword mpDef          recolor redraw refill register_dirty_chars
+  syn keyword mpDef          remapcolor remapcolors remappedcolor reprocess
+  syn keyword mpDef          resetarrows resetcolormap resetdrawoptions
+  syn keyword mpDef          resolvedcolor restroke retext rightarrow savedata
+  syn keyword mpDef          saveoptions scale_currentpicture set_ahlength
+  syn keyword mpDef          set_grid showgrid startplaincompatibility
+  syn keyword mpDef          startsavingdata stopplaincompatibility
+  syn keyword mpDef          stopsavingdata stripe_path_a stripe_path_n undashed
+  syn keyword mpDef          undrawfill untext visualizeddraw visualizedfill
+  syn keyword mpDef          visualizepaths withcolor withgray
+  syn keyword mpDef          xscale_currentpicture xshifted
+  syn keyword mpDef          xyscale_currentpicture yscale_currentpicture
+  syn keyword mpDef          yshifted
+  syn keyword mpVardef       acos acosh anglebetween area arrowhead
+  syn keyword mpVardef       arrowheadonpath arrowpath asciistring asin asinh
+  syn keyword mpVardef       atan basiccolors bbheight bbwidth bcomponent
+  syn keyword mpVardef       blackcolor bottomboundary boundingbox c_phantom
+  syn keyword mpVardef       ccomponent center cleanstring colorcircle
+  syn keyword mpVardef       colordecimals colordecimalslist colorlike colorpart
+  syn keyword mpVardef       colortype complementary complemented copylist cos
+  syn keyword mpVardef       cosh cot cotd curved ddddecimal dddecimal ddecimal
+  syn keyword mpVardef       decorated drawarrowpath epsed exp freedotlabel
+  syn keyword mpVardef       freelabel gcomponent getunstringed grayed greyed
+  syn keyword mpVardef       hsvtorgb infinite innerboundingbox interpolated inv
+  syn keyword mpVardef       invcos inverted invsin invtan laddered leftboundary
+  syn keyword mpVardef       leftpath leftrightpath listsize listtocurves
+  syn keyword mpVardef       listtolines ln log mcomponent new_on_grid
+  syn keyword mpVardef       outerboundingbox paired pen_size penpoint phantom
+  syn keyword mpVardef       pointarrow pow punked rangepath rcomponent
+  syn keyword mpVardef       redecorated repathed rightboundary rightpath
+  syn keyword mpVardef       rotation roundedsquare set_inner_boundingbox
+  syn keyword mpVardef       set_outer_boundingbox setunstringed shapedlist
+  syn keyword mpVardef       simplified sin sinh sortlist sqr straightpath tan
+  syn keyword mpVardef       tand tanh tensecircle thefreelabel topboundary
+  syn keyword mpVardef       tripled undecorated unitvector unspiked unstringed
+  syn keyword mpVardef       whitecolor ycomponent
+  syn keyword mpPrimaryDef   along blownup bottomenlarged cornered crossed
+  syn keyword mpPrimaryDef   enlarged enlonged leftenlarged llenlarged llmoved
+  syn keyword mpPrimaryDef   lrenlarged lrmoved on paralleled randomized
+  syn keyword mpPrimaryDef   randomizedcontrols randomshifted rightenlarged
+  syn keyword mpPrimaryDef   shortened sized smoothed snapped softened squeezed
+  syn keyword mpPrimaryDef   stretched superellipsed topenlarged ulenlarged
+  syn keyword mpPrimaryDef   ulmoved uncolored urenlarged urmoved xsized
+  syn keyword mpPrimaryDef   xstretched xyscaled xysized ysized ystretched zmod
+  syn keyword mpSecondaryDef anglestriped intersection_point numberstriped
+  syn keyword mpSecondaryDef peepholed
+  syn keyword mpTertiaryDef  cutends
+  syn keyword mpNewInternal  ahdimple ahvariant anglelength anglemethod
+  syn keyword mpNewInternal  angleoffset charscale cmykcolormodel graycolormodel
+  syn keyword mpNewInternal  greycolormodel maxdimensions metapostversion
+  syn keyword mpNewInternal  nocolormodel rgbcolormodel striped_normal_inner
+  syn keyword mpNewInternal  striped_normal_outer striped_reverse_inner
+  syn keyword mpNewInternal  striped_reverse_outer
+  syn keyword mpType         grayscale greyscale quadruplet triplet
+  syn keyword mpVariable     ahfactor collapse_data color_map drawoptionsfactor
+  syn keyword mpVariable     freedotlabelsize freelabeloffset grid grid_full
+  syn keyword mpVariable     grid_h grid_left grid_nx grid_ny grid_w grid_x
+  syn keyword mpVariable     grid_y intersection_found originlength
+  syn keyword mpVariable     plain_compatibility_data pointlabelfont
+  syn keyword mpVariable     pointlabelscale refillbackground savingdata
+  syn keyword mpVariable     savingdatadone swappointlabels ticklength tickstep
+  syn keyword mpConstant     CRLF DQUOTE PERCENT SPACE bcircle context_tool crlf
+  syn keyword mpConstant     darkblue darkcyan darkgray darkgreen darkmagenta
+  syn keyword mpConstant     darkred darkyellow downtriangle dquote freesquare
+  syn keyword mpConstant     fulldiamond fullsquare fulltriangle lcircle
+  syn keyword mpConstant     lefttriangle lightgray llcircle lltriangle lrcircle
+  syn keyword mpConstant     lrtriangle mpversion nocolor noline oddly
+  syn keyword mpConstant     originpath percent rcircle righttriangle space
+  syn keyword mpConstant     tcircle triangle ulcircle ultriangle unitcircle
+  syn keyword mpConstant     unitdiamond unittriangle uptriangle urcircle
+  syn keyword mpConstant     urtriangle
+endif " MetaFun macros
+
 " Define the default highlighting
-" Only when an item doesn't have highlighting yet
-
-hi def link mpTeXinsert	String
-hi def link mpTeXbegin	Statement
-hi def link mpTeXend	Statement
-hi def link mpInternal	mfInternal
-hi def link mpMacro	Macro
-
+hi def link mpTeXdelim     mpPrimitive
+hi def link mpBoolExp      mfBoolExp
+hi def link mpNumExp       mfNumExp
+hi def link mpPairExp      mfPairExp
+hi def link mpPathExp      mfPathExp
+hi def link mpPenExp       mfPenExp
+hi def link mpPicExp       mfPicExp
+hi def link mpStringExp    mfStringExp
+hi def link mpInternal     mfInternal
+hi def link mpCommand      mfCommand
+hi def link mpType         mfType
+hi def link mpPrimitive    mfPrimitive
+hi def link mpDef          mfDef
+hi def link mpVardef       mpDef
+hi def link mpPrimaryDef   mpDef
+hi def link mpSecondaryDef mpDef
+hi def link mpTertiaryDef  mpDef
+hi def link mpNewInternal  mpInternal
+hi def link mpVariable     mfVariable
+hi def link mpConstant     mfConstant
+hi def link mpOnOff        mpPrimitive
+hi def link mpDash         mpPrimitive
 
 let b:current_syntax = "mp"
 
-" vim: ts=8
+let &cpo = s:cpo_sav
+unlet! s:cpo_sav
+
+" vim:sw=2

From 60e68f309675c353b0453d6a1caa21c95caf97c2 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 29 Apr 2017 00:53:29 +0200
Subject: [PATCH 194/257] vim-patch:dc08328821a2

Updated runtime files.

https://github.com/vim/vim/commit/dc08328821a2c11e33dfb1980332e4923ec64fca

NA patches:
vim-patch:8.0.0028
vim-patch:8.0.0029
vim-patch:8.0.0030
---
 runtime/autoload/phpcomplete.vim | 100 ++++++++++++++++++++++++++-----
 runtime/colors/evening.vim       |   6 +-
 runtime/doc/options.txt          |   2 +
 runtime/doc/syntax.txt           |  36 ++++++-----
 runtime/ftplugin/mf.vim          |  11 ++--
 runtime/ftplugin/mp.vim          |  13 ++--
 runtime/indent/mp.vim            |  35 ++++++-----
 runtime/syntax/avra.vim          |   4 +-
 8 files changed, 136 insertions(+), 71 deletions(-)

diff --git a/runtime/autoload/phpcomplete.vim b/runtime/autoload/phpcomplete.vim
index 0d01bc8bf1..8e38867a77 100644
--- a/runtime/autoload/phpcomplete.vim
+++ b/runtime/autoload/phpcomplete.vim
@@ -3,7 +3,7 @@
 " Maintainer:	Dávid Szabó ( complex857 AT gmail DOT com )
 " Previous Maintainer:	Mikolaj Machowski ( mikmach AT wp DOT pl )
 " URL: https://github.com/shawncplus/phpcomplete.vim
-" Last Change:  2015 Jul 13
+" Last Change:  2016 Oct 10
 "
 "	OPTIONS:
 "
@@ -195,6 +195,8 @@ function! phpcomplete#CompletePHP(findstart, base) " {{{
 			" }}}
 		elseif context =~? 'implements'
 			return phpcomplete#CompleteClassName(a:base, ['i'], current_namespace, imports)
+		elseif context =~? 'instanceof'
+			return phpcomplete#CompleteClassName(a:base, ['c', 'n'], current_namespace, imports)
 		elseif context =~? 'extends\s\+.\+$' && a:base == ''
 			return ['implements']
 		elseif context =~? 'extends'
@@ -787,6 +789,8 @@ function! phpcomplete#CompleteClassName(base, kinds, current_namespace, imports)
 
 	if kinds == ['c', 'i']
 		let filterstr = 'v:val =~? "\\(class\\|interface\\)\\s\\+[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*"'
+	elseif kinds == ['c', 'n']
+		let filterstr = 'v:val =~? "\\(class\\|namespace\\)\\s\\+[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*"'
 	elseif kinds == ['c']
 		let filterstr = 'v:val =~? "class\\s\\+[a-zA-Z_\\x7f-\\xff][a-zA-Z_0-9\\x7f-\\xff]*\\s*"'
 	elseif kinds == ['i']
@@ -996,7 +1000,7 @@ function! phpcomplete#CompleteUserClass(context, base, sccontent, visibility) "
 		let required_modifiers += ['static']
 	endif
 	let all_variable = filter(deepcopy(a:sccontent),
-					\ 'v:val =~ "^\\s*\\(var\\s\\+\\|public\\s\\+\\|protected\\s\\+\\|private\\s\\+\\|final\\s\\+\\|abstract\\s\\+\\|static\\s\\+\\)\\+\\$"')
+					\ 'v:val =~ "\\(^\\s*\\(var\\s\\+\\|public\\s\\+\\|protected\\s\\+\\|private\\s\\+\\|final\\s\\+\\|abstract\\s\\+\\|static\\s\\+\\)\\+\\$\\|^\\s*\\(\\/\\|\\*\\)*\\s*@property\\s\\+\\S\\+\\s\\S\\{-}\\s*$\\)"')
 
 	let variables = []
 	for i in all_variable
@@ -1160,6 +1164,14 @@ function! phpcomplete#GetTaglist(pattern) " {{{
 	endif
 
 	let tags = taglist(a:pattern)
+	for tag in tags
+		for prop in keys(tag)
+			if prop == 'cmd' || prop == 'static' || prop == 'kind' || prop == 'builtin'
+				continue
+			endif
+			let tag[prop] = substitute(tag[prop], '\\\\', '\\', 'g')
+		endfor
+	endfor
 	let s:cache_tags[a:pattern] = tags
 	let has_key = has_key(s:cache_tags, a:pattern)
 	let s:cache_tags_checksum = cache_checksum
@@ -1379,7 +1391,7 @@ function! phpcomplete#GetCallChainReturnType(classname_candidate, class_candidat
 			" Get Structured information of all classes and subclasses including namespace and includes
 			" try to find the method's return type in docblock comment
 			for classstructure in classcontents
-				let docblock_target_pattern = 'function\s\+&\?'.method.'\|\(public\|private\|protected\|var\).\+\$'.method
+				let docblock_target_pattern = 'function\s\+&\?'.method.'\>\|\(public\|private\|protected\|var\).\+\$'.method.'\>\|@property.\+\$'.method.'\>'
 				let doc_str = phpcomplete#GetDocBlock(split(classstructure.content, '\n'), docblock_target_pattern)
 				if doc_str != ''
 					break
@@ -1387,8 +1399,17 @@ function! phpcomplete#GetCallChainReturnType(classname_candidate, class_candidat
 			endfor
 			if doc_str != ''
 				let docblock = phpcomplete#ParseDocBlock(doc_str)
-				if has_key(docblock.return, 'type') || has_key(docblock.var, 'type')
-					let type = has_key(docblock.return, 'type') ? docblock.return.type : docblock.var.type
+				if has_key(docblock.return, 'type') || has_key(docblock.var, 'type') || len(docblock.properties) > 0
+					let type = has_key(docblock.return, 'type') ? docblock.return.type : has_key(docblock.var, 'type') ? docblock.var.type : ''
+
+					if type == ''
+						for property in docblock.properties
+							if property.description =~? method
+								let type = property.type
+								break
+							endif
+						endfor
+					endif
 
 					" there's a namespace in the type, threat the type as FQCN
 					if type =~ '\\'
@@ -1554,6 +1575,9 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 	elseif get(methodstack, 0) =~# function_invocation_pattern
 		let function_name = matchstr(methodstack[0], '^\s*\zs'.function_name_pattern)
 		let function_file = phpcomplete#GetFunctionLocation(function_name, a:current_namespace)
+		if function_file == ''
+			let function_file = phpcomplete#GetFunctionLocation(function_name, '\')
+		endif
 
 		if function_file == 'VIMPHP_BUILTINFUNCTION'
 			" built in function, grab the return type from the info string
@@ -1569,7 +1593,7 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 				let [class_candidate_namespace, function_imports] = phpcomplete#GetCurrentNameSpace(file_lines)
 				" try to expand the classname of the returned type with the context got from the function's source file
 
-				let [classname_candidate, unused] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports)
+				let [classname_candidate, class_candidate_namespace] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports)
 			endif
 		endif
 		if classname_candidate != ''
@@ -1650,9 +1674,10 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 					let sub_methodstack = phpcomplete#GetMethodStack(matchstr(line, '^\s*'.object.'\s*=&\?\s*\s\+\zs.*'))
 					let [classname_candidate, class_candidate_namespace] = phpcomplete#GetCallChainReturnType(
 						\ classname,
-						\ a:current_namespace,
+						\ namespace_for_class,
 						\ a:imports,
 						\ sub_methodstack)
+
 					return (class_candidate_namespace == '\' || class_candidate_namespace == '') ? classname_candidate : class_candidate_namespace.'\'.classname_candidate
 				endif
 			endif
@@ -1783,6 +1808,9 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 				let [function_name, function_namespace] = phpcomplete#ExpandClassName(function_name, a:current_namespace, a:imports)
 
 				let function_file = phpcomplete#GetFunctionLocation(function_name, function_namespace)
+				if function_file == ''
+					let function_file = phpcomplete#GetFunctionLocation(function_name, '\')
+				endif
 
 				if function_file == 'VIMPHP_BUILTINFUNCTION'
 					" built in function, grab the return type from the info string
@@ -1798,7 +1826,7 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 						let classname_candidate = docblock.return.type
 						let [class_candidate_namespace, function_imports] = phpcomplete#GetCurrentNameSpace(file_lines)
 						" try to expand the classname of the returned type with the context got from the function's source file
-						let [classname_candidate, unused] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports)
+						let [classname_candidate, class_candidate_namespace] = phpcomplete#ExpandClassName(classname_candidate, class_candidate_namespace, function_imports)
 						break
 					endif
 				endif
@@ -1861,6 +1889,8 @@ function! phpcomplete#GetClassName(start_line, context, current_namespace, impor
 				for tag in tags
 					if tag.kind ==? 'v' && tag.cmd =~? '=\s*new\s\+\zs'.class_name_pattern.'\ze'
 						let classname = matchstr(tag.cmd, '=\s*new\s\+\zs'.class_name_pattern.'\ze')
+						" unescape the classname, it would have "\" doubled since it is an ex command
+						let classname = substitute(classname, '\\\(\_.\)', '\1', 'g')
 						return classname
 					endif
 				endfor
@@ -2077,6 +2107,19 @@ function! phpcomplete#GetClassContentsStructure(file_path, file_lines, class_nam
 	endif
 	call searchpair('{', '', '}', 'W')
 	let class_closing_bracket_line = line('.')
+
+	" Include class docblock
+	let doc_line = cfline - 1
+	if getline(doc_line) =~? '^\s*\*/'
+		while doc_line != 0
+			if getline(doc_line) =~? '^\s*/\*\*'
+				let cfline = doc_line
+				break
+			endif
+			let doc_line -= 1
+		endwhile
+	endif
+
 	let classcontent = join(getline(cfline, class_closing_bracket_line), "\n")
 
 	let used_traits = []
@@ -2241,8 +2284,19 @@ function! phpcomplete#GetDocBlock(sccontent, search) " {{{
 		let line = a:sccontent[i]
 		" search for a function declaration
 		if line =~? a:search
-			let l = i - 1
-			" start backward serch for the comment block
+			if line =~? '@property'
+				let doc_line = i
+				while doc_line != sccontent_len - 1
+					if a:sccontent[doc_line] =~? '^\s*\*/'
+						let l = doc_line
+						break
+					endif
+					let doc_line += 1
+				endwhile
+			else
+				let l = i - 1
+			endif
+			" start backward search for the comment block
 			while l != 0
 				let line = a:sccontent[l]
 				" if it's a one line docblock like comment and we can just return it right away
@@ -2263,7 +2317,7 @@ function! phpcomplete#GetDocBlock(sccontent, search) " {{{
 				return ''
 			end
 
-			while l != 0
+			while l >= 0
 				let line = a:sccontent[l]
 				if line =~? '^\s*/\*\*'
 					let comment_start = l
@@ -2297,9 +2351,10 @@ function! phpcomplete#ParseDocBlock(docblock) " {{{
 		\ 'return': {},
 		\ 'throws': [],
 		\ 'var': {},
+		\ 'properties': [],
 		\ }
 
-	let res.description = substitute(matchstr(a:docblock, '\zs\_.\{-}\ze\(@var\|@param\|@return\|$\)'), '\(^\_s*\|\_s*$\)', '', 'g')
+	let res.description = substitute(matchstr(a:docblock, '\zs\_.\{-}\ze\(@type\|@var\|@param\|@return\|$\)'), '\(^\_s*\|\_s*$\)', '', 'g')
 	let docblock_lines = split(a:docblock, "\n")
 
 	let param_lines = filter(copy(docblock_lines), 'v:val =~? "^@param"')
@@ -2334,15 +2389,26 @@ function! phpcomplete#ParseDocBlock(docblock) " {{{
 		endif
 	endfor
 
-	let var_line = filter(copy(docblock_lines), 'v:val =~? "^@var"')
+	let var_line = filter(copy(docblock_lines), 'v:val =~? "^\\(@var\\|@type\\)"')
 	if len(var_line) > 0
-		let var_parts = matchlist(var_line[0], '@var\s\+\(\S\+\)\s*\(.*\)')
+		let var_parts = matchlist(var_line[0], '\(@var\|@type\)\s\+\(\S\+\)\s*\(.*\)')
 		let res['var'] = {
 					\ 'line': var_parts[0],
-					\ 'type': phpcomplete#GetTypeFromDocBlockParam(get(var_parts, 1, '')),
-					\ 'description': get(var_parts, 2, '')}
+					\ 'type': phpcomplete#GetTypeFromDocBlockParam(get(var_parts, 2, '')),
+					\ 'description': get(var_parts, 3, '')}
 	endif
 
+	let property_lines = filter(copy(docblock_lines), 'v:val =~? "^@property"')
+	for property_line in property_lines
+		let parts = matchlist(property_line, '\(@property\)\s\+\(\S\+\)\s*\(.*\)')
+		if len(parts) > 0
+			call add(res.properties, {
+						\ 'line': parts[0],
+						\ 'type': phpcomplete#GetTypeFromDocBlockParam(get(parts, 2, '')),
+						\ 'description': get(parts, 3, '')})
+		endif
+	endfor
+
 	return res
 endfunction
 " }}}
@@ -2498,6 +2564,7 @@ function! phpcomplete#GetCurrentNameSpace(file_lines) " {{{
 						let	name = matchstr(name, '\\\zs[^\\]\+\ze$')
 					endif
 				endif
+
 				" leading slash is not required use imports are always absolute
 				let imports[name] = {'name': object, 'kind': ''}
 			endfor
@@ -2533,6 +2600,7 @@ function! phpcomplete#GetCurrentNameSpace(file_lines) " {{{
 								elseif !exists('no_namespace_candidate')
 									" save the first namespacless match to be used if no better
 									" candidate found later on
+									let tag.namespace = namespace_for_classes
 									let no_namespace_candidate = tag
 								endif
 							endif
diff --git a/runtime/colors/evening.vim b/runtime/colors/evening.vim
index 5dae08280e..5257307593 100644
--- a/runtime/colors/evening.vim
+++ b/runtime/colors/evening.vim
@@ -1,6 +1,6 @@
 " Vim color file
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2006 Apr 14
+" Last Change:	2016 Oct 10
 
 " This color scheme uses a dark grey background.
 
@@ -45,8 +45,8 @@ hi CursorColumn term=reverse ctermbg=Black guibg=grey40
 hi CursorLine term=underline cterm=underline guibg=grey40
 
 " Groups for syntax highlighting
-hi Constant term=underline ctermfg=Magenta guifg=#ffa0a0 guibg=grey5
-hi Special term=bold ctermfg=LightRed guifg=Orange guibg=grey5
+hi Constant term=underline ctermfg=Magenta guifg=#ffa0a0
+hi Special term=bold ctermfg=LightRed guifg=Orange
 if &t_Co > 8
   hi Statement term=bold cterm=bold ctermfg=Yellow guifg=#ffff60 gui=bold
 endif
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index b0b47cc243..bbfd6d32d3 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3431,6 +3431,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	original position when no match is found and when pressing <Esc>.  You
 	still need to finish the search command with <Enter> to move the
 	cursor to the match.
+	You can use the CTRL-G and CTRL-T keys to move to the next and
+	previous match. |c_CTRL-G| |c_CTRL-T|
 	Vim only searches for about half a second.  With a complicated
 	pattern and/or a lot of text the match may not be found.  This is to
 	avoid that Vim hangs while you are typing the pattern.
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 1ee35e19dd..9e4f546f64 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -2850,9 +2850,11 @@ vimrc file: >
 (Adapted from the html.vim help text by Claudio Fleiner <claudio@fleiner.com>)
 
 
-SH		*sh.vim* *ft-sh-syntax* *ft-bash-syntax* *ft-ksh-syntax*
+		*ft-posix-synax* *ft-dash-syntax*
+SH		*sh.vim*  *ft-sh-syntax*  *ft-bash-syntax*  *ft-ksh-syntax*
 
-This covers the "normal" Unix (Bourne) sh, bash and the Korn shell.
+This covers syntax highlighting for the older Unix (Bourne) sh, and newer
+shells such as bash, dash, posix, and the Korn shells.
 
 Vim attempts to determine which shell type is in use by specifying that
 various filenames are of specific types: >
@@ -2861,28 +2863,31 @@ various filenames are of specific types: >
     bash: .bashrc* bashrc bash.bashrc .bash_profile* *.bash
 <
 If none of these cases pertain, then the first line of the file is examined
-(ex. /bin/sh  /bin/ksh	/bin/bash).  If the first line specifies a shelltype,
-then that shelltype is used.  However some files (ex. .profile) are known to
-be shell files but the type is not apparent.  Furthermore, on many systems
-sh is symbolically linked to "bash" (Linux, Windows+cygwin) or "ksh" (Posix).
+(ex. looking for /bin/sh  /bin/ksh  /bin/bash).  If the first line specifies a
+shelltype, then that shelltype is used.  However some files (ex. .profile) are
+known to be shell files but the type is not apparent.  Furthermore, on many
+systems sh is symbolically linked to "bash" (Linux, Windows+cygwin) or "ksh"
+(Posix).
 
-One may specify a global default by instantiating one of the following three
+One may specify a global default by instantiating one of the following
 variables in your vimrc:
 
-    ksh: >
+   ksh: >
 	let g:is_kornshell = 1
-<   posix: (using this is the same as setting is_kornshell to 1) >
+<   posix:  (using this is the nearly the same as setting g:is_kornshell to 1) >
 	let g:is_posix     = 1
 <   bash: >
 	let g:is_bash	   = 1
 <   sh: (default) Bourne shell >
 	let g:is_sh	   = 1
 
+<   (dash users should use posix)
+
 If there's no "#! ..." line, and the user hasn't availed himself/herself of a
 default sh.vim syntax setting as just shown, then syntax/sh.vim will assume
 the Bourne shell syntax.  No need to quote RFCs or market penetration
 statistics in error reports, please -- just select the default version of the
-sh your system uses in your vimrc.
+sh your system uses and install the associated "let..." in your <.vimrc>.
 
 The syntax/sh.vim file provides several levels of syntax-based folding: >
 
@@ -2891,7 +2896,7 @@ The syntax/sh.vim file provides several levels of syntax-based folding: >
 	let g:sh_fold_enabled= 2     (enable heredoc folding)
 	let g:sh_fold_enabled= 4     (enable if/do/for folding)
 >
-then various syntax items (HereDocuments and function bodies) become
+then various syntax items (ie. HereDocuments and function bodies) become
 syntax-foldable (see |:syn-fold|).  You also may add these together
 to get multiple types of folding: >
 
@@ -2915,14 +2920,7 @@ reduce this, the "sh_maxlines" internal variable can be set.  Example: >
 The default is to use the twice sh_minlines.  Set it to a smaller number to
 speed up displaying.  The disadvantage is that highlight errors may appear.
 
-						*g:sh_isk* *g:sh_noisk*
-The shell languages appear to let "." be part of words, commands, etc;
-consequently it should be in the isk for sh.vim.  As of v116 of syntax/sh.vim,
-syntax/sh.vim will append the "." to |'iskeyword'| by default; you may control
-this behavior with: >
-	let g:sh_isk  = '..whatever characters you want as part of iskeyword'
-	let g:sh_noisk= 1  " otherwise, if this exists, the isk will NOT chg
-<
+
 						*sh-embed*  *sh-awk*
  Sh: EMBEDDING LANGUAGES~
 
diff --git a/runtime/ftplugin/mf.vim b/runtime/ftplugin/mf.vim
index fa567368ea..7c9a8a1283 100644
--- a/runtime/ftplugin/mf.vim
+++ b/runtime/ftplugin/mf.vim
@@ -2,7 +2,7 @@
 " Language:           METAFONT
 " Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 " Former Maintainers: Nikolai Weibull <now@bitwi.se>
-" Latest Revision:    2016 Oct 1
+" Latest Revision:    2016 Oct 2
 
 if exists("b:did_ftplugin")
   finish
@@ -25,7 +25,7 @@ let g:omni_syntax_group_exclude_mf = 'mfTodoComment'
 
 let s:mp_regex = {
       \ 'beginsection' : '^\s*\%(\%(\|var\|primary\|secondary\|tertiary\)def\|beginchar\|beginlogochar\)\>',
-      \ 'endsection'   : '^\s*\%(enddef\|endchar\|endlogochar\)\>',
+      \ 'endsection'   : '^\s*\%(enddef\|endchar\)\>',
       \ 'beginblock'   : '^\s*\%(begingroup\|if\|for\%(\|suffixes\|ever\)\)\>',
       \ 'endblock'     : '^\s*\%(endgroup\|fi\|endfor\)\>'
       \ }
@@ -35,9 +35,7 @@ function! s:move_around(count, what, flags, visual)
     exe "normal! gv"
   endif
   call search(s:mp_regex[a:what], a:flags.'s') " 's' sets previous context mark
-  for i in range(2, a:count)
-    call search(s:mp_regex[a:what], a:flags)
-  endfor
+  call map(range(2, a:count), 'search(s:mp_regex[a:what], a:flags)')
 endfunction
 
 
@@ -62,8 +60,7 @@ if exists("loaded_matchit")
         \ '\<for\%(\|suffixes\|ever\)\>:\<exit\%(if\|unless\)\>:\<endfor\>,' .
         \ '\<\%(\|var\|primary\|secondary\|tertiary\)def\>:\<enddef\>,' .
         \ '\<begingroup\>:\<endgroup\>,' .
-        \ '\<beginchar\>:\<endchar\>' .
-        \ '\<beginlogochar\>:\<endlogochar\>'
+        \ '\<begin\%(logo\)\?char\>:\<endchar\>'
   " Ignore comments and strings
   let b:match_skip = 'synIDattr(synID(line("."), col("."), 1), "name")
         \ =~# "mf\\(Comment\\|String\\)$"'
diff --git a/runtime/ftplugin/mp.vim b/runtime/ftplugin/mp.vim
index a3c9af342b..3a0a3d0298 100644
--- a/runtime/ftplugin/mp.vim
+++ b/runtime/ftplugin/mp.vim
@@ -2,7 +2,7 @@
 " Language:           MetaPost
 " Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 " Former Maintainers: Nikolai Weibull <now@bitwi.se>
-" Latest Revision:    2016 Oct 1
+" Latest Revision:    2016 Oct 2
 
 if exists("b:did_ftplugin")
   finish
@@ -34,7 +34,7 @@ endif
 
 let s:mp_regex = {
       \ 'beginsection' : '^\s*\%(\%(\|var\|primary\|secondary\|tertiary\)def\|begin\%(fig\|char\|logochar\|glyph\|graph\)\)\>',
-      \ 'endsection'   : '^\s*\%(enddef\|end\%(fig\|char\|logochar\|glyph\|graph\)\)\>',
+      \ 'endsection'   : '^\s*\%(enddef\|end\%(fig\|char\|glyph\|graph\)\)\>',
       \ 'beginblock'   : '^\s*\%(begingroup\|if\|for\%(\|suffixes\|ever\)\)\>',
       \ 'endblock'     : '^\s*\%(endgroup\|fi\|endfor\)\>'
       \ }
@@ -44,9 +44,7 @@ function! s:move_around(count, what, flags, visual)
     exe "normal! gv"
   endif
   call search(s:mp_regex[a:what], a:flags.'s') " 's' sets previous context mark
-  for i in range(2, a:count)
-    call search(s:mp_regex[a:what], a:flags)
-  endfor
+  call map(range(2, a:count), 'search(s:mp_regex[a:what], a:flags)')
 endfunction
 
 
@@ -72,9 +70,8 @@ if exists("loaded_matchit")
         \ '\<\%(\|var\|primary\|secondary\|tertiary\)def\>:\<enddef\>,' .
         \ '\<beginfig\>:\<endfig\>,' .
         \ '\<begingroup\>:\<endgroup\>,' .
-        \ '\<beginchar\>:\<endchar\>' .
-        \ '\<beginlogochar\>:\<endlogochar\>' .
-        \ '\<beginglyph\>:\<endglyph\>' .
+        \ '\<begin\%(logo\)\?char\>:\<endchar\>,' .
+        \ '\<beginglyph\>:\<endglyph\>,' .
         \ '\<begingraph\>:\<endgraph\>'
   " Ignore comments and strings
   let b:match_skip = 'synIDattr(synID(line("."), col("."), 1), "name")
diff --git a/runtime/indent/mp.vim b/runtime/indent/mp.vim
index c9639efed3..86fa2539c1 100644
--- a/runtime/indent/mp.vim
+++ b/runtime/indent/mp.vim
@@ -2,7 +2,7 @@
 " Language:           MetaPost
 " Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 " Former Maintainers: Eugene Minkovskii <emin@mccme.ru>
-" Last Change:        2016 Oct 01
+" Last Change:        2016 Oct 2, 4:13pm
 " Version: 0.2
 
 if exists("b:did_indent")
@@ -57,7 +57,7 @@ let g:mp_open_tag = ''
 let g:mp_close_tag = ''
       \ . '\<fi\>'
       \ . '\|\<else\%[if]\>'
-      \ . '\|\<end\%(\|for\|group\|def\|fig\|char\|logochar\|glyph\|graph\)\>'
+      \ . '\|\<end\%(\|for\|group\|def\|fig\|char\|glyph\|graph\)\>'
       \ . '\|[)\]}]'
 
 " Statements that may span multiple lines and are ended by a semicolon. To
@@ -118,12 +118,10 @@ function! s:CommentOrString(line, pos)
   return in_string || (c >= 0 && c <= a:pos)
 endfunction
 
-" Find the first non-comment non-blank line before the current line. Skip also
-" verbatimtex/btex... etex blocks.
+" Find the first non-comment non-blank line before the current line.
 function! s:PrevNonBlankNonComment(lnum)
   let l:lnum = prevnonblank(a:lnum - 1)
-  while getline(l:lnum) =~# '^\s*%' ||
-        \ synIDattr(synID(a:lnum, 1, 1), "name") =~# '^mpTeXinsert$\|^tex\|^Delimiter'
+  while getline(l:lnum) =~# '^\s*%'
     let l:lnum = prevnonblank(l:lnum - 1)
   endwhile
   return l:lnum
@@ -220,25 +218,32 @@ endfunction
 "
 " Example:
 "
-"    shiftwidth=4
 "    def foo =
-"        makepen(subpath(T-n,t) of r %>
-"            shifted .5down %>
-"                --subpath(t,T) of r shifted .5up -- cycle) %<<
+"        makepen(
+"            subpath(T-n,t) of r  %>
+"                shifted .5down   %>
+"                    --subpath(t,T) of r shifted .5up -- cycle   %<<<
+"        )
 "        withcolor black
 "    enddef
 "
 " The default indentation of the previous example would be:
 "
 "    def foo =
-"        makepen(subpath(T-n,t) of r
-"        shifted .5down
-"        --subpath(t,T) of r shifted .5up -- cycle)
+"        makepen(
+"            subpath(T-n,t) of r
+"            shifted .5down
+"            --subpath(t,T) of r shifted .5up -- cycle
+"        )
 "        withcolor black
 "    enddef
 "
 " Personally, I prefer the latter, but anyway...
 function! GetMetaPostIndentIntern()
+  " Do not touch indentation inside verbatimtex/btex.. etex blocks.
+  if synIDattr(synID(v:lnum, 1, 1), "name") =~# '^mpTeXinsert$\|^tex\|^Delimiter'
+    return -1
+  endif
 
   " This is the reference line relative to which the current line is indented
   " (but see below).
@@ -327,8 +332,8 @@ function! GetMetaPostIndentIntern()
   "
   "    for i = 1 upto 3:  % <-- Current line: this gets the same indent as `draw ...`
   "
-  " NOTE: we get here if and only if L does not contain a statement (among
-  " those listed in g:mp_statement).
+  " NOTE: we get here only if L does not contain a statement (among those
+  " listed in g:mp_statement).
   if s:ValidMatchEnd(prev_text, ';'.s:eol, 0) >= 0 " L ends with a semicolon
     let stm_lnum = s:PrevNonBlankNonComment(lnum)
     while stm_lnum > 0
diff --git a/runtime/syntax/avra.vim b/runtime/syntax/avra.vim
index ebf0aaff11..0e02bd8397 100644
--- a/runtime/syntax/avra.vim
+++ b/runtime/syntax/avra.vim
@@ -2,14 +2,12 @@
 " Language:     AVR Assembler (AVRA)
 " AVRA Home:    http://avra.sourceforge.net/index.html
 " AVRA Version: 1.3.0
+" Last Update:	2016 Oct 7
 " Maintainer:	  Marius Ghita <mhitza@gmail.com>
 
 let s:cpo_save = &cpo
 set cpo&vim
 
-setlocal iskeyword=a-z,A-Z,48-57,.,_
-" 'isident' is a global option, better not set it
-" setlocal isident=a-z,A-Z,48-57,.,_
 syn case ignore
 
 syn keyword avraRegister r0 r1 r2 r3 r4 r5 r6 r7 r8 r9 r10 r11 r12 r13 r14

From 53419673154a98b705cfa80590099a247cc9df49 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 29 Apr 2017 01:02:22 +0200
Subject: [PATCH 195/257] vim-patch:4575876dc865

Updated runtime files.

https://github.com/vim/vim/commit/4575876dc865d4160f20d61bd822fbe7cafbec41
---
 runtime/autoload/rubycomplete.vim | 2 +-
 runtime/indent/ruby.vim           | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/runtime/autoload/rubycomplete.vim b/runtime/autoload/rubycomplete.vim
index 440dfd42e9..40b87f4cbe 100644
--- a/runtime/autoload/rubycomplete.vim
+++ b/runtime/autoload/rubycomplete.vim
@@ -196,7 +196,7 @@ function! rubycomplete#Complete(findstart, base)
             if c =~ '\w'
                 continue
             elseif ! c =~ '\.'
-                idx = -1
+                let idx = -1
                 break
             else
                 break
diff --git a/runtime/indent/ruby.vim b/runtime/indent/ruby.vim
index 4f87ec7823..a97f4828d6 100644
--- a/runtime/indent/ruby.vim
+++ b/runtime/indent/ruby.vim
@@ -92,11 +92,12 @@ let s:end_skip_expr = s:skip_expr .
       \ ' && getline(".") =~ "^\\s*\\<\\(while\\|until\\|for\\):\\@!\\>")'
 
 " Regex that defines continuation lines, not including (, {, or [.
-let s:non_bracket_continuation_regex = '\%([\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)\s*\%(#.*\)\=$'
+let s:non_bracket_continuation_regex =
+      \ '\%([\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|:\@<![^[:alnum:]:][|&?]\|||\|&&\)\s*\%(#.*\)\=$'
 
 " Regex that defines continuation lines.
 let s:continuation_regex =
-      \ '\%(%\@<![({[\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|\W[|&?]\|||\|&&\)\s*\%(#.*\)\=$'
+      \ '\%(%\@<![({[\\.,:*/%+]\|\<and\|\<or\|\%(<%\)\@<![=-]\|:\@<![^[:alnum:]:][|&?]\|||\|&&\)\s*\%(#.*\)\=$'
 
 " Regex that defines continuable keywords
 let s:continuable_regex =
@@ -389,7 +390,7 @@ function! s:FindContainingClass()
       call setpos('.', saved_position)
       return found_lnum
     endif
-  endif
+  endwhile
 
   call setpos('.', saved_position)
   return 0

From 8d3f8f639ba8ca37f32e08647822ac428738ea28 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 29 Apr 2017 01:43:29 +0200
Subject: [PATCH 196/257] vim-patch:46fceaaa8d14

Updated runtime files.

https://github.com/vim/vim/commit/46fceaaa8d1447a9588736d86eb4908214187b08
---
 runtime/autoload/context.vim         | 184 +++++++++++++++++++++++++++
 runtime/autoload/contextcomplete.vim |  25 ++++
 runtime/compiler/context.vim         |  54 ++++++++
 runtime/doc/tabpage.txt              |   3 +
 runtime/doc/windows.txt              |   2 +-
 runtime/filetype.vim                 |   4 +-
 runtime/ftplugin/context.vim         |  79 +++++++++++-
 runtime/indent/context.vim           |  36 ++++++
 runtime/syntax/context.vim           | 115 +++++++++++------
 runtime/syntax/mp.vim                |   8 +-
 10 files changed, 458 insertions(+), 52 deletions(-)
 create mode 100644 runtime/autoload/context.vim
 create mode 100644 runtime/autoload/contextcomplete.vim
 create mode 100644 runtime/compiler/context.vim
 create mode 100644 runtime/indent/context.vim

diff --git a/runtime/autoload/context.vim b/runtime/autoload/context.vim
new file mode 100644
index 0000000000..254d710c01
--- /dev/null
+++ b/runtime/autoload/context.vim
@@ -0,0 +1,184 @@
+" Language:           ConTeXt typesetting engine
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Latest Revision:    2016 Oct 21
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+" Helper functions {{{
+function! s:context_echo(message, mode)
+  redraw
+  echo "\r"
+  execute 'echohl' a:mode
+  echomsg '[ConTeXt]' a:message
+  echohl None
+endf
+
+function! s:sh()
+  return has('win32') || has('win64') || has('win16') || has('win95')
+        \ ? ['cmd.exe', '/C']
+        \ : ['/bin/sh', '-c']
+endfunction
+
+" For backward compatibility
+if exists('*win_getid')
+
+  function! s:win_getid()
+    return win_getid()
+  endf
+
+  function! s:win_id2win(winid)
+    return win_id2win(a:winid)
+  endf
+
+else
+
+  function! s:win_getid()
+    return winnr()
+  endf
+
+  function! s:win_id2win(winnr)
+    return a:winnr
+  endf
+
+endif
+" }}}
+
+" ConTeXt jobs {{{
+if has('job')
+
+  let g:context_jobs = []
+
+  " Print the status of ConTeXt jobs
+  function! context#job_status()
+    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
+    let l:n = len(l:jobs)
+    call s:context_echo(
+          \ 'There '.(l:n == 1 ? 'is' : 'are').' '.(l:n == 0 ? 'no' : l:n)
+          \ .' job'.(l:n == 1 ? '' : 's').' running'
+          \ .(l:n == 0 ? '.' : ' (' . join(l:jobs, ', ').').'),
+          \ 'ModeMsg')
+  endfunction
+
+  " Stop all ConTeXt jobs
+  function! context#stop_jobs()
+    let l:jobs = filter(g:context_jobs, 'job_status(v:val) == "run"')
+    for job in l:jobs
+      call job_stop(job)
+    endfor
+    sleep 1
+    let l:tmp = []
+    for job in l:jobs
+      if job_status(job) == "run"
+        call add(l:tmp, job)
+      endif
+    endfor
+    let g:context_jobs = l:tmp
+    if empty(g:context_jobs)
+      call s:context_echo('Done. No jobs running.', 'ModeMsg')
+    else
+      call s:context_echo('There are still some jobs running. Please try again.', 'WarningMsg')
+    endif
+  endfunction
+
+  function! context#callback(path, job, status)
+    if index(g:context_jobs, a:job) != -1 && job_status(a:job) != 'run' " just in case
+      call remove(g:context_jobs, index(g:context_jobs, a:job))
+    endif
+    call s:callback(a:path, a:job, a:status)
+  endfunction
+
+  function! context#close_cb(channel)
+    call job_status(ch_getjob(a:channel)) " Trigger exit_cb's callback for faster feedback
+  endfunction
+
+  function! s:typeset(path)
+    call add(g:context_jobs,
+          \ job_start(add(s:sh(), context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))), {
+          \   'close_cb' : 'context#close_cb',
+          \   'exit_cb'  : function(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
+          \                         [a:path]),
+          \   'in_io'    : 'null'
+          \ }))
+  endfunction
+
+else " No jobs
+
+  function! context#job_status()
+    call s:context_echo('Not implemented', 'WarningMsg')
+  endfunction!
+
+  function! context#stop_jobs()
+    call s:context_echo('Not implemented', 'WarningMsg')
+  endfunction
+
+  function! context#callback(path, job, status)
+    call s:callback(a:path, a:job, a:status)
+  endfunction
+
+  function! s:typeset(path)
+    execute '!' . context#command() . ' ' . shellescape(fnamemodify(a:path, ":t"))
+    call call(get(b:, 'context_callback', get(g:, 'context_callback', 'context#callback')),
+          \ [a:path, 0, v:shell_error])
+  endfunction
+
+endif " has('job')
+
+function! s:callback(path, job, status) abort
+  if a:status < 0 " Assume the job was terminated
+    return
+  endif
+  " Get info about the current window
+  let l:winid = s:win_getid()             " Save window id
+  let l:efm = &l:errorformat              " Save local errorformat
+  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
+  " Set errorformat to parse ConTeXt errors
+  execute 'setl efm=' . escape(b:context_errorformat, ' ')
+  try " Set cwd to expand error file correctly
+    execute 'lcd' fnameescape(fnamemodify(a:path, ':h'))
+  catch /.*/
+    execute 'setl efm=' . escape(l:efm, ' ')
+    throw v:exception
+  endtry
+  try
+    execute 'cgetfile' fnameescape(fnamemodify(a:path, ':r') . '.log')
+    botright cwindow
+  finally " Restore cwd and errorformat
+    execute s:win_id2win(l:winid) . 'wincmd w'
+    execute 'lcd ' . fnameescape(l:cwd)
+    execute 'setl efm=' . escape(l:efm, ' ')
+  endtry
+  if a:status == 0
+    call s:context_echo('Success!', 'ModeMsg')
+  else
+    call s:context_echo('There are errors. ', 'ErrorMsg')
+  endif
+endfunction
+
+function! context#command()
+  return get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
+        \ . ' --script context --autogenerate --nonstopmode'
+        \ . ' --synctex=' . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
+        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
+endfunction
+
+" Accepts an optional path (useful for big projects, when the file you are
+" editing is not the project's root document). If no argument is given, uses
+" the path of the current buffer.
+function! context#typeset(...) abort
+  let l:path = fnamemodify(strlen(a:000[0]) > 0 ? a:1 : expand("%"), ":p")
+  let l:cwd = fnamemodify(getcwd(), ":p") " Save local working directory
+  call s:context_echo('Typesetting...',  'ModeMsg')
+  execute 'lcd' fnameescape(fnamemodify(l:path, ":h"))
+  try
+    call s:typeset(l:path)
+  finally " Restore local working directory
+    execute 'lcd ' . fnameescape(l:cwd)
+  endtry
+endfunction!
+"}}}
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim: sw=2 fdm=marker
diff --git a/runtime/autoload/contextcomplete.vim b/runtime/autoload/contextcomplete.vim
new file mode 100644
index 0000000000..5b93bb0986
--- /dev/null
+++ b/runtime/autoload/contextcomplete.vim
@@ -0,0 +1,25 @@
+" Language:           ConTeXt typesetting engine
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Latest Revision:    2016 Oct 15
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+" Complete keywords in MetaPost blocks
+function! contextcomplete#Complete(findstart, base)
+  if a:findstart == 1
+    if len(synstack(line('.'), 1)) > 0 &&
+          \ synIDattr(synstack(line('.'), 1)[0], "name") ==# 'contextMPGraphic'
+      return syntaxcomplete#Complete(a:findstart, a:base)
+    else
+      return -3
+    endif
+  else
+    return syntaxcomplete#Complete(a:findstart, a:base)
+  endif
+endfunction
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim: sw=2 fdm=marker
diff --git a/runtime/compiler/context.vim b/runtime/compiler/context.vim
new file mode 100644
index 0000000000..cb78c96df0
--- /dev/null
+++ b/runtime/compiler/context.vim
@@ -0,0 +1,54 @@
+" Vim compiler file
+" Compiler:     ConTeXt typesetting engine
+" Maintainer:   Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Last Change:  2016 Oct 21
+
+if exists("current_compiler")
+  finish
+endif
+let s:keepcpo= &cpo
+set cpo&vim
+
+if exists(":CompilerSet") != 2    " older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+" If makefile exists and we are not asked to ignore it, we use standard make
+" (do not redefine makeprg)
+if get(b:, 'context_ignore_makefile', get(g:, 'context_ignore_makefile', 0)) ||
+      \ (!filereadable('Makefile') && !filereadable('makefile'))
+  let current_compiler = 'context'
+  " The following assumes that the current working directory is set to the
+  " directory of the file to be typeset
+  let &l:makeprg = get(b:, 'context_mtxrun', get(g:, 'context_mtxrun', 'mtxrun'))
+        \ . ' --script context --autogenerate --nonstopmode --synctex='
+        \ . (get(b:, 'context_synctex', get(g:, 'context_synctex', 0)) ? '1' : '0')
+        \ . ' ' . get(b:, 'context_extra_options', get(g:, 'context_extra_options', ''))
+        \ . ' ' . shellescape(expand('%:p:t'))
+else
+  let current_compiler = 'make'
+endif
+
+let b:context_errorformat = ''
+      \ . '%-Popen source%.%#> %f,'
+      \ . '%-Qclose source%.%#> %f,'
+      \ . "%-Popen source%.%#name '%f',"
+      \ . "%-Qclose source%.%#name '%f',"
+      \ . '%Etex %trror%.%#mp error on line %l in file %f:%.%#,'
+      \ . 'tex %trror%.%#error on line %l in file %f: %m,'
+      \ . '%Elua %trror%.%#error on line %l in file %f:,'
+      \ . '%+Emetapost %#> error: %#,'
+      \ . '! error: %#%m,'
+      \ . '%-C %#,'
+      \ . '%C! %m,'
+      \ . '%Z[ctxlua]%m,'
+      \ . '%+C<*> %.%#,'
+      \ . '%-C%.%#,'
+      \ . '%Z...%m,'
+      \ . '%-Zno-error,'
+      \ . '%-G%.%#' " Skip remaining lines
+
+execute 'CompilerSet errorformat=' . escape(b:context_errorformat, ' ')
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt
index c9635a9f6f..5ee71d7aab 100644
--- a/runtime/doc/tabpage.txt
+++ b/runtime/doc/tabpage.txt
@@ -54,6 +54,8 @@ right of the labels.
 In the GUI tab pages line you can use the right mouse button to open menu.
 |tabline-menu|.
 
+For the related autocommands see |tabnew-autocmd|.
+
 :[count]tabe[dit]				*:tabe* *:tabedit* *:tabnew*
 :[count]tabnew
 		Open a new tab page with an empty window, after the current
@@ -279,6 +281,7 @@ Variables local to a tab page start with "t:". |tabpage-variable|
 
 Currently there is only one option local to a tab page: 'cmdheight'.
 
+						*tabnew-autocmd*
 The TabLeave and TabEnter autocommand events can be used to do something when
 switching from one tab page to another.  The exact order depends on what you
 are doing.  When creating a new tab page this works as if you create a new
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index fa7a7f2a81..ebedbb8ae6 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -287,7 +287,7 @@ CTRL-W CTRL-Q						*CTRL-W_CTRL-Q*
 		    :1quit  " quit the first window
 		    :$quit  " quit the last window
 		    :9quit  " quit the last window
-			    " if there are less than 9 windows opened
+			    " if there are fewer than 9 windows opened
 		    :-quit  " quit the previous window
 		    :+quit  " quit the next window
 		    :+2quit " quit the second next window
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index a909debf97..151e6ed4ac 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Sep 22
+" Last Change:	2016 Oct 15
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -2250,7 +2250,7 @@ func! s:FTtex()
 endfunc
 
 " ConTeXt
-au BufNewFile,BufRead tex/context/*/*.tex,*.mkii,*.mkiv   setf context
+au BufNewFile,BufRead tex/context/*/*.tex,*.mkii,*.mkiv,*.mkvi   setf context
 
 " Texinfo
 au BufNewFile,BufRead *.texinfo,*.texi,*.txi	setf texinfo
diff --git a/runtime/ftplugin/context.vim b/runtime/ftplugin/context.vim
index 1c7d678375..6c11166afa 100644
--- a/runtime/ftplugin/context.vim
+++ b/runtime/ftplugin/context.vim
@@ -1,7 +1,8 @@
 " Vim filetype plugin file
-" Language:         ConTeXt typesetting engine
-" Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2008-07-09
+" Language:           ConTeXt typesetting engine
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Former Maintainers: Nikolai Weibull <now@bitwi.se>
+" Latest Revision:    2016 Oct 14
 
 if exists("b:did_ftplugin")
   finish
@@ -11,16 +12,26 @@ let b:did_ftplugin = 1
 let s:cpo_save = &cpo
 set cpo&vim
 
-let b:undo_ftplugin = "setl com< cms< def< inc< sua< fo<"
+if !exists('current_compiler')
+  compiler context
+endif
 
-setlocal comments=b:%D,b:%C,b:%M,:% commentstring=%\ %s formatoptions+=tcroql
+let b:undo_ftplugin = "setl com< cms< def< inc< sua< fo< ofu<"
+      \ . "| unlet! b:match_ignorecase b:match_words b:match_skip"
+
+setlocal comments=b:%D,b:%C,b:%M,:% commentstring=%\ %s formatoptions+=tjcroql2
+if get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
+  setlocal omnifunc=context#complete
+  let g:omni_syntax_group_include_context = 'mf\w\+,mp\w\+'
+  let g:omni_syntax_group_exclude_context = 'mfTodoComment'
+endif
 
 let &l:define='\\\%([egx]\|char\|mathchar\|count\|dimen\|muskip\|skip\|toks\)\='
         \ .     'def\|\\font\|\\\%(future\)\=let'
         \ . '\|\\new\%(count\|dimen\|skip\|muskip\|box\|toks\|read\|write'
         \ .     '\|fam\|insert\|if\)'
 
-let &l:include = '^\s*\%(input\|component\)'
+let &l:include = '^\s*\\\%(input\|component\|product\|project\|environment\)'
 
 setlocal suffixesadd=.tex
 
@@ -31,5 +42,61 @@ if exists("loaded_matchit")
         \ '\\start\(\a\+\):\\stop\1'
 endif
 
+let s:context_regex = {
+      \ 'beginsection' : '\\\%(start\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>',
+      \ 'endsection'   : '\\\%(stop\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>',
+      \ 'beginblock'   : '\\\%(start\|setup\|define\)',
+      \ 'endblock'     : '\\\%(stop\|setup\|define\)'
+      \ }
+
+function! s:move_around(count, what, flags, visual)
+  if a:visual
+    exe "normal! gv"
+  endif
+  call search(s:context_regex[a:what], a:flags.'s') " 's' sets previous context mark
+  call map(range(2, a:count), 'search(s:context_regex[a:what], a:flags)')
+endfunction
+
+" Move around macros.
+nnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:false) <CR>
+vnoremap <silent><buffer> [[ :<C-U>call <SID>move_around(v:count1, "beginsection", "bW", v:true)  <CR>
+nnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:false) <CR>
+vnoremap <silent><buffer> ]] :<C-U>call <SID>move_around(v:count1, "beginsection", "W",  v:true)  <CR>
+nnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:false) <CR>
+vnoremap <silent><buffer> [] :<C-U>call <SID>move_around(v:count1, "endsection",   "bW", v:true)  <CR>
+nnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:false) <CR>
+vnoremap <silent><buffer> ][ :<C-U>call <SID>move_around(v:count1, "endsection",   "W",  v:true)  <CR>
+nnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:false) <CR>
+vnoremap <silent><buffer> [{ :<C-U>call <SID>move_around(v:count1, "beginblock",   "bW", v:true)  <CR>
+nnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:false) <CR>
+vnoremap <silent><buffer> ]} :<C-U>call <SID>move_around(v:count1, "endblock",     "W",  v:true)  <CR>
+
+" Other useful mappings
+if get(g:, 'context_mappings', 1)
+  let s:tp_regex = '?^$\|^\s*\\\(item\|start\|stop\|blank\|\%(sub\)*section\|chapter\|\%(sub\)*subject\|title\|part\)'
+
+  fun! s:tp()
+    call cursor(search(s:tp_regex, 'bcW') + 1, 1)
+    normal! V
+    call cursor(search(s:tp_regex, 'W') - 1, 1)
+  endf
+
+  " Reflow paragraphs with commands like gqtp ("gq TeX paragraph")
+  onoremap <silent><buffer> tp :<c-u>call <sid>tp()<cr>
+  " Select TeX paragraph
+  vnoremap <silent><buffer> tp <esc>:<c-u>call <sid>tp()<cr>
+
+  " $...$ text object
+  onoremap <silent><buffer> i$ :<c-u>normal! T$vt$<cr>
+  onoremap <silent><buffer> a$ :<c-u>normal! F$vf$<cr>
+  vnoremap <buffer> i$ T$ot$
+  vnoremap <buffer> a$ F$of$
+endif
+
+" Commands for asynchronous typesetting
+command! -buffer -nargs=? -complete=file ConTeXt          call context#typeset(<q-args>)
+command!         -nargs=0                ConTeXtJobStatus call context#job_status()
+command!         -nargs=0                ConTeXtStopJobs  call context#stop_jobs()
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/indent/context.vim b/runtime/indent/context.vim
new file mode 100644
index 0000000000..652479f7e2
--- /dev/null
+++ b/runtime/indent/context.vim
@@ -0,0 +1,36 @@
+" ConTeXt indent file
+" Language: ConTeXt typesetting engine
+" Maintainer: Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Last Change:  2016 Oct 15
+
+if exists("b:did_indent")
+  finish
+endif
+
+if !get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
+  finish
+endif
+
+" Load MetaPost indentation script
+runtime! indent/mp.vim
+
+let s:keepcpo= &cpo
+set cpo&vim
+
+setlocal indentexpr=GetConTeXtIndent()
+
+let b:undo_indent = "setl indentexpr<"
+
+function! GetConTeXtIndent()
+  " Use MetaPost rules inside MetaPost graphic environments
+  if len(synstack(v:lnum, 1)) > 0 &&
+        \ synIDattr(synstack(v:lnum, 1)[0], "name") ==# 'contextMPGraphic'
+    return GetMetaPostIndent()
+  endif
+  return -1
+endfunc
+
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
+" vim:sw=2
diff --git a/runtime/syntax/context.vim b/runtime/syntax/context.vim
index 225cc6efc2..b29f256baa 100644
--- a/runtime/syntax/context.vim
+++ b/runtime/syntax/context.vim
@@ -1,7 +1,8 @@
 " Vim syntax file
-" Language:         ConTeXt typesetting engine
-" Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2006-08-10
+" Language:           ConTeXt typesetting engine
+" Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
+" Former Maintainers: Nikolai Weibull <now@bitwi.se>
+" Latest Revision:    2016 Oct 16
 
 if exists("b:current_syntax")
   finish
@@ -13,65 +14,93 @@ unlet b:current_syntax
 let s:cpo_save = &cpo
 set cpo&vim
 
-if !exists('g:context_include')
-  let g:context_include = ['mp', 'javascript', 'xml']
+" Dictionary of (filetype, group) pairs to highlight between \startGROUP \stopGROUP.
+let s:context_include = get(b:, 'context_include', get(g:, 'context_include', {'xml': 'XML'}))
+
+" For backward compatibility (g:context_include used to be a List)
+if type(s:context_include) ==# type([])
+  let g:context_metapost = (index(s:context_include, 'mp') != -1)
+  let s:context_include = filter(
+        \ {'c': 'C', 'javascript': 'JS', 'ruby': 'Ruby', 'xml': 'XML'},
+        \ { k,_ -> index(s:context_include, k) != -1 }
+        \ )
 endif
 
+syn iskeyword @,48-57,a-z,A-Z,192-255
+
 syn spell   toplevel
 
-syn match   contextBlockDelim display '\\\%(start\|stop\)\a\+'
-                              \ contains=@NoSpell
+" ConTeXt options, i.e., [...] blocks
+syn region  contextOptions    matchgroup=contextDelimiter start='\['  end=']\|\ze\\stop' skip='\\\[\|\\\]' contains=ALLBUT,contextBeginEndLua,@Spell
 
-syn region  contextEscaped    display matchgroup=contextPreProc
-                              \ start='\\type\z(\A\)' end='\z1'
-syn region  contextEscaped    display matchgroup=contextPreProc
-                              \ start='\\type\={' end='}'
-syn region  contextEscaped    display matchgroup=contextPreProc
-                              \ start='\\type\=<<' end='>>'
+" Highlight braces
+syn match   contextDelimiter  '[{}]'
+
+" Comments
+syn match   contextComment '\\\@<!\%(\\\\\)*\zs%.*$' display contains=initexTodo
+syn match   contextComment '^\s*%[CDM].*$'           display contains=initexTodo
+
+syn match   contextBlockDelim '\\\%(start\|stop\)\a\+' contains=@NoSpell
+
+syn region  contextEscaped    matchgroup=contextPreProc start='\\type\%(\s*\|\n\)*\z([^A-Za-z%]\)' end='\z1'
+syn region  contextEscaped    matchgroup=contextPreProc start='\\type\=\%(\s\|\n\)*{' end='}'
+syn region  contextEscaped    matchgroup=contextPreProc start='\\type\=\%(\s*\|\n\)*<<' end='>>'
 syn region  contextEscaped    matchgroup=contextPreProc
                               \ start='\\start\z(\a*\%(typing\|typen\)\)'
                               \ end='\\stop\z1' contains=plaintexComment keepend
-syn region  contextEscaped    display matchgroup=contextPreProc
-                              \ start='\\\h\+Type{' end='}'
-syn region  contextEscaped    display matchgroup=contextPreProc
-                              \ start='\\Typed\h\+{' end='}'
+syn region  contextEscaped    matchgroup=contextPreProc start='\\\h\+Type\%(\s\|\n\)*{' end='}'
+syn region  contextEscaped    matchgroup=contextPreProc start='\\Typed\h\+\%(\s\|\n\)*{' end='}'
 
 syn match   contextBuiltin    display contains=@NoSpell
-      \ '\\\%(unprotect\|protect\|unexpanded\)' 
+      \ '\\\%(unprotect\|protect\|unexpanded\)\>'
 
-syn match   contextPreProc    '^\s*\\\%(start\|stop\)\=\%(component\|environment\|project\|product\).*$'
+syn match   contextPreProc    '^\s*\\\%(start\|stop\)\=\%(component\|environment\|project\|product\)\>'
                               \ contains=@NoSpell
 
-if index(g:context_include, 'mp') != -1
+if get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
+  let b:mp_metafun_macros = 1 " Highlight MetaFun keywords
   syn include @mpTop          syntax/mp.vim
   unlet b:current_syntax
 
-  syn region  contextMPGraphic  transparent matchgroup=contextBlockDelim
-                                \ start='\\start\z(\a*MPgraphic\|MP\%(page\|inclusions\|run\)\).*'
+  syn region  contextMPGraphic  matchgroup=contextBlockDelim
+                                \ start='\\start\z(MP\%(clip\|code\|definitions\|drawing\|environment\|extensions\|inclusions\|initializations\|page\|\)\)\>.*$'
                                 \ end='\\stop\z1'
-                                \ contains=@mpTop
+                                \ contains=@mpTop,@NoSpell
+  syn region  contextMPGraphic  matchgroup=contextBlockDelim
+                                \ start='\\start\z(\%(\%[re]usable\|use\|unique\|static\)MPgraphic\|staticMPfigure\|uniqueMPpagegraphic\)\>.*$'
+                                \ end='\\stop\z1'
+                                \ contains=@mpTop,@NoSpell
 endif
 
-" TODO: also need to implement this for \\typeC or something along those
-" lines.
-function! s:include_syntax(name, group)
-  if index(g:context_include, a:name) != -1
-    execute 'syn include @' . a:name . 'Top' 'syntax/' . a:name . '.vim'
-    unlet b:current_syntax
-    execute 'syn region context' . a:group . 'Code'
-          \ 'transparent matchgroup=contextBlockDelim'
-          \ 'start=+\\start' . a:group . '+ end=+\\stop' . a:group . '+'
-          \ 'contains=@' . a:name . 'Top'
-  endif
-endfunction
+if get(b:, 'context_lua', get(g:, 'context_lua', 1))
+  syn include @luaTop          syntax/lua.vim
+  unlet b:current_syntax
 
-call s:include_syntax('c', 'C')
-call s:include_syntax('ruby', 'Ruby')
-call s:include_syntax('javascript', 'JS')
-call s:include_syntax('xml', 'XML')
+  syn region  contextLuaCode    matchgroup=contextBlockDelim
+                                \ start='\\startluacode\>'
+                                \ end='\\stopluacode\>' keepend
+                                \ contains=@luaTop,@NoSpell
 
-syn match   contextSectioning '\\chapter\>' contains=@NoSpell
-syn match   contextSectioning '\\\%(sub\)*section\>' contains=@NoSpell
+  syn match   contextDirectLua  "\\\%(directlua\|ctxlua\)\>\%(\s*%.*$\)\="
+                                \ nextgroup=contextBeginEndLua skipwhite skipempty
+                                \ contains=initexComment
+  syn region  contextBeginEndLua matchgroup=contextSpecial
+                                \ start="{" end="}" skip="\\[{}]"
+                                \ contained contains=@luaTop,@NoSpell
+endif
+
+for synname in keys(s:context_include)
+  execute 'syn include @' . synname . 'Top' 'syntax/' . synname . '.vim'
+  unlet b:current_syntax
+  execute 'syn region context' . s:context_include[synname] . 'Code'
+        \ 'matchgroup=contextBlockDelim'
+        \ 'start=+\\start' . s:context_include[synname] . '+'
+        \ 'end=+\\stop' . s:context_include[synname] . '+'
+        \ 'contains=@' . synname . 'Top,@NoSpell'
+endfor
+
+syn match   contextSectioning '\\\%(start\|stop\)\=\%(\%(sub\)*section\|\%(sub\)*subject\|chapter\|part\|component\|product\|title\)\>'
+                              \ contains=@NoSpell
 
 syn match   contextSpecial    '\\crlf\>\|\\par\>\|-\{2,3}\||[<>/]\=|'
                               \ contains=@NoSpell
@@ -92,15 +121,19 @@ syn match   contextFont       '\\\%(vi\{1,3}\|ix\|xi\{0,2}\)\>'
 syn match   contextFont       '\\\%(tf\|b[si]\|s[cl]\|os\)\%(xx\|[xabcd]\)\=\>'
                               \ contains=@NoSpell
 
+hi def link contextOptions    Typedef
+hi def link contextComment    Comment
 hi def link contextBlockDelim Keyword
 hi def link contextBuiltin    Keyword
 hi def link contextDelimiter  Delimiter
+hi def link contextEscaped    String
 hi def link contextPreProc    PreProc
 hi def link contextSectioning PreProc
 hi def link contextSpecial    Special
 hi def link contextType       Type
 hi def link contextStyle      contextType
 hi def link contextFont       contextType
+hi def link contextDirectLua  Keyword
 
 let b:current_syntax = "context"
 
diff --git a/runtime/syntax/mp.vim b/runtime/syntax/mp.vim
index 95723d0d97..a8fa36fe0a 100644
--- a/runtime/syntax/mp.vim
+++ b/runtime/syntax/mp.vim
@@ -2,7 +2,7 @@
 " Language:           MetaPost
 " Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 " Former Maintainers: Andreas Scherer <andreas.scherer@pobox.com>
-" Last Change:        2016 Oct 01
+" Last Change:        2016 Oct 14
 
 if exists("b:current_syntax")
   finish
@@ -233,7 +233,10 @@ if get(g:, "other_mp_macros", 1)
 endif
 
 " Up to date as of 23-Sep-2016.
-if get(g:, "mp_metafun_macros", 0)
+if get(b:, 'mp_metafun_macros', get(g:, 'mp_metafun_macros', 0))
+  " Highlight TeX keywords (for use in ConTeXt documents)
+  syn match   mpTeXKeyword  '\\[a-zA-Z@]\+'
+
   " These keywords have been added manually.
   syn keyword mpPrimitive runscript
 
@@ -756,6 +759,7 @@ hi def link mpVariable     mfVariable
 hi def link mpConstant     mfConstant
 hi def link mpOnOff        mpPrimitive
 hi def link mpDash         mpPrimitive
+hi def link mpTeXKeyword   Identifier
 
 let b:current_syntax = "mp"
 

From 1e7806bd410f8ff0fcf5aec81370e57f1a57938e Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 29 Apr 2017 01:47:52 +0200
Subject: [PATCH 197/257] vim-patch:6d5ad4c4118c

Updated runtime files.

https://github.com/vim/vim/commit/6d5ad4c4118cab5fd96db157621c3aa9af368edb
---
 runtime/keymap/kazakh-jcuken.vim |  102 +
 runtime/syntax/c.vim             |   50 +-
 runtime/syntax/sh.vim            |   16 +-
 runtime/syntax/sm.vim            |   10 +-
 runtime/syntax/tags.vim          |   32 +-
 runtime/syntax/tex.vim           |   82 +-
 runtime/syntax/vim.vim           |    2 +-
 src/nvim/po/ga.po                | 6475 +++++++++++++-----------------
 8 files changed, 3095 insertions(+), 3674 deletions(-)
 create mode 100644 runtime/keymap/kazakh-jcuken.vim

diff --git a/runtime/keymap/kazakh-jcuken.vim b/runtime/keymap/kazakh-jcuken.vim
new file mode 100644
index 0000000000..63d122d112
--- /dev/null
+++ b/runtime/keymap/kazakh-jcuken.vim
@@ -0,0 +1,102 @@
+" Vim Keymap file for kazakh characters, layout 'jcuken', classical variant
+
+" Derived from russian-jcuken.vim by Artem Chuprina <ran@ran.pp.ru>
+" Maintainer:   Darkhan Kubigenov <darkhanu@gmail.com>
+" Last Changed: 2016 Oct 25
+
+" All characters are given literally, conversion to another encoding (e.g.,
+" UTF-8) should work.
+scriptencoding utf-8
+
+let b:keymap_name = "kk"
+
+loadkeymap
+~	)	CYRILLIC CAPITAL LETTER IO
+`	(	CYRILLIC SMALL LETTER IO
+F	А	CYRILLIC CAPITAL LETTER A
+<	Б	CYRILLIC CAPITAL LETTER BE
+D	В	CYRILLIC CAPITAL LETTER VE
+U	Г	CYRILLIC CAPITAL LETTER GHE
+L	Д	CYRILLIC CAPITAL LETTER DE
+T	Е	CYRILLIC CAPITAL LETTER IE
+:	Ж	CYRILLIC CAPITAL LETTER ZHE
+P	З	CYRILLIC CAPITAL LETTER ZE
+B	И	CYRILLIC CAPITAL LETTER I
+Q	Й	CYRILLIC CAPITAL LETTER SHORT I
+R	К	CYRILLIC CAPITAL LETTER KA
+K	Л	CYRILLIC CAPITAL LETTER EL
+V	М	CYRILLIC CAPITAL LETTER EM
+Y	Н	CYRILLIC CAPITAL LETTER EN
+J	О	CYRILLIC CAPITAL LETTER O
+G	П	CYRILLIC CAPITAL LETTER PE
+H	Р	CYRILLIC CAPITAL LETTER ER
+C	С	CYRILLIC CAPITAL LETTER ES
+N	Т	CYRILLIC CAPITAL LETTER TE
+E	У	CYRILLIC CAPITAL LETTER U
+A	Ф	CYRILLIC CAPITAL LETTER EF
+{	Х	CYRILLIC CAPITAL LETTER HA
+W	Ц	CYRILLIC CAPITAL LETTER TSE
+X	Ч	CYRILLIC CAPITAL LETTER CHE
+I	Ш	CYRILLIC CAPITAL LETTER SHA
+O	Щ	CYRILLIC CAPITAL LETTER SHCHA
+}	Ъ	CYRILLIC CAPITAL LETTER HARD SIGN
+S	Ы	CYRILLIC CAPITAL LETTER YERU
+M	Ь	CYRILLIC CAPITAL LETTER SOFT SIGN
+\"	Э	CYRILLIC CAPITAL LETTER E
+>	Ю	CYRILLIC CAPITAL LETTER YU
+Z	Я	CYRILLIC CAPITAL LETTER YA
+f	а	CYRILLIC SMALL LETTER A
+,	б	CYRILLIC SMALL LETTER BE
+d	в	CYRILLIC SMALL LETTER VE
+u	г	CYRILLIC SMALL LETTER GHE
+l	д	CYRILLIC SMALL LETTER DE
+t	е	CYRILLIC SMALL LETTER IE
+;	ж	CYRILLIC SMALL LETTER ZHE
+p	з	CYRILLIC SMALL LETTER ZE
+b	и	CYRILLIC SMALL LETTER I
+q	й	CYRILLIC SMALL LETTER SHORT I
+r	к	CYRILLIC SMALL LETTER KA
+k	л	CYRILLIC SMALL LETTER EL
+v	м	CYRILLIC SMALL LETTER EM
+y	н	CYRILLIC SMALL LETTER EN
+j	о	CYRILLIC SMALL LETTER O
+g	п	CYRILLIC SMALL LETTER PE
+h	р	CYRILLIC SMALL LETTER ER
+c	с	CYRILLIC SMALL LETTER ES
+n	т	CYRILLIC SMALL LETTER TE
+e	у	CYRILLIC SMALL LETTER U
+a	ф	CYRILLIC SMALL LETTER EF
+[	х	CYRILLIC SMALL LETTER HA
+w	ц	CYRILLIC SMALL LETTER TSE
+x	ч	CYRILLIC SMALL LETTER CHE
+i	ш	CYRILLIC SMALL LETTER SHA
+o	щ	CYRILLIC SMALL LETTER SHCHA
+]	ъ	CYRILLIC SMALL LETTER HARD SIGN
+s	ы	CYRILLIC SMALL LETTER YERU
+m	ь	CYRILLIC SMALL LETTER SOFT SIGN
+'	э	CYRILLIC SMALL LETTER E
+.	ю	CYRILLIC SMALL LETTER YU
+z	я	CYRILLIC SMALL LETTER YA
+@	Ә	CYRILLIC CAPITAL LETTER SCHWA
+#	І	CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+$	Ң	CYRILLIC CAPITAL LETTER EN WITH DESCENDER
+%	Ғ	CYRILLIC CAPITAL LETTER GHE WITH STROKE
+^	;
+&	:
+*	Ү	CYRILLIC CAPITAL LETTER STRAIGHT U
+(	Ұ	CYRILLIC CAPITAL LETTER STRAIGHT U WITH STROKE
+)	Қ	CYRILLIC CAPITAL LETTER KA WITH DESCENDER
+_	Ө	CYRILLIC CAPITAL LETTER BARRED O
++	Һ	CYRILLIC CAPITAL LETTER SHHA
+1	"
+2	ә	CYRILLIC SMALL LETTER SCHWA
+3	і	CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+4	ң	CYRILLIC SMALL LETTER EN WITH DESCENDER
+5	ғ	CYRILLIC SMALL LETTER GHE WITH STROKE
+6	,
+7	.
+8	ү	CYRILLIC SMALL LETTER STRAIGHT U
+9	ұ	CYRILLIC SMALL LETTER STRAIGHT U WITH STROKE
+0	қ	CYRILLIC SMALL LETTER KA WITH DESCENDER
+-	ө	CYRILLIC SMALL LETTER BARRED O
+=	һ	CYRILLIC SMALL LETTER SHHA
diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim
index 57d99ab1e9..2b946dd73d 100644
--- a/runtime/syntax/c.vim
+++ b/runtime/syntax/c.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Jul 07
+" Last Change:	2016 Oct 27
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -358,36 +358,36 @@ if !exists("c_no_c99") " ISO C99
 endif
 
 " Accept %: for # (C99)
-syn region	cPreCondit	start="^\s*\(%:\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" keepend contains=cComment,cCommentL,cCppString,cCharacter,cCppParen,cParenError,cNumbers,cCommentError,cSpaceError
-syn match	cPreConditMatch	display "^\s*\(%:\|#\)\s*\(else\|endif\)\>"
+syn region	cPreCondit	start="^\s*\zs\(%:\|#\)\s*\(if\|ifdef\|ifndef\|elif\)\>" skip="\\$" end="$" keepend contains=cComment,cCommentL,cCppString,cCharacter,cCppParen,cParenError,cNumbers,cCommentError,cSpaceError
+syn match	cPreConditMatch	display "^\s*\zs\(%:\|#\)\s*\(else\|endif\)\>"
 if !exists("c_no_if0")
   syn cluster	cCppOutInGroup	contains=cCppInIf,cCppInElse,cCppInElse2,cCppOutIf,cCppOutIf2,cCppOutElse,cCppInSkip,cCppOutSkip
-  syn region	cCppOutWrapper	start="^\s*\(%:\|#\)\s*if\s\+0\+\s*\($\|//\|/\*\|&\)" end=".\@=\|$" contains=cCppOutIf,cCppOutElse,@NoSpell fold
-  syn region	cCppOutIf	contained start="0\+" matchgroup=cCppOutWrapper end="^\s*\(%:\|#\)\s*endif\>" contains=cCppOutIf2,cCppOutElse
+  syn region	cCppOutWrapper	start="^\s*\zs\(%:\|#\)\s*if\s\+0\+\s*\($\|//\|/\*\|&\)" end=".\@=\|$" contains=cCppOutIf,cCppOutElse,@NoSpell fold
+  syn region	cCppOutIf	contained start="0\+" matchgroup=cCppOutWrapper end="^\s*\zs\(%:\|#\)\s*endif\>" contains=cCppOutIf2,cCppOutElse
   if !exists("c_no_if0_fold")
-    syn region	cCppOutIf2	contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell fold
+    syn region	cCppOutIf2	contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\zs\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell fold
   else
     syn region	cCppOutIf2	contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell
   endif
-  syn region	cCppOutElse	contained matchgroup=cCppOutWrapper start="^\s*\(%:\|#\)\s*\(else\|elif\)" end="^\s*\(%:\|#\)\s*endif\>"me=s-1 contains=TOP,cPreCondit
-  syn region	cCppInWrapper	start="^\s*\(%:\|#\)\s*if\s\+0*[1-9]\d*\s*\($\|//\|/\*\||\)" end=".\@=\|$" contains=cCppInIf,cCppInElse fold
-  syn region	cCppInIf	contained matchgroup=cCppInWrapper start="\d\+" end="^\s*\(%:\|#\)\s*endif\>" contains=TOP,cPreCondit
+  syn region	cCppOutElse	contained matchgroup=cCppOutWrapper start="^\s*\zs\(%:\|#\)\s*\(else\|elif\)" end="^\s*\zs\(%:\|#\)\s*endif\>"me=s-1 contains=TOP,cPreCondit
+  syn region	cCppInWrapper	start="^\s*\zs\(%:\|#\)\s*if\s\+0*[1-9]\d*\s*\($\|//\|/\*\||\)" end=".\@=\|$" contains=cCppInIf,cCppInElse fold
+  syn region	cCppInIf	contained matchgroup=cCppInWrapper start="\d\+" end="^\s*\zs\(%:\|#\)\s*endif\>" contains=TOP,cPreCondit
   if !exists("c_no_if0_fold")
-    syn region	cCppInElse	contained start="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2 fold
+    syn region	cCppInElse	contained start="^\s*\zs\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2 fold
   else
-    syn region	cCppInElse	contained start="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2
+    syn region	cCppInElse	contained start="^\s*\zs\(%:\|#\)\s*\(else\>\|elif\s\+\(0*[1-9]\d*\s*\($\|//\|/\*\||\)\)\@!\)" end=".\@=\|$" containedin=cCppInIf contains=cCppInElse2
   endif
-  syn region	cCppInElse2	contained matchgroup=cCppInWrapper start="^\s*\(%:\|#\)\s*\(else\|elif\)\([^/]\|/[^/*]\)*" end="^\s*\(%:\|#\)\s*endif\>"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell
-  syn region	cCppOutSkip	contained start="^\s*\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppOutSkip
-  syn region	cCppInSkip	contained matchgroup=cCppInWrapper start="^\s*\(%:\|#\)\s*\(if\s\+\(\d\+\s*\($\|//\|/\*\||\|&\)\)\@!\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\(%:\|#\)\s*endif\>" containedin=cCppOutElse,cCppInIf,cCppInSkip contains=TOP,cPreProc
+  syn region	cCppInElse2	contained matchgroup=cCppInWrapper start="^\s*\zs\(%:\|#\)\s*\(else\|elif\)\([^/]\|/[^/*]\)*" end="^\s*\zs\(%:\|#\)\s*endif\>"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell
+  syn region	cCppOutSkip	contained start="^\s*\zs\(%:\|#\)\s*\(if\>\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\zs\(%:\|#\)\s*endif\>" contains=cSpaceError,cCppOutSkip
+  syn region	cCppInSkip	contained matchgroup=cCppInWrapper start="^\s*\zs\(%:\|#\)\s*\(if\s\+\(\d\+\s*\($\|//\|/\*\||\|&\)\)\@!\|ifdef\>\|ifndef\>\)" skip="\\$" end="^\s*\zs\(%:\|#\)\s*endif\>" containedin=cCppOutElse,cCppInIf,cCppInSkip contains=TOP,cPreProc
 endif
 syn region	cIncluded	display contained start=+"+ skip=+\\\\\|\\"+ end=+"+
 syn match	cIncluded	display contained "<[^>]*>"
-syn match	cInclude	display "^\s*\(%:\|#\)\s*include\>\s*["<]" contains=cIncluded
+syn match	cInclude	display "^\s*\zs\(%:\|#\)\s*include\>\s*["<]" contains=cIncluded
 "syn match cLineSkip	"\\$"
 syn cluster	cPreProcGroup	contains=cPreCondit,cIncluded,cInclude,cDefine,cErrInParen,cErrInBracket,cUserLabel,cSpecial,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cString,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cParen,cBracket,cMulti,cBadBlock
-syn region	cDefine		start="^\s*\(%:\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell
-syn region	cPreProc	start="^\s*\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell
+syn region	cDefine		start="^\s*\zs\(%:\|#\)\s*\(define\|undef\)\>" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell
+syn region	cPreProc	start="^\s*\zs\(%:\|#\)\s*\(pragma\>\|line\>\|warning\>\|warn\>\|error\>\)" skip="\\$" end="$" keepend contains=ALLBUT,@cPreProcGroup,@Spell
 
 " Highlight User Labels
 syn cluster	cMultiGroup	contains=cIncluded,cSpecial,cCommentSkip,cCommentString,cComment2String,@cCommentGroup,cCommentStartError,cUserCont,cUserLabel,cBitField,cOctalZero,cCppOutWrapper,cCppInWrapper,@cCppOutInGroup,cFormat,cNumber,cFloat,cOctal,cOctalError,cNumbersCom,cCppParen,cCppBracket,cCppString
@@ -396,21 +396,21 @@ if s:ft ==# 'c' || exists("cpp_no_cpp11")
 endif
 " Avoid matching foo::bar() in C++ by requiring that the next char is not ':'
 syn cluster	cLabelGroup	contains=cUserLabel
-syn match	cUserCont	display "^\s*\I\i*\s*:$" contains=@cLabelGroup
-syn match	cUserCont	display ";\s*\I\i*\s*:$" contains=@cLabelGroup
+syn match	cUserCont	display "^\s*\zs\I\i*\s*:$" contains=@cLabelGroup
+syn match	cUserCont	display ";\s*\zs\I\i*\s*:$" contains=@cLabelGroup
 if s:ft ==# 'cpp'
-  syn match	cUserCont	display "^\s*\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
-  syn match	cUserCont	display ";\s*\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
+  syn match	cUserCont	display "^\s*\zs\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
+  syn match	cUserCont	display ";\s*\zs\%(class\|struct\|enum\)\@!\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
 else
-  syn match	cUserCont	display "^\s*\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
-  syn match	cUserCont	display ";\s*\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
+  syn match	cUserCont	display "^\s*\zs\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
+  syn match	cUserCont	display ";\s*\zs\I\i*\s*:[^:]"me=e-1 contains=@cLabelGroup
 endif
 
 syn match	cUserLabel	display "\I\i*" contained
 
 " Avoid recognizing most bitfields as labels
-syn match	cBitField	display "^\s*\I\i*\s*:\s*[1-9]"me=e-1 contains=cType
-syn match	cBitField	display ";\s*\I\i*\s*:\s*[1-9]"me=e-1 contains=cType
+syn match	cBitField	display "^\s*\zs\I\i*\s*:\s*[1-9]"me=e-1 contains=cType
+syn match	cBitField	display ";\s*\zs\I\i*\s*:\s*[1-9]"me=e-1 contains=cType
 
 if exists("c_minlines")
   let b:c_minlines = c_minlines
diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index 6048aed4ec..2f880bbc12 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -2,8 +2,8 @@
 " Language:		shell (sh) Korn shell (ksh) bash (sh)
 " Maintainer:		Charles E. Campbell  <NdrOchipS@PcampbellAfamily.Mbiz>
 " Previous Maintainer:	Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change:		Aug 31, 2016
-" Version:		162
+" Last Change:		Sep 22, 2016
+" Version:		165
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
 " For options and settings, please use:      :help ft-sh-syntax
 " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr)
@@ -170,7 +170,7 @@ if exists("b:is_kornshell") || exists("b:is_bash")
 
  " Touch: {{{1
  " =====
- syn match shTouch	'\<touch\>[^;#]*'	skipwhite nextgroup=shComment contains=shTouchCmd
+ syn match shTouch	'\<touch\>[^;#]*'	skipwhite nextgroup=shComment contains=shTouchCmd,shDoubleQuote,shSingleQuote,shDeref,shDerefSimple
  syn match shTouchCmd	'\<touch\>'		contained
 endif
 
@@ -220,7 +220,7 @@ syn region shSubSh transparent matchgroup=shSubShRegion start="[^(]\zs(" end=")"
 "=======
 syn region shExpr	matchgroup=shRange start="\[" skip=+\\\\\|\\$\|\[+ end="\]" contains=@shTestList,shSpecial
 syn region shTest	transparent matchgroup=shStatement start="\<test\s" skip=+\\\\\|\\$+ matchgroup=NONE end="[;&|]"me=e-1 end="$" contains=@shExprList1
-syn region shNoQuote	start='\S'	skip='\%(\\\\\)*\\.'	end='\ze\s'	contained
+syn region shNoQuote	start='\S'	skip='\%(\\\\\)*\\.'	end='\ze\s'	contained contains=shDerefSimple,shDeref
 syn match  shAstQuote	contained	'\*\ze"'	nextgroup=shString
 syn match  shTestOpr	contained	'[^-+/%]\zs=' skipwhite nextgroup=shTestDoubleQuote,shTestSingleQuote,shTestPattern
 syn match  shTestOpr	contained	"<=\|>=\|!=\|==\|=\~\|-.\>\|-\(nt\|ot\|ef\|eq\|ne\|lt\|le\|gt\|ge\)\>\|[!<>]"
@@ -355,7 +355,11 @@ syn region  shBkslshDblQuote	contained	matchgroup=shQuote start=+"+ skip=+\\"+ e
 " Comments: {{{1
 "==========
 syn cluster	shCommentGroup	contains=shTodo,@Spell
-syn keyword	shTodo	contained		COMBAK FIXME TODO XXX
+if exists("b:is_bash")
+ syn match	shTodo	contained		"\<\%(COMBAK\|FIXME\|TODO\|XXX\)\ze:\=\>"
+else
+ syn keyword	shTodo	contained		COMBAK FIXME TODO XXX
+endif
 syn match	shComment		"^\s*\zs#.*$"	contains=@shCommentGroup
 syn match	shComment		"\s\zs#.*$"	contains=@shCommentGroup
 syn match	shComment	contained	"#.*$"	contains=@shCommentGroup
@@ -381,7 +385,7 @@ ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc15 start="<<-\s*\\\z([^ \
 
 " Here Strings: {{{1
 " =============
-" available for: bash; ksh (really should be ksh93 only) but not if it's a posix
+" available for: bash; ksh (really should be ksh93 only) but not if its a posix
 if exists("b:is_bash") || (exists("b:is_kornshell") && !exists("g:is_posix"))
  syn match shHereString "<<<"	skipwhite	nextgroup=shCmdParenRegion
 endif
diff --git a/runtime/syntax/sm.vim b/runtime/syntax/sm.vim
index cb01d44bb6..0ecc96875f 100644
--- a/runtime/syntax/sm.vim
+++ b/runtime/syntax/sm.vim
@@ -1,10 +1,9 @@
 " Vim syntax file
 " Language:	sendmail
 " Maintainer:	Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change:	Oct 23, 2014
-" Version:	7
+" Last Change:	Oct 25, 2016
+" Version:	8
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SM
-
 if exists("b:current_syntax")
   finish
 endif
@@ -62,10 +61,10 @@ hi def link smClause	Special
 hi def link smClauseError	Error
 hi def link smComment	Comment
 hi def link smDefine	Statement
-hi def link smElse		Delimiter
+hi def link smElse	Delimiter
 hi def link smHeader	Statement
 hi def link smHeaderSep	String
-hi def link smMesg		Special
+hi def link smMesg	Special
 hi def link smPrecedence	Number
 hi def link smRewrite	Statement
 hi def link smRewriteComment	Comment
@@ -76,7 +75,6 @@ hi def link smRuleset	Preproc
 hi def link smTrusted	Special
 hi def link smVar		String
 
-
 let b:current_syntax = "sm"
 
 " vim: ts=18
diff --git a/runtime/syntax/tags.vim b/runtime/syntax/tags.vim
index 3980f84a30..f34696d4b0 100644
--- a/runtime/syntax/tags.vim
+++ b/runtime/syntax/tags.vim
@@ -1,7 +1,7 @@
 " Language:		tags
 " Maintainer:	Charles E. Campbell  <NdrOchip@PcampbellAfamily.Mbiz>
-" Last Change:	Aug 31, 2016
-" Version:		6
+" Last Change:	Oct 26, 2016
+" Version:		7
 " URL:	http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TAGS
 
 " quit when a syntax file was already loaded
@@ -9,27 +9,23 @@ if exists("b:current_syntax")
   finish
 endif
 
-syn match	tagName	"^[^\t]\+"		skipwhite	nextgroup=tagPath
-syn match	tagPath	"[^\t]\+"	contained	skipwhite	nextgroup=tagAddr	contains=tagBaseFile
+syn match	tagName		"^[^\t]\+"	skipwhite	nextgroup=tagPath
+syn match	tagPath		"[^\t]\+"	contained	skipwhite	nextgroup=tagAddr	contains=tagBaseFile
 syn match	tagBaseFile	"[a-zA-Z_]\+[\.a-zA-Z_0-9]*\t"me=e-1		contained
-syn match	tagAddr	"\d*"	contained skipwhite nextgroup=tagComment
-syn region	tagAddr	matchgroup=tagDelim start="/" skip="\(\\\\\)*\\/" matchgroup=tagDelim end="$\|/" oneline contained skipwhite nextgroup=tagComment
-syn match	tagComment	";.*$"	contained contains=tagField
+syn match	tagAddr		"\d*"		contained skipwhite nextgroup=tagComment
+syn region	tagAddr				matchgroup=tagDelim start="/" skip="\(\\\\\)*\\/" matchgroup=tagDelim end="$\|/" oneline contained skipwhite nextgroup=tagComment
+syn match	tagComment	";.*$"		contained contains=tagField
 syn match	tagComment	"^!_TAG_.*$"
-syn match	tagField	contained "[a-z]*:"
+syn match	tagField			contained "[a-z]*:"
 
 " Define the default highlighting.
 if !exists("skip_drchip_tags_inits")
-
-  hi def link tagBaseFile	PreProc
-  hi def link tagComment	Comment
-  hi def link tagDelim	Delimiter
-  hi def link tagField	Number
-  hi def link tagName	Identifier
-  hi def link tagPath	PreProc
-
+ hi def link tagBaseFile	PreProc
+ hi def link tagComment		Comment
+ hi def link tagDelim		Delimiter
+ hi def link tagField		Number
+ hi def link tagName		Identifier
+ hi def link tagPath		PreProc
 endif
 
 let b:current_syntax = "tags"
-
-" vim: ts=12
diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim
index f4a0875da0..dd6690200f 100644
--- a/runtime/syntax/tex.vim
+++ b/runtime/syntax/tex.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	TeX
 " Maintainer:	Charles E. Campbell <NdrchipO@ScampbellPfamily.AbizM>
-" Last Change:	Aug 31, 2016
-" Version:	100
+" Last Change:	Sep 20, 2016
+" Version:	101
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
 "
 " Notes: {{{1
@@ -160,15 +160,17 @@ syn cluster texBoldGroup		contains=texAccent,texBadMath,texComment,texDefCmd,tex
 syn cluster texItalGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texInputFile,texLength,texLigature,texMatcher,texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ,texNewCmd,texNewEnv,texOnlyMath,texOption,texParen,texRefZone,texSection,texBeginEnd,texSectionZone,texSpaceCode,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,@texMathZones,texTitle,texAbstract,texItalStyle,texItalBoldStyle,texNoSpell
 if !s:tex_nospell
  syn cluster texMatchGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,@Spell
+ syn cluster texMatchNMGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcherNM,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,@Spell
  syn cluster texStyleGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texStyleStatement,@Spell,texStyleMatcher
 else
  syn cluster texMatchGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption
+ syn cluster texMatchNMGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcherNM,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption
  syn cluster texStyleGroup		contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texStyleStatement,texStyleMatcher
 endif
-syn cluster texPreambleMatchGroup	contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTitle,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texMathZoneZ
+syn cluster texPreambleMatchGroup	contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcherNM,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTitle,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texMathZoneZ
 syn cluster texRefGroup			contains=texMatcher,texComment,texDelimiter
 if !exists("g:tex_no_math")
- syn cluster texPreambleMatchGroup	contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcher,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTitle,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texMathZoneZ
+ syn cluster texPreambleMatchGroup	contains=texAccent,texBadMath,texComment,texDefCmd,texDelimiter,texDocType,texInput,texLength,texLigature,texMatcherNM,texNewCmd,texNewEnv,texOnlyMath,texParen,texRefZone,texSection,texSpecialChar,texStatement,texString,texTitle,texTypeSize,texTypeStyle,texZone,texInputFile,texOption,texMathZoneZ
  syn cluster texMathZones		contains=texMathZoneV,texMathZoneW,texMathZoneX,texMathZoneY,texMathZoneZ
  syn cluster texMatchGroup		add=@texMathZones
  syn cluster texMathDelimGroup		contains=texMathDelimBad,texMathDelimKey,texMathDelimSet1,texMathDelimSet2
@@ -199,9 +201,13 @@ if s:tex_fast =~# 'm'
   if !s:tex_no_error
    syn region texMatcher	matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"			transparent contains=@texMatchGroup,texError
    syn region texMatcher	matchgroup=Delimiter start="\["				end="]"			transparent contains=@texMatchGroup,texError,@NoSpell
+   syn region texMatcherNM	matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"			transparent contains=@texMatchNMGroup,texError
+   syn region texMatcherNM	matchgroup=Delimiter start="\["				end="]"			transparent contains=@texMatchNMGroup,texError,@NoSpell
   else
    syn region texMatcher	matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"			transparent contains=@texMatchGroup
    syn region texMatcher	matchgroup=Delimiter start="\["				end="]"			transparent contains=@texMatchGroup
+   syn region texMatcherNM	matchgroup=Delimiter start="{" skip="\\\\\|\\[{}]"	end="}"			transparent contains=@texMatchNMGroup
+   syn region texMatcherNM	matchgroup=Delimiter start="\["				end="]"			transparent contains=@texMatchNMGroup
   endif
   if !s:tex_nospell
    syn region texParen		start="("	end=")"								transparent contains=@texMatchGroup,@Spell
@@ -399,7 +405,7 @@ if !exists("g:tex_no_math")
  " TexNewMathZone: function creates a mathzone with the given suffix and mathzone name. {{{2
  "                 Starred forms are created if starform is true.  Starred
  "                 forms have syntax group and synchronization groups with a
- "                 "S" appended.  Handles: cluster, syntax, sync, and hi link.
+ "                 "S" appended.  Handles: cluster, syntax, sync, and highlighting.
  fun! TexNewMathZone(sfx,mathzone,starform)
    let grpname  = "texMathZone".a:sfx
    let syncname = "texSyncMathZone".a:sfx
@@ -1262,13 +1268,13 @@ if !exists("skip_tex_syntax_inits")
   if !exists("g:tex_no_error")
    if !exists("g:tex_no_math")
     hi def link texBadMath		texError
-    hi def link texMathDelimBad	texError
+    hi def link texMathDelimBad		texError
     hi def link texMathError		texError
     if !b:tex_stylish
-      hi def link texOnlyMath	texError
+      hi def link texOnlyMath		texError
     endif
    endif
-   hi def link texError		Error
+   hi def link texError			Error
   endif
 
   hi texBoldStyle		gui=bold	cterm=bold
@@ -1277,59 +1283,59 @@ if !exists("skip_tex_syntax_inits")
   hi texItalBoldStyle		gui=bold,italic cterm=bold,italic
   hi def link texCite		texRefZone
   hi def link texDefCmd		texDef
-  hi def link texDefName		texDef
-  hi def link texDocType		texCmdName
-  hi def link texDocTypeArgs		texCmdArgs
+  hi def link texDefName	texDef
+  hi def link texDocType	texCmdName
+  hi def link texDocTypeArgs	texCmdArgs
   hi def link texInputFileOpt	texCmdArgs
   hi def link texInputCurlies	texDelimiter
-  hi def link texLigature		texSpecialChar
+  hi def link texLigature	texSpecialChar
   if !exists("g:tex_no_math")
    hi def link texMathDelimSet1	texMathDelim
    hi def link texMathDelimSet2	texMathDelim
    hi def link texMathDelimKey	texMathDelim
    hi def link texMathMatcher	texMath
-   hi def link texAccent		texStatement
+   hi def link texAccent	texStatement
    hi def link texGreek		texStatement
    hi def link texSuperscript	texStatement
-   hi def link texSubscript		texStatement
+   hi def link texSubscript	texStatement
    hi def link texSuperscripts 	texSuperscript
    hi def link texSubscripts 	texSubscript
-   hi def link texMathSymbol		texStatement
-   hi def link texMathZoneV		texMath
-   hi def link texMathZoneW		texMath
-   hi def link texMathZoneX		texMath
-   hi def link texMathZoneY		texMath
-   hi def link texMathZoneV		texMath
-   hi def link texMathZoneZ		texMath
+   hi def link texMathSymbol	texStatement
+   hi def link texMathZoneV	texMath
+   hi def link texMathZoneW	texMath
+   hi def link texMathZoneX	texMath
+   hi def link texMathZoneY	texMath
+   hi def link texMathZoneV	texMath
+   hi def link texMathZoneZ	texMath
   endif
-  hi def link texBeginEnd		texCmdName
+  hi def link texBeginEnd	texCmdName
   hi def link texBeginEndName	texSection
-  hi def link texSpaceCode		texStatement
+  hi def link texSpaceCode	texStatement
   hi def link texStyleStatement	texStatement
-  hi def link texTypeSize		texType
-  hi def link texTypeStyle		texType
+  hi def link texTypeSize	texType
+  hi def link texTypeStyle	texType
 
    " Basic TeX highlighting groups
-  hi def link texCmdArgs		Number
-  hi def link texCmdName		Statement
-  hi def link texComment		Comment
-  hi def link texDef			Statement
-  hi def link texDefParm		Special
-  hi def link texDelimiter		Delimiter
+  hi def link texCmdArgs	Number
+  hi def link texCmdName	Statement
+  hi def link texComment	Comment
+  hi def link texDef		Statement
+  hi def link texDefParm	Special
+  hi def link texDelimiter	Delimiter
   hi def link texInput		Special
-  hi def link texInputFile		Special
+  hi def link texInputFile	Special
   hi def link texLength		Number
   hi def link texMath		Special
-  hi def link texMathDelim		Statement
-  hi def link texMathOper		Operator
+  hi def link texMathDelim	Statement
+  hi def link texMathOper	Operator
   hi def link texNewCmd		Statement
   hi def link texNewEnv		Statement
   hi def link texOption		Number
-  hi def link texRefZone		Special
-  hi def link texSection		PreCondit
+  hi def link texRefZone	Special
+  hi def link texSection	PreCondit
   hi def link texSpaceCodeChar	Special
-  hi def link texSpecialChar		SpecialChar
-  hi def link texStatement		Statement
+  hi def link texSpecialChar	SpecialChar
+  hi def link texStatement	Statement
   hi def link texString		String
   hi def link texTodo		Todo
   hi def link texType		Type
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 650f2e4a7b..49002b9599 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -470,7 +470,7 @@ syn cluster vimFuncBodyList add=vimSynType
 syn cluster	vimSynMtchGroup	contains=vimMtchComment,vimSynContains,vimSynError,vimSynMtchOpt,vimSynNextgroup,vimSynRegPat,vimNotation
 syn keyword	vimSynType	contained	match	skipwhite nextgroup=vimSynMatchRegion
 syn region	vimSynMatchRegion	contained keepend	matchgroup=vimGroupName start="\h\w*" matchgroup=vimSep end="|\|$" contains=@vimSynMtchGroup
-syn match	vimSynMtchOpt	contained	"\<\(conceal\|transparent\|contained\|excludenl\|skipempty\|skipwhite\|display\|extend\|skipnl\|fold\)\>"
+syn match	vimSynMtchOpt	contained	"\<\(conceal\|transparent\|contained\|excludenl\|keepend\|skipempty\|skipwhite\|display\|extend\|skipnl\|fold\)\>"
 if has("conceal")
  syn match	vimSynMtchOpt	contained	"\<cchar="	nextgroup=vimSynMtchCchar
  syn match	vimSynMtchCchar	contained	"\S"
diff --git a/src/nvim/po/ga.po b/src/nvim/po/ga.po
index 761539039d..abb3565077 100644
--- a/src/nvim/po/ga.po
+++ b/src/nvim/po/ga.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: vim 7.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-26 14:21+0200\n"
+"POT-Creation-Date: 2016-10-25 09:31-0500\n"
 "PO-Revision-Date: 2010-04-14 10:01-0500\n"
 "Last-Translator: Kevin Patrick Scannell <kscanne@gmail.com>\n"
 "Language-Team: Irish <gaeilge-gnulinux@lists.sourceforge.net>\n"
@@ -14,208 +14,171 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=ISO-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : (n>2 && n<7) ? 2 :"
+"(n>6 && n<11) ? 3 : 4;\n"
 
-#: ../api/private/helpers.c:201
-#, fuzzy
-msgid "Unable to get option value"
-msgstr "Dramha�l i ndiaidh arg�inte rogha"
+msgid "E831: bf_key_init() called with empty password"
+msgstr "E831: cuireadh glaoch ar bf_key_init() le focal faire folamh"
 
-#: ../api/private/helpers.c:204
-msgid "internal error: unknown option type"
-msgstr ""
+msgid "E820: sizeof(uint32_t) != 4"
+msgstr "E820: sizeof(uint32_t) != 4"
+
+msgid "E817: Blowfish big/little endian use wrong"
+msgstr "E817: �s�id mh�cheart Blowfish m�rcheannach/caolcheannach"
+
+msgid "E818: sha256 test failed"
+msgstr "E818: Theip ar th�st�il sha256"
+
+msgid "E819: Blowfish test failed"
+msgstr "E819: Theip ar th�st�il Blowfish"
 
-#: ../buffer.c:92
 msgid "[Location List]"
 msgstr "[Liosta Su�omh]"
 
-#: ../buffer.c:93
 msgid "[Quickfix List]"
-msgstr "[Liosta Ceart�ch�n Tapa]"
+msgstr "[Liosta Mearcheart�ch�n]"
 
-#: ../buffer.c:94
-#, fuzzy
 msgid "E855: Autocommands caused command to abort"
-msgstr "E812: Bh� maol�n n� ainm maol�in athraithe ag orduithe uathoibr�ocha"
+msgstr "E855: Tobscoireadh an t-ord� mar gheall ar uathorduithe"
 
-#: ../buffer.c:135
 msgid "E82: Cannot allocate any buffer, exiting..."
 msgstr "E82: N� f�idir maol�n a dh�ileadh, ag scor..."
 
-#: ../buffer.c:138
 msgid "E83: Cannot allocate buffer, using other one..."
 msgstr "E83: N� f�idir maol�n a dh�ileadh, ag �s�id cinn eile..."
 
-#: ../buffer.c:763
+msgid "E931: Buffer cannot be registered"
+msgstr "E931: N� f�idir an maol�n a chl�r�"
+
+msgid "E937: Attempt to delete a buffer that is in use"
+msgstr "E937: Iarracht ar mhaol�n in �s�id a scriosadh"
+
 msgid "E515: No buffers were unloaded"
 msgstr "E515: N� raibh aon mhaol�n d�luchtaithe"
 
-#: ../buffer.c:765
 msgid "E516: No buffers were deleted"
 msgstr "E516: N� raibh aon mhaol�n scriosta"
 
-#: ../buffer.c:767
 msgid "E517: No buffers were wiped out"
 msgstr "E517: N� raibh aon mhaol�n b�naithe"
 
-#: ../buffer.c:772
 msgid "1 buffer unloaded"
 msgstr "Bh� maol�n amh�in d�luchtaithe"
 
-#: ../buffer.c:774
 #, c-format
 msgid "%d buffers unloaded"
 msgstr "%d maol�n folmhaithe"
 
-#: ../buffer.c:777
 msgid "1 buffer deleted"
 msgstr "Bh� maol�n amh�in scriosta"
 
-#: ../buffer.c:779
 #, c-format
 msgid "%d buffers deleted"
 msgstr "%d maol�n scriosta"
 
-#: ../buffer.c:782
 msgid "1 buffer wiped out"
 msgstr "Bh� maol�n amh�in b�naithe"
 
-#: ../buffer.c:784
 #, c-format
 msgid "%d buffers wiped out"
 msgstr "%d maol�n b�naithe"
 
-#: ../buffer.c:806
 msgid "E90: Cannot unload last buffer"
 msgstr "E90: N� f�idir an maol�n deireanach a dh�lucht�"
 
-#: ../buffer.c:874
 msgid "E84: No modified buffer found"
 msgstr "E84: N�or aims�odh maol�n mionathraithe"
 
 #. back where we started, didn't find anything.
-#: ../buffer.c:903
 msgid "E85: There is no listed buffer"
 msgstr "E85: N�l aon mhaol�n liostaithe ann"
 
-#: ../buffer.c:913
-#, c-format
-msgid "E86: Buffer %<PRId64> does not exist"
-msgstr "E86: N�l a leith�id de mhaol�n %<PRId64>"
-
-#: ../buffer.c:915
 msgid "E87: Cannot go beyond last buffer"
 msgstr "E87: N� f�idir a dhul thar an maol�n deireanach"
 
-#: ../buffer.c:917
 msgid "E88: Cannot go before first buffer"
 msgstr "E88: N� f�idir a dhul roimh an ch�ad mhaol�n"
 
-#: ../buffer.c:945
 #, c-format
-msgid ""
-"E89: No write since last change for buffer %<PRId64> (add ! to override)"
+msgid "E89: No write since last change for buffer %ld (add ! to override)"
 msgstr ""
-"E89: Athra�odh maol�n %<PRId64> ach nach bhfuil s� s�bh�ilte � shin (cuir ! "
-"leis an ord� chun s�r�)"
+"E89: Athra�odh maol�n %ld ach nach bhfuil s� s�bh�ilte � shin (cuir ! leis "
+"an ord� chun s�r�)"
 
-#. wrap around (may cause duplicates)
-#: ../buffer.c:1423
 msgid "W14: Warning: List of file names overflow"
 msgstr "W14: Rabhadh: Liosta ainmneacha comhaid thar maoil"
 
-#: ../buffer.c:1555 ../quickfix.c:3361
 #, c-format
-msgid "E92: Buffer %<PRId64> not found"
-msgstr "E92: Maol�n %<PRId64> gan aimsi�"
+msgid "E92: Buffer %ld not found"
+msgstr "E92: Maol�n %ld gan aimsi�"
 
-#: ../buffer.c:1798
 #, c-format
 msgid "E93: More than one match for %s"
 msgstr "E93: N�os m� n� teaghr�n amh�in comhoiri�naithe le %s"
 
-#: ../buffer.c:1800
 #, c-format
 msgid "E94: No matching buffer for %s"
 msgstr "E94: N�l aon mhaol�n comhoiri�naithe le %s"
 
-#: ../buffer.c:2161
 #, c-format
-msgid "line %<PRId64>"
-msgstr "l�ne %<PRId64>:"
+msgid "line %ld"
+msgstr "l�ne %ld:"
 
-#: ../buffer.c:2233
 msgid "E95: Buffer with this name already exists"
 msgstr "E95: T� maol�n ann leis an ainm seo cheana"
 
-#: ../buffer.c:2498
 msgid " [Modified]"
 msgstr " [Mionathraithe]"
 
-#: ../buffer.c:2501
 msgid "[Not edited]"
 msgstr "[Gan eagr�]"
 
-#: ../buffer.c:2504
 msgid "[New file]"
 msgstr "[Comhad nua]"
 
-#: ../buffer.c:2505
 msgid "[Read errors]"
 msgstr "[Earr�id� l�imh]"
 
-#: ../buffer.c:2506 ../buffer.c:3217 ../fileio.c:1807 ../screen.c:4895
 msgid "[RO]"
 msgstr "[L-A]"
 
-#: ../buffer.c:2507 ../fileio.c:1807
 msgid "[readonly]"
 msgstr "[inl�ite amh�in]"
 
-#: ../buffer.c:2524
 #, c-format
 msgid "1 line --%d%%--"
 msgstr "1 l�ne --%d%%--"
 
-#: ../buffer.c:2526
 #, c-format
-msgid "%<PRId64> lines --%d%%--"
-msgstr "%<PRId64> l�ne --%d%%--"
+msgid "%ld lines --%d%%--"
+msgstr "%ld l�ne --%d%%--"
 
-#: ../buffer.c:2530
 #, c-format
-msgid "line %<PRId64> of %<PRId64> --%d%%-- col "
-msgstr "l�ne %<PRId64> de %<PRId64> --%d%%-- col "
+msgid "line %ld of %ld --%d%%-- col "
+msgstr "l�ne %ld de %ld --%d%%-- col "
 
-#: ../buffer.c:2632 ../buffer.c:4292 ../memline.c:1554
 msgid "[No Name]"
 msgstr "[Gan Ainm]"
 
 #. must be a help buffer
-#: ../buffer.c:2667
 msgid "help"
 msgstr "cabhair"
 
-#: ../buffer.c:3225 ../screen.c:4883
 msgid "[Help]"
 msgstr "[Cabhair]"
 
-#: ../buffer.c:3254 ../screen.c:4887
 msgid "[Preview]"
 msgstr "[R�amhamharc]"
 
-#: ../buffer.c:3528
 msgid "All"
 msgstr "Uile"
 
-#: ../buffer.c:3528
 msgid "Bot"
 msgstr "Bun"
 
-#: ../buffer.c:3531
 msgid "Top"
 msgstr "Barr"
 
-#: ../buffer.c:4244
 msgid ""
 "\n"
 "# Buffer list:\n"
@@ -223,11 +186,9 @@ msgstr ""
 "\n"
 "# Liosta maol�in:\n"
 
-#: ../buffer.c:4289
 msgid "[Scratch]"
 msgstr "[Sealadach]"
 
-#: ../buffer.c:4529
 msgid ""
 "\n"
 "--- Signs ---"
@@ -235,202 +196,236 @@ msgstr ""
 "\n"
 "--- Comhartha� ---"
 
-#: ../buffer.c:4538
 #, c-format
 msgid "Signs for %s:"
 msgstr "Comhartha� do %s:"
 
-#: ../buffer.c:4543
 #, c-format
-msgid "    line=%<PRId64>  id=%d  name=%s"
-msgstr "    l�ne=%<PRId64>  id=%d  ainm=%s"
+msgid "    line=%ld  id=%d  name=%s"
+msgstr "    l�ne=%ld  id=%d  ainm=%s"
 
-#: ../cursor_shape.c:68
-msgid "E545: Missing colon"
-msgstr "E545: Idirstad ar iarraidh"
+msgid "E902: Cannot connect to port"
+msgstr "E902: N� f�idir ceangal leis an bport"
 
-#: ../cursor_shape.c:70 ../cursor_shape.c:94
-msgid "E546: Illegal mode"
-msgstr "E546: M�d neamhcheadaithe"
+msgid "E901: gethostbyname() in channel_open()"
+msgstr "E901: gethostbyname() in channel_open()"
 
-#: ../cursor_shape.c:134
-msgid "E548: digit expected"
-msgstr "E548: ag s�il le digit"
+msgid "E898: socket() in channel_open()"
+msgstr "E898: socket() in channel_open()"
 
-#: ../cursor_shape.c:138
-msgid "E549: Illegal percentage"
-msgstr "E549: C�atad�n neamhcheadaithe"
+msgid "E903: received command with non-string argument"
+msgstr "E903: fuarthas ord� le harg�int nach bhfuil ina theaghr�n"
+
+msgid "E904: last argument for expr/call must be a number"
+msgstr "E904: n� m�r don arg�int dheireanach ar expr/call a bheith ina huimhir"
+
+msgid "E904: third argument for call must be a list"
+msgstr "E904: Caithfidh an tr�� arg�int a bheith ina liosta"
 
-#: ../diff.c:146
 #, c-format
-msgid "E96: Can not diff more than %<PRId64> buffers"
-msgstr "E96: N� f�idir diff a dh�anamh ar n�os m� n� %<PRId64> maol�n"
+msgid "E905: received unknown command: %s"
+msgstr "E905: fuarthas ord� anaithnid: %s"
+
+#, c-format
+msgid "E630: %s(): write while not connected"
+msgstr "E630: %s(): scr�obh gan ceangal a bheith ann"
+
+#, c-format
+msgid "E631: %s(): write failed"
+msgstr "E631: %s(): theip ar scr�obh"
+
+#, c-format
+msgid "E917: Cannot use a callback with %s()"
+msgstr "E917: N� f�idir aisghlaoch a �s�id le %s()"
+
+msgid "E912: cannot use ch_evalexpr()/ch_sendexpr() with a raw or nl channel"
+msgstr "E912: n� f�idir ch_evalexpr()/ch_sendexpr() a �s�id le cain�al raw n� nl"
+
+msgid "E906: not an open channel"
+msgstr "E906: n� cain�al oscailte �"
+
+msgid "E920: _io file requires _name to be set"
+msgstr "E920: caithfear _name a shocr� chun comhad _io a �s�id"
+
+msgid "E915: in_io buffer requires in_buf or in_name to be set"
+msgstr "E915: caithfear in_buf n� in_name a shocr� chun maol�n in_io a �s�id"
+
+#, c-format
+msgid "E918: buffer must be loaded: %s"
+msgstr "E918: n� m�r an maol�n a lucht�: %s"
+
+msgid "E821: File is encrypted with unknown method"
+msgstr "E821: Comhad criptithe le modh anaithnid"
+
+msgid "Warning: Using a weak encryption method; see :help 'cm'"
+msgstr "Rabhadh: Cripti�ch�n lag; f�ach :help 'cm'"
+
+msgid "Enter encryption key: "
+msgstr "Iontr�il eochair chripti�ch�in: "
+
+msgid "Enter same key again: "
+msgstr "Iontr�il an eochair ar�s: "
+
+msgid "Keys don't match!"
+msgstr "N�l na heochracha comhoiri�nach le ch�ile!"
+
+msgid "[crypted]"
+msgstr "[criptithe]"
+
+#, c-format
+msgid "E720: Missing colon in Dictionary: %s"
+msgstr "E720: Idirstad ar iarraidh i bhFocl�ir: %s"
+
+#, c-format
+msgid "E721: Duplicate key in Dictionary: \"%s\""
+msgstr "E721: Eochair dh�blach i bhFocl�ir: \"%s\""
+
+#, c-format
+msgid "E722: Missing comma in Dictionary: %s"
+msgstr "E722: Cam�g ar iarraidh i bhFocl�ir: %s"
+
+#, c-format
+msgid "E723: Missing end of Dictionary '}': %s"
+msgstr "E723: '}' ar iarraidh ag deireadh focl�ra: %s"
+
+msgid "extend() argument"
+msgstr "arg�int extend()"
+
+#, c-format
+msgid "E737: Key already exists: %s"
+msgstr "E737: T� eochair ann cheana: %s"
+
+#, c-format
+msgid "E96: Cannot diff more than %ld buffers"
+msgstr "E96: N� f�idir diff a dh�anamh ar n�os m� n� %ld maol�n"
 
-#: ../diff.c:753
 msgid "E810: Cannot read or write temp files"
 msgstr "E810: N� f�idir comhaid shealadacha a l�amh n� a scr�obh"
 
-#: ../diff.c:755
 msgid "E97: Cannot create diffs"
 msgstr "E97: N� f�idir diffeanna a chruth�"
 
-#: ../diff.c:966
+msgid "Patch file"
+msgstr "Comhad paiste"
+
 msgid "E816: Cannot read patch output"
 msgstr "E816: N� f�idir aschur � 'patch' a l�amh"
 
-#: ../diff.c:1220
 msgid "E98: Cannot read diff output"
 msgstr "E98: N� f�idir aschur � 'diff' a l�amh"
 
-#: ../diff.c:2081
 msgid "E99: Current buffer is not in diff mode"
 msgstr "E99: N�l an maol�n reatha sa mh�d diff"
 
-#: ../diff.c:2100
 msgid "E793: No other buffer in diff mode is modifiable"
 msgstr "E793: N� f�idir aon mhaol�n eile a athr� sa mh�d diff"
 
-#: ../diff.c:2102
 msgid "E100: No other buffer in diff mode"
 msgstr "E100: N�l aon mhaol�n eile sa mh�d diff"
 
-#: ../diff.c:2112
 msgid "E101: More than two buffers in diff mode, don't know which one to use"
 msgstr ""
 "E101: T� n�os m� n� dh� mhaol�n sa mh�d diff, n�l fhios agam c� acu ba ch�ir "
 "a �s�id"
 
-#: ../diff.c:2141
 #, c-format
 msgid "E102: Can't find buffer \"%s\""
 msgstr "E102: T� maol�n \"%s\" gan aimsi�"
 
-#: ../diff.c:2152
 #, c-format
 msgid "E103: Buffer \"%s\" is not in diff mode"
 msgstr "E103: N�l maol�n \"%s\" i m�d diff"
 
-#: ../diff.c:2193
 msgid "E787: Buffer changed unexpectedly"
 msgstr "E787: Athra�odh an maol�n gan choinne"
 
-#: ../digraph.c:1598
 msgid "E104: Escape not allowed in digraph"
 msgstr "E104: N� cheada�tear carachtair �al�ch�in i nd�ghraf"
 
-#: ../digraph.c:1760
 msgid "E544: Keymap file not found"
 msgstr "E544: Comhad eochairmhap�la gan aimsi�"
 
-#: ../digraph.c:1785
 msgid "E105: Using :loadkeymap not in a sourced file"
 msgstr "E105: Ag �s�id :loadkeymap ach n� comhad foinsithe � seo"
 
-#: ../digraph.c:1821
 msgid "E791: Empty keymap entry"
 msgstr "E791: Iontr�il fholamh eochairmhap�la"
 
-#: ../edit.c:82
 msgid " Keyword completion (^N^P)"
 msgstr " Comhl�n� lorgfhocal (^N^P)"
 
 #. ctrl_x_mode == 0, ^P/^N compl.
-#: ../edit.c:83
 msgid " ^X mode (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 msgstr " m�d ^X (^]^D^E^F^I^K^L^N^O^Ps^U^V^Y)"
 
-#: ../edit.c:85
 msgid " Whole line completion (^L^N^P)"
 msgstr " Comhl�n� L�nte Ina Ioml�n (^L^N^P)"
 
-#: ../edit.c:86
 msgid " File name completion (^F^N^P)"
 msgstr " Comhl�n� de na hainmneacha comhaid (^F^N^P)"
 
-#: ../edit.c:87
 msgid " Tag completion (^]^N^P)"
 msgstr " Comhl�n� clibeanna (^]/^N/^P)"
 
-#: ../edit.c:88
 msgid " Path pattern completion (^N^P)"
 msgstr " Comhl�n� Conaire (^N^P)"
 
-#: ../edit.c:89
 msgid " Definition completion (^D^N^P)"
 msgstr " Comhl�n� de na sainmh�nithe (^D^N^P)"
 
-#: ../edit.c:91
 msgid " Dictionary completion (^K^N^P)"
 msgstr " Comhl�n� focl�ra (^K^N^P)"
 
-#: ../edit.c:92
 msgid " Thesaurus completion (^T^N^P)"
 msgstr " Comhl�n� teas�rais (^T^N^P)"
 
-#: ../edit.c:93
 msgid " Command-line completion (^V^N^P)"
 msgstr " Comhl�n� den l�ne ordaithe (^V^N^P)"
 
-#: ../edit.c:94
 msgid " User defined completion (^U^N^P)"
 msgstr " Comhl�n� saincheaptha (^U^N^P)"
 
-#: ../edit.c:95
 msgid " Omni completion (^O^N^P)"
 msgstr " Comhl�n� Omni (^O^N^P)"
 
-#: ../edit.c:96
 msgid " Spelling suggestion (s^N^P)"
 msgstr " Moladh litrithe (s^N^P)"
 
-#: ../edit.c:97
 msgid " Keyword Local completion (^N^P)"
 msgstr " Comhl�n� log�nta lorgfhocal (^N^P)"
 
-#: ../edit.c:100
 msgid "Hit end of paragraph"
 msgstr "Sroicheadh cr�och an pharagraif"
 
-#: ../edit.c:101
-#, fuzzy
 msgid "E839: Completion function changed window"
-msgstr "E813: N� f�idir fuinneog autocmd a dh�nadh"
+msgstr "E839: D'athraigh an fheidhm chomhl�naithe an fhuinneog"
 
-#: ../edit.c:102
 msgid "E840: Completion function deleted text"
-msgstr ""
+msgstr "E840: Scrios an fheidhm chomhl�naithe roinnt t�acs"
 
-#: ../edit.c:1847
 msgid "'dictionary' option is empty"
 msgstr "t� an rogha 'dictionary' folamh"
 
-#: ../edit.c:1848
 msgid "'thesaurus' option is empty"
 msgstr "t� an rogha 'thesaurus' folamh"
 
-#: ../edit.c:2655
 #, c-format
 msgid "Scanning dictionary: %s"
 msgstr "Focl�ir � scanadh: %s"
 
-#: ../edit.c:3079
 msgid " (insert) Scroll (^E/^Y)"
 msgstr " (ions�igh) Scrollaigh (^E/^Y)"
 
-#: ../edit.c:3081
 msgid " (replace) Scroll (^E/^Y)"
 msgstr " (ionadaigh) Scrollaigh (^E/^Y)"
 
-#: ../edit.c:3587
 #, c-format
 msgid "Scanning: %s"
 msgstr "%s � scanadh"
 
-#: ../edit.c:3614
 msgid "Scanning tags."
 msgstr "Clibeanna � scanadh."
 
-#: ../edit.c:4519
 msgid " Adding"
 msgstr " M�ad�"
 
@@ -438,587 +433,219 @@ msgstr " M
 #. * be called before line = ml_get(), or when this address is no
 #. * longer needed.  -- Acevedo.
 #.
-#: ../edit.c:4562
 msgid "-- Searching..."
 msgstr "-- Ag Cuardach..."
 
-#: ../edit.c:4618
 msgid "Back at original"
 msgstr "Ar ais ag an mbun�it"
 
-#: ../edit.c:4621
 msgid "Word from other line"
 msgstr "Focal as l�ne eile"
 
-#: ../edit.c:4624
 msgid "The only match"
 msgstr "An t-aon teaghr�n amh�in comhoiri�naithe"
 
-#: ../edit.c:4680
 #, c-format
 msgid "match %d of %d"
 msgstr "comhoiri�n� %d as %d"
 
-#: ../edit.c:4684
 #, c-format
 msgid "match %d"
 msgstr "comhoiri�n� %d"
 
-#: ../eval.c:137
+#. maximum nesting of lists and dicts
 msgid "E18: Unexpected characters in :let"
 msgstr "E18: Carachtair gan choinne i :let"
 
-#: ../eval.c:138
-#, c-format
-msgid "E684: list index out of range: %<PRId64>"
-msgstr "E684: inn�acs liosta as raon: %<PRId64>"
-
-#: ../eval.c:139
 #, c-format
 msgid "E121: Undefined variable: %s"
 msgstr "E121: Athr�g gan sainmh�ni�: %s"
 
-#: ../eval.c:140
 msgid "E111: Missing ']'"
 msgstr "E111: `]' ar iarraidh"
 
-#: ../eval.c:141
-#, c-format
-msgid "E686: Argument of %s must be a List"
-msgstr "E686: Caithfidh arg�int de %s a bheith ina Liosta"
-
-#: ../eval.c:143
-#, c-format
-msgid "E712: Argument of %s must be a List or Dictionary"
-msgstr "E712: Caithfidh arg�int de %s a bheith ina Liosta n� Focl�ir"
-
-#: ../eval.c:144
-msgid "E713: Cannot use empty key for Dictionary"
-msgstr "E713: N� f�idir eochair fholamh a �s�id le Focl�ir"
-
-#: ../eval.c:145
-msgid "E714: List required"
-msgstr "E714: T� g� le liosta"
-
-#: ../eval.c:146
-msgid "E715: Dictionary required"
-msgstr "E715: T� g� le focl�ir"
-
-#: ../eval.c:147
-#, c-format
-msgid "E118: Too many arguments for function: %s"
-msgstr "E118: An iomarca arg�int� d'fheidhm: %s"
-
-#: ../eval.c:148
-#, c-format
-msgid "E716: Key not present in Dictionary: %s"
-msgstr "E716: N�l an eochair seo san Fhocl�ir: %s"
-
-#: ../eval.c:150
-#, c-format
-msgid "E122: Function %s already exists, add ! to replace it"
-msgstr "E122: T� feidhm %s ann cheana, cuir ! leis an ord� chun � a as�iti�"
-
-#: ../eval.c:151
-msgid "E717: Dictionary entry already exists"
-msgstr "E717: T� an iontr�il focl�ra seo ann cheana"
-
-#: ../eval.c:152
-msgid "E718: Funcref required"
-msgstr "E718: T� g� le Funcref"
-
-#: ../eval.c:153
 msgid "E719: Cannot use [:] with a Dictionary"
 msgstr "E719: N� f�idir [:] a �s�id le focl�ir"
 
-#: ../eval.c:154
 #, c-format
 msgid "E734: Wrong variable type for %s="
 msgstr "E734: Cine�l m�cheart athr�ige le haghaidh %s="
 
-#: ../eval.c:155
-#, c-format
-msgid "E130: Unknown function: %s"
-msgstr "E130: Feidhm anaithnid: %s"
-
-#: ../eval.c:156
 #, c-format
 msgid "E461: Illegal variable name: %s"
 msgstr "E461: Ainm athr�ige neamhcheadaithe: %s"
 
-#: ../eval.c:157
 msgid "E806: using Float as a String"
 msgstr "E806: Sn�mhphointe � �s�id mar Theaghr�n"
 
-#: ../eval.c:1830
 msgid "E687: Less targets than List items"
 msgstr "E687: N�os l� spriocanna n� m�reanna Liosta"
 
-#: ../eval.c:1834
 msgid "E688: More targets than List items"
 msgstr "E688: N�os m� spriocanna n� m�reanna Liosta"
 
-#: ../eval.c:1906
 msgid "Double ; in list of variables"
 msgstr "; d�blach i liosta na n-athr�g"
 
-#: ../eval.c:2078
 #, c-format
 msgid "E738: Can't list variables for %s"
 msgstr "E738: N� f�idir athr�ga do %s a thaispe�int"
 
-#: ../eval.c:2391
 msgid "E689: Can only index a List or Dictionary"
 msgstr "E689: Is f�idir Liosta n� Focl�ir amh�in a inn�acs�"
 
-#: ../eval.c:2396
 msgid "E708: [:] must come last"
 msgstr "E708: caithfidh [:] a bheith ar deireadh"
 
-#: ../eval.c:2439
 msgid "E709: [:] requires a List value"
 msgstr "E709: n� fol�ir Liosta a thabhairt le [:]"
 
-#: ../eval.c:2674
 msgid "E710: List value has more items than target"
 msgstr "E710: T� n�os m� m�reanna ag an Liosta n� an sprioc"
 
-#: ../eval.c:2678
 msgid "E711: List value has not enough items"
 msgstr "E711: N�l go leor m�reanna ag an Liosta"
 
-#: ../eval.c:2867
 msgid "E690: Missing \"in\" after :for"
 msgstr "E690: \"in\" ar iarraidh i ndiaidh :for"
 
-#: ../eval.c:3063
-#, c-format
-msgid "E107: Missing parentheses: %s"
-msgstr "E107: L�ib�n� ar iarraidh: %s"
-
-#: ../eval.c:3263
 #, c-format
 msgid "E108: No such variable: \"%s\""
 msgstr "E108: N�l a leith�id d'athr�g: \"%s\""
 
-#: ../eval.c:3333
 msgid "E743: variable nested too deep for (un)lock"
 msgstr "E743: athr�g neadaithe r�dhomhain chun � a (d�)ghlas�il"
 
-#: ../eval.c:3630
 msgid "E109: Missing ':' after '?'"
 msgstr "E109: ':' ar iarraidh i ndiaidh '?'"
 
-#: ../eval.c:3893
 msgid "E691: Can only compare List with List"
 msgstr "E691: Is f�idir Liosta a chur i gcompar�id le Liosta eile amh�in"
 
-#: ../eval.c:3895
-msgid "E692: Invalid operation for Lists"
+msgid "E692: Invalid operation for List"
 msgstr "E692: Oibr�ocht neamhbhail� ar Liosta�"
 
-#: ../eval.c:3915
 msgid "E735: Can only compare Dictionary with Dictionary"
 msgstr "E735: Is f�idir Focl�ir a chur i gcompar�id le Focl�ir eile amh�in"
 
-#: ../eval.c:3917
 msgid "E736: Invalid operation for Dictionary"
 msgstr "E736: Oibr�ocht neamhbhail� ar Fhocl�ir"
 
-#: ../eval.c:3932
-msgid "E693: Can only compare Funcref with Funcref"
-msgstr "E693: Is f�idir Funcref a chur i gcompar�id le Funcref eile amh�in"
-
-#: ../eval.c:3934
 msgid "E694: Invalid operation for Funcrefs"
 msgstr "E694: Oibr�ocht neamhbhail� ar Funcref"
 
-#: ../eval.c:4277
 msgid "E804: Cannot use '%' with Float"
 msgstr "E804: N� f�idir '%' a �s�id le Sn�mhphointe"
 
-#: ../eval.c:4478
 msgid "E110: Missing ')'"
 msgstr "E110: ')' ar iarraidh"
 
-#: ../eval.c:4609
 msgid "E695: Cannot index a Funcref"
 msgstr "E695: N� f�idir Funcref a inn�acs�"
 
-#: ../eval.c:4839
+msgid "E909: Cannot index a special variable"
+msgstr "E909: N� f�idir athr�g speisialta a inn�acs�"
+
 #, c-format
 msgid "E112: Option name missing: %s"
 msgstr "E112: Ainm rogha ar iarraidh: %s"
 
-#: ../eval.c:4855
 #, c-format
 msgid "E113: Unknown option: %s"
 msgstr "E113: Rogha anaithnid: %s"
 
-#: ../eval.c:4904
 #, c-format
 msgid "E114: Missing quote: %s"
 msgstr "E114: Comhartha athfhriotail ar iarraidh: %s"
 
-#: ../eval.c:5020
 #, c-format
 msgid "E115: Missing quote: %s"
 msgstr "E115: Comhartha athfhriotail ar iarraidh: %s"
 
-#: ../eval.c:5084
-#, c-format
-msgid "E696: Missing comma in List: %s"
-msgstr "E696: Cam�g ar iarraidh i Liosta: %s"
+msgid "Not enough memory to set references, garbage collection aborted!"
+msgstr ""
+"N�l go leor cuimhne ann le tagairt� a shocr�; baili� dramha�ola � thobscor!"
 
-#: ../eval.c:5091
-#, c-format
-msgid "E697: Missing end of List ']': %s"
-msgstr "E697: ']' ar iarraidh ag deireadh liosta: %s"
-
-#: ../eval.c:6475
-#, c-format
-msgid "E720: Missing colon in Dictionary: %s"
-msgstr "E720: Idirstad ar iarraidh i bhFocl�ir: %s"
-
-#: ../eval.c:6499
-#, c-format
-msgid "E721: Duplicate key in Dictionary: \"%s\""
-msgstr "E721: Eochair dh�blach i bhFocl�ir: \"%s\""
-
-#: ../eval.c:6517
-#, c-format
-msgid "E722: Missing comma in Dictionary: %s"
-msgstr "E722: Cam�g ar iarraidh i bhFocl�ir: %s"
-
-#: ../eval.c:6524
-#, c-format
-msgid "E723: Missing end of Dictionary '}': %s"
-msgstr "E723: '}' ar iarraidh ag deireadh focl�ra: %s"
-
-#: ../eval.c:6555
 msgid "E724: variable nested too deep for displaying"
 msgstr "E724: athr�g neadaithe r�dhomhain chun � a thaispe�int"
 
-#: ../eval.c:7188
-#, c-format
-msgid "E740: Too many arguments for function %s"
-msgstr "E740: An iomarca arg�int� d'fheidhm %s"
-
-#: ../eval.c:7190
-#, c-format
-msgid "E116: Invalid arguments for function %s"
-msgstr "E116: Arg�int� neamhbhail� d'fheidhm %s"
-
-#: ../eval.c:7377
-#, c-format
-msgid "E117: Unknown function: %s"
-msgstr "E117: Feidhm anaithnid: %s"
-
-#: ../eval.c:7383
-#, c-format
-msgid "E119: Not enough arguments for function: %s"
-msgstr "E119: N�l go leor feidhmeanna d'fheidhm: %s"
-
-#: ../eval.c:7387
-#, c-format
-msgid "E120: Using <SID> not in a script context: %s"
-msgstr "E120: <SID> � �s�id ach gan a bheith i gcomhth�acs scripte: %s"
-
-#: ../eval.c:7391
-#, c-format
-msgid "E725: Calling dict function without Dictionary: %s"
-msgstr "E725: Feidhm 'dict' � ghlao gan Focl�ir: %s"
-
-#: ../eval.c:7453
-msgid "E808: Number or Float required"
-msgstr "E808: Uimhir n� Sn�mhphointe de dh�th"
-
-#: ../eval.c:7503
-#, fuzzy
-msgid "add() argument"
-msgstr "arg�int -c"
-
-#: ../eval.c:7907
-msgid "E699: Too many arguments"
-msgstr "E699: An iomarca arg�int�"
-
-#: ../eval.c:8073
-msgid "E785: complete() can only be used in Insert mode"
-msgstr "E785: is f�idir complete() a �s�id sa mh�d Ions�ite amh�in"
-
-#: ../eval.c:8156
-msgid "&Ok"
-msgstr "&Ok"
-
-#: ../eval.c:8676
-#, c-format
-msgid "E737: Key already exists: %s"
-msgstr "E737: T� eochair ann cheana: %s"
-
-#: ../eval.c:8692
-#, fuzzy
-msgid "extend() argument"
-msgstr "arg�int --cmd"
-
-#: ../eval.c:8915
-#, fuzzy
-msgid "map() argument"
-msgstr "arg�int -c"
-
-#: ../eval.c:8916
-#, fuzzy
-msgid "filter() argument"
-msgstr "arg�int -c"
-
-#: ../eval.c:9229
-#, c-format
-msgid "+-%s%3ld lines: "
-msgstr "+-%s%3ld l�ne: "
-
-#: ../eval.c:9291
-#, c-format
-msgid "E700: Unknown function: %s"
-msgstr "E700: Feidhm anaithnid: %s"
-
-#: ../eval.c:10729
-msgid "called inputrestore() more often than inputsave()"
-msgstr "Glaodh inputrestore() n�os minice n� inputsave()"
-
-#: ../eval.c:10771
-#, fuzzy
-msgid "insert() argument"
-msgstr "arg�int -c"
-
-#: ../eval.c:10841
-msgid "E786: Range not allowed"
-msgstr "E786: N� cheada�tear an raon"
-
-#: ../eval.c:11140
-msgid "E701: Invalid type for len()"
-msgstr "E701: Cine�l neamhbhail� le haghaidh len()"
-
-#: ../eval.c:11980
-msgid "E726: Stride is zero"
-msgstr "E726: Is nialas � an ch�im"
-
-#: ../eval.c:11982
-msgid "E727: Start past end"
-msgstr "E727: Tosach thar dheireadh"
-
-#: ../eval.c:12024 ../eval.c:15297
-msgid "<empty>"
-msgstr "<folamh>"
-
-#: ../eval.c:12282
-#, fuzzy
-msgid "remove() argument"
-msgstr "arg�int --cmd"
-
-#: ../eval.c:12466
-msgid "E655: Too many symbolic links (cycle?)"
-msgstr "E655: An iomarca naisc shiombalacha (ciogal?)"
-
-#: ../eval.c:12593
-#, fuzzy
-msgid "reverse() argument"
-msgstr "arg�int -c"
-
-#: ../eval.c:13721
-#, fuzzy
-msgid "sort() argument"
-msgstr "arg�int -c"
-
-#: ../eval.c:13721
-#, fuzzy
-msgid "uniq() argument"
-msgstr "arg�int -c"
-
-#: ../eval.c:13776
-msgid "E702: Sort compare function failed"
-msgstr "E702: Theip ar fheidhm chompar�ide le linn s�rt�la"
-
-#: ../eval.c:13806
-#, fuzzy
-msgid "E882: Uniq compare function failed"
-msgstr "E702: Theip ar fheidhm chompar�ide le linn s�rt�la"
-
-#: ../eval.c:14085
-msgid "(Invalid)"
-msgstr "(Neamhbhail�)"
-
-#: ../eval.c:14590
-msgid "E677: Error writing temp file"
-msgstr "E677: Earr�id agus comhad sealadach � scr�obh"
-
-#: ../eval.c:16159
 msgid "E805: Using a Float as a Number"
 msgstr "E805: Sn�mhphointe � �s�id mar Uimhir"
 
-#: ../eval.c:16162
 msgid "E703: Using a Funcref as a Number"
 msgstr "E703: Funcref � �s�id mar Uimhir"
 
-#: ../eval.c:16170
 msgid "E745: Using a List as a Number"
 msgstr "E745: Liosta � �s�id mar Uimhir"
 
-#: ../eval.c:16173
 msgid "E728: Using a Dictionary as a Number"
 msgstr "E728: Focl�ir � �s�id mar Uimhir"
 
-#: ../eval.c:16259
+msgid "E910: Using a Job as a Number"
+msgstr "E910: Jab � �s�id mar Uimhir"
+
+msgid "E913: Using a Channel as a Number"
+msgstr "E913: Cain�al � �s�id mar Uimhir"
+
+msgid "E891: Using a Funcref as a Float"
+msgstr "E891: Funcref � �s�id mar Shn�mhphointe"
+
+msgid "E892: Using a String as a Float"
+msgstr "E892: Teaghr�n � �s�id mar Shn�mhphointe"
+
+msgid "E893: Using a List as a Float"
+msgstr "E893: Liosta � �s�id mar Shn�mhphointe"
+
+msgid "E894: Using a Dictionary as a Float"
+msgstr "E894: Focl�ir � �s�id mar Shn�mhphointe"
+
+msgid "E907: Using a special value as a Float"
+msgstr "E907: Luach speisialta � �s�id mar Shn�mhphointe"
+
+msgid "E911: Using a Job as a Float"
+msgstr "E911: Jab � �s�id mar Shn�mhphointe"
+
+msgid "E914: Using a Channel as a Float"
+msgstr "E914: Cain�al � �s�id mar Shn�mhphointe"
+
 msgid "E729: using Funcref as a String"
 msgstr "E729: Funcref � �s�id mar Theaghr�n"
 
-#: ../eval.c:16262
 msgid "E730: using List as a String"
 msgstr "E730: Liosta � �s�id mar Theaghr�n"
 
-#: ../eval.c:16265
 msgid "E731: using Dictionary as a String"
 msgstr "E731: Focl�ir � �s�id mar Theaghr�n"
 
-#: ../eval.c:16619
-#, c-format
-msgid "E706: Variable type mismatch for: %s"
-msgstr "E706: M�mheaitse�il idir cine�lacha athr�ige: %s"
+msgid "E908: using an invalid value as a String"
+msgstr "E908: luach neamhbhail� � �s�id mar Theaghr�n"
 
-#: ../eval.c:16705
 #, c-format
 msgid "E795: Cannot delete variable %s"
 msgstr "E795: N� f�idir athr�g %s a scriosadh"
 
-#: ../eval.c:16724
 #, c-format
 msgid "E704: Funcref variable name must start with a capital: %s"
 msgstr "E704: Caithfidh ceannlitir a bheith ar dt�s ainm Funcref: %s"
 
-#: ../eval.c:16732
 #, c-format
 msgid "E705: Variable name conflicts with existing function: %s"
 msgstr "E705: Tagann ainm athr�ige salach ar fheidhm at� ann cheana: %s"
 
-#: ../eval.c:16763
 #, c-format
 msgid "E741: Value is locked: %s"
 msgstr "E741: T� an luach faoi ghlas: %s"
 
-#: ../eval.c:16764 ../eval.c:16769 ../message.c:1839
 msgid "Unknown"
 msgstr "Anaithnid"
 
-#: ../eval.c:16768
 #, c-format
 msgid "E742: Cannot change value of %s"
 msgstr "E742: N� f�idir an luach de %s a athr�"
 
-#: ../eval.c:16838
 msgid "E698: variable nested too deep for making a copy"
 msgstr "E698: athr�g neadaithe r�dhomhain chun � a ch�ipe�il"
 
-#: ../eval.c:17249
-#, c-format
-msgid "E123: Undefined function: %s"
-msgstr "E123: Feidhm gan sainmh�ni�: %s"
-
-#: ../eval.c:17260
-#, c-format
-msgid "E124: Missing '(': %s"
-msgstr "E124: '(' ar iarraidh: %s"
-
-#: ../eval.c:17293
-#, fuzzy
-msgid "E862: Cannot use g: here"
-msgstr "E284: N� f�idir luachanna IC a shocr�"
-
-#: ../eval.c:17312
-#, c-format
-msgid "E125: Illegal argument: %s"
-msgstr "E125: Arg�int neamhcheadaithe: %s"
-
-#: ../eval.c:17323
-#, fuzzy, c-format
-msgid "E853: Duplicate argument name: %s"
-msgstr "E125: Arg�int neamhcheadaithe: %s"
-
-#: ../eval.c:17416
-msgid "E126: Missing :endfunction"
-msgstr "E126: :endfunction ar iarraidh"
-
-#: ../eval.c:17537
-#, c-format
-msgid "E707: Function name conflicts with variable: %s"
-msgstr "E707: Tagann ainm na feidhme salach ar athr�g: %s"
-
-#: ../eval.c:17549
-#, c-format
-msgid "E127: Cannot redefine function %s: It is in use"
-msgstr ""
-"E127: N� f�idir sainmh�ni� nua a dh�anamh ar fheidhm %s: In �s�id cheana"
-
-#: ../eval.c:17604
-#, c-format
-msgid "E746: Function name does not match script file name: %s"
-msgstr ""
-"E746: N�l ainm na feidhme comhoiri�nach le hainm comhaid na scripte: %s"
-
-#: ../eval.c:17716
-msgid "E129: Function name required"
-msgstr "E129: T� g� le hainm feidhme"
-
-#: ../eval.c:17824
-#, fuzzy, c-format
-msgid "E128: Function name must start with a capital or \"s:\": %s"
-msgstr ""
-"E128: Caithfidh ceannlitir a bheith ar dt�s ainm feidhme, n� idirstad a "
-"bheith ann: %s"
-
-#: ../eval.c:17833
-#, fuzzy, c-format
-msgid "E884: Function name cannot contain a colon: %s"
-msgstr ""
-"E128: Caithfidh ceannlitir a bheith ar dt�s ainm feidhme, n� idirstad a "
-"bheith ann: %s"
-
-#: ../eval.c:18336
-#, c-format
-msgid "E131: Cannot delete function %s: It is in use"
-msgstr "E131: N� f�idir feidhm %s a scriosadh: T� s� in �s�id faoi l�thair"
-
-#: ../eval.c:18441
-msgid "E132: Function call depth is higher than 'maxfuncdepth'"
-msgstr "E132: Doimhneacht na nglaonna n�os m� n� 'maxfuncdepth'"
-
-#: ../eval.c:18568
-#, c-format
-msgid "calling %s"
-msgstr "%s � glao"
-
-#: ../eval.c:18651
-#, c-format
-msgid "%s aborted"
-msgstr "%s tobscortha"
-
-#: ../eval.c:18653
-#, c-format
-msgid "%s returning #%<PRId64>"
-msgstr "%s ag aisfhilleadh #%<PRId64>"
-
-#: ../eval.c:18670
-#, c-format
-msgid "%s returning %s"
-msgstr "%s ag aisfhilleadh %s"
-
-#: ../eval.c:18691 ../ex_cmds2.c:2695
-#, c-format
-msgid "continuing in %s"
-msgstr "ag lean�int i %s"
-
-#: ../eval.c:18795
-msgid "E133: :return not inside a function"
-msgstr "E133: Caithfidh :return a bheith isteach i bhfeidhm"
-
-#: ../eval.c:19159
 msgid ""
 "\n"
 "# global variables:\n"
@@ -1026,7 +653,6 @@ msgstr ""
 "\n"
 "# athr�ga comhchoiteanna:\n"
 
-#: ../eval.c:19254
 msgid ""
 "\n"
 "\tLast set from "
@@ -1034,106 +660,224 @@ msgstr ""
 "\n"
 "\tSocraithe is d�ana� � "
 
-#: ../eval.c:19272
-msgid "No old files"
-msgstr "Gan seanchomhaid"
+msgid "map() argument"
+msgstr "arg�int map()"
+
+msgid "filter() argument"
+msgstr "arg�int filter()"
+
+#, c-format
+msgid "E686: Argument of %s must be a List"
+msgstr "E686: Caithfidh arg�int de %s a bheith ina Liosta"
+
+msgid "E928: String required"
+msgstr "E928: Teaghr�n de dh�th"
+
+msgid "E808: Number or Float required"
+msgstr "E808: Uimhir n� Sn�mhphointe de dh�th"
+
+msgid "add() argument"
+msgstr "arg�int add()"
+
+msgid "E785: complete() can only be used in Insert mode"
+msgstr "E785: is f�idir complete() a �s�id sa mh�d Ions�ite amh�in"
+
+#.
+#. * Yes this is ugly, I don't particularly like it either.  But doing it
+#. * this way has the compelling advantage that translations need not to
+#. * be touched at all.  See below what 'ok' and 'ync' are used for.
+#.
+msgid "&Ok"
+msgstr "&Ok"
+
+#, c-format
+msgid "+-%s%3ld line: "
+msgid_plural "+-%s%3ld lines: "
+msgstr[0] "+-%s%3ld l�ne: "
+msgstr[1] "+-%s%3ld l�ne: "
+msgstr[2] "+-%s%3ld l�ne: "
+msgstr[3] "+-%s%3ld l�ne: "
+msgstr[4] "+-%s%3ld l�ne: "
+
+#, c-format
+msgid "E700: Unknown function: %s"
+msgstr "E700: Feidhm anaithnid: %s"
+
+msgid "E922: expected a dict"
+msgstr "E922: bh�othas ag s�il le focl�ir"
+
+msgid "E923: Second argument of function() must be a list or a dict"
+msgstr "E923: Caithfidh an dara harg�int de function() a bheith ina liosta n� ina focl�ir"
+
+msgid ""
+"&OK\n"
+"&Cancel"
+msgstr ""
+"&OK\n"
+"&Cealaigh"
+
+msgid "called inputrestore() more often than inputsave()"
+msgstr "Glaodh inputrestore() n�os minice n� inputsave()"
+
+msgid "insert() argument"
+msgstr "arg�int insert()"
+
+msgid "E786: Range not allowed"
+msgstr "E786: N� cheada�tear an raon"
+
+msgid "E916: not a valid job"
+msgstr "E916: n� jab bail� �"
+
+msgid "E701: Invalid type for len()"
+msgstr "E701: Cine�l neamhbhail� le haghaidh len()"
+
+#, c-format
+msgid "E798: ID is reserved for \":match\": %ld"
+msgstr "E798: Aitheantas in �irithe do \":match\": %ld"
+
+msgid "E726: Stride is zero"
+msgstr "E726: Is nialas � an ch�im"
+
+msgid "E727: Start past end"
+msgstr "E727: Tosach thar dheireadh"
+
+msgid "<empty>"
+msgstr "<folamh>"
+
+msgid "E240: No connection to Vim server"
+msgstr "E240: N�l aon nasc le freastala� Vim"
+
+#, c-format
+msgid "E241: Unable to send to %s"
+msgstr "E241: N� f�idir aon rud a sheoladh chuig %s"
+
+msgid "E277: Unable to read a server reply"
+msgstr "E277: N� f�idir freagra �n fhreastala� a l�amh"
+
+msgid "remove() argument"
+msgstr "arg�int remove()"
+
+msgid "E655: Too many symbolic links (cycle?)"
+msgstr "E655: An iomarca naisc shiombalacha (ciogal?)"
+
+msgid "reverse() argument"
+msgstr "arg�int reverse()"
+
+msgid "E258: Unable to send to client"
+msgstr "E258: N� f�idir aon rud a sheoladh chuig an chliant"
+
+#, c-format
+msgid "E927: Invalid action: '%s'"
+msgstr "E927: Gn�omh neamhbhail�: '%s'"
+
+msgid "sort() argument"
+msgstr "arg�int sort()"
+
+msgid "uniq() argument"
+msgstr "arg�int uniq()"
+
+msgid "E702: Sort compare function failed"
+msgstr "E702: Theip ar fheidhm chompar�ide le linn s�rt�la"
+
+msgid "E882: Uniq compare function failed"
+msgstr "E882: Theip ar fheidhm chompar�ide Uniq"
+
+msgid "(Invalid)"
+msgstr "(Neamhbhail�)"
+
+#, c-format
+msgid "E935: invalid submatch number: %d"
+msgstr "E935: uimhir fho-mheaitse�la neamhbhail�: %d"
+
+msgid "E677: Error writing temp file"
+msgstr "E677: Earr�id agus comhad sealadach � scr�obh"
+
+msgid "E921: Invalid callback argument"
+msgstr "E921: Arg�int neamhbhail� ar aisghlaoch"
 
-#: ../ex_cmds.c:122
 #, c-format
 msgid "<%s>%s%s  %d,  Hex %02x,  Octal %03o"
 msgstr "<%s>%s%s  %d,  Heics %02x,  Ocht %03o"
 
-#: ../ex_cmds.c:145
 #, c-format
 msgid "> %d, Hex %04x, Octal %o"
 msgstr "> %d, Heics %04x, Ocht %o"
 
-#: ../ex_cmds.c:146
 #, c-format
 msgid "> %d, Hex %08x, Octal %o"
 msgstr "> %d, Heics %08x, Ocht %o"
 
-#: ../ex_cmds.c:684
 msgid "E134: Move lines into themselves"
 msgstr "E134: Bog l�nte isteach iontu f�in"
 
-#: ../ex_cmds.c:747
 msgid "1 line moved"
 msgstr "Bogadh l�ne amh�in"
 
-#: ../ex_cmds.c:749
 #, c-format
-msgid "%<PRId64> lines moved"
-msgstr "Bogadh %<PRId64> l�ne"
+msgid "%ld lines moved"
+msgstr "Bogadh %ld l�ne"
 
-#: ../ex_cmds.c:1175
 #, c-format
-msgid "%<PRId64> lines filtered"
-msgstr "Scagadh %<PRId64> l�ne"
+msgid "%ld lines filtered"
+msgstr "Scagadh %ld l�ne"
 
-#: ../ex_cmds.c:1194
 msgid "E135: *Filter* Autocommands must not change current buffer"
 msgstr ""
 "E135: N� cheada�tear d'uathorduithe *scagaire* an maol�n reatha a athr�"
 
-#: ../ex_cmds.c:1244
 msgid "[No write since last change]\n"
 msgstr "[Athraithe agus nach s�bh�ilte � shin]\n"
 
-#: ../ex_cmds.c:1424
 #, c-format
 msgid "%sviminfo: %s in line: "
 msgstr "%sviminfo: %s i l�ne: "
 
-#: ../ex_cmds.c:1431
 msgid "E136: viminfo: Too many errors, skipping rest of file"
 msgstr ""
 "E136: viminfo: An iomarca earr�id�, ag scipe�il an chuid eile den chomhad"
 
-#: ../ex_cmds.c:1458
 #, c-format
 msgid "Reading viminfo file \"%s\"%s%s%s"
 msgstr "Comhad viminfo \"%s\"%s%s%s � l�amh"
 
-#: ../ex_cmds.c:1460
 msgid " info"
 msgstr " eolas"
 
-#: ../ex_cmds.c:1461
 msgid " marks"
 msgstr " marcanna"
 
-#: ../ex_cmds.c:1462
 msgid " oldfiles"
 msgstr " seanchomhad"
 
-#: ../ex_cmds.c:1463
 msgid " FAILED"
 msgstr " TEIPTHE"
 
 #. avoid a wait_return for this message, it's annoying
-#: ../ex_cmds.c:1541
 #, c-format
 msgid "E137: Viminfo file is not writable: %s"
 msgstr "E137: N�l an comhad Viminfo inscr�ofa: %s"
 
-#: ../ex_cmds.c:1626
+#, c-format
+msgid "E929: Too many viminfo temp files, like %s!"
+msgstr "E929: An iomarca comhad sealadach viminfo, mar shampla %s!"
+
 #, c-format
 msgid "E138: Can't write viminfo file %s!"
 msgstr "E138: N� f�idir comhad viminfo %s a scr�obh!"
 
-#: ../ex_cmds.c:1635
 #, c-format
 msgid "Writing viminfo file \"%s\""
 msgstr "Comhad viminfo \"%s\" � scr�obh"
 
+#, c-format
+msgid "E886: Can't rename viminfo file to %s!"
+msgstr "E886: N� f�idir ainm %s a chur ar an gcomhad viminfo!"
+
 #. Write the info:
-#: ../ex_cmds.c:1720
 #, c-format
 msgid "# This viminfo file was generated by Vim %s.\n"
 msgstr "# Chruthaigh Vim an comhad viminfo seo %s.\n"
 
-#: ../ex_cmds.c:1722
 msgid ""
 "# You may edit it if you're careful!\n"
 "\n"
@@ -1141,47 +885,47 @@ msgstr ""
 "# Is f�idir leat an comhad seo a chur in eagar ach b� c�ramach!\n"
 "\n"
 
-#: ../ex_cmds.c:1723
 msgid "# Value of 'encoding' when this file was written\n"
 msgstr "# Luach 'encoding' agus an comhad seo � scr�obh\n"
 
-#: ../ex_cmds.c:1800
 msgid "Illegal starting char"
 msgstr "Carachtar neamhcheadaithe tosaigh"
 
-#: ../ex_cmds.c:2162
+msgid ""
+"\n"
+"# Bar lines, copied verbatim:\n"
+msgstr ""
+"\n"
+"# Barral�nte, c�ipe�ilte focal ar fhocal:\n"
+
+msgid "Save As"
+msgstr "S�bh�il Mar"
+
 msgid "Write partial file?"
 msgstr "Scr�obh comhad neamhioml�n?"
 
-#: ../ex_cmds.c:2166
 msgid "E140: Use ! to write partial buffer"
 msgstr "E140: Bain �s�id as ! chun maol�n neamhioml�n a scr�obh"
 
-#: ../ex_cmds.c:2281
 #, c-format
 msgid "Overwrite existing file \"%s\"?"
 msgstr "Forscr�obh comhad \"%s\" at� ann cheana?"
 
-#: ../ex_cmds.c:2317
 #, c-format
 msgid "Swap file \"%s\" exists, overwrite anyway?"
 msgstr "T� comhad babht�la \"%s\" ann cheana; forscr�obh mar sin f�in?"
 
-#: ../ex_cmds.c:2326
 #, c-format
 msgid "E768: Swap file exists: %s (:silent! overrides)"
 msgstr "E768: T� comhad babht�la ann cheana: %s (�s�id :silent! chun s�r�)"
 
-#: ../ex_cmds.c:2381
 #, c-format
-msgid "E141: No file name for buffer %<PRId64>"
-msgstr "E141: N�l aon ainm ar mhaol�n %<PRId64>"
+msgid "E141: No file name for buffer %ld"
+msgstr "E141: N�l aon ainm ar mhaol�n %ld"
 
-#: ../ex_cmds.c:2412
 msgid "E142: File not written: Writing is disabled by 'write' option"
 msgstr "E142: N�or scr�obhadh an comhad: d�chumasaithe leis an rogha 'write'"
 
-#: ../ex_cmds.c:2434
 #, c-format
 msgid ""
 "'readonly' option is set for \"%s\".\n"
@@ -1190,7 +934,6 @@ msgstr ""
 "t� an rogha 'readonly' socraithe do \"%s\".\n"
 "Ar mhaith leat � a scr�obh mar sin f�in?"
 
-#: ../ex_cmds.c:2439
 #, c-format
 msgid ""
 "File permissions of \"%s\" are read-only.\n"
@@ -1201,85 +944,70 @@ msgstr ""
 "Seans gurbh fh�idir scr�obh ann mar sin f�in.\n"
 "An bhfuil fonn ort triail a bhaint as?"
 
-#: ../ex_cmds.c:2451
 #, c-format
 msgid "E505: \"%s\" is read-only (add ! to override)"
 msgstr "E505: is inl�ite amh�in � \"%s\" (cuir ! leis an ord� chun s�r�)"
 
-#: ../ex_cmds.c:3120
+msgid "Edit File"
+msgstr "Cuir Comhad in Eagar"
+
 #, c-format
 msgid "E143: Autocommands unexpectedly deleted new buffer %s"
 msgstr "E143: Scrios na huathorduithe maol�n nua %s go tobann"
 
-#: ../ex_cmds.c:3313
 msgid "E144: non-numeric argument to :z"
 msgstr "E144: arg�int neamhuimhri�il chun :z"
 
-#: ../ex_cmds.c:3404
 msgid "E145: Shell commands not allowed in rvim"
 msgstr "E145: N� cheada�tear orduithe blaoisce i rvim"
 
-#: ../ex_cmds.c:3498
 msgid "E146: Regular expressions can't be delimited by letters"
 msgstr ""
 "E146: N� cheada�tear litreacha mar theormharc�ir� ar shloinn ionada�ochta"
 
-#: ../ex_cmds.c:3964
 #, c-format
 msgid "replace with %s (y/n/a/q/l/^E/^Y)?"
 msgstr "cuir %s ina ionad (y/n/a/q/l/^E/^Y)?"
 
-#: ../ex_cmds.c:4379
 msgid "(Interrupted) "
 msgstr "(Idirbhriste) "
 
-#: ../ex_cmds.c:4384
 msgid "1 match"
 msgstr "1 rud comhoiri�nach"
 
-#: ../ex_cmds.c:4384
 msgid "1 substitution"
 msgstr "1 ionada�ocht"
 
-#: ../ex_cmds.c:4387
 #, c-format
-msgid "%<PRId64> matches"
-msgstr "%<PRId64> rud comhoiri�nach"
+msgid "%ld matches"
+msgstr "%ld rud comhoiri�nach"
 
-#: ../ex_cmds.c:4388
 #, c-format
-msgid "%<PRId64> substitutions"
-msgstr "%<PRId64> ionada�ocht"
+msgid "%ld substitutions"
+msgstr "%ld ionada�ocht"
 
-#: ../ex_cmds.c:4392
 msgid " on 1 line"
 msgstr " ar l�ne amh�in"
 
-#: ../ex_cmds.c:4395
 #, c-format
-msgid " on %<PRId64> lines"
-msgstr " ar %<PRId64> l�ne"
+msgid " on %ld lines"
+msgstr " ar %ld l�ne"
 
-#: ../ex_cmds.c:4438
 msgid "E147: Cannot do :global recursive"
 msgstr "E147: N� cheada�tear :global go hathch�rsach"
 
 # should have ":"
-#: ../ex_cmds.c:4467
 msgid "E148: Regular expression missing from global"
 msgstr "E148: Slonn ionada�ochta ar iarraidh � :global"
 
-#: ../ex_cmds.c:4508
 #, c-format
 msgid "Pattern found in every line: %s"
 msgstr "Aims�odh an patr�n i ngach l�ne: %s"
 
-#: ../ex_cmds.c:4510
-#, fuzzy, c-format
+#, c-format
 msgid "Pattern not found: %s"
-msgstr "Patr�n gan aimsi�"
+msgstr "Patr�n gan aimsi�: %s"
 
-#: ../ex_cmds.c:4587
 msgid ""
 "\n"
 "# Last Substitute String:\n"
@@ -1289,682 +1017,599 @@ msgstr ""
 "# Teaghr�n Ionadach Is D�ana�:\n"
 "$"
 
-#: ../ex_cmds.c:4679
 msgid "E478: Don't panic!"
 msgstr "E478: N� t�igh i scaoll!"
 
-#: ../ex_cmds.c:4717
 #, c-format
 msgid "E661: Sorry, no '%s' help for %s"
 msgstr "E661: T� br�n orm, n� aon chabhair '%s' do %s"
 
-#: ../ex_cmds.c:4719
 #, c-format
 msgid "E149: Sorry, no help for %s"
 msgstr "E149: T� br�n orm, n�l aon chabhair do %s"
 
-#: ../ex_cmds.c:4751
 #, c-format
 msgid "Sorry, help file \"%s\" not found"
 msgstr "T� br�n orm, comhad cabhrach \"%s\" gan aimsi�"
 
-#: ../ex_cmds.c:5323
 #, c-format
-msgid "E150: Not a directory: %s"
-msgstr "E150: N� comhadlann �: %s"
+msgid "E151: No match: %s"
+msgstr "E151: Gan meaitse�il: %s"
 
-#: ../ex_cmds.c:5446
 #, c-format
 msgid "E152: Cannot open %s for writing"
 msgstr "E152: N� f�idir %s a oscailt chun scr�obh ann"
 
-#: ../ex_cmds.c:5471
 #, c-format
 msgid "E153: Unable to open %s for reading"
 msgstr "E153: N� f�idir %s a oscailt chun � a l�amh"
 
-#: ../ex_cmds.c:5500
 #, c-format
 msgid "E670: Mix of help file encodings within a language: %s"
 msgstr "E670: Ionch�duithe �ags�la do chomhaid chabhracha i dteanga aonair: %s"
 
-#: ../ex_cmds.c:5565
 #, c-format
 msgid "E154: Duplicate tag \"%s\" in file %s/%s"
 msgstr "E154: Clib dh�blach \"%s\" i gcomhad %s/%s"
 
-#: ../ex_cmds.c:5687
+#, c-format
+msgid "E150: Not a directory: %s"
+msgstr "E150: N� comhadlann �: %s"
+
 #, c-format
 msgid "E160: Unknown sign command: %s"
 msgstr "E160: Ord� anaithnid comhartha: %s"
 
-#: ../ex_cmds.c:5704
 msgid "E156: Missing sign name"
 msgstr "E156: Ainm comhartha ar iarraidh"
 
-#: ../ex_cmds.c:5746
 msgid "E612: Too many signs defined"
 msgstr "E612: An iomarca comhartha� sainmh�nithe"
 
-#: ../ex_cmds.c:5813
 #, c-format
 msgid "E239: Invalid sign text: %s"
 msgstr "E239: T�acs neamhbhail� comhartha: %s"
 
-#: ../ex_cmds.c:5844 ../ex_cmds.c:6035
 #, c-format
 msgid "E155: Unknown sign: %s"
 msgstr "E155: Comhartha anaithnid: %s"
 
-#: ../ex_cmds.c:5877
 msgid "E159: Missing sign number"
 msgstr "E159: Uimhir chomhartha ar iarraidh"
 
-#: ../ex_cmds.c:5971
 #, c-format
 msgid "E158: Invalid buffer name: %s"
 msgstr "E158: Ainm maol�in neamhbhail�: %s"
 
-#: ../ex_cmds.c:6008
-#, c-format
-msgid "E157: Invalid sign ID: %<PRId64>"
-msgstr "E157: ID neamhbhail� comhartha: %<PRId64>"
+msgid "E934: Cannot jump to a buffer that does not have a name"
+msgstr "E934: N� f�idir l�im go maol�n gan ainm"
+
+#, c-format
+msgid "E157: Invalid sign ID: %ld"
+msgstr "E157: ID neamhbhail� comhartha: %ld"
+
+#, c-format
+msgid "E885: Not possible to change sign %s"
+msgstr "E885: N� f�idir an comhartha a athr�: %s"
+
+msgid " (NOT FOUND)"
+msgstr " (AR IARRAIDH)"
 
-#: ../ex_cmds.c:6066
 msgid " (not supported)"
 msgstr " (n�l an rogha seo ar f�il)"
 
-#: ../ex_cmds.c:6169
 msgid "[Deleted]"
 msgstr "[Scriosta]"
 
-#: ../ex_cmds2.c:139
+msgid "No old files"
+msgstr "Gan seanchomhaid"
+
 msgid "Entering Debug mode.  Type \"cont\" to continue."
 msgstr "M�d d�fhabhtaithe � thos�.  Cl�scr�obh \"cont\" chun lean�int."
 
-#: ../ex_cmds2.c:143 ../ex_docmd.c:759
 #, c-format
-msgid "line %<PRId64>: %s"
-msgstr "l�ne %<PRId64>: %s"
+msgid "line %ld: %s"
+msgstr "l�ne %ld: %s"
 
-#: ../ex_cmds2.c:145
 #, c-format
 msgid "cmd: %s"
 msgstr "ord�: %s"
 
-#: ../ex_cmds2.c:322
-#, c-format
-msgid "Breakpoint in \"%s%s\" line %<PRId64>"
-msgstr "Brisphointe i \"%s%s\" l�ne %<PRId64>"
+msgid "frame is zero"
+msgstr "is nialas � an fr�ma"
+
+#, c-format
+msgid "frame at highest level: %d"
+msgstr "fr�ma ag an leibh�al is airde: %d"
+
+#, c-format
+msgid "Breakpoint in \"%s%s\" line %ld"
+msgstr "Brisphointe i \"%s%s\" l�ne %ld"
 
-#: ../ex_cmds2.c:581
 #, c-format
 msgid "E161: Breakpoint not found: %s"
 msgstr "E161: Brisphointe gan aimsi�: %s"
 
-#: ../ex_cmds2.c:611
 msgid "No breakpoints defined"
 msgstr "N�l aon bhrisphointe socraithe"
 
-#: ../ex_cmds2.c:617
 #, c-format
-msgid "%3d  %s %s  line %<PRId64>"
-msgstr "%3d  %s %s  l�ne %<PRId64>"
+msgid "%3d  %s %s  line %ld"
+msgstr "%3d  %s %s  l�ne %ld"
 
-#: ../ex_cmds2.c:942
 msgid "E750: First use \":profile start {fname}\""
 msgstr "E750: �s�id \":profile start {ainm}\" ar dt�s"
 
-#: ../ex_cmds2.c:1269
 #, c-format
 msgid "Save changes to \"%s\"?"
 msgstr "S�bh�il athruithe ar \"%s\"?"
 
-#: ../ex_cmds2.c:1271 ../ex_docmd.c:8851
 msgid "Untitled"
 msgstr "Gan Teideal"
 
-#: ../ex_cmds2.c:1421
 #, c-format
 msgid "E162: No write since last change for buffer \"%s\""
 msgstr "E162: Athra�odh maol�n \"%s\" ach nach bhfuil s� s�bh�ilte � shin"
 
-#: ../ex_cmds2.c:1480
 msgid "Warning: Entered other buffer unexpectedly (check autocommands)"
 msgstr "Rabhadh: Chuathas i maol�n eile go tobann (seice�il na huathorduithe)"
 
-#: ../ex_cmds2.c:1826
 msgid "E163: There is only one file to edit"
 msgstr "E163: N�l ach aon chomhad amh�in le cur in eagar"
 
-#: ../ex_cmds2.c:1828
 msgid "E164: Cannot go before first file"
 msgstr "E164: N� f�idir a dhul roimh an ch�ad chomhad"
 
-#: ../ex_cmds2.c:1830
 msgid "E165: Cannot go beyond last file"
 msgstr "E165: N� f�idir a dhul thar an gcomhad deireanach"
 
-#: ../ex_cmds2.c:2175
 #, c-format
 msgid "E666: compiler not supported: %s"
 msgstr "E666: n� ghlactar leis an tiomsaitheoir: %s"
 
-#: ../ex_cmds2.c:2257
 #, c-format
 msgid "Searching for \"%s\" in \"%s\""
 msgstr "Ag d�anamh cuardach ar \"%s\" i \"%s\""
 
-#: ../ex_cmds2.c:2284
 #, c-format
 msgid "Searching for \"%s\""
 msgstr "Ag d�anamh cuardach ar \"%s\""
 
-#: ../ex_cmds2.c:2307
 #, c-format
-msgid "not found in 'runtimepath': \"%s\""
-msgstr "gan aimsi� i 'runtimepath': \"%s\""
+msgid "not found in '%s': \"%s\""
+msgstr "gan aimsi� in '%s': \"%s\""
+
+msgid "Source Vim script"
+msgstr "Foinsigh script Vim"
 
-#: ../ex_cmds2.c:2472
 #, c-format
 msgid "Cannot source a directory: \"%s\""
 msgstr "N� f�idir comhadlann a l�amh: \"%s\""
 
-#: ../ex_cmds2.c:2518
 #, c-format
 msgid "could not source \"%s\""
 msgstr "n�orbh fh�idir \"%s\" a l�amh"
 
-#: ../ex_cmds2.c:2520
 #, c-format
-msgid "line %<PRId64>: could not source \"%s\""
-msgstr "l�ne %<PRId64>: n�orbh fh�idir \"%s\" a fhoinsi�"
+msgid "line %ld: could not source \"%s\""
+msgstr "l�ne %ld: n�orbh fh�idir \"%s\" a fhoinsi�"
 
-#: ../ex_cmds2.c:2535
 #, c-format
 msgid "sourcing \"%s\""
 msgstr "\"%s\" � fhoinsi�"
 
-#: ../ex_cmds2.c:2537
 #, c-format
-msgid "line %<PRId64>: sourcing \"%s\""
-msgstr "l�ne %<PRId64>: \"%s\" � fhoinsi�"
+msgid "line %ld: sourcing \"%s\""
+msgstr "l�ne %ld: \"%s\" � fhoinsi�"
 
-#: ../ex_cmds2.c:2693
 #, c-format
 msgid "finished sourcing %s"
 msgstr "deireadh ag foinsi� %s"
 
-#: ../ex_cmds2.c:2765
+#, c-format
+msgid "continuing in %s"
+msgstr "ag lean�int i %s"
+
 msgid "modeline"
 msgstr "m�dl�ne"
 
-#: ../ex_cmds2.c:2767
 msgid "--cmd argument"
 msgstr "arg�int --cmd"
 
-#: ../ex_cmds2.c:2769
 msgid "-c argument"
 msgstr "arg�int -c"
 
-#: ../ex_cmds2.c:2771
 msgid "environment variable"
 msgstr "athr�g thimpeallachta"
 
-#: ../ex_cmds2.c:2773
 msgid "error handler"
 msgstr "l�imhse�la� earr�id�"
 
-#: ../ex_cmds2.c:3020
 msgid "W15: Warning: Wrong line separator, ^M may be missing"
 msgstr ""
 "W15: Rabhadh: Deighilteoir l�nte m�cheart, is f�idir go bhfuil ^M ar iarraidh"
 
-#: ../ex_cmds2.c:3139
 msgid "E167: :scriptencoding used outside of a sourced file"
 msgstr "E167: n� �s�idtear :scriptencoding ach i gcomhad foinsithe"
 
-#: ../ex_cmds2.c:3166
 msgid "E168: :finish used outside of a sourced file"
 msgstr "E168: n� �s�idtear :finish ach i gcomhaid foinsithe"
 
-#: ../ex_cmds2.c:3389
 #, c-format
 msgid "Current %slanguage: \"%s\""
 msgstr "%sTeanga faoi l�thair: \"%s\""
 
-#: ../ex_cmds2.c:3404
 #, c-format
 msgid "E197: Cannot set language to \"%s\""
 msgstr "E197: N� f�idir an teanga a shocr� mar \"%s\""
 
-#. don't redisplay the window
-#. don't wait for return
-#: ../ex_docmd.c:387
 msgid "Entering Ex mode.  Type \"visual\" to go to Normal mode."
 msgstr "M�d Ex � thos�.  Cl�scr�obh \"visual\" le haghaidh an ghn�thmh�d."
 
 # in FARF -KPS
-#: ../ex_docmd.c:428
 msgid "E501: At end-of-file"
 msgstr "E501: Ag an chomhadchr�och"
 
-#: ../ex_docmd.c:513
 msgid "E169: Command too recursive"
 msgstr "E169: Ord� r�-athch�rsach"
 
-#: ../ex_docmd.c:1006
 #, c-format
 msgid "E605: Exception not caught: %s"
 msgstr "E605: Eisceacht gan l�imhse�il: %s"
 
-#: ../ex_docmd.c:1085
 msgid "End of sourced file"
 msgstr "Cr�och chomhaid foinsithe"
 
-#: ../ex_docmd.c:1086
 msgid "End of function"
 msgstr "Cr�och fheidhme"
 
-#: ../ex_docmd.c:1628
 msgid "E464: Ambiguous use of user-defined command"
 msgstr "E464: �s�id athbhr�och d'ord� saincheaptha"
 
-#: ../ex_docmd.c:1638
 msgid "E492: Not an editor command"
 msgstr "E492: N�l ina ord� eagarth�ra"
 
-#: ../ex_docmd.c:1729
 msgid "E493: Backwards range given"
 msgstr "E493: Raon droim ar ais"
 
-#: ../ex_docmd.c:1733
 msgid "Backwards range given, OK to swap"
 msgstr "Raon droim ar ais, babht�il"
 
-#. append
-#. typed wrong
-#: ../ex_docmd.c:1787
 msgid "E494: Use w or w>>"
 msgstr "E494: Bain �s�id as w n� w>>"
 
-#: ../ex_docmd.c:3454
-msgid "E319: The command is not available in this version"
+msgid "E319: Sorry, the command is not available in this version"
 msgstr "E319: T� br�n orm, n�l an t-ord� ar f�il sa leagan seo"
 
-#: ../ex_docmd.c:3752
 msgid "E172: Only one file name allowed"
 msgstr "E172: N� cheada�tear ach aon ainm comhaid amh�in"
 
-#: ../ex_docmd.c:4238
 msgid "1 more file to edit.  Quit anyway?"
 msgstr "1 comhad le cur in eagar f�s.  Scoir mar sin f�in?"
 
-#: ../ex_docmd.c:4242
 #, c-format
 msgid "%d more files to edit.  Quit anyway?"
 msgstr "%d comhad le cur in eagar f�s.  Scoir mar sin f�in?"
 
-#: ../ex_docmd.c:4248
 msgid "E173: 1 more file to edit"
 msgstr "E173: 1 chomhad le heagr� f�s"
 
-#: ../ex_docmd.c:4250
 #, c-format
-msgid "E173: %<PRId64> more files to edit"
-msgstr "E173: %<PRId64> comhad le cur in eagar"
+msgid "E173: %ld more files to edit"
+msgstr "E173: %ld comhad le cur in eagar"
 
-#: ../ex_docmd.c:4320
 msgid "E174: Command already exists: add ! to replace it"
 msgstr "E174: T� an t-ord� ann cheana: cuir ! leis chun s�r�"
 
-#: ../ex_docmd.c:4432
 msgid ""
 "\n"
-"    Name        Args Range Complete  Definition"
+"    Name        Args       Address   Complete  Definition"
 msgstr ""
 "\n"
-"    Ainm        Arg  Raon  Ioml�n    Sainmh�ni�"
+"    Ainm        Arg        Seoladh   Ioml�n    Sainmh�ni�"
 
-#: ../ex_docmd.c:4516
 msgid "No user-defined commands found"
 msgstr "N�l aon ord� aimsithe at� sainithe ag an �s�ideoir"
 
-#: ../ex_docmd.c:4538
 msgid "E175: No attribute specified"
 msgstr "E175: N�l aon aitreab�id sainithe"
 
-#: ../ex_docmd.c:4583
 msgid "E176: Invalid number of arguments"
 msgstr "E176: T� l�on na n-arg�int� m�cheart"
 
-#: ../ex_docmd.c:4594
 msgid "E177: Count cannot be specified twice"
 msgstr "E177: N� cheada�tear an t-�ireamh a bheith tugtha faoi dh�"
 
-#: ../ex_docmd.c:4603
 msgid "E178: Invalid default value for count"
 msgstr "E178: Luach r�amhshocraithe neamhbhail� ar �ireamh"
 
-#: ../ex_docmd.c:4625
 msgid "E179: argument required for -complete"
 msgstr "E179: t� g� le harg�int i ndiaidh -complete"
 
-#: ../ex_docmd.c:4635
+msgid "E179: argument required for -addr"
+msgstr "E179: t� g� le harg�int i ndiaidh -addr"
+
 #, c-format
 msgid "E181: Invalid attribute: %s"
 msgstr "E181: Aitreab�id neamhbhail�: %s"
 
-#: ../ex_docmd.c:4678
 msgid "E182: Invalid command name"
 msgstr "E182: Ainm neamhbhail� ordaithe"
 
-#: ../ex_docmd.c:4691
 msgid "E183: User defined commands must start with an uppercase letter"
 msgstr ""
 "E183: Caithfidh ceannlitir a bheith ar dt�s orduithe at� sainithe ag an "
 "�s�ideoir"
 
-#: ../ex_docmd.c:4696
-#, fuzzy
 msgid "E841: Reserved name, cannot be used for user defined command"
-msgstr "E464: �s�id athbhr�och d'ord� saincheaptha"
+msgstr ""
+"E841: Ainm in �irithe, n� f�idir � a chur ar ord� sainithe ag an �s�ideoir"
 
-#: ../ex_docmd.c:4751
 #, c-format
 msgid "E184: No such user-defined command: %s"
 msgstr "E184: N�l a leith�id d'ord� saincheaptha: %s"
 
-#: ../ex_docmd.c:5219
+#, c-format
+msgid "E180: Invalid address type value: %s"
+msgstr "E180: Cine�l neamhbhail� seolta: %s"
+
 #, c-format
 msgid "E180: Invalid complete value: %s"
 msgstr "E180: Luach ioml�n neamhbhail�: %s"
 
-#: ../ex_docmd.c:5225
 msgid "E468: Completion argument only allowed for custom completion"
 msgstr ""
 "E468: N� cheada�tear arg�int chomhl�naithe ach le comhl�n� saincheaptha"
 
-#: ../ex_docmd.c:5231
 msgid "E467: Custom completion requires a function argument"
 msgstr "E467: T� g� le harg�int fheidhme le comhl�n� saincheaptha"
 
-#: ../ex_docmd.c:5257
-#, fuzzy, c-format
-msgid "E185: Cannot find color scheme '%s'"
-msgstr "E185: Sc�im dathanna %s gan aimsi�"
+msgid "unknown"
+msgstr "anaithnid"
+
+#, c-format
+msgid "E185: Cannot find color scheme '%s'"
+msgstr "E185: Sc�im dathanna '%s' gan aimsi�"
 
-#: ../ex_docmd.c:5263
 msgid "Greetings, Vim user!"
 msgstr "Dia duit, a �s�ideoir Vim!"
 
-#: ../ex_docmd.c:5431
 msgid "E784: Cannot close last tab page"
-msgstr "E784: N� f�idir an leathanach cluais�n deiridh a dh�nadh"
+msgstr "E784: N� f�idir an leathanach cluais�n� deiridh a dh�nadh"
 
-#: ../ex_docmd.c:5462
 msgid "Already only one tab page"
-msgstr "N�l ach leathanach cluais�n amh�in cheana f�in"
+msgstr "N�l ach leathanach cluais�n� amh�in cheana f�in"
+
+msgid "Edit File in new window"
+msgstr "Cuir comhad in eagar i bhfuinneog nua"
 
-#: ../ex_docmd.c:6004
 #, c-format
 msgid "Tab page %d"
 msgstr "Leathanach cluais�n %d"
 
-#: ../ex_docmd.c:6295
 msgid "No swap file"
 msgstr "N�l aon chomhad babht�la ann"
 
-#: ../ex_docmd.c:6478
+msgid "Append File"
+msgstr "Cuir Comhad i nDeireadh"
+
 msgid "E747: Cannot change directory, buffer is modified (add ! to override)"
 msgstr ""
 "E747: N� f�idir an chomhadlann a athr�, mionathra�odh an maol�n (cuir ! leis "
 "an ord� chun s�r�)"
 
-#: ../ex_docmd.c:6485
 msgid "E186: No previous directory"
 msgstr "E186: N�l aon chomhadlann roimhe seo"
 
-#: ../ex_docmd.c:6530
 msgid "E187: Unknown"
 msgstr "E187: Anaithnid"
 
-#: ../ex_docmd.c:6610
 msgid "E465: :winsize requires two number arguments"
 msgstr "E465: n� fol�ir dh� arg�int uimhri�la le :winsize"
 
-#: ../ex_docmd.c:6655
+#, c-format
+msgid "Window position: X %d, Y %d"
+msgstr "Ionad na fuinneoige: X %d, Y %d"
+
 msgid "E188: Obtaining window position not implemented for this platform"
 msgstr "E188: N� f�idir ionad na fuinneoige a fh�il amach ar an ch�ras seo"
 
-#: ../ex_docmd.c:6662
 msgid "E466: :winpos requires two number arguments"
 msgstr "E466: n� fol�ir dh� arg�int uimhri�la le :winpos"
 
-#: ../ex_docmd.c:7241
+msgid "E930: Cannot use :redir inside execute()"
+msgstr "E930: N� f�idir :redir a �s�id laistigh de execute()"
+
+msgid "Save Redirection"
+msgstr "S�bh�il Atreor�"
+
+msgid "Save View"
+msgstr "S�bh�il an tAmharc"
+
+msgid "Save Session"
+msgstr "S�bh�il an Seisi�n"
+
+msgid "Save Setup"
+msgstr "S�bh�il an Socr�"
+
 #, c-format
 msgid "E739: Cannot create directory: %s"
 msgstr "E739: N� f�idir comhadlann a chruth�: %s"
 
-#: ../ex_docmd.c:7268
 #, c-format
 msgid "E189: \"%s\" exists (add ! to override)"
 msgstr "E189: T� \"%s\" ann cheana (cuir ! leis an ord� chun s�r�)"
 
-#: ../ex_docmd.c:7273
 #, c-format
 msgid "E190: Cannot open \"%s\" for writing"
 msgstr "E190: N� f�idir \"%s\" a oscailt chun l�amh"
 
 #. set mark
-#: ../ex_docmd.c:7294
 msgid "E191: Argument must be a letter or forward/backward quote"
 msgstr "E191: Caithfidh an arg�int a bheith litir n� comhartha athfhriotal"
 
-#: ../ex_docmd.c:7333
 msgid "E192: Recursive use of :normal too deep"
 msgstr "E192: athch�rs�il :normal r�dhomhain"
 
-#: ../ex_docmd.c:7807
+msgid "E809: #< is not available without the +eval feature"
+msgstr "E809: n�l #< ar f�il gan ghn� +eval"
+
 msgid "E194: No alternate file name to substitute for '#'"
 msgstr "E194: N�l aon ainm comhaid a chur in ionad '#'"
 
-#: ../ex_docmd.c:7841
 msgid "E495: no autocommand file name to substitute for \"<afile>\""
 msgstr "E495: n�l aon ainm comhaid uathordaithe le cur in ionad \"<afile>\""
 
-#: ../ex_docmd.c:7850
 msgid "E496: no autocommand buffer number to substitute for \"<abuf>\""
 msgstr "E496: n�l aon uimhir mhaol�n uathordaithe le cur in ionad \"<abuf>\""
 
-#: ../ex_docmd.c:7861
 msgid "E497: no autocommand match name to substitute for \"<amatch>\""
 msgstr ""
 "E497: n�l aon ainm meaitse�la uathordaithe le cur in ionad \"<amatch>\""
 
-#: ../ex_docmd.c:7870
 msgid "E498: no :source file name to substitute for \"<sfile>\""
 msgstr "E498: n�l aon ainm comhaid :source le cur in ionad \"<sfile>\""
 
-#: ../ex_docmd.c:7876
-#, fuzzy
 msgid "E842: no line number to use for \"<slnum>\""
-msgstr "E498: n�l aon ainm comhaid :source le cur in ionad \"<sfile>\""
+msgstr "E842: n�l aon l�ne-uimhir ar f�il le haghaidh \"<slnum>\""
 
-#: ../ex_docmd.c:7903
-#, fuzzy, c-format
+#, no-c-format
 msgid "E499: Empty file name for '%' or '#', only works with \":p:h\""
 msgstr ""
 "E499: Ainm comhaid folamh le haghaidh '%' n� '#', oibreoidh s� le \":p:h\" "
 "amh�in"
 
-#: ../ex_docmd.c:7905
 msgid "E500: Evaluates to an empty string"
 msgstr "E500: Luach�iltear � seo mar theaghr�n folamh"
 
-#: ../ex_docmd.c:8838
 msgid "E195: Cannot open viminfo file for reading"
 msgstr "E195: N� f�idir an comhad viminfo a oscailt chun l�amh"
 
-#: ../ex_eval.c:464
+msgid "E196: No digraphs in this version"
+msgstr "E196: N� cheada�tear d�ghraif sa leagan seo"
+
 msgid "E608: Cannot :throw exceptions with 'Vim' prefix"
 msgstr "E608: N� f�idir eisceachta� a :throw le r�im�r 'Vim'"
 
 #. always scroll up, don't overwrite
-#: ../ex_eval.c:496
 #, c-format
 msgid "Exception thrown: %s"
 msgstr "Gineadh eisceacht: %s"
 
-#: ../ex_eval.c:545
 #, c-format
 msgid "Exception finished: %s"
 msgstr "Eisceacht curtha i gcr�ch: %s"
 
-#: ../ex_eval.c:546
 #, c-format
 msgid "Exception discarded: %s"
 msgstr "Eisceacht curtha i leataobh: %s"
 
-#: ../ex_eval.c:588 ../ex_eval.c:634
 #, c-format
-msgid "%s, line %<PRId64>"
-msgstr "%s, l�ne %<PRId64>"
+msgid "%s, line %ld"
+msgstr "%s, l�ne %ld"
 
 #. always scroll up, don't overwrite
-#: ../ex_eval.c:608
 #, c-format
 msgid "Exception caught: %s"
 msgstr "L�imhse�ladh eisceacht: %s"
 
-#: ../ex_eval.c:676
 #, c-format
 msgid "%s made pending"
 msgstr "%s ar feitheamh anois"
 
-#: ../ex_eval.c:679
 #, c-format
 msgid "%s resumed"
 msgstr "atosa�odh %s"
 
-#: ../ex_eval.c:683
 #, c-format
 msgid "%s discarded"
 msgstr "%s curtha i leataobh"
 
-#: ../ex_eval.c:708
 msgid "Exception"
 msgstr "Eisceacht"
 
-#: ../ex_eval.c:713
 msgid "Error and interrupt"
 msgstr "Earr�id agus idirbhriseadh"
 
-#: ../ex_eval.c:715
 msgid "Error"
 msgstr "Earr�id"
 
 #. if (pending & CSTP_INTERRUPT)
-#: ../ex_eval.c:717
 msgid "Interrupt"
 msgstr "Idirbhriseadh"
 
-#: ../ex_eval.c:795
 msgid "E579: :if nesting too deep"
 msgstr "E579: :if neadaithe r�dhomhain"
 
-#: ../ex_eval.c:830
 msgid "E580: :endif without :if"
 msgstr "E580: :endif gan :if"
 
-#: ../ex_eval.c:873
 msgid "E581: :else without :if"
 msgstr "E581: :else gan :if"
 
-#: ../ex_eval.c:876
 msgid "E582: :elseif without :if"
 msgstr "E582: :elseif gan :if"
 
-#: ../ex_eval.c:880
 msgid "E583: multiple :else"
 msgstr "E583: :else iomad�la"
 
-#: ../ex_eval.c:883
 msgid "E584: :elseif after :else"
 msgstr "E584: :elseif i ndiaidh :else"
 
-#: ../ex_eval.c:941
 msgid "E585: :while/:for nesting too deep"
 msgstr "E585: :while/:for neadaithe r�dhomhain"
 
-#: ../ex_eval.c:1028
 msgid "E586: :continue without :while or :for"
 msgstr "E586: :continue gan :while n� :for"
 
-#: ../ex_eval.c:1061
 msgid "E587: :break without :while or :for"
 msgstr "E587: :break gan :while n� :for"
 
-#: ../ex_eval.c:1102
 msgid "E732: Using :endfor with :while"
 msgstr "E732: :endfor � �s�id le :while"
 
-#: ../ex_eval.c:1104
 msgid "E733: Using :endwhile with :for"
 msgstr "E733: :endwhile � �s�id le :for"
 
-#: ../ex_eval.c:1247
 msgid "E601: :try nesting too deep"
 msgstr "E601: :try neadaithe r�dhomhain"
 
-#: ../ex_eval.c:1317
 msgid "E603: :catch without :try"
 msgstr "E603: :catch gan :try"
 
 #. Give up for a ":catch" after ":finally" and ignore it.
 #. * Just parse.
-#: ../ex_eval.c:1332
 msgid "E604: :catch after :finally"
 msgstr "E604: :catch i ndiaidh :finally"
 
-#: ../ex_eval.c:1451
 msgid "E606: :finally without :try"
 msgstr "E606: :finally gan :try"
 
 #. Give up for a multiple ":finally" and ignore it.
-#: ../ex_eval.c:1467
 msgid "E607: multiple :finally"
 msgstr "E607: :finally iomad�la"
 
-#: ../ex_eval.c:1571
 msgid "E602: :endtry without :try"
 msgstr "E602: :endtry gan :try"
 
-#: ../ex_eval.c:2026
 msgid "E193: :endfunction not inside a function"
 msgstr "E193: Caithfidh :endfunction a bheith isteach i bhfeidhm"
 
-#: ../ex_getln.c:1643
 msgid "E788: Not allowed to edit another buffer now"
 msgstr "E788: N�l cead agat maol�n eile a chur in eagar anois"
 
-#: ../ex_getln.c:1656
 msgid "E811: Not allowed to change buffer information now"
 msgstr "E811: N�l cead agat faisn�is an mhaol�in a athr� anois"
 
-#: ../ex_getln.c:3178
 msgid "tagname"
 msgstr "clibainm"
 
-#: ../ex_getln.c:3181
 msgid " kind file\n"
 msgstr " cine�l comhaid\n"
 
-#: ../ex_getln.c:4799
 msgid "'history' option is zero"
 msgstr "t� an rogha 'history' nialas"
 
-#: ../ex_getln.c:5046
 #, c-format
 msgid ""
 "\n"
@@ -1975,310 +1620,230 @@ msgstr ""
 
 # this gets plugged into the %s in the previous string,
 # hence the colon
-#: ../ex_getln.c:5047
 msgid "Command Line"
 msgstr "L�ne na nOrduithe:"
 
-#: ../ex_getln.c:5048
 msgid "Search String"
 msgstr "Teaghr�n Cuardaigh"
 
-#: ../ex_getln.c:5049
 msgid "Expression"
 msgstr "Sloinn:"
 
-#: ../ex_getln.c:5050
 msgid "Input Line"
 msgstr "L�ne an Ionchuir:"
 
-#: ../ex_getln.c:5117
+msgid "Debug Line"
+msgstr "L�ne Dh�fhabhtaithe"
+
 msgid "E198: cmd_pchar beyond the command length"
 msgstr "E198: cmd_pchar os cionn fad an ordaithe"
 
-#: ../ex_getln.c:5279
 msgid "E199: Active window or buffer deleted"
 msgstr "E199: Scriosadh an fhuinneog reatha n� an maol�n reatha"
 
-#: ../file_search.c:203
-msgid "E854: path too long for completion"
-msgstr ""
-
-#: ../file_search.c:446
-#, c-format
-msgid ""
-"E343: Invalid path: '**[number]' must be at the end of the path or be "
-"followed by '%s'."
-msgstr ""
-"E343: Conair neamhbhail�: n� m�r '**[uimhir]' a bheith ag deireadh na "
-"conaire, n� le '%s' ina dhiaidh."
-
-#: ../file_search.c:1505
-#, c-format
-msgid "E344: Can't find directory \"%s\" in cdpath"
-msgstr "E344: N� f�idir comhadlann \"%s\" a aimsi� sa cdpath"
-
-#: ../file_search.c:1508
-#, c-format
-msgid "E345: Can't find file \"%s\" in path"
-msgstr "E345: N� f�idir comhad \"%s\" a aimsi� sa chonair"
-
-#: ../file_search.c:1512
-#, c-format
-msgid "E346: No more directory \"%s\" found in cdpath"
-msgstr "E346: N�l comhadlann \"%s\" sa cdpath a thuilleadh"
-
-#: ../file_search.c:1515
-#, c-format
-msgid "E347: No more file \"%s\" found in path"
-msgstr "E347: N�l comhad \"%s\" sa chonair a thuilleadh"
-
-#: ../fileio.c:137
 msgid "E812: Autocommands changed buffer or buffer name"
 msgstr "E812: Bh� maol�n n� ainm maol�in athraithe ag orduithe uathoibr�ocha"
 
-#: ../fileio.c:368
 msgid "Illegal file name"
 msgstr "Ainm comhaid neamhcheadaithe"
 
-#: ../fileio.c:395 ../fileio.c:476 ../fileio.c:2543 ../fileio.c:2578
 msgid "is a directory"
 msgstr "is comhadlann �"
 
-#: ../fileio.c:397
 msgid "is not a file"
 msgstr "n� comhad �"
 
-#: ../fileio.c:508 ../fileio.c:3522
+msgid "is a device (disabled with 'opendevice' option)"
+msgstr "is gl�as � seo (d�chumasaithe le rogha 'opendevice')"
+
 msgid "[New File]"
 msgstr "[Comhad Nua]"
 
-#: ../fileio.c:511
 msgid "[New DIRECTORY]"
 msgstr "[COMHADLANN nua]"
 
-#: ../fileio.c:529 ../fileio.c:532
 msgid "[File too big]"
 msgstr "[Comhad r�mh�r]"
 
-#: ../fileio.c:534
 msgid "[Permission Denied]"
 msgstr "[Cead Di�ltaithe]"
 
-#: ../fileio.c:653
 msgid "E200: *ReadPre autocommands made the file unreadable"
 msgstr "E200: Rinne uathorduithe *ReadPre praiseach as an chomhad"
 
-#: ../fileio.c:655
 msgid "E201: *ReadPre autocommands must not change current buffer"
 msgstr "E201: N� cheada�tear d'uathorduithe *ReadPre an maol�n reatha a athr�"
 
-#: ../fileio.c:672
-msgid "Nvim: Reading from stdin...\n"
+msgid "Vim: Reading from stdin...\n"
 msgstr "Vim: Ag l�amh �n ionchur caighde�nach...\n"
 
+msgid "Reading from stdin..."
+msgstr "Ag l�amh �n ionchur caighde�nach..."
+
 #. Re-opening the original file failed!
-#: ../fileio.c:909
 msgid "E202: Conversion made file unreadable!"
 msgstr "E202: Comhad dol�ite i ndiaidh an tiontaithe!"
 
-#. fifo or socket
-#: ../fileio.c:1782
 msgid "[fifo/socket]"
 msgstr "[fifo/soic�ad]"
 
 # `TITA' ?! -KPS
-#. fifo
-#: ../fileio.c:1788
 msgid "[fifo]"
 msgstr "[fifo]"
 
-#. or socket
-#: ../fileio.c:1794
 msgid "[socket]"
 msgstr "[soic�ad]"
 
-#. or character special
-#: ../fileio.c:1801
 msgid "[character special]"
 msgstr "[comhad speisialta den chine�l carachtar]"
 
-#: ../fileio.c:1815
 msgid "[CR missing]"
 msgstr "[CR ar iarraidh]"
 
-#: ../fileio.c:1819
 msgid "[long lines split]"
 msgstr "[l�nte fada deighilte]"
 
-#: ../fileio.c:1823 ../fileio.c:3512
 msgid "[NOT converted]"
 msgstr "[N� tiontaithe]"
 
-#: ../fileio.c:1826 ../fileio.c:3515
 msgid "[converted]"
 msgstr "[tiontaithe]"
 
-#: ../fileio.c:1831
 #, c-format
-msgid "[CONVERSION ERROR in line %<PRId64>]"
-msgstr "[EARR�ID TIONTAITHE i l�ne %<PRId64>]"
+msgid "[CONVERSION ERROR in line %ld]"
+msgstr "[EARR�ID TIONTAITHE i l�ne %ld]"
 
-#: ../fileio.c:1835
 #, c-format
-msgid "[ILLEGAL BYTE in line %<PRId64>]"
-msgstr "[BEART NEAMHCHEADAITHE i l�ne %<PRId64>]"
+msgid "[ILLEGAL BYTE in line %ld]"
+msgstr "[BEART NEAMHCHEADAITHE i l�ne %ld]"
 
-#: ../fileio.c:1838
 msgid "[READ ERRORS]"
 msgstr "[EARR�ID� L�IMH]"
 
-#: ../fileio.c:2104
 msgid "Can't find temp file for conversion"
 msgstr "N� f�idir comhad sealadach a aimsi� le haghaidh tiontaithe"
 
-#: ../fileio.c:2110
 msgid "Conversion with 'charconvert' failed"
 msgstr "Theip ar thiont� le 'charconvert'"
 
-#: ../fileio.c:2113
 msgid "can't read output of 'charconvert'"
 msgstr "n� f�idir an t-aschur � 'charconvert' a l�amh"
 
-#: ../fileio.c:2437
 msgid "E676: No matching autocommands for acwrite buffer"
 msgstr "E676: N�l aon uathord� comhoiri�naithe le haghaidh maol�in acwrite"
 
-#: ../fileio.c:2466
 msgid "E203: Autocommands deleted or unloaded buffer to be written"
 msgstr "E203: Scrios n� dh�luchtaigh uathorduithe an maol�n le scr�obh"
 
-#: ../fileio.c:2486
 msgid "E204: Autocommand changed number of lines in unexpected way"
 msgstr "E204: D'athraigh uathord� l�on na l�nte gan choinne"
 
-#: ../fileio.c:2548 ../fileio.c:2565
+msgid "NetBeans disallows writes of unmodified buffers"
+msgstr "N� cheada�onn NetBeans maol�in gan athr� a bheith scr�ofa"
+
+msgid "Partial writes disallowed for NetBeans buffers"
+msgstr "N� cheada�tear maol�in NetBeans a bheith scr�ofa go neamhioml�n"
+
 msgid "is not a file or writable device"
 msgstr "n� comhad n� gl�as inscr�ofa �"
 
-#: ../fileio.c:2601
+msgid "writing to device disabled with 'opendevice' option"
+msgstr "d�chumasa�odh scr�obh chuig gl�as le rogha 'opendevice'"
+
 msgid "is read-only (add ! to override)"
 msgstr "is inl�ite amh�in � (cuir ! leis an ord� chun s�r�)"
 
-#: ../fileio.c:2886
 msgid "E506: Can't write to backup file (add ! to override)"
 msgstr ""
 "E506: N� f�idir scr�obh a dh�anamh sa chomhad c�ltaca (�s�id ! chun s�r�)"
 
-#: ../fileio.c:2898
 msgid "E507: Close error for backup file (add ! to override)"
 msgstr ""
 "E507: Earr�id agus comhad c�ltaca � dh�nadh (cuir ! leis an ord� chun s�r�)"
 
-#: ../fileio.c:2901
 msgid "E508: Can't read file for backup (add ! to override)"
 msgstr ""
 "E508: N� f�idir an comhad c�ltaca a l�amh (cuir ! leis an ord� chun s�r�)"
 
-#: ../fileio.c:2923
 msgid "E509: Cannot create backup file (add ! to override)"
 msgstr ""
 "E509: N� f�idir comhad c�ltaca a chruth� (cuir ! leis an ord� chun s�r�)"
 
-#: ../fileio.c:3008
 msgid "E510: Can't make backup file (add ! to override)"
 msgstr ""
 "E510: N� f�idir comhad c�ltaca a chruth� (cuir ! leis an ord� chun s�r�)"
 
-#. Can't write without a tempfile!
-#: ../fileio.c:3121
+msgid "E460: The resource fork would be lost (add ! to override)"
+msgstr "E460: Chaillf� an forc acmhainne (cuir ! leis an ord� chun s�r�)"
+
 msgid "E214: Can't find temp file for writing"
 msgstr "E214: N� f�idir comhad sealadach a aimsi� chun scr�obh ann"
 
-#: ../fileio.c:3134
 msgid "E213: Cannot convert (add ! to write without conversion)"
 msgstr "E213: N� f�idir tiont� (cuir ! leis an ord� chun scr�obh gan tiont�)"
 
-#: ../fileio.c:3169
 msgid "E166: Can't open linked file for writing"
 msgstr "E166: N� f�idir comhad nasctha a oscailt chun scr�obh ann"
 
-#: ../fileio.c:3173
 msgid "E212: Can't open file for writing"
 msgstr "E212: N� f�idir comhad a oscailt chun scr�obh ann"
 
-#: ../fileio.c:3363
 msgid "E667: Fsync failed"
 msgstr "E667: Theip ar fsync"
 
-#: ../fileio.c:3398
 msgid "E512: Close failed"
 msgstr "E512: Theip ar d�nadh"
 
-#: ../fileio.c:3436
 msgid "E513: write error, conversion failed (make 'fenc' empty to override)"
 msgstr ""
 "E513: earr�id le linn scr�obh, theip ar thiont� (�s�id 'fenc' folamh chun "
 "s�r�)"
 
-#: ../fileio.c:3441
 #, c-format
 msgid ""
-"E513: write error, conversion failed in line %<PRId64> (make 'fenc' empty to "
+"E513: write error, conversion failed in line %ld (make 'fenc' empty to "
 "override)"
 msgstr ""
-"E513: earr�id le linn scr�ofa, theip ar thiont� ar l�ne %<PRId64> (�s�id "
-"'fenc' folamh le s�r�)"
+"E513: earr�id le linn scr�ofa, theip ar thiont� ar l�ne %ld (�s�id 'fenc' "
+"folamh le s�r�)"
 
-#: ../fileio.c:3448
 msgid "E514: write error (file system full?)"
 msgstr "E514: earr�id le linn scr�ofa (an bhfuil an c�ras comhaid l�n?)"
 
-#: ../fileio.c:3506
 msgid " CONVERSION ERROR"
 msgstr " EARR�ID TIONTAITHE"
 
-#: ../fileio.c:3509
 #, c-format
-msgid " in line %<PRId64>;"
-msgstr " ar l�ne %<PRId64>;"
+msgid " in line %ld;"
+msgstr " ar l�ne %ld;"
 
-#: ../fileio.c:3519
 msgid "[Device]"
 msgstr "[Gl�as]"
 
-#: ../fileio.c:3522
 msgid "[New]"
 msgstr "[Nua]"
 
-#: ../fileio.c:3535
 msgid " [a]"
 msgstr " [a]"
 
-#: ../fileio.c:3535
 msgid " appended"
 msgstr " iarcheangailte"
 
-#: ../fileio.c:3537
 msgid " [w]"
 msgstr " [w]"
 
-#: ../fileio.c:3537
 msgid " written"
 msgstr " scr�ofa"
 
-#: ../fileio.c:3579
 msgid "E205: Patchmode: can't save original file"
 msgstr "E205: Patchmode: n� f�idir an comhad bun�sach a sh�bh�il"
 
-#: ../fileio.c:3602
 msgid "E206: patchmode: can't touch empty original file"
 msgstr "E206: patchmode: n� f�idir an comhad bun�sach folamh a theagmh�il"
 
-#: ../fileio.c:3616
 msgid "E207: Can't delete backup file"
 msgstr "E207: N� f�idir an comhad c�ltaca a scriosadh"
 
-#: ../fileio.c:3672
 msgid ""
 "\n"
 "WARNING: Original file may be lost or damaged\n"
@@ -2286,96 +1851,75 @@ msgstr ""
 "\n"
 "RABHADH: Is f�idir gur caillte n� loite an comhad bun�sach\n"
 
-#: ../fileio.c:3675
 msgid "don't quit the editor until the file is successfully written!"
 msgstr "n� scoir go dt� go scr�obhfa� an comhad!"
 
-#: ../fileio.c:3795
 msgid "[dos]"
 msgstr "[dos]"
 
-#: ../fileio.c:3795
 msgid "[dos format]"
 msgstr "[form�id dos]"
 
-#: ../fileio.c:3801
 msgid "[mac]"
 msgstr "[mac]"
 
-#: ../fileio.c:3801
 msgid "[mac format]"
 msgstr "[form�id mac]"
 
-#: ../fileio.c:3807
 msgid "[unix]"
 msgstr "[unix]"
 
-#: ../fileio.c:3807
 msgid "[unix format]"
 msgstr "[form�id unix]"
 
-#: ../fileio.c:3831
 msgid "1 line, "
 msgstr "1 l�ne, "
 
-#: ../fileio.c:3833
 #, c-format
-msgid "%<PRId64> lines, "
-msgstr "%<PRId64> l�ne, "
+msgid "%ld lines, "
+msgstr "%ld l�ne, "
 
-#: ../fileio.c:3836
 msgid "1 character"
 msgstr "1 carachtar"
 
-#: ../fileio.c:3838
 #, c-format
-msgid "%<PRId64> characters"
-msgstr "%<PRId64> carachtar"
+msgid "%lld characters"
+msgstr "%lld carachtar"
 
-#: ../fileio.c:3849
 msgid "[noeol]"
 msgstr "[ganEOL]"
 
-#: ../fileio.c:3849
 msgid "[Incomplete last line]"
 msgstr "[Is neamhioml�n an l�ne dheireanach]"
 
 #. don't overwrite messages here
 #. must give this prompt
 #. don't use emsg() here, don't want to flush the buffers
-#: ../fileio.c:3865
 msgid "WARNING: The file has been changed since reading it!!!"
 msgstr "RABHADH: Athra�odh an comhad � l�adh �!!!"
 
-#: ../fileio.c:3867
 msgid "Do you really want to write to it"
 msgstr "An bhfuil t� cinnte gur mhaith leat � a scr�obh"
 
-#: ../fileio.c:4648
 #, c-format
 msgid "E208: Error writing to \"%s\""
 msgstr "E208: Earr�id agus \"%s\" � scr�obh"
 
-#: ../fileio.c:4655
 #, c-format
 msgid "E209: Error closing \"%s\""
 msgstr "E209: Earr�id agus \"%s\" � dh�nadh"
 
-#: ../fileio.c:4657
 #, c-format
 msgid "E210: Error reading \"%s\""
 msgstr "E210: Earr�id agus \"%s\" � l�amh"
 
-#: ../fileio.c:4883
 msgid "E246: FileChangedShell autocommand deleted buffer"
 msgstr "E246: Scrios uathord� FileChangedShell an maol�n"
 
-#: ../fileio.c:4894
 #, c-format
 msgid "E211: File \"%s\" no longer available"
 msgstr "E211: N�l comhad \"%s\" ar f�il feasta"
 
-#: ../fileio.c:4906
 #, c-format
 msgid ""
 "W12: Warning: File \"%s\" has changed and the buffer was changed in Vim as "
@@ -2383,39 +1927,31 @@ msgid ""
 msgstr ""
 "W12: Rabhadh: Athra�odh comhad \"%s\" agus athra�odh an maol�n i Vim fosta"
 
-#: ../fileio.c:4907
 msgid "See \":help W12\" for more info."
 msgstr "Bain triail as \":help W12\" chun tuilleadh eolais a fh�il."
 
-#: ../fileio.c:4910
 #, c-format
 msgid "W11: Warning: File \"%s\" has changed since editing started"
 msgstr "W11: Rabhadh: Athra�odh comhad \"%s\" � tosa�odh � a chur in eagar"
 
-#: ../fileio.c:4911
 msgid "See \":help W11\" for more info."
 msgstr "Bain triail as \":help W11\" chun tuilleadh eolais a fh�il."
 
-#: ../fileio.c:4914
 #, c-format
 msgid "W16: Warning: Mode of file \"%s\" has changed since editing started"
 msgstr ""
 "W16: Rabhadh: Athra�odh m�d an chomhaid \"%s\" � tosa�odh � a chur in eagar"
 
-#: ../fileio.c:4915
 msgid "See \":help W16\" for more info."
 msgstr "Bain triail as \":help W16\" chun tuilleadh eolais a fh�il."
 
-#: ../fileio.c:4927
 #, c-format
 msgid "W13: Warning: File \"%s\" has been created after editing started"
 msgstr "W13: Rabhadh: Crutha�odh comhad \"%s\" � tosa�odh � a chur in eagar"
 
-#: ../fileio.c:4947
 msgid "Warning"
 msgstr "Rabhadh"
 
-#: ../fileio.c:4948
 msgid ""
 "&OK\n"
 "&Load File"
@@ -2423,48 +1959,45 @@ msgstr ""
 "&OK\n"
 "&Luchtaigh Comhad"
 
-#: ../fileio.c:5065
 #, c-format
 msgid "E462: Could not prepare for reloading \"%s\""
 msgstr "E462: N� f�idir \"%s\" a ullmh� le haghaidh athluchtaithe"
 
-#: ../fileio.c:5078
 #, c-format
 msgid "E321: Could not reload \"%s\""
 msgstr "E321: N� f�idir \"%s\" a athlucht�"
 
-#: ../fileio.c:5601
 msgid "--Deleted--"
 msgstr "--Scriosta--"
 
-#: ../fileio.c:5732
 #, c-format
 msgid "auto-removing autocommand: %s <buffer=%d>"
 msgstr "uathord� � bhaint go huathoibr�och: %s <maol�n=%d>"
 
 #. the group doesn't exist
-#: ../fileio.c:5772
 #, c-format
 msgid "E367: No such group: \"%s\""
 msgstr "E367: N�l a leith�id de ghr�pa: \"%s\""
 
-#: ../fileio.c:5897
+msgid "E936: Cannot delete the current group"
+msgstr "E936: N� f�idir an gr�pa reatha a scriosadh"
+
+msgid "W19: Deleting augroup that is still in use"
+msgstr "W19: Iarracht ar augroup at� f�s in �s�id a scriosadh"
+
 #, c-format
 msgid "E215: Illegal character after *: %s"
 msgstr "E215: Carachtar neamhcheadaithe i ndiaidh *: %s"
 
-#: ../fileio.c:5905
 #, c-format
 msgid "E216: No such event: %s"
 msgstr "E216: N�l a leith�id de theagmhas: %s"
 
-#: ../fileio.c:5907
 #, c-format
 msgid "E216: No such group or event: %s"
 msgstr "E216: N�l a leith�id de ghr�pa n� theagmhas: %s"
 
 #. Highlight title
-#: ../fileio.c:6090
 msgid ""
 "\n"
 "--- Auto-Commands ---"
@@ -2472,765 +2005,567 @@ msgstr ""
 "\n"
 "--- Uathorduithe ---"
 
-#: ../fileio.c:6293
 #, c-format
 msgid "E680: <buffer=%d>: invalid buffer number "
 msgstr "E680: <maol�n=%d>: uimhir neamhbhail� mhaol�in "
 
-#: ../fileio.c:6370
 msgid "E217: Can't execute autocommands for ALL events"
 msgstr "E217: N� f�idir uathorduithe a rith i gcomhair teagmhas UILE"
 
-#: ../fileio.c:6393
 msgid "No matching autocommands"
 msgstr "N�l aon uathord� comhoiri�naithe"
 
-#: ../fileio.c:6831
 msgid "E218: autocommand nesting too deep"
 msgstr "E218: uathord� neadaithe r�dhomhain"
 
-#: ../fileio.c:7143
 #, c-format
 msgid "%s Auto commands for \"%s\""
 msgstr "%s Uathorduithe do \"%s\""
 
-#: ../fileio.c:7149
 #, c-format
 msgid "Executing %s"
 msgstr "%s � rith"
 
-#: ../fileio.c:7211
 #, c-format
 msgid "autocommand %s"
 msgstr "uathord� %s"
 
-#: ../fileio.c:7795
 msgid "E219: Missing {."
 msgstr "E219: { ar iarraidh."
 
-#: ../fileio.c:7797
 msgid "E220: Missing }."
 msgstr "E220: } ar iarraidh."
 
-#: ../fold.c:93
 msgid "E490: No fold found"
 msgstr "E490: N�or aims�odh aon fhilleadh"
 
-#: ../fold.c:544
 msgid "E350: Cannot create fold with current 'foldmethod'"
 msgstr "E350: N� f�idir filleadh a chruth� leis an 'foldmethod' reatha"
 
-#: ../fold.c:546
 msgid "E351: Cannot delete fold with current 'foldmethod'"
 msgstr "E351: N� f�idir filleadh a scriosadh leis an 'foldmethod' reatha"
 
-#: ../fold.c:1784
 #, c-format
-msgid "+--%3ld lines folded "
-msgstr "+--%3ld l�ne fillte "
+msgid "+--%3ld line folded "
+msgid_plural "+--%3ld lines folded "
+msgstr[0] "+--%3ld l�ne fillte "
+msgstr[1] "+--%3ld l�ne fillte "
+msgstr[2] "+--%3ld l�ne fillte "
+msgstr[3] "+--%3ld l�ne fillte "
+msgstr[4] "+--%3ld l�ne fillte "
 
-#. buffer has already been read
-#: ../getchar.c:273
 msgid "E222: Add to read buffer"
 msgstr "E222: Cuir leis an maol�n l�ite"
 
-#: ../getchar.c:2040
 msgid "E223: recursive mapping"
 msgstr "E223: map�il athch�rsach"
 
-#: ../getchar.c:2849
 #, c-format
 msgid "E224: global abbreviation already exists for %s"
 msgstr "E224: t� giorr�ch�n comhchoiteann ann cheana le haghaidh %s"
 
-#: ../getchar.c:2852
 #, c-format
 msgid "E225: global mapping already exists for %s"
 msgstr "E225: t� map�il chomhchoiteann ann cheana le haghaidh %s"
 
-#: ../getchar.c:2952
 #, c-format
 msgid "E226: abbreviation already exists for %s"
 msgstr "E226: t� giorr�ch�n ann cheana le haghaidh %s"
 
-#: ../getchar.c:2955
 #, c-format
 msgid "E227: mapping already exists for %s"
 msgstr "E227: t� map�il ann cheana le haghaidh %s"
 
-#: ../getchar.c:3008
 msgid "No abbreviation found"
 msgstr "N�or aims�odh aon ghiorr�ch�n"
 
-#: ../getchar.c:3010
 msgid "No mapping found"
 msgstr "N�or aims�odh aon mhap�il"
 
-#: ../getchar.c:3974
 msgid "E228: makemap: Illegal mode"
 msgstr "E228: makemap: M�d neamhcheadaithe"
 
-#. key value of 'cedit' option
-#. type of cmdline window or 0
-#. result of cmdline window or 0
-#: ../globals.h:924
-msgid "--No lines in buffer--"
-msgstr "--T� an maol�n folamh--"
+msgid "E851: Failed to create a new process for the GUI"
+msgstr "E851: N�orbh fh�idir pr�iseas nua a chruth� don GUI"
 
-#.
-#. * The error messages that can be shared are included here.
-#. * Excluded are errors that are only used once and debugging messages.
-#.
-#: ../globals.h:996
-msgid "E470: Command aborted"
-msgstr "E470: Ord� tobscortha"
+msgid "E852: The child process failed to start the GUI"
+msgstr "E852: Theip ar an macphr�iseas an GUI a thos�"
 
-#: ../globals.h:997
-msgid "E471: Argument required"
-msgstr "E471: T� g� le harg�int"
+msgid "E229: Cannot start the GUI"
+msgstr "E229: N� f�idir an GUI a chur ag obair"
 
-#: ../globals.h:998
-msgid "E10: \\ should be followed by /, ? or &"
-msgstr "E10: Ba ch�ir /, ? n� & a chur i ndiaidh \\"
+#, c-format
+msgid "E230: Cannot read from \"%s\""
+msgstr "E230: N� f�idir l�amh � \"%s\""
 
-#: ../globals.h:1000
-msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgid "E665: Cannot start GUI, no valid font found"
 msgstr ""
-"E11: Neamhbhail� i bhfuinneog l�ne na n-orduithe; <CR>=rith, CTRL-C=scoir"
+"E665: N� f�idir an GUI a chur ag obair, n�l aon chl�fhoireann bhail� ann"
 
-#: ../globals.h:1002
-msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgid "E231: 'guifontwide' invalid"
+msgstr "E231: 'guifontwide' neamhbhail�"
+
+msgid "E599: Value of 'imactivatekey' is invalid"
+msgstr "E599: Luach neamhbhail� ar 'imactivatekey'"
+
+#, c-format
+msgid "E254: Cannot allocate color %s"
+msgstr "E254: N� f�idir dath %s a dh�ileadh"
+
+msgid "No match at cursor, finding next"
+msgstr "N�l a leith�id ag an ch�rs�ir, ag cuardach ar an ch�ad cheann eile"
+
+msgid "<cannot open> "
+msgstr "<n� f�idir a oscailt> "
+
+#, c-format
+msgid "E616: vim_SelFile: can't get font %s"
+msgstr "E616: vim_SelFile: n�l aon fh�il ar an chl�fhoireann %s"
+
+msgid "E614: vim_SelFile: can't return to current directory"
+msgstr "E614: vim_SelFile: n� f�idir dul ar ais go dt� an chomhadlann reatha"
+
+msgid "Pathname:"
+msgstr "Conair:"
+
+msgid "E615: vim_SelFile: can't get current directory"
+msgstr "E615: vim_SelFile: n�l an chomhadlann reatha ar f�il"
+
+msgid "OK"
+msgstr "OK"
+
+msgid "Cancel"
+msgstr "Cealaigh"
+
+msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
 msgstr ""
-"E12: N� cheada�tear ord� � exrc/vimrc sa chomhadlann reatha n� � chuardach "
-"clibe"
+"Giuirl�id Scrollbharra: N� f�idir c�imseata an mhapa picteil�n� a fh�il."
 
-#: ../globals.h:1003
-msgid "E171: Missing :endif"
-msgstr "E171: :endif ar iarraidh"
+msgid "Vim dialog"
+msgstr "Dial�g Vim"
 
-#: ../globals.h:1004
-msgid "E600: Missing :endtry"
-msgstr "E600: :endtry ar iarraidh"
-
-#: ../globals.h:1005
-msgid "E170: Missing :endwhile"
-msgstr "E170: :endwhile ar iarraidh"
-
-#: ../globals.h:1006
-msgid "E170: Missing :endfor"
-msgstr "E170: :endfor ar iarraidh"
-
-#: ../globals.h:1007
-msgid "E588: :endwhile without :while"
-msgstr "E588: :endwhile gan :while"
-
-#: ../globals.h:1008
-msgid "E588: :endfor without :for"
-msgstr "E588: :endfor gan :for"
-
-#: ../globals.h:1009
-msgid "E13: File exists (add ! to override)"
-msgstr "E13: T� comhad ann cheana (cuir ! leis an ord� chun forscr�obh)"
-
-#: ../globals.h:1010
-msgid "E472: Command failed"
-msgstr "E472: Theip ar ord�"
-
-#: ../globals.h:1011
-msgid "E473: Internal error"
-msgstr "E473: Earr�id inmhe�nach"
-
-#: ../globals.h:1012
-msgid "Interrupted"
-msgstr "Idirbhriste"
-
-#: ../globals.h:1013
-msgid "E14: Invalid address"
-msgstr "E14: Drochsheoladh"
-
-#: ../globals.h:1014
-msgid "E474: Invalid argument"
-msgstr "E474: Arg�int neamhbhail�"
-
-#: ../globals.h:1015
-#, c-format
-msgid "E475: Invalid argument: %s"
-msgstr "E475: Arg�int neamhbhail�: %s"
-
-#: ../globals.h:1016
-#, c-format
-msgid "E15: Invalid expression: %s"
-msgstr "E15: Slonn neamhbhail�: %s"
-
-#: ../globals.h:1017
-msgid "E16: Invalid range"
-msgstr "E16: Raon neamhbhail�"
-
-#: ../globals.h:1018
-msgid "E476: Invalid command"
-msgstr "E476: Ord� neamhbhail�"
-
-#: ../globals.h:1019
-#, c-format
-msgid "E17: \"%s\" is a directory"
-msgstr "E17: is comhadlann \"%s\""
-
-#: ../globals.h:1020
-#, fuzzy
-msgid "E900: Invalid job id"
-msgstr "E49: M�id neamhbhail� scrollaithe"
-
-#: ../globals.h:1021
-msgid "E901: Job table is full"
+msgid "E232: Cannot create BalloonEval with both message and callback"
 msgstr ""
+"E232: N� f�idir BalloonEval a chruth� le teachtaireacht agus aisghlaoch araon"
 
-#: ../globals.h:1024
-#, c-format
-msgid "E364: Library call failed for \"%s()\""
-msgstr "E364: Theip ar ghlao leabharlainne \"%s()\""
+msgid "_Cancel"
+msgstr "_Cealaigh"
 
-#: ../globals.h:1026
-msgid "E19: Mark has invalid line number"
-msgstr "E19: T� l�ne-uimhir neamhbhail� ag an mharc"
+msgid "_Save"
+msgstr "_S�bh�il"
 
-#: ../globals.h:1027
-msgid "E20: Mark not set"
-msgstr "E20: Marc gan socr�"
+msgid "_Open"
+msgstr "_Oscail"
 
-#: ../globals.h:1029
-msgid "E21: Cannot make changes, 'modifiable' is off"
+msgid "_OK"
+msgstr "_OK"
+
+msgid ""
+"&Yes\n"
+"&No\n"
+"&Cancel"
 msgstr ""
-"E21: N� f�idir athruithe a chur i bhfeidhm, n�l an bhratach 'modifiable' "
-"socraithe"
+"&T�\n"
+"&N�l\n"
+"&Cealaigh"
 
-#: ../globals.h:1030
-msgid "E22: Scripts nested too deep"
-msgstr "E22: scripteanna neadaithe r�dhomhain"
+msgid "Yes"
+msgstr "T�"
 
-#: ../globals.h:1031
-msgid "E23: No alternate file"
-msgstr "E23: N�l aon chomhad malartach"
+msgid "No"
+msgstr "N�l"
 
-#: ../globals.h:1032
-msgid "E24: No such abbreviation"
-msgstr "E24: N�l a leith�id de ghiorr�ch�n ann"
+msgid "Input _Methods"
+msgstr "_Modhanna ionchuir"
 
-#: ../globals.h:1033
-msgid "E477: No ! allowed"
-msgstr "E477: N� cheada�tear !"
+# in OLT --KPS
+msgid "VIM - Search and Replace..."
+msgstr "VIM - Cuardaigh agus Athchuir..."
 
-#: ../globals.h:1035
-msgid "E25: Nvim does not have a built-in GUI"
-msgstr "E25: N� f�idir an GUI a �s�id: N�or cumasa�odh � ag am tiomsaithe"
+msgid "VIM - Search..."
+msgstr "VIM - Cuardaigh..."
+
+msgid "Find what:"
+msgstr "Aimsigh:"
+
+msgid "Replace with:"
+msgstr "Le cur in ionad:"
+
+#. whole word only button
+msgid "Match whole word only"
+msgstr "Focal ioml�n amh�in"
+
+#. match case button
+msgid "Match case"
+msgstr "Meaitse�il an c�s"
+
+msgid "Direction"
+msgstr "Treo"
+
+#. 'Up' and 'Down' buttons
+msgid "Up"
+msgstr "Suas"
+
+msgid "Down"
+msgstr "S�os"
+
+msgid "Find Next"
+msgstr "An Ch�ad Cheann Eile"
+
+msgid "Replace"
+msgstr "Ionadaigh"
+
+msgid "Replace All"
+msgstr "Ionadaigh Uile"
+
+msgid "_Close"
+msgstr "_D�n"
+
+msgid "Vim: Received \"die\" request from session manager\n"
+msgstr "Vim: Fuarthas iarratas \"die\" � bhainisteoir an tseisi�in\n"
+
+msgid "Close tab"
+msgstr "D�n cluais�n"
+
+msgid "New tab"
+msgstr "Cluais�n nua"
+
+msgid "Open Tab..."
+msgstr "Oscail Cluais�n..."
+
+msgid "Vim: Main window unexpectedly destroyed\n"
+msgstr "Vim: Milleadh an pr�omhfhuinneog gan choinne\n"
+
+msgid "&Filter"
+msgstr "&Scagaire"
+
+msgid "&Cancel"
+msgstr "&Cealaigh"
+
+msgid "Directories"
+msgstr "Comhadlanna"
+
+msgid "Filter"
+msgstr "Scagaire"
+
+msgid "&Help"
+msgstr "&Cabhair"
+
+msgid "Files"
+msgstr "Comhaid"
+
+msgid "&OK"
+msgstr "&OK"
+
+msgid "Selection"
+msgstr "Roghn�"
+
+msgid "Find &Next"
+msgstr "An Ch�ad Chea&nn Eile"
+
+msgid "&Replace"
+msgstr "&Ionadaigh"
+
+msgid "Replace &All"
+msgstr "Ionadaigh &Uile"
+
+msgid "&Undo"
+msgstr "&Cealaigh"
+
+msgid "Open tab..."
+msgstr "Oscail cluais�n..."
+
+msgid "Find string (use '\\\\' to find  a '\\')"
+msgstr "Aimsigh teaghr�n (bain �s�id as '\\\\' chun '\\' a aimsi�)"
+
+msgid "Find & Replace (use '\\\\' to find  a '\\')"
+msgstr "Aimsigh & Athchuir (�s�id '\\\\' chun '\\' a aimsi�)"
+
+#. We fake this: Use a filter that doesn't select anything and a default
+#. * file name that won't be used.
+msgid "Not Used"
+msgstr "Gan �s�id"
+
+msgid "Directory\t*.nothing\n"
+msgstr "Comhadlann\t*.neamhn�\n"
 
-#: ../globals.h:1036
 #, c-format
-msgid "E28: No such highlight group name: %s"
-msgstr "E28: N�l a leith�id d'ainm gr�pa aibhsithe: %s"
+msgid "E671: Cannot find window title \"%s\""
+msgstr "E671: N� f�idir teideal na fuinneoige \"%s\" a aimsi�"
 
-#: ../globals.h:1037
-msgid "E29: No inserted text yet"
-msgstr "E29: N�l aon t�acs ions�ite go dt� seo"
-
-#: ../globals.h:1038
-msgid "E30: No previous command line"
-msgstr "E30: N�l aon l�ne na n-orduithe roimhe seo"
-
-#: ../globals.h:1039
-msgid "E31: No such mapping"
-msgstr "E31: N�l a leith�id de mhap�il"
-
-#: ../globals.h:1040
-msgid "E479: No match"
-msgstr "E479: N�l aon rud comhoiri�nach ann"
-
-#: ../globals.h:1041
 #, c-format
-msgid "E480: No match: %s"
-msgstr "E480: N�l aon rud comhoiri�nach ann: %s"
+msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
+msgstr "E243: Arg�int gan taca�ocht: \"-%s\"; Bain �s�id as an leagan OLE."
 
-#: ../globals.h:1042
-msgid "E32: No file name"
-msgstr "E32: N�l aon ainm comhaid"
+msgid "E672: Unable to open window inside MDI application"
+msgstr "E672: N� f�idir fuinneog a oscailt isteach i bhfeidhmchl�r MDI"
 
-#: ../globals.h:1044
-msgid "E33: No previous substitute regular expression"
-msgstr "E33: N�l aon slonn ionada�ochta roimhe seo"
+msgid "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
+msgstr ""
+"Vim E458: N� f�idir iontr�il dathmhap�la a dh�ileadh, is f�idir go mbeidh "
+"dathanna m�chearta ann"
 
-#: ../globals.h:1045
-msgid "E34: No previous command"
-msgstr "E34: N�l aon ord� roimhe seo"
-
-#: ../globals.h:1046
-msgid "E35: No previous regular expression"
-msgstr "E35: N�l aon slonn ionada�ochta roimhe seo"
-
-#: ../globals.h:1047
-msgid "E481: No range allowed"
-msgstr "E481: N� cheada�tear raon"
-
-#: ../globals.h:1048
-msgid "E36: Not enough room"
-msgstr "E36: N�l sl� a dh�thain ann"
-
-#: ../globals.h:1049
 #, c-format
-msgid "E482: Can't create file %s"
-msgstr "E482: N� f�idir comhad %s a chruth�"
+msgid "E250: Fonts for the following charsets are missing in fontset %s:"
+msgstr ""
+"E250: Cl�nna ar iarraidh le haghaidh na dtacar carachtar i dtacar cl� %s:"
 
-#: ../globals.h:1050
-msgid "E483: Can't get temp file name"
-msgstr "E483: N�l aon fh�il ar ainm comhaid sealadach"
-
-#: ../globals.h:1051
 #, c-format
-msgid "E484: Can't open file %s"
-msgstr "E484: N� f�idir comhad %s a oscailt"
+msgid "E252: Fontset name: %s"
+msgstr "E252: Ainm an tacar cl�: %s"
 
-#: ../globals.h:1052
 #, c-format
-msgid "E485: Can't read file %s"
-msgstr "E485: N� f�idir comhad %s a l�amh"
+msgid "Font '%s' is not fixed-width"
+msgstr "N� cl� aonleithid � '%s'"
 
-#: ../globals.h:1054
-msgid "E37: No write since last change (add ! to override)"
-msgstr "E37: T� athruithe ann gan s�bh�il (cuir ! leis an ord� chun s�r�)"
-
-#: ../globals.h:1055
-#, fuzzy
-msgid "E37: No write since last change"
-msgstr "[Athraithe agus nach s�bh�ilte � shin]\n"
-
-#: ../globals.h:1056
-msgid "E38: Null argument"
-msgstr "E38: Arg�int nialasach"
-
-#: ../globals.h:1057
-msgid "E39: Number expected"
-msgstr "E39: Ag s�il le huimhir"
-
-#: ../globals.h:1058
 #, c-format
-msgid "E40: Can't open errorfile %s"
-msgstr "E40: N� f�idir an comhad earr�ide %s a oscailt"
+msgid "E253: Fontset name: %s"
+msgstr "E253: Ainm an tacar cl�: %s"
 
-#: ../globals.h:1059
-msgid "E41: Out of memory!"
-msgstr "E41: Cuimhne �dithe!"
-
-#: ../globals.h:1060
-msgid "Pattern not found"
-msgstr "Patr�n gan aimsi�"
-
-#: ../globals.h:1061
 #, c-format
-msgid "E486: Pattern not found: %s"
-msgstr "E486: Patr�n gan aimsi�: %s"
+msgid "Font0: %s"
+msgstr "Cl�0: %s"
 
-#: ../globals.h:1062
-msgid "E487: Argument must be positive"
-msgstr "E487: N� fol�ir arg�int dheimhneach"
-
-#: ../globals.h:1064
-msgid "E459: Cannot go back to previous directory"
-msgstr "E459: N� f�idir a fhilleadh ar an chomhadlann roimhe seo"
-
-#: ../globals.h:1066
-msgid "E42: No Errors"
-msgstr "E42: N�l Aon Earr�id Ann"
-
-#: ../globals.h:1067
-msgid "E776: No location list"
-msgstr "E776: Gan liosta su�omh"
-
-#: ../globals.h:1068
-msgid "E43: Damaged match string"
-msgstr "E43: Teaghr�n cuardaigh loite"
-
-#: ../globals.h:1069
-msgid "E44: Corrupted regexp program"
-msgstr "E44: Cl�r na sloinn ionada�ochta truaillithe"
-
-#: ../globals.h:1071
-msgid "E45: 'readonly' option is set (add ! to override)"
-msgstr "E45: t� an rogha 'readonly' socraithe (cuir ! leis an ord� chun s�r�)"
-
-#: ../globals.h:1073
 #, c-format
-msgid "E46: Cannot change read-only variable \"%s\""
-msgstr "E46: N� f�idir athr�g inl�ite amh�in \"%s\" a athr�"
+msgid "Font1: %s"
+msgstr "Cl�1: %s"
 
-#: ../globals.h:1075
 #, c-format
-msgid "E794: Cannot set variable in the sandbox: \"%s\""
-msgstr "E794: N� f�idir athr�g a shocr� sa bhosca gainimh: \"%s\""
+msgid "Font%ld width is not twice that of font0"
+msgstr "N�l Cl�%ld n�os leithne faoi dh� n� cl�0"
 
-#: ../globals.h:1076
-msgid "E47: Error while reading errorfile"
-msgstr "E47: Earr�id agus comhad earr�ide � l�amh"
-
-#: ../globals.h:1078
-msgid "E48: Not allowed in sandbox"
-msgstr "E48: N� cheada�tear � seo i mbosca gainimh"
-
-#: ../globals.h:1080
-msgid "E523: Not allowed here"
-msgstr "E523: N� cheada�tear � anseo"
-
-#: ../globals.h:1082
-msgid "E359: Screen mode setting not supported"
-msgstr "E359: N� f�idir an m�d sc�ile�in a shocr�"
-
-#: ../globals.h:1083
-msgid "E49: Invalid scroll size"
-msgstr "E49: M�id neamhbhail� scrollaithe"
-
-#: ../globals.h:1084
-msgid "E91: 'shell' option is empty"
-msgstr "E91: rogha 'shell' folamh"
-
-#: ../globals.h:1085
-msgid "E255: Couldn't read in sign data!"
-msgstr "E255: N�orbh fh�idir na sonra� comhartha a l�amh!"
-
-#: ../globals.h:1086
-msgid "E72: Close error on swap file"
-msgstr "E72: Earr�id agus comhad babht�la � dh�nadh"
-
-#: ../globals.h:1087
-msgid "E73: tag stack empty"
-msgstr "E73: t� cruach na gclibeanna folamh"
-
-#: ../globals.h:1088
-msgid "E74: Command too complex"
-msgstr "E74: Ord� r�chasta"
-
-#: ../globals.h:1089
-msgid "E75: Name too long"
-msgstr "E75: Ainm r�fhada"
-
-#: ../globals.h:1090
-msgid "E76: Too many ["
-msgstr "E76: an iomarca ["
-
-#: ../globals.h:1091
-msgid "E77: Too many file names"
-msgstr "E77: An iomarca ainmneacha comhaid"
-
-#: ../globals.h:1092
-msgid "E488: Trailing characters"
-msgstr "E488: Carachtair chun deiridh"
-
-#: ../globals.h:1093
-msgid "E78: Unknown mark"
-msgstr "E78: Marc anaithnid"
-
-#: ../globals.h:1094
-msgid "E79: Cannot expand wildcards"
-msgstr "E79: N� f�idir saor�ga a leathn�"
-
-#: ../globals.h:1096
-msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
-msgstr "E591: n� cheada�tear 'winheight' a bheith n�os l� n� 'winminheight'"
-
-#: ../globals.h:1098
-msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
-msgstr "E592: n� cheada�tear 'winwidth' a bheith n�os l� n� 'winminwidth'"
-
-#: ../globals.h:1099
-msgid "E80: Error while writing"
-msgstr "E80: Earr�id agus � scr�obh"
-
-#: ../globals.h:1100
-msgid "Zero count"
-msgstr "Nialas"
-
-#: ../globals.h:1101
-msgid "E81: Using <SID> not in a script context"
-msgstr "E81: <SID> � �s�id nach i gcomhth�acs scripte"
-
-#: ../globals.h:1102
 #, c-format
-msgid "E685: Internal error: %s"
-msgstr "E685: Earr�id inmhe�nach: %s"
+msgid "Font0 width: %ld"
+msgstr "Leithead Cl�0: %ld"
 
-#: ../globals.h:1104
-msgid "E363: pattern uses more memory than 'maxmempattern'"
-msgstr "E363: �s�ideann an patr�n n�os m� cuimhne n� 'maxmempattern'"
-
-#: ../globals.h:1105
-msgid "E749: empty buffer"
-msgstr "E749: maol�n folamh"
-
-#: ../globals.h:1108
-msgid "E682: Invalid search pattern or delimiter"
-msgstr "E682: Patr�n n� teormharc�ir neamhbhail� cuardaigh"
-
-#: ../globals.h:1109
-msgid "E139: File is loaded in another buffer"
-msgstr "E139: T� an comhad luchtaithe i maol�n eile"
-
-#: ../globals.h:1110
 #, c-format
-msgid "E764: Option '%s' is not set"
-msgstr "E764: Rogha '%s' gan socr�"
+msgid "Font1 width: %ld"
+msgstr "Leithead cl�1: %ld"
 
-#: ../globals.h:1111
-#, fuzzy
-msgid "E850: Invalid register name"
-msgstr "E354: Ainm neamhbhail� tabhaill: '%s'"
+msgid "Invalid font specification"
+msgstr "Sonr� neamhbhail� cl�"
 
-#: ../globals.h:1114
-msgid "search hit TOP, continuing at BOTTOM"
-msgstr "Buaileadh an BARR le linn an chuardaigh, ag lean�int ag an CHR�OCH"
+msgid "&Dismiss"
+msgstr "&Ruaig"
 
-#: ../globals.h:1115
-msgid "search hit BOTTOM, continuing at TOP"
-msgstr "Buaileadh an BUN le linn an chuardaigh, ag lean�int ag an BHARR"
+msgid "no specific match"
+msgstr "n�l a leith�id ann"
+
+msgid "Vim - Font Selector"
+msgstr "Vim - Roghn� Cl�"
+
+msgid "Name:"
+msgstr "Ainm:"
+
+#. create toggle button
+msgid "Show size in Points"
+msgstr "Taispe�in m�id (Point�)"
+
+msgid "Encoding:"
+msgstr "Ionch�d�:"
+
+msgid "Font:"
+msgstr "Cl�:"
+
+msgid "Style:"
+msgstr "St�l:"
+
+msgid "Size:"
+msgstr "M�id:"
+
+msgid "E256: Hangul automata ERROR"
+msgstr "E256: EARR�ID leis na huathoibre�in Hangul"
 
-#: ../hardcopy.c:240
 msgid "E550: Missing colon"
 msgstr "E550: Idirstad ar iarraidh"
 
-#: ../hardcopy.c:252
 msgid "E551: Illegal component"
 msgstr "E551: Comhph�irt neamhcheadaithe"
 
-#: ../hardcopy.c:259
 msgid "E552: digit expected"
 msgstr "E552: ag s�il le digit"
 
-#: ../hardcopy.c:473
 #, c-format
 msgid "Page %d"
 msgstr "Leathanach %d"
 
-#: ../hardcopy.c:597
 msgid "No text to be printed"
 msgstr "N�l aon t�acs le priont�il"
 
-#: ../hardcopy.c:668
 #, c-format
 msgid "Printing page %d (%d%%)"
 msgstr "Leathanach %d (%d%%) � phriont�il"
 
-#: ../hardcopy.c:680
 #, c-format
 msgid " Copy %d of %d"
 msgstr " C�ip %d de %d"
 
-#: ../hardcopy.c:733
 #, c-format
 msgid "Printed: %s"
 msgstr "Priont�ilte: %s"
 
-#: ../hardcopy.c:740
 msgid "Printing aborted"
 msgstr "Priont�il tobscortha"
 
-#: ../hardcopy.c:1365
 msgid "E455: Error writing to PostScript output file"
 msgstr "E455: Earr�id le linn scr�obh chuig aschomhad PostScript"
 
-#: ../hardcopy.c:1747
 #, c-format
 msgid "E624: Can't open file \"%s\""
 msgstr "E624: N� f�idir an comhad \"%s\" a oscailt"
 
-#: ../hardcopy.c:1756 ../hardcopy.c:2470
 #, c-format
 msgid "E457: Can't read PostScript resource file \"%s\""
 msgstr "E457: N� f�idir comhad acmhainne PostScript \"%s\" a l�amh"
 
-#: ../hardcopy.c:1772
 #, c-format
 msgid "E618: file \"%s\" is not a PostScript resource file"
 msgstr "E618: N�l comhad \"%s\" ina chomhad acmhainne PostScript"
 
-#: ../hardcopy.c:1788 ../hardcopy.c:1805 ../hardcopy.c:1844
 #, c-format
 msgid "E619: file \"%s\" is not a supported PostScript resource file"
 msgstr "E619: T� \"%s\" ina chomhad acmhainne PostScript gan tac�"
 
-#: ../hardcopy.c:1856
 #, c-format
 msgid "E621: \"%s\" resource file has wrong version"
 msgstr "E621: T� an leagan m�cheart ar an gcomhad acmhainne \"%s\""
 
-#: ../hardcopy.c:2225
 msgid "E673: Incompatible multi-byte encoding and character set."
 msgstr "E673: Ionch�d� agus tacar carachtar ilbhirt neamh-chomhoiri�nach."
 
-#: ../hardcopy.c:2238
 msgid "E674: printmbcharset cannot be empty with multi-byte encoding."
 msgstr ""
 "E674: n� cheada�tear printmbcharset a bheith folamh le hionch�d� ilbhirt."
 
-#: ../hardcopy.c:2254
 msgid "E675: No default font specified for multi-byte printing."
 msgstr "E675: N�or r�amhshocra�odh cl� le haghaidh priont�la ilbhirt."
 
-#: ../hardcopy.c:2426
 msgid "E324: Can't open PostScript output file"
 msgstr "E324: N� f�idir aschomhad PostScript a oscailt"
 
-#: ../hardcopy.c:2458
 #, c-format
 msgid "E456: Can't open file \"%s\""
 msgstr "E456: N� f�idir an comhad \"%s\" a oscailt"
 
-#: ../hardcopy.c:2583
 msgid "E456: Can't find PostScript resource file \"prolog.ps\""
 msgstr "E456: Comhad acmhainne PostScript \"prolog.ps\" gan aimsi�"
 
-#: ../hardcopy.c:2593
 msgid "E456: Can't find PostScript resource file \"cidfont.ps\""
 msgstr "E456: Comhad acmhainne PostScript \"cidfont.ps\" gan aimsi�"
 
-#: ../hardcopy.c:2622 ../hardcopy.c:2639 ../hardcopy.c:2665
 #, c-format
 msgid "E456: Can't find PostScript resource file \"%s.ps\""
 msgstr "E456: Comhad acmhainne PostScript \"%s.ps\" gan aimsi�"
 
-#: ../hardcopy.c:2654
 #, c-format
 msgid "E620: Unable to convert to print encoding \"%s\""
 msgstr "E620: N� f�idir an t-ionch�d� priont�la \"%s\" a thiont�"
 
-#: ../hardcopy.c:2877
 msgid "Sending to printer..."
 msgstr "� sheoladh chuig an phrint�ir..."
 
-#: ../hardcopy.c:2881
 msgid "E365: Failed to print PostScript file"
 msgstr "E365: Theip ar phriont�il comhaid PostScript"
 
-#: ../hardcopy.c:2883
 msgid "Print job sent."
 msgstr "Seoladh jab priont�la."
 
-#: ../if_cscope.c:85
 msgid "Add a new database"
 msgstr "Bunachar sonra� nua"
 
-#: ../if_cscope.c:87
 msgid "Query for a pattern"
 msgstr "Iarratas ar phatr�n"
 
-#: ../if_cscope.c:89
 msgid "Show this message"
 msgstr "Taispe�in an teachtaireacht seo"
 
-#: ../if_cscope.c:91
 msgid "Kill a connection"
 msgstr "Maraigh nasc"
 
-#: ../if_cscope.c:93
 msgid "Reinit all connections"
 msgstr "At�saigh gach nasc"
 
-#: ../if_cscope.c:95
 msgid "Show connections"
 msgstr "Taispe�in naisc"
 
-#: ../if_cscope.c:101
 #, c-format
 msgid "E560: Usage: cs[cope] %s"
 msgstr "E560: �s�id: cs[cope] %s"
 
-#: ../if_cscope.c:225
 msgid "This cscope command does not support splitting the window.\n"
 msgstr "N� f�idir fuinneoga a scoilteadh leis an ord� seo `cscope'.\n"
 
-#: ../if_cscope.c:266
 msgid "E562: Usage: cstag <ident>"
 msgstr "E562: �s�id: cstag <ident>"
 
-#: ../if_cscope.c:313
 msgid "E257: cstag: tag not found"
 msgstr "E257: cstag: clib gan aimsi�"
 
-#: ../if_cscope.c:461
 #, c-format
 msgid "E563: stat(%s) error: %d"
 msgstr "E563: earr�id stat(%s): %d"
 
-#: ../if_cscope.c:551
+msgid "E563: stat error"
+msgstr "E563: earr�id stat"
+
 #, c-format
 msgid "E564: %s is not a directory or a valid cscope database"
 msgstr "E564: N�l %s ina comhadlann n� bunachar sonra� cscope bail�"
 
-#: ../if_cscope.c:566
 #, c-format
 msgid "Added cscope database %s"
 msgstr "Bunachar sonra� nua cscope: %s"
 
-#: ../if_cscope.c:616
 #, c-format
-msgid "E262: error reading cscope connection %<PRId64>"
-msgstr "E262: earr�id agus an nasc cscope %<PRId64> � l�amh"
+msgid "E262: error reading cscope connection %ld"
+msgstr "E262: earr�id agus an nasc cscope %ld � l�amh"
 
-#: ../if_cscope.c:711
 msgid "E561: unknown cscope search type"
 msgstr "E561: cine�l anaithnid cuardaigh cscope"
 
-#: ../if_cscope.c:752 ../if_cscope.c:789
 msgid "E566: Could not create cscope pipes"
 msgstr "E566: N�orbh fh�idir p�opa� cscope a chruth�"
 
-#: ../if_cscope.c:767
 msgid "E622: Could not fork for cscope"
 msgstr "E622: N�orbh fh�idir forc a dh�anamh le haghaidh cscope"
 
-#: ../if_cscope.c:849
-#, fuzzy
 msgid "cs_create_connection setpgid failed"
-msgstr "theip ar rith cs_create_connection"
+msgstr "theip ar setpgid do cs_create_connection"
 
-#: ../if_cscope.c:853 ../if_cscope.c:889
 msgid "cs_create_connection exec failed"
 msgstr "theip ar rith cs_create_connection"
 
-#: ../if_cscope.c:863 ../if_cscope.c:902
 msgid "cs_create_connection: fdopen for to_fp failed"
 msgstr "cs_create_connection: theip ar fdopen le haghaidh to_fp"
 
-#: ../if_cscope.c:865 ../if_cscope.c:906
 msgid "cs_create_connection: fdopen for fr_fp failed"
 msgstr "cs_create_connection: theip ar fdopen le haghaidh fr_fp"
 
-#: ../if_cscope.c:890
 msgid "E623: Could not spawn cscope process"
 msgstr "E623: N�orbh fh�idir pr�iseas cscope a sceitheadh"
 
-#: ../if_cscope.c:932
 msgid "E567: no cscope connections"
 msgstr "E567: n�l aon nasc cscope ann"
 
-#: ../if_cscope.c:1009
 #, c-format
 msgid "E469: invalid cscopequickfix flag %c for %c"
 msgstr "E469: bratach neamhbhail� cscopequickfix %c le haghaidh %c"
 
-#: ../if_cscope.c:1058
 #, c-format
 msgid "E259: no matches found for cscope query %s of %s"
 msgstr ""
 "E259: n�or aims�odh aon rud comhoiri�nach leis an iarratas cscope %s de %s"
 
-#: ../if_cscope.c:1142
 msgid "cscope commands:\n"
 msgstr "Orduithe cscope:\n"
 
-#: ../if_cscope.c:1150
 #, c-format
 msgid "%-5s: %s%*s (Usage: %s)"
 msgstr "%-5s: %s%*s (�s�id: %s)"
 
-#: ../if_cscope.c:1155
-#, fuzzy
 msgid ""
 "\n"
+"       a: Find assignments to this symbol\n"
 "       c: Find functions calling this function\n"
 "       d: Find functions called by this function\n"
 "       e: Find this egrep pattern\n"
@@ -3241,6 +2576,7 @@ msgid ""
 "       t: Find this text string\n"
 msgstr ""
 "\n"
+"       a: Aimsigh r�itis sannach�in leis an tsiombail seo\n"
 "       c: Aimsigh feidhmeanna a chuireann glaoch ar an bhfeidhm seo\n"
 "       d: Aimsigh feidhmeanna a gcuireann an fheidhm seo glaoch orthu\n"
 "       e: Aimsigh an patr�n egrep seo\n"
@@ -3248,33 +2584,34 @@ msgstr ""
 "       g: Aimsigh an sainmh�ni� seo\n"
 "       i: Aimsigh comhaid a #include-�il an comhad seo\n"
 "       s: Aimsigh an tsiombail C seo\n"
-"       t: Aimsigh sannta� do\n"
+"       t: Aimsigh an teaghr�n t�acs seo\n"
+
+#, c-format
+msgid "E625: cannot open cscope database: %s"
+msgstr "E625: n� f�idir bunachar sonra� cscope a oscailt: %s"
+
+msgid "E626: cannot get cscope database information"
+msgstr "E626: n� f�idir eolas a fh�il faoin bhunachar sonra� cscope"
 
-#: ../if_cscope.c:1226
 msgid "E568: duplicate cscope database not added"
 msgstr "E568: n�or cuireadh bunachar sonra� d�blach cscope leis"
 
-#: ../if_cscope.c:1335
 #, c-format
 msgid "E261: cscope connection %s not found"
 msgstr "E261: nasc cscope %s gan aimsi�"
 
-#: ../if_cscope.c:1364
 #, c-format
 msgid "cscope connection %s closed"
 msgstr "D�nadh nasc cscope %s"
 
 #. should not reach here
-#: ../if_cscope.c:1486
 msgid "E570: fatal error in cs_manage_matches"
 msgstr "E570: earr�id mharfach i cs_manage_matches"
 
-#: ../if_cscope.c:1693
 #, c-format
 msgid "Cscope tag: %s"
 msgstr "Clib cscope: %s"
 
-#: ../if_cscope.c:1711
 msgid ""
 "\n"
 "   #   line"
@@ -3282,88 +2619,301 @@ msgstr ""
 "\n"
 "   #   l�ne"
 
-#: ../if_cscope.c:1713
 msgid "filename / context / line\n"
 msgstr "ainm comhaid / comhth�acs / l�ne\n"
 
-#: ../if_cscope.c:1809
 #, c-format
 msgid "E609: Cscope error: %s"
 msgstr "E609: Earr�id cscope: %s"
 
-#: ../if_cscope.c:2053
 msgid "All cscope databases reset"
 msgstr "Athshocra�odh gach bunachar sonra� cscope"
 
-#: ../if_cscope.c:2123
 msgid "no cscope connections\n"
 msgstr "n�l aon nasc cscope\n"
 
-#: ../if_cscope.c:2126
 msgid " # pid    database name                       prepend path\n"
 msgstr " # pid    ainm bunachair                       conair thosaigh\n"
 
-#: ../main.c:144
+msgid "Lua library cannot be loaded."
+msgstr "N� f�idir an leabharlann Lua a lucht�."
+
+msgid "cannot save undo information"
+msgstr "n� f�idir eolas cealaithe a sh�bh�il"
+
+msgid ""
+"E815: Sorry, this command is disabled, the MzScheme libraries could not be "
+"loaded."
+msgstr ""
+"E815: T� br�n orm, bh� an t-ord� seo d�chumasaithe, n�orbh fh�idir "
+"leabharlanna MzScheme a lucht�."
+
+msgid ""
+"E895: Sorry, this command is disabled, the MzScheme's racket/base module "
+"could not be loaded."
+msgstr ""
+"E895: �r leithsc�al, t� an t-ord� seo d�chumasaithe; n�orbh fh�idir "
+"mod�l racket/base MzScheme a lucht�."
+
+msgid "invalid expression"
+msgstr "slonn neamhbhail�"
+
+msgid "expressions disabled at compile time"
+msgstr "d�chumasa�odh sloinn ag am an tiomsaithe"
+
+msgid "hidden option"
+msgstr "rogha fholaithe"
+
+msgid "unknown option"
+msgstr "rogha anaithnid"
+
+msgid "window index is out of range"
+msgstr "inn�acs fuinneoige as raon"
+
+msgid "couldn't open buffer"
+msgstr "n� f�idir maol�n a oscailt"
+
+msgid "cannot delete line"
+msgstr "n� f�idir an l�ne a scriosadh"
+
+msgid "cannot replace line"
+msgstr "n� f�idir an l�ne a athchur"
+
+msgid "cannot insert line"
+msgstr "n� f�idir l�ne a ions�"
+
+msgid "string cannot contain newlines"
+msgstr "n� cheada�tear carachtair l�ne nua sa teaghr�n"
+
+msgid "error converting Scheme values to Vim"
+msgstr "earr�id agus luach Scheme � thiont� go Vim"
+
+msgid "Vim error: ~a"
+msgstr "earr�id Vim: ~a"
+
+msgid "Vim error"
+msgstr "earr�id Vim"
+
+msgid "buffer is invalid"
+msgstr "maol�n neamhbhail�"
+
+msgid "window is invalid"
+msgstr "fuinneog neamhbhail�"
+
+msgid "linenr out of range"
+msgstr "l�ne-uimhir as raon"
+
+msgid "not allowed in the Vim sandbox"
+msgstr "n� cheada�tear � seo i mbosca gainimh Vim"
+
+msgid "E836: This Vim cannot execute :python after using :py3"
+msgstr ""
+"E836: N� f�idir leis an leagan seo de Vim :python a rith tar �is :py3 a �s�id"
+
+msgid ""
+"E263: Sorry, this command is disabled, the Python library could not be "
+"loaded."
+msgstr ""
+"E263: T� br�n orm, n�l an t-ord� seo le f�il, n�orbh fh�idir an leabharlann "
+"Python a lucht�."
+
+msgid ""
+"E887: Sorry, this command is disabled, the Python's site module could not be "
+"loaded."
+msgstr ""
+"E887: �r leithsc�al, n�l an t-ord� seo le f�il, n�orbh fh�idir an mod�l "
+"Python a lucht�."
+
+msgid "E659: Cannot invoke Python recursively"
+msgstr "E659: N� f�idir Python a rith go hathch�rsach"
+
+msgid "E837: This Vim cannot execute :py3 after using :python"
+msgstr ""
+"E837: N� f�idir leis an leagan seo de Vim :py3 a rith tar �is :python a �s�id"
+
+msgid "E265: $_ must be an instance of String"
+msgstr "E265: caithfidh $_ a bheith cine�l Teaghr�in"
+
+msgid ""
+"E266: Sorry, this command is disabled, the Ruby library could not be loaded."
+msgstr ""
+"E266: T� br�n orm, n�l an t-ord� seo le f�il, n�orbh fh�idir an leabharlann "
+"Ruby a lucht�."
+
+msgid "E267: unexpected return"
+msgstr "E267: \"return\" gan choinne"
+
+msgid "E268: unexpected next"
+msgstr "E268: \"next\" gan choinne"
+
+msgid "E269: unexpected break"
+msgstr "E269: \"break\" gan choinne"
+
+msgid "E270: unexpected redo"
+msgstr "E270: \"redo\" gan choinne"
+
+msgid "E271: retry outside of rescue clause"
+msgstr "E271: \"retry\" taobh amuigh de chl�sal tarrth�la"
+
+msgid "E272: unhandled exception"
+msgstr "E272: eisceacht gan l�imhse�il"
+
+#, c-format
+msgid "E273: unknown longjmp status %d"
+msgstr "E273: st�das anaithnid longjmp %d"
+
+msgid "invalid buffer number"
+msgstr "uimhir neamhbhail� mhaol�in"
+
+msgid "not implemented yet"
+msgstr "n�l ar f�il"
+
+#. ???
+msgid "cannot set line(s)"
+msgstr "n� f�idir l�n(t)e a shocr�"
+
+msgid "invalid mark name"
+msgstr "ainm neamhbhail� mairc"
+
+msgid "mark not set"
+msgstr "marc gan socr�"
+
+#, c-format
+msgid "row %d column %d"
+msgstr "l�ne %d col�n %d"
+
+msgid "cannot insert/append line"
+msgstr "n� f�idir l�ne a ions�/iarcheangal"
+
+msgid "line number out of range"
+msgstr "l�ne-uimhir as raon"
+
+msgid "unknown flag: "
+msgstr "bratach anaithnid: "
+
+msgid "unknown vimOption"
+msgstr "vimOption anaithnid"
+
+msgid "keyboard interrupt"
+msgstr "idirbhriseadh m�archl�ir"
+
+msgid "vim error"
+msgstr "earr�id vim"
+
+msgid "cannot create buffer/window command: object is being deleted"
+msgstr "n� f�idir ord� maol�in/fuinneoige a chruth�: r�ad � scriosadh"
+
+msgid ""
+"cannot register callback command: buffer/window is already being deleted"
+msgstr "n� f�idir ord� aisghlaoch a chl�r�: maol�n/fuinneog � scriosadh cheana"
+
+#. This should never happen.  Famous last word?
+msgid ""
+"E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-dev@vim."
+"org"
+msgstr ""
+"E280: EARR�ID MHARFACH TCL: liosta truaillithe tagartha!? Seol tuairisc "
+"fhabht chuig <vim-dev@vim.org> le do thoil"
+
+msgid "cannot register callback command: buffer/window reference not found"
+msgstr ""
+"n� f�idir ord� aisghlaoch a chl�r�: tagairt mhaol�n/fhuinneoige gan aimsi�"
+
+msgid ""
+"E571: Sorry, this command is disabled: the Tcl library could not be loaded."
+msgstr ""
+"E571: T� br�n orm, n�l an t-ord� seo le f�il: n�orbh fh�idir an leabharlann "
+"Tcl a lucht�."
+
+#, c-format
+msgid "E572: exit code %d"
+msgstr "E572: c�d scortha %d"
+
+msgid "cannot get line"
+msgstr "n� f�idir an l�ne a fh�il"
+
+msgid "Unable to register a command server name"
+msgstr "N� f�idir ainm fhreastala� ordaithe a chl�r�"
+
+msgid "E248: Failed to send command to the destination program"
+msgstr "E248: Theip ar sheoladh ord� chuig an sprioc-chl�r"
+
+#, c-format
+msgid "E573: Invalid server id used: %s"
+msgstr "E573: Aitheantas neamhbhail� freastala� in �s�id: %s"
+
+msgid "E251: VIM instance registry property is badly formed.  Deleted!"
+msgstr "E251: Air� m�chumtha sa chl�rlann �isc VIM.  Scriosta!"
+
+#, c-format
+msgid "E696: Missing comma in List: %s"
+msgstr "E696: Cam�g ar iarraidh i Liosta: %s"
+
+#, c-format
+msgid "E697: Missing end of List ']': %s"
+msgstr "E697: ']' ar iarraidh ag deireadh liosta: %s"
+
 msgid "Unknown option argument"
 msgstr "Arg�int anaithnid rogha"
 
-#: ../main.c:146
 msgid "Too many edit arguments"
 msgstr "An iomarca arg�int� eagarth�ireachta"
 
-#: ../main.c:148
 msgid "Argument missing after"
 msgstr "Arg�int ar iarraidh i ndiaidh"
 
-#: ../main.c:150
 msgid "Garbage after option argument"
 msgstr "Dramha�l i ndiaidh arg�inte rogha"
 
-#: ../main.c:152
 msgid "Too many \"+command\", \"-c command\" or \"--cmd command\" arguments"
 msgstr ""
 "An iomarca arg�int� den chine�l \"+ord�\", \"-c ord�\" n� \"--cmd ord�\""
 
-#: ../main.c:154
 msgid "Invalid argument for"
 msgstr "Arg�int neamhbhail� do"
 
-#: ../main.c:294
 #, c-format
 msgid "%d files to edit\n"
 msgstr "%d comhad le heagr�\n"
 
-#: ../main.c:1342
+msgid "netbeans is not supported with this GUI\n"
+msgstr "N� thaca�tear le netbeans sa GUI seo\n"
+
+msgid "'-nb' cannot be used: not enabled at compile time\n"
+msgstr "N� f�idir '-nb' a �s�id: n�or cumasa�odh � ag am tiomsaithe\n"
+
+msgid "This Vim was not compiled with the diff feature."
+msgstr "N�or tiomsa�odh an leagan Vim seo le `diff' ar f�il."
+
 msgid "Attempt to open script file again: \""
 msgstr "D�an iarracht ar oscailt na scripte ar�s: \""
 
-#: ../main.c:1350
 msgid "Cannot open for reading: \""
 msgstr "N� f�idir � a oscailt chun l�amh: \""
 
-#: ../main.c:1393
 msgid "Cannot open for script output: \""
 msgstr "N� f�idir a oscailt le haghaidh an aschuir scripte: \""
 
-#: ../main.c:1622
+msgid "Vim: Error: Failure to start gvim from NetBeans\n"
+msgstr "Vim: Earr�id: Theip ar thos� gvim � NetBeans\n"
+
+msgid "Vim: Error: This version of Vim does not run in a Cygwin terminal\n"
+msgstr "Vim: Earr�id: N� f�idir an leagan seo de Vim a rith i dteirmin�al Cygwin\n"
+
 msgid "Vim: Warning: Output is not to a terminal\n"
 msgstr "Vim: Rabhadh: N�l an t-aschur ag dul chuig teirmin�al\n"
 
-#: ../main.c:1624
 msgid "Vim: Warning: Input is not from a terminal\n"
 msgstr "Vim: Rabhadh: N�l an t-ionchur ag teacht � theirmin�al\n"
 
 #. just in case..
-#: ../main.c:1891
 msgid "pre-vimrc command line"
 msgstr "l�ne na n-orduithe pre-vimrc"
 
-#: ../main.c:1964
 #, c-format
 msgid "E282: Cannot read from \"%s\""
 msgstr "E282: N� f�idir l�amh � \"%s\""
 
-#: ../main.c:2149
 msgid ""
 "\n"
 "More info with: \"vim -h\"\n"
@@ -3371,23 +2921,18 @@ msgstr ""
 "\n"
 "Tuilleadh eolais: \"vim -h\"\n"
 
-#: ../main.c:2178
 msgid "[file ..]       edit specified file(s)"
 msgstr "[comhad ..]       cuir na comhaid ceaptha in eagar"
 
-#: ../main.c:2179
 msgid "-               read text from stdin"
 msgstr "-               scr�obh t�acs � stdin"
 
-#: ../main.c:2180
 msgid "-t tag          edit file where tag is defined"
 msgstr "-t tag          cuir an comhad ina bhfuil an chlib in eagar"
 
-#: ../main.c:2181
 msgid "-q [errorfile]  edit file with first error"
 msgstr "-q [comhadearr] cuir comhad leis an ch�ad earr�id in eagar"
 
-#: ../main.c:2187
 msgid ""
 "\n"
 "\n"
@@ -3397,11 +2942,9 @@ msgstr ""
 "\n"
 "�s�id:"
 
-#: ../main.c:2189
 msgid " vim [arguments] "
 msgstr " vim [arg�int�] "
 
-#: ../main.c:2193
 msgid ""
 "\n"
 "   or:"
@@ -3409,7 +2952,14 @@ msgstr ""
 "\n"
 "   n�:"
 
-#: ../main.c:2196
+msgid ""
+"\n"
+"Where case is ignored prepend / to make flag upper case"
+msgstr ""
+"\n"
+"Nuair nach c�s�ogair �, cuir '/' ag tosach na brata� chun � a chur sa ch�s "
+"uachtair"
+
 msgid ""
 "\n"
 "\n"
@@ -3419,194 +2969,338 @@ msgstr ""
 "\n"
 "Arg�int�:\n"
 
-#: ../main.c:2197
 msgid "--\t\t\tOnly file names after this"
 msgstr "--\t\t\tN� cheada�tear ach ainmneacha comhaid i ndiaidh � seo"
 
-#: ../main.c:2199
 msgid "--literal\t\tDon't expand wildcards"
 msgstr "--literal\t\tN� leathnaigh saor�ga"
 
-#: ../main.c:2201
+msgid "-register\t\tRegister this gvim for OLE"
+msgstr "-register\t\tCl�raigh an gvim seo le haghaidh OLE"
+
+msgid "-unregister\t\tUnregister gvim for OLE"
+msgstr "-unregister\t\tD�chl�raigh an gvim seo le haghaidh OLE"
+
+msgid "-g\t\t\tRun using GUI (like \"gvim\")"
+msgstr "-g\t\t\tRith agus �s�id an GUI (mar \"gvim\")"
+
+msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
+msgstr "-f  n�  --nofork\tTulra: N� d�an forc agus an GUI � thos�"
+
 msgid "-v\t\t\tVi mode (like \"vi\")"
 msgstr "-v\t\t\tM�d Vi (mar \"vi\")"
 
-#: ../main.c:2202
 msgid "-e\t\t\tEx mode (like \"ex\")"
 msgstr "-e\t\t\tM�d Ex (mar \"ex\")"
 
-#: ../main.c:2203
 msgid "-E\t\t\tImproved Ex mode"
-msgstr ""
+msgstr "-E\t\t\tM�d Ex feabhsaithe"
 
-#: ../main.c:2204
 msgid "-s\t\t\tSilent (batch) mode (only for \"ex\")"
 msgstr "-s\t\t\tM�d ci�in (baiscphr�ise�la) (do \"ex\" amh�in)"
 
-#: ../main.c:2205
 msgid "-d\t\t\tDiff mode (like \"vimdiff\")"
 msgstr "-d\t\t\tM�d diff (mar \"vimdiff\")"
 
-#: ../main.c:2206
 msgid "-y\t\t\tEasy mode (like \"evim\", modeless)"
 msgstr "-y\t\t\tM�d �asca (mar \"evim\", gan mh�id)"
 
-#: ../main.c:2207
 msgid "-R\t\t\tReadonly mode (like \"view\")"
 msgstr "-R\t\t\tM�d inl�ite amh�in (mar \"view\")"
 
-#: ../main.c:2208
 msgid "-Z\t\t\tRestricted mode (like \"rvim\")"
 msgstr "-Z\t\t\tM�d srianta (mar \"rvim\")"
 
-#: ../main.c:2209
 msgid "-m\t\t\tModifications (writing files) not allowed"
 msgstr "-m\t\t\tN� cheada�tear athruithe (.i. scr�obh na gcomhad)"
 
-#: ../main.c:2210
 msgid "-M\t\t\tModifications in text not allowed"
 msgstr "-M\t\t\tN� cheada�tear athruithe sa t�acs"
 
-#: ../main.c:2211
 msgid "-b\t\t\tBinary mode"
 msgstr "-b\t\t\tM�d d�n�rtha"
 
-#: ../main.c:2212
 msgid "-l\t\t\tLisp mode"
 msgstr "-l\t\t\tM�d Lisp"
 
-#: ../main.c:2213
 msgid "-C\t\t\tCompatible with Vi: 'compatible'"
 msgstr "-C\t\t\tComhoiri�nach le Vi: 'compatible'"
 
-#: ../main.c:2214
 msgid "-N\t\t\tNot fully Vi compatible: 'nocompatible'"
 msgstr "-N\t\t\tN� comhoiri�naithe le Vi go hioml�n: 'nocompatible'"
 
-#: ../main.c:2215
 msgid "-V[N][fname]\t\tBe verbose [level N] [log messages to fname]"
 msgstr ""
 "-V[N][fname]\t\tB� foclach [leibh�al N] [log�il teachtaireachta� i fname]"
 
-#: ../main.c:2216
 msgid "-D\t\t\tDebugging mode"
 msgstr "-D\t\t\tM�d d�fhabhtaithe"
 
-#: ../main.c:2217
 msgid "-n\t\t\tNo swap file, use memory only"
 msgstr "-n\t\t\tN� h�s�id comhad babht�la .i. n� h�s�id ach an chuimhne"
 
-#: ../main.c:2218
 msgid "-r\t\t\tList swap files and exit"
 msgstr "-r\t\t\tTaispe�in comhaid bhabht�la agus scoir"
 
-#: ../main.c:2219
 msgid "-r (with file name)\tRecover crashed session"
 msgstr "-r (le hainm comhaid)\tAthshl�naigh � chliseadh"
 
-#: ../main.c:2220
 msgid "-L\t\t\tSame as -r"
 msgstr "-L\t\t\tAr comhbhr� le -r"
 
-#: ../main.c:2221
+msgid "-f\t\t\tDon't use newcli to open window"
+msgstr "-f\t\t\tN� h�s�id newcli chun fuinneog a oscailt"
+
+msgid "-dev <device>\t\tUse <device> for I/O"
+msgstr "-dev <gl�as>\t\tBain �s�id as <gl�as> do I/A"
+
 msgid "-A\t\t\tstart in Arabic mode"
 msgstr "-A\t\t\ttosaigh sa mh�d Araibise"
 
-#: ../main.c:2222
 msgid "-H\t\t\tStart in Hebrew mode"
 msgstr "-H\t\t\tTosaigh sa mh�d Eabhraise"
 
-#: ../main.c:2223
 msgid "-F\t\t\tStart in Farsi mode"
 msgstr "-F\t\t\tTosaigh sa mh�d Pheirsise"
 
-#: ../main.c:2224
 msgid "-T <terminal>\tSet terminal type to <terminal>"
 msgstr "-T <teirmin�al>\tSocraigh cine�l teirmin�al"
 
-#: ../main.c:2225
+msgid "--not-a-term\t\tSkip warning for input/output not being a terminal"
+msgstr "--not-a-term\t\tN� bac le rabhadh faoi ionchur/aschur gan a bheith �n teirmin�al"
+
 msgid "-u <vimrc>\t\tUse <vimrc> instead of any .vimrc"
 msgstr "-u <vimrc>\t\t�s�id <vimrc> in ionad aon .vimrc"
 
-#: ../main.c:2226
+msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
+msgstr "-U <gvimrc>\t\tBain �s�id as <gvimrc> in ionad aon .gvimrc"
+
 msgid "--noplugin\t\tDon't load plugin scripts"
 msgstr "--noplugin\t\tN� luchtaigh breise�in"
 
-#: ../main.c:2227
 msgid "-p[N]\t\tOpen N tab pages (default: one for each file)"
-msgstr "-p[N]\t\tOscail N leathanach cluais�n (default: ceann do gach comhad)"
+msgstr "-p[N]\t\tOscail N leathanach cluais�n� (default: ceann do gach comhad)"
 
-#: ../main.c:2228
 msgid "-o[N]\t\tOpen N windows (default: one for each file)"
 msgstr "-o[N]\t\tOscail N fuinneog (r�amhshocr�: ceann do gach comhad)"
 
-#: ../main.c:2229
 msgid "-O[N]\t\tLike -o but split vertically"
 msgstr "-O[N]\t\tMar -o, ach roinn go hingearach"
 
-#: ../main.c:2230
 msgid "+\t\t\tStart at end of file"
 msgstr "+\t\t\tTosaigh ag an chomhadchr�och"
 
-#: ../main.c:2231
 msgid "+<lnum>\t\tStart at line <lnum>"
 msgstr "+<lnum>\t\tTosaigh ar l�ne <lnum>"
 
-#: ../main.c:2232
 msgid "--cmd <command>\tExecute <command> before loading any vimrc file"
 msgstr "--cmd <ord�>\tRith <ord�> roimh aon chomhad vimrc a lucht�"
 
-#: ../main.c:2233
 msgid "-c <command>\t\tExecute <command> after loading the first file"
 msgstr "-c <ord�>\t\tRith <ord�> i ndiaidh lucht� an ch�ad chomhad"
 
-#: ../main.c:2235
 msgid "-S <session>\t\tSource file <session> after loading the first file"
 msgstr ""
 "-S <seisi�n>\t\tL�igh comhad <seisi�n> i ndiaidh an ch�ad chomhad � l�amh"
 
-#: ../main.c:2236
 msgid "-s <scriptin>\tRead Normal mode commands from file <scriptin>"
 msgstr "-s <script>\tL�igh orduithe gn�thmh�id �n chomhad <script>"
 
-#: ../main.c:2237
 msgid "-w <scriptout>\tAppend all typed commands to file <scriptout>"
 msgstr ""
 "-w <script>\tIarcheangail gach ord� iontr�ilte leis an gcomhad <script>"
 
-#: ../main.c:2238
 msgid "-W <scriptout>\tWrite all typed commands to file <scriptout>"
 msgstr "-W <aschur>\tScr�obh gach ord� cl�scr�ofa sa chomhad <aschur>"
 
-#: ../main.c:2240
+msgid "-x\t\t\tEdit encrypted files"
+msgstr "-x\t\t\tCuir comhaid chriptithe in eagar"
+
+msgid "-display <display>\tConnect vim to this particular X-server"
+msgstr "-display <freastala�>\tNasc vim leis an bhfreastala�-X seo"
+
+msgid "-X\t\t\tDo not connect to X server"
+msgstr "-X\t\t\tN� naisc leis an bhfreastala� X"
+
+msgid "--remote <files>\tEdit <files> in a Vim server if possible"
+msgstr ""
+"--remote <comhaid>\tCuir <comhaid> in eagar le freastala� Vim m�s f�idir"
+
+msgid "--remote-silent <files>  Same, don't complain if there is no server"
+msgstr ""
+"--remote-silent <comhaid> Mar an gc�anna, n� d�an gear�n mura bhfuil "
+"freastala� ann"
+
+msgid ""
+"--remote-wait <files>  As --remote but wait for files to have been edited"
+msgstr ""
+"--remote-wait <comhaid>  Mar --remote ach fan leis na comhaid a bheith "
+"curtha in eagar"
+
+msgid ""
+"--remote-wait-silent <files>  Same, don't complain if there is no server"
+msgstr ""
+"--remote-wait-silent <comhaid>  Mar an gc�anna, n� d�an gear�n mura bhfuil "
+"freastala� ann"
+
+msgid ""
+"--remote-tab[-wait][-silent] <files>  As --remote but use tab page per file"
+msgstr ""
+"--remote-tab[-wait][-silent] <comhaid>  Cos�il le --remote ach oscail "
+"cluais�n do gach comhad"
+
+msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
+msgstr ""
+"--remote-send <eochracha>\tSeol <eochracha> chuig freastala� Vim agus scoir"
+
+msgid "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
+msgstr ""
+"--remote-expr <slonn>\tLuach�il <slonn> le freastala� Vim agus taispe�in an "
+"toradh"
+
+msgid "--serverlist\t\tList available Vim server names and exit"
+msgstr "--serverlist\t\tTaispe�in freastalaithe Vim at� ar f�il agus scoir"
+
+msgid "--servername <name>\tSend to/become the Vim server <name>"
+msgstr "--servername <ainm>\tSeol chuig/T�igh i do fhreastala� Vim <ainm>"
+
 msgid "--startuptime <file>\tWrite startup timing messages to <file>"
 msgstr ""
 "--startuptime <comhad>\tScr�obh faisn�is maidir le tr�imhse tosaithe i "
 "<comhad>"
 
-#: ../main.c:2242
 msgid "-i <viminfo>\t\tUse <viminfo> instead of .viminfo"
 msgstr "-i <viminfo>\t\t�s�id <viminfo> in ionad .viminfo"
 
-#: ../main.c:2243
 msgid "-h  or  --help\tPrint Help (this message) and exit"
 msgstr "-h  n�  --help\tTaispe�in an chabhair seo agus scoir"
 
-#: ../main.c:2244
 msgid "--version\t\tPrint version information and exit"
 msgstr "--version\t\tTaispe�in eolas faoin leagan agus scoir"
 
-#: ../mark.c:676
+msgid ""
+"\n"
+"Arguments recognised by gvim (Motif version):\n"
+msgstr ""
+"\n"
+"Arg�int� ar eolas do gvim (leagan Motif):\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (neXtaw version):\n"
+msgstr ""
+"\n"
+"Arg�int� ar eolas do gvim (leagan neXtaw):\n"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (Athena version):\n"
+msgstr ""
+"\n"
+"Arg�int� ar eolas do gvim (leagan Athena):\n"
+
+msgid "-display <display>\tRun vim on <display>"
+msgstr "-display <sc�ile�n>\tRith vim ar <sc�ile�n>"
+
+msgid "-iconic\t\tStart vim iconified"
+msgstr "-iconic\t\tTosaigh vim sa mh�d �oslaghdaithe"
+
+msgid "-background <color>\tUse <color> for the background (also: -bg)"
+msgstr "-background <dath>\tBain �s�id as <dath> don ch�lra (-bg fosta)"
+
+msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
+msgstr "-foreground <dath>\t�s�id <dath> le haghaidh gn�th-th�acs (fosta: -fg)"
+
+msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
+msgstr "-font <cl�>\t\t�s�id <cl�> le haghaidh gn�th-th�acs (fosta: -fn)"
+
+msgid "-boldfont <font>\tUse <font> for bold text"
+msgstr "-boldfont <cl�>\tBain �s�id as <cl�> do chl� trom"
+
+msgid "-italicfont <font>\tUse <font> for italic text"
+msgstr "-italicfont <cl�>\t�s�id <cl�> le haghaidh t�acs iod�lach"
+
+msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
+msgstr ""
+"-geometry <geoim>\t�s�id <geoim> le haghaidh na c�imseatan tosaigh (fosta: -"
+"geom)"
+
+msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
+msgstr "-borderwidth <leithead>\tSocraigh <leithead> na himl�ne (-bw fosta)"
+
+msgid "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
+msgstr ""
+"-scrollbarwidth <leithead> Socraigh leithead na scrollbharra� a bheith "
+"<leithead> (fosta: -sw)"
+
+msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
+msgstr ""
+"-menuheight <airde>\tSocraigh airde an bharra roghchl�ir a bheith <airde> "
+"(fosta: -mh)"
+
+msgid "-reverse\t\tUse reverse video (also: -rv)"
+msgstr "-reverse\t\t�s�id f�s aisiompaithe (fosta: -rv)"
+
+msgid "+reverse\t\tDon't use reverse video (also: +rv)"
+msgstr "+reverse\t\tN� h�s�id f�s aisiompaithe (fosta: +rv)"
+
+msgid "-xrm <resource>\tSet the specified resource"
+msgstr "-xrm <acmhainn>\tSocraigh an acmhainn sainithe"
+
+msgid ""
+"\n"
+"Arguments recognised by gvim (GTK+ version):\n"
+msgstr ""
+"\n"
+"Arg�int� ar eolas do gvim (leagan GTK+):\n"
+
+msgid "-display <display>\tRun vim on <display> (also: --display)"
+msgstr "-display <sc�ile�n>\tRith vim ar <sc�ile�n> (fosta: --display)"
+
+msgid "--role <role>\tSet a unique role to identify the main window"
+msgstr "--role <r�l>\tSocraigh r�l saini�il chun an phr�omhfhuinneog a aithint"
+
+msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
+msgstr "--socketid <xid>\tOscail Vim isteach i ngiuirl�id GTK eile"
+
+msgid "--echo-wid\t\tMake gvim echo the Window ID on stdout"
+msgstr "--echo-wid\t\tTaispe�nann gvim aitheantas na fuinneoige ar stdout"
+
+msgid "-P <parent title>\tOpen Vim inside parent application"
+msgstr "-P <m�thairchl�r>\tOscail Vim isteach sa mh�thairchl�r"
+
+msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
+msgstr "--windowid <HWND>\tOscail Vim isteach i ngiuirl�id win32 eile"
+
+msgid "No display"
+msgstr "Gan taispe�int"
+
+#. Failed to send, abort.
+msgid ": Send failed.\n"
+msgstr ": Theip ar seoladh.\n"
+
+#. Let vim start normally.
+msgid ": Send failed. Trying to execute locally\n"
+msgstr ": Theip ar seoladh. Ag baint triail as go log�nta\n"
+
+#, c-format
+msgid "%d of %d edited"
+msgstr "%d as %d d�anta"
+
+msgid "No display: Send expression failed.\n"
+msgstr "Gan taispe�int: Theip ar sheoladh sloinn.\n"
+
+msgid ": Send expression failed.\n"
+msgstr ": Theip ar sheoladh sloinn.\n"
+
 msgid "No marks set"
 msgstr "N�l aon mharc socraithe"
 
-#: ../mark.c:678
 #, c-format
 msgid "E283: No marks matching \"%s\""
 msgstr "E283: N�l aon mharc comhoiri�naithe le \"%s\""
 
 #. Highlight title
-#: ../mark.c:687
 msgid ""
 "\n"
 "mark line  col file/text"
@@ -3615,7 +3309,6 @@ msgstr ""
 "marc l�ne  col comhad/t�acs"
 
 #. Highlight title
-#: ../mark.c:789
 msgid ""
 "\n"
 " jump line  col file/text"
@@ -3624,7 +3317,6 @@ msgstr ""
 " l�im l�ne  col comhad/t�acs"
 
 #. Highlight title
-#: ../mark.c:831
 msgid ""
 "\n"
 "change line  col text"
@@ -3632,7 +3324,6 @@ msgstr ""
 "\n"
 "athr�  l�ne  col t�acs"
 
-#: ../mark.c:1238
 msgid ""
 "\n"
 "# File marks:\n"
@@ -3641,7 +3332,6 @@ msgstr ""
 "# Marcanna comhaid:\n"
 
 #. Write the jumplist with -'
-#: ../mark.c:1271
 msgid ""
 "\n"
 "# Jumplist (newest first):\n"
@@ -3649,7 +3339,6 @@ msgstr ""
 "\n"
 "# Liosta l�imeanna (is nua� i dtosach):\n"
 
-#: ../mark.c:1352
 msgid ""
 "\n"
 "# History of marks within files (newest to oldest):\n"
@@ -3657,86 +3346,90 @@ msgstr ""
 "\n"
 "# Stair na marcanna i gcomhaid (is nua� ar dt�s):\n"
 
-#: ../mark.c:1431
 msgid "Missing '>'"
 msgstr "`>' ar iarraidh"
 
-#: ../memfile.c:426
+msgid "E543: Not a valid codepage"
+msgstr "E543: N� c�dleathanach bail� �"
+
+msgid "E284: Cannot set IC values"
+msgstr "E284: N� f�idir luachanna IC a shocr�"
+
+msgid "E285: Failed to create input context"
+msgstr "E285: Theip ar chruth� comhth�acs ionchuir"
+
+msgid "E286: Failed to open input method"
+msgstr "E286: Theip ar oscailt mhodh ionchuir"
+
+msgid "E287: Warning: Could not set destroy callback to IM"
+msgstr "E287: Rabhadh: N�orbh fh�idir aisghlaoch l�irscriosta a shocr� le IM"
+
+msgid "E288: input method doesn't support any style"
+msgstr "E288: N� thaca�onn an modh ionchuir aon st�l"
+
+msgid "E289: input method doesn't support my preedit type"
+msgstr "E289: n� thaca�onn an modh ionchuir mo chine�l r�amheagair"
+
 msgid "E293: block was not locked"
 msgstr "E293: n� raibh an bloc faoi ghlas"
 
-#: ../memfile.c:799
 msgid "E294: Seek error in swap file read"
 msgstr "E294: Earr�id chuardaigh agus comhad babht�la � l�amh"
 
-#: ../memfile.c:803
 msgid "E295: Read error in swap file"
 msgstr "E295: Earr�id sa l�amh i gcomhad babht�la"
 
-#: ../memfile.c:849
 msgid "E296: Seek error in swap file write"
 msgstr "E296: Earr�id chuardaigh agus comhad babht�la � scr�obh"
 
-#: ../memfile.c:865
 msgid "E297: Write error in swap file"
 msgstr "E297: Earr�id sa scr�obh i gcomhad babht�la"
 
-#: ../memfile.c:1036
 msgid "E300: Swap file already exists (symlink attack?)"
 msgstr "E300: T� comhad babht�la ann cheana (ionsa� le naisc shiombalacha?)"
 
-#: ../memline.c:318
 msgid "E298: Didn't get block nr 0?"
 msgstr "E298: N� bhfuarthas bloc 0?"
 
-#: ../memline.c:361
 msgid "E298: Didn't get block nr 1?"
 msgstr "E298: N� bhfuarthas bloc a haon?"
 
-#: ../memline.c:377
 msgid "E298: Didn't get block nr 2?"
 msgstr "E298: N� bhfuarthas bloc a d�?"
 
+msgid "E843: Error while updating swap file crypt"
+msgstr "E843: Earr�id agus cripti� an chomhaid bhabht�la � nuashonr�"
+
 #. could not (re)open the swap file, what can we do????
-#: ../memline.c:465
 msgid "E301: Oops, lost the swap file!!!"
 msgstr "E301: �ps, cailleadh an comhad babht�la!!!"
 
-#: ../memline.c:477
 msgid "E302: Could not rename swap file"
 msgstr "E302: N�orbh fh�idir an comhad babht�la a athainmni�"
 
-#: ../memline.c:554
 #, c-format
 msgid "E303: Unable to open swap file for \"%s\", recovery impossible"
 msgstr ""
 "E303: N� f�idir comhad babht�la le haghaidh \"%s\" a oscailt, n� f�idir "
 "athshl�n�"
 
-#: ../memline.c:666
 msgid "E304: ml_upd_block0(): Didn't get block 0??"
 msgstr "E304: ml_upd_block0(): N� bhfuarthas bloc 0??"
 
-#. no swap files found
-#: ../memline.c:830
 #, c-format
 msgid "E305: No swap file found for %s"
 msgstr "E305: N�or aims�odh comhad babht�la le haghaidh %s"
 
-#: ../memline.c:839
 msgid "Enter number of swap file to use (0 to quit): "
 msgstr "Iontr�il uimhir an chomhaid babht�la le h�s�id (0 = scoir): "
 
-#: ../memline.c:879
 #, c-format
 msgid "E306: Cannot open %s"
 msgstr "E306: N� f�idir %s a oscailt"
 
-#: ../memline.c:897
 msgid "Unable to read block 0 from "
 msgstr "N� f�idir bloc 0 a l�amh � "
 
-#: ../memline.c:900
 msgid ""
 "\n"
 "Maybe no changes were made or Vim did not update the swap file."
@@ -3745,28 +3438,22 @@ msgstr ""
 "B'fh�idir nach raibh aon athr� � dh�anamh, n� t� an comhad\n"
 "babht�la as d�ta."
 
-#: ../memline.c:909
 msgid " cannot be used with this version of Vim.\n"
 msgstr " n�l ar f�il leis an leagan seo de Vim.\n"
 
-#: ../memline.c:911
 msgid "Use Vim version 3.0.\n"
 msgstr "Bain �s�id as Vim, leagan 3.0.\n"
 
-#: ../memline.c:916
 #, c-format
 msgid "E307: %s does not look like a Vim swap file"
 msgstr "E307: N�l %s cos�il le comhad babht�la Vim"
 
-#: ../memline.c:922
 msgid " cannot be used on this computer.\n"
 msgstr " n�l ar f�il ar an r�omhaire seo.\n"
 
-#: ../memline.c:924
 msgid "The file was created on "
 msgstr "Crutha�odh an comhad seo ar "
 
-#: ../memline.c:928
 msgid ""
 ",\n"
 "or the file has been damaged."
@@ -3774,86 +3461,107 @@ msgstr ""
 ",\n"
 "is � sin n� rinneadh dochar don chomhad."
 
-#: ../memline.c:945
+#, c-format
+msgid ""
+"E833: %s is encrypted and this version of Vim does not support encryption"
+msgstr ""
+"E833: t� %s criptithe agus n� thaca�onn an leagan seo de Vim le cripti�"
+
 msgid " has been damaged (page size is smaller than minimum value).\n"
 msgstr " rinneadh dochar d� (m�id an leathanaigh n�os l� n� an �osmh�id).\n"
 
-#: ../memline.c:974
 #, c-format
 msgid "Using swap file \"%s\""
 msgstr "Comhad babht�la \"%s\" � �s�id"
 
-#: ../memline.c:980
 #, c-format
 msgid "Original file \"%s\""
 msgstr "Comhad bun�sach \"%s\""
 
-#: ../memline.c:995
 msgid "E308: Warning: Original file may have been changed"
 msgstr "E308: Rabhadh: Is f�idir gur athra�odh an comhad bun�sach"
 
-#: ../memline.c:1061
+#, c-format
+msgid "Swap file is encrypted: \"%s\""
+msgstr "T� an comhad babht�la criptithe: \"%s\""
+
+msgid ""
+"\n"
+"If you entered a new crypt key but did not write the text file,"
+msgstr ""
+"\n"
+"M� chuir t� eochair nua chripti�ch�in isteach, ach mura scr�obh t� an "
+"t�acschomhad,"
+
+msgid ""
+"\n"
+"enter the new crypt key."
+msgstr ""
+"\n"
+"cuir isteach an eochair nua chripti�ch�in."
+
+msgid ""
+"\n"
+"If you wrote the text file after changing the crypt key press enter"
+msgstr ""
+"\n"
+"M� scr�obh t� an t�acschomhad tar �is duit an eochair chripti�ch��n a athr�, "
+"br�igh Enter"
+
+msgid ""
+"\n"
+"to use the same key for text file and swap file"
+msgstr ""
+"\n"
+"chun an eochair ch�anna a �s�id don t�acschomhad agus an comhad babht�la"
+
 #, c-format
 msgid "E309: Unable to read block 1 from %s"
 msgstr "E309: N� f�idir bloc a haon a l�amh � %s"
 
-#: ../memline.c:1065
 msgid "???MANY LINES MISSING"
 msgstr "???GO LEOR L�NTE AR IARRAIDH"
 
-#: ../memline.c:1076
 msgid "???LINE COUNT WRONG"
 msgstr "???L�ON M�CHEART NA L�NTE"
 
-#: ../memline.c:1082
 msgid "???EMPTY BLOCK"
 msgstr "???BLOC FOLAMH"
 
-#: ../memline.c:1103
 msgid "???LINES MISSING"
 msgstr "???L�NTE AR IARRAIDH"
 
-#: ../memline.c:1128
 #, c-format
 msgid "E310: Block 1 ID wrong (%s not a .swp file?)"
 msgstr "E310: Aitheantas m�cheart ar bhloc a haon (n�l %s ina chomhad .swp?)"
 
-#: ../memline.c:1133
 msgid "???BLOCK MISSING"
 msgstr "???BLOC AR IARRAIDH"
 
-#: ../memline.c:1147
 msgid "??? from here until ???END lines may be messed up"
 msgstr "??? is f�idir go ndearnadh praiseach de l�nte � anseo go ???END"
 
-#: ../memline.c:1164
 msgid "??? from here until ???END lines may have been inserted/deleted"
 msgstr "??? is f�idir go bhfuil l�nte ions�ite/scriosta � anseo go ???END"
 
-#: ../memline.c:1181
 msgid "???END"
 msgstr "???DEIREADH"
 
-#: ../memline.c:1238
 msgid "E311: Recovery Interrupted"
 msgstr "E311: Idirbhriseadh an t-athshl�n�"
 
-#: ../memline.c:1243
 msgid ""
 "E312: Errors detected while recovering; look for lines starting with ???"
 msgstr ""
 "E312: Braitheadh earr�id� le linn athshl�naithe; f�ach ar na l�nte le ??? ar "
 "tosach"
 
-#: ../memline.c:1245
 msgid "See \":help E312\" for more information."
 msgstr "Bain triail as \":help E312\" chun tuilleadh eolais a fh�il."
 
-#: ../memline.c:1249
 msgid "Recovery completed. You should check if everything is OK."
 msgstr "Athshl�na�odh. Ba ch�ir duit gach rud a sheice�il uair amh�in eile."
 
-#: ../memline.c:1251
 msgid ""
 "\n"
 "(You might want to write out this file under another name\n"
@@ -3861,73 +3569,61 @@ msgstr ""
 "\n"
 "(B'fh�idir gur mian leat an comhad seo a sh�bh�il de r�ir ainm eile\n"
 
-#: ../memline.c:1252
-#, fuzzy
 msgid "and run diff with the original file to check for changes)"
-msgstr ""
-"agus d�an compar�id leis an chomhad bhun�sach (m.sh. le `diff') chun "
-"athruithe a scr�d�)\n"
+msgstr "agus d�an compar�id leis an mbunchomhad chun athruithe a lorg)"
 
-#: ../memline.c:1254
 msgid "Recovery completed. Buffer contents equals file contents."
 msgstr ""
+"Athshl�n� cr�ochnaithe. Is ionann an t-�bhar sa mhaol�n agus an t-�bhar sa "
+"chomhad."
 
-#: ../memline.c:1255
-#, fuzzy
 msgid ""
 "\n"
 "You may want to delete the .swp file now.\n"
 "\n"
 msgstr ""
-"Scrios an comhad .swp tar �is sin.\n"
+"\n"
+"B'fh�idir gur mhaith leat an comhad .swp a scriosadh anois.\n"
 "\n"
 
+msgid "Using crypt key from swap file for the text file.\n"
+msgstr ""
+"Eochair chripti�ch�in �n gcomhad babht�la � h�s�id ar an t�acschomhad.\n"
+
 #. use msg() to start the scrolling properly
-#: ../memline.c:1327
 msgid "Swap files found:"
 msgstr "Comhaid bhabht�la aimsithe:"
 
-#: ../memline.c:1446
 msgid "   In current directory:\n"
 msgstr "   Sa chomhadlann reatha:\n"
 
-#: ../memline.c:1448
 msgid "   Using specified name:\n"
 msgstr "   Ag baint �s�id as ainm socraithe:\n"
 
-#: ../memline.c:1450
 msgid "   In directory "
 msgstr "   Sa chomhadlann "
 
-#: ../memline.c:1465
 msgid "      -- none --\n"
 msgstr "      -- neamhn� --\n"
 
-#: ../memline.c:1527
 msgid "          owned by: "
 msgstr "          �in�ir: "
 
-#: ../memline.c:1529
 msgid "   dated: "
 msgstr "   d�taithe: "
 
-#: ../memline.c:1532 ../memline.c:3231
 msgid "             dated: "
 msgstr "             d�taithe: "
 
-#: ../memline.c:1548
 msgid "         [from Vim version 3.0]"
 msgstr "         [� leagan 3.0 Vim]"
 
-#: ../memline.c:1550
 msgid "         [does not look like a Vim swap file]"
 msgstr "         [n� cos�il le comhad babht�la Vim]"
 
-#: ../memline.c:1552
 msgid "         file name: "
 msgstr "         ainm comhaid: "
 
-#: ../memline.c:1558
 msgid ""
 "\n"
 "          modified: "
@@ -3935,15 +3631,12 @@ msgstr ""
 "\n"
 "          mionathraithe: "
 
-#: ../memline.c:1559
 msgid "YES"
 msgstr "IS SEA"
 
-#: ../memline.c:1559
 msgid "no"
 msgstr "n� hea"
 
-#: ../memline.c:1562
 msgid ""
 "\n"
 "         user name: "
@@ -3951,11 +3644,9 @@ msgstr ""
 "\n"
 "         �s�ideoir: "
 
-#: ../memline.c:1568
 msgid "   host name: "
 msgstr "   ainm an �str�omhaire: "
 
-#: ../memline.c:1570
 msgid ""
 "\n"
 "         host name: "
@@ -3963,7 +3654,6 @@ msgstr ""
 "\n"
 "         �stainm: "
 
-#: ../memline.c:1575
 msgid ""
 "\n"
 "        process ID: "
@@ -3971,11 +3661,16 @@ msgstr ""
 "\n"
 "        PID: "
 
-#: ../memline.c:1579
 msgid " (still running)"
 msgstr " (ag rith f�s)"
 
-#: ../memline.c:1586
+msgid ""
+"\n"
+"         [not usable with this version of Vim]"
+msgstr ""
+"\n"
+"         [n� in�s�idte leis an leagan seo Vim]"
+
 msgid ""
 "\n"
 "         [not usable on this computer]"
@@ -3983,97 +3678,75 @@ msgstr ""
 "\n"
 "         [n� in�s�idte ar an r�omhaire seo]"
 
-#: ../memline.c:1590
 msgid "         [cannot be read]"
 msgstr "         [n� f�idir a l�amh]"
 
-#: ../memline.c:1593
 msgid "         [cannot be opened]"
 msgstr "         [n� f�idir oscailt]"
 
-#: ../memline.c:1698
 msgid "E313: Cannot preserve, there is no swap file"
 msgstr "E313: N� f�idir � a chaomhn�, n�l aon chomhad babht�la ann"
 
-#: ../memline.c:1747
 msgid "File preserved"
 msgstr "Caomhna�odh an comhad"
 
-#: ../memline.c:1749
 msgid "E314: Preserve failed"
 msgstr "E314: Theip ar chaomhn�"
 
-#: ../memline.c:1819
 #, c-format
-msgid "E315: ml_get: invalid lnum: %<PRId64>"
-msgstr "E315: ml_get: lnum neamhbhail�: %<PRId64>"
+msgid "E315: ml_get: invalid lnum: %ld"
+msgstr "E315: ml_get: lnum neamhbhail�: %ld"
 
-#: ../memline.c:1851
 #, c-format
-msgid "E316: ml_get: cannot find line %<PRId64>"
-msgstr "E316: ml_get: l�ne %<PRId64> gan aimsi�"
+msgid "E316: ml_get: cannot find line %ld"
+msgstr "E316: ml_get: l�ne %ld gan aimsi�"
 
-#: ../memline.c:2236
 msgid "E317: pointer block id wrong 3"
 msgstr "E317: aitheantas m�cheart ar an mbloc pointeora 3"
 
-#: ../memline.c:2311
 msgid "stack_idx should be 0"
 msgstr "ba ch�ir do stack_idx a bheith 0"
 
-#: ../memline.c:2369
 msgid "E318: Updated too many blocks?"
 msgstr "E318: An iomarca bloic nuashonraithe?"
 
-#: ../memline.c:2511
 msgid "E317: pointer block id wrong 4"
 msgstr "E317: aitheantas m�cheart ar an mbloc pointeora 4"
 
-#: ../memline.c:2536
 msgid "deleted block 1?"
 msgstr "bloc a haon scriosta?"
 
-#: ../memline.c:2707
 #, c-format
-msgid "E320: Cannot find line %<PRId64>"
-msgstr "E320: L�ne %<PRId64> gan aimsi�"
+msgid "E320: Cannot find line %ld"
+msgstr "E320: L�ne %ld gan aimsi�"
 
-#: ../memline.c:2916
 msgid "E317: pointer block id wrong"
 msgstr "E317: aitheantas m�cheart ar an mbloc pointeora"
 
-#: ../memline.c:2930
 msgid "pe_line_count is zero"
 msgstr "is 0 pe_line_count\""
 
-#: ../memline.c:2955
 #, c-format
-msgid "E322: line number out of range: %<PRId64> past the end"
-msgstr "E322: l�ne-uimhir as raon: %<PRId64> thar dheireadh"
+msgid "E322: line number out of range: %ld past the end"
+msgstr "E322: l�ne-uimhir as raon: %ld thar dheireadh"
 
-#: ../memline.c:2959
 #, c-format
-msgid "E323: line count wrong in block %<PRId64>"
-msgstr "E323: l�on m�cheart na l�nte i mbloc %<PRId64>"
+msgid "E323: line count wrong in block %ld"
+msgstr "E323: l�on m�cheart na l�nte i mbloc %ld"
 
-#: ../memline.c:2999
 msgid "Stack size increases"
 msgstr "M�ada�onn an chruach"
 
-#: ../memline.c:3038
 msgid "E317: pointer block id wrong 2"
 msgstr "E317: aitheantas m�cheart ar an mbloc pointeora 2"
 
-#: ../memline.c:3070
 #, c-format
 msgid "E773: Symlink loop for \"%s\""
 msgstr "E773: Ciogal i naisc shiombalacha le haghaidh \"%s\""
 
-#: ../memline.c:3221
 msgid "E325: ATTENTION"
 msgstr "E325: AIRE"
 
-#: ../memline.c:3222
 msgid ""
 "\n"
 "Found a swap file by the name \""
@@ -4081,45 +3754,31 @@ msgstr ""
 "\n"
 "Fuarthas comhad babht�la darbh ainm \""
 
-#: ../memline.c:3226
 msgid "While opening file \""
 msgstr "Agus an comhad seo � oscailt: \""
 
-#: ../memline.c:3239
 msgid "      NEWER than swap file!\n"
 msgstr "      N�OS NUA� n� comhad babht�la!\n"
 
-#: ../memline.c:3244
-#, fuzzy
+#. Some of these messages are long to allow translation to
+#. * other languages.
 msgid ""
 "\n"
 "(1) Another program may be editing the same file.  If this is the case,\n"
 "    be careful not to end up with two different instances of the same\n"
-"    file when making changes."
+"    file when making changes.  Quit, or continue with caution.\n"
 msgstr ""
 "\n"
-"(1) Is f�idir go bhfuil cl�r eile ag rochtain an comhad seo.\n"
-"    M�s ea, b� c�ramach nach bhfuil dh� leagan den chomhad\n"
-"    c�anna.\n"
+"(1) Seans go bhfuil an comhad seo � chur in eagar ag cl�r eile. M� t�,\n"
+"    b� c�ramach nach bhfuil dh� leagan den chomhad c�anna agat nuair\n"
+"    a athra�onn t� �. Scoir anois, n� lean ort go faichilleach.\n"
 
-#: ../memline.c:3245
-#, fuzzy
-msgid "  Quit, or continue with caution.\n"
-msgstr "    Scoir, n� lean ar aghaidh go hairdeallach.\n"
-
-#: ../memline.c:3246
-#, fuzzy
 msgid "(2) An edit session for this file crashed.\n"
-msgstr ""
-"\n"
-"(2) Rinne Vim thobscor agus an comhad seo\n"
-"    idir l�mha agat.\n"
+msgstr "(2) Thuairte�il seisi�n eagarth�ireachta.\n"
 
-#: ../memline.c:3247
 msgid "    If this is the case, use \":recover\" or \"vim -r "
 msgstr "    M�s amhlaidh, bain �s�id as \":recover\" n� \"vim -r "
 
-#: ../memline.c:3249
 msgid ""
 "\"\n"
 "    to recover the changes (see \":help recovery\").\n"
@@ -4127,11 +3786,9 @@ msgstr ""
 "\"\n"
 "    chun na hathruithe a fh�il ar ais (f�ach \":help recovery\").\n"
 
-#: ../memline.c:3250
 msgid "    If you did this already, delete the swap file \""
 msgstr "    M� t� s� seo d�anta cheana agat, scrios an comhad babht�la \""
 
-#: ../memline.c:3252
 msgid ""
 "\"\n"
 "    to avoid this message.\n"
@@ -4139,23 +3796,18 @@ msgstr ""
 "\"\n"
 "   chun an teachtaireacht seo a sheachaint.\n"
 
-#: ../memline.c:3450 ../memline.c:3452
 msgid "Swap file \""
 msgstr "Comhad babht�la \""
 
-#: ../memline.c:3451 ../memline.c:3455
 msgid "\" already exists!"
 msgstr "\" t� s� ann cheana!"
 
-#: ../memline.c:3457
 msgid "VIM - ATTENTION"
 msgstr "VIM - AIRE"
 
-#: ../memline.c:3459
 msgid "Swap file already exists!"
 msgstr "T� comhad babht�la ann cheana!"
 
-#: ../memline.c:3464
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4169,7 +3821,6 @@ msgstr ""
 "&Scoir\n"
 "&Tobscoir"
 
-#: ../memline.c:3467
 msgid ""
 "&Open Read-Only\n"
 "&Edit anyway\n"
@@ -4185,58 +3836,36 @@ msgstr ""
 "&Scoir\n"
 "&Tobscoir"
 
-#.
-#. * Change the ".swp" extension to find another file that can be used.
-#. * First decrement the last char: ".swo", ".swn", etc.
-#. * If that still isn't enough decrement the last but one char: ".svz"
-#. * Can happen when editing many "No Name" buffers.
-#.
-#. ".s?a"
-#. ".saa": tried enough, give up
-#: ../memline.c:3528
 msgid "E326: Too many swap files found"
 msgstr "E326: Aims�odh an iomarca comhaid bhabht�la"
 
-#: ../memory.c:227
-#, c-format
-msgid "E342: Out of memory!  (allocating %<PRIu64> bytes)"
-msgstr "E342: Cuimhne �dithe!  (%<PRIu64> beart � nd�ileadh)"
-
-#: ../menu.c:62
 msgid "E327: Part of menu-item path is not sub-menu"
 msgstr "E327: N� fo-roghchl�r � p�irt de chonair roghchl�ir"
 
-#: ../menu.c:63
 msgid "E328: Menu only exists in another mode"
 msgstr "E328: N�l an roghchl�r ar f�il sa mh�d seo"
 
-#: ../menu.c:64
 #, c-format
 msgid "E329: No menu \"%s\""
 msgstr "E329: N�l aon roghchl�r darbh ainm \"%s\""
 
 #. Only a mnemonic or accelerator is not valid.
-#: ../menu.c:329
 msgid "E792: Empty menu name"
 msgstr "E792: Ainm folamh ar an roghchl�r"
 
-#: ../menu.c:340
 msgid "E330: Menu path must not lead to a sub-menu"
 msgstr "E330: N� cheada�tear conair roghchl�ir a threora�onn go fo-roghchl�r"
 
-#: ../menu.c:365
 msgid "E331: Must not add menu items directly to menu bar"
 msgstr ""
 "E331: N� cheada�tear m�reanna roghchl�ir a chur le barra roghchl�ir go "
 "d�reach"
 
-#: ../menu.c:370
 msgid "E332: Separator cannot be part of a menu path"
 msgstr "E332: N� cheada�tear deighilteoir mar ph�irt de chonair roghchl�ir"
 
 #. Now we have found the matching menu, and we list the mappings
 #. Highlight title
-#: ../menu.c:762
 msgid ""
 "\n"
 "--- Menus ---"
@@ -4244,69 +3873,61 @@ msgstr ""
 "\n"
 "--- Roghchl�ir ---"
 
-#: ../menu.c:1313
+msgid "Tear off this menu"
+msgstr "Bain an roghchl�r seo"
+
 msgid "E333: Menu path must lead to a menu item"
 msgstr "E333: N� m�r conair roghchl�ir a threor� chun m�r roghchl�ir"
 
-#: ../menu.c:1330
 #, c-format
 msgid "E334: Menu not found: %s"
 msgstr "E334: Roghchl�r gan aimsi�: %s"
 
-#: ../menu.c:1396
 #, c-format
 msgid "E335: Menu not defined for %s mode"
 msgstr "E335: N�l an roghchl�r ar f�il sa mh�d %s"
 
-#: ../menu.c:1426
 msgid "E336: Menu path must lead to a sub-menu"
 msgstr "E336: N� m�r conair roghchl�ir a threor� chun fo-roghchl�r"
 
-#: ../menu.c:1447
 msgid "E337: Menu not found - check menu names"
 msgstr "E337: Roghchl�r gan aimsi� - deimhnigh ainmneacha na roghchl�r"
 
-#: ../message.c:423
 #, c-format
 msgid "Error detected while processing %s:"
 msgstr "Earr�id agus %s � phr�ise�il:"
 
-#: ../message.c:445
 #, c-format
 msgid "line %4ld:"
 msgstr "l�ne %4ld:"
 
-#: ../message.c:617
 #, c-format
 msgid "E354: Invalid register name: '%s'"
 msgstr "E354: Ainm neamhbhail� tabhaill: '%s'"
 
-#: ../message.c:986
+msgid "Messages maintainer: Bram Moolenaar <Bram@vim.org>"
+msgstr ""
+"Cothaitheoir na dteachtaireachta�: Kevin P. Scannell <scannell@slu.edu>"
+
 msgid "Interrupt: "
 msgstr "Idirbhriseadh: "
 
-#: ../message.c:988
 msgid "Press ENTER or type command to continue"
 msgstr "Br�igh ENTER n� iontr�il ord� le lean�int"
 
-#: ../message.c:1843
 #, c-format
-msgid "%s line %<PRId64>"
-msgstr "%s l�ne %<PRId64>"
+msgid "%s line %ld"
+msgstr "%s l�ne %ld"
 
-#: ../message.c:2392
 msgid "-- More --"
 msgstr "-- Tuilleadh --"
 
-#: ../message.c:2398
 msgid " SPACE/d/j: screen/page/line down, b/u/k: up, q: quit "
 msgstr " SP�S/d/j: sc�ile�n/leathanach/l�ne s�os, b/u/k: suas, q: scoir "
 
-#: ../message.c:3021 ../message.c:3031
 msgid "Question"
 msgstr "Ceist"
 
-#: ../message.c:3023
 msgid ""
 "&Yes\n"
 "&No"
@@ -4314,17 +3935,6 @@ msgstr ""
 "&T�\n"
 "&N�l"
 
-#: ../message.c:3033
-msgid ""
-"&Yes\n"
-"&No\n"
-"&Cancel"
-msgstr ""
-"&T�\n"
-"&N�l\n"
-"&Cealaigh"
-
-#: ../message.c:3045
 msgid ""
 "&Yes\n"
 "&No\n"
@@ -4338,180 +3948,251 @@ msgstr ""
 "&Dealaigh Uile\n"
 "&Cealaigh"
 
-#: ../message.c:3058
+msgid "Select Directory dialog"
+msgstr "Dial�g `Roghnaigh Comhadlann'"
+
+msgid "Save File dialog"
+msgstr "Dial�g `S�bh�il Comhad'"
+
+msgid "Open File dialog"
+msgstr "Dial�g `Oscail Comhad'"
+
+#. TODO: non-GUI file selector here
+msgid "E338: Sorry, no file browser in console mode"
+msgstr "E338: N�l brabhs�la� comhaid ar f�il sa mh�d cons�il"
+
 msgid "E766: Insufficient arguments for printf()"
 msgstr "E766: Easpa arg�int� d'fheidhm printf()"
 
-#: ../message.c:3119
 msgid "E807: Expected Float argument for printf()"
 msgstr "E807: Bh�othas ag s�il le harg�int Sn�mhphointe d'fheidhm printf()"
 
-#: ../message.c:3873
 msgid "E767: Too many arguments to printf()"
 msgstr "E767: An iomarca arg�int� d'fheidhm printf()"
 
-#: ../misc1.c:2256
 msgid "W10: Warning: Changing a readonly file"
 msgstr "W10: Rabhadh: Comhad inl�ite amh�in � athr�"
 
-#: ../misc1.c:2537
 msgid "Type number and <Enter> or click with mouse (empty cancels): "
 msgstr ""
 "Cl�scr�obh uimhir agus <Enter> n� clice�il leis an luch (f�g folamh le "
 "ceal�): "
 
-#: ../misc1.c:2539
 msgid "Type number and <Enter> (empty cancels): "
 msgstr "Cl�scr�obh uimhir agus <Enter> (f�g folamh le ceal�): "
 
-#: ../misc1.c:2585
 msgid "1 more line"
 msgstr "1 l�ne eile"
 
-#: ../misc1.c:2588
 msgid "1 line less"
 msgstr "1 l�ne n�os l�"
 
-#: ../misc1.c:2593
 #, c-format
-msgid "%<PRId64> more lines"
-msgstr "%<PRId64> l�ne eile"
+msgid "%ld more lines"
+msgstr "%ld l�ne eile"
 
-#: ../misc1.c:2596
 #, c-format
-msgid "%<PRId64> fewer lines"
-msgstr "%<PRId64> l�ne n�os l�"
+msgid "%ld fewer lines"
+msgstr "%ld l�ne n�os l�"
 
-#: ../misc1.c:2599
 msgid " (Interrupted)"
 msgstr " (Idirbhriste)"
 
-#: ../misc1.c:2635
 msgid "Beep!"
 msgstr "B�p!"
 
-#: ../misc2.c:738
+msgid "ERROR: "
+msgstr "EARR�ID: "
+
+#, c-format
+msgid ""
+"\n"
+"[bytes] total alloc-freed %lu-%lu, in use %lu, peak use %lu\n"
+msgstr ""
+"\n"
+"[beart] ioml�n d�ilte-saor %lu-%lu, in �s�id %lu, buaic %lu\n"
+
+#, c-format
+msgid ""
+"[calls] total re/malloc()'s %lu, total free()'s %lu\n"
+"\n"
+msgstr ""
+"[glaonna] re/malloc(): %lu, free(): %lu\n"
+"\n"
+
+msgid "E340: Line is becoming too long"
+msgstr "E340: T� an l�ne ag �ir� r�fhada"
+
+#, c-format
+msgid "E341: Internal error: lalloc(%ld, )"
+msgstr "E341: Earr�id inmhe�nach: lalloc(%ld, )"
+
+#, c-format
+msgid "E342: Out of memory!  (allocating %lu bytes)"
+msgstr "E342: Cuimhne �dithe!  (%lu beart � nd�ileadh)"
+
 #, c-format
 msgid "Calling shell to execute: \"%s\""
 msgstr "An t-ord� seo � rith leis an bhlaosc: \"%s\""
 
-#: ../normal.c:183
+msgid "E545: Missing colon"
+msgstr "E545: Idirstad ar iarraidh"
+
+msgid "E546: Illegal mode"
+msgstr "E546: M�d neamhcheadaithe"
+
+msgid "E547: Illegal mouseshape"
+msgstr "E547: Cruth neamhcheadaithe luiche"
+
+msgid "E548: digit expected"
+msgstr "E548: ag s�il le digit"
+
+msgid "E549: Illegal percentage"
+msgstr "E549: C�atad�n neamhcheadaithe"
+
+msgid "E854: path too long for completion"
+msgstr "E854: conair r�fhada le comhl�n�"
+
+#, c-format
+msgid ""
+"E343: Invalid path: '**[number]' must be at the end of the path or be "
+"followed by '%s'."
+msgstr ""
+"E343: Conair neamhbhail�: n� m�r '**[uimhir]' a bheith ag deireadh na "
+"conaire, n� le '%s' ina dhiaidh."
+
+#, c-format
+msgid "E344: Can't find directory \"%s\" in cdpath"
+msgstr "E344: N� f�idir comhadlann \"%s\" a aimsi� sa cdpath"
+
+#, c-format
+msgid "E345: Can't find file \"%s\" in path"
+msgstr "E345: N� f�idir comhad \"%s\" a aimsi� sa chonair"
+
+#, c-format
+msgid "E346: No more directory \"%s\" found in cdpath"
+msgstr "E346: N�l comhadlann \"%s\" sa cdpath a thuilleadh"
+
+#, c-format
+msgid "E347: No more file \"%s\" found in path"
+msgstr "E347: N�l comhad \"%s\" sa chonair a thuilleadh"
+
+#, c-format
+msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
+msgstr "E668: M�d m�cheart rochtana ar an chomhad eolas naisc NetBeans: \"%s\""
+
+#, c-format
+msgid "E658: NetBeans connection lost for buffer %ld"
+msgstr "E658: Cailleadh nasc NetBeans le haghaidh maol�in %ld"
+
+msgid "E838: netbeans is not supported with this GUI"
+msgstr "E838: N� thaca�tear le netbeans sa GUI seo"
+
+msgid "E511: netbeans already connected"
+msgstr "E511: T� netbeans ceangailte cheana"
+
+#, c-format
+msgid "E505: %s is read-only (add ! to override)"
+msgstr "E505: T� %s inl�ite amh�in (cuir ! leis chun s�r�)"
+
 msgid "E349: No identifier under cursor"
 msgstr "E349: N�l aitheant�ir faoin ch�rs�ir"
 
-#: ../normal.c:1866
 msgid "E774: 'operatorfunc' is empty"
 msgstr "E774: 'operatorfunc' folamh"
 
-#: ../normal.c:2637
+msgid "E775: Eval feature not available"
+msgstr "E775: N�l an ghn� Eval le f�il"
+
 msgid "Warning: terminal cannot highlight"
 msgstr "Rabhadh: n� f�idir leis an teirmin�al aibhsi�"
 
-#: ../normal.c:2807
 msgid "E348: No string under cursor"
 msgstr "E348: N�l teaghr�n faoin ch�rs�ir"
 
-#: ../normal.c:3937
 msgid "E352: Cannot erase folds with current 'foldmethod'"
 msgstr "E352: N� f�idir fillteacha a l�irscriosadh leis an 'foldmethod' reatha"
 
-#: ../normal.c:5897
 msgid "E664: changelist is empty"
 msgstr "E664: t� liosta na n-athruithe folamh"
 
-#: ../normal.c:5899
 msgid "E662: At start of changelist"
 msgstr "E662: Ag tosach liosta na n-athruithe"
 
-#: ../normal.c:5901
 msgid "E663: At end of changelist"
 msgstr "E663: Ag deireadh liosta na n-athruithe"
 
-#: ../normal.c:7053
-msgid "Type  :quit<Enter>  to exit Nvim"
+msgid "Type  :quit<Enter>  to exit Vim"
 msgstr "Cl�scr�obh  :quit<Enter>  chun Vim a scor"
 
 # ouch - English -ed ?
-#: ../ops.c:248
 #, c-format
 msgid "1 line %sed 1 time"
 msgstr "1 l�ne %s uair amh�in"
 
 # ouch - English -ed ?
-#: ../ops.c:250
 #, c-format
 msgid "1 line %sed %d times"
 msgstr "1 l�ne %s %d uair"
 
 # ouch - English -ed ?
-#: ../ops.c:253
 #, c-format
-msgid "%<PRId64> lines %sed 1 time"
-msgstr "%<PRId64> l�ne %sed uair amh�in"
+msgid "%ld lines %sed 1 time"
+msgstr "%ld l�ne %sed uair amh�in"
 
 # ouch - English -ed ?
-#: ../ops.c:256
 #, c-format
-msgid "%<PRId64> lines %sed %d times"
-msgstr "%<PRId64> l�ne %sed %d uair"
+msgid "%ld lines %sed %d times"
+msgstr "%ld l�ne %sed %d uair"
 
-#: ../ops.c:592
 #, c-format
-msgid "%<PRId64> lines to indent... "
-msgstr "%<PRId64> l�ne le heang�... "
+msgid "%ld lines to indent... "
+msgstr "%ld l�ne le heang�... "
 
-#: ../ops.c:634
 msgid "1 line indented "
 msgstr "eanga�odh l�ne amh�in "
 
-#: ../ops.c:636
 #, c-format
-msgid "%<PRId64> lines indented "
-msgstr "%<PRId64> l�ne eangaithe "
+msgid "%ld lines indented "
+msgstr "%ld l�ne eangaithe "
 
-#: ../ops.c:938
 msgid "E748: No previously used register"
 msgstr "E748: N�l aon tabhall �s�idte roimhe seo"
 
 #. must display the prompt
-#: ../ops.c:1433
 msgid "cannot yank; delete anyway"
 msgstr "n� f�idir a sracadh; scrios mar sin f�in"
 
-#: ../ops.c:1929
 msgid "1 line changed"
 msgstr "athra�odh l�ne amh�in"
 
-#: ../ops.c:1931
 #, c-format
-msgid "%<PRId64> lines changed"
-msgstr "athra�odh %<PRId64> l�ne"
+msgid "%ld lines changed"
+msgstr "athra�odh %ld l�ne"
+
+#, c-format
+msgid "freeing %ld lines"
+msgstr "%ld l�ne � saoradh"
 
-#: ../ops.c:2521
 msgid "block of 1 line yanked"
 msgstr "sracadh bloc de l�ne amh�in"
 
-#: ../ops.c:2523
 msgid "1 line yanked"
 msgstr "sracadh l�ne amh�in"
 
-#: ../ops.c:2525
 #, c-format
-msgid "block of %<PRId64> lines yanked"
-msgstr "sracadh bloc de %<PRId64> l�ne"
+msgid "block of %ld lines yanked"
+msgstr "sracadh bloc de %ld l�ne"
 
-#: ../ops.c:2528
 #, c-format
-msgid "%<PRId64> lines yanked"
-msgstr "%<PRId64> l�ne sractha"
+msgid "%ld lines yanked"
+msgstr "%ld l�ne sractha"
 
-#: ../ops.c:2710
 #, c-format
 msgid "E353: Nothing in register %s"
 msgstr "E353: Tabhall folamh %s"
 
 #. Highlight title
-#: ../ops.c:3185
 msgid ""
 "\n"
 "--- Registers ---"
@@ -4519,11 +4200,9 @@ msgstr ""
 "\n"
 "--- Tabhaill ---"
 
-#: ../ops.c:4455
 msgid "Illegal register name"
 msgstr "Ainm neamhcheadaithe tabhaill"
 
-#: ../ops.c:4533
 msgid ""
 "\n"
 "# Registers:\n"
@@ -4531,185 +4210,175 @@ msgstr ""
 "\n"
 "# Tabhaill:\n"
 
-#: ../ops.c:4575
 #, c-format
 msgid "E574: Unknown register type %d"
 msgstr "E574: Cine�l anaithnid tabhaill %d"
 
-#: ../ops.c:5089
-#, c-format
-msgid "%<PRId64> Cols; "
-msgstr "%<PRId64> Col�n; "
+msgid ""
+"E883: search pattern and expression register may not contain two or more "
+"lines"
+msgstr ""
+"E883: n� cheada�tear n�os m� n� l�ne amh�in i bpatr�n cuardaigh n� sa "
+"slonntabhall"
+
+#, c-format
+msgid "%ld Cols; "
+msgstr "%ld Col�n; "
+
+#, c-format
+msgid "Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Bytes"
+msgstr "Roghna�odh %s%ld as %ld L�ne; %lld as %lld Focal; %lld as %lld Beart"
 
-#: ../ops.c:5097
 #, c-format
 msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Bytes"
+"Selected %s%ld of %ld Lines; %lld of %lld Words; %lld of %lld Chars; %lld of "
+"%lld Bytes"
 msgstr ""
-"Roghna�odh %s%<PRId64> as %<PRId64> L�ne; %<PRId64> as %<PRId64> Focal; "
-"%<PRId64> as %<PRId64> Beart"
+"Roghna�odh %s%ld as %ld L�ne; %lld as %lld Focal; %lld as %lld Carachtar; %lld as %lld Beart"
+
+#, c-format
+msgid "Col %s of %s; Line %ld of %ld; Word %lld of %lld; Byte %lld of %lld"
+msgstr "Col %s as %s; L�ne %ld as %ld; Focal %lld as %lld; Beart %lld as %lld"
 
-#: ../ops.c:5105
 #, c-format
 msgid ""
-"Selected %s%<PRId64> of %<PRId64> Lines; %<PRId64> of %<PRId64> Words; "
-"%<PRId64> of %<PRId64> Chars; %<PRId64> of %<PRId64> Bytes"
+"Col %s of %s; Line %ld of %ld; Word %lld of %lld; Char %lld of %lld; Byte "
+"%lld of %lld"
 msgstr ""
-"Roghna�odh %s%<PRId64> as %<PRId64> L�ne; %<PRId64> as %<PRId64> Focal; "
-"%<PRId64> as %<PRId64> Carachtar; %<PRId64> as %<PRId64> Beart"
+"Col %s as %s; L�ne %ld as %ld; Focal %lld as %lld; Carachtar %lld as %lld; Beart %lld as %lld"
 
-#: ../ops.c:5123
 #, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Byte "
-"%<PRId64> of %<PRId64>"
-msgstr ""
-"Col %s as %s; L�ne %<PRId64> as %<PRId64>; Focal %<PRId64> as %<PRId64>; "
-"Beart %<PRId64> as %<PRId64>"
+msgid "(+%ld for BOM)"
+msgstr "(+%ld do BOM)"
 
-#: ../ops.c:5133
-#, c-format
-msgid ""
-"Col %s of %s; Line %<PRId64> of %<PRId64>; Word %<PRId64> of %<PRId64>; Char "
-"%<PRId64> of %<PRId64>; Byte %<PRId64> of %<PRId64>"
-msgstr ""
-"Col %s as %s; L�ne %<PRId64> as %<PRId64>; Focal %<PRId64> as %<PRId64>; "
-"Carachtar %<PRId64> as %<PRId64>; Beart %<PRId64> as %<PRId64>"
-
-#: ../ops.c:5146
-#, c-format
-msgid "(+%<PRId64> for BOM)"
-msgstr "(+%<PRId64> do BOM)"
-
-#: ../option.c:1238
 msgid "%<%f%h%m%=Page %N"
 msgstr "%<%f%h%m%=Leathanach %N"
 
-#: ../option.c:1574
 msgid "Thanks for flying Vim"
 msgstr "Go raibh m�le maith agat as Vim a �s�id"
 
-#. found a mismatch: skip
-#: ../option.c:2698
 msgid "E518: Unknown option"
 msgstr "E518: Rogha anaithnid"
 
-#: ../option.c:2709
 msgid "E519: Option not supported"
 msgstr "E519: N�l an rogha seo ar f�il"
 
-#: ../option.c:2740
 msgid "E520: Not allowed in a modeline"
 msgstr "E520: N� cheadaithe i m�dl�ne"
 
-#: ../option.c:2815
 msgid "E846: Key code not set"
-msgstr ""
+msgstr "E846: C�d eochrach gan socr�"
 
-#: ../option.c:2924
 msgid "E521: Number required after ="
 msgstr "E521: T� g� le huimhir i ndiaidh ="
 
-#: ../option.c:3226 ../option.c:3864
 msgid "E522: Not found in termcap"
 msgstr "E522: Gan aimsi� sa termcap"
 
-#: ../option.c:3335
 #, c-format
 msgid "E539: Illegal character <%s>"
 msgstr "E539: Carachtar neamhcheadaithe <%s>"
 
-#: ../option.c:3862
+#, c-format
+msgid "For option %s"
+msgstr "Le haghaidh rogha %s"
+
 msgid "E529: Cannot set 'term' to empty string"
 msgstr "E529: N� f�idir 'term' a shocr� mar theaghr�n folamh"
 
-#: ../option.c:3885
+msgid "E530: Cannot change term in GUI"
+msgstr "E530: N� f�idir 'term' a athr� sa GUI"
+
+msgid "E531: Use \":gui\" to start the GUI"
+msgstr "E531: �s�id \":gui\" chun an GUI a chur ag obair"
+
 msgid "E589: 'backupext' and 'patchmode' are equal"
 msgstr "E589: is ionann iad 'backupext' agus 'patchmode'"
 
-#: ../option.c:3964
 msgid "E834: Conflicts with value of 'listchars'"
-msgstr ""
+msgstr "E834: Tagann s� salach ar luach de 'listchars'"
 
-#: ../option.c:3966
 msgid "E835: Conflicts with value of 'fillchars'"
-msgstr ""
+msgstr "E835: Tagann s� salach ar luach de 'fillchars'"
+
+msgid "E617: Cannot be changed in the GTK+ 2 GUI"
+msgstr "E617: N� f�idir � a athr� sa GUI GTK+ 2"
 
-#: ../option.c:4163
 msgid "E524: Missing colon"
 msgstr "E524: Idirstad ar iarraidh"
 
-#: ../option.c:4165
 msgid "E525: Zero length string"
 msgstr "E525: Teaghr�n folamh"
 
-#: ../option.c:4220
 #, c-format
 msgid "E526: Missing number after <%s>"
 msgstr "E526: Uimhir ar iarraidh i ndiaidh <%s>"
 
-#: ../option.c:4232
 msgid "E527: Missing comma"
 msgstr "E527: Cam�g ar iarraidh"
 
-#: ../option.c:4239
 msgid "E528: Must specify a ' value"
 msgstr "E528: Caithfidh luach ' a shonr�"
 
-#: ../option.c:4271
 msgid "E595: contains unprintable or wide character"
 msgstr "E595: t� carachtar neamhghrafach n� leathan ann"
 
-#: ../option.c:4469
+msgid "E596: Invalid font(s)"
+msgstr "E596: Cl�(nna) neamhbhail�"
+
+msgid "E597: can't select fontset"
+msgstr "E597: n� f�idir tacar cl� a roghn�"
+
+msgid "E598: Invalid fontset"
+msgstr "E598: Tacar cl� neamhbhail�"
+
+msgid "E533: can't select wide font"
+msgstr "E533: n� f�idir cl� leathan a roghn�"
+
+msgid "E534: Invalid wide font"
+msgstr "E534: Cl� leathan neamhbhail�"
+
 #, c-format
 msgid "E535: Illegal character after <%c>"
 msgstr "E535: Carachtar neamhbhail� i ndiaidh <%c>"
 
-#: ../option.c:4534
 msgid "E536: comma required"
 msgstr "E536: t� g� le cam�g"
 
-#: ../option.c:4543
 #, c-format
 msgid "E537: 'commentstring' must be empty or contain %s"
 msgstr ""
 "E537: n� m�r %s a bheith i 'commentstring', is � sin n� n� m�r d� a bheith "
 "folamh"
 
-#: ../option.c:4928
+msgid "E538: No mouse support"
+msgstr "E538: Gan taca�ocht luiche"
+
 msgid "E540: Unclosed expression sequence"
 msgstr "E540: Seicheamh gan d�nadh"
 
-#: ../option.c:4932
 msgid "E541: too many items"
 msgstr "E541: an iomarca m�reanna"
 
-#: ../option.c:4934
 msgid "E542: unbalanced groups"
 msgstr "E542: gr�pa� neamhchothromaithe"
 
-#: ../option.c:5148
 msgid "E590: A preview window already exists"
 msgstr "E590: T� fuinneog r�amhamhairc ann cheana"
 
-#: ../option.c:5311
 msgid "W17: Arabic requires UTF-8, do ':set encoding=utf-8'"
 msgstr ""
 "W17: T� UTF-8 ag teast�il le haghaidh Araibise, socraigh � le ':set "
 "encoding=utf-8'"
 
-#: ../option.c:5623
 #, c-format
 msgid "E593: Need at least %d lines"
 msgstr "E593: T� g� le %d l�ne ar a laghad"
 
-#: ../option.c:5631
 #, c-format
 msgid "E594: Need at least %d columns"
 msgstr "E594: T� g� le %d col�n ar a laghad"
 
-#: ../option.c:6011
 #, c-format
 msgid "E355: Unknown option: %s"
 msgstr "E355: Rogha anaithnid: %s"
@@ -4717,12 +4386,10 @@ msgstr "E355: Rogha anaithnid: %s"
 #. There's another character after zeros or the string
 #. * is empty.  In both cases, we are trying to set a
 #. * num option using a string.
-#: ../option.c:6037
 #, c-format
 msgid "E521: Number required: &%s = '%s'"
 msgstr "E521: Uimhir de dh�th: &%s = '%s'"
 
-#: ../option.c:6149
 msgid ""
 "\n"
 "--- Terminal codes ---"
@@ -4730,7 +4397,6 @@ msgstr ""
 "\n"
 "--- C�id teirmin�il ---"
 
-#: ../option.c:6151
 msgid ""
 "\n"
 "--- Global option values ---"
@@ -4738,7 +4404,6 @@ msgstr ""
 "\n"
 "--- Luachanna na roghanna comhchoiteann ---"
 
-#: ../option.c:6153
 msgid ""
 "\n"
 "--- Local option values ---"
@@ -4746,7 +4411,6 @@ msgstr ""
 "\n"
 "--- Luachanna na roghanna log�nta ---"
 
-#: ../option.c:6155
 msgid ""
 "\n"
 "--- Options ---"
@@ -4754,37 +4418,119 @@ msgstr ""
 "\n"
 "--- Roghanna ---"
 
-#: ../option.c:6816
 msgid "E356: get_varp ERROR"
 msgstr "E356: EARR�ID get_varp"
 
-#: ../option.c:7696
 #, c-format
 msgid "E357: 'langmap': Matching character missing for %s"
 msgstr "E357: 'langmap': Carachtar comhoiri�nach ar iarraidh le haghaidh %s"
 
-#: ../option.c:7715
 #, c-format
 msgid "E358: 'langmap': Extra characters after semicolon: %s"
 msgstr "E358: 'langmap': Carachtair breise i ndiaidh an idirstad: %s"
 
-#: ../os/shell.c:194
+msgid "cannot open "
+msgstr "n� f�idir a oscailt: "
+
+msgid "VIM: Can't open window!\n"
+msgstr "VIM: N� f�idir fuinneog a oscailt!\n"
+
+msgid "Need Amigados version 2.04 or later\n"
+msgstr "T� g� le Amigados leagan 2.04 n� n�os d�ana�\n"
+
+#, c-format
+msgid "Need %s version %ld\n"
+msgstr "T� g� le %s, leagan %ld\n"
+
+msgid "Cannot open NIL:\n"
+msgstr "N� f�idir NIL a oscailt:\n"
+
+msgid "Cannot create "
+msgstr "N� f�idir a chruth�: "
+
+#, c-format
+msgid "Vim exiting with %d\n"
+msgstr "Vim � scor le st�das %d\n"
+
+msgid "cannot change console mode ?!\n"
+msgstr "n� f�idir m�d cons�il a athr� ?!\n"
+
+msgid "mch_get_shellsize: not a console??\n"
+msgstr "mch_get_shellsize: n� cons�l � seo??\n"
+
+#. if Vim opened a window: Executing a shell may cause crashes
+msgid "E360: Cannot execute shell with -f option"
+msgstr "E360: N� f�idir blaosc a rith le rogha -f"
+
+msgid "Cannot execute "
+msgstr "N� f�idir blaosc a rith: "
+
+msgid "shell "
+msgstr "blaosc "
+
+msgid " returned\n"
+msgstr " aisfhilleadh\n"
+
+msgid "ANCHOR_BUF_SIZE too small."
+msgstr "ANCHOR_BUF_SIZE r�bheag."
+
+msgid "I/O ERROR"
+msgstr "EARR�ID I/A"
+
+msgid "Message"
+msgstr "Teachtaireacht"
+
+msgid "E237: Printer selection failed"
+msgstr "E237: Theip ar roghn� print�ara"
+
+#, c-format
+msgid "to %s on %s"
+msgstr "go %s ar %s"
+
+#, c-format
+msgid "E613: Unknown printer font: %s"
+msgstr "E613: Cl�fhoireann anaithnid print�ara: %s"
+
+#, c-format
+msgid "E238: Print error: %s"
+msgstr "E238: Earr�id phriont�la: %s"
+
+#, c-format
+msgid "Printing '%s'"
+msgstr "'%s' � phriont�il"
+
+#, c-format
+msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
+msgstr ""
+"E244: Ainm neamhcheadaithe ar thacar carachtar \"%s\" mar ph�irt d'ainm cl� "
+"\"%s\""
+
+#, c-format
+msgid "E244: Illegal quality name \"%s\" in font name \"%s\""
+msgstr ""
+"E244: Ainm neamhcheadaithe ar ch�il�ocht \"%s\" in ainm cl� \"%s\""
+
+#, c-format
+msgid "E245: Illegal char '%c' in font name \"%s\""
+msgstr "E245: Carachtar neamhcheadaithe '%c' mar ph�irt d'ainm cl� \"%s\""
+
+#, c-format
+msgid "Opening the X display took %ld msec"
+msgstr "Th�g %ld ms chun an sc�ile�n X a oscailt"
+
 msgid ""
 "\n"
-"Cannot execute shell "
+"Vim: Got X error\n"
 msgstr ""
 "\n"
-"N� f�idir blaosc a rith "
+"Vim: Fuarthas earr�id � X\n"
 
-#: ../os/shell.c:439
-msgid ""
-"\n"
-"shell returned "
-msgstr ""
-"\n"
-"d'aisfhill an bhlaosc "
+msgid "Testing the X display failed"
+msgstr "Theip ar th�st�il an sc�ile�in X"
+
+msgid "Opening the X display timed out"
+msgstr "Oscailt an sc�ile�in X thar am"
 
-#: ../os_unix.c:465 ../os_unix.c:471
 msgid ""
 "\n"
 "Could not get security context for "
@@ -4792,7 +4538,6 @@ msgstr ""
 "\n"
 "N�orbh fh�idir comhth�acs sl�nd�la a fh�il le haghaidh "
 
-#: ../os_unix.c:479
 msgid ""
 "\n"
 "Could not set security context for "
@@ -4800,456 +4545,498 @@ msgstr ""
 "\n"
 "N�orbh fh�idir comhth�acs sl�nd�la a shocr� le haghaidh "
 
-#: ../os_unix.c:1558 ../os_unix.c:1647
+#, c-format
+msgid "Could not set security context %s for %s"
+msgstr "N�orbh fh�idir comhth�acs sl�nd�la %s a shocr� le haghaidh %s"
+
+#, c-format
+msgid "Could not get security context %s for %s. Removing it!"
+msgstr "N�orbh fh�idir comhth�acs sl�nd�la %s a fh�il le haghaidh %s. � bhaint!"
+
+msgid ""
+"\n"
+"Cannot execute shell sh\n"
+msgstr ""
+"\n"
+"N� f�idir an bhlaosc sh a rith\n"
+
+msgid ""
+"\n"
+"shell returned "
+msgstr ""
+"\n"
+"d'aisfhill an bhlaosc "
+
+msgid ""
+"\n"
+"Cannot create pipes\n"
+msgstr ""
+"\n"
+"N� f�idir p�opa� a chruth�\n"
+
+# "fork" not in standard refs/corpus.  Maybe want a "gabhl*" word instead? -KPS
+msgid ""
+"\n"
+"Cannot fork\n"
+msgstr ""
+"\n"
+"N� f�idir forc a dh�anamh\n"
+
+msgid ""
+"\n"
+"Cannot execute shell "
+msgstr ""
+"\n"
+"N� f�idir blaosc a rith "
+
+msgid ""
+"\n"
+"Command terminated\n"
+msgstr ""
+"\n"
+"Ord� cr�ochnaithe\n"
+
+msgid "XSMP lost ICE connection"
+msgstr "Chaill XSMP an nasc ICE"
+
 #, c-format
 msgid "dlerror = \"%s\""
 msgstr "dlerror = \"%s\""
 
-#: ../path.c:1449
-#, c-format
-msgid "E447: Can't find file \"%s\" in path"
-msgstr "E447: N�l aon fh�il ar chomhad \"%s\" sa chonair"
+msgid "Opening the X display failed"
+msgstr "Theip ar oscailt an sc�ile�in X"
+
+msgid "XSMP handling save-yourself request"
+msgstr "Iarratas s�bh�il-do-f�in � l�imhse�il ag XSMP"
+
+msgid "XSMP opening connection"
+msgstr "Nasc � oscailt ag XSMP"
+
+msgid "XSMP ICE connection watch failed"
+msgstr "Theip ar fhaire nasc ICE XSMP"
+
+#, c-format
+msgid "XSMP SmcOpenConnection failed: %s"
+msgstr "Theip ar XSMP SmcOpenConnection: %s"
+
+msgid "At line"
+msgstr "Ag l�ne"
+
+msgid "Could not load vim32.dll!"
+msgstr "N�orbh fh�idir vim32.dll a lucht�!"
+
+msgid "VIM Error"
+msgstr "Earr�id VIM"
+
+msgid "Could not fix up function pointers to the DLL!"
+msgstr "N�orbh fh�idir pointeoir� feidhme a ch�iri� i gcomhair an DLL!"
+
+#, c-format
+msgid "Vim: Caught %s event\n"
+msgstr "Vim: Fuarthas teagmhas %s\n"
+
+msgid "close"
+msgstr "d�n"
+
+msgid "logoff"
+msgstr "log�il amach"
+
+msgid "shutdown"
+msgstr "m�chadh"
+
+msgid "E371: Command not found"
+msgstr "E371: N� bhfuarthas an t-ord�"
+
+msgid ""
+"VIMRUN.EXE not found in your $PATH.\n"
+"External commands will not pause after completion.\n"
+"See  :help win32-vimrun  for more information."
+msgstr ""
+"N�or aims�odh VIMRUN.EXE i do $PATH.\n"
+"N� mhoilleoidh orduithe seachtracha agus iad curtha i gcr�ch.\n"
+"F�ach ar  :help win32-vimrun  chun n�os m� eolas a fh�il."
+
+msgid "Vim Warning"
+msgstr "Rabhadh Vim"
+
+#, c-format
+msgid "shell returned %d"
+msgstr "d'aisfhill an bhlaosc %d"
 
-#: ../quickfix.c:359
 #, c-format
 msgid "E372: Too many %%%c in format string"
 msgstr "E372: An iomarca %%%c i dteaghr�n form�ide"
 
-#: ../quickfix.c:371
 #, c-format
 msgid "E373: Unexpected %%%c in format string"
 msgstr "E373: %%%c gan choinne i dteaghr�n form�ide"
 
-#: ../quickfix.c:420
 msgid "E374: Missing ] in format string"
 msgstr "E374: ] ar iarraidh i dteaghr�n form�ide"
 
-#: ../quickfix.c:431
 #, c-format
 msgid "E375: Unsupported %%%c in format string"
 msgstr "E375: %%%c gan taca�ocht i dteaghr�n form�ide"
 
-#: ../quickfix.c:448
 #, c-format
 msgid "E376: Invalid %%%c in format string prefix"
 msgstr "E376: %%%c neamhbhail� i r�im�r an teaghr�in form�ide"
 
-#: ../quickfix.c:454
 #, c-format
 msgid "E377: Invalid %%%c in format string"
 msgstr "E377: %%%c neamhbhail� i dteaghr�n form�ide"
 
 #. nothing found
-#: ../quickfix.c:477
 msgid "E378: 'errorformat' contains no pattern"
 msgstr "E378: N�l aon phatr�n i 'errorformat'"
 
-#: ../quickfix.c:695
 msgid "E379: Missing or empty directory name"
 msgstr "E379: Ainm comhadlainne ar iarraidh, n� folamh"
 
-#: ../quickfix.c:1305
 msgid "E553: No more items"
 msgstr "E553: N�l aon mh�r eile"
 
-#: ../quickfix.c:1674
+msgid "E924: Current window was closed"
+msgstr "E924: D�nadh an fhuinneog reatha"
+
+msgid "E925: Current quickfix was changed"
+msgstr "E925: Athra�odh an mearcheart�ch�n reatha"
+
+msgid "E926: Current location list was changed"
+msgstr "E926: Athra�odh an liosta su�omh reatha"
+
 #, c-format
 msgid "(%d of %d)%s%s: "
 msgstr "(%d as %d)%s%s: "
 
-#: ../quickfix.c:1676
 msgid " (line deleted)"
 msgstr " (l�ne scriosta)"
 
-#: ../quickfix.c:1863
-msgid "E380: At bottom of quickfix stack"
-msgstr "E380: In �ochtar na cruaiche quickfix"
-
-#: ../quickfix.c:1869
-msgid "E381: At top of quickfix stack"
-msgstr "E381: In uachtar na cruaiche quickfix"
-
-#: ../quickfix.c:1880
 #, c-format
-msgid "error list %d of %d; %d errors"
-msgstr "liosta earr�id� %d as %d; %d earr�id"
+msgid "%serror list %d of %d; %d errors "
+msgstr "%sliosta earr�id� %d as %d; %d earr�id "
+
+msgid "E380: At bottom of quickfix stack"
+msgstr "E380: In �ochtar chruach na mearcheart�ch�n"
+
+msgid "E381: At top of quickfix stack"
+msgstr "E381: In uachtar chruach na mearcheart�ch�n"
+
+msgid "No entries"
+msgstr "Gan iontr�il"
 
-#: ../quickfix.c:2427
 msgid "E382: Cannot write, 'buftype' option is set"
 msgstr "E382: N� f�idir scr�obh, rogha 'buftype' socraithe"
 
-#: ../quickfix.c:2812
+msgid "Error file"
+msgstr "Comhad earr�ide"
+
 msgid "E683: File name missing or invalid pattern"
 msgstr "E683: Ainm comhaid ar iarraidh, n� patr�n neamhbhail�"
 
-#: ../quickfix.c:2911
 #, c-format
 msgid "Cannot open file \"%s\""
 msgstr "N� f�idir comhad \"%s\" a oscailt"
 
-#: ../quickfix.c:3429
 msgid "E681: Buffer is not loaded"
 msgstr "E681: N�l an maol�n luchtaithe"
 
-#: ../quickfix.c:3487
 msgid "E777: String or List expected"
 msgstr "E777: Bh�othas ag s�il le Teaghr�n n� Liosta"
 
-#: ../regexp.c:359
 #, c-format
 msgid "E369: invalid item in %s%%[]"
 msgstr "E369: m�r neamhbhail� i %s%%[]"
 
-#: ../regexp.c:374
 #, c-format
 msgid "E769: Missing ] after %s["
 msgstr "E769: ] ar iarraidh i ndiaidh %s["
 
-#: ../regexp.c:375
 #, c-format
 msgid "E53: Unmatched %s%%("
 msgstr "E53: %s%%( corr"
 
-#: ../regexp.c:376
 #, c-format
 msgid "E54: Unmatched %s("
 msgstr "E54: %s( corr"
 
-#: ../regexp.c:377
 #, c-format
 msgid "E55: Unmatched %s)"
 msgstr "E55: %s) corr"
 
-#: ../regexp.c:378
 msgid "E66: \\z( not allowed here"
 msgstr "E66: n� cheada�tear \\z( anseo"
 
-#: ../regexp.c:379
 msgid "E67: \\z1 et al. not allowed here"
 msgstr "E67: n� cheada�tear \\z1 et al. anseo"
 
-#: ../regexp.c:380
 #, c-format
 msgid "E69: Missing ] after %s%%["
 msgstr "E69: ] ar iarraidh i ndiaidh %s%%["
 
-#: ../regexp.c:381
 #, c-format
 msgid "E70: Empty %s%%[]"
 msgstr "E70: %s%%[] folamh"
 
-#: ../regexp.c:1209 ../regexp.c:1224
 msgid "E339: Pattern too long"
 msgstr "E339: Slonn r�fhada"
 
-#: ../regexp.c:1371
 msgid "E50: Too many \\z("
 msgstr "E50: an iomarca \\z("
 
-#: ../regexp.c:1378
 #, c-format
 msgid "E51: Too many %s("
 msgstr "E51: an iomarca %s("
 
-#: ../regexp.c:1427
 msgid "E52: Unmatched \\z("
 msgstr "E52: \\z( corr"
 
-#: ../regexp.c:1637
 #, c-format
 msgid "E59: invalid character after %s@"
 msgstr "E59: carachtar neamhbhail� i ndiaidh %s@"
 
-#: ../regexp.c:1672
 #, c-format
 msgid "E60: Too many complex %s{...}s"
 msgstr "E60: An iomarca %s{...} coimpl�ascach"
 
-#: ../regexp.c:1687
 #, c-format
 msgid "E61: Nested %s*"
 msgstr "E61: %s* neadaithe"
 
-#: ../regexp.c:1690
 #, c-format
 msgid "E62: Nested %s%c"
 msgstr "E62: %s%c neadaithe"
 
-#: ../regexp.c:1800
 msgid "E63: invalid use of \\_"
 msgstr "E63: �s�id neamhbhail� de \\_"
 
-#: ../regexp.c:1850
 #, c-format
 msgid "E64: %s%c follows nothing"
 msgstr "E64: n�l aon rud roimh %s%c"
 
-#: ../regexp.c:1902
 msgid "E65: Illegal back reference"
 msgstr "E65: C�ltagairt neamhbhail�"
 
-#: ../regexp.c:1943
 msgid "E68: Invalid character after \\z"
 msgstr "E68: Carachtar neamhbhail� i ndiaidh \\z"
 
-#: ../regexp.c:2049 ../regexp_nfa.c:1296
 #, c-format
 msgid "E678: Invalid character after %s%%[dxouU]"
 msgstr "E678: Carachtar neamhbhail� i ndiaidh %s%%[dxouU]"
 
-#: ../regexp.c:2107
 #, c-format
 msgid "E71: Invalid character after %s%%"
 msgstr "E71: Carachtar neamhbhail� i ndiaidh %s%%"
 
-#: ../regexp.c:3017
 #, c-format
 msgid "E554: Syntax error in %s{...}"
 msgstr "E554: Earr�id chomhr�ire i %s{...}"
 
-#: ../regexp.c:3805
 msgid "External submatches:\n"
 msgstr "Fo-mheaitse�il sheachtrach:\n"
 
-#: ../regexp.c:7022
+#, c-format
+msgid "E888: (NFA regexp) cannot repeat %s"
+msgstr "E888: (slonn NFA) n� f�idir %s a athdh�anamh"
+
 msgid ""
 "E864: \\%#= can only be followed by 0, 1, or 2. The automatic engine will be "
 "used "
 msgstr ""
+"E864: N� cheada�tear ach 0, 1, n� 2 tar �is \\%#=. �s�idfear an t-inneall "
+"uathoibr�och "
 
-#: ../regexp_nfa.c:239
-msgid "E865: (NFA) Regexp end encountered prematurely"
+msgid "Switching to backtracking RE engine for pattern: "
 msgstr ""
+"Ag athr� go dt� an t-inneall rianaithe siar le haghaidh an phatr�in seo: "
+
+msgid "E865: (NFA) Regexp end encountered prematurely"
+msgstr "E865: (NFA) Th�ngthas ar dheireadh an tsloinn gan s�il leis"
 
-#: ../regexp_nfa.c:240
 #, c-format
 msgid "E866: (NFA regexp) Misplaced %c"
-msgstr ""
+msgstr "E866: (slonn NFA) %c as �it"
 
-#: ../regexp_nfa.c:242
 #, c-format
-msgid "E877: (NFA regexp) Invalid character class: %<PRId64>"
-msgstr ""
+msgid "E877: (NFA regexp) Invalid character class: %ld"
+msgstr "E877: (slonn NFA) Aicme carachtar neamhbhail�: %ld"
 
-#: ../regexp_nfa.c:1261
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\z%c'"
-msgstr ""
+msgstr "E867: (NFA) Oibreoir anaithnid '\\z%c'"
 
-#: ../regexp_nfa.c:1387
 #, c-format
 msgid "E867: (NFA) Unknown operator '\\%%%c'"
-msgstr ""
+msgstr "E867: (NFA) Oibreoir anaithnid '\\%%%c'"
+
+#. should never happen
+msgid "E868: Error building NFA with equivalence class!"
+msgstr "E868: Earr�id agus NFA � th�g�il le haicme coibh�ise!"
 
-#: ../regexp_nfa.c:1802
 #, c-format
 msgid "E869: (NFA) Unknown operator '\\@%c'"
-msgstr ""
+msgstr "E869: (NFA) Oibreoir anaithnid '\\@%c'"
 
-#: ../regexp_nfa.c:1831
 msgid "E870: (NFA regexp) Error reading repetition limits"
-msgstr ""
+msgstr "E870: (slonn NFA) Earr�id agus teorainneacha athdh�anta � l�amh"
 
 #. Can't have a multi follow a multi.
-#: ../regexp_nfa.c:1895
 msgid "E871: (NFA regexp) Can't have a multi follow a multi !"
-msgstr ""
+msgstr "E871: (slonn NFA) N� cheada�tear ilchodach tar �is ilchodach!"
 
 #. Too many `('
-#: ../regexp_nfa.c:2037
 msgid "E872: (NFA regexp) Too many '('"
-msgstr ""
+msgstr "E872: (slonn NFA) An iomarca '('"
 
-#: ../regexp_nfa.c:2042
-#, fuzzy
 msgid "E879: (NFA regexp) Too many \\z("
-msgstr "E50: an iomarca \\z("
+msgstr "E879: (slonn NFA) An iomarca \\z("
 
-#: ../regexp_nfa.c:2066
 msgid "E873: (NFA regexp) proper termination error"
-msgstr ""
+msgstr "E873: (slonn NFA) cr�ochn� neamhoiri�nach"
 
-#: ../regexp_nfa.c:2599
 msgid "E874: (NFA) Could not pop the stack !"
-msgstr ""
+msgstr "E874: (NFA) N�orbh fh�idir an chruach a phlobadh!"
 
-#: ../regexp_nfa.c:3298
 msgid ""
 "E875: (NFA regexp) (While converting from postfix to NFA), too many states "
 "left on stack"
 msgstr ""
+"E875: (slonn NFA) (Le linn tiontaithe � postfix go NFA), an iomarca "
+"staideanna f�gtha ar an gcruach"
 
-#: ../regexp_nfa.c:3302
 msgid "E876: (NFA regexp) Not enough space to store the whole NFA "
-msgstr ""
+msgstr "E876: (slonn NFA) N�l go leor sp�is ann don NFA ioml�n "
+
+msgid "E878: (NFA) Could not allocate memory for branch traversal!"
+msgstr ""
+"E878: (NFA) N�orbh fh�idir cuimhne a leithdh�ileadh leis an gcraobh a "
+"thrasna�l!"
 
-#: ../regexp_nfa.c:4571 ../regexp_nfa.c:4869
 msgid ""
 "Could not open temporary log file for writing, displaying on stderr ... "
 msgstr ""
+"N�orbh fh�idir logchomhad sealadach a oscailt le scr�obh ann, � thaispe�int "
+"ar stderr..."
 
-#: ../regexp_nfa.c:4840
 #, c-format
 msgid "(NFA) COULD NOT OPEN %s !"
-msgstr ""
+msgstr "(NFA) N�ORBH FH�IDIR %s A OSCAILT!"
 
-#: ../regexp_nfa.c:6049
-#, fuzzy
 msgid "Could not open temporary log file for writing "
-msgstr "E214: N� f�idir comhad sealadach a aimsi� chun scr�obh ann"
+msgstr "N�orbh fh�idir logchomhad sealadach a oscailt le scr�obh ann "
 
-#: ../screen.c:7435
 msgid " VREPLACE"
 msgstr " V-IONADAIGH"
 
-#: ../screen.c:7437
 msgid " REPLACE"
 msgstr " ATHCHUR"
 
-#: ../screen.c:7440
 msgid " REVERSE"
 msgstr " TIONT�"
 
-#: ../screen.c:7441
 msgid " INSERT"
 msgstr " IONS�"
 
-#: ../screen.c:7443
 msgid " (insert)"
 msgstr " (ions�igh)"
 
-#: ../screen.c:7445
 msgid " (replace)"
 msgstr " (ionadaigh)"
 
-#: ../screen.c:7447
 msgid " (vreplace)"
 msgstr " (v-ionadaigh)"
 
-#: ../screen.c:7449
 msgid " Hebrew"
 msgstr " Eabhrais"
 
-#: ../screen.c:7454
 msgid " Arabic"
 msgstr " Araibis"
 
-#: ../screen.c:7456
-msgid " (lang)"
-msgstr " (teanga)"
-
-#: ../screen.c:7459
 msgid " (paste)"
 msgstr " (greamaigh)"
 
-#: ../screen.c:7469
 msgid " VISUAL"
 msgstr " RADHARCACH"
 
-#: ../screen.c:7470
 msgid " VISUAL LINE"
 msgstr " L�NE RADHARCACH"
 
-#: ../screen.c:7471
 msgid " VISUAL BLOCK"
 msgstr " BLOC RADHARCACH"
 
-#: ../screen.c:7472
 msgid " SELECT"
 msgstr " ROGHN�"
 
-#: ../screen.c:7473
 msgid " SELECT LINE"
 msgstr " SELECT LINE"
 
-#: ../screen.c:7474
 msgid " SELECT BLOCK"
 msgstr " SELECT BLOCK"
 
-#: ../screen.c:7486 ../screen.c:7541
 msgid "recording"
 msgstr "� thaifeadadh"
 
-#: ../search.c:487
 #, c-format
 msgid "E383: Invalid search string: %s"
 msgstr "E383: Teaghr�n cuardaigh neamhbhail�: %s"
 
-#: ../search.c:832
 #, c-format
 msgid "E384: search hit TOP without match for: %s"
 msgstr "E384: bhuail an cuardach an BARR gan teaghr�n comhoiri�nach le %s"
 
-#: ../search.c:835
 #, c-format
 msgid "E385: search hit BOTTOM without match for: %s"
 msgstr "E385: bhuail an cuardach an BUN gan teaghr�n comhoiri�nach le %s"
 
-#: ../search.c:1200
 msgid "E386: Expected '?' or '/'  after ';'"
 msgstr "E386: Ag s�il le '?' n� '/'  i ndiaidh ';'"
 
-#: ../search.c:4085
 msgid " (includes previously listed match)"
 msgstr " (t� an teaghr�n comhoiri�naithe roimhe seo san �ireamh)"
 
 #. cursor at status line
-#: ../search.c:4104
 msgid "--- Included files "
 msgstr "--- Comhaid cheannt�isc "
 
-#: ../search.c:4106
 msgid "not found "
 msgstr "gan aimsi�"
 
-#: ../search.c:4107
 msgid "in path ---\n"
 msgstr "i gconair ---\n"
 
-#: ../search.c:4168
 msgid "  (Already listed)"
 msgstr "  (Liostaithe cheana f�in)"
 
-#: ../search.c:4170
 msgid "  NOT FOUND"
 msgstr "  AR IARRAIDH"
 
-#: ../search.c:4211
 #, c-format
 msgid "Scanning included file: %s"
 msgstr "Comhad ceannt�isc � scanadh: %s"
 
-#: ../search.c:4216
 #, c-format
 msgid "Searching included file %s"
 msgstr "Comhad ceannt�isc %s � chuardach"
 
-#: ../search.c:4405
 msgid "E387: Match is on current line"
 msgstr "E387: T� an teaghr�n comhoiri�naithe ar an l�ne reatha"
 
-#: ../search.c:4517
 msgid "All included files were found"
 msgstr "Aims�odh gach comhad ceannt�isc"
 
-#: ../search.c:4519
 msgid "No included files"
 msgstr "Gan comhaid cheannt�isc"
 
-#: ../search.c:4527
 msgid "E388: Couldn't find definition"
 msgstr "E388: Sainmh�ni� gan aimsi�"
 
-#: ../search.c:4529
 msgid "E389: Couldn't find pattern"
 msgstr "E389: Patr�n gan aimsi�"
 
-#: ../search.c:4668
 msgid "Substitute "
 msgstr "Ionad� "
 
 # in .viminfo
-#: ../search.c:4681
 #, c-format
 msgid ""
 "\n"
@@ -5260,98 +5047,130 @@ msgstr ""
 "# %sPatr�n Cuardaigh Is D�ana�:\n"
 "~"
 
-#: ../spell.c:951
-msgid "E759: Format error in spell file"
-msgstr "E759: Earr�id fhorm�ide i gcomhad litrithe"
-
-#: ../spell.c:952
-msgid "E758: Truncated spell file"
-msgstr "E758: Comhad teasctha litrithe"
-
-#: ../spell.c:953
-#, c-format
-msgid "Trailing text in %s line %d: %s"
-msgstr "T�acs chun deiridh i %s l�ne %d: %s"
-
-#: ../spell.c:954
-#, c-format
-msgid "Affix name too long in %s line %d: %s"
-msgstr "Ainm foircinn r�fhada i %s l�ne %d: %s"
-
-#: ../spell.c:955
-msgid "E761: Format error in affix file FOL, LOW or UPP"
-msgstr "E761: Earr�id fhorm�ide i gcomhad foircinn FOL, LOW, n� UPP"
-
-#: ../spell.c:957
-msgid "E762: Character in FOL, LOW or UPP is out of range"
-msgstr "E762: Carachtar i FOL, LOW n� UPP as raon"
-
-#: ../spell.c:958
-msgid "Compressing word tree..."
-msgstr "Crann focal � chomhbhr�..."
-
-#: ../spell.c:1951
 msgid "E756: Spell checking is not enabled"
 msgstr "E756: N�l seice�il litrithe cumasaithe"
 
-#: ../spell.c:2249
+#, c-format
+msgid "Warning: Cannot find word list \"%s_%s.spl\" or \"%s_ascii.spl\""
+msgstr ""
+"Rabhadh: N� f�idir liosta focal \"%s_%s.spl\" n� \"%s_ascii.spl\" a aimsi�"
+
 #, c-format
 msgid "Warning: Cannot find word list \"%s.%s.spl\" or \"%s.ascii.spl\""
 msgstr ""
 "Rabhadh: N� f�idir liosta focal \"%s.%s.spl\" n� \"%s.ascii.spl\" a aimsi�"
 
-#: ../spell.c:2473
-#, c-format
-msgid "Reading spell file \"%s\""
-msgstr "Comhad litrithe \"%s\" � l�amh"
+msgid "E797: SpellFileMissing autocommand deleted buffer"
+msgstr "E797: Scrios uathord� SpellFileMissing an maol�n"
 
-#: ../spell.c:2496
-msgid "E757: This does not look like a spell file"
-msgstr "E757: N�l s� cos�il le comhad litrithe"
-
-#: ../spell.c:2501
-msgid "E771: Old spell file, needs to be updated"
-msgstr "E771: Seanchomhad litrithe, t� g� lena nuashonr�"
-
-#: ../spell.c:2504
-msgid "E772: Spell file is for newer version of Vim"
-msgstr "E772: Oibr�onn an comhad litrithe le leagan n�os nua� de Vim"
-
-#: ../spell.c:2602
-msgid "E770: Unsupported section in spell file"
-msgstr "E770: Rann�n gan taca�ocht i gcomhad litrithe"
-
-#: ../spell.c:3762
 #, c-format
 msgid "Warning: region %s not supported"
 msgstr "Rabhadh: r�igi�n %s gan taca�ocht"
 
-#: ../spell.c:4550
+msgid "Sorry, no suggestions"
+msgstr "T� br�n orm, n�l aon mholadh ann"
+
+#, c-format
+msgid "Sorry, only %ld suggestions"
+msgstr "T� br�n orm, n�l ach %ld moladh ann"
+
+#. for when 'cmdheight' > 1
+#. avoid more prompt
+#, c-format
+msgid "Change \"%.*s\" to:"
+msgstr "Athraigh \"%.*s\" go:"
+
+#, c-format
+msgid " < \"%.*s\""
+msgstr " < \"%.*s\""
+
+msgid "E752: No previous spell replacement"
+msgstr "E752: N�l aon ionada� litrithe roimhe seo"
+
+#, c-format
+msgid "E753: Not found: %s"
+msgstr "E753: Gan aimsi�: %s"
+
+msgid "E758: Truncated spell file"
+msgstr "E758: Comhad teasctha litrithe"
+
+#, c-format
+msgid "Trailing text in %s line %d: %s"
+msgstr "T�acs chun deiridh i %s l�ne %d: %s"
+
+#, c-format
+msgid "Affix name too long in %s line %d: %s"
+msgstr "Ainm foircinn r�fhada i %s l�ne %d: %s"
+
+msgid "E761: Format error in affix file FOL, LOW or UPP"
+msgstr "E761: Earr�id fhorm�ide i gcomhad foircinn FOL, LOW, n� UPP"
+
+msgid "E762: Character in FOL, LOW or UPP is out of range"
+msgstr "E762: Carachtar i FOL, LOW n� UPP as raon"
+
+msgid "Compressing word tree..."
+msgstr "Crann focal � chomhbhr�..."
+
+#, c-format
+msgid "Reading spell file \"%s\""
+msgstr "Comhad litrithe \"%s\" � l�amh"
+
+msgid "E757: This does not look like a spell file"
+msgstr "E757: N�l s� cos�il le comhad litrithe"
+
+msgid "E771: Old spell file, needs to be updated"
+msgstr "E771: Seanchomhad litrithe, t� g� lena nuashonr�"
+
+msgid "E772: Spell file is for newer version of Vim"
+msgstr "E772: Oibr�onn an comhad litrithe le leagan n�os nua� de Vim"
+
+msgid "E770: Unsupported section in spell file"
+msgstr "E770: Rann�n gan taca�ocht i gcomhad litrithe"
+
+#, c-format
+msgid "E778: This does not look like a .sug file: %s"
+msgstr "E778: N�l s� cos�il le comhad .sug: %s"
+
+#, c-format
+msgid "E779: Old .sug file, needs to be updated: %s"
+msgstr "E779: Seanchomhad .sug, t� g� lena nuashonr�: %s"
+
+#, c-format
+msgid "E780: .sug file is for newer version of Vim: %s"
+msgstr "E780: Oibr�onn an comhad .sug le leagan n�os nua� de Vim: %s"
+
+#, c-format
+msgid "E781: .sug file doesn't match .spl file: %s"
+msgstr "E781: N�l an comhad .sug comhoiri�nach leis an gcomhad .spl: %s"
+
+#, c-format
+msgid "E782: error while reading .sug file: %s"
+msgstr "E782: earr�id agus comhad .sug � l�amh: %s"
+
 #, c-format
 msgid "Reading affix file %s ..."
 msgstr "Comhad foircinn %s � l�amh..."
 
-#: ../spell.c:4589 ../spell.c:5635 ../spell.c:6140
 #, c-format
 msgid "Conversion failure for word in %s line %d: %s"
 msgstr "Theip ar thiont� focail i %s l�ne %d: %s"
 
-#: ../spell.c:4630 ../spell.c:6170
 #, c-format
 msgid "Conversion in %s not supported: from %s to %s"
 msgstr "Tiont� i %s gan taca�ocht: � %s go %s"
 
-#: ../spell.c:4642
+#, c-format
+msgid "Conversion in %s not supported"
+msgstr "Tiont� i %s gan taca�ocht"
+
 #, c-format
 msgid "Invalid value for FLAG in %s line %d: %s"
 msgstr "Luach neamhbhail� ar FLAG i %s l�ne %d: %s"
 
-#: ../spell.c:4655
 #, c-format
 msgid "FLAG after using flags in %s line %d: %s"
 msgstr "FLAG i ndiaidh bratacha in �s�id i %s l�ne %d: %s"
 
-#: ../spell.c:4723
 #, c-format
 msgid ""
 "Defining COMPOUNDFORBIDFLAG after PFX item may give wrong results in %s line "
@@ -5360,7 +5179,6 @@ msgstr ""
 "Seans go bhfaighfidh t� tortha� m�chearta m� chuireann t� COMPOUNDFORBIDFLAG "
 "tar �is m�re PFX i %s l�ne %d"
 
-#: ../spell.c:4731
 #, c-format
 msgid ""
 "Defining COMPOUNDPERMITFLAG after PFX item may give wrong results in %s line "
@@ -5369,42 +5187,34 @@ msgstr ""
 "Seans go bhfaighfidh t� tortha� m�chearta m� chuireann t� COMPOUNDPERMITFLAG "
 "tar �is m�re PFX i %s l�ne %d"
 
-#: ../spell.c:4747
 #, c-format
 msgid "Wrong COMPOUNDRULES value in %s line %d: %s"
 msgstr "Luach m�cheart ar COMPOUNDRULES i %s l�ne %d: %s"
 
-#: ../spell.c:4771
 #, c-format
 msgid "Wrong COMPOUNDWORDMAX value in %s line %d: %s"
 msgstr "Luach m�cheart ar COMPOUNDWORDMAX i %s l�ne %d: %s"
 
-#: ../spell.c:4777
 #, c-format
 msgid "Wrong COMPOUNDMIN value in %s line %d: %s"
 msgstr "Luach m�cheart ar COMPOUNDMIN i %s l�ne %d: %s"
 
-#: ../spell.c:4783
 #, c-format
 msgid "Wrong COMPOUNDSYLMAX value in %s line %d: %s"
 msgstr "Luach m�cheart ar COMPOUNDSYLMAX i %s l�ne %d: %s"
 
-#: ../spell.c:4795
 #, c-format
 msgid "Wrong CHECKCOMPOUNDPATTERN value in %s line %d: %s"
 msgstr "Luach m�cheart ar CHECKCOMPOUNDPATTERN i %s l�ne %d: %s"
 
-#: ../spell.c:4847
 #, c-format
 msgid "Different combining flag in continued affix block in %s line %d: %s"
 msgstr "Bratach dhifri�il cheangail i mbloc leanta foircinn i %s l�ne %d: %s"
 
-#: ../spell.c:4850
 #, c-format
 msgid "Duplicate affix in %s line %d: %s"
 msgstr "Clib dh�blach i %s l�ne %d: %s"
 
-#: ../spell.c:4871
 #, c-format
 msgid ""
 "Affix also used for BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/NOSUGGEST in %s "
@@ -5413,335 +5223,230 @@ msgstr ""
 "Foirceann in �s�id le haghaidh BAD/RARE/KEEPCASE/NEEDAFFIX/NEEDCOMPOUND/"
 "NOSUGGEST freisin i %s l�ne %d: %s"
 
-#: ../spell.c:4893
 #, c-format
 msgid "Expected Y or N in %s line %d: %s"
 msgstr "Bh�othas ag s�il le `Y' n� `N' i %s l�ne %d: %s"
 
-#: ../spell.c:4968
 #, c-format
 msgid "Broken condition in %s line %d: %s"
 msgstr "Coinn�oll briste i %s l�ne %d: %s"
 
-#: ../spell.c:5091
 #, c-format
 msgid "Expected REP(SAL) count in %s line %d"
 msgstr "Bh�othas ag s�il le l�on na REP(SAL) i %s l�ne %d"
 
-#: ../spell.c:5120
 #, c-format
 msgid "Expected MAP count in %s line %d"
 msgstr "Bh�othas ag s�il le l�on na MAP i %s l�ne %d"
 
-#: ../spell.c:5132
 #, c-format
 msgid "Duplicate character in MAP in %s line %d"
 msgstr "Carachtar d�blach i MAP i %s l�ne %d"
 
-#: ../spell.c:5176
 #, c-format
 msgid "Unrecognized or duplicate item in %s line %d: %s"
 msgstr "M�r anaithnid n� dh�blach i %s l�ne %d: %s"
 
-#: ../spell.c:5197
 #, c-format
 msgid "Missing FOL/LOW/UPP line in %s"
 msgstr "L�ne FOL/LOW/UPP ar iarraidh i %s"
 
-#: ../spell.c:5220
 msgid "COMPOUNDSYLMAX used without SYLLABLE"
 msgstr "COMPOUNDSYLMAX in �s�id gan SYLLABLE"
 
-#: ../spell.c:5236
 msgid "Too many postponed prefixes"
 msgstr "An iomarca r�im�reanna curtha siar"
 
-#: ../spell.c:5238
 msgid "Too many compound flags"
 msgstr "An iomarca bratach comhfhocail"
 
-#: ../spell.c:5240
 msgid "Too many postponed prefixes and/or compound flags"
 msgstr "An iomarca r�im�reanna curtha siar agus/n� bratacha comhfhocal"
 
-#: ../spell.c:5250
 #, c-format
 msgid "Missing SOFO%s line in %s"
 msgstr "L�ne SOFO%s ar iarraidh i %s"
 
-#: ../spell.c:5253
 #, c-format
 msgid "Both SAL and SOFO lines in %s"
 msgstr "L�nte SAL agus SOFO araon i %s"
 
-#: ../spell.c:5331
 #, c-format
 msgid "Flag is not a number in %s line %d: %s"
 msgstr "N� uimhir � an bhratach i %s l�ne %d: %s"
 
-#: ../spell.c:5334
 #, c-format
 msgid "Illegal flag in %s line %d: %s"
 msgstr "Bratach neamhcheadaithe i %s l�ne %d: %s"
 
-#: ../spell.c:5493 ../spell.c:5501
 #, c-format
 msgid "%s value differs from what is used in another .aff file"
 msgstr "T� difear idir luach %s agus an luach i gcomhad .aff eile"
 
-#: ../spell.c:5602
 #, c-format
 msgid "Reading dictionary file %s ..."
 msgstr "Focl�ir %s � l�amh ..."
 
-#: ../spell.c:5611
 #, c-format
 msgid "E760: No word count in %s"
 msgstr "E760: L�on na bhfocal ar iarraidh i %s"
 
-#: ../spell.c:5669
 #, c-format
 msgid "line %6d, word %6d - %s"
 msgstr "l�ne %6d, focal %6d - %s"
 
-#: ../spell.c:5691
 #, c-format
 msgid "Duplicate word in %s line %d: %s"
 msgstr "Focal d�blach i %s l�ne %d: %s"
 
-#: ../spell.c:5694
 #, c-format
 msgid "First duplicate word in %s line %d: %s"
 msgstr "An ch�ad fhocal d�blach i %s l�ne %d: %s"
 
-#: ../spell.c:5746
 #, c-format
 msgid "%d duplicate word(s) in %s"
 msgstr "%d focal d�blach i %s"
 
-#: ../spell.c:5748
 #, c-format
 msgid "Ignored %d word(s) with non-ASCII characters in %s"
 msgstr "Rinneadh neamhshuim ar %d focal le carachtair neamh-ASCII i %s"
 
-#: ../spell.c:6115
 #, c-format
 msgid "Reading word file %s ..."
 msgstr "Comhad focail %s � l�amh ..."
 
-#: ../spell.c:6155
 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
 msgstr "Rinneadh neamhshuim ar l�ne dh�blach `/encoding=' i %s l�ne %d: %s"
 
-#: ../spell.c:6159
 #, c-format
 msgid "/encoding= line after word ignored in %s line %d: %s"
 msgstr ""
 "Rinneadh neamhshuim ar l�ne `/encoding=' i ndiaidh focail i %s l�ne %d: %s"
 
-#: ../spell.c:6180
 #, c-format
 msgid "Duplicate /regions= line ignored in %s line %d: %s"
 msgstr "Rinneadh neamhshuim ar l�ne `/regions=' i %s l�ne %d: %s"
 
-#: ../spell.c:6185
 #, c-format
 msgid "Too many regions in %s line %d: %s"
 msgstr "An iomarca r�igi�n i %s l�ne %d: %s"
 
-#: ../spell.c:6198
 #, c-format
 msgid "/ line ignored in %s line %d: %s"
 msgstr "Rinneadh neamhshuim ar l�ne `/' i %s l�ne %d: %s"
 
-#: ../spell.c:6224
 #, c-format
 msgid "Invalid region nr in %s line %d: %s"
 msgstr "Uimhir neamhbhail� r�igi�in i %s l�ne %d: %s"
 
-#: ../spell.c:6230
 #, c-format
 msgid "Unrecognized flags in %s line %d: %s"
 msgstr "Bratacha anaithnide i %s l�ne %d: %s"
 
-#: ../spell.c:6257
 #, c-format
 msgid "Ignored %d words with non-ASCII characters"
 msgstr "Rinneadh neamhshuim ar %d focal le carachtair neamh-ASCII"
 
-#: ../spell.c:6656
+msgid "E845: Insufficient memory, word list will be incomplete"
+msgstr "E845: Easpa cuimhne, beidh an liosta focal neamhioml�n"
+
 #, c-format
 msgid "Compressed %d of %d nodes; %d (%d%%) remaining"
 msgstr "Comhbhr�dh %d as %d n�d; %d (%d%%) f�gtha"
 
-#: ../spell.c:7340
 msgid "Reading back spell file..."
 msgstr "Comhad litrithe � l�amh ar�s..."
 
-#. Go through the trie of good words, soundfold each word and add it to
-#. the soundfold trie.
-#: ../spell.c:7357
+#.
+#. * Go through the trie of good words, soundfold each word and add it to
+#. * the soundfold trie.
+#.
 msgid "Performing soundfolding..."
 msgstr "Fuaimfhilleadh..."
 
-#: ../spell.c:7368
 #, c-format
-msgid "Number of words after soundfolding: %<PRId64>"
-msgstr "L�on na bhfocal tar �is fuaimfhillte: %<PRId64>"
+msgid "Number of words after soundfolding: %ld"
+msgstr "L�on na bhfocal tar �is fuaimfhillte: %ld"
 
-#: ../spell.c:7476
 #, c-format
 msgid "Total number of words: %d"
 msgstr "L�on ioml�n na bhfocal: %d"
 
-#: ../spell.c:7655
 #, c-format
 msgid "Writing suggestion file %s ..."
 msgstr "Comhad molta� %s � scr�obh ..."
 
-#: ../spell.c:7707 ../spell.c:7927
 #, c-format
 msgid "Estimated runtime memory use: %d bytes"
 msgstr "Cuimhne measta a bheith in �s�id le linn rite: %d beart"
 
-#: ../spell.c:7820
 msgid "E751: Output file name must not have region name"
 msgstr "E751: N� cheada�tear ainm r�igi�in in ainm an aschomhaid"
 
-#: ../spell.c:7822
 msgid "E754: Only up to 8 regions supported"
 msgstr "E754: N� thaca�tear le n�os m� n� 8 r�igi�n"
 
-#: ../spell.c:7846
 #, c-format
 msgid "E755: Invalid region in %s"
 msgstr "E755: R�igi�n neamhbhail� i %s"
 
-#: ../spell.c:7907
 msgid "Warning: both compounding and NOBREAK specified"
 msgstr "Rabhadh: sonra�odh comhfhocail agus NOBREAK araon"
 
-#: ../spell.c:7920
 #, c-format
 msgid "Writing spell file %s ..."
 msgstr "Comhad litrithe %s � scr�obh ..."
 
-#: ../spell.c:7925
 msgid "Done!"
 msgstr "Cr�ochnaithe!"
 
-#: ../spell.c:8034
 #, c-format
-msgid "E765: 'spellfile' does not have %<PRId64> entries"
-msgstr "E765: n�l %<PRId64> iontr�il i 'spellfile'"
+msgid "E765: 'spellfile' does not have %ld entries"
+msgstr "E765: n�l %ld iontr�il i 'spellfile'"
 
-#: ../spell.c:8074
-#, fuzzy, c-format
+#, c-format
 msgid "Word '%.*s' removed from %s"
-msgstr "Baineadh focal � %s"
+msgstr "Baineadh focal '%.*s' � %s"
 
-#: ../spell.c:8117
-#, fuzzy, c-format
+#, c-format
 msgid "Word '%.*s' added to %s"
-msgstr "Cuireadh focal le %s"
+msgstr "Cuireadh focal '%.*s' le %s"
 
-#: ../spell.c:8381
 msgid "E763: Word characters differ between spell files"
 msgstr "E763: T� carachtair dhifri�la fhocail sna comhaid litrithe"
 
-#: ../spell.c:8684
-msgid "Sorry, no suggestions"
-msgstr "T� br�n orm, n�l aon mholadh ann"
-
-#: ../spell.c:8687
-#, c-format
-msgid "Sorry, only %<PRId64> suggestions"
-msgstr "T� br�n orm, n�l ach %<PRId64> moladh ann"
-
-#. for when 'cmdheight' > 1
-#. avoid more prompt
-#: ../spell.c:8704
-#, c-format
-msgid "Change \"%.*s\" to:"
-msgstr "Athraigh \"%.*s\" go:"
-
-#: ../spell.c:8737
-#, c-format
-msgid " < \"%.*s\""
-msgstr " < \"%.*s\""
-
-#: ../spell.c:8882
-msgid "E752: No previous spell replacement"
-msgstr "E752: N�l aon ionada� litrithe roimhe seo"
-
-#: ../spell.c:8925
-#, c-format
-msgid "E753: Not found: %s"
-msgstr "E753: Gan aimsi�: %s"
-
-#: ../spell.c:9276
-#, c-format
-msgid "E778: This does not look like a .sug file: %s"
-msgstr "E778: N�l s� cos�il le comhad .sug: %s"
-
-#: ../spell.c:9282
-#, c-format
-msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: Seanchomhad .sug, t� g� lena nuashonr�: %s"
-
-#: ../spell.c:9286
-#, c-format
-msgid "E780: .sug file is for newer version of Vim: %s"
-msgstr "E780: Oibr�onn an comhad .sug le leagan n�os nua� de Vim: %s"
-
-#: ../spell.c:9295
-#, c-format
-msgid "E781: .sug file doesn't match .spl file: %s"
-msgstr "E781: N�l an comhad .sug comhoiri�nach leis an gcomhad .spl: %s"
-
-#: ../spell.c:9305
-#, c-format
-msgid "E782: error while reading .sug file: %s"
-msgstr "E782: earr�id agus comhad .sug � l�amh: %s"
-
 #. This should have been checked when generating the .spl
-#. file.
-#: ../spell.c:11575
+#. * file.
 msgid "E783: duplicate char in MAP entry"
 msgstr "E783: carachtar d�blach in iontr�il MAP"
 
-#: ../syntax.c:266
 msgid "No Syntax items defined for this buffer"
 msgstr "N�l aon mh�r chomhr�ire sainmh�nithe le haghaidh an mhaol�in seo"
 
-#: ../syntax.c:3083 ../syntax.c:3104 ../syntax.c:3127
 #, c-format
 msgid "E390: Illegal argument: %s"
 msgstr "E390: Arg�int neamhcheadaithe: %s"
 
-#: ../syntax.c:3299
+msgid "syntax iskeyword "
+msgstr "comhr�ir iskeyword "
+
 #, c-format
 msgid "E391: No such syntax cluster: %s"
 msgstr "E391: N�l a leith�id de mhogall comhr�ire: %s"
 
-#: ../syntax.c:3433
 msgid "syncing on C-style comments"
 msgstr "ag sioncr�n� ar n�ta den n�s C"
 
-#: ../syntax.c:3439
 msgid "no syncing"
 msgstr "gan sioncr�n�"
 
-#: ../syntax.c:3441
 msgid "syncing starts "
 msgstr "tosa�onn an sioncr�n� "
 
-#: ../syntax.c:3443 ../syntax.c:3506
 msgid " lines before top line"
 msgstr " l�nte roimh an bharr"
 
-#: ../syntax.c:3448
 msgid ""
 "\n"
 "--- Syntax sync items ---"
@@ -5749,7 +5454,6 @@ msgstr ""
 "\n"
 "--- M�reanna Comhr�ire Sionc ---"
 
-#: ../syntax.c:3452
 msgid ""
 "\n"
 "syncing on items"
@@ -5757,7 +5461,6 @@ msgstr ""
 "\n"
 "ag sioncr�n� ar mh�reanna"
 
-#: ../syntax.c:3457
 msgid ""
 "\n"
 "--- Syntax items ---"
@@ -5765,275 +5468,217 @@ msgstr ""
 "\n"
 "--- M�reanna comhr�ire ---"
 
-#: ../syntax.c:3475
 #, c-format
 msgid "E392: No such syntax cluster: %s"
 msgstr "E392: N�l a leith�id de mhogall comhr�ire: %s"
 
-#: ../syntax.c:3497
 msgid "minimal "
 msgstr "�osta "
 
-#: ../syntax.c:3503
 msgid "maximal "
 msgstr "uasta "
 
-#: ../syntax.c:3513
 msgid "; match "
 msgstr "; meaitse�il "
 
-#: ../syntax.c:3515
 msgid " line breaks"
 msgstr " bristeacha l�ne"
 
-#: ../syntax.c:4076
 msgid "E395: contains argument not accepted here"
 msgstr "E395: t� arg�int ann nach nglactar leis anseo"
 
-#: ../syntax.c:4096
-#, fuzzy
 msgid "E844: invalid cchar value"
-msgstr "E474: Arg�int neamhbhail�"
+msgstr "E844: luach neamhbhail� cchar"
 
-#: ../syntax.c:4107
 msgid "E393: group[t]here not accepted here"
 msgstr "E393: n� ghlactar le group[t]here anseo"
 
-#: ../syntax.c:4126
 #, c-format
 msgid "E394: Didn't find region item for %s"
 msgstr "E394: N�or aims�odh m�r r�igi�in le haghaidh %s"
 
-#: ../syntax.c:4188
 msgid "E397: Filename required"
 msgstr "E397: T� g� le hainm comhaid"
 
-#: ../syntax.c:4221
-#, fuzzy
 msgid "E847: Too many syntax includes"
-msgstr "E77: An iomarca ainmneacha comhaid"
+msgstr "E847: An iomarca comhad comhr�ire in �s�id"
 
-#: ../syntax.c:4303
 #, c-format
 msgid "E789: Missing ']': %s"
 msgstr "E789: ']' ar iarraidh: %s"
 
-#: ../syntax.c:4531
+#, c-format
+msgid "E890: trailing char after ']': %s]%s"
+msgstr "E890: carachtar tar �is ']': %s]%s"
+
 #, c-format
 msgid "E398: Missing '=': %s"
 msgstr "E398: '=' ar iarraidh: %s"
 
-#: ../syntax.c:4666
 #, c-format
 msgid "E399: Not enough arguments: syntax region %s"
 msgstr "E399: N�l go leor arg�int� ann: r�igi�n comhr�ire %s"
 
-#: ../syntax.c:4870
-#, fuzzy
 msgid "E848: Too many syntax clusters"
-msgstr "E391: N�l a leith�id de mhogall comhr�ire: %s"
+msgstr "E848: An iomarca mogall comhr�ire"
 
-#: ../syntax.c:4954
 msgid "E400: No cluster specified"
 msgstr "E400: N�or sonra�odh mogall"
 
-#. end delimiter not found
-#: ../syntax.c:4986
 #, c-format
 msgid "E401: Pattern delimiter not found: %s"
 msgstr "E401: Teormharc�ir patr�in gan aimsi�: %s"
 
-#: ../syntax.c:5049
 #, c-format
 msgid "E402: Garbage after pattern: %s"
 msgstr "E402: Dramha�l i ndiaidh patr�in: %s"
 
-#: ../syntax.c:5120
 msgid "E403: syntax sync: line continuations pattern specified twice"
 msgstr "E403: comhr�ir sionc: tugadh patr�n lean�int l�ne faoi dh�"
 
-#: ../syntax.c:5169
 #, c-format
 msgid "E404: Illegal arguments: %s"
 msgstr "E404: Arg�int� neamhcheadaithe: %s"
 
-#: ../syntax.c:5217
 #, c-format
 msgid "E405: Missing equal sign: %s"
 msgstr "E405: S�n chothroime ar iarraidh: %s"
 
-#: ../syntax.c:5222
 #, c-format
 msgid "E406: Empty argument: %s"
 msgstr "E406: Arg�int fholamh: %s"
 
-#: ../syntax.c:5240
 #, c-format
 msgid "E407: %s not allowed here"
 msgstr "E407: n� cheada�tear %s anseo"
 
-#: ../syntax.c:5246
 #, c-format
 msgid "E408: %s must be first in contains list"
 msgstr "E408: n� fol�ir %s a thabhairt ar dt�s sa liosta `contains'"
 
-#: ../syntax.c:5304
 #, c-format
 msgid "E409: Unknown group name: %s"
 msgstr "E409: Ainm anaithnid gr�pa: %s"
 
-#: ../syntax.c:5512
 #, c-format
 msgid "E410: Invalid :syntax subcommand: %s"
 msgstr "E410: Fo-ord� neamhbhail� :syntax: %s"
 
-#: ../syntax.c:5854
 msgid ""
 "  TOTAL      COUNT  MATCH   SLOWEST     AVERAGE   NAME               PATTERN"
 msgstr ""
+"  IOML�N     L�ON   MEAITS  IS MOILLE   ME�N      AINM               PATR�N"
 
-#: ../syntax.c:6146
 msgid "E679: recursive loop loading syncolor.vim"
 msgstr "E679: l�b athch�rsach agus syncolor.vim � lucht�"
 
-#: ../syntax.c:6256
 #, c-format
 msgid "E411: highlight group not found: %s"
 msgstr "E411: Gr�pa aibhsithe gan aimsi�: %s"
 
-#: ../syntax.c:6278
 #, c-format
 msgid "E412: Not enough arguments: \":highlight link %s\""
 msgstr "E412: Easpa arg�int�: \":highlight link %s\""
 
-#: ../syntax.c:6284
 #, c-format
 msgid "E413: Too many arguments: \":highlight link %s\""
 msgstr "E413: An iomarca arg�int�: \":highlight link %s\""
 
-#: ../syntax.c:6302
 msgid "E414: group has settings, highlight link ignored"
 msgstr ""
 "E414: t� socruithe ag an ghr�pa, ag d�anamh neamhshuim ar nasc aibhsithe"
 
-#: ../syntax.c:6367
 #, c-format
 msgid "E415: unexpected equal sign: %s"
 msgstr "E415: s�n chothroime gan choinne: %s"
 
-#: ../syntax.c:6395
 #, c-format
 msgid "E416: missing equal sign: %s"
 msgstr "E416: s�n chothroime ar iarraidh: %s"
 
-#: ../syntax.c:6418
 #, c-format
 msgid "E417: missing argument: %s"
 msgstr "E417: arg�int ar iarraidh: %s"
 
-#: ../syntax.c:6446
 #, c-format
 msgid "E418: Illegal value: %s"
 msgstr "E418: Luach neamhcheadaithe: %s"
 
-#: ../syntax.c:6496
 msgid "E419: FG color unknown"
 msgstr "E419: Dath anaithnid an ch�lra"
 
-#: ../syntax.c:6504
 msgid "E420: BG color unknown"
 msgstr "E420: Dath anaithnid an tulra"
 
-#: ../syntax.c:6564
 #, c-format
 msgid "E421: Color name or number not recognized: %s"
 msgstr "E421: N�or aithn�odh ainm/uimhir an datha: %s"
 
-#: ../syntax.c:6714
 #, c-format
 msgid "E422: terminal code too long: %s"
 msgstr "E422: c�d teirmin�il r�fhada: %s"
 
-#: ../syntax.c:6753
 #, c-format
 msgid "E423: Illegal argument: %s"
 msgstr "E423: Arg�int neamhcheadaithe: %s"
 
-#: ../syntax.c:6925
 msgid "E424: Too many different highlighting attributes in use"
 msgstr "E424: An iomarca tr�ithe aibhsithe in �s�id"
 
-#: ../syntax.c:7427
 msgid "E669: Unprintable character in group name"
 msgstr "E669: Carachtar neamhghrafach in ainm gr�pa"
 
-#: ../syntax.c:7434
 msgid "W18: Invalid character in group name"
 msgstr "W18: Carachtar neamhbhail� in ainm gr�pa"
 
-#: ../syntax.c:7448
 msgid "E849: Too many highlight and syntax groups"
-msgstr ""
+msgstr "E849: An iomarca gr�pa� aibhsithe agus comhr�ire"
 
-#: ../tag.c:104
 msgid "E555: at bottom of tag stack"
 msgstr "E555: in �ochtar na cruaiche clibeanna"
 
-#: ../tag.c:105
 msgid "E556: at top of tag stack"
 msgstr "E556: in uachtar na cruaiche clibeanna"
 
-#: ../tag.c:380
 msgid "E425: Cannot go before first matching tag"
 msgstr "E425: N� f�idir a dhul roimh an ch�ad chlib chomhoiri�nach"
 
-#: ../tag.c:504
 #, c-format
 msgid "E426: tag not found: %s"
 msgstr "E426: clib gan aimsi�: %s"
 
-#: ../tag.c:528
 msgid "  # pri kind tag"
 msgstr "  # tos cin clib"
 
-#: ../tag.c:531
 msgid "file\n"
 msgstr "comhad\n"
 
-#: ../tag.c:829
 msgid "E427: There is only one matching tag"
 msgstr "E427: T� aon chlib chomhoiri�nach amh�in"
 
-#: ../tag.c:831
 msgid "E428: Cannot go beyond last matching tag"
 msgstr "E428: N� f�idir a dhul thar an chlib chomhoiri�nach deireanach"
 
-#: ../tag.c:850
 #, c-format
 msgid "File \"%s\" does not exist"
 msgstr "N�l a leith�id de chomhad \"%s\" ann"
 
 #. Give an indication of the number of matching tags
-#: ../tag.c:859
 #, c-format
 msgid "tag %d of %d%s"
 msgstr "clib %d as %d%s"
 
-#: ../tag.c:862
 msgid " or more"
 msgstr " n� os a chionn"
 
-#: ../tag.c:864
 msgid "  Using tag with different case!"
 msgstr "  Ag �s�id clib le c�s eile!"
 
-#: ../tag.c:909
 #, c-format
 msgid "E429: File \"%s\" does not exist"
 msgstr "E429: N�l a leith�id de chomhad \"%s\""
 
 #. Highlight title
-#: ../tag.c:960
 msgid ""
 "\n"
 "  # TO tag         FROM line  in file/text"
@@ -6041,79 +5686,66 @@ msgstr ""
 "\n"
 "  # Go clib        �    l�ne  i  gcomhad/t�acs"
 
-#: ../tag.c:1303
 #, c-format
 msgid "Searching tags file %s"
 msgstr "Comhad clibeanna %s � chuardach"
 
-#: ../tag.c:1545
+#, c-format
+msgid "E430: Tag file path truncated for %s\n"
+msgstr "E430: Teascadh conair an chomhaid clibeanna le haghaidh %s\n"
+
 msgid "Ignoring long line in tags file"
 msgstr "Ag d�anamh neamhaird de l�ne fhada sa chomhad clibeanna"
 
-#: ../tag.c:1915
 #, c-format
 msgid "E431: Format error in tags file \"%s\""
 msgstr "E431: Earr�id fhorm�ide i gcomhad clibeanna \"%s\""
 
-#: ../tag.c:1917
 #, c-format
-msgid "Before byte %<PRId64>"
-msgstr "Roimh bheart %<PRId64>"
+msgid "Before byte %ld"
+msgstr "Roimh bheart %ld"
 
-#: ../tag.c:1929
 #, c-format
 msgid "E432: Tags file not sorted: %s"
 msgstr "E432: Comhad clibeanna gan s�rt�il: %s"
 
 #. never opened any tags file
-#: ../tag.c:1960
 msgid "E433: No tags file"
 msgstr "E433: N�l aon chomhad clibeanna"
 
-#: ../tag.c:2536
 msgid "E434: Can't find tag pattern"
 msgstr "E434: Patr�n clibe gan aimsi�"
 
-#: ../tag.c:2544
 msgid "E435: Couldn't find tag, just guessing!"
 msgstr "E435: Clib gan aimsi�, ag tabhairt buille faoi thuairim!"
 
-#: ../tag.c:2797
-#, fuzzy, c-format
+#, c-format
 msgid "Duplicate field name: %s"
-msgstr "Clib dh�blach i %s l�ne %d: %s"
+msgstr "Ainm r�imse d�bailte: %s"
 
-#: ../term.c:1442
 msgid "' not known. Available builtin terminals are:"
 msgstr "' anaithnid. Is iad seo na teirmin�il insuite:"
 
-#: ../term.c:1463
 msgid "defaulting to '"
 msgstr "r�amhshocr� = '"
 
-#: ../term.c:1731
 msgid "E557: Cannot open termcap file"
 msgstr "E557: N� f�idir an comhad termcap a oscailt"
 
-#: ../term.c:1735
 msgid "E558: Terminal entry not found in terminfo"
 msgstr "E558: Iontr�il teirmin�il gan aimsi� sa terminfo"
 
-#: ../term.c:1737
 msgid "E559: Terminal entry not found in termcap"
 msgstr "E559: Iontr�il teirmin�il gan aimsi� sa termcap"
 
-#: ../term.c:1878
 #, c-format
 msgid "E436: No \"%s\" entry in termcap"
 msgstr "E436: N�l aon iontr�il \"%s\" sa termcap"
 
-#: ../term.c:2249
 msgid "E437: terminal capability \"cm\" required"
 msgstr "E437: t� g� leis an chumas teirmin�il \"cm\""
 
 #. Highlight title
-#: ../term.c:4376
 msgid ""
 "\n"
 "--- Terminal keys ---"
@@ -6121,169 +5753,342 @@ msgstr ""
 "\n"
 "--- Eochracha teirmin�il ---"
 
-#: ../ui.c:481
+msgid "Cannot open $VIMRUNTIME/rgb.txt"
+msgstr "N� f�idir $VIMRUNTIME/rgb.txt a oscailt"
+
+msgid "new shell started\n"
+msgstr "tosa�odh blaosc nua\n"
+
 msgid "Vim: Error reading input, exiting...\n"
 msgstr "Vim: Earr�id agus an t-inchomhad � l�amh; ag scor...\n"
 
+msgid "Used CUT_BUFFER0 instead of empty selection"
+msgstr "�s�ideadh CUT_BUFFER0 in ionad roghn�ch�in folaimh"
+
 #. This happens when the FileChangedRO autocommand changes the
 #. * file in a way it becomes shorter.
-#: ../undo.c:379
-#, fuzzy
 msgid "E881: Line count changed unexpectedly"
-msgstr "E787: Athra�odh an maol�n gan choinne"
+msgstr "E881: Athra�odh l�on na l�nte gan s�il leis"
 
-#: ../undo.c:627
-#, fuzzy, c-format
+#. must display the prompt
+msgid "No undo possible; continue anyway"
+msgstr "N� f�idir a cheal�; lean ar aghaidh mar sin f�in"
+
+#, c-format
 msgid "E828: Cannot open undo file for writing: %s"
-msgstr "E212: N� f�idir comhad a oscailt chun scr�obh ann"
+msgstr "E828: N� f�idir comhad staire a oscailt le scr�obh ann: %s"
 
-#: ../undo.c:717
 #, c-format
 msgid "E825: Corrupted undo file (%s): %s"
-msgstr ""
+msgstr "E825: Comhad staire truaillithe (%s): %s"
 
-#: ../undo.c:1039
 msgid "Cannot write undo file in any directory in 'undodir'"
-msgstr ""
+msgstr "N� f�idir comhad staire a sh�bh�il in aon chomhadlann in 'undodir'"
 
-#: ../undo.c:1074
 #, c-format
 msgid "Will not overwrite with undo file, cannot read: %s"
-msgstr ""
+msgstr "N� forscr�obhfar le comhad staire, n� f�idir � a l�amh: %s"
 
-#: ../undo.c:1092
 #, c-format
 msgid "Will not overwrite, this is not an undo file: %s"
-msgstr ""
+msgstr "N� forscr�obhfar �, n� comhad staire � seo: %s"
 
-#: ../undo.c:1108
 msgid "Skipping undo file write, nothing to undo"
-msgstr ""
+msgstr "N� scr�obhfar an comhad staire, n�l aon stair ann"
 
-#: ../undo.c:1121
-#, fuzzy, c-format
+#, c-format
 msgid "Writing undo file: %s"
-msgstr "Comhad viminfo \"%s\" � scr�obh"
+msgstr "Comhad staire � scr�obh: %s"
 
-#: ../undo.c:1213
-#, fuzzy, c-format
+#, c-format
 msgid "E829: write error in undo file: %s"
-msgstr "E297: Earr�id sa scr�obh i gcomhad babht�la"
+msgstr "E829: earr�id le linn scr�ofa i gcomhad staire: %s"
 
-#: ../undo.c:1280
 #, c-format
 msgid "Not reading undo file, owner differs: %s"
-msgstr ""
+msgstr "N�or l�adh an comhad staire; �in�ir difri�il: %s"
 
-#: ../undo.c:1292
-#, fuzzy, c-format
+#, c-format
 msgid "Reading undo file: %s"
-msgstr "Comhad focail %s � l�amh ..."
+msgstr "Comhad staire � l�amh: %s"
 
-#: ../undo.c:1299
-#, fuzzy, c-format
+#, c-format
 msgid "E822: Cannot open undo file for reading: %s"
-msgstr "E195: N� f�idir an comhad viminfo a oscailt chun l�amh"
+msgstr "E822: N� f�idir an comhad staire a oscailt lena l�amh: %s"
 
-#: ../undo.c:1308
-#, fuzzy, c-format
+#, c-format
 msgid "E823: Not an undo file: %s"
-msgstr "E753: Gan aimsi�: %s"
+msgstr "E823: N� comhad staire �: %s"
 
-#: ../undo.c:1313
-#, fuzzy, c-format
+#, c-format
+msgid "E832: Non-encrypted file has encrypted undo file: %s"
+msgstr "E832: Comhad neamhchriptithe le comhad staire criptithe: %s"
+
+#, c-format
+msgid "E826: Undo file decryption failed: %s"
+msgstr "E826: N�orbh fh�idir an comhad staire a dh�chripti�: %s"
+
+#, c-format
+msgid "E827: Undo file is encrypted: %s"
+msgstr "E827: T� an comhad staire criptithe: %s"
+
+#, c-format
 msgid "E824: Incompatible undo file: %s"
-msgstr "E484: N� f�idir comhad %s a oscailt"
+msgstr "E824: Comhad staire neamh-chomhoiri�nach: %s"
 
-#: ../undo.c:1328
 msgid "File contents changed, cannot use undo info"
-msgstr ""
+msgstr "Athra�odh �bhar an chomhaid, n� f�idir comhad staire a �s�id"
 
-#: ../undo.c:1497
-#, fuzzy, c-format
+#, c-format
 msgid "Finished reading undo file %s"
-msgstr "deireadh ag foinsi� %s"
+msgstr "Comhad staire %s l�ite"
 
-#: ../undo.c:1586 ../undo.c:1812
 msgid "Already at oldest change"
 msgstr "Ag an athr� is sine cheana"
 
-#: ../undo.c:1597 ../undo.c:1814
 msgid "Already at newest change"
 msgstr "Ag an athr� is nua� cheana"
 
-#: ../undo.c:1806
-#, fuzzy, c-format
-msgid "E830: Undo number %<PRId64> not found"
-msgstr "N�or aims�odh ceal� uimhir a %<PRId64>"
+#, c-format
+msgid "E830: Undo number %ld not found"
+msgstr "E830: M�r staire %ld gan aimsi�"
 
-#: ../undo.c:1979
 msgid "E438: u_undo: line numbers wrong"
 msgstr "E438: u_undo: l�ne-uimhreacha m�chearta"
 
-#: ../undo.c:2183
 msgid "more line"
 msgstr "l�ne eile"
 
-#: ../undo.c:2185
 msgid "more lines"
 msgstr "l�ne eile"
 
-#: ../undo.c:2187
 msgid "line less"
 msgstr "l�ne n�os l�"
 
-#: ../undo.c:2189
 msgid "fewer lines"
 msgstr "l�ne n�os l�"
 
-#: ../undo.c:2193
 msgid "change"
 msgstr "athr�"
 
-#: ../undo.c:2195
 msgid "changes"
 msgstr "athr�"
 
-#: ../undo.c:2225
 #, c-format
-msgid "%<PRId64> %s; %s #%<PRId64>  %s"
-msgstr "%<PRId64> %s; %s #%<PRId64>  %s"
+msgid "%ld %s; %s #%ld  %s"
+msgstr "%ld %s; %s #%ld  %s"
 
-#: ../undo.c:2228
 msgid "before"
 msgstr "roimh"
 
-#: ../undo.c:2228
 msgid "after"
 msgstr "tar �is"
 
-#: ../undo.c:2325
 msgid "Nothing to undo"
 msgstr "N�l faic le ceal�"
 
-#: ../undo.c:2330
 msgid "number changes  when               saved"
-msgstr ""
+msgstr "athra�onn an uimhir ag am s�bh�la"
 
-#: ../undo.c:2360
 #, c-format
-msgid "%<PRId64> seconds ago"
-msgstr "%<PRId64> soicind � shin"
+msgid "%ld seconds ago"
+msgstr "%ld soicind � shin"
 
-#: ../undo.c:2372
 msgid "E790: undojoin is not allowed after undo"
 msgstr "E790: n� cheada�tear \"undojoin\" tar �is \"undo\""
 
-#: ../undo.c:2466
 msgid "E439: undo list corrupt"
 msgstr "E439: t� an liosta cealaithe truaillithe"
 
-#: ../undo.c:2495
 msgid "E440: undo line missing"
 msgstr "E440: l�ne chealaithe ar iarraidh"
 
-#: ../version.c:600
+#, c-format
+msgid "E122: Function %s already exists, add ! to replace it"
+msgstr "E122: T� feidhm %s ann cheana, cuir ! leis an ord� chun � a as�iti�"
+
+msgid "E717: Dictionary entry already exists"
+msgstr "E717: T� an iontr�il focl�ra seo ann cheana"
+
+msgid "E718: Funcref required"
+msgstr "E718: T� g� le Funcref"
+
+#, c-format
+msgid "E130: Unknown function: %s"
+msgstr "E130: Feidhm anaithnid: %s"
+
+#, c-format
+msgid "E125: Illegal argument: %s"
+msgstr "E125: Arg�int neamhcheadaithe: %s"
+
+#, c-format
+msgid "E853: Duplicate argument name: %s"
+msgstr "E853: Arg�int dh�bailte: %s"
+
+#, c-format
+msgid "E740: Too many arguments for function %s"
+msgstr "E740: An iomarca arg�int� d'fheidhm %s"
+
+#, c-format
+msgid "E116: Invalid arguments for function %s"
+msgstr "E116: Arg�int� neamhbhail� d'fheidhm %s"
+
+msgid "E132: Function call depth is higher than 'maxfuncdepth'"
+msgstr "E132: Doimhneacht na nglaonna n�os m� n� 'maxfuncdepth'"
+
+#, c-format
+msgid "calling %s"
+msgstr "%s � glao"
+
+#, c-format
+msgid "%s aborted"
+msgstr "%s tobscortha"
+
+#, c-format
+msgid "%s returning #%ld"
+msgstr "%s ag aisfhilleadh #%ld"
+
+#, c-format
+msgid "%s returning %s"
+msgstr "%s ag aisfhilleadh %s"
+
+msgid "E699: Too many arguments"
+msgstr "E699: An iomarca arg�int�"
+
+#, c-format
+msgid "E117: Unknown function: %s"
+msgstr "E117: Feidhm anaithnid: %s"
+
+#, c-format
+msgid "E933: Function was deleted: %s"
+msgstr "E933: Scriosadh an fheidhm: %s"
+
+#, c-format
+msgid "E119: Not enough arguments for function: %s"
+msgstr "E119: N�l go leor feidhmeanna d'fheidhm: %s"
+
+#, c-format
+msgid "E120: Using <SID> not in a script context: %s"
+msgstr "E120: <SID> � �s�id ach gan a bheith i gcomhth�acs scripte: %s"
+
+#, c-format
+msgid "E725: Calling dict function without Dictionary: %s"
+msgstr "E725: Feidhm 'dict' � ghlao gan Focl�ir: %s"
+
+msgid "E129: Function name required"
+msgstr "E129: T� g� le hainm feidhme"
+
+#, c-format
+msgid "E128: Function name must start with a capital or \"s:\": %s"
+msgstr ""
+"E128: Caithfidh ceannlitir a bheith ar dt�s ainm feidhme, n� \"s:\": %s"
+
+#, c-format
+msgid "E884: Function name cannot contain a colon: %s"
+msgstr "E884: N� cheada�tear idirstad in ainm feidhme: %s"
+
+#, c-format
+msgid "E123: Undefined function: %s"
+msgstr "E123: Feidhm gan sainmh�ni�: %s"
+
+#, c-format
+msgid "E124: Missing '(': %s"
+msgstr "E124: '(' ar iarraidh: %s"
+
+msgid "E862: Cannot use g: here"
+msgstr "E862: N� f�idir g: a �s�id anseo"
+
+#, c-format
+msgid "E932: Closure function should not be at top level: %s"
+msgstr "E932: N� m�r don chlabhs�r a bheith ag an mbarrleibh�al: %s"
+
+msgid "E126: Missing :endfunction"
+msgstr "E126: :endfunction ar iarraidh"
+
+#, c-format
+msgid "E707: Function name conflicts with variable: %s"
+msgstr "E707: Tagann ainm na feidhme salach ar athr�g: %s"
+
+#, c-format
+msgid "E127: Cannot redefine function %s: It is in use"
+msgstr ""
+"E127: N� f�idir sainmh�ni� nua a dh�anamh ar fheidhm %s: In �s�id cheana"
+
+#, c-format
+msgid "E746: Function name does not match script file name: %s"
+msgstr ""
+"E746: N�l ainm na feidhme comhoiri�nach le hainm comhaid na scripte: %s"
+
+#, c-format
+msgid "E131: Cannot delete function %s: It is in use"
+msgstr "E131: N� f�idir feidhm %s a scriosadh: T� s� in �s�id faoi l�thair"
+
+msgid "E133: :return not inside a function"
+msgstr "E133: Caithfidh :return a bheith isteach i bhfeidhm"
+
+#, c-format
+msgid "E107: Missing parentheses: %s"
+msgstr "E107: L�ib�n� ar iarraidh: %s"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit GUI version"
+msgstr ""
+"\n"
+"Leagan GUI 64 giot�n MS-Windows"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit GUI version"
+msgstr ""
+"\n"
+"Leagan GUI 32 giot�n MS-Windows"
+
+msgid " with OLE support"
+msgstr " le taca�ocht OLE"
+
+msgid ""
+"\n"
+"MS-Windows 64-bit console version"
+msgstr ""
+"\n"
+"Leagan cons�il 64 giot�n MS-Windows"
+
+msgid ""
+"\n"
+"MS-Windows 32-bit console version"
+msgstr ""
+"\n"
+"Leagan cons�il 32 giot�n MS-Windows"
+
+msgid ""
+"\n"
+"MacOS X (unix) version"
+msgstr ""
+"\n"
+"Leagan MacOS X (unix)"
+
+msgid ""
+"\n"
+"MacOS X version"
+msgstr ""
+"\n"
+"Leagan MacOS X"
+
+msgid ""
+"\n"
+"MacOS version"
+msgstr ""
+"\n"
+"Leagan MacOS"
+
+msgid ""
+"\n"
+"OpenVMS version"
+msgstr ""
+"\n"
+"Leagan OpenVMS"
+
 msgid ""
 "\n"
 "Included patches: "
@@ -6291,7 +6096,6 @@ msgstr ""
 "\n"
 "Paist� san �ireamh: "
 
-#: ../version.c:627
 msgid ""
 "\n"
 "Extra patches: "
@@ -6299,11 +6103,9 @@ msgstr ""
 "\n"
 "Paist� sa bhreis: "
 
-#: ../version.c:639 ../version.c:864
 msgid "Modified by "
 msgstr "Mionathraithe ag "
 
-#: ../version.c:646
 msgid ""
 "\n"
 "Compiled "
@@ -6312,11 +6114,9 @@ msgstr ""
 "Tiomsaithe "
 
 # with "Tiomsaithe"
-#: ../version.c:649
 msgid "by "
 msgstr "ag "
 
-#: ../version.c:660
 msgid ""
 "\n"
 "Huge version "
@@ -6324,656 +6124,952 @@ msgstr ""
 "\n"
 "Leagan ollmh�r "
 
-#: ../version.c:661
+msgid ""
+"\n"
+"Big version "
+msgstr ""
+"\n"
+"Leagan m�r "
+
+msgid ""
+"\n"
+"Normal version "
+msgstr ""
+"\n"
+"Leagan coitianta "
+
+msgid ""
+"\n"
+"Small version "
+msgstr ""
+"\n"
+"Leagan beag "
+
+msgid ""
+"\n"
+"Tiny version "
+msgstr ""
+"\n"
+"Leagan beag b�deach "
+
 msgid "without GUI."
 msgstr "gan GUI."
 
-#: ../version.c:662
+msgid "with GTK3 GUI."
+msgstr "le GUI GTK3."
+
+msgid "with GTK2-GNOME GUI."
+msgstr "le GUI GTK2-GNOME."
+
+msgid "with GTK2 GUI."
+msgstr "le GUI GTK2."
+
+msgid "with X11-Motif GUI."
+msgstr "le GUI X11-Motif."
+
+msgid "with X11-neXtaw GUI."
+msgstr "le GUI X11-neXtaw."
+
+msgid "with X11-Athena GUI."
+msgstr "le GUI X11-Athena."
+
+msgid "with Photon GUI."
+msgstr "le GUI Photon."
+
+msgid "with GUI."
+msgstr "le GUI."
+
+msgid "with Carbon GUI."
+msgstr "le GUI Carbon."
+
+msgid "with Cocoa GUI."
+msgstr "le GUI Cocoa."
+
+msgid "with (classic) GUI."
+msgstr "le GUI (clasaiceach)."
+
 msgid "  Features included (+) or not (-):\n"
 msgstr "  Gn�ithe san �ireamh (+) n� nach bhfuil (-):\n"
 
-#: ../version.c:667
 msgid "   system vimrc file: \""
 msgstr "   comhad vimrc an ch�rais: \""
 
-#: ../version.c:672
 msgid "     user vimrc file: \""
 msgstr "     comhad vimrc �s�ideora: \""
 
-#: ../version.c:677
 msgid " 2nd user vimrc file: \""
 msgstr " dara comhad vimrc �s�ideora: \""
 
-#: ../version.c:682
 msgid " 3rd user vimrc file: \""
 msgstr " tr�� comhad vimrc �s�ideora: \""
 
-#: ../version.c:687
 msgid "      user exrc file: \""
 msgstr "      comhad exrc �s�ideora: \""
 
-#: ../version.c:692
 msgid "  2nd user exrc file: \""
 msgstr "  dara comhad �s�ideora exrc: \""
 
-#: ../version.c:699
+msgid "  system gvimrc file: \""
+msgstr "  comhad gvimrc c�rais: \""
+
+msgid "    user gvimrc file: \""
+msgstr "    comhad gvimrc �s�ideora: \""
+
+msgid "2nd user gvimrc file: \""
+msgstr "dara comhad gvimrc �s�ideora: \""
+
+msgid "3rd user gvimrc file: \""
+msgstr "tr�� comhad gvimrc �s�ideora: \""
+
+msgid "       defaults file: \""
+msgstr "       comhad na r�amhshocruithe: \""
+
+msgid "    system menu file: \""
+msgstr "    comhad roghchl�ir an ch�rais: \""
+
 msgid "  fall-back for $VIM: \""
 msgstr "  rogha th�naisteach do $VIM: \""
 
-#: ../version.c:705
 msgid " f-b for $VIMRUNTIME: \""
 msgstr " f-b do $VIMRUNTIME: \""
 
-#: ../version.c:709
 msgid "Compilation: "
 msgstr "Tioms�: "
 
-#: ../version.c:712
+msgid "Compiler: "
+msgstr "Tiomsaitheoir: "
+
 msgid "Linking: "
 msgstr "Nasc�il: "
 
-#: ../version.c:717
 msgid "  DEBUG BUILD"
 msgstr "  LEAGAN D�FHABHTAITHE"
 
-#: ../version.c:767
 msgid "VIM - Vi IMproved"
 msgstr "VIM - Vi IMproved"
 
-#: ../version.c:769
 msgid "version "
 msgstr "leagan "
 
-#: ../version.c:770
 msgid "by Bram Moolenaar et al."
 msgstr "le Bram Moolenaar et al."
 
-#: ../version.c:774
 msgid "Vim is open source and freely distributable"
 msgstr "Is saorbhogearra � Vim"
 
-#: ../version.c:776
 msgid "Help poor children in Uganda!"
 msgstr "Tabhair cabhair do ph�ist� bochta in Uganda!"
 
-#: ../version.c:777
 msgid "type  :help iccf<Enter>       for information "
 msgstr "cl�scr�obh  :help iccf<Enter>       chun eolas a fh�il "
 
-#: ../version.c:779
 msgid "type  :q<Enter>               to exit         "
 msgstr "cl�scr�obh  :q<Enter>               chun scoir      "
 
-#: ../version.c:780
 msgid "type  :help<Enter>  or  <F1>  for on-line help"
 msgstr "cl�scr�obh  :help<Enter>  n�  <F1>  le haghaidh cabhrach ar l�ne"
 
-#: ../version.c:781
-msgid "type  :help version7<Enter>   for version info"
-msgstr "cl�scr�obh  :help version7<Enter>   le haghaidh eolais faoin leagan"
+msgid "type  :help version8<Enter>   for version info"
+msgstr "cl�scr�obh  :help version8<Enter>   le haghaidh eolais faoin leagan"
 
-#: ../version.c:784
 msgid "Running in Vi compatible mode"
 msgstr "Sa mh�d comhoiri�nachta Vi"
 
-#: ../version.c:785
 msgid "type  :set nocp<Enter>        for Vim defaults"
 msgstr ""
 "cl�scr�obh  :set nocp<Enter>        chun na r�amhshocruithe Vim a thaispe�int"
 
-#: ../version.c:786
 msgid "type  :help cp-default<Enter> for info on this"
 msgstr ""
 "cl�scr�obh  :help cp-default<Enter> chun n�os m� eolas faoi seo a fh�il"
 
-#: ../version.c:827
+# don't see where to localize "Help->Orphans"? --kps
+msgid "menu  Help->Orphans           for information    "
+msgstr "roghchl�r  Help->Orphans      chun eolas a fh�il "
+
+msgid "Running modeless, typed text is inserted"
+msgstr "� rith gan mh�id, ag ions� an t�acs at� iontr�ilte"
+
+# same problem --kps
+msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
+msgstr "roghchl�r  Edit->Global Settings->Toggle Insert Mode  "
+
+msgid "                              for two modes      "
+msgstr "                              do dh� mh�d       "
+
+# same problem --kps
+msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
+msgstr "roghchl�r  Edit->Global Settings->Toggle Vi Compatible"
+
+msgid "                              for Vim defaults   "
+msgstr "                              le haghaidh r�amhshocruithe Vim   "
+
 msgid "Sponsor Vim development!"
 msgstr "B� i d'urraitheoir Vim!"
 
-#: ../version.c:828
 msgid "Become a registered Vim user!"
 msgstr "B� i d'�s�ideoir cl�raithe Vim!"
 
-#: ../version.c:831
 msgid "type  :help sponsor<Enter>    for information "
 msgstr "cl�scr�obh  :help sponsor<Enter>        chun eolas a fh�il "
 
-#: ../version.c:832
 msgid "type  :help register<Enter>   for information "
 msgstr "cl�scr�obh  :help register<Enter>       chun eolas a fh�il "
 
-#: ../version.c:834
 msgid "menu  Help->Sponsor/Register  for information    "
 msgstr "roghchl�r  Help->Sponsor/Register       chun eolas a fh�il "
 
-#: ../window.c:119
 msgid "Already only one window"
 msgstr "N�l ach aon fhuinneog amh�in ann cheana"
 
-#: ../window.c:224
 msgid "E441: There is no preview window"
 msgstr "E441: N�l aon fhuinneog r�amhamhairc ann"
 
-#: ../window.c:559
 msgid "E442: Can't split topleft and botright at the same time"
 msgstr "E442: N� f�idir a scoilteadh topleft agus botright san am c�anna"
 
-#: ../window.c:1228
 msgid "E443: Cannot rotate when another window is split"
 msgstr "E443: N� f�idir rothl� nuair at� fuinneog eile scoilte"
 
-#: ../window.c:1803
 msgid "E444: Cannot close last window"
 msgstr "E444: N� f�idir an fhuinneog dheiridh a dh�nadh"
 
-#: ../window.c:1810
 msgid "E813: Cannot close autocmd window"
 msgstr "E813: N� f�idir fuinneog autocmd a dh�nadh"
 
-#: ../window.c:1814
 msgid "E814: Cannot close window, only autocmd window would remain"
 msgstr ""
 "E814: N� f�idir an fhuinneog a dh�nadh, n� bheadh ach fuinneog autocmd f�gtha"
 
-#: ../window.c:2717
 msgid "E445: Other window contains changes"
 msgstr "E445: T� athruithe ann san fhuinneog eile"
 
-#: ../window.c:4805
 msgid "E446: No file name under cursor"
 msgstr "E446: N�l ainm comhaid faoin ch�rs�ir"
 
-#~ msgid "Patch file"
-#~ msgstr "Comhad paiste"
+#, c-format
+msgid "E447: Can't find file \"%s\" in path"
+msgstr "E447: N�l aon fh�il ar chomhad \"%s\" sa chonair"
 
-#~ msgid ""
-#~ "&OK\n"
-#~ "&Cancel"
-#~ msgstr ""
-#~ "&OK\n"
-#~ "&Cealaigh"
+#, c-format
+msgid "E799: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E799: Aitheantas neamhbhail�: %ld (n� m�r d� a bheith >= 1)"
 
-#~ msgid "E240: No connection to Vim server"
-#~ msgstr "E240: N�l aon nasc le freastala� Vim"
+#, c-format
+msgid "E801: ID already taken: %ld"
+msgstr "E801: Aitheantas in �s�id cheana: %ld"
 
-#~ msgid "E241: Unable to send to %s"
-#~ msgstr "E241: N� f�idir aon rud a sheoladh chuig %s"
+msgid "List or number required"
+msgstr "T� g� le liosta n� uimhir"
 
-#~ msgid "E277: Unable to read a server reply"
-#~ msgstr "E277: N� f�idir freagra �n fhreastala� a l�amh"
+#, c-format
+msgid "E802: Invalid ID: %ld (must be greater than or equal to 1)"
+msgstr "E802: Aitheantas neamhbhail�: %ld (n� m�r d� a bheith >= 1)"
 
-#~ msgid "E258: Unable to send to client"
-#~ msgstr "E258: N� f�idir aon rud a sheoladh chuig an chliant"
+#, c-format
+msgid "E803: ID not found: %ld"
+msgstr "E803: Aitheantas gan aimsi�: %ld"
 
-#~ msgid "Save As"
-#~ msgstr "S�bh�il Mar"
+#, c-format
+msgid "E370: Could not load library %s"
+msgstr "E370: N�orbh fh�idir an leabharlann %s a oscailt"
 
-#~ msgid "Edit File"
-#~ msgstr "Cuir Comhad in Eagar"
+msgid "Sorry, this command is disabled: the Perl library could not be loaded."
+msgstr ""
+"T� br�n orm, n�l an t-ord� seo le f�il: n�orbh fh�idir an leabharlann Perl a "
+"lucht�."
 
-#~ msgid " (NOT FOUND)"
-#~ msgstr " (AR IARRAIDH)"
+msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
+msgstr "E299: N� cheada�tear luach�il Perl i mbosca gainimh gan an mod�l Safe"
 
-#~ msgid "Source Vim script"
-#~ msgstr "Foinsigh script Vim"
+msgid "Edit with &multiple Vims"
+msgstr "Cuir in eagar le Vimeanna io&mad�la"
 
-#~ msgid "Edit File in new window"
-#~ msgstr "Cuir comhad in eagar i bhfuinneog nua"
+msgid "Edit with single &Vim"
+msgstr "Cuir in eagar le &Vim aonair"
 
-#~ msgid "Append File"
-#~ msgstr "Cuir Comhad i nDeireadh"
+msgid "Diff with Vim"
+msgstr "Diff le Vim"
 
-#~ msgid "Window position: X %d, Y %d"
-#~ msgstr "Ionad na fuinneoige: X %d, Y %d"
+msgid "Edit with &Vim"
+msgstr "Cuir in Eagar le &Vim"
 
-#~ msgid "Save Redirection"
-#~ msgstr "S�bh�il Atreor�"
+#. Now concatenate
+msgid "Edit with existing Vim - "
+msgstr "Cuir in Eagar le Vim beo - "
 
-#~ msgid "Save View"
-#~ msgstr "S�bh�il an tAmharc"
+msgid "Edits the selected file(s) with Vim"
+msgstr "Cuir an comhad roghnaithe in eagar le Vim"
 
-#~ msgid "Save Session"
-#~ msgstr "S�bh�il an Seisi�n"
+msgid "Error creating process: Check if gvim is in your path!"
+msgstr ""
+"Earr�id agus pr�iseas � chruth�: Deimhnigh go bhfuil gvim i do chonair!"
 
-#~ msgid "Save Setup"
-#~ msgstr "S�bh�il an Socr�"
+msgid "gvimext.dll error"
+msgstr "earr�id gvimext.dll"
 
-#~ msgid "E809: #< is not available without the +eval feature"
-#~ msgstr "E809: n�l #< ar f�il gan ghn� +eval"
+msgid "Path length too long!"
+msgstr "Conair r�fhada!"
 
-#~ msgid "E196: No digraphs in this version"
-#~ msgstr "E196: N� cheada�tear d�ghraif sa leagan seo"
+msgid "--No lines in buffer--"
+msgstr "--T� an maol�n folamh--"
 
-#~ msgid "is a device (disabled with 'opendevice' option)"
-#~ msgstr "is gl�as � seo (d�chumasaithe le rogha 'opendevice')"
+#.
+#. * The error messages that can be shared are included here.
+#. * Excluded are errors that are only used once and debugging messages.
+#.
+msgid "E470: Command aborted"
+msgstr "E470: Ord� tobscortha"
 
-#~ msgid "Reading from stdin..."
-#~ msgstr "Ag l�amh �n ionchur caighde�nach..."
+msgid "E471: Argument required"
+msgstr "E471: T� g� le harg�int"
 
-#~ msgid "[crypted]"
-#~ msgstr "[criptithe]"
+msgid "E10: \\ should be followed by /, ? or &"
+msgstr "E10: Ba ch�ir /, ? n� & a chur i ndiaidh \\"
 
-#~ msgid "NetBeans disallows writes of unmodified buffers"
-#~ msgstr "N� cheada�onn NetBeans maol�in gan athr� a bheith scr�ofa"
+msgid "E11: Invalid in command-line window; <CR> executes, CTRL-C quits"
+msgstr ""
+"E11: Neamhbhail� i bhfuinneog l�ne na n-orduithe; <CR>=rith, CTRL-C=scoir"
 
-#~ msgid "Partial writes disallowed for NetBeans buffers"
-#~ msgstr "N� cheada�tear maol�in NetBeans a bheith scr�ofa go neamhioml�n"
+msgid "E12: Command not allowed from exrc/vimrc in current dir or tag search"
+msgstr ""
+"E12: N� cheada�tear ord� � exrc/vimrc sa chomhadlann reatha n� � chuardach "
+"clibe"
 
-#~ msgid "writing to device disabled with 'opendevice' option"
-#~ msgstr "d�chumasa�odh scr�obh chuig gl�as le rogha 'opendevice'"
+msgid "E171: Missing :endif"
+msgstr "E171: :endif ar iarraidh"
 
-#~ msgid "E460: The resource fork would be lost (add ! to override)"
-#~ msgstr "E460: Chaillf� an forc acmhainne (cuir ! leis an ord� chun s�r�)"
+msgid "E600: Missing :endtry"
+msgstr "E600: :endtry ar iarraidh"
 
-#~ msgid "E229: Cannot start the GUI"
-#~ msgstr "E229: N� f�idir an GUI a chur ag obair"
+msgid "E170: Missing :endwhile"
+msgstr "E170: :endwhile ar iarraidh"
 
-#~ msgid "E230: Cannot read from \"%s\""
-#~ msgstr "E230: N� f�idir l�amh � \"%s\""
+msgid "E170: Missing :endfor"
+msgstr "E170: :endfor ar iarraidh"
 
-#~ msgid "E665: Cannot start GUI, no valid font found"
-#~ msgstr ""
-#~ "E665: N� f�idir an GUI a chur ag obair, n�l aon chl�fhoireann bhail� ann"
+msgid "E588: :endwhile without :while"
+msgstr "E588: :endwhile gan :while"
 
-#~ msgid "E231: 'guifontwide' invalid"
-#~ msgstr "E231: 'guifontwide' neamhbhail�"
+msgid "E588: :endfor without :for"
+msgstr "E588: :endfor gan :for"
 
-#~ msgid "E599: Value of 'imactivatekey' is invalid"
-#~ msgstr "E599: Luach neamhbhail� ar 'imactivatekey'"
+msgid "E13: File exists (add ! to override)"
+msgstr "E13: T� comhad ann cheana (cuir ! leis an ord� chun forscr�obh)"
 
-#~ msgid "E254: Cannot allocate color %s"
-#~ msgstr "E254: N� f�idir dath %s a dh�ileadh"
+msgid "E472: Command failed"
+msgstr "E472: Theip ar ord�"
 
-#~ msgid "No match at cursor, finding next"
-#~ msgstr "N�l a leith�id ag an ch�rs�ir, ag cuardach ar an ch�ad cheann eile"
+#, c-format
+msgid "E234: Unknown fontset: %s"
+msgstr "E234: Tacar cl� anaithnid: %s"
 
-#~ msgid "<cannot open> "
-#~ msgstr "<n� f�idir a oscailt> "
+#, c-format
+msgid "E235: Unknown font: %s"
+msgstr "E235: Cl�fhoireann anaithnid: %s"
 
-#~ msgid "E616: vim_SelFile: can't get font %s"
-#~ msgstr "E616: vim_SelFile: n�l aon fh�il ar an chl�fhoireann %s"
+#, c-format
+msgid "E236: Font \"%s\" is not fixed-width"
+msgstr "E236: N� cl� aonleithid � \"%s\""
 
-#~ msgid "E614: vim_SelFile: can't return to current directory"
-#~ msgstr ""
-#~ "E614: vim_SelFile: n� f�idir dul ar ais go dt� an chomhadlann reatha"
+msgid "E473: Internal error"
+msgstr "E473: Earr�id inmhe�nach"
 
-#~ msgid "Pathname:"
-#~ msgstr "Conair:"
+msgid "Interrupted"
+msgstr "Idirbhriste"
 
-#~ msgid "E615: vim_SelFile: can't get current directory"
-#~ msgstr "E615: vim_SelFile: n�l an chomhadlann reatha ar f�il"
+msgid "E14: Invalid address"
+msgstr "E14: Drochsheoladh"
 
-#~ msgid "OK"
-#~ msgstr "OK"
+msgid "E474: Invalid argument"
+msgstr "E474: Arg�int neamhbhail�"
 
-#~ msgid "Cancel"
-#~ msgstr "Cealaigh"
+#, c-format
+msgid "E475: Invalid argument: %s"
+msgstr "E475: Arg�int neamhbhail�: %s"
 
-#~ msgid "Scrollbar Widget: Could not get geometry of thumb pixmap."
-#~ msgstr ""
-#~ "Giuirl�id Scrollbharra: N� f�idir c�imseata an mhapa picteil�n� a fh�il."
+#, c-format
+msgid "E15: Invalid expression: %s"
+msgstr "E15: Slonn neamhbhail�: %s"
 
-#~ msgid "Vim dialog"
-#~ msgstr "Dial�g Vim"
+msgid "E16: Invalid range"
+msgstr "E16: Raon neamhbhail�"
 
-#~ msgid "E232: Cannot create BalloonEval with both message and callback"
-#~ msgstr ""
-#~ "E232: N� f�idir BalloonEval a chruth� le teachtaireacht agus aisghlaoch "
-#~ "araon"
+msgid "E476: Invalid command"
+msgstr "E476: Ord� neamhbhail�"
 
-#~ msgid "Vim dialog..."
-#~ msgstr "Dial�g Vim..."
+#, c-format
+msgid "E17: \"%s\" is a directory"
+msgstr "E17: is comhadlann \"%s\""
 
-#~ msgid "Input _Methods"
-#~ msgstr "_Modhanna ionchuir"
+#, c-format
+msgid "E364: Library call failed for \"%s()\""
+msgstr "E364: Theip ar ghlao leabharlainne \"%s()\""
 
-# in OLT --KPS
-#~ msgid "VIM - Search and Replace..."
-#~ msgstr "VIM - Cuardaigh agus Athchuir..."
+#, c-format
+msgid "E448: Could not load library function %s"
+msgstr "E448: N� f�idir feidhm %s leabharlainne a lucht�"
 
-#~ msgid "VIM - Search..."
-#~ msgstr "VIM - Cuardaigh..."
+msgid "E19: Mark has invalid line number"
+msgstr "E19: T� l�ne-uimhir neamhbhail� ag an mharc"
 
-#~ msgid "Find what:"
-#~ msgstr "Aimsigh:"
+msgid "E20: Mark not set"
+msgstr "E20: Marc gan socr�"
 
-#~ msgid "Replace with:"
-#~ msgstr "Le cur in ionad:"
+msgid "E21: Cannot make changes, 'modifiable' is off"
+msgstr ""
+"E21: N� f�idir athruithe a chur i bhfeidhm, n�l an bhratach 'modifiable' "
+"socraithe"
 
-#~ msgid "Match whole word only"
-#~ msgstr "Focal ioml�n amh�in"
+msgid "E22: Scripts nested too deep"
+msgstr "E22: scripteanna neadaithe r�dhomhain"
 
-#~ msgid "Match case"
-#~ msgstr "Meaitse�il an c�s"
+msgid "E23: No alternate file"
+msgstr "E23: N�l aon chomhad malartach"
 
-#~ msgid "Direction"
-#~ msgstr "Treo"
+msgid "E24: No such abbreviation"
+msgstr "E24: N�l a leith�id de ghiorr�ch�n ann"
 
-#~ msgid "Up"
-#~ msgstr "Suas"
+msgid "E477: No ! allowed"
+msgstr "E477: N� cheada�tear !"
 
-#~ msgid "Down"
-#~ msgstr "S�os"
+msgid "E25: GUI cannot be used: Not enabled at compile time"
+msgstr "E25: N� f�idir an GUI a �s�id: N�or cumasa�odh � ag am tiomsaithe"
 
-#~ msgid "Find Next"
-#~ msgstr "An Ch�ad Cheann Eile"
+msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
+msgstr ""
+"E26: N�l taca�ocht Eabhraise ar f�il: N�or cumasa�odh � ag am tiomsaithe\n"
 
-#~ msgid "Replace"
-#~ msgstr "Ionadaigh"
+msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
+msgstr ""
+"E27: N�l taca�ocht Pheirsise ar f�il: N�or cumasa�odh � ag am tiomsaithe\n"
 
-#~ msgid "Replace All"
-#~ msgstr "Ionadaigh Uile"
+msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
+msgstr ""
+"E800: N�l taca�ocht Araibise ar f�il: N�or cumasa�odh � ag am tiomsaithe\n"
 
-#~ msgid "Vim: Received \"die\" request from session manager\n"
-#~ msgstr "Vim: Fuarthas iarratas \"die\" � bhainisteoir an tseisi�in\n"
+#, c-format
+msgid "E28: No such highlight group name: %s"
+msgstr "E28: N�l a leith�id d'ainm gr�pa aibhsithe: %s"
 
-#~ msgid "Close"
-#~ msgstr "D�n"
+msgid "E29: No inserted text yet"
+msgstr "E29: N�l aon t�acs ions�ite go dt� seo"
 
-#~ msgid "New tab"
-#~ msgstr "Cluais�n nua"
+msgid "E30: No previous command line"
+msgstr "E30: N�l aon l�ne na n-orduithe roimhe seo"
 
-#~ msgid "Open Tab..."
-#~ msgstr "Oscail Cluais�n..."
+msgid "E31: No such mapping"
+msgstr "E31: N�l a leith�id de mhap�il"
 
-#~ msgid "Vim: Main window unexpectedly destroyed\n"
-#~ msgstr "Vim: Milleadh an pr�omhfhuinneog gan choinne\n"
+msgid "E479: No match"
+msgstr "E479: N�l aon rud comhoiri�nach ann"
 
-#~ msgid "Font Selection"
-#~ msgstr "Roghn� Cl�"
+#, c-format
+msgid "E480: No match: %s"
+msgstr "E480: N�l aon rud comhoiri�nach ann: %s"
 
-#~ msgid "&Filter"
-#~ msgstr "&Scagaire"
+msgid "E32: No file name"
+msgstr "E32: N�l aon ainm comhaid"
 
-#~ msgid "&Cancel"
-#~ msgstr "&Cealaigh"
+msgid "E33: No previous substitute regular expression"
+msgstr "E33: N�l aon slonn ionada�ochta roimhe seo"
 
-#~ msgid "Directories"
-#~ msgstr "Comhadlanna"
+msgid "E34: No previous command"
+msgstr "E34: N�l aon ord� roimhe seo"
 
-#~ msgid "Filter"
-#~ msgstr "Scagaire"
+msgid "E35: No previous regular expression"
+msgstr "E35: N�l aon slonn ionada�ochta roimhe seo"
 
-#~ msgid "&Help"
-#~ msgstr "&Cabhair"
+msgid "E481: No range allowed"
+msgstr "E481: N� cheada�tear raon"
 
-#~ msgid "Files"
-#~ msgstr "Comhaid"
+msgid "E36: Not enough room"
+msgstr "E36: N�l sl� a dh�thain ann"
 
-#~ msgid "&OK"
-#~ msgstr "&OK"
+#, c-format
+msgid "E247: no registered server named \"%s\""
+msgstr "E247: n�l aon fhreastala� cl�raithe leis an ainm \"%s\""
 
-#~ msgid "Selection"
-#~ msgstr "Roghn�"
+#, c-format
+msgid "E482: Can't create file %s"
+msgstr "E482: N� f�idir comhad %s a chruth�"
 
-#~ msgid "Find &Next"
-#~ msgstr "An Ch�ad Chea&nn Eile"
+msgid "E483: Can't get temp file name"
+msgstr "E483: N�l aon fh�il ar ainm comhaid sealadach"
 
-#~ msgid "&Replace"
-#~ msgstr "&Ionadaigh"
+#, c-format
+msgid "E484: Can't open file %s"
+msgstr "E484: N� f�idir comhad %s a oscailt"
 
-#~ msgid "Replace &All"
-#~ msgstr "Ionadaigh &Uile"
+#, c-format
+msgid "E485: Can't read file %s"
+msgstr "E485: N� f�idir comhad %s a l�amh"
 
-#~ msgid "&Undo"
-#~ msgstr "&Cealaigh"
+msgid "E37: No write since last change (add ! to override)"
+msgstr "E37: T� athruithe ann gan s�bh�il (cuir ! leis an ord� chun s�r�)"
 
-#~ msgid "E671: Cannot find window title \"%s\""
-#~ msgstr "E671: N� f�idir teideal na fuinneoige \"%s\" a aimsi�"
+msgid "E37: No write since last change"
+msgstr "E37: Gan scr�obh �n athr� is d�ana�"
 
-#~ msgid "E243: Argument not supported: \"-%s\"; Use the OLE version."
-#~ msgstr "E243: Arg�int gan taca�ocht: \"-%s\"; Bain �s�id as an leagan OLE."
+msgid "E38: Null argument"
+msgstr "E38: Arg�int nialasach"
 
-#~ msgid "E672: Unable to open window inside MDI application"
-#~ msgstr "E672: N� f�idir fuinneog a oscailt isteach i bhfeidhmchl�r MDI"
+msgid "E39: Number expected"
+msgstr "E39: Ag s�il le huimhir"
 
-#~ msgid "Close tab"
-#~ msgstr "D�n cluais�n"
+#, c-format
+msgid "E40: Can't open errorfile %s"
+msgstr "E40: N� f�idir an comhad earr�ide %s a oscailt"
 
-#~ msgid "Open tab..."
-#~ msgstr "Oscail cluais�n..."
+msgid "E233: cannot open display"
+msgstr "E233: n� f�idir an sc�ile�n a oscailt"
 
-#~ msgid "Find string (use '\\\\' to find  a '\\')"
-#~ msgstr "Aimsigh teaghr�n (bain �s�id as '\\\\' chun '\\' a aimsi�)"
+msgid "E41: Out of memory!"
+msgstr "E41: Cuimhne �dithe!"
 
-#~ msgid "Find & Replace (use '\\\\' to find  a '\\')"
-#~ msgstr "Aimsigh & Athchuir (�s�id '\\\\' chun '\\' a aimsi�)"
+msgid "Pattern not found"
+msgstr "Patr�n gan aimsi�"
 
-#~ msgid "Not Used"
-#~ msgstr "Gan �s�id"
+#, c-format
+msgid "E486: Pattern not found: %s"
+msgstr "E486: Patr�n gan aimsi�: %s"
 
-#~ msgid "Directory\t*.nothing\n"
-#~ msgstr "Comhadlann\t*.neamhn�\n"
+msgid "E487: Argument must be positive"
+msgstr "E487: N� fol�ir arg�int dheimhneach"
 
-#~ msgid ""
-#~ "Vim E458: Cannot allocate colormap entry, some colors may be incorrect"
-#~ msgstr ""
-#~ "Vim E458: N� f�idir iontr�il dathmhap�la a dh�ileadh, is f�idir go mbeidh "
-#~ "dathanna m�chearta ann"
+msgid "E459: Cannot go back to previous directory"
+msgstr "E459: N� f�idir a fhilleadh ar an chomhadlann roimhe seo"
 
-#~ msgid "E250: Fonts for the following charsets are missing in fontset %s:"
-#~ msgstr ""
-#~ "E250: Cl�nna ar iarraidh le haghaidh na dtacar carachtar i dtacar cl� %s:"
+msgid "E42: No Errors"
+msgstr "E42: N�l Aon Earr�id Ann"
 
-#~ msgid "E252: Fontset name: %s"
-#~ msgstr "E252: Ainm an tacar cl�: %s"
+msgid "E776: No location list"
+msgstr "E776: Gan liosta su�omh"
 
-#~ msgid "Font '%s' is not fixed-width"
-#~ msgstr "N� cl� aonleithid � '%s'"
+msgid "E43: Damaged match string"
+msgstr "E43: Teaghr�n cuardaigh loite"
 
-#~ msgid "E253: Fontset name: %s\n"
-#~ msgstr "E253: Ainm an tacar cl�: %s\n"
+msgid "E44: Corrupted regexp program"
+msgstr "E44: Cl�r na sloinn ionada�ochta truaillithe"
 
-#~ msgid "Font0: %s\n"
-#~ msgstr "Cl�0: %s\n"
+msgid "E45: 'readonly' option is set (add ! to override)"
+msgstr "E45: t� an rogha 'readonly' socraithe (cuir ! leis an ord� chun s�r�)"
 
-#~ msgid "Font1: %s\n"
-#~ msgstr "Cl�1: %s\n"
+#, c-format
+msgid "E46: Cannot change read-only variable \"%s\""
+msgstr "E46: N� f�idir athr�g inl�ite amh�in \"%s\" a athr�"
 
-#~ msgid "Font%<PRId64> width is not twice that of font0\n"
-#~ msgstr "N�l Cl�%<PRId64> n�os leithne faoi dh� n� cl�0\n"
+#, c-format
+msgid "E794: Cannot set variable in the sandbox: \"%s\""
+msgstr "E794: N� f�idir athr�g a shocr� sa bhosca gainimh: \"%s\""
 
-#~ msgid "Font0 width: %<PRId64>\n"
-#~ msgstr "Leithead Cl�0: %<PRId64>\n"
+msgid "E713: Cannot use empty key for Dictionary"
+msgstr "E713: N� f�idir eochair fholamh a �s�id le Focl�ir"
 
-#~ msgid ""
-#~ "Font1 width: %<PRId64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "Leithead Cl�1: %<PRId64>\n"
-#~ "\n"
+msgid "E715: Dictionary required"
+msgstr "E715: T� g� le focl�ir"
 
-#~ msgid "Invalid font specification"
-#~ msgstr "Sonr� neamhbhail� cl�"
+#, c-format
+msgid "E684: list index out of range: %ld"
+msgstr "E684: inn�acs liosta as raon: %ld"
 
-#~ msgid "&Dismiss"
-#~ msgstr "&Ruaig"
+#, c-format
+msgid "E118: Too many arguments for function: %s"
+msgstr "E118: An iomarca arg�int� d'fheidhm: %s"
 
-#~ msgid "no specific match"
-#~ msgstr "n�l a leith�id ann"
+#, c-format
+msgid "E716: Key not present in Dictionary: %s"
+msgstr "E716: N�l an eochair seo san Fhocl�ir: %s"
 
-#~ msgid "Vim - Font Selector"
-#~ msgstr "Vim - Roghn� Cl�"
+msgid "E714: List required"
+msgstr "E714: T� g� le liosta"
 
-#~ msgid "Name:"
-#~ msgstr "Ainm:"
+#, c-format
+msgid "E712: Argument of %s must be a List or Dictionary"
+msgstr "E712: Caithfidh arg�int de %s a bheith ina Liosta n� Focl�ir"
 
-#~ msgid "Show size in Points"
-#~ msgstr "Taispe�in m�id (Point�)"
+msgid "E47: Error while reading errorfile"
+msgstr "E47: Earr�id agus comhad earr�ide � l�amh"
 
-#~ msgid "Encoding:"
-#~ msgstr "Ionch�d�:"
+msgid "E48: Not allowed in sandbox"
+msgstr "E48: N� cheada�tear � seo i mbosca gainimh"
 
-#~ msgid "Font:"
-#~ msgstr "Cl�:"
+msgid "E523: Not allowed here"
+msgstr "E523: N� cheada�tear � anseo"
 
-#~ msgid "Style:"
-#~ msgstr "St�l:"
+msgid "E359: Screen mode setting not supported"
+msgstr "E359: N� f�idir an m�d sc�ile�in a shocr�"
 
-#~ msgid "Size:"
-#~ msgstr "M�id:"
+msgid "E49: Invalid scroll size"
+msgstr "E49: M�id neamhbhail� scrollaithe"
 
-#~ msgid "E256: Hangul automata ERROR"
-#~ msgstr "E256: EARR�ID leis na huathoibre�in Hangul"
+msgid "E91: 'shell' option is empty"
+msgstr "E91: rogha 'shell' folamh"
 
-#~ msgid "E563: stat error"
-#~ msgstr "E563: earr�id stat"
+msgid "E255: Couldn't read in sign data!"
+msgstr "E255: N�orbh fh�idir na sonra� comhartha a l�amh!"
 
-#~ msgid "E625: cannot open cscope database: %s"
-#~ msgstr "E625: n� f�idir bunachar sonra� cscope a oscailt: %s"
+msgid "E72: Close error on swap file"
+msgstr "E72: Earr�id agus comhad babht�la � dh�nadh"
 
-#~ msgid "E626: cannot get cscope database information"
-#~ msgstr "E626: n� f�idir eolas a fh�il faoin bhunachar sonra� cscope"
+msgid "E73: tag stack empty"
+msgstr "E73: t� cruach na gclibeanna folamh"
 
-#~ msgid ""
-#~ "E815: Sorry, this command is disabled, the MzScheme libraries could not "
-#~ "be loaded."
-#~ msgstr ""
-#~ "E815: T� br�n orm, bh� an t-ord� seo d�chumasaithe, n�orbh fh�idir "
-#~ "leabharlanna MzScheme a lucht�."
+msgid "E74: Command too complex"
+msgstr "E74: Ord� r�chasta"
 
-#~ msgid "invalid expression"
-#~ msgstr "slonn neamhbhail�"
+msgid "E75: Name too long"
+msgstr "E75: Ainm r�fhada"
 
-#~ msgid "expressions disabled at compile time"
-#~ msgstr "d�chumasa�odh sloinn ag am an tiomsaithe"
+msgid "E76: Too many ["
+msgstr "E76: an iomarca ["
 
-#~ msgid "hidden option"
-#~ msgstr "rogha fholaithe"
+msgid "E77: Too many file names"
+msgstr "E77: An iomarca ainmneacha comhaid"
 
-#~ msgid "unknown option"
-#~ msgstr "rogha anaithnid"
+msgid "E488: Trailing characters"
+msgstr "E488: Carachtair chun deiridh"
 
-#~ msgid "window index is out of range"
-#~ msgstr "inn�acs fuinneoige as raon"
+msgid "E78: Unknown mark"
+msgstr "E78: Marc anaithnid"
 
-#~ msgid "couldn't open buffer"
-#~ msgstr "n� f�idir maol�n a oscailt"
+msgid "E79: Cannot expand wildcards"
+msgstr "E79: N� f�idir saor�ga a leathn�"
 
-#~ msgid "cannot save undo information"
-#~ msgstr "n� f�idir eolas cealaithe a sh�bh�il"
+msgid "E591: 'winheight' cannot be smaller than 'winminheight'"
+msgstr "E591: n� cheada�tear 'winheight' a bheith n�os l� n� 'winminheight'"
 
-#~ msgid "cannot delete line"
-#~ msgstr "n� f�idir an l�ne a scriosadh"
+msgid "E592: 'winwidth' cannot be smaller than 'winminwidth'"
+msgstr "E592: n� cheada�tear 'winwidth' a bheith n�os l� n� 'winminwidth'"
 
-#~ msgid "cannot replace line"
-#~ msgstr "n� f�idir an l�ne a athchur"
+msgid "E80: Error while writing"
+msgstr "E80: Earr�id agus � scr�obh"
 
-#~ msgid "cannot insert line"
-#~ msgstr "n� f�idir l�ne a ions�"
+msgid "Zero count"
+msgstr "Nialas"
 
-#~ msgid "string cannot contain newlines"
-#~ msgstr "n� cheada�tear carachtair l�ne nua sa teaghr�n"
+msgid "E81: Using <SID> not in a script context"
+msgstr "E81: <SID> � �s�id nach i gcomhth�acs scripte"
 
-#~ msgid "Vim error: ~a"
-#~ msgstr "earr�id Vim: ~a"
+msgid "E449: Invalid expression received"
+msgstr "E449: Fuarthas slonn neamhbhail�"
 
-#~ msgid "Vim error"
-#~ msgstr "earr�id Vim"
+msgid "E463: Region is guarded, cannot modify"
+msgstr "E463: R�igi�n cosanta, n� f�idir � a athr�"
 
-#~ msgid "buffer is invalid"
-#~ msgstr "maol�n neamhbhail�"
+msgid "E744: NetBeans does not allow changes in read-only files"
+msgstr "E744: N� cheada�onn NetBeans aon athr� i gcomhaid inl�ite amh�in"
 
-#~ msgid "window is invalid"
-#~ msgstr "fuinneog neamhbhail�"
+#, c-format
+msgid "E685: Internal error: %s"
+msgstr "E685: Earr�id inmhe�nach: %s"
 
-#~ msgid "linenr out of range"
-#~ msgstr "l�ne-uimhir as raon"
+msgid "E363: pattern uses more memory than 'maxmempattern'"
+msgstr "E363: �s�ideann an patr�n n�os m� cuimhne n� 'maxmempattern'"
 
-#~ msgid "not allowed in the Vim sandbox"
-#~ msgstr "n� cheada�tear � seo i mbosca gainimh Vim"
+msgid "E749: empty buffer"
+msgstr "E749: maol�n folamh"
 
-#~ msgid ""
-#~ "E263: Sorry, this command is disabled, the Python library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E263: T� br�n orm, n�l an t-ord� seo le f�il, n�orbh fh�idir an "
-#~ "leabharlann Python a lucht�."
+#, c-format
+msgid "E86: Buffer %ld does not exist"
+msgstr "E86: N�l a leith�id de mhaol�n %ld"
 
-#~ msgid "E659: Cannot invoke Python recursively"
-#~ msgstr "E659: N� f�idir Python a rith go hathch�rsach"
+msgid "E682: Invalid search pattern or delimiter"
+msgstr "E682: Patr�n n� teormharc�ir neamhbhail� cuardaigh"
 
-#~ msgid "can't delete OutputObject attributes"
-#~ msgstr "n� f�idir tr�ithe OutputObject a scriosadh"
+msgid "E139: File is loaded in another buffer"
+msgstr "E139: T� an comhad luchtaithe i maol�n eile"
 
-#~ msgid "softspace must be an integer"
-#~ msgstr "caithfidh softspace a bheith ina shl�nuimhir"
+#, c-format
+msgid "E764: Option '%s' is not set"
+msgstr "E764: Rogha '%s' gan socr�"
 
-#~ msgid "invalid attribute"
-#~ msgstr "aitreab�id neamhbhail�"
+msgid "E850: Invalid register name"
+msgstr "E850: Ainm neamhbhail� tabhaill"
 
-#~ msgid "writelines() requires list of strings"
-#~ msgstr "liosta teaghr�n ag teast�il � writelines()"
+#, c-format
+msgid "E919: Directory not found in '%s': \"%s\""
+msgstr "E919: Comhadlann gan aimsi� in '%s': \"%s\""
 
-#~ msgid "E264: Python: Error initialising I/O objects"
-#~ msgstr "E264: Python: Earr�id agus r�ada I/A � dt�s�"
+msgid "search hit TOP, continuing at BOTTOM"
+msgstr "Buaileadh an BARR le linn an chuardaigh, ag lean�int ag an CHR�OCH"
 
-#~ msgid "attempt to refer to deleted buffer"
-#~ msgstr "rinneadh iarracht ar mhaol�n scriosta a rochtain"
+msgid "search hit BOTTOM, continuing at TOP"
+msgstr "Buaileadh an BUN le linn an chuardaigh, ag lean�int ag an BHARR"
 
-#~ msgid "line number out of range"
-#~ msgstr "l�ne-uimhir as raon"
+#, c-format
+msgid "Need encryption key for \"%s\""
+msgstr "Eochair chripti�ch�in le haghaidh \"%s\" de dh�th"
 
-#~ msgid "<buffer object (deleted) at %p>"
-#~ msgstr "<r�ad maol�in (scriosta) ag %p>"
+msgid "empty keys are not allowed"
+msgstr "n� cheada�tear eochracha folmha"
 
-#~ msgid "invalid mark name"
-#~ msgstr "ainm neamhbhail� mairc"
+msgid "dictionary is locked"
+msgstr "t� an focl�ir faoi ghlas"
 
-#~ msgid "no such buffer"
-#~ msgstr "n�l a leith�id de mhaol�n ann"
+msgid "list is locked"
+msgstr "t� an liosta faoi ghlas"
 
-#~ msgid "attempt to refer to deleted window"
-#~ msgstr "rinneadh iarracht ar fhuinneog scriosta a rochtain"
+#, c-format
+msgid "failed to add key '%s' to dictionary"
+msgstr "n�orbh fh�idir eochair '%s' a chur leis an bhfocl�ir"
 
-#~ msgid "readonly attribute"
-#~ msgstr "tr�ith inl�ite amh�in"
+#, c-format
+msgid "index must be int or slice, not %s"
+msgstr "n� m�r don inn�acs a bheith ina shl�nuimhir n� ina shlisne, seachas %s"
 
-#~ msgid "cursor position outside buffer"
-#~ msgstr "c�rs�ir taobh amuigh den mhaol�n"
+#, c-format
+msgid "expected str() or unicode() instance, but got %s"
+msgstr "bh�othas ag s�il le str() n� unicode(), ach fuarthas %s"
 
-#~ msgid "<window object (deleted) at %p>"
-#~ msgstr "<r�ad fuinneoige (scriosta) ag %p>"
+#, c-format
+msgid "expected bytes() or str() instance, but got %s"
+msgstr "bh�othas ag s�il le bytes() n� str(), ach fuarthas %s"
 
-#~ msgid "<window object (unknown) at %p>"
-#~ msgstr "<r�ad fuinneoige (anaithnid) ag %p>"
+#, c-format
+msgid ""
+"expected int(), long() or something supporting coercing to long(), but got %s"
+msgstr ""
+"bh�othas ag s�il le int(), long(), n� rud �igin inathraithe ina long(), ach "
+"fuarthas %s"
 
-#~ msgid "<window %d>"
-#~ msgstr "<fuinneog %d>"
+#, c-format
+msgid "expected int() or something supporting coercing to int(), but got %s"
+msgstr ""
+"bh�othas ag s�il le int() n� rud �igin inathraithe ina int(), ach fuarthas %s"
 
-#~ msgid "no such window"
-#~ msgstr "n�l a leith�id d'fhuinneog ann"
+msgid "value is too large to fit into C int type"
+msgstr "t� an luach n�os m� n� athr�g int sa teanga C"
 
-#~ msgid "E265: $_ must be an instance of String"
-#~ msgstr "E265: caithfidh $_ a bheith cine�l Teaghr�in"
+msgid "value is too small to fit into C int type"
+msgstr "t� an luach n�os l� n� athr�g int sa teanga C"
 
-#~ msgid ""
-#~ "E266: Sorry, this command is disabled, the Ruby library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E266: T� br�n orm, n�l an t-ord� seo le f�il, n�orbh fh�idir an "
-#~ "leabharlann Ruby a lucht�."
+msgid "number must be greater than zero"
+msgstr "n� m�r don uimhir a bheith deimhneach"
 
-#~ msgid "E267: unexpected return"
-#~ msgstr "E267: \"return\" gan choinne"
+msgid "number must be greater or equal to zero"
+msgstr "n� m�r don uimhir a bheith >= 0"
 
-#~ msgid "E268: unexpected next"
-#~ msgstr "E268: \"next\" gan choinne"
+msgid "can't delete OutputObject attributes"
+msgstr "n� f�idir tr�ithe OutputObject a scriosadh"
 
-#~ msgid "E269: unexpected break"
-#~ msgstr "E269: \"break\" gan choinne"
+#, c-format
+msgid "invalid attribute: %s"
+msgstr "aitreab�id neamhbhail�: %s"
 
-#~ msgid "E270: unexpected redo"
-#~ msgstr "E270: \"redo\" gan choinne"
+msgid "E264: Python: Error initialising I/O objects"
+msgstr "E264: Python: Earr�id agus r�ada I/A � dt�s�"
 
-#~ msgid "E271: retry outside of rescue clause"
-#~ msgstr "E271: \"retry\" taobh amuigh de chl�sal tarrth�la"
+msgid "failed to change directory"
+msgstr "n�orbh fh�idir an chomhadlann a athr�"
 
-#~ msgid "E272: unhandled exception"
-#~ msgstr "E272: eisceacht gan l�imhse�il"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got %s"
+msgstr ""
+"bh�othas ag s�il le 3-chodach mar thoradh ar imp.find_module(), ach fuarthas "
+"%s"
 
-#~ msgid "E273: unknown longjmp status %d"
-#~ msgstr "E273: st�das anaithnid longjmp %d"
+#, c-format
+msgid "expected 3-tuple as imp.find_module() result, but got tuple of size %d"
+msgstr ""
+"bh�othas ag s�il le 3-chodach mar thoradh ar imp.find_module(), ach fuarthas "
+"%d-chodach"
+
+msgid "internal error: imp.find_module returned tuple with NULL"
+msgstr "earr�id inmhe�nach: fuarthas codach NULL ar ais � imp.find_module"
+
+msgid "cannot delete vim.Dictionary attributes"
+msgstr "n� f�idir tr�ithe vim.Dictionary a scriosadh"
+
+msgid "cannot modify fixed dictionary"
+msgstr "n� f�idir focl�ir socraithe a athr�"
+
+#, c-format
+msgid "cannot set attribute %s"
+msgstr "n� f�idir tr�ith %s a shocr�"
+
+msgid "hashtab changed during iteration"
+msgstr "athra�odh an haist�b le linn atriallta"
+
+#, c-format
+msgid "expected sequence element of size 2, but got sequence of size %d"
+msgstr "bh�othas ag s�il le heilimint de mh�id 2, ach fuarthas m�id %d"
+
+msgid "list constructor does not accept keyword arguments"
+msgstr "n� ghlacann cruthaitheoir an liosta le harg�int� eochairfhocail"
+
+msgid "list index out of range"
+msgstr "inn�acs liosta as raon"
+
+#. No more suitable format specifications in python-2.3
+#, c-format
+msgid "internal error: failed to get vim list item %d"
+msgstr "earr�id inmhe�nach: n�l aon fh�il ar mh�r %d sa liosta vim"
+
+msgid "slice step cannot be zero"
+msgstr "n� cheada�tear slisne le c�im 0"
+
+#, c-format
+msgid "attempt to assign sequence of size greater than %d to extended slice"
+msgstr "iarracht ar sheicheamh n�os m� n� %d a shannadh do shlisne fadaithe"
+
+#, c-format
+msgid "internal error: no vim list item %d"
+msgstr "earr�id inmhe�nach: n�l aon mh�r %d sa liosta vim"
+
+msgid "internal error: not enough list items"
+msgstr "earr�id inmhe�nach: n�l go leor m�reanna liosta ann"
+
+msgid "internal error: failed to add item to list"
+msgstr "earr�id inmhe�nach: n�orbh fh�idir m�r a chur leis an liosta"
+
+#, c-format
+msgid "attempt to assign sequence of size %d to extended slice of size %d"
+msgstr "iarracht ar sheicheamh de mh�id %d a shannadh do shlisne de mh�id %d"
+
+msgid "failed to add item to list"
+msgstr "n�orbh fh�idir m�r a chur leis an liosta"
+
+msgid "cannot delete vim.List attributes"
+msgstr "n� f�idir tr�ithe vim.List a scriosadh"
+
+msgid "cannot modify fixed list"
+msgstr "n� f�idir liosta socraithe a athr�"
+
+#, c-format
+msgid "unnamed function %s does not exist"
+msgstr "n�l feidhm %s gan ainm ann"
+
+#, c-format
+msgid "function %s does not exist"
+msgstr "n�l feidhm %s ann"
+
+#, c-format
+msgid "failed to run function %s"
+msgstr "n�orbh fh�idir feidhm %s a rith"
+
+msgid "unable to get option value"
+msgstr "n� f�idir luach na rogha a fh�il"
+
+msgid "internal error: unknown option type"
+msgstr "earr�id inmhe�nach: cine�l rogha anaithnid"
+
+msgid "problem while switching windows"
+msgstr "tharla earr�id agus an fhuinneog � hathr�"
+
+#, c-format
+msgid "unable to unset global option %s"
+msgstr "n� f�idir rogha chomhchoiteann %s a dh�shocr�"
+
+#, c-format
+msgid "unable to unset option %s which does not have global value"
+msgstr "n� f�idir rogha %s gan luach comhchoiteann a dh�shocr�"
+
+msgid "attempt to refer to deleted tab page"
+msgstr "tagairt d�anta do leathanach cluais�n� scriosta"
+
+msgid "no such tab page"
+msgstr "n�l a leith�id de leathanach cluais�n� ann"
+
+msgid "attempt to refer to deleted window"
+msgstr "rinneadh iarracht ar fhuinneog scriosta a rochtain"
+
+msgid "readonly attribute: buffer"
+msgstr "tr�ith inl�ite amh�in: maol�n"
+
+msgid "cursor position outside buffer"
+msgstr "c�rs�ir taobh amuigh den mhaol�n"
+
+msgid "no such window"
+msgstr "n�l a leith�id d'fhuinneog ann"
+
+msgid "attempt to refer to deleted buffer"
+msgstr "rinneadh iarracht ar mhaol�n scriosta a rochtain"
+
+msgid "failed to rename buffer"
+msgstr "n�orbh fh�idir ainm nua a chur ar an maol�n"
+
+msgid "mark name must be a single character"
+msgstr "n� cheada�tear ach carachtar amh�in in ainm an mhairc"
+
+#, c-format
+msgid "expected vim.Buffer object, but got %s"
+msgstr "bh�othas ag s�il le r�ad vim.Buffer, ach fuarthas %s"
+
+#, c-format
+msgid "failed to switch to buffer %d"
+msgstr "n�orbh fh�idir athr� go dt� maol�n a %d"
+
+#, c-format
+msgid "expected vim.Window object, but got %s"
+msgstr "bh�othas ag s�il le r�ad vim.Window, ach fuarthas %s"
+
+msgid "failed to find window in the current tab page"
+msgstr "n�or aims�odh fuinneog sa leathanach cluais�n� reatha"
+
+msgid "did not switch to the specified window"
+msgstr "n�or athra�odh go dt� an fhuinneog roghnaithe"
+
+#, c-format
+msgid "expected vim.TabPage object, but got %s"
+msgstr "bh�othas ag s�il le r�ad vim.TabPage, ach fuarthas %s"
+
+msgid "did not switch to the specified tab page"
+msgstr "n�or athra�odh go dt� an leathanach cluais�n� roghnaithe"
+
+msgid "failed to run the code"
+msgstr "n�orbh fh�idir an c�d a chur ar si�l"
+
+msgid "E858: Eval did not return a valid python object"
+msgstr "E858: N� bhfuarthas r�ad bail� python ar ais � Eval"
+
+msgid "E859: Failed to convert returned python object to vim value"
+msgstr "E859: N�orbh fh�idir luach vim a dh�anamh as an r�ad python"
+
+#, c-format
+msgid "unable to convert %s to vim dictionary"
+msgstr "n� f�idir focl�ir vim a dh�anamh as %s"
+
+#, c-format
+msgid "unable to convert %s to vim list"
+msgstr "n� f�idir liosta vim a dh�anamh as %s"
+
+#, c-format
+msgid "unable to convert %s to vim structure"
+msgstr "n� f�idir strucht�r vim a dh�anamh as %s"
+
+msgid "internal error: NULL reference passed"
+msgstr "earr�id inmhe�nach: tagairt NULL seolta"
+
+msgid "internal error: invalid value type"
+msgstr "earr�id inmhe�nach: cine�l neamhbhail�"
+
+msgid ""
+"Failed to set path hook: sys.path_hooks is not a list\n"
+"You should now do the following:\n"
+"- append vim.path_hook to sys.path_hooks\n"
+"- append vim.VIM_SPECIAL_PATH to sys.path\n"
+msgstr ""
+"N�orbh fh�idir path_hook a shocr�: n� liosta � sys.path_hooks\n"
+"Ba ch�ir duit na ruda� seo a leanas a dh�anamh:\n"
+"- cuir vim.path_hook le deireadh sys.path_hooks\n"
+"- cuir vim.VIM_SPECIAL_PATH le deireadh sys.path\n"
+
+msgid ""
+"Failed to set path: sys.path is not a list\n"
+"You should now append vim.VIM_SPECIAL_PATH to sys.path"
+msgstr ""
+"N�orbh fh�idir an chonair a shocr�: n� liosta � sys.path\n"
+"Ba ch�ir duit vim.VIM_SPECIAL_PATH a cheangal le deireadh sys.path"
+
+#~ msgid "E693: Can only compare Funcref with Funcref"
+#~ msgstr "E693: Is f�idir Funcref a chur i gcompar�id le Funcref eile amh�in"
+
+#~ msgid "E706: Variable type mismatch for: %s"
+#~ msgstr "E706: M�mheaitse�il idir cine�lacha athr�ige: %s"
+
+#~ msgid "%ld characters"
+#~ msgstr "%ld carachtar"
 
 #~ msgid "Toggle implementation/definition"
 #~ msgstr "Scor�naigh feidhmi�/sainmh�ni�"
@@ -7063,666 +7159,35 @@ msgstr "E446: N
 #~ msgid "Sniff: Error during write. Disconnected"
 #~ msgstr "Sniff: Earr�id sa scr�obh. D�nasctha"
 
-#~ msgid "invalid buffer number"
-#~ msgstr "uimhir neamhbhail� mhaol�in"
-
-#~ msgid "not implemented yet"
-#~ msgstr "n�l ar f�il"
-
-#~ msgid "cannot set line(s)"
-#~ msgstr "n� f�idir l�n(t)e a shocr�"
-
-#~ msgid "mark not set"
-#~ msgstr "marc gan socr�"
-
-#~ msgid "row %d column %d"
-#~ msgstr "l�ne %d col�n %d"
-
-#~ msgid "cannot insert/append line"
-#~ msgstr "n� f�idir l�ne a ions�/iarcheangal"
-
-#~ msgid "unknown flag: "
-#~ msgstr "bratach anaithnid: "
-
-#~ msgid "unknown vimOption"
-#~ msgstr "vimOption anaithnid"
-
-#~ msgid "keyboard interrupt"
-#~ msgstr "idirbhriseadh m�archl�ir"
-
-#~ msgid "vim error"
-#~ msgstr "earr�id vim"
-
-#~ msgid "cannot create buffer/window command: object is being deleted"
-#~ msgstr "n� f�idir ord� maol�in/fuinneoige a chruth�: r�ad � scriosadh"
-
-#~ msgid ""
-#~ "cannot register callback command: buffer/window is already being deleted"
-#~ msgstr ""
-#~ "n� f�idir ord� aisghlaoch a chl�r�: maol�n/fuinneog � scriosadh cheana"
-
-#~ msgid ""
-#~ "E280: TCL FATAL ERROR: reflist corrupt!? Please report this to vim-"
-#~ "dev@vim.org"
-#~ msgstr ""
-#~ "E280: EARR�ID MHARFACH TCL: liosta truaillithe tagartha!? Seol tuairisc "
-#~ "fhabht chuig <vim-dev@vim.org> le do thoil"
-
-#~ msgid "cannot register callback command: buffer/window reference not found"
-#~ msgstr ""
-#~ "n� f�idir ord� aisghlaoch a chl�r�: tagairt mhaol�n/fhuinneoige gan aimsi�"
-
-#~ msgid ""
-#~ "E571: Sorry, this command is disabled: the Tcl library could not be "
-#~ "loaded."
-#~ msgstr ""
-#~ "E571: T� br�n orm, n�l an t-ord� seo le f�il: n�orbh fh�idir an "
-#~ "leabharlann Tcl a lucht�."
-
-#~ msgid ""
-#~ "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim."
-#~ "org"
-#~ msgstr ""
-#~ "E281: EARR�ID TCL: n�l an c�d scortha ina shl�nuimhir!? Seol tuairisc "
-#~ "fhabht chuig <vim-dev@vim.org> le do thoil"
-
-#~ msgid "E572: exit code %d"
-#~ msgstr "E572: c�d scortha %d"
-
-#~ msgid "cannot get line"
-#~ msgstr "n� f�idir an l�ne a fh�il"
-
-#~ msgid "Unable to register a command server name"
-#~ msgstr "N� f�idir ainm fhreastala� ordaithe a chl�r�"
-
-#~ msgid "E248: Failed to send command to the destination program"
-#~ msgstr "E248: Theip ar sheoladh ord� chuig an sprioc-chl�r"
-
-#~ msgid "E573: Invalid server id used: %s"
-#~ msgstr "E573: Aitheantas neamhbhail� freastala� in �s�id: %s"
-
-#~ msgid "E251: VIM instance registry property is badly formed.  Deleted!"
-#~ msgstr "E251: Air� m�chumtha sa chl�rlann �isc VIM.  Scriosta!"
-
-#~ msgid "This Vim was not compiled with the diff feature."
-#~ msgstr "N�or tiomsa�odh an leagan Vim seo le `diff' ar f�il."
-
-#~ msgid "'-nb' cannot be used: not enabled at compile time\n"
-#~ msgstr "N� f�idir '-nb' a �s�id: n�or cumasa�odh � ag am tiomsaithe\n"
-
-#~ msgid "Vim: Error: Failure to start gvim from NetBeans\n"
-#~ msgstr "Vim: Earr�id: Theip ar thos� gvim � NetBeans\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Where case is ignored prepend / to make flag upper case"
-#~ msgstr ""
-#~ "\n"
-#~ "Nuair nach c�s�ogair �, cuir '/' ag tosach na brata� chun � a chur sa "
-#~ "ch�s uachtair"
-
-#~ msgid "-register\t\tRegister this gvim for OLE"
-#~ msgstr "-register\t\tCl�raigh an gvim seo le haghaidh OLE"
-
-#~ msgid "-unregister\t\tUnregister gvim for OLE"
-#~ msgstr "-unregister\t\tD�chl�raigh an gvim seo le haghaidh OLE"
-
-#~ msgid "-g\t\t\tRun using GUI (like \"gvim\")"
-#~ msgstr "-g\t\t\tRith agus �s�id an GUI (mar \"gvim\")"
-
-#~ msgid "-f  or  --nofork\tForeground: Don't fork when starting GUI"
-#~ msgstr "-f  n�  --nofork\tTulra: N� d�an forc agus an GUI � thos�"
-
-#~ msgid "-f\t\t\tDon't use newcli to open window"
-#~ msgstr "-f\t\t\tN� h�s�id newcli chun fuinneog a oscailt"
-
-#~ msgid "-dev <device>\t\tUse <device> for I/O"
-#~ msgstr "-dev <gl�as>\t\tBain �s�id as <gl�as> do I/A"
-
-#~ msgid "-U <gvimrc>\t\tUse <gvimrc> instead of any .gvimrc"
-#~ msgstr "-U <gvimrc>\t\tBain �s�id as <gvimrc> in ionad aon .gvimrc"
-
-#~ msgid "-x\t\t\tEdit encrypted files"
-#~ msgstr "-x\t\t\tCuir comhaid chriptithe in eagar"
-
-#~ msgid "-display <display>\tConnect vim to this particular X-server"
-#~ msgstr "-display <freastala�>\tNasc vim leis an bhfreastala�-X seo"
-
-#~ msgid "-X\t\t\tDo not connect to X server"
-#~ msgstr "-X\t\t\tN� naisc leis an bhfreastala� X"
-
-#~ msgid "--remote <files>\tEdit <files> in a Vim server if possible"
-#~ msgstr ""
-#~ "--remote <comhaid>\tCuir <comhaid> in eagar le freastala� Vim m�s f�idir"
-
-#~ msgid "--remote-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-silent <comhaid> Mar an gc�anna, n� d�an gear�n mura bhfuil "
-#~ "freastala� ann"
-
-#~ msgid ""
-#~ "--remote-wait <files>  As --remote but wait for files to have been edited"
-#~ msgstr ""
-#~ "--remote-wait <comhaid>  Mar --remote ach fan leis na comhaid a bheith "
-#~ "curtha in eagar"
-
-#~ msgid ""
-#~ "--remote-wait-silent <files>  Same, don't complain if there is no server"
-#~ msgstr ""
-#~ "--remote-wait-silent <comhaid>  Mar an gc�anna, n� d�an gear�n mura "
-#~ "bhfuil freastala� ann"
-
-#~ msgid ""
-#~ "--remote-tab[-wait][-silent] <files>  As --remote but use tab page per "
-#~ "file"
-#~ msgstr ""
-#~ "--remote-tab[-wait][-silent] <comhaid>  Cos�il le --remote ach oscail "
-#~ "cluais�n do gach comhad"
-
-#~ msgid "--remote-send <keys>\tSend <keys> to a Vim server and exit"
-#~ msgstr ""
-#~ "--remote-send <eochracha>\tSeol <eochracha> chuig freastala� Vim agus "
-#~ "scoir"
-
-#~ msgid ""
-#~ "--remote-expr <expr>\tEvaluate <expr> in a Vim server and print result"
-#~ msgstr ""
-#~ "--remote-expr <slonn>\tLuach�il <slonn> le freastala� Vim agus taispe�in "
-#~ "an toradh"
-
-#~ msgid "--serverlist\t\tList available Vim server names and exit"
-#~ msgstr "--serverlist\t\tTaispe�in freastalaithe Vim at� ar f�il agus scoir"
-
-#~ msgid "--servername <name>\tSend to/become the Vim server <name>"
-#~ msgstr "--servername <ainm>\tSeol chuig/T�igh i do fhreastala� Vim <ainm>"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Motif version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Arg�int� ar eolas do gvim (leagan Motif):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (neXtaw version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Arg�int� ar eolas do gvim (leagan neXtaw):\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (Athena version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Arg�int� ar eolas do gvim (leagan Athena):\n"
-
-#~ msgid "-display <display>\tRun vim on <display>"
-#~ msgstr "-display <sc�ile�n>\tRith vim ar <sc�ile�n>"
-
-#~ msgid "-iconic\t\tStart vim iconified"
-#~ msgstr "-iconic\t\tTosaigh vim sa mh�d �oslaghdaithe"
-
-#~ msgid "-name <name>\t\tUse resource as if vim was <name>"
-#~ msgstr "-name <ainm>\t\t�s�id acmhainn mar a bheadh vim <ainm>"
-
-#~ msgid "\t\t\t  (Unimplemented)\n"
-#~ msgstr "\t\t\t  (N�l ar f�il)\n"
-
-#~ msgid "-background <color>\tUse <color> for the background (also: -bg)"
-#~ msgstr "-background <dath>\tBain �s�id as <dath> don ch�lra (-bg fosta)"
-
-#~ msgid "-foreground <color>\tUse <color> for normal text (also: -fg)"
-#~ msgstr ""
-#~ "-foreground <dath>\t�s�id <dath> le haghaidh gn�th-th�acs (fosta: -fg)"
-
-#~ msgid "-font <font>\t\tUse <font> for normal text (also: -fn)"
-#~ msgstr "-font <cl�>\t\t�s�id <cl�> le haghaidh gn�th-th�acs (fosta: -fn)"
-
-#~ msgid "-boldfont <font>\tUse <font> for bold text"
-#~ msgstr "-boldfont <cl�>\tBain �s�id as <cl�> do chl� trom"
-
-#~ msgid "-italicfont <font>\tUse <font> for italic text"
-#~ msgstr "-italicfont <cl�>\t�s�id <cl�> le haghaidh t�acs iod�lach"
-
-#~ msgid "-geometry <geom>\tUse <geom> for initial geometry (also: -geom)"
-#~ msgstr ""
-#~ "-geometry <geoim>\t�s�id <geoim> le haghaidh na c�imseatan tosaigh "
-#~ "(fosta: -geom)"
-
-#~ msgid "-borderwidth <width>\tUse a border width of <width> (also: -bw)"
-#~ msgstr "-borderwidth <leithead>\tSocraigh <leithead> na himl�ne (-bw fosta)"
-
-#~ msgid ""
-#~ "-scrollbarwidth <width>  Use a scrollbar width of <width> (also: -sw)"
-#~ msgstr ""
-#~ "-scrollbarwidth <leithead> Socraigh leithead na scrollbharra� a bheith "
-#~ "<leithead> (fosta: -sw)"
-
-#~ msgid "-menuheight <height>\tUse a menu bar height of <height> (also: -mh)"
-#~ msgstr ""
-#~ "-menuheight <airde>\tSocraigh airde an bharra roghchl�ir a bheith <airde> "
-#~ "(fosta: -mh)"
-
-#~ msgid "-reverse\t\tUse reverse video (also: -rv)"
-#~ msgstr "-reverse\t\t�s�id f�s aisiompaithe (fosta: -rv)"
-
-#~ msgid "+reverse\t\tDon't use reverse video (also: +rv)"
-#~ msgstr "+reverse\t\tN� h�s�id f�s aisiompaithe (fosta: +rv)"
-
-#~ msgid "-xrm <resource>\tSet the specified resource"
-#~ msgstr "-xrm <acmhainn>\tSocraigh an acmhainn sainithe"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (RISC OS version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Arg�int� ar eolas do gvim (leagan RISC OS):\n"
-
-#~ msgid "--columns <number>\tInitial width of window in columns"
-#~ msgstr "--columns <uimhir>\tLeithead fuinneoige i dtosach (col�in)"
-
-#~ msgid "--rows <number>\tInitial height of window in rows"
-#~ msgstr "--rows <uimhir>\tAirde fhuinneoige i dtosach (r�nna)"
-
-#~ msgid ""
-#~ "\n"
-#~ "Arguments recognised by gvim (GTK+ version):\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Arg�int� ar eolas do gvim (leagan GTK+):\n"
-
-#~ msgid "-display <display>\tRun vim on <display> (also: --display)"
-#~ msgstr "-display <sc�ile�n>\tRith vim ar <sc�ile�n> (fosta: --display)"
-
-#~ msgid "--role <role>\tSet a unique role to identify the main window"
-#~ msgstr ""
-#~ "--role <r�l>\tSocraigh r�l saini�il chun an phr�omhfhuinneog a aithint"
-
-#~ msgid "--socketid <xid>\tOpen Vim inside another GTK widget"
-#~ msgstr "--socketid <xid>\tOscail Vim isteach i ngiuirl�id GTK eile"
-
-#~ msgid "-P <parent title>\tOpen Vim inside parent application"
-#~ msgstr "-P <m�thairchl�r>\tOscail Vim isteach sa mh�thairchl�r"
-
-#~ msgid "--windowid <HWND>\tOpen Vim inside another win32 widget"
-#~ msgstr "--windowid <HWND>\tOscail Vim isteach i ngiuirl�id win32 eile"
-
-#~ msgid "No display"
-#~ msgstr "Gan taispe�int"
-
-#~ msgid ": Send failed.\n"
-#~ msgstr ": Theip ar seoladh.\n"
-
-#~ msgid ": Send failed. Trying to execute locally\n"
-#~ msgstr ": Theip ar seoladh. Ag baint triail as go log�nta\n"
-
-#~ msgid "%d of %d edited"
-#~ msgstr "%d as %d d�anta"
-
-#~ msgid "No display: Send expression failed.\n"
-#~ msgstr "Gan taispe�int: Theip ar sheoladh sloinn.\n"
-
-#~ msgid ": Send expression failed.\n"
-#~ msgstr ": Theip ar sheoladh sloinn.\n"
-
-#~ msgid "E543: Not a valid codepage"
-#~ msgstr "E543: N� c�dleathanach bail� �"
-
-#~ msgid "E285: Failed to create input context"
-#~ msgstr "E285: Theip ar chruth� comhth�acs ionchuir"
-
-#~ msgid "E286: Failed to open input method"
-#~ msgstr "E286: Theip ar oscailt mhodh ionchuir"
-
-#~ msgid "E287: Warning: Could not set destroy callback to IM"
-#~ msgstr ""
-#~ "E287: Rabhadh: N�orbh fh�idir aisghlaoch l�irscriosta a shocr� le IM"
-
-#~ msgid "E288: input method doesn't support any style"
-#~ msgstr "E288: N� thaca�onn an modh ionchuir aon st�l"
-
-#~ msgid "E289: input method doesn't support my preedit type"
-#~ msgstr "E289: n� thaca�onn an modh ionchuir mo chine�l r�amheagair"
-
-#~ msgid "E290: over-the-spot style requires fontset"
-#~ msgstr "E290: tacar cl� ag teast�il � st�l thar-an-spota"
-
-#~ msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
-#~ msgstr ""
-#~ "E291: T� an GTK+ at� agat n�os sine n� leagan 1.2.3. D�chumasa�tear an "
-#~ "limist�ar st�dais"
-
-#~ msgid "E292: Input Method Server is not running"
-#~ msgstr "E292: N�l an Freastala� Mhodh Ionchuir ag rith"
-
-#~ msgid ""
-#~ "\n"
-#~ "         [not usable with this version of Vim]"
-#~ msgstr ""
-#~ "\n"
-#~ "         [n� in�s�idte leis an leagan seo Vim]"
-
-#~ msgid "Tear off this menu"
-#~ msgstr "Bain an roghchl�r seo"
-
-#~ msgid "Select Directory dialog"
-#~ msgstr "Dial�g `Roghnaigh Comhadlann'"
-
-#~ msgid "Save File dialog"
-#~ msgstr "Dial�g `S�bh�il Comhad'"
-
-#~ msgid "Open File dialog"
-#~ msgstr "Dial�g `Oscail Comhad'"
-
-#~ msgid "E338: Sorry, no file browser in console mode"
-#~ msgstr "E338: N�l brabhs�la� comhaid ar f�il sa mh�d cons�il"
-
-#~ msgid "Vim: preserving files...\n"
-#~ msgstr "Vim: comhaid � gcaomhn�...\n"
-
-#~ msgid "Vim: Finished.\n"
-#~ msgstr "Vim: Cr�ochnaithe.\n"
-
-#~ msgid "ERROR: "
-#~ msgstr "EARR�ID: "
-
-#~ msgid ""
-#~ "\n"
-#~ "[bytes] total alloc-freed %<PRIu64>-%<PRIu64>, in use %<PRIu64>, peak use "
-#~ "%<PRIu64>\n"
-#~ msgstr ""
-#~ "\n"
-#~ "[beart] ioml�n d�ilte-saor %<PRIu64>-%<PRIu64>, in �s�id %<PRIu64>, buaic "
-#~ "%<PRIu64>\n"
-
-#~ msgid ""
-#~ "[calls] total re/malloc()'s %<PRIu64>, total free()'s %<PRIu64>\n"
-#~ "\n"
-#~ msgstr ""
-#~ "[glaonna] re/malloc(): %<PRIu64>, free(): %<PRIu64>\n"
-#~ "\n"
-
-#~ msgid "E340: Line is becoming too long"
-#~ msgstr "E340: T� an l�ne ag �ir� r�fhada"
-
-#~ msgid "E341: Internal error: lalloc(%<PRId64>, )"
-#~ msgstr "E341: Earr�id inmhe�nach: lalloc(%<PRId64>, )"
-
-#~ msgid "E547: Illegal mouseshape"
-#~ msgstr "E547: Cruth neamhcheadaithe luiche"
-
-#~ msgid "Enter encryption key: "
-#~ msgstr "Iontr�il eochair chripti�ch�in: "
-
-#~ msgid "Enter same key again: "
-#~ msgstr "Iontr�il an eochair ar�s: "
-
-#~ msgid "Keys don't match!"
-#~ msgstr "N�l na heochracha comhoiri�nach le ch�ile!"
+#~ msgid "  Quit, or continue with caution.\n"
+#~ msgstr "  Scoir, n� lean ar aghaidh go hairdeallach.\n"
 
 #~ msgid "Cannot connect to Netbeans #2"
 #~ msgstr "N� f�idir nascadh le Netbeans #2"
 
-#~ msgid "Cannot connect to Netbeans"
-#~ msgstr "N� f�idir nascadh le Netbeans"
-
-#~ msgid "E668: Wrong access mode for NetBeans connection info file: \"%s\""
-#~ msgstr ""
-#~ "E668: M�d m�cheart rochtana ar an chomhad eolas naisc NetBeans: \"%s\""
-
 #~ msgid "read from Netbeans socket"
 #~ msgstr "l�adh � shoic�ad Netbeans"
 
-#~ msgid "E658: NetBeans connection lost for buffer %<PRId64>"
-#~ msgstr "E658: Cailleadh nasc NetBeans le haghaidh maol�in %<PRId64>"
-
-#~ msgid "E505: "
-#~ msgstr "E505: "
-
-#~ msgid "E775: Eval feature not available"
-#~ msgstr "E775: N�l an ghn� Eval le f�il"
-
-#~ msgid "freeing %<PRId64> lines"
-#~ msgstr "%<PRId64> l�ne � saoradh"
-
-#~ msgid "E530: Cannot change term in GUI"
-#~ msgstr "E530: N� f�idir 'term' a athr� sa GUI"
-
-#~ msgid "E531: Use \":gui\" to start the GUI"
-#~ msgstr "E531: �s�id \":gui\" chun an GUI a chur ag obair"
-
-#~ msgid "E617: Cannot be changed in the GTK+ 2 GUI"
-#~ msgstr "E617: N� f�idir � a athr� sa GUI GTK+ 2"
-
-#~ msgid "E596: Invalid font(s)"
-#~ msgstr "E596: Cl�(nna) neamhbhail�"
-
-#~ msgid "E597: can't select fontset"
-#~ msgstr "E597: n� f�idir tacar cl� a roghn�"
-
-#~ msgid "E598: Invalid fontset"
-#~ msgstr "E598: Tacar cl� neamhbhail�"
-
-#~ msgid "E533: can't select wide font"
-#~ msgstr "E533: n� f�idir cl� leathan a roghn�"
-
-#~ msgid "E534: Invalid wide font"
-#~ msgstr "E534: Cl� leathan neamhbhail�"
-
-#~ msgid "E538: No mouse support"
-#~ msgstr "E538: Gan taca�ocht luiche"
-
-#~ msgid "cannot open "
-#~ msgstr "n� f�idir a oscailt: "
-
-#~ msgid "VIM: Can't open window!\n"
-#~ msgstr "VIM: N� f�idir fuinneog a oscailt!\n"
-
-#~ msgid "Need Amigados version 2.04 or later\n"
-#~ msgstr "T� g� le Amigados leagan 2.04 n� n�os d�ana�\n"
-
-#~ msgid "Need %s version %<PRId64>\n"
-#~ msgstr "T� g� le %s, leagan %<PRId64>\n"
-
-#~ msgid "Cannot open NIL:\n"
-#~ msgstr "N� f�idir NIL a oscailt:\n"
-
-#~ msgid "Cannot create "
-#~ msgstr "N� f�idir a chruth�: "
-
-#~ msgid "Vim exiting with %d\n"
-#~ msgstr "Vim � scor le st�das %d\n"
-
-#~ msgid "cannot change console mode ?!\n"
-#~ msgstr "n� f�idir m�d cons�il a athr� ?!\n"
-
-#~ msgid "mch_get_shellsize: not a console??\n"
-#~ msgstr "mch_get_shellsize: n� cons�l � seo??\n"
-
-#~ msgid "E360: Cannot execute shell with -f option"
-#~ msgstr "E360: N� f�idir blaosc a rith le rogha -f"
-
-#~ msgid "Cannot execute "
-#~ msgstr "N� f�idir blaosc a rith: "
-
-#~ msgid "shell "
-#~ msgstr "blaosc "
-
-#~ msgid " returned\n"
-#~ msgstr " aisfhilleadh\n"
-
-#~ msgid "ANCHOR_BUF_SIZE too small."
-#~ msgstr "ANCHOR_BUF_SIZE r�bheag."
-
-#~ msgid "I/O ERROR"
-#~ msgstr "EARR�ID I/A"
-
-#~ msgid "Message"
-#~ msgstr "Teachtaireacht"
-
 #~ msgid "'columns' is not 80, cannot execute external commands"
 #~ msgstr "n� 80 � 'columns', n� f�idir orduithe seachtracha a rith"
 
-#~ msgid "E237: Printer selection failed"
-#~ msgstr "E237: Theip ar roghn� print�ara"
+#~ msgid "Could not set security context "
+#~ msgstr "N�orbh fh�idir comhth�acs sl�nd�la a shocr� "
 
-#~ msgid "to %s on %s"
-#~ msgstr "go %s ar %s"
+#~ msgid " for "
+#~ msgstr " le haghaidh "
 
-#~ msgid "E613: Unknown printer font: %s"
-#~ msgstr "E613: Cl�fhoireann anaithnid print�ara: %s"
+#~ msgid "Could not get security context "
+#~ msgstr "N�orbh fh�idir comhth�acs sl�nd�la a fh�il "
 
-#~ msgid "E238: Print error: %s"
-#~ msgstr "E238: Earr�id phriont�la: %s"
+#~ msgid ". Removing it!\n"
+#~ msgstr ". � scriosadh!\n"
 
-#~ msgid "Printing '%s'"
-#~ msgstr "'%s' � phriont�il"
+#~ msgid " (lang)"
+#~ msgstr " (teanga)"
 
-#~ msgid "E244: Illegal charset name \"%s\" in font name \"%s\""
-#~ msgstr ""
-#~ "E244: Ainm neamhcheadaithe ar thacar carachtar \"%s\" mar ph�irt d'ainm "
-#~ "cl� \"%s\""
-
-#~ msgid "E245: Illegal char '%c' in font name \"%s\""
-#~ msgstr "E245: Carachtar neamhcheadaithe '%c' mar ph�irt d'ainm cl� \"%s\""
-
-#~ msgid "Vim: Double signal, exiting\n"
-#~ msgstr "Vim: Comhartha d�bailte, ag scor\n"
-
-#~ msgid "Vim: Caught deadly signal %s\n"
-#~ msgstr "Vim: Fuarthas comhartha marfach %s\n"
-
-#~ msgid "Vim: Caught deadly signal\n"
-#~ msgstr "Vim: Fuarthas comhartha marfach\n"
-
-#~ msgid "Opening the X display took %<PRId64> msec"
-#~ msgstr "Th�g %<PRId64> ms chun an sc�ile�n X a oscailt"
-
-#~ msgid ""
-#~ "\n"
-#~ "Vim: Got X error\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Vim: Fuarthas earr�id � X\n"
-
-#~ msgid "Testing the X display failed"
-#~ msgstr "Theip ar th�st�il an sc�ile�in X"
-
-#~ msgid "Opening the X display timed out"
-#~ msgstr "Oscailt an sc�ile�in X thar am"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot execute shell sh\n"
-#~ msgstr ""
-#~ "\n"
-#~ "N� f�idir an bhlaosc sh a rith\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Cannot create pipes\n"
-#~ msgstr ""
-#~ "\n"
-#~ "N� f�idir p�opa� a chruth�\n"
-
-# "fork" not in standard refs/corpus.  Maybe want a "gabhl*" word instead? -KPS
-#~ msgid ""
-#~ "\n"
-#~ "Cannot fork\n"
-#~ msgstr ""
-#~ "\n"
-#~ "N� f�idir forc a dh�anamh\n"
-
-#~ msgid ""
-#~ "\n"
-#~ "Command terminated\n"
-#~ msgstr ""
-#~ "\n"
-#~ "Ord� cr�ochnaithe\n"
-
-#~ msgid "XSMP lost ICE connection"
-#~ msgstr "Chaill XSMP an nasc ICE"
-
-#~ msgid "Opening the X display failed"
-#~ msgstr "Theip ar oscailt an sc�ile�in X"
-
-#~ msgid "XSMP handling save-yourself request"
-#~ msgstr "Iarratas s�bh�il-do-f�in � l�imhse�il ag XSMP"
-
-#~ msgid "XSMP opening connection"
-#~ msgstr "Nasc � oscailt ag XSMP"
-
-#~ msgid "XSMP ICE connection watch failed"
-#~ msgstr "Theip ar fhaire nasc ICE XSMP"
-
-#~ msgid "XSMP SmcOpenConnection failed: %s"
-#~ msgstr "Theip ar XSMP SmcOpenConnection: %s"
-
-#~ msgid "At line"
-#~ msgstr "Ag l�ne"
-
-#~ msgid "Could not load vim32.dll!"
-#~ msgstr "N�orbh fh�idir vim32.dll a lucht�!"
-
-#~ msgid "VIM Error"
-#~ msgstr "Earr�id VIM"
-
-#~ msgid "Could not fix up function pointers to the DLL!"
-#~ msgstr "N�orbh fh�idir pointeoir� feidhme a ch�iri� i gcomhair an DLL!"
-
-#~ msgid "shell returned %d"
-#~ msgstr "d'aisfhill an bhlaosc %d"
-
-#~ msgid "Vim: Caught %s event\n"
-#~ msgstr "Vim: Fuarthas teagmhas %s\n"
-
-#~ msgid "close"
-#~ msgstr "d�n"
-
-#~ msgid "logoff"
-#~ msgstr "log�il amach"
-
-#~ msgid "shutdown"
-#~ msgstr "m�chadh"
-
-#~ msgid "E371: Command not found"
-#~ msgstr "E371: N� bhfuarthas an t-ord�"
-
-#~ msgid ""
-#~ "VIMRUN.EXE not found in your $PATH.\n"
-#~ "External commands will not pause after completion.\n"
-#~ "See  :help win32-vimrun  for more information."
-#~ msgstr ""
-#~ "N�or aims�odh VIMRUN.EXE i do $PATH.\n"
-#~ "N� mhoilleoidh orduithe seachtracha agus iad curtha i gcr�ch.\n"
-#~ "F�ach ar  :help win32-vimrun  chun n�os m� eolas a fh�il."
-
-#~ msgid "Vim Warning"
-#~ msgstr "Rabhadh Vim"
-
-#~ msgid "Conversion in %s not supported"
-#~ msgstr "Tiont� i %s gan taca�ocht"
-
-#~ msgid "E396: containedin argument not accepted here"
-#~ msgstr "E396: n� ghlactar leis an arg�int containedin anseo"
-
-#~ msgid "E430: Tag file path truncated for %s\n"
-#~ msgstr "E430: Teascadh conair an chomhaid clibeanna le haghaidh %s\n"
-
-#~ msgid "new shell started\n"
-#~ msgstr "tosa�odh blaosc nua\n"
-
-#~ msgid "Used CUT_BUFFER0 instead of empty selection"
-#~ msgstr "�s�ideadh CUT_BUFFER0 in ionad roghn�ch�in folaimh"
-
-#~ msgid "No undo possible; continue anyway"
-#~ msgstr "N� f�idir a cheal�; lean ar aghaidh mar sin f�in"
-
-# columns?
-#~ msgid "number changes  time"
-#~ msgstr "uimhir athruithe  am"
+#~ msgid "E759: Format error in spell file"
+#~ msgstr "E759: Earr�id fhorm�ide i gcomhad litrithe"
 
 #~ msgid ""
 #~ "\n"
@@ -7731,40 +7196,9 @@ msgstr "E446: N
 #~ "\n"
 #~ "Leagan GUI 16/32 giot�n MS-Windows"
 
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "Leagan GUI 64 giot�n MS-Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit GUI version"
-#~ msgstr ""
-#~ "\n"
-#~ "Leagan GUI 32 giot�n MS-Windows"
-
 #~ msgid " in Win32s mode"
 #~ msgstr " i m�d Win32s"
 
-#~ msgid " with OLE support"
-#~ msgstr " le taca�ocht OLE"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 64-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "Leagan cons�il 64 giot�n MS-Windows"
-
-#~ msgid ""
-#~ "\n"
-#~ "MS-Windows 32-bit console version"
-#~ msgstr ""
-#~ "\n"
-#~ "Leagan cons�il 32 giot�n MS-Windows"
-
 #~ msgid ""
 #~ "\n"
 #~ "MS-Windows 16-bit version"
@@ -7786,26 +7220,100 @@ msgstr "E446: N
 #~ "\n"
 #~ "Leagan 16 giot�n MS-DOS"
 
+#~ msgid "WARNING: Windows 95/98/ME detected"
+#~ msgstr "RABHADH: Braitheadh Windows 95/98/ME"
+
+#~ msgid "type  :help windows95<Enter>  for info on this"
+#~ msgstr "cl�scr�obh  :help windows95<Enter>      chun eolas a fh�il "
+
+#~ msgid "function constructor does not accept keyword arguments"
+#~ msgstr "n� ghlacann cruthaitheoir na feidhme le harg�int� eochairfhocail"
+
+#~ msgid "Vim dialog..."
+#~ msgstr "Dial�g Vim..."
+
+#~ msgid "Font Selection"
+#~ msgstr "Roghn� Cl�"
+
+#~ msgid "softspace must be an integer"
+#~ msgstr "caithfidh softspace a bheith ina shl�nuimhir"
+
+#~ msgid "writelines() requires list of strings"
+#~ msgstr "liosta teaghr�n ag teast�il � writelines()"
+
+#~ msgid "<buffer object (deleted) at %p>"
+#~ msgstr "<r�ad maol�in (scriosta) ag %p>"
+
+#~ msgid "<window object (deleted) at %p>"
+#~ msgstr "<r�ad fuinneoige (scriosta) ag %p>"
+
+#~ msgid "<window object (unknown) at %p>"
+#~ msgstr "<r�ad fuinneoige (anaithnid) ag %p>"
+
+#~ msgid "<window %d>"
+#~ msgstr "<fuinneog %d>"
+
 #~ msgid ""
-#~ "\n"
-#~ "MacOS X (unix) version"
+#~ "E281: TCL ERROR: exit code is not int!? Please report this to vim-dev@vim."
+#~ "org"
 #~ msgstr ""
-#~ "\n"
-#~ "Leagan MacOS X (unix)"
+#~ "E281: EARR�ID TCL: n�l an c�d scortha ina shl�nuimhir!? Seol tuairisc "
+#~ "fhabht chuig <vim-dev@vim.org> le do thoil"
+
+#~ msgid "-name <name>\t\tUse resource as if vim was <name>"
+#~ msgstr "-name <ainm>\t\t�s�id acmhainn mar a bheadh vim <ainm>"
+
+#~ msgid "\t\t\t  (Unimplemented)\n"
+#~ msgstr "\t\t\t  (N�l ar f�il)\n"
 
 #~ msgid ""
 #~ "\n"
-#~ "MacOS X version"
+#~ "Arguments recognised by gvim (RISC OS version):\n"
 #~ msgstr ""
 #~ "\n"
-#~ "Leagan MacOS X"
+#~ "Arg�int� ar eolas do gvim (leagan RISC OS):\n"
 
-#~ msgid ""
-#~ "\n"
-#~ "MacOS version"
+#~ msgid "--columns <number>\tInitial width of window in columns"
+#~ msgstr "--columns <uimhir>\tLeithead fuinneoige i dtosach (col�in)"
+
+#~ msgid "--rows <number>\tInitial height of window in rows"
+#~ msgstr "--rows <uimhir>\tAirde fhuinneoige i dtosach (r�nna)"
+
+#~ msgid "E290: over-the-spot style requires fontset"
+#~ msgstr "E290: tacar cl� ag teast�il � st�l thar-an-spota"
+
+#~ msgid "E291: Your GTK+ is older than 1.2.3. Status area disabled"
 #~ msgstr ""
-#~ "\n"
-#~ "Leagan MacOS"
+#~ "E291: T� an GTK+ at� agat n�os sine n� leagan 1.2.3. D�chumasa�tear an "
+#~ "limist�ar st�dais"
+
+#~ msgid "E292: Input Method Server is not running"
+#~ msgstr "E292: N�l an Freastala� Mhodh Ionchuir ag rith"
+
+#~ msgid "Vim: preserving files...\n"
+#~ msgstr "Vim: comhaid � gcaomhn�...\n"
+
+#~ msgid "Vim: Finished.\n"
+#~ msgstr "Vim: Cr�ochnaithe.\n"
+
+#~ msgid "E505: "
+#~ msgstr "E505: "
+
+#~ msgid "Vim: Double signal, exiting\n"
+#~ msgstr "Vim: Comhartha d�bailte, ag scor\n"
+
+#~ msgid "Vim: Caught deadly signal %s\n"
+#~ msgstr "Vim: Fuarthas comhartha marfach %s\n"
+
+#~ msgid "Vim: Caught deadly signal\n"
+#~ msgstr "Vim: Fuarthas comhartha marfach\n"
+
+#~ msgid "E396: containedin argument not accepted here"
+#~ msgstr "E396: n� ghlactar leis an arg�int containedin anseo"
+
+# columns?
+#~ msgid "number changes  time"
+#~ msgstr "uimhir athruithe  am"
 
 #~ msgid ""
 #~ "\n"
@@ -7814,202 +7322,9 @@ msgstr "E446: N
 #~ "\n"
 #~ "Leagan RISC OS"
 
-#~ msgid ""
-#~ "\n"
-#~ "OpenVMS version"
-#~ msgstr ""
-#~ "\n"
-#~ "Leagan OpenVMS"
-
-#~ msgid ""
-#~ "\n"
-#~ "Big version "
-#~ msgstr ""
-#~ "\n"
-#~ "Leagan m�r "
-
-#~ msgid ""
-#~ "\n"
-#~ "Normal version "
-#~ msgstr ""
-#~ "\n"
-#~ "Leagan coitianta "
-
-#~ msgid ""
-#~ "\n"
-#~ "Small version "
-#~ msgstr ""
-#~ "\n"
-#~ "Leagan beag "
-
-#~ msgid ""
-#~ "\n"
-#~ "Tiny version "
-#~ msgstr ""
-#~ "\n"
-#~ "Leagan beag b�deach "
-
-#~ msgid "with GTK2-GNOME GUI."
-#~ msgstr "le GUI GTK2-GNOME."
-
 #~ msgid "with GTK-GNOME GUI."
 #~ msgstr "le GUI GTK-GNOME."
 
-#~ msgid "with GTK2 GUI."
-#~ msgstr "le GUI GTK2."
-
-#~ msgid "with GTK GUI."
-#~ msgstr "le GUI GTK."
-
-#~ msgid "with X11-Motif GUI."
-#~ msgstr "le GUI X11-Motif."
-
-#~ msgid "with X11-neXtaw GUI."
-#~ msgstr "le GUI X11-neXtaw."
-
-#~ msgid "with X11-Athena GUI."
-#~ msgstr "le GUI X11-Athena."
-
-#~ msgid "with Photon GUI."
-#~ msgstr "le GUI Photon."
-
-#~ msgid "with GUI."
-#~ msgstr "le GUI."
-
-#~ msgid "with Carbon GUI."
-#~ msgstr "le GUI Carbon."
-
-#~ msgid "with Cocoa GUI."
-#~ msgstr "le GUI Cocoa."
-
-#~ msgid "with (classic) GUI."
-#~ msgstr "le GUI (clasaiceach)."
-
-#~ msgid "  system gvimrc file: \""
-#~ msgstr "  comhad gvimrc c�rais: \""
-
-#~ msgid "    user gvimrc file: \""
-#~ msgstr "    comhad gvimrc �s�ideora: \""
-
-#~ msgid "2nd user gvimrc file: \""
-#~ msgstr "dara comhad gvimrc �s�ideora: \""
-
-#~ msgid "3rd user gvimrc file: \""
-#~ msgstr "tr�� comhad gvimrc �s�ideora: \""
-
-#~ msgid "    system menu file: \""
-#~ msgstr "    comhad roghchl�ir an ch�rais: \""
-
-#~ msgid "Compiler: "
-#~ msgstr "Tiomsaitheoir: "
-
-# don't see where to localize "Help->Orphans"? --kps
-#~ msgid "menu  Help->Orphans           for information    "
-#~ msgstr "roghchl�r  Help->Orphans      chun eolas a fh�il "
-
-#~ msgid "Running modeless, typed text is inserted"
-#~ msgstr "� rith gan mh�id, ag ions� an t�acs at� iontr�ilte"
-
-# same problem --kps
-#~ msgid "menu  Edit->Global Settings->Toggle Insert Mode  "
-#~ msgstr "roghchl�r  Edit->Global Settings->Toggle Insert Mode  "
-
-#~ msgid "                              for two modes      "
-#~ msgstr "                              do dh� mh�d       "
-
-# same problem --kps
-#~ msgid "menu  Edit->Global Settings->Toggle Vi Compatible"
-#~ msgstr "roghchl�r  Edit->Global Settings->Toggle Vi Compatible"
-
-#~ msgid "                              for Vim defaults   "
-#~ msgstr "                              le haghaidh r�amhshocruithe Vim   "
-
-#~ msgid "WARNING: Windows 95/98/ME detected"
-#~ msgstr "RABHADH: Braitheadh Windows 95/98/ME"
-
-#~ msgid "type  :help windows95<Enter>  for info on this"
-#~ msgstr "cl�scr�obh  :help windows95<Enter>      chun eolas a fh�il "
-
-#~ msgid "E370: Could not load library %s"
-#~ msgstr "E370: N�orbh fh�idir an leabharlann %s a oscailt"
-
-#~ msgid ""
-#~ "Sorry, this command is disabled: the Perl library could not be loaded."
-#~ msgstr ""
-#~ "T� br�n orm, n�l an t-ord� seo le f�il: n�orbh fh�idir an leabharlann "
-#~ "Perl a lucht�."
-
-#~ msgid "E299: Perl evaluation forbidden in sandbox without the Safe module"
-#~ msgstr ""
-#~ "E299: N� cheada�tear luach�il Perl i mbosca gainimh gan an mod�l Safe"
-
-#~ msgid "Edit with &multiple Vims"
-#~ msgstr "Cuir in eagar le Vimeanna io&mad�la"
-
-#~ msgid "Edit with single &Vim"
-#~ msgstr "Cuir in eagar le &Vim aonair"
-
-#~ msgid "Diff with Vim"
-#~ msgstr "Diff le Vim"
-
-#~ msgid "Edit with &Vim"
-#~ msgstr "Cuir in Eagar le &Vim"
-
-#~ msgid "Edit with existing Vim - "
-#~ msgstr "Cuir in Eagar le Vim beo - "
-
-#~ msgid "Edits the selected file(s) with Vim"
-#~ msgstr "Cuir an comhad roghnaithe in eagar le Vim"
-
-#~ msgid "Error creating process: Check if gvim is in your path!"
-#~ msgstr ""
-#~ "Earr�id agus pr�iseas � chruth�: Deimhnigh go bhfuil gvim i do chonair!"
-
-#~ msgid "gvimext.dll error"
-#~ msgstr "earr�id gvimext.dll"
-
-#~ msgid "Path length too long!"
-#~ msgstr "Conair r�fhada!"
-
-#~ msgid "E234: Unknown fontset: %s"
-#~ msgstr "E234: Tacar cl� anaithnid: %s"
-
-#~ msgid "E235: Unknown font: %s"
-#~ msgstr "E235: Cl�fhoireann anaithnid: %s"
-
-#~ msgid "E236: Font \"%s\" is not fixed-width"
-#~ msgstr "E236: N� cl� aonleithid � \"%s\""
-
-#~ msgid "E448: Could not load library function %s"
-#~ msgstr "E448: N� f�idir feidhm %s leabharlainne a lucht�"
-
-#~ msgid "E26: Hebrew cannot be used: Not enabled at compile time\n"
-#~ msgstr ""
-#~ "E26: N�l taca�ocht Eabhraise ar f�il: N�or cumasa�odh � ag am tiomsaithe\n"
-
-#~ msgid "E27: Farsi cannot be used: Not enabled at compile time\n"
-#~ msgstr ""
-#~ "E27: N�l taca�ocht Pheirsise ar f�il: N�or cumasa�odh � ag am tiomsaithe\n"
-
-#~ msgid "E800: Arabic cannot be used: Not enabled at compile time\n"
-#~ msgstr ""
-#~ "E800: N�l taca�ocht Araibise ar f�il: N�or cumasa�odh � ag am tiomsaithe\n"
-
-#~ msgid "E247: no registered server named \"%s\""
-#~ msgstr "E247: n�l aon fhreastala� cl�raithe leis an ainm \"%s\""
-
-#~ msgid "E233: cannot open display"
-#~ msgstr "E233: n� f�idir an sc�ile�n a oscailt"
-
-#~ msgid "E449: Invalid expression received"
-#~ msgstr "E449: Fuarthas slonn neamhbhail�"
-
-#~ msgid "E463: Region is guarded, cannot modify"
-#~ msgstr "E463: R�igi�n cosanta, n� f�idir � a athr�"
-
-#~ msgid "E744: NetBeans does not allow changes in read-only files"
-#~ msgstr "E744: N� cheada�onn NetBeans aon athr� i gcomhaid inl�ite amh�in"
-
 #~ msgid "E569: maximum number of cscope connections reached"
 #~ msgstr "E569: n� cheada�tear n�os m� n� an l�on uasta nasc cscope"
 
@@ -8070,8 +7385,8 @@ msgstr "E446: N
 #~ msgstr ""
 #~ "N� m�r do charachtar a �s�idtear ar SLASH a bheith ASCII; i %s l�ne %d: %s"
 
-#~ msgid "%<PRId64> changes"
-#~ msgstr "%<PRId64> athr�"
+#~ msgid "%ld changes"
+#~ msgstr "%ld athr�"
 
 #~ msgid "with KDE GUI."
 #~ msgstr "le GUI KDE."

From 789c46934b2089782fb0115493513bd0cc6f7388 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 29 Apr 2017 01:50:00 +0200
Subject: [PATCH 198/257] vim-patch:b4ada79aa7d0

Runtime file updates.

https://github.com/vim/vim/commit/b4ada79aa7d0d1e5da3a659b1a203d7cae9f7f59

Closes #5055
---
 runtime/colors/README.txt    |  9 +++-
 runtime/doc/pi_gzip.txt      |  1 +
 runtime/doc/syntax.txt       |  9 +++-
 runtime/filetype.vim         |  7 ++-
 runtime/ftplugin/context.vim |  4 +-
 runtime/plugin/gzip.vim      |  8 ++-
 runtime/syntax/cpp.vim       | 10 ++--
 runtime/syntax/python.vim    | 97 +++++++++++++++++++-----------------
 8 files changed, 89 insertions(+), 56 deletions(-)

diff --git a/runtime/colors/README.txt b/runtime/colors/README.txt
index 3b3445cbc9..8fa6f322ab 100644
--- a/runtime/colors/README.txt
+++ b/runtime/colors/README.txt
@@ -41,9 +41,16 @@ this autocmd might be useful:
      autocmd SourcePre */colors/blue_sky.vim set background=dark
 Replace "blue_sky" with the name of the colorscheme.
 
-In case you want to tweak a colorscheme after it was loaded, check out that
+In case you want to tweak a colorscheme after it was loaded, check out the
 ColorScheme autocmd event.
 
+To customize a colorscheme use another name, e.g.  "~/.vim/colors/mine.vim",
+and use `:runtime` to load the original colorscheme:
+	" load the "evening" colorscheme
+	runtime colors/evening.vim
+	" change the color of statements
+	hi Statement ctermfg=Blue guifg=Blue
+
 To see which highlight group is used where, find the help for
 "highlight-groups" and "group-name".
 
diff --git a/runtime/doc/pi_gzip.txt b/runtime/doc/pi_gzip.txt
index 5b7a903f9c..a2497c89f9 100644
--- a/runtime/doc/pi_gzip.txt
+++ b/runtime/doc/pi_gzip.txt
@@ -25,6 +25,7 @@ with these extensions:
 	*.bz2		bzip2
 	*.lzma		lzma
 	*.xz		xz
+	*.lz		lzip
 
 That's actually the only thing you need to know.  There are no options.
 
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 9e4f546f64..7f4ede4124 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -4572,7 +4572,14 @@ in their own color.
 
 			Doesn't work recursively, thus you can't use
 			":colorscheme" in a color scheme script.
-			After the color scheme has been loaded the
+
+			To customize a colorscheme use another name, e.g.
+			"~/.vim/colors/mine.vim", and use `:runtime` to load
+			the original colorscheme: >
+				runtime colors/evening.vim
+				hi Statement ctermfg=Blue guifg=Blue
+
+<			After the color scheme has been loaded the
 			|ColorScheme| autocommand event is triggered.
 			For info about writing a colorscheme file: >
 				:edit $VIMRUNTIME/colors/README.txt
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 151e6ed4ac..d8a9a8e4ab 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Oct 15
+" Last Change:	2016 Oct 28
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -858,7 +858,7 @@ au BufNewFile,BufRead *.ht			setf haste
 au BufNewFile,BufRead *.htpp			setf hastepreproc
 
 " Hercules
-au BufNewFile,BufRead *.vc,*.ev,*.rs,*.sum,*.errsum	setf hercules
+au BufNewFile,BufRead *.vc,*.ev,*.sum,*.errsum	setf hercules
 
 " HEX (Intel)
 au BufNewFile,BufRead *.hex,*.h32		setf hex
@@ -1756,6 +1756,9 @@ au BufNewFile,BufRead *.rb,*.rbw		setf ruby
 " RubyGems
 au BufNewFile,BufRead *.gemspec			setf ruby
 
+" Rust
+au BufNewFile,BufRead *.rs			setf rust
+
 " Rackup
 au BufNewFile,BufRead *.ru			setf ruby
 
diff --git a/runtime/ftplugin/context.vim b/runtime/ftplugin/context.vim
index 6c11166afa..10f1ae1648 100644
--- a/runtime/ftplugin/context.vim
+++ b/runtime/ftplugin/context.vim
@@ -2,7 +2,7 @@
 " Language:           ConTeXt typesetting engine
 " Maintainer:         Nicola Vitacolonna <nvitacolonna@gmail.com>
 " Former Maintainers: Nikolai Weibull <now@bitwi.se>
-" Latest Revision:    2016 Oct 14
+" Latest Revision:    2016 Oct 30
 
 if exists("b:did_ftplugin")
   finish
@@ -21,7 +21,7 @@ let b:undo_ftplugin = "setl com< cms< def< inc< sua< fo< ofu<"
 
 setlocal comments=b:%D,b:%C,b:%M,:% commentstring=%\ %s formatoptions+=tjcroql2
 if get(b:, 'context_metapost', get(g:, 'context_metapost', 1))
-  setlocal omnifunc=context#complete
+  setlocal omnifunc=contextcomplete#Complete
   let g:omni_syntax_group_include_context = 'mf\w\+,mp\w\+'
   let g:omni_syntax_group_exclude_context = 'mfTodoComment'
 endif
diff --git a/runtime/plugin/gzip.vim b/runtime/plugin/gzip.vim
index edef149537..f7ee9dc510 100644
--- a/runtime/plugin/gzip.vim
+++ b/runtime/plugin/gzip.vim
@@ -1,6 +1,6 @@
 " Vim plugin for editing compressed files.
 " Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2010 Mar 10
+" Last Change: 2016 Oct 30
 
 " Exit quickly when:
 " - this plugin was already loaded
@@ -20,25 +20,29 @@ augroup gzip
   "
   " Set binary mode before reading the file.
   " Use "gzip -d", gunzip isn't always available.
-  autocmd BufReadPre,FileReadPre	*.gz,*.bz2,*.Z,*.lzma,*.xz setlocal bin
+  autocmd BufReadPre,FileReadPre	*.gz,*.bz2,*.Z,*.lzma,*.xz,*.lz setlocal bin
   autocmd BufReadPost,FileReadPost	*.gz  call gzip#read("gzip -dn")
   autocmd BufReadPost,FileReadPost	*.bz2 call gzip#read("bzip2 -d")
   autocmd BufReadPost,FileReadPost	*.Z   call gzip#read("uncompress")
   autocmd BufReadPost,FileReadPost	*.lzma call gzip#read("lzma -d")
   autocmd BufReadPost,FileReadPost	*.xz  call gzip#read("xz -d")
+  autocmd BufReadPost,FileReadPost	*.lz  call gzip#read("lzip -d")
   autocmd BufWritePost,FileWritePost	*.gz  call gzip#write("gzip")
   autocmd BufWritePost,FileWritePost	*.bz2 call gzip#write("bzip2")
   autocmd BufWritePost,FileWritePost	*.Z   call gzip#write("compress -f")
   autocmd BufWritePost,FileWritePost	*.lzma call gzip#write("lzma -z")
   autocmd BufWritePost,FileWritePost	*.xz  call gzip#write("xz -z")
+  autocmd BufWritePost,FileWritePost	*.lz  call gzip#write("lzip")
   autocmd FileAppendPre			*.gz  call gzip#appre("gzip -dn")
   autocmd FileAppendPre			*.bz2 call gzip#appre("bzip2 -d")
   autocmd FileAppendPre			*.Z   call gzip#appre("uncompress")
   autocmd FileAppendPre			*.lzma call gzip#appre("lzma -d")
   autocmd FileAppendPre			*.xz   call gzip#appre("xz -d")
+  autocmd FileAppendPre			*.lz   call gzip#appre("lzip -d")
   autocmd FileAppendPost		*.gz  call gzip#write("gzip")
   autocmd FileAppendPost		*.bz2 call gzip#write("bzip2")
   autocmd FileAppendPost		*.Z   call gzip#write("compress -f")
   autocmd FileAppendPost		*.lzma call gzip#write("lzma -z")
   autocmd FileAppendPost		*.xz call gzip#write("xz -z")
+  autocmd FileAppendPost		*.lz call gzip#write("lzip")
 augroup END
diff --git a/runtime/syntax/cpp.vim b/runtime/syntax/cpp.vim
index d669206b3e..5a478fb77d 100644
--- a/runtime/syntax/cpp.vim
+++ b/runtime/syntax/cpp.vim
@@ -2,7 +2,7 @@
 " Language:	C++
 " Current Maintainer:	vim-jp (https://github.com/vim-jp/vim-cpp)
 " Previous Maintainer:	Ken Shan <ccshan@post.harvard.edu>
-" Last Change:	2016 Jul 07
+" Last Change:	2016 Oct 28
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -31,7 +31,7 @@ syn keyword cppConstant		__cplusplus
 " C++ 11 extensions
 if !exists("cpp_no_cpp11")
   syn keyword cppModifier	override final
-  syn keyword cppType		nullptr_t
+  syn keyword cppType		nullptr_t auto
   syn keyword cppExceptions	noexcept
   syn keyword cppStorageClass	constexpr decltype thread_local
   syn keyword cppConstant	nullptr
@@ -46,7 +46,11 @@ endif
 
 " C++ 14 extensions
 if !exists("cpp_no_cpp14")
-  syn match cppNumber		display "\<0b[01]\+\(u\=l\{0,2}\|ll\=u\)\>"
+  syn case ignore
+  syn match cppNumber		display "\<0b[01]\('\=[01]\+\)*\(u\=l\{0,2}\|ll\=u\)\>"
+  syn match cppNumber		display "\<[1-9]\('\=\d\+\)*\(u\=l\{0,2}\|ll\=u\)\>"
+  syn match cppNumber		display "\<0x\x\('\=\x\+\)*\(u\=l\{0,2}\|ll\=u\)\>"
+  syn case match
 endif
 
 " The minimum and maximum operators in GNU C++
diff --git a/runtime/syntax/python.vim b/runtime/syntax/python.vim
index f258184b52..5aec2fe3d2 100644
--- a/runtime/syntax/python.vim
+++ b/runtime/syntax/python.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Python
 " Maintainer:	Zvezdan Petkovic <zpetkovic@acm.org>
-" Last Change:	2016 Sep 14
+" Last Change:	2016 Oct 29
 " Credits:	Neil Schemenauer <nas@python.ca>
 "		Dmitry Vasiliev
 "
@@ -46,6 +46,29 @@ endif
 let s:cpo_save = &cpo
 set cpo&vim
 
+if exists("python_no_doctest_highlight")
+  let python_no_doctest_code_highlight = 1
+endif
+
+if exists("python_highlight_all")
+  if exists("python_no_builtin_highlight")
+    unlet python_no_builtin_highlight
+  endif
+  if exists("python_no_doctest_code_highlight")
+    unlet python_no_doctest_code_highlight
+  endif
+  if exists("python_no_doctest_highlight")
+    unlet python_no_doctest_highlight
+  endif
+  if exists("python_no_exception_highlight")
+    unlet python_no_exception_highlight
+  endif
+  if exists("python_no_number_highlight")
+    unlet python_no_number_highlight
+  endif
+  let python_space_error_highlight = 1
+endif
+
 " Keep Python keywords in alphabetical order inside groups for easy
 " comparison with the table in the 'Python Language Reference'
 " https://docs.python.org/2/reference/lexical_analysis.html#keywords,
@@ -81,30 +104,31 @@ syn keyword pythonInclude	from import
 syn keyword pythonAsync		async await
 
 " Decorators (new in Python 2.4)
-" Python 3.5 introduced the use of the same symbol for matrix
-" multiplication.  We now have to exclude the symbol from being
-" highlighted when used in that context. Hence, the check that it's
-" preceded by empty space only (possibly in a docstring/doctest) and
-" followed by decorator name, optional parenthesized list of arguments,
-" and the next line with either def, class, or another decorator.
-syn match   pythonDecorator
-  \ "\%(\%(^\s*\)\%(\%(>>>\|\.\.\.\)\s\+\)\=\)\zs@\%(\s*\h\%(\w\|\.\)*\s*\%((\_\s\{-}[^)]\_.\{-})\s*\)\=\%(#.*\)\=\n\s*\%(\.\.\.\s\+\)\=\%(@\s*\h\|\%(def\|class\)\s\+\)\)\@="
-  \ display nextgroup=pythonDecoratorName skipwhite
-
 " A dot must be allowed because of @MyClass.myfunc decorators.
-" It must be preceded by a decorator symbol and on a separate line from
-" a function/class it decorates.
-syn match   pythonDecoratorName
-  \ "\%(@\s*\)\@<=\h\%(\w\|\.\)*\%(\s*\%((\_\s\{-}[^)]\_.\{-})\s*\)\=\%(#.*\)\=\n\)\@="
-  \ contained display nextgroup=pythonFunction skipnl
+syn match   pythonDecorator	"@" display contained
+syn match   pythonDecoratorName	"@\s*\h\%(\w\|\.\)*" display contains=pythonDecorator
 
-" The zero-length non-grouping match of def or class before the function
-" name is extremely important in pythonFunction.  Without it, everything
-" is interpreted as a function inside the contained environment of
-" doctests.
-syn match   pythonFunction
-  \ "\%(\%(^\s*\)\%(\%(>>>\|\.\.\.\)\s\+\)\=\%(def\|class\)\s\+\)\@<=\h\w*"
-  \ contained
+" Python 3.5 introduced the use of the same symbol for matrix multiplication:
+" https://www.python.org/dev/peps/pep-0465/.  We now have to exclude the
+" symbol from highlighting when used in that context.
+" Single line multiplication.
+syn match   pythonMatrixMultiply
+      \ "\%(\w\|[])]\)\s*@"
+      \ contains=ALLBUT,pythonDecoratorName,pythonDecorator,pythonFunction,pythonDoctestValue
+      \ transparent
+" Multiplication continued on the next line after backslash.
+syn match   pythonMatrixMultiply
+      \ "[^\\]\\\s*\n\%(\s*\.\.\.\s\)\=\s\+@"
+      \ contains=ALLBUT,pythonDecoratorName,pythonDecorator,pythonFunction,pythonDoctestValue
+      \ transparent
+" Multiplication in a parenthesized expression over multiple lines with @ at
+" the start of each continued line; very similar to decorators and complex.
+syn match   pythonMatrixMultiply
+      \ "^\s*\%(\%(>>>\|\.\.\.\)\s\+\)\=\zs\%(\h\|\%(\h\|[[(]\).\{-}\%(\w\|[])]\)\)\s*\n\%(\s*\.\.\.\s\)\=\s\+@\%(.\{-}\n\%(\s*\.\.\.\s\)\=\s\+@\)*"
+      \ contains=ALLBUT,pythonDecoratorName,pythonDecorator,pythonFunction,pythonDoctestValue
+      \ transparent
+
+syn match   pythonFunction	"\h\w*" display contained
 
 syn match   pythonComment	"#.*$" contains=pythonTodo,@Spell
 syn keyword pythonTodo		FIXME NOTE NOTES TODO XXX contained
@@ -131,25 +155,6 @@ syn match   pythonEscape	"\%(\\u\x\{4}\|\\U\x\{8}\)" contained
 syn match   pythonEscape	"\\N{\a\+\%(\s\a\+\)*}" contained
 syn match   pythonEscape	"\\$"
 
-if exists("python_highlight_all")
-  if exists("python_no_builtin_highlight")
-    unlet python_no_builtin_highlight
-  endif
-  if exists("python_no_doctest_code_highlight")
-    unlet python_no_doctest_code_highlight
-  endif
-  if exists("python_no_doctest_highlight")
-    unlet python_no_doctest_highlight
-  endif
-  if exists("python_no_exception_highlight")
-    unlet python_no_exception_highlight
-  endif
-  if exists("python_no_number_highlight")
-    unlet python_no_number_highlight
-  endif
-  let python_space_error_highlight = 1
-endif
-
 " It is very important to understand all details before changing the
 " regular expressions below or their order.
 " The word boundaries are *not* the floating-point number boundaries
@@ -213,7 +218,9 @@ if !exists("python_no_builtin_highlight")
   " non-essential built-in functions; Python 2 only
   syn keyword pythonBuiltin	apply buffer coerce intern
   " avoid highlighting attributes as builtins
-  syn match   pythonAttribute	/\.\h\w*/hs=s+1 contains=ALLBUT,pythonBuiltin transparent
+  syn match   pythonAttribute	/\.\h\w*/hs=s+1
+	\ contains=ALLBUT,pythonBuiltin,pythonFunction,pythonAsync
+	\ transparent
 endif
 
 " From the 'Python Library Reference' class hierarchy at the bottom.
@@ -275,7 +282,7 @@ if !exists("python_no_doctest_highlight")
   if !exists("python_no_doctest_code_highlight")
     syn region pythonDoctest
 	  \ start="^\s*>>>\s" end="^\s*$"
-	  \ contained contains=ALLBUT,pythonDoctest,@Spell
+	  \ contained contains=ALLBUT,pythonDoctest,pythonFunction,@Spell
     syn region pythonDoctestValue
 	  \ start=+^\s*\%(>>>\s\|\.\.\.\s\|"""\|'''\)\@!\S\++ end="$"
 	  \ contained
@@ -287,7 +294,7 @@ if !exists("python_no_doctest_highlight")
 endif
 
 " Sync at the beginning of class, function, or method definition.
-syn sync match pythonSync grouphere NONE "^\s*\%(def\|class\)\s\+\h\w*\s*("
+syn sync match pythonSync grouphere NONE "^\%(def\|class\)\s\+\h\w*\s*[(:]"
 
 " The default highlight links.  Can be overridden later.
 hi def link pythonStatement		Statement

From 024ff6b80831a27d2f6571006eb6fdf94d95f882 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 29 Apr 2017 01:53:03 +0200
Subject: [PATCH 199/257] vim-patch:25de4c232d58

Updated runtime files.

https://github.com/vim/vim/commit/25de4c232d580583feadae11ab34e3cc6333c350
---
 runtime/doc/eval.txt       | 2 +-
 runtime/doc/quickfix.txt   | 2 +-
 runtime/filetype.vim       | 5 ++++-
 runtime/syntax/synload.vim | 9 ++++++---
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 2d6c6ee3a0..30fd75c447 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2473,7 +2473,7 @@ assert_exception({error} [, {msg}])			*assert_exception()*
 assert_fails({cmd} [, {error}])					*assert_fails()*
 		Run {cmd} and add an error message to |v:errors| if it does
 		NOT produce an error.
-		When {error} is given it must match |v:errmsg|.
+		When {error} is given it must match in |v:errmsg|.
 
 assert_false({actual} [, {msg}])				*assert_false()*
 		When {actual} is not false an error message is added to
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index 1bc5c31281..d9f6b2c39d 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -872,7 +872,7 @@ need to write down a "todo" list.
 
 
 The Vim plugins in the "compiler" directory will set options to use the
-selected compiler.  For ":compiler" local options are set, for ":compiler!"
+selected compiler.  For `:compiler` local options are set, for `:compiler!`
 global options.
 							*current_compiler*
 To support older Vim versions, the plugins always use "current_compiler" and
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index d8a9a8e4ab..3e502ca362 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Oct 28
+" Last Change:	2016 Oct 31
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -2670,6 +2670,9 @@ au BufNewFile,BufRead mutt{ng,}rc*,Mutt{ng,}rc*		call s:StarSetf('muttrc')
 " Nroff macros
 au BufNewFile,BufRead tmac.*			call s:StarSetf('nroff')
 
+" OpenBSD hostname.if
+au BufNewFile,BufRead /etc/hostname.*		call s:StarSetf('config')
+
 " Pam conf
 au BufNewFile,BufRead */etc/pam.d/*		call s:StarSetf('pamconf')
 
diff --git a/runtime/syntax/synload.vim b/runtime/syntax/synload.vim
index 6183f33a59..ab918c645b 100644
--- a/runtime/syntax/synload.vim
+++ b/runtime/syntax/synload.vim
@@ -1,6 +1,6 @@
 " Vim syntax support file
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2012 Sep 25
+" Last Change:	2016 Nov 04
 
 " This file sets up for syntax highlighting.
 " It is loaded from "syntax.vim" and "manual.vim".
@@ -69,8 +69,11 @@ au Syntax c,cpp,cs,idl,java,php,datascript
 
 
 " Source the user-specified syntax highlighting file
-if exists("mysyntaxfile") && filereadable(expand(mysyntaxfile))
-  execute "source " . mysyntaxfile
+if exists("mysyntaxfile")
+  let s:fname = expand(mysyntaxfile)
+  if filereadable(s:fname)
+    execute "source " . fnameescape(s:fname)
+  endif
 endif
 
 " Restore 'cpoptions'

From 51a2d8dc36b56125c81a085a773eb47671eec7f0 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Fri, 28 Apr 2017 16:41:16 +0200
Subject: [PATCH 200/257] win: health.vim/check_ruby(): find `gem.cmd` #6608

gem.cmd is not found by system(['gem', ...]), pass it to cmd.exe.
---
 runtime/autoload/health/provider.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/runtime/autoload/health/provider.vim b/runtime/autoload/health/provider.vim
index dccff12bae..c5826217c5 100644
--- a/runtime/autoload/health/provider.vim
+++ b/runtime/autoload/health/provider.vim
@@ -445,7 +445,7 @@ function! s:check_ruby() abort
   endif
   call health#report_info('Host: '. host)
 
-  let latest_gem_cmd = 'gem list -ra ^neovim$'
+  let latest_gem_cmd = has('win32') ? 'cmd /c gem list -ra ^^neovim$' : 'gem list -ra ^neovim$'
   let latest_gem = s:system(split(latest_gem_cmd))
   if s:shell_error || empty(latest_gem)
     call health#report_error('Failed to run: '. latest_gem_cmd,

From 0df1b6655be5385c9cbb70dca1c042c6447ec50b Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sat, 29 Apr 2017 16:56:40 +0200
Subject: [PATCH 201/257] doc: Removed t_XX options/keycodes. (#6616)

Closes #4482

TODO: revisit find_key_option_len()
---
 runtime/doc/gui.txt      |  15 +-
 runtime/doc/help.txt     |   1 -
 runtime/doc/intro.txt    |   2 -
 runtime/doc/map.txt      |  38 ++--
 runtime/doc/mbyte.txt    |  94 +---------
 runtime/doc/options.txt  |  37 +---
 runtime/doc/repeat.txt   |   9 +-
 runtime/doc/syntax.txt   | 153 +---------------
 runtime/doc/term.txt     | 385 +--------------------------------------
 runtime/doc/tips.txt     |  43 -----
 runtime/doc/usr_06.txt   |   7 +-
 runtime/doc/various.txt  |   3 -
 runtime/doc/vim_diff.txt |   5 +
 scripts/vim-patch.sh     |   2 +-
 14 files changed, 47 insertions(+), 747 deletions(-)

diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 4b89cd0d35..7cf489d769 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -13,27 +13,15 @@ Vim's Graphical User Interface				*gui* *GUI*
 5. Menus			|menus|
 6. Extras			|gui-extras|
 
-Other GUI documentation:
-|gui_w32.txt|	For specific items of the Win32 GUI.
-
 ==============================================================================
 1. Starting the GUI				*gui-start* *E229* *E233*
 
-First you must make sure you actually have a version of Vim with the GUI code
-included.
-
-How to start the GUI depends on the system used.  Mostly you can run the
-GUI version of Vim with:
-    gvim [options] [files...]
-
 				*ginit.vim* *gui-init* *gvimrc* *$MYGVIMRC*
 The gvimrc file is where GUI-specific startup commands should be placed.  It
 is always sourced after the |init.vim| file.  If you have one then the 
 $MYGVIMRC environment variable has its name.
 
 When the GUI starts up initializations are carried out, in this order:
-- The 'term' option is set to "builtin_gui" and terminal options are reset to
-  their default value for the GUI |terminal-options|.
 - If the system menu file exists, it is sourced.  The name of this file is
   normally "$VIMRUNTIME/menu.vim".  You can check this with ":version".  Also
   see |$VIMRUNTIME|.  To skip loading the system menu include 'M' in
@@ -92,8 +80,7 @@ and only the first one that is found is read.
 :winp[os] {X} {Y}							*E466*
 		Put the GUI vim window at the given {X} and {Y} coordinates.
 		The coordinates should specify the position in pixels of the
-		top left corner of the window.  Does not work in all versions.
-		Does work in an (new) xterm |xterm-color|.
+		top left corner of the window.
 		When the GUI window has not been opened yet, the values are
 		remembered until the window is opened.  The position is
 		adjusted to make the window fit on the screen (if possible).
diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index 3837cf3e26..7cba0b9894 100644
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -148,7 +148,6 @@ Special issues ~
 
 GUI ~
 |gui.txt|	Graphical User Interface (GUI)
-|gui_w32.txt|	Win32 GUI
 
 Interfaces ~
 |if_cscop.txt|	using Cscope with Vim
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index e5a32041a5..7564679b93 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -445,7 +445,6 @@ notation	meaning		    equivalent	decimal value(s)	~
 <M-...>		alt-key or meta-key		*META* *meta* *alt* *<M-*
 <A-...>		same as <M-...>			*<A-*
 <D-...>		command-key or "super" key	*<D-*
-<t_xx>		key with "xx" entry in termcap
 -----------------------------------------------------------------------
 
 Note: The shifted cursor keys, the help key, and the undo key are only
@@ -480,7 +479,6 @@ the ":map" command.  The rules are:
 	   <S-F11>		Shifted function key 11
 	   <M-a>		Meta- a  ('a' with bit 8 set)
 	   <M-A>		Meta- A  ('A' with bit 8 set)
-	   <t_kd>		"kd" termcap entry (cursor down key)
 
 The <> notation uses <lt> to escape the special meaning of key names.  Using a
 backslash also works, but only when 'cpoptions' does not include the 'B' flag.
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 25bd2d18ee..3513a19899 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -453,42 +453,30 @@ See |:verbose-cmd| for more information.
 
 1.5 MAPPING SPECIAL KEYS				*:map-special-keys*
 
-There are three ways to map a special key:
+There are two ways to map a special key:
 1. The Vi-compatible method: Map the key code.  Often this is a sequence that
    starts with <Esc>.  To enter a mapping like this you type ":map " and then
    you have to type CTRL-V before hitting the function key.  Note that when
-   the key code for the key is in the termcap (the t_ options), it will
-   automatically be translated into the internal code and become the second
-   way of mapping (unless the 'k' flag is included in 'cpoptions').
+   the key code for the key is in the termcap, it will automatically be
+   translated into the internal code and become the second way of mapping
+   (unless the 'k' flag is included in 'cpoptions').
 2. The second method is to use the internal code for the function key.  To
    enter such a mapping type CTRL-K and then hit the function key, or use
    the form "#1", "#2", .. "#9", "#0", "<Up>", "<S-Down>", "<S-F7>", etc.
    (see table of keys |key-notation|, all keys from <Up> can be used).  The
    first ten function keys can be defined in two ways: Just the number, like
    "#2", and with "<F>", like "<F2>".  Both stand for function key 2.  "#0"
-   refers to function key 10, defined with option 't_f10', which may be
-   function key zero on some keyboards.  The <> form cannot be used when
-   'cpoptions' includes the '<' flag.
-3. Use the termcap entry, with the form <t_xx>, where "xx" is the name of the
-   termcap entry.  Any string entry can be used.  For example: >
-     :map <t_F3> G
-<  Maps function key 13 to "G".  This does not work if 'cpoptions' includes
-   the '<' flag.
-
-The advantage of the second and third method is that the mapping will work on
-different terminals without modification (the function key will be
-translated into the same internal code or the actual key code, no matter what
-terminal you are using.  The termcap must be correct for this to work, and you
-must use the same mappings).
+   refers to function key 10.  The <> form cannot be used when 'cpoptions'
+   includes the '<' flag.
 
 DETAIL: Vim first checks if a sequence from the keyboard is mapped.  If it
-isn't the terminal key codes are tried (see |terminal-options|).  If a
-terminal code is found it is replaced with the internal code.  Then the check
-for a mapping is done again (so you can map an internal code to something
-else).  What is written into the script file depends on what is recognized.
-If the terminal key code was recognized as a mapping the key code itself is
-written to the script file.  If it was recognized as a terminal code the
-internal code is written to the script file.
+isn't the terminal key codes are tried.  If a terminal code is found it is
+replaced with the internal code.  Then the check for a mapping is done again
+(so you can map an internal code to something else).  What is written into the
+script file depends on what is recognized. If the terminal key code was
+recognized as a mapping the key code itself is written to the script file.  If
+it was recognized as a terminal code the internal code is written to the
+script file.
 
 
 1.6 SPECIAL CHARACTERS					*:map-special-chars*
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index 708c05e241..870264adc6 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -14,26 +14,8 @@ For an introduction to the most common features, see |usr_45.txt| in the user
 manual.
 For changing the language of messages and menus see |mlang.txt|.
 
-{not available when compiled without the |+multi_byte| feature}
-
-
-1.  Getting started			|mbyte-first|
-2.  Locale				|mbyte-locale|
-3.  Encoding				|mbyte-encoding|
-4.  Using a terminal			|mbyte-terminal|
-5.  Fonts on X11			|mbyte-fonts-X11|
-6.  Fonts on MS-Windows			|mbyte-fonts-MSwin|
-7.  Input on X11			|mbyte-XIM|
-8.  Input on MS-Windows			|mbyte-IME|
-9.  Input with a keymap			|mbyte-keymap|
-10. Using UTF-8				|mbyte-utf8|
-11. Overview of options			|mbyte-options|
-
-NOTE: This file contains UTF-8 characters.  These may show up as strange
-characters or boxes when using another encoding.
-
 ==============================================================================
-1. Getting started					*mbyte-first*
+Getting started						*mbyte-first*
 
 This is a summary of the multibyte features in Vim.  If you are lucky it works
 as described and you can start using Vim without much trouble.  If something
@@ -89,8 +71,7 @@ be displayed and edited correctly.
 
 For the GUI you must select fonts that work with UTF-8.  This
 is the difficult part.  It depends on the system you are using, the locale and
-a few other things.  See the chapters on fonts: |mbyte-fonts-X11| for
-X-Windows and |mbyte-fonts-MSwin| for MS-Windows.
+a few other things.
 
 For X11 you can set the 'guifontset' option to a list of fonts that together
 cover the characters that are used.  Example for Korean: >
@@ -120,7 +101,7 @@ The options 'iminsert', 'imsearch' and 'imcmdline' can be used to chose
 the different input methods or disable them temporarily.
 
 ==============================================================================
-2.  Locale						*mbyte-locale*
+Locale							*mbyte-locale*
 
 The easiest setup is when your whole system uses the locale you want to work
 in.  But it's also possible to set the locale for one shell you are working
@@ -209,7 +190,7 @@ Or specify $LANG when starting Vim:
 You could make a small shell script for this.
 
 ==============================================================================
-3.  Encoding				*mbyte-encoding*
+Encoding				*mbyte-encoding*
 
 In Nvim UTF-8 is always used internally to encode characters.
  This applies to all the places where text is used, including buffers (files
@@ -418,49 +399,7 @@ neither of them can be found Vim will still work but some conversions won't be
 possible.
 
 ==============================================================================
-4. Using a terminal					*mbyte-terminal*
-
-The GUI fully supports multi-byte characters.  It is also possible in a
-terminal, if the terminal supports the same encoding that Vim uses.  Thus this
-is less flexible.
-
-For example, you can run Vim in a xterm with added multi-byte support and/or
-|XIM|.  Examples are kterm (Kanji term) and hanterm (for Korean), Eterm
-(Enlightened terminal) and rxvt.
-
-UTF-8 IN XFREE86 XTERM					*UTF8-xterm*
-
-This is a short explanation of how to use UTF-8 character encoding in the
-xterm that comes with XFree86 by Thomas Dickey (text by Markus Kuhn).
-
-Get the latest xterm version which has now UTF-8 support:
-
-	http://invisible-island.net/xterm/xterm.html
-
-Compile it with "./configure --enable-wide-chars ; make"
-
-Also get the ISO 10646-1 version of various fonts, which is available on
-
-	http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz
-
-and install the font as described in the README file.
-
-Now start xterm with >
-
-  xterm -u8 -fn -misc-fixed-medium-r-semicondensed--13-120-75-75-c-60-iso10646-1
-or, for bigger character: >
-  xterm -u8 -fn -misc-fixed-medium-r-normal--15-140-75-75-c-90-iso10646-1
-
-and you will have a working UTF-8 terminal emulator.  Try both >
-
-   cat utf-8-demo.txt
-   vim utf-8-demo.txt
-
-with the demo text that comes with ucs-fonts.tar.gz in order to see
-whether there are any problems with UTF-8 in your xterm.
-
-==============================================================================
-5.  Fonts on X11					*mbyte-fonts-X11*
+Fonts on X11						*mbyte-fonts-X11*
 
 Unfortunately, using fonts in X11 is complicated.  The name of a single-byte
 font is a long string.  For multi-byte fonts we need several of these...
@@ -596,20 +535,7 @@ Also make sure that you set 'guifontset' before setting fonts for highlight
 groups.
 
 ==============================================================================
-6.  Fonts on MS-Windows				*mbyte-fonts-MSwin*
-
-The simplest is to use the font dialog to select fonts and try them out.  You
-can find this at the "Edit/Select Font..." menu.  Once you find a font name
-that works well you can use this command to see its name: >
-
-	:set guifont
-
-Then add a command to your |ginit.vim| file to set 'guifont': >
-
-	:set guifont=courier_new:h12
-
-==============================================================================
-7.  Input on X11				*mbyte-XIM*
+Input on X11					*mbyte-XIM*
 
 X INPUT METHOD (XIM) BACKGROUND			*XIM* *xim* *x-input-method*
 
@@ -768,7 +694,7 @@ For example, when you are using kinput2 as |IM-server| and sh, >
 <
 
 ==============================================================================
-8.  Input on MS-Windows					*mbyte-IME*
+Input on MS-Windows					*mbyte-IME*
 
 (Windows IME support)				*multibyte-ime* *IME*
 
@@ -842,7 +768,7 @@ Cursor color when IME or XIM is on				*CursorIM*
     status is on.
 
 ==============================================================================
-9. Input with a keymap					*mbyte-keymap*
+Input with a keymap					*mbyte-keymap*
 
 When the keyboard doesn't produce the characters you want to enter in your
 text, you can use the 'keymap' option.  This will translate one or more
@@ -1090,7 +1016,7 @@ Combining forms:
 ﭏ    0xfb4f  Xal  alef-lamed
 
 ==============================================================================
-10. Using UTF-8				*mbyte-utf8* *UTF-8* *utf-8* *utf8*
+Using UTF-8				*mbyte-utf8* *UTF-8* *utf-8* *utf8*
 							*Unicode* *unicode*
 The Unicode character set was designed to include all characters from other
 character sets.  Therefore it is possible to write text in any language using
@@ -1222,7 +1148,7 @@ not everybody is able to type a composing character.
 
 
 ==============================================================================
-11. Overview of options					*mbyte-options*
+Overview of options					*mbyte-options*
 
 These options are relevant for editing multi-byte files.  Check the help in
 options.txt for detailed information.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index bbfd6d32d3..93ab956471 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -130,39 +130,6 @@ A few special texts:
 	Last set from error handler ~
 		Option was cleared when evaluating it resulted in an error.
 
-{not available when compiled without the |+eval| feature}
-
-							*:set-termcap* *E522*
-For {option} the form "t_xx" may be used to set a terminal option.  This will
-override the value from the termcap.  You can then use it in a mapping.  If
-the "xx" part contains special characters, use the <t_xx> form: >
-	:set <t_#4>=^[Ot
-This can also be used to translate a special code for a normal key.  For
-example, if Alt-b produces <Esc>b, use this: >
-	:set <M-b>=^[b
-(the ^[ is a real <Esc> here, use CTRL-V <Esc> to enter it)
-The advantage over a mapping is that it works in all situations.
-
-You can define any key codes, e.g.: >
-	:set t_xy=^[foo;
-There is no warning for using a name that isn't recognized.  You can map these
-codes as you like: >
-	:map <t_xy> something
-<								*E846*
-When a key code is not set, it's like it does not exist.  Trying to get its
-value will result in an error: >
-	:set t_kb=
-	:set t_kb
-	E846: Key code not set: t_kb
-
-The t_xx options cannot be set from a |modeline| or in the |sandbox|, for
-security reasons.
-
-The listing from ":set" looks different from Vi.  Long string options are put
-at the end of the list.  The number of options is quite large.  The output of
-"set all" probably does not fit on the screen, causing Vim to give the
-|more-prompt|.
-
 							*option-backslash*
 To include white space in a string option value it has to be preceded with a
 backslash.  To include a backslash you have to use two.  Effectively this
@@ -628,7 +595,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	See Unicode Standard Annex #11 (http://www.unicode.org/reports/tr11).
 
 	Vim may set this option automatically at startup time when Vim is
-	compiled with the |+termresponse| feature and if |t_u7| is set to the
+	compiled with the |+termresponse| feature and if t_u7 is set to the
 	escape sequence to request cursor position report.
 
 			*'autochdir'* *'acd'* *'noautochdir'* *'noacd'*
@@ -2840,8 +2807,6 @@ A jump table for the options with a short description can be found at |Q_op|.
 			blinking off you can use "blinkon0".  The cursor only
 			blinks when Vim is waiting for input, not while
 			executing a command.
-			To make the cursor blink in an xterm, see
-			|xterm-blink|.
 		{group-name}
 			a highlight group name, that sets the color and font
 			for the cursor
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index bfe689fb13..8316387726 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -357,8 +357,7 @@ terminal-independent two character codes.  This means that they can be used
 in the same way on different kinds of terminals.  The first character of a
 key code is 0x80 or 128, shown on the screen as "~@".  The second one can be
 found in the list |key-notation|.  Any of these codes can also be entered
-with CTRL-V followed by the three digit decimal code.  This does NOT work for
-the <t_xx> termcap codes, these can only be used in mappings.
+with CTRL-V followed by the three digit decimal code.
 
 							*:source_crnl* *W15*
 Windows: Files that are read with ":source" normally have <CR><NL> <EOL>s.
@@ -369,12 +368,6 @@ something like ":map <F1> :help^M", where "^M" is a <CR>.  If the first line
 ends in a <CR>, but following ones don't, you will get an error message,
 because the <CR> from the first lines will be lost.
 
-Mac Classic: Files that are read with ":source" normally have <CR> <EOL>s.
-These always work.  If you are using a file with <NL> <EOL>s (for example, a
-file made on Unix), this will be recognized if 'fileformats' is not empty and
-the first line does not end in a <CR>.  Be careful not to use a file with <NL>
-linebreaks which has a <CR> in first line.
-
 On other systems, Vim expects ":source"ed files to end in a <NL>.  These
 always work.  If you are using a file with <CR><NL> <EOL>s (for example, a
 file made on Windows), all lines will have a trailing <CR>.  This may cause
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 7f4ede4124..9c0f1cd989 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -4636,8 +4636,7 @@ mentioned for the default values. See |:verbose-cmd| for more information.
 					*highlight-args* *E416* *E417* *E423*
 There are three types of terminals for highlighting:
 term	a normal terminal (vt100, xterm)
-cterm	a color terminal (Windows console, color-xterm, these have the "Co"
-	termcap entry)
+cterm	a color terminal (Windows console, color-xterm)
 gui	the GUI
 
 For each type the highlighting can be given.  This makes it possible to use
@@ -4677,21 +4676,12 @@ stop={term-list}				*term-list* *highlight-stop*
 	highlighted area.  This should undo the "start" argument.
 	Otherwise the screen will look messed up.
 
-	The {term-list} can have two forms:
-
-	1. A string with escape sequences.
-	   This is any string of characters, except that it can't start with
-	   "t_" and blanks are not allowed.  The <> notation is recognized
-	   here, so you can use things like "<Esc>" and "<Space>".  Example:
+        {term-list} is a a string with escape sequences. This is any string of
+        characters, except that it can't start with "t_" and blanks are not
+        allowed.  The <> notation is recognized here, so you can use things
+        like "<Esc>" and "<Space>".  Example:
 		start=<Esc>[27h;<Esc>[<Space>r;
 
-	2. A list of terminal codes.
-	   Each terminal code has the form "t_xx", where "xx" is the name of
-	   the termcap entry.  The codes have to be separated with commas.
-	   White space is not allowed.	Example:
-		start=t_C1,t_BL
-	   The terminal codes must exist for this to work.
-
 
 2. highlight arguments for color terminals
 
@@ -4716,7 +4706,7 @@ ctermbg={color-nr}				*highlight-ctermbg*
 	unpredictable.	See your xterm documentation for the defaults.	The
 	colors for a color-xterm can be changed from the .Xdefaults file.
 	Unfortunately this means that it's not possible to get the same colors
-	for each user.	See |xterm-color| for info about color xterms.
+	for each user.
 
 	The MSDOS standard colors are fixed (in a console window), so these
 	have been used for the names.  But the meaning of color names in X11
@@ -5209,32 +5199,6 @@ When splitting the window, the new window will use the original syntax.
 ==============================================================================
 17. Color xterms				*xterm-color* *color-xterm*
 
-Most color xterms have only eight colors.  If you don't get colors with the
-default setup, it should work with these lines in your vimrc: >
-   :if &term =~ "xterm"
-   :  if has("terminfo")
-   :	set t_Co=8
-   :	set t_Sf=<Esc>[3%p1%dm
-   :	set t_Sb=<Esc>[4%p1%dm
-   :  else
-   :	set t_Co=8
-   :	set t_Sf=<Esc>[3%dm
-   :	set t_Sb=<Esc>[4%dm
-   :  endif
-   :endif
-<	[<Esc> is a real escape, type CTRL-V <Esc>]
-
-You might want to change the first "if" to match the name of your terminal,
-e.g. "dtterm" instead of "xterm".
-
-Note: Do these settings BEFORE doing ":syntax on".  Otherwise the colors may
-be wrong.
-							*xiterm* *rxvt*
-The above settings have been mentioned to work for xiterm and rxvt too.
-But for using 16 colors in an rxvt these should work with terminfo: >
-	:set t_AB=<Esc>[%?%p1%{8}%<%t25;%p1%{40}%+%e5;%p1%{32}%+%;%dm
-	:set t_AF=<Esc>[%?%p1%{8}%<%t22;%p1%{30}%+%e1;%p1%{22}%+%;%dm
-<
 							*colortest.vim*
 To test your color setup, a file has been included in the Vim distribution.
 To use it, execute this command: >
@@ -5245,111 +5209,6 @@ output lighter foreground colors, even though the number of colors is defined
 at 8.  Therefore Vim sets the "cterm=bold" attribute for light foreground
 colors, when 't_Co' is 8.
 
-							*xfree-xterm*
-To get 16 colors or more, get the newest xterm version (which should be
-included with XFree86 3.3 and later).  You can also find the latest version
-at: >
-	http://invisible-island.net/xterm/xterm.html
-Here is a good way to configure it.  This uses 88 colors and enables the
-termcap-query feature, which allows Vim to ask the xterm how many colors it
-supports. >
-	./configure --disable-bold-color --enable-88-color --enable-tcap-query
-If you only get 8 colors, check the xterm compilation settings.
-(Also see |UTF8-xterm| for using this xterm with UTF-8 character encoding).
-
-This xterm should work with these lines in your vimrc (for 16 colors): >
-   :if has("terminfo")
-   :  set t_Co=16
-   :  set t_AB=<Esc>[%?%p1%{8}%<%t%p1%{40}%+%e%p1%{92}%+%;%dm
-   :  set t_AF=<Esc>[%?%p1%{8}%<%t%p1%{30}%+%e%p1%{82}%+%;%dm
-   :else
-   :  set t_Co=16
-   :  set t_Sf=<Esc>[3%dm
-   :  set t_Sb=<Esc>[4%dm
-   :endif
-<	[<Esc> is a real escape, type CTRL-V <Esc>]
-
-Without |+terminfo|, Vim will recognize these settings, and automatically
-translate cterm colors of 8 and above to "<Esc>[9%dm" and "<Esc>[10%dm".
-Colors above 16 are also translated automatically.
-
-For 256 colors this has been reported to work: >
-
-   :set t_AB=<Esc>[48;5;%dm
-   :set t_AF=<Esc>[38;5;%dm
-
-Or just set the TERM environment variable to "xterm-color" or "xterm-16color"
-and try if that works.
-
-You probably want to use these X resources (in your ~/.Xdefaults file):
-	XTerm*color0:			#000000
-	XTerm*color1:			#c00000
-	XTerm*color2:			#008000
-	XTerm*color3:			#808000
-	XTerm*color4:			#0000c0
-	XTerm*color5:			#c000c0
-	XTerm*color6:			#008080
-	XTerm*color7:			#c0c0c0
-	XTerm*color8:			#808080
-	XTerm*color9:			#ff6060
-	XTerm*color10:			#00ff00
-	XTerm*color11:			#ffff00
-	XTerm*color12:			#8080ff
-	XTerm*color13:			#ff40ff
-	XTerm*color14:			#00ffff
-	XTerm*color15:			#ffffff
-	Xterm*cursorColor:		Black
-
-[Note: The cursorColor is required to work around a bug, which changes the
-cursor color to the color of the last drawn text.  This has been fixed by a
-newer version of xterm, but not everybody is using it yet.]
-
-To get these right away, reload the .Xdefaults file to the X Option database
-Manager (you only need to do this when you just changed the .Xdefaults file): >
-  xrdb -merge ~/.Xdefaults
-<
-					*xterm-blink* *xterm-blinking-cursor*
-To make the cursor blink in an xterm, see tools/blink.c.  Or use Thomas
-Dickey's xterm above patchlevel 107 (see above for where to get it), with
-these resources:
-	XTerm*cursorBlink:	on
-	XTerm*cursorOnTime:	400
-	XTerm*cursorOffTime:	250
-	XTerm*cursorColor:	White
-
-							*hpterm-color*
-These settings work (more or less) for an hpterm, which only supports 8
-foreground colors: >
-   :if has("terminfo")
-   :  set t_Co=8
-   :  set t_Sf=<Esc>[&v%p1%dS
-   :  set t_Sb=<Esc>[&v7S
-   :else
-   :  set t_Co=8
-   :  set t_Sf=<Esc>[&v%dS
-   :  set t_Sb=<Esc>[&v7S
-   :endif
-<	[<Esc> is a real escape, type CTRL-V <Esc>]
-
-						*Eterm* *enlightened-terminal*
-These settings have been reported to work for the Enlightened terminal
-emulator, or Eterm.  They might work for all xterm-like terminals that use the
-bold attribute to get bright colors.  Add an ":if" like above when needed. >
-       :set t_Co=16
-       :set t_AF=^[[%?%p1%{8}%<%t3%p1%d%e%p1%{22}%+%d;1%;m
-       :set t_AB=^[[%?%p1%{8}%<%t4%p1%d%e%p1%{32}%+%d;1%;m
-<
-						*TTpro-telnet*
-These settings should work for TTpro telnet.  Tera Term Pro is a freeware /
-open-source program for MS-Windows. >
-	set t_Co=16
-	set t_AB=^[[%?%p1%{8}%<%t%p1%{40}%+%e%p1%{32}%+5;%;%dm
-	set t_AF=^[[%?%p1%{8}%<%t%p1%{30}%+%e%p1%{22}%+1;%;%dm
-Also make sure TTpro's Setup / Window / Full Color is enabled, and make sure
-that Setup / Font / Enable Bold is NOT enabled.
-(info provided by John Love-Jensen <eljay@Adobe.COM>)
-
-
 ==============================================================================
 18. When syntax is slow						*:syntime*
 
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index 56f57a3819..214975c5a1 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -10,29 +10,17 @@ Vim uses information about the terminal you are using to fill the screen and
 recognize what keys you hit.  If this information is not correct, the screen
 may be messed up or keys may not be recognized.  The actions which have to be
 performed on the screen are accomplished by outputting a string of
-characters.  Special keys produce a string of characters.  These strings are
-stored in the terminal options, see |terminal-options|.
-
-NOTE: Most of this is not used when running the |GUI|.
-
-1. Startup			|startup-terminal|
-2. Terminal options		|terminal-options|
-3. Window size			|window-size|
-4. Slow and fast terminals	|slow-fast-terminal|
-5. Using the mouse		|mouse-using|
+characters.
 
 ==============================================================================
-1. Startup						*startup-terminal*
+Startup						*startup-terminal*
 
 When Vim is started a default terminal type is assumed.  for MS-DOS this is
 the pc terminal, for Unix an ansi terminal.
 
 				*termcap* *terminfo* *E557* *E558* *E559*
 On Unix the terminfo database or termcap file is used.  This is referred to as
-"termcap" in all the documentation.  At compile time, when running configure,
-the choice whether to use terminfo or termcap is done automatically.  When
-running Vim the output of ":version" will show |+terminfo| if terminfo is
-used.  Also see |xterm-screens|.
+"termcap" in all the documentation.
 
 Settings depending on terminal			*term-dependent-settings*
 
@@ -45,25 +33,12 @@ can do this best in your vimrc.  Example: >
      ... vt100, vt102 maps and settings ...
    endif
 <
-						*raw-terminal-mode*
-For normal editing the terminal will be put into "raw" mode.  The strings
-defined with 't_ti' and 't_ks' will be sent to the terminal.  Normally this
-puts the terminal in a state where the termcap codes are valid and activates
-the cursor and function keys.  When Vim exits the terminal will be put back
-into the mode it was before Vim started.  The strings defined with 't_te' and
-'t_ke' will be sent to the terminal.
-
 							*cs7-problem*
 Note: If the terminal settings are changed after running Vim, you might have
 an illegal combination of settings.  This has been reported on Solaris 2.5
 with "stty cs8 parenb", which is restored as "stty cs7 parenb".  Use
 "stty cs8 -parenb -istrip" instead, this is restored correctly.
 
-Some termcap entries are wrong in the sense that after sending 't_ks' the
-cursor keys send codes different from the codes defined in the termcap.  To
-avoid this you can set 't_ks' (and 't_ke') to empty strings.  This must be
-done during initialization (see |initialization|), otherwise it's too late.
-
 Many cursor key codes start with an <Esc>.  Vim must find out if this is a
 single hit of the <Esc> key or the start of a cursor key sequence.  It waits
 for a next character to arrive.  If it does not arrive within one second a
@@ -92,55 +67,6 @@ them as a cursor key.  When you type you normally are not that fast, so they
 are recognized as individual typed commands, even though Vim receives the same
 sequence of bytes.
 
-				*vt100-function-keys* *xterm-function-keys*
-An xterm can send function keys F1 to F4 in two modes: vt100 compatible or
-not.  Because Vim may not know what the xterm is sending, both types of keys
-are recognized.  The same happens for the <Home> and <End> keys.
-			normal			vt100 ~
-	<F1>	t_k1	<Esc>[11~	<xF1>	<Esc>OP	    *<xF1>-xterm*
-	<F2>	t_k2	<Esc>[12~	<xF2>	<Esc>OQ	    *<xF2>-xterm*
-	<F3>	t_k3	<Esc>[13~	<xF3>	<Esc>OR	    *<xF3>-xterm*
-	<F4>	t_k4	<Esc>[14~	<xF4>	<Esc>OS	    *<xF4>-xterm*
-	<Home>	t_kh	<Esc>[7~	<xHome>	<Esc>OH	    *<xHome>-xterm*
-	<End>	t_@7	<Esc>[4~	<xEnd>	<Esc>OF	    *<xEnd>-xterm*
-
-When Vim starts, <xF1> is mapped to <F1>, <xF2> to <F2> etc.  This means that
-by default both codes do the same thing.  If you make a mapping for <xF2>,
-because your terminal does have two keys, the default mapping is overwritten,
-thus you can use the <F2> and <xF2> keys for something different.
-
-							*xterm-shifted-keys*
-Newer versions of xterm support shifted function keys and special keys.  Vim
-recognizes most of them.  Use ":set termcap" to check which are supported and
-what the codes are.  Mostly these are not in a termcap, they are only
-supported by the builtin_xterm termcap.
-
-							*xterm-modifier-keys*
-Newer versions of xterm support Alt and Ctrl for most function keys.  To avoid
-having to add all combinations of Alt, Ctrl and Shift for every key a special
-sequence is recognized at the end of a termcap entry: ";*X".  The "X" can be
-any character, often '~' is used.  The ";*" stands for an optional modifier
-argument.  ";2" is Shift, ";3" is Alt, ";5" is Ctrl and ";9" is Meta (when
-it's different from Alt).  They can be combined.  Examples: >
-	:set <F8>=^[[19;*~
-	:set <Home>=^[[1;*H
-Another speciality about these codes is that they are not overwritten by
-another code.  That is to avoid that the codes obtained from xterm directly
-|t_RV| overwrite them.
-							*xterm-scroll-region*
-The default termcap entry for xterm on Sun and other platforms does not
-contain the entry for scroll regions.  Add ":cs=\E[%i%d;%dr:" to the xterm
-entry in /etc/termcap and everything should work.
-
-							*xterm-end-home-keys*
-On some systems (at least on FreeBSD with XFree86 3.1.2) the codes that the
-<End> and <Home> keys send contain a <Nul> character.  To make these keys send
-the proper key code, add these lines to your ~/.Xdefaults file:
-
-*VT100.Translations:		#override \n\
-		<Key>Home: string("0x1b") string("[7~") \n\
-		<Key>End: string("0x1b") string("[8~")
-
 						*xterm-8bit* *xterm-8-bit*
 Xterm can be run in a mode where it uses 8-bit escape sequences.  The CSI code
 is used instead of <Esc>[.  The advantage is that an <Esc> can quickly be
@@ -151,309 +77,12 @@ For the builtin termcap entries, Vim checks if the 'term' option contains
 mouse and a few other things.  You would normally set $TERM in your shell to
 "xterm-8bit" and Vim picks this up and adjusts to the 8-bit setting
 automatically.
-When Vim receives a response to the |t_RV| (request version) sequence and it
+When Vim receives a response to the "request version" sequence and it
 starts with CSI, it assumes that the terminal is in 8-bit mode and will
 convert all key sequences to their 8-bit variants.
 
 ==============================================================================
-2. Terminal options		*terminal-options* *termcap-options* *E436*
-
-The terminal options can be set just like normal options.  But they are not
-shown with the ":set all" command.  Instead use ":set termcap".
-
-It is always possible to change individual strings by setting the
-appropriate option.  For example: >
-	:set t_ce=^V^[[K	(CTRL-V, <Esc>, [, K)
-
-The options are listed below.  The associated termcap code is always equal to
-the last two characters of the option name.  Only one termcap code is
-required: Cursor motion, 't_cm'.
-
-The options 't_da', 't_db', 't_ms', 't_xs' represent flags in the termcap.
-When the termcap flag is present, the option will be set to "y".  But any
-non-empty string means that the flag is set.  An empty string means that the
-flag is not set.  't_CS' works like this too, but it isn't a termcap flag.
-
-OUTPUT CODES
-	option	meaning	~
-
-	t_AB	set background color (ANSI)			*t_AB* *'t_AB'*
-	t_AF	set foreground color (ANSI)			*t_AF* *'t_AF'*
-	t_AL	add number of blank lines			*t_AL* *'t_AL'*
-	t_al	add new blank line				*t_al* *'t_al'*
-	t_bc	backspace character				*t_bc* *'t_bc'*
-	t_cd	clear to end of screen				*t_cd* *'t_cd'*
-	t_ce	clear to end of line				*t_ce* *'t_ce'*
-	t_cl	clear screen					*t_cl* *'t_cl'*
-	t_cm	cursor motion (required!)		  *E437* *t_cm* *'t_cm'*
-	t_Co	number of colors				*t_Co* *'t_Co'*
-	t_CS	if non-empty, cursor relative to scroll region	*t_CS* *'t_CS'*
-	t_cs	define scrolling region				*t_cs* *'t_cs'*
-	t_CV	define vertical scrolling region		*t_CV* *'t_CV'*
-	t_da	if non-empty, lines from above scroll down	*t_da* *'t_da'*
-	t_db	if non-empty, lines from below scroll up	*t_db* *'t_db'*
-	t_DL	delete number of lines				*t_DL* *'t_DL'*
-	t_dl	delete line					*t_dl* *'t_dl'*
-	t_fs	set window title end (from status line)		*t_fs* *'t_fs'*
-	t_ke	exit "keypad transmit" mode			*t_ke* *'t_ke'*
-	t_ks	start "keypad transmit" mode			*t_ks* *'t_ks'*
-	t_le	move cursor one char left			*t_le* *'t_le'*
-	t_mb	blinking mode					*t_mb* *'t_mb'*
-	t_md	bold mode					*t_md* *'t_md'*
-	t_me	Normal mode (undoes t_mr, t_mb, t_md and color)	*t_me* *'t_me'*
-	t_mr	reverse (invert) mode				*t_mr* *'t_mr'*
-								*t_ms* *'t_ms'*
-	t_ms	if non-empty, cursor can be moved in standout/inverse mode
-	t_nd	non destructive space character			*t_nd* *'t_nd'*
-	t_op	reset to original color pair			*t_op* *'t_op'*
-	t_RI	cursor number of chars right			*t_RI* *'t_RI'*
-	t_Sb	set background color				*t_Sb* *'t_Sb'*
-	t_Sf	set foreground color				*t_Sf* *'t_Sf'*
-	t_se	standout end					*t_se* *'t_se'*
-	t_so	standout mode					*t_so* *'t_so'*
-	t_sr	scroll reverse (backward)			*t_sr* *'t_sr'*
-	t_te	out of "termcap" mode				*t_te* *'t_te'*
-	t_ti	put terminal in "termcap" mode			*t_ti* *'t_ti'*
-	t_ts	set window title start (to status line)		*t_ts* *'t_ts'*
-	t_ue	underline end					*t_ue* *'t_ue'*
-	t_us	underline mode					*t_us* *'t_us'*
-	t_Ce	undercurl end					*t_Ce* *'t_Ce'*
-	t_Cs	undercurl mode					*t_Cs* *'t_Cs'*
-	t_ut	clearing uses the current background color	*t_ut* *'t_ut'*
-	t_vb	visual bell					*t_vb* *'t_vb'*
-	t_ve	cursor visible					*t_ve* *'t_ve'*
-	t_vi	cursor invisible				*t_vi* *'t_vi'*
-	t_vs	cursor very visible				*t_vs* *'t_vs'*
-								*t_xs* *'t_xs'*
-	t_xs	if non-empty, standout not erased by overwriting (hpterm)
-	t_ZH	italics mode					*t_ZH* *'t_ZH'*
-	t_ZR	italics end					*t_ZR* *'t_ZR'*
-
-Added by Vim (there are no standard codes for these):
-	t_IS	set icon text start				*t_IS* *'t_IS'*
-	t_IE	set icon text end				*t_IE* *'t_IE'*
-	t_WP	set window position (Y, X) in pixels		*t_WP* *'t_WP'*
-	t_WS	set window size (height, width) in characters	*t_WS* *'t_WS'*
-	t_SI	start insert mode (bar cursor shape)		*t_SI* *'t_SI'*
-	t_EI	end insert mode (block cursor shape)		*t_EI* *'t_EI'*
-		|termcap-cursor-shape|
-	t_RV	request terminal version string (for xterm)	*t_RV* *'t_RV'*
-		|xterm-8bit| |v:termresponse| |xterm-codes|
-	t_u7	request cursor position (for xterm)		*t_u7* *'t_u7'*
-		see |'ambiwidth'|
-
-KEY CODES
-Note: Use the <> form if possible
-
-	option	name		meaning	~
-
-	t_ku	<Up>		arrow up			*t_ku* *'t_ku'*
-	t_kd	<Down>		arrow down			*t_kd* *'t_kd'*
-	t_kr	<Right>		arrow right			*t_kr* *'t_kr'*
-	t_kl	<Left>		arrow left			*t_kl* *'t_kl'*
-		<xUp>		alternate arrow up		*<xUp>*
-		<xDown>		alternate arrow down		*<xDown>*
-		<xRight>	alternate arrow right		*<xRight>*
-		<xLeft>		alternate arrow left		*<xLeft>*
-		<S-Up>		shift arrow up
-		<S-Down>	shift arrow down
-	t_%i	<S-Right>	shift arrow right		*t_%i* *'t_%i'*
-	t_#4	<S-Left>	shift arrow left		*t_#4* *'t_#4'*
-	t_k1	<F1>		function key 1			*t_k1* *'t_k1'*
-		<xF1>		alternate F1			*<xF1>*
-	t_k2	<F2>		function key 2		*<F2>*	*t_k2* *'t_k2'*
-		<xF2>		alternate F2			*<xF2>*
-	t_k3	<F3>		function key 3		*<F3>*	*t_k3* *'t_k3'*
-		<xF3>		alternate F3			*<xF3>*
-	t_k4	<F4>		function key 4		*<F4>*	*t_k4* *'t_k4'*
-		<xF4>		alternate F4			*<xF4>*
-	t_k5	<F5>		function key 5		*<F5>*	*t_k5* *'t_k5'*
-	t_k6	<F6>		function key 6		*<F6>*	*t_k6* *'t_k6'*
-	t_k7	<F7>		function key 7		*<F7>*	*t_k7* *'t_k7'*
-	t_k8	<F8>		function key 8		*<F8>*	*t_k8* *'t_k8'*
-	t_k9	<F9>		function key 9		*<F9>*	*t_k9* *'t_k9'*
-	t_k;	<F10>		function key 10		*<F10>*	*t_k;* *'t_k;'*
-	t_F1	<F11>		function key 11		*<F11>*	*t_F1* *'t_F1'*
-	t_F2	<F12>		function key 12		*<F12>*	*t_F2* *'t_F2'*
-	t_F3	<F13>		function key 13		*<F13>*	*t_F3* *'t_F3'*
-	t_F4	<F14>		function key 14		*<F14>*	*t_F4* *'t_F4'*
-	t_F5	<F15>		function key 15		*<F15>*	*t_F5* *'t_F5'*
-	t_F6	<F16>		function key 16		*<F16>*	*t_F6* *'t_F6'*
-	t_F7	<F17>		function key 17		*<F17>*	*t_F7* *'t_F7'*
-	t_F8	<F18>		function key 18		*<F18>*	*t_F8* *'t_F8'*
-	t_F9	<F19>		function key 19		*<F19>*	*t_F9* *'t_F9'*
-		<S-F1>		shifted function key 1
-		<S-xF1>		alternate <S-F1>		*<S-xF1>*
-		<S-F2>		shifted function key 2		*<S-F2>*
-		<S-xF2>		alternate <S-F2>		*<S-xF2>*
-		<S-F3>		shifted function key 3		*<S-F3>*
-		<S-xF3>		alternate <S-F3>		*<S-xF3>*
-		<S-F4>		shifted function key 4		*<S-F4>*
-		<S-xF4>		alternate <S-F4>		*<S-xF4>*
-		<S-F5>		shifted function key 5		*<S-F5>*
-		<S-F6>		shifted function key 6		*<S-F6>*
-		<S-F7>		shifted function key 7		*<S-F7>*
-		<S-F8>		shifted function key 8		*<S-F8>*
-		<S-F9>		shifted function key 9		*<S-F9>*
-		<S-F10>		shifted function key 10		*<S-F10>*
-		<S-F11>		shifted function key 11		*<S-F11>*
-		<S-F12>		shifted function key 12		*<S-F12>*
-	t_%1	<Help>		help key			*t_%1* *'t_%1'*
-	t_&8	<Undo>		undo key			*t_&8* *'t_&8'*
-	t_kI	<Insert>	insert key			*t_kI* *'t_kI'*
-	t_kD	<Del>		delete key			*t_kD* *'t_kD'*
-	t_kb	<BS>		backspace key			*t_kb* *'t_kb'*
-	t_kB	<S-Tab>		back-tab (shift-tab)  *<S-Tab>*	*t_kB* *'t_kB'*
-	t_kh	<Home>		home key			*t_kh* *'t_kh'*
-	t_#2	<S-Home>	shifted home key     *<S-Home>*	*t_#2* *'t_#2'*
-		<xHome>		alternate home key		*<xHome>*
-	t_@7	<End>		end key				*t_@7* *'t_@7'*
-	t_*7	<S-End>		shifted end key	*<S-End>* *t_star7* *'t_star7'*
-		<xEnd>		alternate end key		*<xEnd>*
-	t_kP	<PageUp>	page-up key			*t_kP* *'t_kP'*
-	t_kN	<PageDown>	page-down key			*t_kN* *'t_kN'*
-	t_K1	<kHome>		keypad home key			*t_K1* *'t_K1'*
-	t_K4	<kEnd>		keypad end key			*t_K4* *'t_K4'*
-	t_K3	<kPageUp>	keypad page-up key		*t_K3* *'t_K3'*
-	t_K5	<kPageDown>	keypad page-down key		*t_K5* *'t_K5'*
-	t_K6	<kPlus>		keypad plus key	      *<kPlus>*	*t_K6* *'t_K6'*
-	t_K7	<kMinus>	keypad minus key     *<kMinus>*	*t_K7* *'t_K7'*
-	t_K8	<kDivide>	keypad divide	    *<kDivide>*	*t_K8* *'t_K8'*
-	t_K9	<kMultiply>	keypad multiply   *<kMultiply>*	*t_K9* *'t_K9'*
-	t_KA	<kEnter>	keypad enter key     *<kEnter>*	*t_KA* *'t_KA'*
-	t_KB	<kPoint>	keypad decimal point *<kPoint>*	*t_KB* *'t_KB'*
-	t_KC	<k0>		keypad 0		 *<k0>*	*t_KC* *'t_KC'*
-	t_KD	<k1>		keypad 1		 *<k1>*	*t_KD* *'t_KD'*
-	t_KE	<k2>		keypad 2		 *<k2>*	*t_KE* *'t_KE'*
-	t_KF	<k3>		keypad 3		 *<k3>*	*t_KF* *'t_KF'*
-	t_KG	<k4>		keypad 4		 *<k4>*	*t_KG* *'t_KG'*
-	t_KH	<k5>		keypad 5		 *<k5>*	*t_KH* *'t_KH'*
-	t_KI	<k6>		keypad 6		 *<k6>*	*t_KI* *'t_KI'*
-	t_KJ	<k7>		keypad 7		 *<k7>*	*t_KJ* *'t_KJ'*
-	t_KK	<k8>		keypad 8		 *<k8>*	*t_KK* *'t_KK'*
-	t_KL	<k9>		keypad 9		 *<k9>*	*t_KL* *'t_KL'*
-		<Mouse>		leader of mouse code		*<Mouse>*
-
-Note about t_so and t_mr: When the termcap entry "so" is not present the
-entry for "mr" is used.  And vice versa.  The same is done for "se" and "me".
-If your terminal supports both inversion and standout mode, you can see two
-different modes.  If your terminal supports only one of the modes, both will
-look the same.
-
-							*keypad-comma*
-The keypad keys, when they are not mapped, behave like the equivalent normal
-key.  There is one exception: if you have a comma on the keypad instead of a
-decimal point, Vim will use a dot anyway.  Use these mappings to fix that: >
-	:noremap <kPoint> ,
-	:noremap! <kPoint> ,
-<							*xterm-codes*
-There is a special trick to obtain the key codes which currently only works
-for xterm.  When |t_RV| is defined and a response is received which indicates
-an xterm with patchlevel 141 or higher, Vim uses special escape sequences to
-request the key codes directly from the xterm.  The responses are used to
-adjust the various t_ codes.  This avoids the problem that the xterm can
-produce different codes, depending on the mode it is in (8-bit, VT102,
-VT220, etc.).  The result is that codes like <xF1> are no longer needed.
-Note: This is only done on startup.  If the xterm options are changed after
-Vim has started, the escape sequences may not be recognized anymore.
-
-							*xterm-resize*
-Window resizing with xterm only works if the allowWindowOps resource is
-enabled.  On some systems and versions of xterm it's disabled by default
-because someone thought it would be a security issue.  It's not clear if this
-is actually the case.
-
-To overrule the default, put this line in your ~/.Xdefaults or
-~/.Xresources:
->
-	XTerm*allowWindowOps: 		true
-
-And run "xrdb -merge .Xresources" to make it effective.  You can check the
-value with the context menu (right mouse button while CTRL key is pressed),
-there should be a tick at allow-window-ops.
-
-							*termcap-colors*
-Note about colors: The 't_Co' option tells Vim the number of colors available.
-When it is non-zero, the 't_AB' and 't_AF' options are used to set the color.
-If one of these is not available, 't_Sb' and 't_Sf' are used.  't_me' is used
-to reset to the default colors.
-
-				*termcap-cursor-shape* *termcap-cursor-color*
-When Vim enters Insert mode the 't_SI' escape sequence is sent.  When leaving
-Insert mode 't_EI' is used.  But only if both are defined.  This can be used
-to change the shape or color of the cursor in Insert mode.  These are not
-standard termcap/terminfo entries, you need to set them yourself.
-Example for an xterm, this changes the color of the cursor: >
-    if &term =~ "xterm"
-	let &t_SI = "\<Esc>]12;purple\x7"
-	let &t_EI = "\<Esc>]12;blue\x7"
-    endif
-NOTE: When Vim exits the shape for Normal mode will remain.  The shape from
-before Vim started will not be restored.
-
-							*termcap-title*
-The 't_ts' and 't_fs' options are used to set the window title if the terminal
-allows title setting via sending strings.  They are sent before and after the
-title string, respectively.  Similar 't_IS' and 't_IE'  are used to set the
-icon text.  These are Vim-internal extensions of the Unix termcap, so they
-cannot be obtained from an external termcap.  However, the builtin termcap
-contains suitable entries for xterm, so you don't need to set them here.
-							*hpterm*
-If inversion or other highlighting does not work correctly, try setting the
-'t_xs' option to a non-empty string.  This makes the 't_ce' code be used to
-remove highlighting from a line.  This is required for "hpterm".  Setting the
-'weirdinvert' option has the same effect as making 't_xs' non-empty, and vice
-versa.
-
-							*scroll-region*
-Some termcaps do not include an entry for 'cs' (scroll region), although the
-terminal does support it.  For example: xterm on a Sun.  You can use the
-builtin_xterm or define t_cs yourself.  For example: >
-	:set t_cs=^V^[[%i%d;%dr
-Where ^V is CTRL-V and ^[ is <Esc>.
-
-The vertical scroll region t_CV is not a standard termcap code.  Vim uses it
-internally in the GUI.  But it can also be defined for a terminal, if you can
-find one that supports it.  The two arguments are the left and right column of
-the region which to restrict the scrolling to.  Just like t_cs defines the top
-and bottom lines.  Defining t_CV will make scrolling in vertically split
-windows a lot faster.  Don't set t_CV when t_da or t_db is set (text isn't
-cleared when scrolling).
-
-Unfortunately it is not possible to deduce from the termcap how cursor
-positioning should be done when using a scrolling region: Relative to the
-beginning of the screen or relative to the beginning of the scrolling region.
-Most terminals use the first method.  The 't_CS' option should be set to any
-string when cursor positioning is relative to the start of the scrolling
-region.  It should be set to an empty string otherwise.
-
-Note for xterm users: The shifted cursor keys normally don't work.  You can
-	make them work with the xmodmap command and some mappings in Vim.
-
-	Give these commands in the xterm:
-		xmodmap -e "keysym Up = Up F13"
-		xmodmap -e "keysym Down = Down F16"
-		xmodmap -e "keysym Left = Left F18"
-		xmodmap -e "keysym Right = Right F19"
-
-	And use these mappings in Vim:
-		:map <t_F3> <S-Up>
-		:map! <t_F3> <S-Up>
-		:map <t_F6> <S-Down>
-		:map! <t_F6> <S-Down>
-		:map <t_F8> <S-Left>
-		:map! <t_F8> <S-Left>
-		:map <t_F9> <S-Right>
-		:map! <t_F9> <S-Right>
-
-Instead of, say, <S-Up> you can use any other command that you want to use the
-shift-cursor-up key for.  (Note: To help people that have a Sun keyboard with
-left side keys F14 is not used because it is confused with the undo key; F15
-is not used, because it does a window-to-front; F17 is not used, because it
-closes the window.  On other systems you can probably use them.)
-
-==============================================================================
-3. Window size						*window-size*
+Window size						*window-size*
 
 [This is about the size of the whole window Vim is using, not a window that is
 created with the ":split" command.]
@@ -477,7 +106,7 @@ One command can be used to set the screen size:
 Detects the screen size and redraws the screen.
 
 ==============================================================================
-4. Slow and fast terminals			*slow-fast-terminal*
+Slow and fast terminals				*slow-fast-terminal*
 						*slow-terminal*
 
 If you have a fast terminal you may like to set the 'ruler' option.  The
@@ -511,7 +140,7 @@ is sent to the terminal at a time (does not work for MS-DOS).  This makes the
 screen updating a lot slower, making it possible to see what is happening.
 
 ==============================================================================
-5. Using the mouse					*mouse-using*
+Using the mouse						*mouse-using*
 
 This section is about using the mouse on a terminal or a terminal window.  How
 to use the mouse in a GUI window is explained in |gui-mouse|.  For scrolling
diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt
index e8dfbaea0b..05d080280c 100644
--- a/runtime/doc/tips.txt
+++ b/runtime/doc/tips.txt
@@ -15,7 +15,6 @@ Don't forget to browse the user manual, it also contains lots of useful tips
 
 Editing C programs				|C-editing|
 Finding where identifiers are used		|ident-search|
-Switching screens in an xterm			|xterm-screens|
 Scrolling in Insert mode			|scroll-insert|
 Smooth scrolling				|scroll-smooth|
 Correcting common typing mistakes		|type-mistakes|
@@ -118,48 +117,6 @@ archive file on your closest gnu-ftp-mirror).
 
 [the idea for this comes from Andreas Kutschera]
 
-==============================================================================
-Switching screens in an xterm		*xterm-screens* *xterm-save-screen*
-
-(From comp.editors, by Juergen Weigert, in reply to a question)
-
-:> Another question is that after exiting vim, the screen is left as it
-:> was, i.e. the contents of the file I was viewing (editing) was left on
-:> the screen. The output from my previous like "ls" were lost,
-:> ie. no longer in the scrolling buffer. I know that there is a way to
-:> restore the screen after exiting vim or other vi like editors,
-:> I just don't know how. Helps are appreciated. Thanks.
-:
-:I imagine someone else can answer this.  I assume though that vim and vi do
-:the same thing as each other for a given xterm setup.
-
-They not necessarily do the same thing, as this may be a termcap vs.
-terminfo problem.  You should be aware that there are two databases for
-describing attributes of a particular type of terminal: termcap and
-terminfo.  This can cause differences when the entries differ AND when of
-the programs in question one uses terminfo and the other uses termcap
-(also see |+terminfo|).
-
-In your particular problem, you are looking for the control sequences
-^[[?47h and ^[[?47l.  These switch between xterms alternate and main screen
-buffer.  As a quick workaround a command sequence like >
-	echo -n "^[[?47h"; vim ... ; echo -n "^[[?47l"
-may do what you want.  (My notation ^[ means the ESC character, further down
-you'll see that the databases use \E instead).
-
-On startup, vim echoes the value of the termcap variable ti (terminfo:
-smcup) to the terminal.  When exiting, it echoes te (terminfo: rmcup).  Thus
-these two variables are the correct place where the above mentioned control
-sequences should go.
-
-Compare your xterm termcap entry (found in /etc/termcap) with your xterm
-terminfo entry (retrieved with "infocmp -C xterm").  Both should contain
-entries similar to: >
-	:te=\E[2J\E[?47l\E8:ti=\E7\E[?47h:
-
-PS: If you find any difference, someone (your sysadmin?) should better check
-    the complete termcap and terminfo database for consistency.
-
 ==============================================================================
 Scrolling in Insert mode				*scroll-insert*
 
diff --git a/runtime/doc/usr_06.txt b/runtime/doc/usr_06.txt
index fb02fe2683..48f672be78 100644
--- a/runtime/doc/usr_06.txt
+++ b/runtime/doc/usr_06.txt
@@ -55,8 +55,7 @@ There can be a number of reasons why you don't see colors:
 - Your terminal does not support colors.
 	Vim will use bold, italic and underlined text, but this doesn't look
 	very nice.  You probably will want to try to get a terminal with
-	colors.  For Unix, I recommend the xterm from the XFree86 project:
-	|xfree-xterm|.
+	colors.
 
 - Your terminal does support colors, but Vim doesn't know this.
 	Make sure your $TERM setting is correct.  For example, when using an
@@ -68,9 +67,7 @@ There can be a number of reasons why you don't see colors:
 
 		TERM=xterm-color; export TERM
 
-<	The terminal name must match the terminal you are using.  If it
-	still doesn't work, have a look at |xterm-color|, which shows a few
-	ways to make Vim display colors (not only for an xterm).
+<	The terminal name must match the terminal you are using.
 
 - The file type is not recognized.
 	Vim doesn't know all file types, and sometimes it's near to impossible
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 1a93a4504f..870f400f52 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -313,7 +313,6 @@ N  *+comments*		|'comments'| support
 B  *+conceal*		"conceal" support, see |conceal| |:syn-conceal| etc.
 B  *+cscope*		|cscope| support
 m  *+cursorbind*	|'cursorbind'| support
-m  *+cursorshape*	|termcap-cursor-shape| support
 m  *+debug*		Compiled for debugging.
 N  *+dialog_gui*	Support for |:confirm| with GUI dialog.
 N  *+dialog_con*	Support for |:confirm| with console dialog.
@@ -373,10 +372,8 @@ T  *+tag_binary*	binary searching in tags file |tag-binary-search|
 N  *+tag_old_static*	old method for static tags |tag-old-static|
 m  *+tag_any_white*	any white space allowed in tags file |tag-any-white|
 B  *+termguicolors*	24-bit color in xterm-compatible terminals support
-   *+terminfo*		uses |terminfo| instead of termcap
 N  *+termresponse*	support for |t_RV| and |v:termresponse|
 N  *+textobjects*	|text-objects| selection
-   *+tgetent*		non-Unix only: able to use external termcap
 N  *+timers*		the |timer_start()| function
 N  *+title*		Setting the window 'title' and 'icon'
 N  *+toolbar*		|gui-toolbar|
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index c84cea2b55..03feb47cbd 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -276,6 +276,11 @@ Ed-compatible mode:
   ":set noedcompatible" is ignored
   ":set edcompatible" is an error
 
+	*t_xx* *:set-termcap* *termcap-options* *t_AB* *t_Sb* *t_vb* *t_SI*
+Nvim does not have special `t_XX` options nor <t_XX> keycodes to configure
+terminal capabilities. Instead Nvim treats the terminal as any other UI. For
+example, 'guicursor' sets the terminal cursor style if possible.
+
 'ttyfast':
   ":set ttyfast" is ignored
   ":set nottyfast" is an error
diff --git a/scripts/vim-patch.sh b/scripts/vim-patch.sh
index 3ade90a65b..3b083e7b83 100755
--- a/scripts/vim-patch.sh
+++ b/scripts/vim-patch.sh
@@ -136,7 +136,7 @@ preprocess_patch() {
   2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/src/\S*\<\%('${na_src}'\)@norm! d/\v(^diff)|%$
' +w +q "$file"
 
   # Remove channel.txt, netbeans.txt, os_*.txt, todo.txt, version*.txt, tags
-  local na_doc='channel\.txt\|netbeans\.txt\|os_\w\+\.txt\|todo\.txt\|version\d\.txt\|tags'
+  local na_doc='channel\.txt\|netbeans\.txt\|os_\w\+\.txt\|term\.txt\|todo\.txt\|version\d\.txt\|tags'
   2>/dev/null $nvim --cmd 'set dir=/tmp' +'g@^diff --git a/runtime/doc/\<\%('${na_doc}'\)\>@norm! d/\v(^diff)|%$
' +w +q "$file"
 
   # Remove "Last change ..." changes in doc files.

From dbdc2d40bb7a950e294c6e50906f546707ccf390 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Fri, 28 Apr 2017 21:04:17 -0400
Subject: [PATCH 202/257] vim-patch:7.4.2231

Problem:    ":oldfiles" output is a very long list.
Solution:   Add a pattern argument. (Coot, closes vim/vim#575)

https://github.com/vim/vim/commit/e11d61a3b1cdedf3144de697a2b38af62c3a78d8
---
 runtime/doc/starting.txt | 11 ++++++-
 src/nvim/eval.c          | 46 ---------------------------
 src/nvim/ex_cmds.c       | 68 ++++++++++++++++++++++++++++++++++++++++
 src/nvim/ex_cmds.lua     |  2 +-
 src/nvim/version.c       |  2 +-
 5 files changed, 80 insertions(+), 49 deletions(-)

diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index f7c47125f1..f34da79e85 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1182,12 +1182,21 @@ running) you have additional options:
 						*:o* *:ol* *:oldfiles*
 :o[ldfiles]		List the files that have marks stored in the ShaDa
 			file.  This list is read on startup and only changes
-			afterwards with ":rshada!".  Also see |v:oldfiles|.
+			afterwards with `:rshada!`.  Also see |v:oldfiles|.
 			The number can be used with |c_#<|.
 			The output can be filtered with |:filter|, e.g.: >
 				filter /\.vim/ oldfiles
 <			The filtering happens on the file name.
 
+:ol[dfiles] {pat}
+:ol[dfiles] /{pat}/
+			Like `:oldfiles` but only files matching {pat} will
+			be included.  {pat} is a Vim search pattern.  Instead
+			of enclosing it in / any non-ID character (see
+			|'isident'|) can be used, so long as it does not
+			appear in {pat}.  Without the enclosing character the
+			pattern cannot include the bar character.
+
 :bro[wse] o[ldfiles][!]
 			List file names as with |:oldfiles|, and then prompt
 			for a number.  When the number is valid that file from
diff --git a/src/nvim/eval.c b/src/nvim/eval.c
index b0f47d8e45..1bf85ccd8b 100644
--- a/src/nvim/eval.c
+++ b/src/nvim/eval.c
@@ -21779,52 +21779,6 @@ void last_set_msg(scid_T scriptID)
   }
 }
 
-/*
- * List v:oldfiles in a nice way.
- */
-void ex_oldfiles(exarg_T *eap)
-{
-  list_T      *l = get_vim_var_list(VV_OLDFILES);
-  listitem_T  *li;
-  long nr = 0;
-
-  if (l == NULL)
-    msg((char_u *)_("No old files"));
-  else {
-    msg_start();
-    msg_scroll = TRUE;
-    for (li = l->lv_first; li != NULL && !got_int; li = li->li_next) {
-      msg_outnum(++nr);
-      MSG_PUTS(": ");
-      msg_outtrans((char_u *)tv_get_string(&li->li_tv));
-      msg_clr_eos();
-      msg_putchar('\n');
-      ui_flush();                  /* output one line at a time */
-      os_breakcheck();
-    }
-    /* Assume "got_int" was set to truncate the listing. */
-    got_int = FALSE;
-
-    // File selection prompt on ":browse oldfiles"
-    if (cmdmod.browse) {
-      quit_more = false;
-      nr = prompt_for_number(false);
-      msg_starthere();
-      if (nr > 0 && nr <= l->lv_len) {
-        const char *const p = tv_list_find_str(l, nr - 1);
-        if (p == NULL) {
-          return;
-        }
-        char *const s = (char *)expand_env_save((char_u *)p);
-        eap->arg = (char_u *)s;
-        eap->cmdidx = CMD_edit;
-        do_exedit(eap, NULL);
-        xfree(s);
-      }
-    }
-  }
-}
-
 // reset v:option_new, v:option_old and v:option_type
 void reset_v_option_vars(void)
 {
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 7726e0fc6d..ab85bb766f 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -6158,3 +6158,71 @@ void ex_substitute(exarg_T *eap)
   ga_clear(&save_view);
   unblock_autocmds();
 }
+
+/// List v:oldfiles in a nice way.
+void ex_oldfiles(exarg_T *eap)
+{
+  list_T      *l = get_vim_var_list(VV_OLDFILES);
+  listitem_T  *li;
+  long nr = 0;
+
+  if (l == NULL) {
+    msg((char_u *)_("No old files"));
+  } else {
+    char_u *reg_pat = NULL;
+    regmatch_T regmatch;
+
+    if (*eap->arg != NUL) {
+      if (skip_vimgrep_pat(eap->arg, &reg_pat, NULL) == NULL) {
+        EMSG(_(e_invalpat));
+        return;
+      }
+      regmatch.regprog = vim_regcomp(reg_pat, p_magic ? RE_MAGIC : 0);
+      if (regmatch.regprog == NULL) {
+        return;
+      }
+    }
+
+    msg_start();
+    msg_scroll = TRUE;
+    for (li = l->lv_first; li != NULL && !got_int; li = li->li_next) {
+      nr++;
+      const char *fname = tv_get_string(&li->li_tv);
+      if (reg_pat == NULL || *reg_pat == NUL
+          || vim_regexec(&regmatch, (char_u *)fname, (colnr_T)0)) {
+        msg_outnum(nr);
+        MSG_PUTS(": ");
+        msg_outtrans((char_u *)tv_get_string(&li->li_tv));
+        msg_clr_eos();
+        msg_putchar('\n');
+        ui_flush();                  // output one line at a time
+        os_breakcheck();
+      }
+    }
+    if (*eap->arg != NUL) {
+      vim_regfree(regmatch.regprog);
+    }
+
+    /* Assume "got_int" was set to truncate the listing. */
+    got_int = FALSE;
+
+    // File selection prompt on ":browse oldfiles"
+    if (cmdmod.browse) {
+      quit_more = false;
+      nr = prompt_for_number(false);
+      msg_starthere();
+      if (nr > 0 && nr <= l->lv_len) {
+        const char *const p = tv_list_find_str(l, nr - 1);
+        if (p == NULL) {
+          return;
+        }
+        char *const s = (char *)expand_env_save((char_u *)p);
+        eap->arg = (char_u *)s;
+        eap->cmdidx = CMD_edit;
+        cmdmod.browse = false;
+        do_exedit(eap, NULL);
+        xfree(s);
+      }
+    }
+  }
+}
diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua
index 92f0669422..844d46ab26 100644
--- a/src/nvim/ex_cmds.lua
+++ b/src/nvim/ex_cmds.lua
@@ -1810,7 +1810,7 @@ return {
   },
   {
     command='oldfiles',
-    flags=bit.bor(BANG, TRLBAR, SBOXOK, CMDWIN),
+    flags=bit.bor(BANG, TRLBAR, NOTADR, EXTRA, SBOXOK, CMDWIN),
     addr_type=ADDR_LINES,
     func='ex_oldfiles',
   },
diff --git a/src/nvim/version.c b/src/nvim/version.c
index b1aa8e2a4b..b3ab5d0d2c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -213,7 +213,7 @@ static const int included_patches[] = {
   // 2234 NA
   2233,
   // 2232 NA
-  // 2231,
+  2231,
   2230,
   // 2229,
   2228,

From 059c3fc2f952b42824ca37610c040c938a75de5c Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 29 Apr 2017 07:55:15 -0400
Subject: [PATCH 203/257] vim-patch:7.4.2239

Problem:    Warning for missing declaration of skip_vimgrep_pat(). (John
            Marriott)
Solution:   Move it to another file.

https://github.com/vim/vim/commit/9baf297c99cc35adb921bee04369499d76438889
---
 src/nvim/ex_cmds.c  | 44 +++++++++++++++++++++++++++++++++++++++++++
 src/nvim/quickfix.c | 46 ---------------------------------------------
 src/nvim/version.c  |  2 +-
 3 files changed, 45 insertions(+), 47 deletions(-)

diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index ab85bb766f..95cbcbbcb9 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -6159,6 +6159,50 @@ void ex_substitute(exarg_T *eap)
   unblock_autocmds();
 }
 
+/// Skip over the pattern argument of ":vimgrep /pat/[g][j]".
+/// Put the start of the pattern in "*s", unless "s" is NULL.
+/// If "flags" is not NULL put the flags in it: VGR_GLOBAL, VGR_NOJUMP.
+/// If "s" is not NULL terminate the pattern with a NUL.
+/// Return a pointer to the char just past the pattern plus flags.
+char_u *skip_vimgrep_pat(char_u *p, char_u **s, int *flags)
+{
+  int c;
+
+  if (vim_isIDc(*p)) {
+    // ":vimgrep pattern fname"
+    if (s != NULL)
+      *s = p;
+    p = skiptowhite(p);
+    if (s != NULL && *p != NUL)
+      *p++ = NUL;
+  } else {
+    // ":vimgrep /pattern/[g][j] fname"
+    if (s != NULL)
+      *s = p + 1;
+    c = *p;
+    p = skip_regexp(p + 1, c, TRUE, NULL);
+    if (*p != c)
+      return NULL;
+
+    // Truncate the pattern.
+    if (s != NULL)
+      *p = NUL;
+    ++p;
+
+    // Find the flags
+    while (*p == 'g' || *p == 'j') {
+      if (flags != NULL) {
+        if (*p == 'g')
+          *flags |= VGR_GLOBAL;
+        else
+          *flags |= VGR_NOJUMP;
+      }
+      ++p;
+    }
+  }
+  return p;
+}
+
 /// List v:oldfiles in a nice way.
 void ex_oldfiles(exarg_T *eap)
 {
diff --git a/src/nvim/quickfix.c b/src/nvim/quickfix.c
index 112498ae20..0ec0d5df9d 100644
--- a/src/nvim/quickfix.c
+++ b/src/nvim/quickfix.c
@@ -3765,52 +3765,6 @@ theend:
   vim_regfree(regmatch.regprog);
 }
 
-/*
- * Skip over the pattern argument of ":vimgrep /pat/[g][j]".
- * Put the start of the pattern in "*s", unless "s" is NULL.
- * If "flags" is not NULL put the flags in it: VGR_GLOBAL, VGR_NOJUMP.
- * If "s" is not NULL terminate the pattern with a NUL.
- * Return a pointer to the char just past the pattern plus flags.
- */
-char_u *skip_vimgrep_pat(char_u *p, char_u **s, int *flags)
-{
-  int c;
-
-  if (vim_isIDc(*p)) {
-    /* ":vimgrep pattern fname" */
-    if (s != NULL)
-      *s = p;
-    p = skiptowhite(p);
-    if (s != NULL && *p != NUL)
-      *p++ = NUL;
-  } else {
-    /* ":vimgrep /pattern/[g][j] fname" */
-    if (s != NULL)
-      *s = p + 1;
-    c = *p;
-    p = skip_regexp(p + 1, c, TRUE, NULL);
-    if (*p != c)
-      return NULL;
-
-    /* Truncate the pattern. */
-    if (s != NULL)
-      *p = NUL;
-    ++p;
-
-    /* Find the flags */
-    while (*p == 'g' || *p == 'j') {
-      if (flags != NULL) {
-        if (*p == 'g')
-          *flags |= VGR_GLOBAL;
-        else
-          *flags |= VGR_NOJUMP;
-      }
-      ++p;
-    }
-  }
-  return p;
-}
-
 /*
  * Restore current working directory to "dirname_start" if they differ, taking
  * into account whether it is set locally or globally.
diff --git a/src/nvim/version.c b/src/nvim/version.c
index b3ab5d0d2c..cdd617e68c 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -205,7 +205,7 @@ static const int included_patches[] = {
   2242,
   2241,
   2240,
-  // 2239,
+  2239,
   // 2238 NA
   2237,
   2236,

From 7bd97127b4e45dcef1159603834b04ef0dcadfd7 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 29 Apr 2017 07:58:49 -0400
Subject: [PATCH 204/257] vim-patch:7.4.2244

Problem:    Adding pattern to ":oldfiles" is not a generic solution.
Solution:   Add the ":filter /pat/ cmd" command modifier.  Only works for some
            commands right now.

https://github.com/vim/vim/commit/7b668e83d0635d082b7ec90d7d2aa30a9d7d8928
---
 runtime/doc/starting.txt             | 34 ++++++++++++++++------------
 src/nvim/ex_cmds.lua                 |  8 ++++++-
 src/nvim/ex_cmds_defs.h              | 26 +++++++++++----------
 src/nvim/ex_docmd.c                  | 34 +++++++++++++++++++++++++++-
 src/nvim/message.c                   | 15 ++++++++++++
 src/nvim/testdir/test_alot.vim       |  1 +
 src/nvim/testdir/test_filter_cmd.vim | 15 ++++++++++++
 src/nvim/version.c                   |  2 +-
 8 files changed, 105 insertions(+), 30 deletions(-)
 create mode 100644 src/nvim/testdir/test_filter_cmd.vim

diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index f34da79e85..edb0770313 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -518,7 +518,8 @@ accordingly.  Vim proceeds in this order:
 	The |v:vim_did_enter| variable is set to 1.
 	The |VimEnter| autocommands are executed.
 
-Some hints on using initializations:
+
+Some hints on using initializations ~
 
 Standard setup:
 Create a vimrc file to set the default settings and mappings for all your edit
@@ -540,17 +541,23 @@ the ":version" command.  NOTE: System vimrc file needs specific compilation
 options (one needs to define SYS_VIMRC_FILE macros). If :version command does 
 not show anything like this, consider contacting the nvim package maintainer.
 
-Saving the current state of Vim to a file:
+
+Saving the current state of Vim to a file ~
+
 Whenever you have changed values of options or when you have created a
 mapping, then you may want to save them in a vimrc file for later use.  See
 |save-settings| about saving the current state of settings to a file.
 
-Avoiding setup problems for Vi users:
+
+Avoiding setup problems for Vi users ~
+
 Vi uses the variable EXINIT and the file "~/.exrc".  So if you do not want to
 interfere with Vi, then use the variable VIMINIT and the file init.vim 
 instead.
 
-MS-DOS line separators:
+
+MS-DOS line separators: ~
+
 On Windows systems Vim assumes that all the vimrc files have <CR> <NL> pairs
 as line separators.  This will give problems if you have a file with only
 <NL>s and have a line like ":map xx yy^M".  The trailing ^M will be ignored.
@@ -558,8 +565,10 @@ as line separators.  This will give problems if you have a file with only
 The $MYVIMRC or $MYGVIMRC file will be set to the first found vimrc and/or
 gvimrc file.
 
-Avoiding trojan horses:					*trojan-horse*
-While reading the vimrc or the exrc file in the current directory, some
+
+Avoiding trojan horses ~
+							*trojan-horse*
+While reading the "vimrc" or the "exrc" file in the current directory, some
 commands can be disabled for security reasons by setting the 'secure' option.
 This is always done when executing the command from a tags file.  Otherwise it
 would be possible that you accidentally use a vimrc or tags file that somebody
@@ -581,6 +590,8 @@ Be careful!
 part of the line in the tags file) is always done in secure mode.  This works
 just like executing a command from a vimrc/exrc in the current directory.
 
+
+If Vim startup is slow ~
 							*slow-start*
 If Vim takes a long time to start up, use the |--startuptime| argument to find
 out what happens.
@@ -590,6 +601,8 @@ while.  You can find out if this is the problem by disabling ShaDa for a
 moment (use the Vim argument "-i NONE", |-i|).  Try reducing the number of
 lines stored in a register with ":set shada='20,<50,s10".  |shada-file|.
 
+
+Intro message ~
 							*:intro*
 When Vim starts without a file name, an introductory message is displayed (for
 those who don't know what Vim is).  It is removed as soon as the display is
@@ -1188,15 +1201,6 @@ running) you have additional options:
 				filter /\.vim/ oldfiles
 <			The filtering happens on the file name.
 
-:ol[dfiles] {pat}
-:ol[dfiles] /{pat}/
-			Like `:oldfiles` but only files matching {pat} will
-			be included.  {pat} is a Vim search pattern.  Instead
-			of enclosing it in / any non-ID character (see
-			|'isident'|) can be used, so long as it does not
-			appear in {pat}.  Without the enclosing character the
-			pattern cannot include the bar character.
-
 :bro[wse] o[ldfiles][!]
 			List file names as with |:oldfiles|, and then prompt
 			for a number.  When the number is valid that file from
diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua
index 844d46ab26..2566dd2f48 100644
--- a/src/nvim/ex_cmds.lua
+++ b/src/nvim/ex_cmds.lua
@@ -930,6 +930,12 @@ return {
     addr_type=ADDR_LINES,
     func='ex_filetype',
   },
+  {
+    command='filter',
+    flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
+    addr_type=ADDR_LINES,
+    func='ex_wrongmodifier',
+  },
   {
     command='find',
     flags=bit.bor(RANGE, NOTADR, BANG, FILE1, EDITCMD, ARGOPT, TRLBAR),
@@ -1810,7 +1816,7 @@ return {
   },
   {
     command='oldfiles',
-    flags=bit.bor(BANG, TRLBAR, NOTADR, EXTRA, SBOXOK, CMDWIN),
+    flags=bit.bor(BANG, TRLBAR, SBOXOK, CMDWIN),
     addr_type=ADDR_LINES,
     func='ex_oldfiles',
   },
diff --git a/src/nvim/ex_cmds_defs.h b/src/nvim/ex_cmds_defs.h
index 133c37cef4..b10775c001 100644
--- a/src/nvim/ex_cmds_defs.h
+++ b/src/nvim/ex_cmds_defs.h
@@ -6,6 +6,7 @@
 
 #include "nvim/pos.h"      // for linenr_T
 #include "nvim/normal.h"
+#include "nvim/regexp_defs.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "ex_cmds_enum.generated.h"
@@ -163,18 +164,19 @@ struct expand {
 /// flag.  This needs to be saved for recursive commands, put them in a
 /// structure for easy manipulation.
 typedef struct {
-  int split;          ///< flags for win_split()
-  int tab;            ///< > 0 when ":tab" was used
-  bool browse;        ///< true to invoke file dialog
-  bool confirm;       ///< true to invoke yes/no dialog
-  bool hide;          ///< true when ":hide" was used
-  bool keepalt;       ///< true when ":keepalt" was used
-  bool keepjumps;     ///< true when ":keepjumps" was used
-  bool keepmarks;     ///< true when ":keepmarks" was used
-  bool keeppatterns;  ///< true when ":keeppatterns" was used
-  bool lockmarks;     ///< true when ":lockmarks" was used
-  bool noswapfile;    ///< true when ":noswapfile" was used
-  char_u *save_ei;    ///< saved value of 'eventignore'
+  int split;                   ///< flags for win_split()
+  int tab;                     ///< > 0 when ":tab" was used
+  bool browse;                 ///< true to invoke file dialog
+  bool confirm;                ///< true to invoke yes/no dialog
+  bool hide;                   ///< true when ":hide" was used
+  bool keepalt;                ///< true when ":keepalt" was used
+  bool keepjumps;              ///< true when ":keepjumps" was used
+  bool keepmarks;              ///< true when ":keepmarks" was used
+  bool keeppatterns;           ///< true when ":keeppatterns" was used
+  bool lockmarks;              ///< true when ":lockmarks" was used
+  bool noswapfile;             ///< true when ":noswapfile" was used
+  char_u *save_ei;             ///< saved value of 'eventignore'
+  regmatch_T filter_regmatch;  ///< set by :filter /pat/
 } cmdmod_T;
 
 #endif  // NVIM_EX_CMDS_DEFS_H
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 7568d71ac0..45a11482d0 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -1350,6 +1350,24 @@ static char_u * do_one_cmd(char_u **cmdlinep,
       cmdmod.keepjumps = true;
       continue;
 
+    case 'f': {  // only accept ":filter {pat} cmd"
+      char_u *reg_pat;
+
+      if (!checkforcmd(&p, "filter", 4) || *p == NUL || ends_excmd(*p)) {
+        break;
+      }
+      p = skip_vimgrep_pat(p, &reg_pat, NULL);
+      if (p == NULL || *p == NUL) {
+        break;
+      }
+      cmdmod.filter_regmatch.regprog = vim_regcomp(reg_pat, RE_MAGIC);
+      if (cmdmod.filter_regmatch.regprog == NULL) {
+        break;
+      }
+      ea.cmd = p;
+      continue;
+    }
+
     /* ":hide" and ":hide | cmd" are not modifiers */
     case 'h':   if (p != ea.cmd || !checkforcmd(&p, "hide", 3)
                     || *p == NUL || ends_excmd(*p))
@@ -1452,6 +1470,7 @@ static char_u * do_one_cmd(char_u **cmdlinep,
     }
     break;
   }
+  char_u *after_modifier = ea.cmd;
 
   ea.skip = did_emsg || got_int || did_throw || (cstack->cs_idx >= 0
                                                  && !(cstack->cs_flags[cstack->
@@ -1734,7 +1753,13 @@ static char_u * do_one_cmd(char_u **cmdlinep,
     if (!ea.skip) {
       STRCPY(IObuff, _("E492: Not an editor command"));
       if (!(flags & DOCMD_VERBOSE)) {
-        append_command(*cmdlinep);
+        // If the modifier was parsed OK the error must be in the following
+        // command
+        if (after_modifier != NULL) {
+          append_command(after_modifier);
+        } else {
+          append_command(*cmdlinep);
+        }
       }
       errormsg = IObuff;
       did_emsg_syntax = TRUE;
@@ -2104,6 +2129,7 @@ static char_u * do_one_cmd(char_u **cmdlinep,
     case CMD_echomsg:
     case CMD_echon:
     case CMD_execute:
+    case CMD_filter:
     case CMD_help:
     case CMD_hide:
     case CMD_ijump:
@@ -2255,6 +2281,10 @@ doend:
     free_string_option(cmdmod.save_ei);
   }
 
+  if (cmdmod.filter_regmatch.regprog != NULL) {
+    vim_regfree(cmdmod.filter_regmatch.regprog);
+  }
+
   cmdmod = save_cmdmod;
 
   if (save_msg_silent != -1) {
@@ -2545,6 +2575,7 @@ static struct cmdmod {
   {"botright", 2, FALSE},
   {"browse", 3, FALSE},
   {"confirm", 4, FALSE},
+  {"filter", 4, FALSE},
   {"hide", 3, FALSE},
   {"keepalt", 5, FALSE},
   {"keepjumps", 5, FALSE},
@@ -3007,6 +3038,7 @@ const char * set_one_cmd_context(
   case CMD_cfdo:
   case CMD_confirm:
   case CMD_debug:
+  case CMD_filter:
   case CMD_folddoclosed:
   case CMD_folddoopen:
   case CMD_hide:
diff --git a/src/nvim/message.c b/src/nvim/message.c
index 696855e3aa..c83dfcd63f 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -31,6 +31,7 @@
 #include "nvim/ops.h"
 #include "nvim/option.h"
 #include "nvim/normal.h"
+#include "nvim/regexp.h"
 #include "nvim/screen.h"
 #include "nvim/strings.h"
 #include "nvim/ui.h"
@@ -148,6 +149,12 @@ msg_attr_keep (
   int retval;
   char_u *buf = NULL;
 
+  // Skip messages not match ":filter pattern".
+  // Don't filter when there is an error.
+  if (!emsg_on_display && message_filtered(s)) {
+    return true;
+  }
+
   if (attr == 0) {
     set_vim_var_string(VV_STATUSMSG, (char *) s, -1);
   }
@@ -1783,6 +1790,14 @@ static void msg_puts_display(const char_u *str, int maxlen, int attr,
   msg_check();
 }
 
+/// Return true when ":filter pattern" was used and "msg" does not match
+/// "pattern".
+bool message_filtered(char_u *msg)
+{
+  return cmdmod.filter_regmatch.regprog != NULL
+    && !vim_regexec(&cmdmod.filter_regmatch, msg, (colnr_T)0);
+}
+
 /*
  * Scroll the screen up one line for displaying the next message line.
  */
diff --git a/src/nvim/testdir/test_alot.vim b/src/nvim/testdir/test_alot.vim
index 99d9835996..5da9a8b0f4 100644
--- a/src/nvim/testdir/test_alot.vim
+++ b/src/nvim/testdir/test_alot.vim
@@ -8,6 +8,7 @@ source test_ex_undo.vim
 source test_expr.vim
 source test_expr_utf8.vim
 source test_feedkeys.vim
+source test_filter_cmd.vim
 source test_filter_map.vim
 source test_goto.vim
 source test_jumps.vim
diff --git a/src/nvim/testdir/test_filter_cmd.vim b/src/nvim/testdir/test_filter_cmd.vim
new file mode 100644
index 0000000000..f85a11ce45
--- /dev/null
+++ b/src/nvim/testdir/test_filter_cmd.vim
@@ -0,0 +1,15 @@
+" Test the :filter command modifier
+
+func Test_filter()
+  edit Xdoesnotmatch
+  edit Xwillmatch
+  call assert_equal('"Xwillmatch"', substitute(execute('filter willma ls'), '[^"]*\(".*"\)[^"]*', '\1', ''))
+endfunc
+
+func Test_filter_fails()
+  call assert_fails('filter', 'E471:')
+  call assert_fails('filter pat', 'E476:')
+  call assert_fails('filter /pat', 'E476:')
+  call assert_fails('filter /pat/', 'E476:')
+  call assert_fails('filter /pat/ asdf', 'E492:')
+endfunc
diff --git a/src/nvim/version.c b/src/nvim/version.c
index cdd617e68c..a4125f9eac 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -200,7 +200,7 @@ static const int included_patches[] = {
   // 2247 NA
   // 2246,
   // 2245,
-  // 2244,
+  2244,
   // 2243 NA
   2242,
   2241,

From f477c23c6282bffb8908f53592923e81443bac24 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 29 Apr 2017 21:22:22 -0400
Subject: [PATCH 205/257] vim-patch:7.4.2245

Problem:    Filter test fails.
Solution:   Include missing changes.

https://github.com/vim/vim/commit/77401add71853d7a3da7ccc489f2a1bca58551ec
---
 src/nvim/buffer.c  | 6 +++++-
 src/nvim/version.c | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 7477118d6f..5007cb5015 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -2365,12 +2365,16 @@ void buflist_list(exarg_T *eap)
             && (buf == curbuf || curwin->w_alt_fnum != buf->b_fnum))) {
       continue;
     }
-    msg_putchar('\n');
     if (buf_spname(buf) != NULL)
       STRLCPY(NameBuff, buf_spname(buf), MAXPATHL);
     else
       home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE);
 
+    if (message_filtered(NameBuff)) {
+      continue;
+    }
+
+    msg_putchar('\n');
     len = vim_snprintf((char *)IObuff, IOSIZE - 20, "%3d%c%c%c%c%c \"%s\"",
         buf->b_fnum,
         buf->b_p_bl ? ' ' : 'u',
diff --git a/src/nvim/version.c b/src/nvim/version.c
index a4125f9eac..c94e2b9f96 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -199,7 +199,7 @@ static const int included_patches[] = {
   2248,
   // 2247 NA
   // 2246,
-  // 2245,
+  2245,
   2244,
   // 2243 NA
   2242,

From ab50c1fdb73aa58f620491d50c6fcd222d37cb9d Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 29 Apr 2017 21:24:42 -0400
Subject: [PATCH 206/257] vim-patch:7.4.2246

Problem:    Oldfiles test fails.
Solution:   Include missing changes.

https://github.com/vim/vim/commit/d6f2ee32dcfa18c781ef157918b524318a2215a2
---
 src/nvim/ex_cmds.c | 20 +-------------------
 src/nvim/version.c |  2 +-
 2 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 95cbcbbcb9..772527532e 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -6213,27 +6213,12 @@ void ex_oldfiles(exarg_T *eap)
   if (l == NULL) {
     msg((char_u *)_("No old files"));
   } else {
-    char_u *reg_pat = NULL;
-    regmatch_T regmatch;
-
-    if (*eap->arg != NUL) {
-      if (skip_vimgrep_pat(eap->arg, &reg_pat, NULL) == NULL) {
-        EMSG(_(e_invalpat));
-        return;
-      }
-      regmatch.regprog = vim_regcomp(reg_pat, p_magic ? RE_MAGIC : 0);
-      if (regmatch.regprog == NULL) {
-        return;
-      }
-    }
-
     msg_start();
     msg_scroll = TRUE;
     for (li = l->lv_first; li != NULL && !got_int; li = li->li_next) {
       nr++;
       const char *fname = tv_get_string(&li->li_tv);
-      if (reg_pat == NULL || *reg_pat == NUL
-          || vim_regexec(&regmatch, (char_u *)fname, (colnr_T)0)) {
+      if (!message_filtered((char_u *)fname)) {
         msg_outnum(nr);
         MSG_PUTS(": ");
         msg_outtrans((char_u *)tv_get_string(&li->li_tv));
@@ -6243,9 +6228,6 @@ void ex_oldfiles(exarg_T *eap)
         os_breakcheck();
       }
     }
-    if (*eap->arg != NUL) {
-      vim_regfree(regmatch.regprog);
-    }
 
     /* Assume "got_int" was set to truncate the listing. */
     got_int = FALSE;
diff --git a/src/nvim/version.c b/src/nvim/version.c
index c94e2b9f96..f2a97cf360 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -198,7 +198,7 @@ static const int included_patches[] = {
   2249,
   2248,
   // 2247 NA
-  // 2246,
+  2246,
   2245,
   2244,
   // 2243 NA

From f219657453271f19519148d76536879bec044534 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 29 Apr 2017 21:29:44 -0400
Subject: [PATCH 207/257] vim-patch:7.4.2263

Problem:    :filter does not work for many commands.  Can only get matching
            messages.
Solution:   Make :filter work for :command, :map, :list, :number and :print.
            Make ":filter!" show non-matching lines.

https://github.com/vim/vim/commit/d29459baa61819e59961804ed258efac5733ec70
---
 src/nvim/ex_cmds.c                   |  5 ++++
 src/nvim/ex_cmds.lua                 |  2 +-
 src/nvim/ex_cmds_defs.h              |  1 +
 src/nvim/ex_docmd.c                  | 14 ++++++++--
 src/nvim/getchar.c                   |  6 ++++-
 src/nvim/message.c                   |  8 ++++--
 src/nvim/testdir/runtest.vim         |  1 +
 src/nvim/testdir/test_filter_cmd.vim | 39 ++++++++++++++++++++++++++++
 src/nvim/version.c                   |  2 +-
 9 files changed, 71 insertions(+), 7 deletions(-)

diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 772527532e..1b2eb774c9 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -1490,6 +1490,11 @@ void print_line(linenr_T lnum, int use_number, int list)
 {
   int save_silent = silent_mode;
 
+  // apply :filter /pat/
+  if (message_filtered(ml_get(lnum))) {
+    return;
+  }
+
   msg_start();
   silent_mode = FALSE;
   info_message = TRUE;          /* use mch_msg(), not mch_errmsg() */
diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua
index 2566dd2f48..523740444d 100644
--- a/src/nvim/ex_cmds.lua
+++ b/src/nvim/ex_cmds.lua
@@ -932,7 +932,7 @@ return {
   },
   {
     command='filter',
-    flags=bit.bor(NEEDARG, EXTRA, NOTRLCOM),
+    flags=bit.bor(BANG, NEEDARG, EXTRA, NOTRLCOM),
     addr_type=ADDR_LINES,
     func='ex_wrongmodifier',
   },
diff --git a/src/nvim/ex_cmds_defs.h b/src/nvim/ex_cmds_defs.h
index b10775c001..d72b83404e 100644
--- a/src/nvim/ex_cmds_defs.h
+++ b/src/nvim/ex_cmds_defs.h
@@ -177,6 +177,7 @@ typedef struct {
   bool noswapfile;             ///< true when ":noswapfile" was used
   char_u *save_ei;             ///< saved value of 'eventignore'
   regmatch_T filter_regmatch;  ///< set by :filter /pat/
+  bool filter_force;           ///< set for :filter!
 } cmdmod_T;
 
 #endif  // NVIM_EX_CMDS_DEFS_H
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 45a11482d0..2eaf92df00 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -1356,6 +1356,13 @@ static char_u * do_one_cmd(char_u **cmdlinep,
       if (!checkforcmd(&p, "filter", 4) || *p == NUL || ends_excmd(*p)) {
         break;
       }
+      if (*p == '!') {
+        cmdmod.filter_force = true;
+        p = skipwhite(p + 1);
+        if (*p == NUL || ends_excmd(*p)) {
+          break;
+        }
+      }
       p = skip_vimgrep_pat(p, &reg_pat, NULL);
       if (p == NULL || *p == NUL) {
         break;
@@ -4883,9 +4890,12 @@ static void uc_list(char_u *name, size_t name_len)
       cmd = USER_CMD_GA(gap, i);
       a = cmd->uc_argt;
 
-      /* Skip commands which don't match the requested prefix */
-      if (STRNCMP(name, cmd->uc_name, name_len) != 0)
+      // Skip commands which don't match the requested prefix and
+      // commands filtered out.
+      if (STRNCMP(name, cmd->uc_name, name_len) != 0
+          || message_filtered(cmd->uc_name)) {
         continue;
+      }
 
       /* Put out the title first time */
       if (!found)
diff --git a/src/nvim/getchar.c b/src/nvim/getchar.c
index 9d32df5a68..6e21ee96e8 100644
--- a/src/nvim/getchar.c
+++ b/src/nvim/getchar.c
@@ -1592,7 +1592,7 @@ vungetc ( /* unget one character (can only be done once!) */
 ///    This may do a blocking wait if "advance" is TRUE.
 ///
 /// if "advance" is TRUE (vgetc()):
-///    really get the character.
+///    Really get the character.
 ///    KeyTyped is set to TRUE in the case the user typed the key.
 ///    KeyStuffed is TRUE if the character comes from the stuff buffer.
 /// if "advance" is FALSE (vpeekc()):
@@ -3168,6 +3168,10 @@ showmap (
 {
   size_t len = 1;
 
+  if (message_filtered(mp->m_keys) && message_filtered(mp->m_str)) {
+    return;
+  }
+
   if (msg_didout || msg_silent != 0) {
     msg_putchar('\n');
     if (got_int)            /* 'q' typed at MORE prompt */
diff --git a/src/nvim/message.c b/src/nvim/message.c
index c83dfcd63f..057ce75f79 100644
--- a/src/nvim/message.c
+++ b/src/nvim/message.c
@@ -1794,8 +1794,12 @@ static void msg_puts_display(const char_u *str, int maxlen, int attr,
 /// "pattern".
 bool message_filtered(char_u *msg)
 {
-  return cmdmod.filter_regmatch.regprog != NULL
-    && !vim_regexec(&cmdmod.filter_regmatch, msg, (colnr_T)0);
+  if (cmdmod.filter_regmatch.regprog == NULL) {
+    return false;
+  }
+
+  bool match = vim_regexec(&cmdmod.filter_regmatch, msg, (colnr_T)0);
+  return cmdmod.filter_force ? match : !match;
 }
 
 /*
diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index 1cf7ab475c..140b67a1a5 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -72,6 +72,7 @@ let v:testing = 1
 set directory^=.
 set backspace=
 set nohidden smarttab noautoindent noautoread complete-=i noruler noshowcmd
+set listchars=eol:$
 " Prevent Nvim log from writing to stderr.
 let $NVIM_LOG_FILE='Xnvim.log'
 
diff --git a/src/nvim/testdir/test_filter_cmd.vim b/src/nvim/testdir/test_filter_cmd.vim
index f85a11ce45..0bbd905c85 100644
--- a/src/nvim/testdir/test_filter_cmd.vim
+++ b/src/nvim/testdir/test_filter_cmd.vim
@@ -4,6 +4,39 @@ func Test_filter()
   edit Xdoesnotmatch
   edit Xwillmatch
   call assert_equal('"Xwillmatch"', substitute(execute('filter willma ls'), '[^"]*\(".*"\)[^"]*', '\1', ''))
+  bwipe Xdoesnotmatch
+  bwipe Xwillmatch
+
+  new
+  call setline(1, ['foo1', 'foo2', 'foo3', 'foo4', 'foo5'])
+  call assert_equal("\nfoo2\nfoo4", execute('filter /foo[24]/ 1,$print'))
+  call assert_equal("\n  2 foo2\n  4 foo4", execute('filter /foo[24]/ 1,$number'))
+  call assert_equal("\nfoo2$\nfoo4$", execute('filter /foo[24]/ 1,$list'))
+
+  call assert_equal("\nfoo1$\nfoo3$\nfoo5$", execute('filter! /foo[24]/ 1,$list'))
+  bwipe!
+
+  command XTryThis echo 'this'
+  command XTryThat echo 'that'
+  command XDoThat echo 'that'
+  let lines = split(execute('filter XTry command'), "\n")
+  call assert_equal(3, len(lines))
+  call assert_match("XTryThat", lines[1])
+  call assert_match("XTryThis", lines[2])
+  delcommand XTryThis
+  delcommand XTryThat
+  delcommand XDoThat
+
+  map f1 the first key
+  map f2 the second key
+  map f3 not a key
+  let lines = split(execute('filter the map f'), "\n")
+  call assert_equal(2, len(lines))
+  call assert_match("f2", lines[0])
+  call assert_match("f1", lines[1])
+  unmap f1
+  unmap f2
+  unmap f3
 endfunc
 
 func Test_filter_fails()
@@ -12,4 +45,10 @@ func Test_filter_fails()
   call assert_fails('filter /pat', 'E476:')
   call assert_fails('filter /pat/', 'E476:')
   call assert_fails('filter /pat/ asdf', 'E492:')
+
+  call assert_fails('filter!', 'E471:')
+  call assert_fails('filter! pat', 'E476:')
+  call assert_fails('filter! /pat', 'E476:')
+  call assert_fails('filter! /pat/', 'E476:')
+  call assert_fails('filter! /pat/ asdf', 'E492:')
 endfunc
diff --git a/src/nvim/version.c b/src/nvim/version.c
index f2a97cf360..b579cdef12 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -181,7 +181,7 @@ static const int included_patches[] = {
   2266,
   2265,
   2264,
-  // 2263,
+  2263,
   // 2262 NA
   // 2261 NA
   // 2260 NA

From b6e36558d1e119a4382e96495b0e1faf402197f3 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 29 Apr 2017 21:49:19 -0400
Subject: [PATCH 208/257] vim-patch:8.0.0150

Problem:    When the pattern of :filter does not have a separator then
            completion of the command fails.
Solution:   Skip over the pattern. (Ozaki Kiichi, clodes vim/vim#1299)

https://github.com/vim/vim/commit/7069bf18e1b1b7bc7640335e07d1022b5acc9048
---
 src/nvim/ex_docmd.c                  | 11 ++++++++++-
 src/nvim/testdir/test_filter_cmd.vim | 22 ++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 2eaf92df00..e844c89516 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -3045,7 +3045,6 @@ const char * set_one_cmd_context(
   case CMD_cfdo:
   case CMD_confirm:
   case CMD_debug:
-  case CMD_filter:
   case CMD_folddoclosed:
   case CMD_folddoopen:
   case CMD_hide:
@@ -3070,6 +3069,16 @@ const char * set_one_cmd_context(
   case CMD_windo:
     return arg;
 
+  case CMD_filter:
+    if (*arg != NUL) {
+      arg = (const char *)skip_vimgrep_pat((char_u *)arg, NULL, NULL);
+    }
+    if (arg == NULL || *arg == NUL) {
+      xp->xp_context = EXPAND_NOTHING;
+      return NULL;
+    }
+    return (const char *)skipwhite((const char_u *)arg);
+
   case CMD_match:
     if (*arg == NUL || !ends_excmd(*arg)) {
       /* also complete "None" */
diff --git a/src/nvim/testdir/test_filter_cmd.vim b/src/nvim/testdir/test_filter_cmd.vim
index 0bbd905c85..5aa5fa64df 100644
--- a/src/nvim/testdir/test_filter_cmd.vim
+++ b/src/nvim/testdir/test_filter_cmd.vim
@@ -52,3 +52,25 @@ func Test_filter_fails()
   call assert_fails('filter! /pat/', 'E476:')
   call assert_fails('filter! /pat/ asdf', 'E492:')
 endfunc
+
+function s:complete_filter_cmd(filtcmd)
+  let keystroke = "\<TAB>\<C-R>=execute('let cmdline = getcmdline()')\<CR>\<C-C>"
+  let cmdline = ''
+  call feedkeys(':' . a:filtcmd . keystroke, 'ntx')
+  return cmdline
+endfunction
+
+func Test_filter_cmd_completion()
+  " Do not complete pattern
+  call assert_equal("filter \t", s:complete_filter_cmd('filter '))
+  call assert_equal("filter pat\t", s:complete_filter_cmd('filter pat'))
+  call assert_equal("filter /pat\t", s:complete_filter_cmd('filter /pat'))
+  call assert_equal("filter /pat/\t", s:complete_filter_cmd('filter /pat/'))
+
+  " Complete after string pattern
+  call assert_equal('filter pat print', s:complete_filter_cmd('filter pat pri'))
+
+  " Complete after regexp pattern
+  call assert_equal('filter /pat/ print', s:complete_filter_cmd('filter /pat/ pri'))
+  call assert_equal('filter #pat# print', s:complete_filter_cmd('filter #pat# pri'))
+endfunc

From 2b191ac5b9a18f31eadb4f14ed8a220d0c03ebdc Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 29 Apr 2017 22:09:09 -0400
Subject: [PATCH 209/257] lint

---
 src/nvim/buffer.c   |  7 ++++---
 src/nvim/ex_cmds.c  | 32 ++++++++++++++++++-------------
 src/nvim/ex_docmd.c | 46 ++++++++++++++++++++++-----------------------
 3 files changed, 46 insertions(+), 39 deletions(-)

diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c
index 5007cb5015..7def8c1684 100644
--- a/src/nvim/buffer.c
+++ b/src/nvim/buffer.c
@@ -2365,10 +2365,11 @@ void buflist_list(exarg_T *eap)
             && (buf == curbuf || curwin->w_alt_fnum != buf->b_fnum))) {
       continue;
     }
-    if (buf_spname(buf) != NULL)
+    if (buf_spname(buf) != NULL) {
       STRLCPY(NameBuff, buf_spname(buf), MAXPATHL);
-    else
-      home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, TRUE);
+    } else {
+      home_replace(buf, buf->b_fname, NameBuff, MAXPATHL, true);
+    }
 
     if (message_filtered(NameBuff)) {
       continue;
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c
index 1b2eb774c9..f73d4c16b6 100644
--- a/src/nvim/ex_cmds.c
+++ b/src/nvim/ex_cmds.c
@@ -6175,34 +6175,40 @@ char_u *skip_vimgrep_pat(char_u *p, char_u **s, int *flags)
 
   if (vim_isIDc(*p)) {
     // ":vimgrep pattern fname"
-    if (s != NULL)
+    if (s != NULL) {
       *s = p;
+    }
     p = skiptowhite(p);
-    if (s != NULL && *p != NUL)
+    if (s != NULL && *p != NUL) {
       *p++ = NUL;
+    }
   } else {
     // ":vimgrep /pattern/[g][j] fname"
-    if (s != NULL)
+    if (s != NULL) {
       *s = p + 1;
+    }
     c = *p;
-    p = skip_regexp(p + 1, c, TRUE, NULL);
-    if (*p != c)
+    p = skip_regexp(p + 1, c, true, NULL);
+    if (*p != c) {
       return NULL;
+    }
 
     // Truncate the pattern.
-    if (s != NULL)
+    if (s != NULL) {
       *p = NUL;
-    ++p;
+    }
+    p++;
 
     // Find the flags
     while (*p == 'g' || *p == 'j') {
       if (flags != NULL) {
-        if (*p == 'g')
+        if (*p == 'g') {
           *flags |= VGR_GLOBAL;
-        else
+        } else {
           *flags |= VGR_NOJUMP;
+        }
       }
-      ++p;
+      p++;
     }
   }
   return p;
@@ -6219,7 +6225,7 @@ void ex_oldfiles(exarg_T *eap)
     msg((char_u *)_("No old files"));
   } else {
     msg_start();
-    msg_scroll = TRUE;
+    msg_scroll = true;
     for (li = l->lv_first; li != NULL && !got_int; li = li->li_next) {
       nr++;
       const char *fname = tv_get_string(&li->li_tv);
@@ -6234,8 +6240,8 @@ void ex_oldfiles(exarg_T *eap)
       }
     }
 
-    /* Assume "got_int" was set to truncate the listing. */
-    got_int = FALSE;
+    // Assume "got_int" was set to truncate the listing.
+    got_int = false;
 
     // File selection prompt on ":browse oldfiles"
     if (cmdmod.browse) {
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index e844c89516..72b2e0f29b 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -2577,29 +2577,29 @@ static struct cmdmod {
   int minlen;
   int has_count;            /* :123verbose  :3tab */
 } cmdmods[] = {
-  {"aboveleft", 3, FALSE},
-  {"belowright", 3, FALSE},
-  {"botright", 2, FALSE},
-  {"browse", 3, FALSE},
-  {"confirm", 4, FALSE},
-  {"filter", 4, FALSE},
-  {"hide", 3, FALSE},
-  {"keepalt", 5, FALSE},
-  {"keepjumps", 5, FALSE},
-  {"keepmarks", 3, FALSE},
-  {"keeppatterns", 5, FALSE},
-  {"leftabove", 5, FALSE},
-  {"lockmarks", 3, FALSE},
-  {"noautocmd", 3, FALSE},
-  {"noswapfile", 3, FALSE},
-  {"rightbelow", 6, FALSE},
-  {"sandbox", 3, FALSE},
-  {"silent", 3, FALSE},
-  {"tab", 3, TRUE},
-  {"topleft", 2, FALSE},
-  {"unsilent", 3, FALSE},
-  {"verbose", 4, TRUE},
-  {"vertical", 4, FALSE},
+  { "aboveleft", 3, false },
+  { "belowright", 3, false },
+  { "botright", 2, false },
+  { "browse", 3, false },
+  { "confirm", 4, false },
+  { "filter", 4, false },
+  { "hide", 3, false },
+  { "keepalt", 5, false },
+  { "keepjumps", 5, false },
+  { "keepmarks", 3, false },
+  { "keeppatterns", 5, false },
+  { "leftabove", 5, false },
+  { "lockmarks", 3, false },
+  { "noautocmd", 3, false },
+  { "noswapfile", 3, false },
+  { "rightbelow", 6, false },
+  { "sandbox", 3, false },
+  { "silent", 3, false },
+  { "tab", 3, true },
+  { "topleft", 2, false },
+  { "unsilent", 3, false },
+  { "verbose", 4, true },
+  { "vertical", 4, false },
 };
 
 /*

From 4488bfcfb3c4abc71a78393595dc13f57a7cfbf0 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 29 Apr 2017 22:28:21 -0400
Subject: [PATCH 210/257] oldfiles_spec: Set the shada file in the session

---
 test/functional/ex_cmds/oldfiles_spec.lua | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/functional/ex_cmds/oldfiles_spec.lua b/test/functional/ex_cmds/oldfiles_spec.lua
index 656b3f9bae..601ede366d 100644
--- a/test/functional/ex_cmds/oldfiles_spec.lua
+++ b/test/functional/ex_cmds/oldfiles_spec.lua
@@ -5,12 +5,13 @@ local buf, eq, feed_command = helpers.curbufmeths, helpers.eq, helpers.feed_comm
 local feed, nvim_prog, wait = helpers.feed, helpers.nvim_prog, helpers.wait
 local ok, set_session, spawn = helpers.ok, helpers.set_session, helpers.spawn
 
-local shada_file = 'test.shada'
+local shada_file = 'Xtest.shada'
 
 local function _clear()
-  set_session(spawn({nvim_prog, '--embed', '-u', 'NONE', '--cmd',
+  set_session(spawn({nvim_prog, '--embed', '-u', 'NONE',
                      -- Need shada for these tests.
-                     'set noswapfile undodir=. directory=. viewdir=. backupdir=. belloff= noshowcmd noruler'}))
+                     '-i', shada_file,
+                     '--cmd', 'set noswapfile undodir=. directory=. viewdir=. backupdir=. belloff= noshowcmd noruler'}))
 end
 
 describe(':oldfiles', function()
@@ -29,8 +30,8 @@ describe(':oldfiles', function()
     screen:attach()
     feed_command('edit testfile1')
     feed_command('edit testfile2')
-    feed_command('wshada ' .. shada_file)
-    feed_command('rshada! ' .. shada_file)
+    feed_command('wshada')
+    feed_command('rshada!')
     local oldfiles = helpers.meths.get_vvar('oldfiles')
     feed_command('oldfiles')
     screen:expect([[
@@ -54,10 +55,9 @@ describe(':browse oldfiles', function()
     filename = buf.get_name()
     feed_command('edit testfile2')
     filename2 = buf.get_name()
-    feed_command('wshada ' .. shada_file)
+    feed_command('wshada')
     wait()
     _clear()
-    feed_command('rshada! ' .. shada_file)
 
     -- Ensure nvim is out of "Press ENTER..." prompt.
     feed('<cr>')

From 35d817e68c9d1f2fd724bf00ad6f1958a0c815a9 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Sat, 29 Apr 2017 23:46:57 -0400
Subject: [PATCH 211/257] oldfiles_spec: Add tests for ":filter ... oldfiles"

---
 test/functional/ex_cmds/oldfiles_spec.lua | 33 +++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/test/functional/ex_cmds/oldfiles_spec.lua b/test/functional/ex_cmds/oldfiles_spec.lua
index 601ede366d..4002855c24 100644
--- a/test/functional/ex_cmds/oldfiles_spec.lua
+++ b/test/functional/ex_cmds/oldfiles_spec.lua
@@ -4,6 +4,7 @@ local helpers = require('test.functional.helpers')(after_each)
 local buf, eq, feed_command = helpers.curbufmeths, helpers.eq, helpers.feed_command
 local feed, nvim_prog, wait = helpers.feed, helpers.nvim_prog, helpers.wait
 local ok, set_session, spawn = helpers.ok, helpers.set_session, helpers.spawn
+local eval = helpers.eval
 
 local shada_file = 'Xtest.shada'
 
@@ -42,6 +43,38 @@ describe(':oldfiles', function()
       Press ENTER or type command to continue^                                                             |
     ]])
   end)
+
+  it('can be filtered with :filter', function()
+    feed_command('edit file_one.txt')
+    local file1 = buf.get_name()
+    feed_command('edit file_two.txt')
+    local file2 = buf.get_name()
+    feed_command('edit another.txt')
+    local another = buf.get_name()
+    feed_command('wshada')
+    feed_command('rshada!')
+
+    local function get_oldfiles(cmd)
+      local t = eval([[split(execute(']]..cmd..[['), "\n")]])
+      for i, _ in ipairs(t) do
+        t[i] = t[i]:gsub('^%d+:%s+', '')
+      end
+      table.sort(t)
+      return t
+    end
+
+    local oldfiles = get_oldfiles('oldfiles')
+    eq({another, file1, file2}, oldfiles)
+
+    oldfiles = get_oldfiles('filter file_ oldfiles')
+    eq({file1, file2}, oldfiles)
+
+    oldfiles = get_oldfiles('filter /another/ oldfiles')
+    eq({another}, oldfiles)
+
+    oldfiles = get_oldfiles('filter! file_ oldfiles')
+    eq({another}, oldfiles)
+  end)
 end)
 
 describe(':browse oldfiles', function()

From 97126bfa020f714d78e5e6f82b59c697ce7dd467 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Linse?= <bjorn.linse@gmail.com>
Date: Sun, 30 Apr 2017 09:16:11 +0200
Subject: [PATCH 212/257] api: deprecate obsolete nvim_buf_get_number function

---
 runtime/doc/msgpack_rpc.txt | 5 ++++-
 scripts/gendispatch.lua     | 6 ++++++
 src/nvim/api/buffer.c       | 4 ++++
 src/nvim/func_attr.h        | 1 +
 4 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/runtime/doc/msgpack_rpc.txt b/runtime/doc/msgpack_rpc.txt
index 261e68cfb1..c5c0392d96 100644
--- a/runtime/doc/msgpack_rpc.txt
+++ b/runtime/doc/msgpack_rpc.txt
@@ -221,7 +221,10 @@ Special types (msgpack EXT) ~
 
 An API method expecting one of these types may be passed an integer instead,
 although they are not interchangeable. For example, a Buffer may be passed as
-an integer, but not a Window or Tabpage.
+an integer, but not as a Window or Tabpage. The data in the EXT object is the
+object id encodes as a msgpack integer. For buffers this is equal to the
+buffer number and for windows the window id. For tabpages this is not equal to
+tabpage numbers.
 
 The most reliable way of determining the type codes for the special Nvim types
 is to inspect the `types` key of metadata dictionary returned by the
diff --git a/scripts/gendispatch.lua b/scripts/gendispatch.lua
index 0ee3ae6475..c0291c55d3 100644
--- a/scripts/gendispatch.lua
+++ b/scripts/gendispatch.lua
@@ -37,6 +37,8 @@ c_proto = Ct(
   fill * P('(') * fill * Cg(c_params, 'parameters') * fill * P(')') *
   Cg(Cc(false), 'async') *
   (fill * Cg((P('FUNC_API_SINCE(') * C(num ^ 1)) * P(')'), 'since') ^ -1) *
+  (fill * Cg((P('FUNC_API_DEPRECATED_SINCE(') * C(num ^ 1)) * P(')'),
+              'deprecated_since') ^ -1) *
   (fill * Cg((P('FUNC_API_ASYNC') * Cc(true)), 'async') ^ -1) *
   (fill * Cg((P('FUNC_API_NOEXPORT') * Cc(true)), 'noexport') ^ -1) *
   (fill * Cg((P('FUNC_API_NOEVAL') * Cc(true)), 'noeval') ^ -1) *
@@ -122,6 +124,10 @@ for i,f in ipairs(shallowcopy(functions)) do
       os.exit(1)
     end
     f.since = tonumber(f.since)
+    if f.deprecated_since ~= nil then
+      f.deprecated_since = tonumber(f.deprecated_since)
+    end
+
     if startswith(f.name, "nvim_buf_") then
       ismethod = true
     elseif startswith(f.name, "nvim_win_") then
diff --git a/src/nvim/api/buffer.c b/src/nvim/api/buffer.c
index ae5728ee21..5de1535bce 100644
--- a/src/nvim/api/buffer.c
+++ b/src/nvim/api/buffer.c
@@ -567,11 +567,15 @@ void nvim_buf_set_option(Buffer buffer, String name, Object value, Error *err)
 
 /// Gets the buffer number
 ///
+/// @deprecated The buffer number now is equal to the object id,
+///             so there is no need to use this function.
+///
 /// @param buffer     Buffer handle
 /// @param[out] err   Error details, if any
 /// @return Buffer number
 Integer nvim_buf_get_number(Buffer buffer, Error *err)
     FUNC_API_SINCE(1)
+    FUNC_API_DEPRECATED_SINCE(2)
 {
   Integer rv = 0;
   buf_T *buf = find_buffer_by_handle(buffer, err);
diff --git a/src/nvim/func_attr.h b/src/nvim/func_attr.h
index 18410445e1..756c6d05ee 100644
--- a/src/nvim/func_attr.h
+++ b/src/nvim/func_attr.h
@@ -187,6 +187,7 @@
 # define FUNC_API_NOEXPORT
 # define FUNC_API_NOEVAL
 # define FUNC_API_SINCE(X)
+# define FUNC_API_DEPRECATED_SINCE(X)
 # define FUNC_ATTR_MALLOC REAL_FATTR_MALLOC
 # define FUNC_ATTR_ALLOC_SIZE(x) REAL_FATTR_ALLOC_SIZE(x)
 # define FUNC_ATTR_ALLOC_SIZE_PROD(x, y) REAL_FATTR_ALLOC_SIZE_PROD(x, y)

From d349f610ac9010cecb550c33fbab632b4e7946ca Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 26 Apr 2017 01:43:03 +0200
Subject: [PATCH 213/257] 'guicursor': No color/blink by default

Closes #6577
---
 runtime/doc/options.txt            |  36 ++++----
 src/nvim/cursor_shape.c            |   6 +-
 src/nvim/options.lua               |   2 +-
 src/nvim/tui/tui.c                 |   4 +-
 test/functional/ui/cursor_spec.lua | 141 ++++++++++++++++++-----------
 5 files changed, 109 insertions(+), 80 deletions(-)

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 93ab956471..d3683f5135 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -2756,23 +2756,24 @@ A jump table for the options with a short description can be found at |Q_op|.
 	security reasons.
 
 			*'guicursor'* *'gcr'* *E545* *E546* *E548* *E549*
-'guicursor' 'gcr'	string	(default "n-v-c:block-Cursor/lCursor,
-					ve:ver35-Cursor,
-					o:hor50-Cursor,
-					i-ci:ver25-Cursor/lCursor,
-					r-cr:hor20-Cursor/lCursor,
-					sm:block-Cursor
-					-blinkwait175-blinkoff150-blinkon175")
+'guicursor' 'gcr'	string	(default "n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20")
 			global
 	Configures the cursor style for each mode. Works in the GUI and some
-	terminals. Unset to disable: >
-		:set guicursor=
-<
+	terminals.
+
 	With tmux you might need this in ~/.tmux.conf (see terminal-overrides
 	in the tmux(1) manual page): >
 		set -ga terminal-overrides ',*:Ss=\E[%p1%d q:Se=\E[2 q'
-<
-	The option is a comma separated list of parts.  Each part consists of a
+
+<	To disable cursor-styling, reset the option: >
+		:set guicursor=
+
+<	To enable mode shapes, "Cursor" highlight, and blinking: >
+		:set guicursor=n-v-c:block,i-ci-ve:ver25,r-cr:hor20,o:hor50
+		  \,a:blinkwait700-blinkoff400-blinkon250-Cursor/lCursor
+		  \,sm:block-blinkwait175-blinkoff150-blinkon175
+
+<	The option is a comma separated list of parts.  Each part consists of a
 	mode-list and an argument-list:
 		mode-list:argument-list,mode-list:argument-list,..
 	The mode-list is a dash separated list of these modes:
@@ -2800,14 +2801,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 			the cursor starts blinking, blinkon is the time that
 			the cursor is shown and blinkoff is the time that the
 			cursor is not shown.  The times are in msec.  When one
-			of the numbers is zero, there is no blinking.  The
-			default is: "blinkwait700-blinkon400-blinkoff250".
-			These numbers are used for a missing entry.  This
-			means that blinking is enabled by default.  To switch
-			blinking off you can use "blinkon0".  The cursor only
-			blinks when Vim is waiting for input, not while
-			executing a command.
-		{group-name}
+			of the numbers is zero, there is no blinking. E.g.: >
+				:set guicursor=n:blinkon0
+<		{group-name}
 			a highlight group name, that sets the color and font
 			for the cursor
 		{group-name}/{group-name}
diff --git a/src/nvim/cursor_shape.c b/src/nvim/cursor_shape.c
index dcc680f806..e302d5aa4c 100644
--- a/src/nvim/cursor_shape.c
+++ b/src/nvim/cursor_shape.c
@@ -142,9 +142,9 @@ char_u *parse_shape_opt(int what)
           {
             // Set the defaults, for the missing parts
             shape_table[idx].shape = SHAPE_BLOCK;
-            shape_table[idx].blinkwait = 700L;
-            shape_table[idx].blinkon = 400L;
-            shape_table[idx].blinkoff = 250L;
+            shape_table[idx].blinkwait = 0L;
+            shape_table[idx].blinkon = 0L;
+            shape_table[idx].blinkoff = 0L;
           }
         }
 
diff --git a/src/nvim/options.lua b/src/nvim/options.lua
index 4e7be63b63..ba7bf5bafb 100644
--- a/src/nvim/options.lua
+++ b/src/nvim/options.lua
@@ -1000,7 +1000,7 @@ return {
       deny_duplicates=true,
       vi_def=true,
       varname='p_guicursor',
-      defaults={if_true={vi="n-v-c:block-Cursor/lCursor,ve:ver35-Cursor,o:hor50-Cursor,i-ci:ver25-Cursor/lCursor,r-cr:hor20-Cursor/lCursor,sm:block-Cursor-blinkwait175-blinkoff150-blinkon175"}}
+      defaults={if_true={vi="n-v-c-sm:block,i-ci-ve:ver25,r-cr-o:hor20"}}
     },
     {
       full_name='guifont', abbreviation='gfn',
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index 5653924154..d07f43f597 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -575,11 +575,11 @@ static void tui_set_mode(UI *ui, ModeShape mode)
 
     switch (shape) {
       case SHAPE_BLOCK: shape = 1; break;
-      case SHAPE_VER:   shape = 5; break;
       case SHAPE_HOR:   shape = 3; break;
+      case SHAPE_VER:   shape = 5; break;
       default: WLOG("Unknown shape value %d", shape); break;
     }
-    data->params[0].i = shape + (c.blinkon ==0);
+    data->params[0].i = shape + (int)(c.blinkon == 0);
     unibi_format(vars, vars + 26, "\x1b[%p1%d q",
                  data->params, out, ui, NULL, NULL);
   }
diff --git a/test/functional/ui/cursor_spec.lua b/test/functional/ui/cursor_spec.lua
index abe0e0b1fd..e6036a6b79 100644
--- a/test/functional/ui/cursor_spec.lua
+++ b/test/functional/ui/cursor_spec.lua
@@ -20,102 +20,102 @@ describe('ui/cursor', function()
   it("'guicursor' is published as a UI event", function()
     local expected_mode_info = {
       [1] = {
-        blinkoff = 250,
-        blinkon = 400,
-        blinkwait = 700,
+        blinkoff = 0,
+        blinkon = 0,
+        blinkwait = 0,
         cell_percentage = 0,
         cursor_shape = 'block',
         name = 'normal',
-        hl_id = 46,
-        id_lm = 47,
+        hl_id = 0,
+        id_lm = 0,
         mouse_shape = 0,
         short_name = 'n' },
       [2] = {
-        blinkoff = 250,
-        blinkon = 400,
-        blinkwait = 700,
+        blinkoff = 0,
+        blinkon = 0,
+        blinkwait = 0,
         cell_percentage = 0,
         cursor_shape = 'block',
         name = 'visual',
-        hl_id = 46,
-        id_lm = 47,
+        hl_id = 0,
+        id_lm = 0,
         mouse_shape = 0,
         short_name = 'v' },
       [3] = {
-        blinkoff = 250,
-        blinkon = 400,
-        blinkwait = 700,
+        blinkoff = 0,
+        blinkon = 0,
+        blinkwait = 0,
         cell_percentage = 25,
         cursor_shape = 'vertical',
         name = 'insert',
-        hl_id = 46,
-        id_lm = 47,
+        hl_id = 0,
+        id_lm = 0,
         mouse_shape = 0,
         short_name = 'i' },
       [4] = {
-        blinkoff = 250,
-        blinkon = 400,
-        blinkwait = 700,
+        blinkoff = 0,
+        blinkon = 0,
+        blinkwait = 0,
         cell_percentage = 20,
         cursor_shape = 'horizontal',
         name = 'replace',
-        hl_id = 46,
-        id_lm = 47,
+        hl_id = 0,
+        id_lm = 0,
         mouse_shape = 0,
         short_name = 'r' },
       [5] = {
-        blinkoff = 250,
-        blinkon = 400,
-        blinkwait = 700,
+        blinkoff = 0,
+        blinkon = 0,
+        blinkwait = 0,
         cell_percentage = 0,
         cursor_shape = 'block',
         name = 'cmdline_normal',
-        hl_id = 46,
-        id_lm = 47,
+        hl_id = 0,
+        id_lm = 0,
         mouse_shape = 0,
         short_name = 'c' },
       [6] = {
-        blinkoff = 250,
-        blinkon = 400,
-        blinkwait = 700,
+        blinkoff = 0,
+        blinkon = 0,
+        blinkwait = 0,
         cell_percentage = 25,
         cursor_shape = 'vertical',
         name = 'cmdline_insert',
-        hl_id = 46,
-        id_lm = 47,
+        hl_id = 0,
+        id_lm = 0,
         mouse_shape = 0,
         short_name = 'ci' },
       [7] = {
-        blinkoff = 250,
-        blinkon = 400,
-        blinkwait = 700,
+        blinkoff = 0,
+        blinkon = 0,
+        blinkwait = 0,
         cell_percentage = 20,
         cursor_shape = 'horizontal',
         name = 'cmdline_replace',
-        hl_id = 46,
-        id_lm = 47,
+        hl_id = 0,
+        id_lm = 0,
         mouse_shape = 0,
         short_name = 'cr' },
       [8] = {
-        blinkoff = 250,
-        blinkon = 400,
-        blinkwait = 700,
-        cell_percentage = 50,
+        blinkoff = 0,
+        blinkon = 0,
+        blinkwait = 0,
+        cell_percentage = 20,
         cursor_shape = 'horizontal',
         name = 'operator',
-        hl_id = 46,
-        id_lm = 46,
+        hl_id = 0,
+        id_lm = 0,
         mouse_shape = 0,
         short_name = 'o' },
       [9] = {
-        blinkoff = 250,
-        blinkon = 400,
-        blinkwait = 700,
-        cell_percentage = 35,
+        blinkoff = 0,
+        blinkon = 0,
+        blinkwait = 0,
+        cell_percentage = 25,
         cursor_shape = 'vertical',
         name = 'visual_select',
-        hl_id = 46,
-        id_lm = 46,
+        hl_id = 0,
+        id_lm = 0,
         mouse_shape = 0,
         short_name = 've' },
       [10] = {
@@ -147,19 +147,19 @@ describe('ui/cursor', function()
         mouse_shape = 0,
         short_name = 'ml' },
       [17] = {
-        blinkoff = 150,
-        blinkon = 175,
-        blinkwait = 175,
+        blinkoff = 0,
+        blinkon = 0,
+        blinkwait = 0,
         cell_percentage = 0,
         cursor_shape = 'block',
         name = 'showmatch',
-        hl_id = 46,
-        id_lm = 46,
+        hl_id = 0,
+        id_lm = 0,
         short_name = 'sm' },
       }
 
     screen:expect(function()
-      -- Default 'guicursor' published on startup.
+      -- Default 'guicursor', published on startup.
       eq(expected_mode_info, screen._mode_info)
       eq(true, screen._cursor_style_enabled)
       eq('normal', screen.mode)
@@ -179,20 +179,53 @@ describe('ui/cursor', function()
     end)
 
     -- Change the cursor style.
-    meths.set_option('guicursor', 'n-v-c:ver35-blinkwait171-blinkoff172-blinkon173,ve:hor35,o:ver50,i-ci:block,r-cr:hor90,sm:ver42')
+    helpers.command('set guicursor=n-v-c:block,i-ci-ve:ver25,r-cr-o:hor20'
+      ..',a:blinkwait700-blinkoff400-blinkon250-Cursor/lCursor'
+      ..',sm:block-blinkwait175-blinkoff150-blinkon175')
+
+    -- Update the expected values.
+    for _, m in ipairs(expected_mode_info) do
+      if m.name == 'showmatch' then
+        if m.blinkon then m.blinkon = 175 end
+        if m.blinkoff then m.blinkoff = 150 end
+        if m.blinkwait then m.blinkwait = 175 end
+      else
+        if m.blinkon then m.blinkon = 250 end
+        if m.blinkoff then m.blinkoff = 400 end
+        if m.blinkwait then m.blinkwait = 700 end
+      end
+      if m.hl_id then m.hl_id = 46 end
+      if m.id_lm then m.id_lm = 47 end
+    end
+
+    -- Assert the new expectation.
+    screen:expect(function()
+      eq(expected_mode_info, screen._mode_info)
+      eq(true, screen._cursor_style_enabled)
+      eq('normal', screen.mode)
+    end)
+
+    -- Another cursor style.
+    meths.set_option('guicursor', 'n-v-c:ver35-blinkwait171-blinkoff172-blinkon173'
+      ..',ve:hor35,o:ver50,i-ci:block,r-cr:hor90,sm:ver42')
     screen:expect(function()
       local named = {}
       for _, m in ipairs(screen._mode_info) do
         named[m.name] = m
       end
       eq('vertical', named.normal.cursor_shape)
+      eq(35, named.normal.cell_percentage)
       eq('horizontal', named.visual_select.cursor_shape)
+      eq(35, named.visual_select.cell_percentage)
       eq('vertical', named.operator.cursor_shape)
+      eq(50, named.operator.cell_percentage)
       eq('block', named.insert.cursor_shape)
       eq('vertical', named.showmatch.cursor_shape)
+      eq(90, named.cmdline_replace.cell_percentage)
       eq(171, named.normal.blinkwait)
       eq(172, named.normal.blinkoff)
       eq(173, named.normal.blinkon)
+      eq(42, named.showmatch.cell_percentage)
     end)
   end)
 

From c1d3bcc1842d7ca4edb514ef162696afd910f532 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 30 Apr 2017 13:22:44 +0200
Subject: [PATCH 214/257] 'guicursor': TMUX_WRAP iTerm seqs. Do color seq
 before shape seq.

---
 src/nvim/tui/tui.c | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index d07f43f597..522f7d59f2 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -44,6 +44,7 @@
 
 #define TOO_MANY_EVENTS 1000000
 #define STARTS_WITH(str, prefix) (!memcmp(str, prefix, sizeof(prefix) - 1))
+#define TMUX_WRAP(seq) (is_tmux ? "\x1bPtmux;\x1b" seq "\x1b\\" : seq)
 
 typedef enum TermType {
   kTermUnknown,
@@ -95,6 +96,7 @@ typedef struct {
 
 static bool volatile got_winch = false;
 static bool cursor_style_enabled = false;
+static bool is_tmux = false;
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "tui/tui.c.generated.h"
@@ -545,13 +547,20 @@ static void tui_set_mode(UI *ui, ModeShape mode)
   TUIData *data = ui->data;
   cursorentry_T c = data->cursor_shapes[mode];
   int shape = c.shape;
-  bool is_tmux = os_getenv("TMUX") != NULL;
   unibi_var_t vars[26 + 26] = { { 0 } };
 
-# define TMUX_WRAP(seq) (is_tmux ? "\x1bPtmux;\x1b" seq "\x1b\\" : seq)
   // Support changing cursor shape on some popular terminals.
   const char *vte_version = os_getenv("VTE_VERSION");
 
+  if (c.id != 0 && ui->rgb) {
+    int attr = syn_id2attr(c.id);
+    if (attr > 0) {
+      attrentry_T *aep = syn_cterm_attr2entry(attr);
+      data->params[0].i = aep->rgb_bg_color;
+      unibi_out(ui, data->unibi_ext.set_cursor_color);
+    }
+  }
+
   if (data->term == kTermKonsole) {
     // Konsole uses a proprietary escape code to set the cursor shape
     // and does not support DECSCUSR.
@@ -583,15 +592,6 @@ static void tui_set_mode(UI *ui, ModeShape mode)
     unibi_format(vars, vars + 26, "\x1b[%p1%d q",
                  data->params, out, ui, NULL, NULL);
   }
-
-  if (c.id != 0 && ui->rgb) {
-    int attr = syn_id2attr(c.id);
-    if (attr > 0) {
-      attrentry_T *aep = syn_cterm_attr2entry(attr);
-      data->params[0].i = aep->rgb_bg_color;
-      unibi_out(ui, data->unibi_ext.set_cursor_color);
-    }
-  }
 }
 
 /// @param mode editor mode
@@ -952,6 +952,7 @@ static TermType detect_term(const char *term, const char *colorterm)
 static void fix_terminfo(TUIData *data)
 {
   unibi_term *ut = data->ut;
+  is_tmux = os_getenv("TMUX") != NULL;
 
   const char *term = os_getenv("TERM");
   const char *colorterm = os_getenv("COLORTERM");
@@ -1019,7 +1020,7 @@ end:
   // Fill some empty slots with common terminal strings
   if (data->term == kTermiTerm) {
     data->unibi_ext.set_cursor_color = (int)unibi_add_ext_str(
-        ut, NULL, "\033]Pl%p1%06x\033\\");
+        ut, NULL, TMUX_WRAP("\033]Pl%p1%06x\033\\"));
   } else {
     data->unibi_ext.set_cursor_color = (int)unibi_add_ext_str(
         ut, NULL, "\033]12;#%p1%06x\007");

From e5b640fdb84c4a5c45be178182cda97262efba00 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 30 Apr 2017 22:08:51 +0200
Subject: [PATCH 215/257] vim-patch:c0514bf4777a

Updated runtime files.

https://github.com/vim/vim/commit/c0514bf4777a1d55f5785b3887c5686fd0bbe870
---
 runtime/compiler/csslint.vim | 16 ++++++++++++++++
 runtime/compiler/pylint.vim  | 16 ++++++++++++++++
 runtime/doc/pi_gzip.txt      |  1 +
 runtime/doc/scroll.txt       |  3 ++-
 runtime/indent/fortran.vim   | 12 ++++++------
 runtime/plugin/gzip.vim      |  6 +++++-
 runtime/syntax/c.vim         |  4 ++--
 runtime/syntax/fortran.vim   | 10 ++++++----
 8 files changed, 54 insertions(+), 14 deletions(-)
 create mode 100644 runtime/compiler/csslint.vim
 create mode 100644 runtime/compiler/pylint.vim

diff --git a/runtime/compiler/csslint.vim b/runtime/compiler/csslint.vim
new file mode 100644
index 0000000000..14c4289a24
--- /dev/null
+++ b/runtime/compiler/csslint.vim
@@ -0,0 +1,16 @@
+" Vim compiler file
+" Compiler:	csslint for CSS
+" Maintainer: Daniel Moch <daniel@danielmoch.com>
+" Last Change: 2016 May 21
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "csslint"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=csslint\ --format=compact
+CompilerSet errorformat=%-G,%-G%f:\ lint\ free!,%f:\ line\ %l\\,\ col\ %c\\,\ %trror\ -\ %m,%f:\ line\ %l\\,\ col\ %c\\,\ %tarning\ -\ %m,%f:\ line\ %l\\,\ col\ %c\\,\ %m
diff --git a/runtime/compiler/pylint.vim b/runtime/compiler/pylint.vim
new file mode 100644
index 0000000000..93079ce61d
--- /dev/null
+++ b/runtime/compiler/pylint.vim
@@ -0,0 +1,16 @@
+" Vim compiler file
+" Compiler:	Pylint for Python
+" Maintainer: Daniel Moch <daniel@danielmoch.com>
+" Last Change: 2016 May 20
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "pylint"
+
+if exists(":CompilerSet") != 2		" older Vim always used :setlocal
+  command -nargs=* CompilerSet setlocal <args>
+endif
+
+CompilerSet makeprg=pylint\ --output-format=text\ --msg-template=\"{path}:{line}:{column}:{C}:\ [{symbol}]\ {msg}\"\ --reports=no
+CompilerSet errorformat=%A%f:%l:%c:%t:\ %m,%A%f:%l:\ %m,%A%f:(%l):\ %m,%-Z%p^%.%#,%-G%.%#
diff --git a/runtime/doc/pi_gzip.txt b/runtime/doc/pi_gzip.txt
index a2497c89f9..f024db1260 100644
--- a/runtime/doc/pi_gzip.txt
+++ b/runtime/doc/pi_gzip.txt
@@ -26,6 +26,7 @@ with these extensions:
 	*.lzma		lzma
 	*.xz		xz
 	*.lz		lzip
+	*.zst		zstd
 
 That's actually the only thing you need to know.  There are no options.
 
diff --git a/runtime/doc/scroll.txt b/runtime/doc/scroll.txt
index fba5275f47..93c704a8ba 100644
--- a/runtime/doc/scroll.txt
+++ b/runtime/doc/scroll.txt
@@ -108,7 +108,8 @@ z^			Without [count]: Redraw with the line just above the
 3. Scrolling relative to cursor				*scroll-cursor*
 
 The following commands reposition the edit window (the part of the buffer that
-you see) while keeping the cursor on the same line:
+you see) while keeping the cursor on the same line.  Note that the 'scrolloff'
+option may cause context lines to show above and below the cursor.
 
 							*z<CR>*
 z<CR>			Redraw, line [count] at top of window (default
diff --git a/runtime/indent/fortran.vim b/runtime/indent/fortran.vim
index c9bee78a6e..2ba69e86df 100644
--- a/runtime/indent/fortran.vim
+++ b/runtime/indent/fortran.vim
@@ -1,7 +1,7 @@
 " Vim indent file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
-" Version:	0.46
-" Last Change:	2016 Sep. 27
+" Version:	47
+" Last Change:	2016 Oct. 29
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
 " Usage:	For instructions, do :help fortran-indent from Vim
 " Credits:
@@ -100,9 +100,9 @@ function FortranGetIndent(lnum)
     endif
   endif
 
-  "Add a shiftwidth to statements following if, else, else if, case,
+  "Add a shiftwidth to statements following if, else, else if, case, class,
   "where, else where, forall, type, interface and associate statements
-  if prevstat =~? '^\s*\(case\|else\|else\s*if\|else\s*where\)\>'
+  if prevstat =~? '^\s*\(case\|class\|else\|else\s*if\|else\s*where\)\>'
 	\ ||prevstat=~? '^\s*\(type\|interface\|associate\|enum\)\>'
 	\ ||prevstat=~?'^\s*\(\d\+\s\)\=\s*\(\a\w*\s*:\)\=\s*\(forall\|where\|block\)\>'
 	\ ||prevstat=~? '^\s*\(\d\+\s\)\=\s*\(\a\w*\s*:\)\=\s*if\>'
@@ -136,11 +136,11 @@ function FortranGetIndent(lnum)
     endif
   endif
 
-  "Subtract a shiftwidth from else, else if, elsewhere, case, end if,
+  "Subtract a shiftwidth from else, else if, elsewhere, case, class, end if,
   " end where, end select, end forall, end interface, end associate,
   " end enum, end type, end block and end type statements
   if getline(v:lnum) =~? '^\s*\(\d\+\s\)\=\s*'
-        \. '\(else\|else\s*if\|else\s*where\|case\|'
+        \. '\(else\|else\s*if\|else\s*where\|case\|class\|'
         \. 'end\s*\(if\|where\|select\|interface\|'
         \. 'type\|forall\|associate\|enum\|block\)\)\>'
     let ind = ind - shiftwidth()
diff --git a/runtime/plugin/gzip.vim b/runtime/plugin/gzip.vim
index f7ee9dc510..5e13b92d1e 100644
--- a/runtime/plugin/gzip.vim
+++ b/runtime/plugin/gzip.vim
@@ -20,29 +20,33 @@ augroup gzip
   "
   " Set binary mode before reading the file.
   " Use "gzip -d", gunzip isn't always available.
-  autocmd BufReadPre,FileReadPre	*.gz,*.bz2,*.Z,*.lzma,*.xz,*.lz setlocal bin
+  autocmd BufReadPre,FileReadPre	*.gz,*.bz2,*.Z,*.lzma,*.xz,*.lz,*.zst setlocal bin
   autocmd BufReadPost,FileReadPost	*.gz  call gzip#read("gzip -dn")
   autocmd BufReadPost,FileReadPost	*.bz2 call gzip#read("bzip2 -d")
   autocmd BufReadPost,FileReadPost	*.Z   call gzip#read("uncompress")
   autocmd BufReadPost,FileReadPost	*.lzma call gzip#read("lzma -d")
   autocmd BufReadPost,FileReadPost	*.xz  call gzip#read("xz -d")
   autocmd BufReadPost,FileReadPost	*.lz  call gzip#read("lzip -d")
+  autocmd BufReadPost,FileReadPost	*.zst call gzip#read("zstd -d --rm")
   autocmd BufWritePost,FileWritePost	*.gz  call gzip#write("gzip")
   autocmd BufWritePost,FileWritePost	*.bz2 call gzip#write("bzip2")
   autocmd BufWritePost,FileWritePost	*.Z   call gzip#write("compress -f")
   autocmd BufWritePost,FileWritePost	*.lzma call gzip#write("lzma -z")
   autocmd BufWritePost,FileWritePost	*.xz  call gzip#write("xz -z")
   autocmd BufWritePost,FileWritePost	*.lz  call gzip#write("lzip")
+  autocmd BufWritePost,FileWritePost	*.zst  call gzip#write("zstd --rm")
   autocmd FileAppendPre			*.gz  call gzip#appre("gzip -dn")
   autocmd FileAppendPre			*.bz2 call gzip#appre("bzip2 -d")
   autocmd FileAppendPre			*.Z   call gzip#appre("uncompress")
   autocmd FileAppendPre			*.lzma call gzip#appre("lzma -d")
   autocmd FileAppendPre			*.xz   call gzip#appre("xz -d")
   autocmd FileAppendPre			*.lz   call gzip#appre("lzip -d")
+  autocmd FileAppendPre			*.zst call gzip#appre("zstd -d --rm")
   autocmd FileAppendPost		*.gz  call gzip#write("gzip")
   autocmd FileAppendPost		*.bz2 call gzip#write("bzip2")
   autocmd FileAppendPost		*.Z   call gzip#write("compress -f")
   autocmd FileAppendPost		*.lzma call gzip#write("lzma -z")
   autocmd FileAppendPost		*.xz call gzip#write("xz -z")
   autocmd FileAppendPost		*.lz call gzip#write("lzip")
+  autocmd FileAppendPost		*.zst call gzip#write("zstd --rm")
 augroup END
diff --git a/runtime/syntax/c.vim b/runtime/syntax/c.vim
index 2b946dd73d..cc99f674a1 100644
--- a/runtime/syntax/c.vim
+++ b/runtime/syntax/c.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	C
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Oct 27
+" Last Change:	2016 Nov 17
 
 " Quit when a (custom) syntax file was already loaded
 if exists("b:current_syntax")
@@ -365,7 +365,7 @@ if !exists("c_no_if0")
   syn region	cCppOutWrapper	start="^\s*\zs\(%:\|#\)\s*if\s\+0\+\s*\($\|//\|/\*\|&\)" end=".\@=\|$" contains=cCppOutIf,cCppOutElse,@NoSpell fold
   syn region	cCppOutIf	contained start="0\+" matchgroup=cCppOutWrapper end="^\s*\zs\(%:\|#\)\s*endif\>" contains=cCppOutIf2,cCppOutElse
   if !exists("c_no_if0_fold")
-    syn region	cCppOutIf2	contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\zs\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell fold
+    syn region	cCppOutIf2	contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell fold
   else
     syn region	cCppOutIf2	contained matchgroup=cCppOutWrapper start="0\+" end="^\s*\(%:\|#\)\s*\(else\>\|elif\s\+\(0\+\s*\($\|//\|/\*\|&\)\)\@!\|endif\>\)"me=s-1 contains=cSpaceError,cCppOutSkip,@Spell
   endif
diff --git a/runtime/syntax/fortran.vim b/runtime/syntax/fortran.vim
index 9d9ab69a3a..4c26e78f16 100644
--- a/runtime/syntax/fortran.vim
+++ b/runtime/syntax/fortran.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language:	Fortran 2008 (and older: Fortran 2003, 95, 90, and 77)
-" Version:	0.99
-" Last Change:	2016 Sep. 23
+" Version:	100
+" Last Change:	2016 Oct. 29
 " Maintainer:	Ajit J. Thakkar <ajit@unb.ca>; <http://www2.unb.ca/~ajit/>
 " Usage:	For instructions, do :help fortran-syntax from Vim
 " Credits:
@@ -397,6 +397,7 @@ if exists("fortran_fold")
     syn region fortranFunction transparent fold keepend extend start="^\s*\(elemental \|pure \|impure \|module \|recursive \)\=\s*\(\(\(real \|integer \|logical \|complex \|double \s*precision \)\s*\((\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\|type\s\+(\s*\w\+\s*) \|character \((\(\s*len\s*=\)\=\s*\d\+\s*)\|(\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\=\s*function\s\+\z(\a\w*\)" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*\($\|function\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule
     syn region fortranSubroutine transparent fold keepend extend start="^\s*\(elemental \|pure \|impure \|module \|recursive \)\=\s*subroutine\s\+\z(\a\w*\)" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*\($\|subroutine\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule
     syn region fortranBlockData transparent fold keepend start="\<block\s*data\(\s\+\z(\a\w*\)\)\=" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*\($\|block\s*data\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
+    syn region fortranAssociate transparent fold keepend start="^\s*\<associate\s\+" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*associate" contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction
     syn region fortranInterface transparent fold keepend extend start="^\s*\(abstract \)\=\s*interface\>" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*interface\>" contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
     syn region fortranTypeDef transparent fold keepend extend start="^\s*type\s*\(,\s*\(public\|private\|abstract\)\)\=\s*::" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*type\>" contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock,fortranInterface
   else
@@ -406,6 +407,7 @@ if exists("fortran_fold")
     syn region fortranFunction transparent fold keepend extend start="^\s*\(elemental \|pure \|impure \|module \|recursive \)\=\s*\(\(\(real \|integer \|logical \|complex \|double \s*precision \)\s*\((\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\|type\s\+(\s*\w\+\s*) \|character \((\(\s*len\s*=\)\=\s*\d\+\s*)\|(\(\s*kind\s*=\)\=\s*\w\+\s*)\)\=\)\=\s*function\s\+\z(\a\w*\)" skip="^\s*[!#].*$" excludenl end="\<end\s*\($\|function\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule
     syn region fortranSubroutine transparent fold keepend extend start="^\s*\(elemental \|pure \|impure \|module \|recursive \)\=\s*subroutine\s\+\z(\a\w*\)" skip="^\s*[!#].*$" excludenl end="\<end\s*\($\|subroutine\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule
     syn region fortranBlockData transparent fold keepend start="\<block\s*data\(\s\+\z(\a\w*\)\)\=" skip="^\s*[!#].*$" excludenl end="\<end\s*\($\|block\s*data\(\s\+\z1\>\)\=\)" contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
+    syn region fortranAssociate transparent fold keepend start="^\s*\<associate\s\+" skip="^\s*[!#].*$" excludenl end="\<end\s*associate" contains=ALLBUT,fortranProgram,fortranModule,fortranSubroutine,fortranFunction
     syn region fortranInterface transparent fold keepend extend start="^\s*\(abstract \)\=\s*interface\>" skip="^\s*[!#].*$" excludenl end="\<end\s*interface\>" contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock
     syn region fortranTypeDef transparent fold keepend extend start="^\s*type\s*\(,\s*\(public\|private\|abstract\)\)\=\s*::" skip="^\s*[!#].*$" excludenl end="\<end\s*type\>" contains=ALLBUT,fortranProgram,fortranModule,fortran77Loop,fortranCase,fortran90Loop,fortranIfBlock,fortranInterface
   endif
@@ -415,12 +417,12 @@ if exists("fortran_fold")
       syn region fortran77Loop transparent fold keepend start="\<do\s\+\z(\d\+\)" end="^\s*\z1\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
       syn region fortran90Loop transparent fold keepend extend start="\(\<end\s\+\)\@<!\<do\(\s\+\a\|\s*$\)" skip="^\([!c*]\|\s*#\).*$" excludenl end="\<end\s*do\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
       syn region fortranIfBlock transparent fold keepend extend start="\(\<e\(nd\|lse\)\s\+\)\@<!\<if\s*(.\+)\s*then\>" skip="^\([!c*]\|\s*#\).*$" end="\<end\s*if\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
-      syn region fortranCase transparent fold keepend extend start="\<select\s*case\>" skip="^\([!c*]\|\s*#\).*$" end="\<end\s*select\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
+      syn region fortranCase transparent fold keepend extend start="\<select\s*\(case\|type\)\>" skip="^\([!c*]\|\s*#\).*$" end="\<end\s*select\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
     else
       syn region fortran77Loop transparent fold keepend start="\<do\s\+\z(\d\+\)" end="^\s*\z1\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
       syn region fortran90Loop transparent fold keepend extend start="\(\<end\s\+\)\@<!\<do\(\s\+\a\|\s*$\)" skip="^\s*[!#].*$" excludenl end="\<end\s*do\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
       syn region fortranIfBlock transparent fold keepend extend start="\(\<e\(nd\|lse\)\s\+\)\@<!\<if\s*(\(.\|&\s*\n\)\+)\(\s\|&\s*\n\)*then\>" skip="^\s*[!#].*$" end="\<end\s*if\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
-      syn region fortranCase transparent fold keepend extend start="\<select\s*case\>" skip="^\s*[!#].*$" end="\<end\s*select\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
+      syn region fortranCase transparent fold keepend extend start="\<select\s*\(case\|type\)\>" skip="^\s*[!#].*$" end="\<end\s*select\>" contains=ALLBUT,fortranUnitHeader,fortranStructure,fortranStorageClass,fortranType,fortranProgram,fortranModule,fortranSubroutine,fortranFunction,fortranBlockData
     endif
   endif
 

From 940f35f66406a475344da8994d1d8746e2500ac6 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 30 Apr 2017 22:10:48 +0200
Subject: [PATCH 216/257] vim-patch:cf49790443ee

Updated runtime files.

https://github.com/vim/vim/commit/cf49790443eea7d720be556f4aaea261feb55259

NA patches:
vim-patch:99c5eb4fd755
---
 runtime/compiler/ghc.vim | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 runtime/compiler/ghc.vim

diff --git a/runtime/compiler/ghc.vim b/runtime/compiler/ghc.vim
new file mode 100644
index 0000000000..c98ae302a8
--- /dev/null
+++ b/runtime/compiler/ghc.vim
@@ -0,0 +1,26 @@
+" Vim compiler file
+" Compiler:         GHC Haskell Compiler
+" Maintainer:       Daniel Campoverde <alx@sillybytes.net>
+" Latest Revision:  2016-11-29
+
+if exists("current_compiler")
+  finish
+endif
+let current_compiler = "ghc"
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+CompilerSet errorformat=
+    \%-G%.%#:\ build,
+    \%-G%.%#preprocessing\ library\ %.%#,
+    \%-G[%.%#]%.%#,
+    \%E%f:%l:%c:\ %m,
+    \%-G--%.%#
+
+if exists('g:compiler_ghc_ignore_unmatched_lines')
+  CompilerSet errorformat+=%-G%.%#
+endif
+
+let &cpo = s:cpo_save
+unlet s:cpo_save

From 4fbcfab1276dd9d827ccf58954e0dc5bdbd4cf53 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Sun, 30 Apr 2017 22:18:04 +0200
Subject: [PATCH 217/257] vim-patch:bc2eada5424b

Updated runtime files.

https://github.com/vim/vim/commit/bc2eada5424bff06f7eb77c032ecc067da52b846

NA patches:
vim-patch:294740d2ac42
vim-patch:a4ce25bd987a
vim-patch:7034a8374345
vim-patch:14a612fa2e57
vim-patch:aaeabfbca571
---
 runtime/doc/cmdline.txt                   |  6 ++--
 runtime/doc/message.txt                   |  5 +--
 runtime/doc/options.txt                   |  2 ++
 runtime/doc/quickref.txt                  |  2 ++
 runtime/doc/usr_22.txt                    |  2 +-
 runtime/keymap/armenian-eastern_utf-8.vim |  4 ++-
 runtime/keymap/armenian-western_utf-8.vim |  4 ++-
 runtime/syntax/html.vim                   | 18 +++++++---
 runtime/syntax/php.vim                    | 40 +++++++++++------------
 runtime/syntax/sshconfig.vim              |  5 +--
 runtime/syntax/sshdconfig.vim             |  5 +--
 11 files changed, 56 insertions(+), 37 deletions(-)

diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 3e041c3b62..80b6cbbeab 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -1000,10 +1000,10 @@ There are several ways to leave the command-line window:
 		Insert and in Normal mode.
 CTRL-C		Continue in Command-line mode.  The command-line under the
 		cursor is used as the command-line.  Works both in Insert and
-		in Normal mode.  ":close" also works.  There is no redraw,
-		thus the window will remain visible.
+		in Normal mode.  There is no redraw, thus the window will
+		remain visible.
 :quit		Discard the command line and go back to Normal mode.
-		":exit", ":xit" and CTRL-\ CTRL-N also work.
+		":close", ":exit", ":xit" and CTRL-\ CTRL-N also work.
 :qall		Quit Vim, unless there are changes in some buffer.
 :qall!		Quit Vim, discarding changes to any buffer.
 
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index e619cfde30..e6bd6ae506 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -124,8 +124,9 @@ closed properly.  Mostly harmless.
   Command too recursive
 
 This happens when an Ex command executes an Ex command that executes an Ex
-command, etc.  This is only allowed 200 times.  When it's more there probably
-is an endless loop.  Probably a |:execute| or |:source| command is involved.
+command, etc.  The limit is 200 or the value of 'maxfuncdepth', whatever is
+larger.  When it's more there probably is an endless loop.  Probably a
+|:execute| or |:source| command is involved.
 
 							*E254*  >
   Cannot allocate color {name}
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index d3683f5135..0492ba891d 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -3972,6 +3972,8 @@ A jump table for the options with a short description can be found at |Q_op|.
 	catches endless recursion.  When using a recursive function with
 	more depth, set 'maxfuncdepth' to a bigger number.  But this will use
 	more memory, there is the danger of failing when memory is exhausted.
+	Increasing this limit above 200 also changes the maximum for Ex
+	command resursion, see |E169|.
 	See also |:function|.
 
 						*'maxmapdepth'* *'mmd'* *E223*
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 420f570c99..75a47e55ce 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -1027,6 +1027,8 @@ Short explanation of each option:		*option-list*
 |c_<Up>|	<Up>/<Down>	   recall older/newer command-line that starts
 				      with current command
 |c_<S-Up>|	<S-Up>/<S-Down>	   recall older/newer command-line from history
+|c_CTRL-G|	CTRL-G		   next match when 'incsearch' is active
+|c_CTRL-T|	CTRL-T		   previous match when 'incsearch' is active
 |:history|	:his[tory]	   show older command-lines
 
 Context-sensitive completion on the command-line:
diff --git a/runtime/doc/usr_22.txt b/runtime/doc/usr_22.txt
index 8d11be11b2..255211f668 100644
--- a/runtime/doc/usr_22.txt
+++ b/runtime/doc/usr_22.txt
@@ -93,7 +93,7 @@ browser.  This is what you get: >
      	 o................Browsing with a Horizontal Split...........|netrw-o|
      	 p................Use Preview Window.........................|netrw-p|
      	 P................Edit in Previous Window....................|netrw-p|
-     	 q................Listing Bookmarks and History..............|netrw-q|
+     	 q................Listing Bookmarks and History..............|netrw-qb|
      	 r................Reversing Sorting Order....................|netrw-r|
 <    	(etc)
 
diff --git a/runtime/keymap/armenian-eastern_utf-8.vim b/runtime/keymap/armenian-eastern_utf-8.vim
index 7b03c5ac73..eaa60a77f8 100644
--- a/runtime/keymap/armenian-eastern_utf-8.vim
+++ b/runtime/keymap/armenian-eastern_utf-8.vim
@@ -1,5 +1,5 @@
 " Maintainer: Benjamin Linskey <vim@benlinskey.com>
-" Last Changed: 2016 July 20
+" Last Changed: 2016 December 5
 " URL: https://github.com/blinskey/vim-armenian-keymaps
 
 let b:keymap_name = "hy"
@@ -98,6 +98,8 @@ f   ֆ
 7   .
 8   «
 9   »
+*   (
+(   )
 \\  '
 |   ՞
 
diff --git a/runtime/keymap/armenian-western_utf-8.vim b/runtime/keymap/armenian-western_utf-8.vim
index e02485ed8c..cf3efdc00f 100644
--- a/runtime/keymap/armenian-western_utf-8.vim
+++ b/runtime/keymap/armenian-western_utf-8.vim
@@ -1,5 +1,5 @@
 " Maintainer: Benjamin Linskey <vim@benlinskey.com>
-" Last Changed: 2016 July 20
+" Last Changed: 2016 December 5
 " URL: https://github.com/blinskey/vim-armenian-keymaps
 
 let b:keymap_name = "hy"
@@ -98,6 +98,8 @@ f   ֆ
 7   .
 8   «
 9   »
+*   (
+(   )
 \\  '
 |   ՞
 
diff --git a/runtime/syntax/html.vim b/runtime/syntax/html.vim
index 336d8c9f44..7408f66476 100644
--- a/runtime/syntax/html.vim
+++ b/runtime/syntax/html.vim
@@ -1,9 +1,9 @@
 " Vim syntax file
-" Language:	HTML
-" Maintainer:	Claudio Fleiner <claudio@fleiner.com>
-" URL:		http://www.fleiner.com/vim/syntax/html.vim
-" Last Change:	2015 Jan 07
-"		included patch from David Felix
+" Language:             HTML
+" Maintainer:           Jorge Maldonado Ventura <jorgesumle@freakspot.net>
+" Previous Maintainer:  Claudio Fleiner <claudio@fleiner.com>
+" Last Change:          2016 Dec 29
+"                       included patch from Jorge Maldonado Ventura
 
 " Please check :help html.vim for some comments and a description of the options
 
@@ -53,6 +53,14 @@ syn keyword htmlTagName contained abbr acronym bdo button col label
 syn keyword htmlTagName contained colgroup del fieldset iframe ins legend
 syn keyword htmlTagName contained object optgroup q s tbody tfoot thead
 
+" new html 5 tags
+syn keyword htmlTagName contained article aside audio bdi canvas datalist
+syn keyword htmlTagName contained details embed figcaption figure
+syn keyword htmlTagName contained footer header hgroup main mark
+syn keyword htmlTagName contained menuitem meter nav output picture
+syn keyword htmlTagName contained progress rb rp rt rtc ruby section
+syn keyword htmlTagName contained slot source template time track video wbr
+
 " legal arg names
 syn keyword htmlArg contained action
 syn keyword htmlArg contained align alink alt archive background bgcolor
diff --git a/runtime/syntax/php.vim b/runtime/syntax/php.vim
index efb355ec83..278fc1358c 100644
--- a/runtime/syntax/php.vim
+++ b/runtime/syntax/php.vim
@@ -1,7 +1,7 @@
 " Vim syntax file
 " Language: php PHP 3/4/5/7
 " Maintainer: Jason Woofenden <jason@jasonwoof.com>
-" Last Change: Jul 27, 2016
+" Last Change: Dec 11, 2016
 " URL: https://jasonwoof.com/gitweb/?p=vim-syntax.git;a=blob;f=php.vim;hb=HEAD
 " Former Maintainers: Peter Hodge <toomuchphp-vim@yahoo.com>
 "         Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
@@ -495,7 +495,7 @@ syntax keyword phpSpecialFunction containedin=ALLBUT,phpComment,phpStringDouble,
 " Highlighting for __autoload slightly different from line above
 syntax keyword phpSpecialFunction containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar
   \ __autoload
-highlight link phpSpecialFunction phpOperator
+hi def link phpSpecialFunction phpOperator
 
 " Highlighting for PHP5's built-in classes
 " - built-in classes harvested from get_declared_classes() in 5.1.4
@@ -518,14 +518,14 @@ syntax keyword phpClasses containedin=ALLBUT,phpComment,phpStringDouble,phpStrin
   \ DOMCharacterData DOMAttr DOMElement DOMText DOMComment DOMTypeinfo DOMUserDataHandler
   \ DOMLocator DOMConfiguration DOMCdataSection DOMDocumentType DOMNotation DOMEntity
   \ DOMEntityReference DOMProcessingInstruction DOMStringExtend DOMXPath
-highlight link phpClasses phpFunctions
+hi def link phpClasses phpFunctions
 
 " Highlighting for PHP5's built-in interfaces
 " - built-in classes harvested from get_declared_interfaces() in 5.1.4
 syntax keyword phpInterfaces containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle,phpIdentifier,phpMethodsVar
   \ Iterator IteratorAggregate RecursiveIterator OuterIterator SeekableIterator
   \ Traversable ArrayAccess Serializable Countable SplObserver SplSubject Reflector
-highlight link phpInterfaces phpConstant
+hi def link phpInterfaces phpConstant
 
 " option defaults:
 if ! exists('php_special_functions')
@@ -553,7 +553,7 @@ endif
 if php_alt_assignByReference
     " special highlighting for '=&' operator
     syntax match phpAssignByRef /=\s*&/ containedin=ALLBUT,phpComment,phpStringDouble,phpStringSingle
-    highlight link phpAssignByRef Type
+    hi def link phpAssignByRef Type
 endif
 
 if php_alt_comparisons
@@ -565,7 +565,7 @@ if php_alt_comparisons
   syntax case ignore
   syntax keyword phpComparison instanceof contained containedin=phpRegion
 
-  hi link phpComparison Statement
+  hi def link phpComparison Statement
 endif
 
 " ================================================================
@@ -645,21 +645,21 @@ hi def link phpTodo  Todo
 hi def link phpDocTodo Todo
 hi def link phpMemberSelector  Structure
 if exists("php_oldStyle")
-hi  phpIntVar guifg=Red ctermfg=DarkRed
-hi  phpEnvVar guifg=Red ctermfg=DarkRed
-hi  phpOperator guifg=SeaGreen ctermfg=DarkGreen
-hi  phpVarSelector guifg=SeaGreen ctermfg=DarkGreen
-hi  phpRelation guifg=SeaGreen ctermfg=DarkGreen
-hi  phpIdentifier guifg=DarkGray ctermfg=Brown
-hi  phpIdentifierSimply guifg=DarkGray ctermfg=Brown
+  hi def phpIntVar guifg=Red ctermfg=DarkRed
+  hi def phpEnvVar guifg=Red ctermfg=DarkRed
+  hi def phpOperator guifg=SeaGreen ctermfg=DarkGreen
+  hi def phpVarSelector guifg=SeaGreen ctermfg=DarkGreen
+  hi def phpRelation guifg=SeaGreen ctermfg=DarkGreen
+  hi def phpIdentifier guifg=DarkGray ctermfg=Brown
+  hi def phpIdentifierSimply guifg=DarkGray ctermfg=Brown
 else
-hi def link phpIntVar Identifier
-hi def link phpEnvVar Identifier
-hi def link phpOperator Operator
-hi def link phpVarSelector  Operator
-hi def link phpRelation Operator
-hi def link phpIdentifier Identifier
-hi def link phpIdentifierSimply Identifier
+  hi def link phpIntVar Identifier
+  hi def link phpEnvVar Identifier
+  hi def link phpOperator Operator
+  hi def link phpVarSelector  Operator
+  hi def link phpRelation Operator
+  hi def link phpIdentifier Identifier
+  hi def link phpIdentifierSimply Identifier
 endif
 
 
diff --git a/runtime/syntax/sshconfig.vim b/runtime/syntax/sshconfig.vim
index 8401923e02..755d08e768 100644
--- a/runtime/syntax/sshconfig.vim
+++ b/runtime/syntax/sshconfig.vim
@@ -5,8 +5,8 @@
 " Contributor:  Leonard Ehrenfried <leonard.ehrenfried@web.de>
 " Contributor:  Karsten Hopp <karsten@redhat.com>
 " Contributor:  Dean, Adam Kenneth <adam.ken.dean@hpe.com>
-" Last Change:	2016 Aug 11
-" SSH Version:	7.3p1
+" Last Change:	2016 Dec 28
+" SSH Version:	7.4p1
 "
 
 " Setup
@@ -181,6 +181,7 @@ syn keyword sshconfigKeyword IPQoS
 syn keyword sshconfigKeyword IdentitiesOnly
 syn keyword sshconfigKeyword IdentityFile
 syn keyword sshconfigKeyword IgnoreUnknown
+syn keyword sshconfigKeyword Include
 syn keyword sshconfigKeyword IPQoS
 syn keyword sshconfigKeyword KbdInteractiveAuthentication
 syn keyword sshconfigKeyword KbdInteractiveDevices
diff --git a/runtime/syntax/sshdconfig.vim b/runtime/syntax/sshdconfig.vim
index 1556258b25..c3abfff632 100644
--- a/runtime/syntax/sshdconfig.vim
+++ b/runtime/syntax/sshdconfig.vim
@@ -6,8 +6,8 @@
 " Contributor:  Leonard Ehrenfried <leonard.ehrenfried@web.de>	
 " Contributor:  Karsten Hopp <karsten@redhat.com>
 " Originally:	2009-07-09
-" Last Change:	2016 Mar 1
-" SSH Version:	7.2
+" Last Change:	2016 Dec 28
+" SSH Version:	7.4p1
 "
 
 " Setup
@@ -161,6 +161,7 @@ syn keyword sshdconfigKeyword Compression
 syn keyword sshdconfigKeyword DebianBanner
 syn keyword sshdconfigKeyword DenyGroups
 syn keyword sshdconfigKeyword DenyUsers
+syn keyword sshdconfigKeyword DisableForwarding
 syn keyword sshdconfigKeyword ForceCommand
 syn keyword sshdconfigKeyword GSSAPIAuthentication
 syn keyword sshdconfigKeyword GSSAPICleanupCredentials

From 44ea50cee45d7c1fc464b77f45ef480916dba19a Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 1 May 2017 12:31:10 +0200
Subject: [PATCH 218/257] vim-patch:68563937f58e

Updated runtime files.

https://github.com/vim/vim/commit/68563937f58ea2dc31b58739336c383d2fd7e6cf
---
 runtime/doc/eval.txt          |   3 +-
 runtime/doc/intro.txt         |  11 +-
 runtime/filetype.vim          |   7 +-
 runtime/indent/javascript.vim | 396 ++++++++++++++++++++++++----------
 runtime/syntax/html.vim       |   7 +-
 5 files changed, 300 insertions(+), 124 deletions(-)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 30fd75c447..931e1821cd 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -7421,7 +7421,8 @@ systemlist({cmd} [, {input} [, {keepempty}]])		*systemlist()*
 		output separated by NL) with NULs transformed into NLs. Output 
 		is the same as |readfile()| will output with {binary} argument 
 		set to "b", except that a final newline is not preserved,
-		unless {keepempty} is present and it's non-zero.
+		unless {keepempty} is non-zero.
+		Note that on MS-Windows you may get trailing CR characters.
 
 		Returns an empty string on error, so be careful not to run 
 		into |E706|.
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index 7564679b93..bbe2df11e6 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -87,21 +87,18 @@ mention that.
 
 						*mail-list* *maillist*
 There are several mailing lists for Vim:
-<vim@vim.org>
+<vim@vim.org>					*vim-use* *vim_use*
 	For discussions about using existing versions of Vim: Useful mappings,
 	questions, answers, where to get a specific version, etc.  There are
 	quite a few people watching this list and answering questions, also
 	for beginners.  Don't hesitate to ask your question here.
-<vim-dev@vim.org>				*vim-dev* *vimdev*
+<vim-dev@vim.org>				*vim-dev* *vim_dev* *vimdev*
 	For discussions about changing Vim: New features, porting, patches,
 	beta-test versions, etc.
-<vim-announce@vim.org>				*vim-announce*
+<vim-announce@vim.org>				*vim-announce* *vim_announce*
 	Announcements about new versions of Vim; also for beta-test versions
 	and ports to different systems.  This is a read-only list.
-<vim-multibyte@vim.org>				*vim-multibyte*
-	For discussions about using and improving the multi-byte aspects of
-	Vim.
-<vim-mac@vim.org>				*vim-mac*
+<vim-mac@vim.org>				*vim-mac* *vim_mac*
 	For discussions about using and improving the Macintosh version of
 	Vim.
 
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 3e502ca362..039e7b3d05 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
 " Vim support file to detect file types
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Oct 31
+" Last Change:	2017 Jan 06
 
 " Listen very carefully, I will say this only once
 if exists("did_load_filetypes")
@@ -305,7 +305,10 @@ au BufNewFile,BufRead *.bl			setf blank
 au BufNewFile,BufRead */etc/blkid.tab,*/etc/blkid.tab.old   setf xml
 
 " Bazel (http://bazel.io)
-autocmd BufRead,BufNewFile *.bzl,BUILD,WORKSPACE setfiletype bzl
+autocmd BufRead,BufNewFile *.bzl,WORKSPACE setfiletype bzl
+if has("fname_case")
+  autocmd BufRead,BufNewFile BUILD setfiletype bzl
+endif
 
 " C or lpc
 au BufNewFile,BufRead *.c			call s:FTlpc()
diff --git a/runtime/indent/javascript.vim b/runtime/indent/javascript.vim
index 0d6c11d151..a6f1e1a8f8 100644
--- a/runtime/indent/javascript.vim
+++ b/runtime/indent/javascript.vim
@@ -2,7 +2,7 @@
 " Language: Javascript
 " Maintainer: Chris Paul ( https://github.com/bounceme )
 " URL: https://github.com/pangloss/vim-javascript
-" Last Change: August 25, 2016
+" Last Change: December 31, 2016
 
 " Only load this indent file when no other was loaded.
 if exists('b:did_indent')
@@ -12,11 +12,10 @@ let b:did_indent = 1
 
 " Now, set up our indentation expression and keys that trigger it.
 setlocal indentexpr=GetJavascriptIndent()
-setlocal nolisp noautoindent nosmartindent
-setlocal indentkeys=0{,0},0),0],:,!^F,o,O,e
-setlocal cinoptions+=j1,J1
+setlocal autoindent nolisp nosmartindent
+setlocal indentkeys+=0],0)
 
-let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys< cinoptions<'
+let b:undo_indent = 'setlocal indentexpr< smartindent< autoindent< indentkeys<'
 
 " Only define the function once.
 if exists('*GetJavascriptIndent')
@@ -37,158 +36,329 @@ else
   endfunction
 endif
 
-let s:line_pre = '^\s*\%(\%(\%(\/\*.\{-}\)\=\*\+\/\s*\)\=\)\@>'
-let s:expr_case = s:line_pre . '\%(\%(case\>.\+\)\|default\)\s*:'
+" searchpair() wrapper
+if has('reltime')
+  function s:GetPair(start,end,flags,skip,time,...)
+    return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 2000,0] + a:000),a:time)
+  endfunction
+else
+  function s:GetPair(start,end,flags,skip,...)
+    return searchpair('\m'.a:start,'','\m'.a:end,a:flags,a:skip,max([prevnonblank(v:lnum) - 1000,get(a:000,1)]))
+  endfunction
+endif
+
 " Regex of syntax group names that are or delimit string or are comments.
-let s:syng_strcom = '\%(s\%(tring\|pecial\)\|comment\|regex\|doc\|template\)'
-
-" Regex of syntax group names that are strings or documentation.
-let s:syng_comment = '\%(comment\|doc\)'
-
+let s:syng_strcom = 'string\|comment\|regex\|special\|doc\|template'
+let s:syng_str = 'string\|template'
+let s:syng_com = 'comment\|doc'
 " Expression used to check whether we should skip a match with searchpair().
 let s:skip_expr = "synIDattr(synID(line('.'),col('.'),0),'name') =~? '".s:syng_strcom."'"
 
-if has('reltime')
-  function s:GetPair(start,end,flags,time)
-    return searchpair(a:start,'',a:end,a:flags,s:skip_expr,max([prevnonblank(v:lnum) - 2000,0]),a:time)
-  endfunction
-else
-  function s:GetPair(start,end,flags,n)
-    return searchpair(a:start,'',a:end,a:flags,0,max([prevnonblank(v:lnum) - 2000,0]))
-  endfunction
-endif
+function s:skip_func()
+  if !s:free || search('\m`\|\*\/','nW',s:looksyn)
+    let s:free = !eval(s:skip_expr)
+    let s:looksyn = s:free ? line('.') : s:looksyn
+    return !s:free
+  endif
+  let s:looksyn = line('.')
+  return (search('\m\/','nbW',s:looksyn) || search('\m[''"]\|\\$','nW',s:looksyn)) && eval(s:skip_expr)
+endfunction
 
-let s:line_term = '\s*\%(\%(\/\%(\%(\*.\{-}\*\/\)\|\%(\*\+\)\)\)\s*\)\=$'
+function s:alternatePair(stop)
+  let pos = getpos('.')[1:2]
+  while search('\m[][(){}]','bW',a:stop)
+    if !s:skip_func()
+      let idx = stridx('])}',s:looking_at())
+      if idx + 1
+        if !s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,a:stop)
+          break
+        endif
+      else
+        return
+      endif
+    endif
+  endwhile
+  call call('cursor',pos)
+endfunction
+
+function s:save_pos(f,...)
+  let l:pos = getpos('.')[1:2]
+  let ret = call(a:f,a:000)
+  call call('cursor',l:pos)
+  return ret
+endfunction
+
+function s:syn_at(l,c)
+  return synIDattr(synID(a:l,a:c,0),'name')
+endfunction
+
+function s:looking_at()
+  return getline('.')[col('.')-1]
+endfunction
+
+function s:token()
+  return s:looking_at() =~ '\k' ? expand('<cword>') : s:looking_at()
+endfunction
+
+function s:b_token()
+  if s:looking_at() =~ '\k'
+    call search('\m\<','cbW')
+  endif
+  return search('\m\S','bW')
+endfunction
+
+function s:previous_token()
+  let l:n = line('.')
+  while s:b_token()
+    if (s:looking_at() == '/' || line('.') != l:n && search('\m\/\/','nbW',
+          \ line('.'))) && s:syn_at(line('.'),col('.')) =~? s:syng_com
+      call search('\m\_[^/]\zs\/[/*]','bW')
+    else
+      return s:token()
+    endif
+  endwhile
+  return ''
+endfunction
+
+function s:others(p)
+  return "((line2byte(line('.')) + col('.')) <= ".(line2byte(a:p[0]) + a:p[1]).") || ".s:skip_expr
+endfunction
+
+function s:tern_skip(p)
+  return s:GetPair('{','}','nbW',s:others(a:p),200,a:p[0]) > 0
+endfunction
+
+function s:tern_col(p)
+  return s:GetPair('?',':\@<!::\@!','nbW',s:others(a:p)
+        \ .' || s:tern_skip('.string(a:p).')',200,a:p[0]) > 0
+endfunction
+
+function s:label_col()
+  let pos = getpos('.')[1:2]
+  let [s:looksyn,s:free] = pos
+  call s:alternatePair(0)
+  if s:save_pos('s:IsBlock')
+    let poss = getpos('.')[1:2]
+    return call('cursor',pos) || !s:tern_col(poss)
+  elseif s:looking_at() == ':'
+    return !s:tern_col([0,0])
+  endif
+endfunction
 
 " configurable regexes that define continuation lines, not including (, {, or [.
-if !exists('g:javascript_opfirst')
-  let g:javascript_opfirst = '\%([<>,:?^%|*&]\|\/[^/*]\|\([-.+]\)\1\@!\|=>\@!\|in\%(stanceof\)\=\>\)'
-endif
-if !exists('g:javascript_continuation')
-  let g:javascript_continuation = '\%([<=,.?/*:^%|&]\|+\@<!+\|-\@<!-\|=\@<!>\|\<in\%(stanceof\)\=\)'
-endif
+let s:opfirst = '^' . get(g:,'javascript_opfirst',
+      \ '\%([<>=,?^%|*/&]\|\([-.:+]\)\1\@!\|!=\|in\%(stanceof\)\=\>\)')
+let s:continuation = get(g:,'javascript_continuation',
+      \ '\%([<=,.~!?/*^%|&:]\|+\@<!+\|-\@<!-\|=\@<!>\|\<\%(typeof\|delete\|void\|in\|instanceof\)\)') . '$'
 
-let g:javascript_opfirst = s:line_pre . g:javascript_opfirst
-let g:javascript_continuation .= s:line_term
-
-function s:OneScope(lnum,text,add)
-  return a:text =~# '\%(\<else\|\<do\|=>\)' . s:line_term ? 'no b' :
-        \ ((a:add && a:text =~ s:line_pre . '$' && search('\%' . s:PrevCodeLine(a:lnum - 1) . 'l.)' . s:line_term)) ||
-        \ cursor(a:lnum, match(a:text, ')' . s:line_term)) > -1) &&
-        \ s:GetPair('(', ')', 'cbW', 100) > 0 && search('\C\l\+\_s*\%#','bW') &&
-        \ (a:add || ((expand('<cword>') !=# 'while' || !s:GetPair('\C\<do\>', '\C\<while\>','nbW',100)) &&
-        \ (expand('<cword>') !=# 'each' || search('\C\<for\_s\+\%#','nbW')))) ? expand('<cword>') : ''
+function s:continues(ln,con)
+  return !cursor(a:ln, match(' '.a:con,s:continuation)) &&
+        \ eval((['s:syn_at(line("."),col(".")) !~? "regex"'] +
+        \ repeat(['s:previous_token() != "."'],5) + [1])[
+        \ index(split('/ typeof in instanceof void delete'),s:token())])
 endfunction
 
-" https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
-function s:IsBlock()
-  return getline(line('.'))[col('.')-1] == '{' && !search(
-        \ '\C\%(\<return\s*\|\%([-=~!<*+,.?^%|&\[(]\|=\@<!>\|\*\@<!\/\|\<\%(var\|const\|let\|import\|export\%(\_s\+default\)\=\|yield\|delete\|void\|t\%(ypeof\|hrow\)\|new\|in\%(stanceof\)\=\)\)\_s*\)\%#','bnW') &&
-        \ (!search(':\_s*\%#','bW') || (!s:GetPair('[({[]','[])}]','bW',200) || s:IsBlock()))
+" get the line of code stripped of comments and move cursor to the last
+" non-comment char.
+function s:Trim(ln)
+  let pline = substitute(getline(a:ln),'\s*$','','')
+  let l:max = max([match(pline,'.*[^/]\zs\/[/*]'),0])
+  while l:max && s:syn_at(a:ln, strlen(pline)) =~? s:syng_com
+    let pline = substitute(strpart(pline, 0, l:max),'\s*$','','')
+    let l:max = max([match(pline,'.*[^/]\zs\/[/*]'),0])
+  endwhile
+  return cursor(a:ln,strlen(pline)) ? pline : pline
 endfunction
 
-" Auxiliary Functions {{{2
-
-" Find line above 'lnum' that isn't empty, in a comment, or in a string.
+" Find line above 'lnum' that isn't empty or in a comment
 function s:PrevCodeLine(lnum)
-  let l:lnum = prevnonblank(a:lnum)
-  while l:lnum
-    if synIDattr(synID(l:lnum,matchend(getline(l:lnum), '^\s*[^''"]'),0),'name') !~? s:syng_strcom
-      return l:lnum
+  let l:n = prevnonblank(a:lnum)
+  while l:n
+    if getline(l:n) =~ '^\s*\/[/*]'
+      if (stridx(getline(l:n),'`') > 0 || getline(l:n-1)[-1:] == '\') &&
+            \ s:syn_at(l:n,1) =~? s:syng_str
+        return l:n
+      endif
+      let l:n = prevnonblank(l:n-1)
+    elseif s:syn_at(l:n,1) =~? s:syng_com
+      let l:n = s:save_pos('eval',
+            \ 'cursor('.l:n.',1) + search(''\m\/\*'',"bW")')
+    else
+      return l:n
     endif
-    let l:lnum = prevnonblank(l:lnum - 1)
   endwhile
 endfunction
 
 " Check if line 'lnum' has a balanced amount of parentheses.
 function s:Balanced(lnum)
-  let [open_0,open_2,open_4] = [0,0,0]
+  let l:open = 0
   let l:line = getline(a:lnum)
   let pos = match(l:line, '[][(){}]', 0)
   while pos != -1
-    if synIDattr(synID(a:lnum,pos + 1,0),'name') !~? s:syng_strcom
-      let idx = stridx('(){}[]', l:line[pos])
-      if idx % 2 == 0
-        let open_{idx} = open_{idx} + 1
-      else
-        let open_{idx - 1} = open_{idx - 1} - 1
+    if s:syn_at(a:lnum,pos + 1) !~? s:syng_strcom
+      let l:open += match(' ' . l:line[pos],'[[({]')
+      if l:open < 0
+        return
       endif
     endif
     let pos = match(l:line, '[][(){}]', pos + 1)
   endwhile
-  return (!open_4 + !open_2 + !open_0) - 2
+  return !l:open
+endfunction
+
+function s:OneScope(lnum)
+  let pline = s:Trim(a:lnum)
+  let kw = 'else do'
+  if pline[-1:] == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
+    call s:previous_token()
+    let kw = 'for if let while with'
+    if index(split('await each'),s:token()) + 1
+      call s:previous_token()
+      let kw = 'for'
+    endif
+  endif
+  return pline[-2:] == '=>' || index(split(kw),s:token()) + 1 &&
+        \ s:save_pos('s:previous_token') != '.'
+endfunction
+
+" returns braceless levels started by 'i' and above lines * &sw. 'num' is the
+" lineNr which encloses the entire context, 'cont' if whether line 'i' + 1 is
+" a continued expression, which could have started in a braceless context
+function s:iscontOne(i,num,cont)
+  let [l:i, l:num, bL] = [a:i, a:num + !a:num, 0]
+  let pind = a:num ? indent(l:num) + s:W : 0
+  let ind = indent(l:i) + (a:cont ? 0 : s:W)
+  while l:i >= l:num && (ind > pind || l:i == l:num)
+    if indent(l:i) < ind && s:OneScope(l:i)
+      let bL += s:W
+      let l:i = line('.')
+    elseif !a:cont || bL || ind < indent(a:i)
+      break
+    endif
+    let ind = min([ind, indent(l:i)])
+    let l:i = s:PrevCodeLine(l:i - 1)
+  endwhile
+  return bL
+endfunction
+
+" https://github.com/sweet-js/sweet.js/wiki/design#give-lookbehind-to-the-reader
+function s:IsBlock()
+  if s:looking_at() == '{'
+    let l:n = line('.')
+    let char = s:previous_token()
+    let syn = char =~ '[{>/]' ? s:syn_at(line('.'),col('.')-(char == '{')) : ''
+    if syn =~? 'xml\|jsx'
+      return char != '{'
+    elseif char =~ '\k'
+      return index(split('return const let import export yield default delete var await void typeof throw case new in instanceof')
+            \ ,char) < (line('.') != l:n) || s:previous_token() == '.'
+    elseif char == '>'
+      return getline('.')[col('.')-2] == '=' || syn =~? '^jsflow'
+    elseif char == ':'
+      return getline('.')[col('.')-2] != ':' && s:label_col()
+    endif
+    return syn =~? 'regex' || char !~ '[-=~!<*+,/?^%|&([]'
+  endif
 endfunction
-" }}}
 
 function GetJavascriptIndent()
-  if !exists('b:js_cache')
-    let b:js_cache = [0,0,0]
-  endif
+  let b:js_cache = get(b:,'js_cache',[0,0,0])
   " Get the current line.
-  let l:line = getline(v:lnum)
-  let syns = synIDattr(synID(v:lnum, 1, 0), 'name')
+  call cursor(v:lnum,1)
+  let l:line = getline('.')
+  let syns = s:syn_at(v:lnum, 1)
 
-  " start with strings,comments,etc.{{{2
-  if (l:line !~ '^[''"`]' && syns =~? '\%(string\|template\)') ||
-        \ (l:line !~ '^\s*[/*]' && syns =~? s:syng_comment)
+  " start with strings,comments,etc.
+  if syns =~? s:syng_com
+    if l:line =~ '^\s*\*'
+      return cindent(v:lnum)
+    elseif l:line !~ '^\s*\/[/*]'
+      return -1
+    endif
+  elseif syns =~? s:syng_str && l:line !~ '^[''"]'
+    if b:js_cache[0] == v:lnum - 1 && s:Balanced(v:lnum-1)
+      let b:js_cache[0] = v:lnum
+    endif
     return -1
   endif
-  if l:line !~ '^\%(\/\*\|\s*\/\/\)' && syns =~? s:syng_comment
-    return cindent(v:lnum)
-  endif
   let l:lnum = s:PrevCodeLine(v:lnum - 1)
-  if l:lnum == 0
-    return 0
+  if !l:lnum
+    return
   endif
 
-  if (l:line =~# s:expr_case)
-    let cpo_switch = &cpo
-    set cpo+=%
-    let ind = cindent(v:lnum)
-    let &cpo = cpo_switch
-    return ind
+  let l:line = substitute(l:line,'^\s*','','')
+  if l:line[:1] == '/*'
+    let l:line = substitute(l:line,'^\%(\/\*.\{-}\*\/\s*\)*','','')
+  endif
+  if l:line =~ '^\/[/*]'
+    let l:line = ''
   endif
-  "}}}
 
-  " the containing paren, bracket, curly. Memoize, last lineNr either has the
-  " same scope or starts a new one, unless if it closed a scope.
-  call cursor(v:lnum,1)
-  if b:js_cache[0] >= l:lnum  && b:js_cache[0] < v:lnum && b:js_cache[0] &&
-        \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum) > 0)
-    let num = b:js_cache[1]
-  elseif syns != '' && l:line[0] =~ '\s'
-    let pattern = syns =~? 'block' ? ['{','}'] : syns =~? 'jsparen' ? ['(',')'] :
-          \ syns =~? 'jsbracket'? ['\[','\]'] : ['[({[]','[])}]']
-    let num = s:GetPair(pattern[0],pattern[1],'bW',2000)
+  " the containing paren, bracket, or curly. Many hacks for performance
+  let idx = strlen(l:line) ? stridx('])}',l:line[0]) : -1
+  if b:js_cache[0] >= l:lnum && b:js_cache[0] < v:lnum &&
+        \ (b:js_cache[0] > l:lnum || s:Balanced(l:lnum))
+    call call('cursor',b:js_cache[1:])
   else
-    let num = s:GetPair('[({[]','[])}]','bW',2000)
-  endif
-  let b:js_cache = [v:lnum,num,line('.') == v:lnum ? b:js_cache[2] : col('.')]
-
-  if l:line =~ s:line_pre . '[])}]'
-    return indent(num)
+    let [s:looksyn, s:free, top] = [v:lnum - 1, 1, (!indent(l:lnum) &&
+          \ s:syn_at(l:lnum,1) !~? s:syng_str) * l:lnum]
+    if idx + 1
+      call s:GetPair(['\[','(','{'][idx], '])}'[idx],'bW','s:skip_func()',2000,top)
+    elseif indent(v:lnum) && syns =~? 'block'
+      call s:GetPair('{','}','bW','s:skip_func()',2000,top)
+    else
+      call s:alternatePair(top)
+    endif
   endif
 
-  call cursor(b:js_cache[1],b:js_cache[2])
-
-  let swcase = getline(l:lnum) =~# s:expr_case
-  let pline = swcase ? getline(l:lnum) : substitute(getline(l:lnum), '\%(:\@<!\/\/.*\)$', '','')
-  let inb = num == 0 || num < l:lnum && ((l:line !~ s:line_pre . ',' && pline !~ ',' . s:line_term) || s:IsBlock())
-  let switch_offset = num == 0 || s:OneScope(num, strpart(getline(num),0,b:js_cache[2] - 1),1) !=# 'switch' ? 0 :
-        \ &cino !~ ':' || !has('float') ?  s:sw() :
-        \ float2nr(str2float(matchstr(&cino,'.*:\zs[-0-9.]*')) * (&cino =~# '.*:[^,]*s' ? s:sw() : 1))
-
-  " most significant, find the indent amount
-  if inb && !swcase && ((l:line =~# g:javascript_opfirst || pline =~# g:javascript_continuation) ||
-        \ num < l:lnum && s:OneScope(l:lnum,pline,0) =~# '\<\%(for\|each\|if\|let\|no\sb\|w\%(hile\|ith\)\)\>' &&
-        \ l:line !~ s:line_pre . '{')
-    return (num > 0 ? indent(num) : -s:sw()) + (s:sw() * 2) + switch_offset
-  elseif num > 0
-    return indent(num) + s:sw() + switch_offset
+  if idx + 1 || l:line[:1] == '|}'
+    if idx == 2 && search('\m\S','bW',line('.')) && s:looking_at() == ')'
+      call s:GetPair('(',')','bW',s:skip_expr,200)
+    endif
+    return indent('.')
   endif
 
+  let b:js_cache = [v:lnum] + (line('.') == v:lnum ? [0,0] : getpos('.')[1:2])
+  let num = b:js_cache[1]
+
+  let [s:W, isOp, bL, switch_offset] = [s:sw(),0,0,0]
+  if !num || s:IsBlock()
+    let pline = s:save_pos('s:Trim',l:lnum)
+    if num && s:looking_at() == ')' && s:GetPair('(', ')', 'bW', s:skip_expr, 100) > 0
+      let num = line('.')
+      if s:previous_token() ==# 'switch' && s:previous_token() != '.'
+        if &cino !~ ':' || !has('float')
+          let switch_offset = s:W
+        else
+          let cinc = matchlist(&cino,'.*:\(-\)\=\([0-9.]*\)\(s\)\=\C')
+          let switch_offset = float2nr(str2float(cinc[1].(strlen(cinc[2]) ? cinc[2] : strlen(cinc[3])))
+                \ * (strlen(cinc[3]) ? s:W : 1))
+        endif
+        if pline[-1:] != '.' && l:line =~# '^\%(default\|case\)\>'
+          return indent(num) + switch_offset
+        endif
+      endif
+    endif
+    if pline[-1:] !~ '[{;]'
+      if pline =~# ':\@<!:$'
+        call cursor(l:lnum,strlen(pline))
+        let isOp = s:tern_col(b:js_cache[1:2])
+      else
+        let isOp = l:line =~# s:opfirst || s:continues(l:lnum,pline)
+      endif
+      let bL = s:iscontOne(l:lnum,num,isOp)
+      let bL -= (bL && l:line[0] == '{') * s:W
+    endif
+  endif
+
+  " main return
+  if isOp
+    return (num ? indent(num) : -s:W) + (s:W * 2) + switch_offset + bL
+  elseif num
+    return indent(num) + s:W + switch_offset + bL
+  endif
+  return bL
 endfunction
 
-
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/syntax/html.vim b/runtime/syntax/html.vim
index 7408f66476..b168750db4 100644
--- a/runtime/syntax/html.vim
+++ b/runtime/syntax/html.vim
@@ -2,7 +2,8 @@
 " Language:             HTML
 " Maintainer:           Jorge Maldonado Ventura <jorgesumle@freakspot.net>
 " Previous Maintainer:  Claudio Fleiner <claudio@fleiner.com>
-" Last Change:          2016 Dec 29
+" Repository:           https://notabug.org/jorgesumle/vim-html-syntax
+" Last Change:          2017 Jan 04
 "                       included patch from Jorge Maldonado Ventura
 
 " Please check :help html.vim for some comments and a description of the options
@@ -95,6 +96,10 @@ syn keyword htmlArg contained multiple nohref nowrap object profile readonly
 syn keyword htmlArg contained rules scheme scope span standby style
 syn keyword htmlArg contained summary tabindex valuetype version
 
+" html 5 arg names
+syn keyword htmlArg contained contenteditable contextmenu draggable dropzone
+syn keyword htmlArg contained hidden spellcheck title translate
+
 " special characters
 syn match htmlSpecialChar "&#\=[0-9A-Za-z]\{1,8};"
 

From eb7ea6e12253d6fb9296113b01f5d257341a7a18 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 1 May 2017 13:15:27 +0200
Subject: [PATCH 219/257] vim-patch:369b6f57c426

Update runtime files.

https://github.com/vim/vim/commit/369b6f57c426b4bf39b4a0cac8d21ed1b5f7de4d
---
 runtime/doc/autocmd.txt         |  2 +-
 runtime/doc/eval.txt            |  2 +-
 runtime/doc/options.txt         |  3 ++-
 runtime/doc/starting.txt        |  3 ++-
 runtime/filetype.vim            | 10 ++++++++--
 runtime/syntax/css.vim          |  5 +++--
 runtime/syntax/debchangelog.vim |  4 ++--
 runtime/syntax/debcontrol.vim   |  2 +-
 runtime/syntax/debsources.vim   |  4 ++--
 9 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index f783438fc9..50af870975 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -30,7 +30,7 @@ files matching *.c.  You can also use autocommands to implement advanced
 features, such as editing compressed files (see |gzip-example|).  The usual
 place to put autocommands is in your vimrc file.
 
-						*E203* *E204* *E143* *E855*
+					*E203* *E204* *E143* *E855* *E937*
 WARNING: Using autocommands is very powerful, and may lead to unexpected side
 effects.  Be careful not to destroy your text.
 - It's a good idea to do some testing on an expendable copy of a file first.
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 931e1821cd..7573165c60 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -7061,7 +7061,7 @@ strcharpart({src}, {start}[, {len}])			*strcharpart()*
 		Like |strpart()| but using character index and length instead
 		of byte index and length.
 		When a character index is used where a character does not
-		exist it is assumed to be one byte.  For example: >
+		exist it is assumed to be one character.  For example: >
 			strcharpart('abc', -1, 2)
 <		results in 'a'.
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 0492ba891d..6684626487 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4085,7 +4085,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 			local to buffer
 	When off the buffer contents cannot be changed.  The 'fileformat' and
 	'fileencoding' options also can't be changed.
-	Can be reset with the |-M| command line argument.
+	Can be reset on startup with the |-M| command line argument.
 
 				*'modified'* *'mod'* *'nomodified'* *'nomod'*
 'modified' 'mod'	boolean	(default off)
@@ -4656,6 +4656,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 	buffer, unless the 'Z' flag is in 'cpoptions'.
 	When using the ":view" command the 'readonly' option is
 	set for the newly edited buffer.
+	See 'modifiable' for disallowing changes to the buffer.
 
 						*'redrawtime'* *'rdt'*
 'redrawtime' 'rdt'	number	(default 2000)
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index edb0770313..5822510a8a 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -181,6 +181,7 @@ argument.
 		the executable "view" has the same effect as the -R argument.
 		The 'updatecount' option will be set to 10000, meaning that
 		the swap file will not be updated automatically very often.
+		See |-M| for disallowing modifications.
 
 							*-m*
 -m		Modifications not allowed to be written.  The 'write' option
@@ -734,7 +735,7 @@ There are several ways to exit Vim:
 - Use `:cquit`.  Also when there are changes.
 
 When using `:cquit` or when there was an error message Vim exits with exit
-code 1.  Errors can be avoided by using `:silent!`.
+code 1.  Errors can be avoided by using `:silent!` or with `:catch`.
 
 ==============================================================================
 6. Saving settings					*save-settings*
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 039e7b3d05..7d0f9cf779 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -672,8 +672,14 @@ au BufNewFile,BufRead *.dtd			setf dtd
 " DTS/DSTI (device tree files)
 au BufNewFile,BufRead *.dts,*.dtsi		setf dts
 
-" EDIF (*.edf,*.edif,*.edn,*.edo)
-au BufNewFile,BufRead *.ed\(f\|if\|n\|o\)	setf edif
+" EDIF (*.edf,*.edif,*.edn,*.edo) or edn
+au BufNewFile,BufRead *.ed\(f\|if\|o\)		setf edif
+au BufNewFile,BufRead *.edn
+	\ if getline(1) =~ '^\s*(\s*edif\>' |
+	\   setf edif |
+	\ else |
+	\   setf clojure |
+	\ endif
 
 " EditorConfig (close enough to dosini)
 au BufNewFile,BufRead .editorconfig		setf dosini
diff --git a/runtime/syntax/css.vim b/runtime/syntax/css.vim
index 3dc3f5c2d6..23db7b10e8 100644
--- a/runtime/syntax/css.vim
+++ b/runtime/syntax/css.vim
@@ -6,7 +6,8 @@
 "               Nikolai Weibull (Add CSS2 support)
 " Maintainer:   Jules Wang      <w.jq0722@gmail.com>
 " URL:          https://github.com/JulesWang/css.vim
-" Last Change:  2015 Apr.17
+" Last Change:  2017 Jan 14
+"  		cssClassName updated by Ryuichi Hayashida Jan 2016
 
 " quit when a syntax file was already loaded
 if !exists("main_syntax")
@@ -56,7 +57,7 @@ syn match cssSelectorOp2 "[~|^$*]\?=" contained
 syn region cssAttributeSelector matchgroup=cssSelectorOp start="\[" end="]" contains=cssUnicodeEscape,cssSelectorOp2,cssStringQ,cssStringQQ
 
 " .class and #id
-syn match cssClassName "\.[A-Za-z][A-Za-z0-9_-]\+" contains=cssClassNameDot
+syn match cssClassName "\.-\=[A-Za-z_][A-Za-z0-9_-]*" contains=cssClassNameDot
 syn match cssClassNameDot contained '\.'
 
 try
diff --git a/runtime/syntax/debchangelog.vim b/runtime/syntax/debchangelog.vim
index a10e4ad342..eb02aaf4af 100644
--- a/runtime/syntax/debchangelog.vim
+++ b/runtime/syntax/debchangelog.vim
@@ -3,7 +3,7 @@
 " Maintainer:  Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainers: Gerfried Fuchs <alfie@ist.org>
 "                     Wichert Akkerman <wakkerma@debian.org>
-" Last Change: 2016 Aug 30
+" Last Change: 2016 Nov 12
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debchangelog.vim
 
 " Standard syntax initialization
@@ -21,7 +21,7 @@ let binNMU='binary-only=yes'
 syn match debchangelogName	contained "^[[:alnum:]][[:alnum:].+-]\+ "
 exe 'syn match debchangelogFirstKV	contained "; \('.urgency.'\|'.binNMU.'\)"'
 exe 'syn match debchangelogOtherKV	contained ", \('.urgency.'\|'.binNMU.'\)"'
-syn match debchangelogTarget	contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile|lts|security)|wheezy-%(backports%(-sloppy)=|security)|jessie%(-backports|-security)=|stretch|%(devel|precise|trusty|vivid|wily|xenial|yakkety)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
+syn match debchangelogTarget	contained "\v %(frozen|unstable|sid|%(testing|%(old)=stable)%(-proposed-updates|-security)=|experimental|squeeze-%(backports%(-sloppy)=|volatile|lts|security)|wheezy-%(backports%(-sloppy)=|security)|jessie%(-backports|-security)=|stretch|%(devel|precise|trusty|vivid|wily|xenial|yakkety|zesty)%(-%(security|proposed|updates|backports|commercial|partner))=)+"
 syn match debchangelogVersion	contained "(.\{-})"
 syn match debchangelogCloses	contained "closes:\_s*\(bug\)\=#\=\_s\=\d\+\(,\_s*\(bug\)\=#\=\_s\=\d\+\)*"
 syn match debchangelogLP	contained "\clp:\s\+#\d\+\(,\s*#\d\+\)*"
diff --git a/runtime/syntax/debcontrol.vim b/runtime/syntax/debcontrol.vim
index b52c496c95..b1bc9f8bfe 100644
--- a/runtime/syntax/debcontrol.vim
+++ b/runtime/syntax/debcontrol.vim
@@ -38,7 +38,7 @@ unlet s:kernels s:archs s:pairs
 syn match debcontrolMultiArch contained "\%(no\|foreign\|allowed\|same\)"
 syn match debcontrolName contained "[a-z0-9][a-z0-9+.-]\+"
 syn match debcontrolPriority contained "\(extra\|important\|optional\|required\|standard\)"
-syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|education|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|introspection|java|kde|kernel|libs|libdevel|lisp|localization|mail|math|metapackages|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|science|shells|sound|text|tex|utils|vcs|video|web|x11|xfce|zope)"
+syn match debcontrolSection contained "\v((contrib|non-free|non-US/main|non-US/contrib|non-US/non-free|restricted|universe|multiverse)/)?(admin|cli-mono|comm|database|debian-installer|debug|devel|doc|editors|education|electronics|embedded|fonts|games|gnome|gnustep|gnu-r|graphics|hamradio|haskell|httpd|interpreters|introspection|java|javascript|kde|kernel|libs|libdevel|lisp|localization|mail|math|metapackages|misc|net|news|ocaml|oldlibs|otherosfs|perl|php|python|ruby|rust|science|shells|sound|text|tex|utils|vcs|video|web|x11|xfce|zope)"
 syn match debcontrolPackageType contained "u\?deb"
 syn match debcontrolVariable contained "\${.\{-}}"
 syn match debcontrolDmUpload contained "\cyes"
diff --git a/runtime/syntax/debsources.vim b/runtime/syntax/debsources.vim
index 2777944971..390c43035e 100644
--- a/runtime/syntax/debsources.vim
+++ b/runtime/syntax/debsources.vim
@@ -2,7 +2,7 @@
 " Language:     Debian sources.list
 " Maintainer:   Debian Vim Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>
 " Former Maintainer: Matthijs Mohlmann <matthijs@cacholong.nl>
-" Last Change: 2016 Sep 27
+" Last Change: 2016 Nov 12
 " URL: https://anonscm.debian.org/cgit/pkg-vim/vim.git/plain/runtime/syntax/debsources.vim
 
 " Standard syntax initialization
@@ -25,7 +25,7 @@ let s:supported = [
       \ 'oldstable', 'stable', 'testing', 'unstable', 'experimental',
       \ 'squeeze', 'wheezy', 'jessie', 'stretch', 'sid', 'rc-buggy',
       \
-      \ 'precise', 'trusty', 'xenial', 'yakkety', 'devel'
+      \ 'precise', 'trusty', 'xenial', 'yakkety', 'zesty', 'devel'
       \ ]
 let s:unsupported = [
       \ 'buzz', 'rex', 'bo', 'hamm', 'slink', 'potato',

From ac107f7fddc59ef286e3ef3979afe0ea5e94633a Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 1 May 2017 13:19:45 +0200
Subject: [PATCH 220/257] vim-patch:690afe1fef87

Update runtime files.

https://github.com/vim/vim/commit/690afe1fef87e7eef6fb7343a926617d5f7315fa
---
 runtime/doc/eval.txt          |  30 ++++--
 runtime/doc/syntax.txt        |  10 ++
 runtime/doc/usr_41.txt        |   1 +
 runtime/indent/html.vim       |  25 ++---
 runtime/syntax/autohotkey.vim | 188 +++++++++++++++++++---------------
 runtime/syntax/html.vim       |  21 ++--
 runtime/syntax/matlab.vim     |  10 +-
 runtime/syntax/nasm.vim       |  25 ++++-
 runtime/syntax/sh.vim         |  18 ++--
 runtime/syntax/tex.vim        |  36 ++++++-
 runtime/syntax/vim.vim        |   3 +-
 11 files changed, 234 insertions(+), 133 deletions(-)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 7573165c60..c992430234 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -2177,8 +2177,8 @@ matchstr({expr}, {pat}[, {start}[, {count}]])
 				String	{count}'th match of {pat} in {expr}
 matchstrpos({expr}, {pat}[, {start}[, {count}]])
 				List	{count}'th match of {pat} in {expr}
-max({list})			Number	maximum value of items in {list}
-min({list})			Number	minimum value of items in {list}
+max({expr})			Number	maximum value of items in {expr}
+min({expr})			Number	minimum value of items in {expr}
 mkdir({name} [, {path} [, {prot}]])
 				Number	create directory {name}
 mode([expr])			String	current editing mode
@@ -3915,6 +3915,10 @@ getchar([expr])						*getchar()*
 			  exe "normal " . v:mouse_col . "|"
 			endif
 <
+		When using bracketed paste only the first character is
+		returned, the rest of the pasted text is dropped.
+		|xterm-bracketed-paste|.
+
 		There is no prompt, you will somehow have to make clear to the
 		user that a character has to be typed.
 		There is no mapping for the character.
@@ -5481,16 +5485,20 @@ matchstrpos({expr}, {pat}[, {start}[, {count}]])		*matchstrpos()*
 		The type isn't changed, it's not necessarily a String.
 
 							*max()*
-max({list})	Return the maximum value of all items in {list}.
-		If {list} is not a list or one of the items in {list} cannot
-		be used as a Number this results in an error.
-		An empty |List| results in zero.
+max({expr})	Return the maximum value of all items in {expr}.
+		{expr} can be a list or a dictionary.  For a dictionary,
+		it returns the maximum of all values in the dictionary.
+		If {expr} is neither a list nor a dictionary, or one of the
+		items in {expr} cannot be used as a Number this results in
+                an error.  An empty |List| or |Dictionary| results in zero.
 
 							*min()*
-min({list})	Return the minimum value of all items in {list}.
-		If {list} is not a list or one of the items in {list} cannot
-		be used as a Number this results in an error.
-		An empty |List| results in zero.
+min({expr})	Return the minimum value of all items in {expr}.
+		{expr} can be a list or a dictionary.  For a dictionary,
+		it returns the minimum of all values in the dictionary.
+		If {expr} is neither a list nor a dictionary, or one of the
+		items in {expr} cannot be used as a Number this results in
+                an error.  An empty |List| or |Dictionary| results in zero.
 
 							*mkdir()* *E739*
 mkdir({name} [, {path} [, {prot}]])
@@ -7897,7 +7905,7 @@ winnr([{arg}])	The result is a Number, which is the number of the current
 		is returned.
 		The number can be used with |CTRL-W_w| and ":wincmd w"
 		|:wincmd|.
-		Also see |tabpagewinnr()|.
+		Also see |tabpagewinnr()| and |win_getid()|.
 
 							*winrestcmd()*
 winrestcmd()	Returns a sequence of |:resize| commands that should restore
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 9c0f1cd989..364b0c2ac2 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -3454,6 +3454,8 @@ DEFINING CASE						*:syn-case* *E390*
 	"ignore".  Note that any items before this are not affected, and all
 	items until the next ":syntax case" command are affected.
 
+:sy[ntax] case
+	Show either "syntax case match" or "syntax case ignore" (translated).
 
 SPELL CHECKING						*:syn-spell*
 
@@ -3471,6 +3473,11 @@ SPELL CHECKING						*:syn-spell*
 
 	To activate spell checking the 'spell' option must be set.
 
+:sy[ntax] spell
+	Show either "syntax spell toplevel", "syntax spell notoplevel" or
+	"syntax spell default" (translated).
+
+
 SYNTAX ISKEYWORD SETTING				*:syn-iskeyword*
 
 :sy[ntax] iskeyword [clear | {option}]
@@ -4064,6 +4071,9 @@ IMPLICIT CONCEAL					*:syn-conceal-implicit*
 	off" returns to the normal state where the "conceal" flag must be
 	given explicitly.
 
+:sy[ntax] conceal
+	Show either "syntax conceal on" or "syntax conceal off" (translated).
+
 ==============================================================================
 7. Syntax patterns				*:syn-pattern* *E401* *E402*
 
diff --git a/runtime/doc/usr_41.txt b/runtime/doc/usr_41.txt
index 77c238ae97..1d09b532a4 100644
--- a/runtime/doc/usr_41.txt
+++ b/runtime/doc/usr_41.txt
@@ -952,6 +952,7 @@ Various:					*various-functions*
 
 	py3eval()		evaluate Python expression (|+python3|)
 	pyeval()		evaluate Python expression (|+python|)
+	pyxeval()		evaluate |python_x| expression
 
 ==============================================================================
 *41.7*	Defining a function
diff --git a/runtime/indent/html.vim b/runtime/indent/html.vim
index 13adaae54c..57ba53ecd4 100644
--- a/runtime/indent/html.vim
+++ b/runtime/indent/html.vim
@@ -2,7 +2,7 @@
 " Header: "{{{
 " Maintainer:	Bram Moolenaar
 " Original Author: Andy Wokula <anwoku@yahoo.de>
-" Last Change:	2016 Mar 30
+" Last Change:	2017 Jan 17
 " Version:	1.0
 " Description:	HTML indent script with cached state for faster indenting on a
 "		range of lines.
@@ -25,27 +25,22 @@
 if exists("b:did_indent") "{{{
   finish
 endif
+
+" Load the Javascript indent script first, it defines GetJavascriptIndent().
+" Undo the rest.
+" Load base python indent.
+if !exists('*GetJavascriptIndent')
+  runtime! indent/javascript.vim
+endif
 let b:did_indent = 1
 
 setlocal indentexpr=HtmlIndent()
 setlocal indentkeys=o,O,<Return>,<>>,{,},!^F
 
-" "j1" is included to make cindent() work better with Javascript.
-setlocal cino=j1
-" "J1" should be included, but it doen't work properly before 7.4.355.
-if has("patch-7.4.355")
-  setlocal cino+=J1
-endif
-" Before patch 7.4.355 indenting after "(function() {" does not work well, add
-" )2 to limit paren search.
-if !has("patch-7.4.355")
-  setlocal cino+=)2
-endif
-
 " Needed for % to work when finding start/end of a tag.
 setlocal matchpairs+=<:>
 
-let b:undo_indent = "setlocal inde< indk< cino<"
+let b:undo_indent = "setlocal inde< indk<"
 
 " b:hi_indent keeps state to speed up indenting consecutive lines.
 let b:hi_indent = {"lnum": -1}
@@ -596,7 +591,7 @@ func! s:Alien3()
     return eval(b:hi_js1indent)
   endif
   if b:hi_indent.scripttype == "javascript"
-    return cindent(v:lnum)
+    return GetJavascriptIndent()
   else
     return -1
   endif
diff --git a/runtime/syntax/autohotkey.vim b/runtime/syntax/autohotkey.vim
index 764f94b11a..3b826af6f5 100644
--- a/runtime/syntax/autohotkey.vim
+++ b/runtime/syntax/autohotkey.vim
@@ -1,8 +1,10 @@
 " Vim syntax file
 " Language:         AutoHotkey script file
-" Maintainer:       SungHyun Nam <goweol@gmail.com>
-" Previous Maintainer:       Nikolai Weibull <now@bitwi.se>
-" Latest Revision:  2015-10-29
+" Maintainer:       Michael Wong
+"                   https://github.com/mmikeww/autohotkey.vim
+" Latest Revision:  2017-01-23
+" Previous Maintainers:       SungHyun Nam <goweol@gmail.com>
+"                             Nikolai Weibull <now@bitwi.se>
 
 if exists("b:current_syntax")
   finish
@@ -17,68 +19,11 @@ syn keyword autohotkeyTodo
       \ contained
       \ TODO FIXME XXX NOTE
 
-syn cluster autohotkeyCommentGroup
-      \ contains=
-      \   autohotkeyTodo,
-      \   @Spell
-
-syn match   autohotkeyComment
-      \ display
-      \ contains=@autohotkeyCommentGroup
-      \ '`\@<!;.*$'
-
-syn region  autohotkeyComment
-      \ contains=@autohotkeyCommentGroup
-      \ matchgroup=autohotkeyCommentStart
-      \ start='/\*'
-      \ end='\*/'
-
+" only these chars are valid as escape sequences:   ,%`;nrbtvaf
+" https://autohotkey.com/docs/commands/_EscapeChar.htm
 syn match   autohotkeyEscape
       \ display
-      \ '`.'
-
-syn match   autohotkeyHotkey
-      \ contains=autohotkeyKey,
-      \   autohotkeyHotkeyDelimiter
-      \ display
-      \ '^.\{-}::'
-
-syn match   autohotkeyKey
-      \ contained
-      \ display
-      \ '^.\{-}'
-
-syn match   autohotkeyDelimiter
-      \ contained
-      \ display
-      \ '::'
-
-syn match   autohotkeyHotstringDefinition
-      \ contains=autohotkeyHotstring,
-      \   autohotkeyHotstringDelimiter
-      \ display
-      \ '^:\%(B0\|C1\|K\d\+\|P\d\+\|S[IPE]\|Z\d\=\|[*?COR]\)*:.\{-}::'
-
-syn match   autohotkeyHotstring
-      \ contained
-      \ display
-      \ '.\{-}'
-
-syn match   autohotkeyHotstringDelimiter
-      \ contained
-      \ display
-      \ '::'
-
-syn match   autohotkeyHotstringDelimiter
-      \ contains=autohotkeyHotstringOptions
-      \ contained
-      \ display
-      \ ':\%(B0\|C1\|K\d\+\|P\d\+\|S[IPE]\|Z\d\=\|[*?COR]\):'
-
-syn match   autohotkeyHotstringOptions
-      \ contained
-      \ display
-      \ '\%(B0\|C1\|K\d\+\|P\d\+\|S[IPE]\|Z\d\=\|[*?COR]\)'
+      \ '`[,%`;nrbtvaf]'
 
 syn region autohotkeyString
       \ display
@@ -88,39 +33,46 @@ syn region autohotkeyString
       \ end=+"+
       \ contains=autohotkeyEscape
 
-syn region autohotkeyVariable
+syn match autohotkeyVariable
       \ display
       \ oneline
       \ contains=autohotkeyBuiltinVariable
-      \ matchgroup=autohotkeyVariableDelimiter
-      \ start="%"
-      \ end="%"
       \ keepend
+      \ '%\S\{-}%'
 
 syn keyword autohotkeyBuiltinVariable
       \ A_Space A_Tab
-      \ A_WorkingDir A_ScriptDir A_ScriptName A_ScriptFullPath A_LineNumber
-      \ A_LineFile A_AhkVersion A_AhkPAth A_IsCompiled A_ExitReason
-      \ A_YYYY A_MM A_DD A_MMMM A_MMM A_DDDD A_DDD A_WDay A_YWeek A_Hour A_Min
+      \ A_WorkingDir A_ScriptDir A_ScriptName A_ScriptFullPath A_ScriptHwnd A_LineNumber
+      \ A_LineFile A_ThisFunc A_ThisLabel A_AhkVersion A_AhkPath A_IsUnicode A_IsCompiled A_ExitReason
+      \ A_YYYY A_MM A_DD A_MMMM A_MMM A_DDDD A_DDD A_WDay A_YDay A_YWeek A_Hour A_Min
+      \ A_Mon A_Year A_MDay A_NumBatchLines
       \ A_Sec A_MSec A_Now A_NowUTC A_TickCount
-      \ A_IsSuspended A_BatchLines A_TitleMatchMode A_TitleMatchModeSpeed
-      \ A_DetectHiddenWindows A_DetectHiddenText A_AutoTrim A_STringCaseSense
-      \ A_FormatInteger A_FormatFloat A_KeyDelay A_WinDelay A_ControlDelay
-      \ A_MouseDelay A_DefaultMouseSpeed A_IconHidden A_IconTip A_IconFile
+      \ A_IsSuspended A_IsPaused A_IsCritical A_BatchLines A_TitleMatchMode A_TitleMatchModeSpeed
+      \ A_DetectHiddenWindows A_DetectHiddenText A_AutoTrim A_StringCaseSense
+      \ A_FileEncoding A_FormatInteger A_FormatFloat A_KeyDelay A_WinDelay A_ControlDelay
+      \ A_SendMode A_SendLevel A_StoreCapsLockMode A_KeyDelay A_KeyDelayDuration
+      \ A_KeyDelayPlay A_KeyDelayPlayDuration A_MouseDelayPlay
+      \ A_MouseDelay A_DefaultMouseSpeed A_RegView A_IconHidden A_IconTip A_IconFile
+      \ A_CoordModeToolTip A_CoordModePixel A_CoordModeMouse A_CoordModeCaret A_CoordModeMenu
       \ A_IconNumber
-      \ A_TimeIdle A_TimeIdlePhysical
+      \ A_TimeIdle A_TimeIdlePhysical A_DefaultGui A_DefaultListView A_DefaultTreeView
       \ A_Gui A_GuiControl A_GuiWidth A_GuiHeight A_GuiX A_GuiY A_GuiEvent
       \ A_GuiControlEvent A_EventInfo
       \ A_ThisMenuItem A_ThisMenu A_ThisMenuItemPos A_ThisHotkey A_PriorHotkey
-      \ A_TimeSinceThisHotkey A_TimeSincePriorHotkey A_EndChar
+      \ A_PriorKey A_TimeSinceThisHotkey A_TimeSincePriorHotkey A_EndChar
       \ ComSpec A_Temp A_OSType A_OSVersion A_Language A_ComputerName A_UserName
+      \ A_Is64BitOS A_PtrSize
       \ A_WinDir A_ProgramFiles ProgramFiles A_AppData A_AppDataCommon A_Desktop
       \ A_DesktopCommon A_StartMenu A_StartMenuCommon A_Programs
       \ A_ProgramsCommon A_Startup A_StartupCommon A_MyDocuments A_IsAdmin
-      \ A_ScreenWidth A_ScreenHeight A_IPAddress1 A_IPAddress2 A_IPAddress3
+      \ A_ScreenWidth A_ScreenHeight A_ScreenDPI A_IPAddress1 A_IPAddress2 A_IPAddress3
       \ A_IPAddress4
       \ A_Cursor A_CaretX A_CaretY Clipboard ClipboardAll ErrorLevel A_LastError
       \ A_Index A_LoopFileName A_LoopRegName A_LoopReadLine A_LoopField
+      \ A_LoopFileExt A_LoopFileFullPath A_LoopFileLongPath A_LoopFileShortPath
+      \ A_LoopFileShortName A_LoopFileDir A_LoopFileTimeModified A_LoopFileTimeCreated
+      \ A_LoopFileTimeAccessed A_LoopFileAttrib A_LoopFileSize A_LoopFileSizeKB A_LoopFileSizeMB
+      \ A_LoopRegType A_LoopRegKey A_LoopRegSubKey A_LoopRegTimeModified
 
 syn match   autohotkeyBuiltinVariable
       \ contained
@@ -130,7 +82,7 @@ syn match   autohotkeyBuiltinVariable
 syn keyword autohotkeyCommand
       \ ClipWait EnvGet EnvSet EnvUpdate
       \ Drive DriveGet DriveSpaceFree FileAppend FileCopy FileCopyDir
-      \ FileCreateDir FileCreateShortcut FileDelete FileGetAttrib
+      \ FileCreateDir FileCreateShortcut FileDelete FileGetAttrib FileEncoding
       \ FileGetShortcut FileGetSize FileGetTime FileGetVersion FileInstall
       \ FileMove FileMoveDir FileReadLine FileRead FileRecycle FileRecycleEmpty
       \ FileRemoveDir FileSelectFolder FileSelectFile FileSetAttrib FileSetTime
@@ -153,7 +105,7 @@ syn keyword autohotkeyCommand
       \ SoundSetWaveVolume
       \ FormatTime IfInString IfNotInString Sort StringCaseSense StringGetPos
       \ StringLeft StringRight StringLower StringUpper StringMid StringReplace
-      \ StringSplit StringTrimLeft StringTrimRight
+      \ StringSplit StringTrimLeft StringTrimRight StringLen
       \ Control ControlClick ControlFocus ControlGet ControlGetFocus
       \ ControlGetPos ControlGetText ControlMove ControlSend ControlSendRaw
       \ ControlSetText Menu PostMessage SendMessage SetControlDelay
@@ -164,12 +116,16 @@ syn keyword autohotkeyCommand
       \ WinGetText WinGetTitle WinHide WinKill WinMaximize WinMinimize
       \ WinMinimizeAll WinMinimizeAllUndo WinMove WinRestore WinSet
       \ WinSetTitle WinShow WinWait WinWaitActive WinWaitNotActive WinWaitClose
+      \ SetCapsLockState SetNumLockState SetScrollLockState
 
 syn keyword autohotkeyFunction
       \ InStr RegExMatch RegExReplace StrLen SubStr Asc Chr
       \ DllCall VarSetCapacity WinActive WinExist IsLabel OnMessage 
       \ Abs Ceil Exp Floor Log Ln Mod Round Sqrt Sin Cos Tan ASin ACos ATan
-      \ FileExist GetKeyState
+      \ FileExist GetKeyState NumGet NumPut StrGet StrPut RegisterCallback
+      \ IsFunc Trim LTrim RTrim IsObject Object Array FileOpen
+      \ ComObjActive ComObjArray ComObjConnect ComObjCreate ComObjGet
+      \ ComObjError ComObjFlags ComObjQuery ComObjType ComObjValue ComObject
 
 syn keyword autohotkeyStatement
       \ Break Continue Exit ExitApp Gosub Goto OnExit Pause Return
@@ -180,7 +136,9 @@ syn keyword autohotkeyRepeat
 
 syn keyword autohotkeyConditional
       \ IfExist IfNotExist If IfEqual IfLess IfGreater Else
-      \ IfWinExist IfWinNotExist
+      \ IfWinExist IfWinNotExist IfWinActive IfWinNotActive
+      \ IfNotEqual IfLessOrEqual IfGreaterOrEqual
+      \ while until for in
 
 syn match   autohotkeyPreProcStart
       \ nextgroup=
@@ -200,6 +158,7 @@ syn keyword autohotkeyPreProc
       \ HotkeyInterval HotKeyModifierTimeout
       \ Hotstring
       \ IfWinActive IfWinNotActive IfWinExist IfWinNotExist
+      \ If IfTimeout
       \ MaxHotkeysPerInterval MaxThreads MaxThreadsBuffer MaxThreadsPerHotkey
       \ UseHook InstallKeybdHook InstallMouseHook
       \ KeyHistory
@@ -213,6 +172,10 @@ syn keyword autohotkeyPreProc
       \ MaxMem
       \ NoEnv
       \ Persistent
+      \ LTrim
+      \ InputLevel
+      \ MenuMaskKey
+      \ Warn
 
 syn keyword autohotkeyMatchClass
       \ ahk_group ahk_class ahk_id ahk_pid
@@ -243,11 +206,74 @@ syn match   autohotkeyFloat
 syn keyword autohotkeyType
       \ local
       \ global
+      \ static
+      \ byref
 
 syn keyword autohotkeyBoolean
       \ true
       \ false
 
+syn match   autohotkeyHotkey
+      \ contains=autohotkeyKey,
+      \   autohotkeyHotkeyDelimiter
+      \ display
+      \ '^.\{-}::'
+
+syn match   autohotkeyKey
+      \ contained
+      \ display
+      \ '^.\{-}'
+
+syn match   autohotkeyDelimiter
+      \ contained
+      \ display
+      \ '::'
+
+" allowable hotstring options:
+" https://autohotkey.com/docs/Hotstrings.htm
+syn match   autohotkeyHotstringDefinition
+      \ contains=autohotkeyHotstring,
+      \   autohotkeyHotstringDelimiter
+      \ display
+      \ '^\s*:\%([*?]\|[BORZ]0\?\|C[01]\?\|K\d\+\|P\d\+\|S[IPE]\)*:.\{-}::'
+
+syn match   autohotkeyHotstring
+      \ contained
+      \ display
+      \ '.\{-}'
+
+syn match   autohotkeyHotstringDelimiter
+      \ contained
+      \ display
+      \ '::'
+
+syn match   autohotkeyHotstringDelimiter
+      \ contains=autohotkeyHotstringOptions
+      \ contained
+      \ display
+      \ ':\%([*?]\|[BORZ]0\?\|C[01]\?\|K\d\+\|P\d\+\|S[IPE]\)*:'
+
+syn match   autohotkeyHotstringOptions
+      \ contained
+      \ display
+      \ '\%([*?]\|[BORZ]0\?\|C[01]\?\|K\d\+\|P\d\+\|S[IPE]\)*'
+
+syn cluster autohotkeyCommentGroup
+      \ contains=
+      \   autohotkeyTodo,
+      \   @Spell
+
+syn match   autohotkeyComment
+      \ display
+      \ contains=@autohotkeyCommentGroup
+      \ '\%(^;\|\s\+;\).*$'
+
+syn region  autohotkeyComment
+      \ contains=@autohotkeyCommentGroup
+      \ matchgroup=autohotkeyCommentStart
+      \ start='^\s*/\*'
+      \ end='^\s*\*/'
+
 " TODO: Shouldn't we look for g:, b:,  variables before defaulting to
 " something?
 if exists("g:autohotkey_syntax_sync_minlines")
diff --git a/runtime/syntax/html.vim b/runtime/syntax/html.vim
index b168750db4..49d3ab4adb 100644
--- a/runtime/syntax/html.vim
+++ b/runtime/syntax/html.vim
@@ -3,7 +3,7 @@
 " Maintainer:           Jorge Maldonado Ventura <jorgesumle@freakspot.net>
 " Previous Maintainer:  Claudio Fleiner <claudio@fleiner.com>
 " Repository:           https://notabug.org/jorgesumle/vim-html-syntax
-" Last Change:          2017 Jan 04
+" Last Change:          2017 Jan 21
 "                       included patch from Jorge Maldonado Ventura
 
 " Please check :help html.vim for some comments and a description of the options
@@ -55,9 +55,9 @@ syn keyword htmlTagName contained colgroup del fieldset iframe ins legend
 syn keyword htmlTagName contained object optgroup q s tbody tfoot thead
 
 " new html 5 tags
-syn keyword htmlTagName contained article aside audio bdi canvas datalist
-syn keyword htmlTagName contained details embed figcaption figure
-syn keyword htmlTagName contained footer header hgroup main mark
+syn keyword htmlTagName contained article aside audio bdi canvas data
+syn keyword htmlTagName contained datalist details embed figcaption figure
+syn keyword htmlTagName contained footer header hgroup keygen main mark
 syn keyword htmlTagName contained menuitem meter nav output picture
 syn keyword htmlTagName contained progress rb rp rt rtc ruby section
 syn keyword htmlTagName contained slot source template time track video wbr
@@ -97,8 +97,17 @@ syn keyword htmlArg contained rules scheme scope span standby style
 syn keyword htmlArg contained summary tabindex valuetype version
 
 " html 5 arg names
-syn keyword htmlArg contained contenteditable contextmenu draggable dropzone
-syn keyword htmlArg contained hidden spellcheck title translate
+syn keyword htmlArg contained allowfullscreen async autocomplete autofocus
+syn keyword htmlArg contained autoplay challenge contenteditable contextmenu
+syn keyword htmlArg contained controls crossorigin default dirname download
+syn keyword htmlArg contained draggable dropzone form formaction formenctype
+syn keyword htmlArg contained formmethod formnovalidate formtarget hidden
+syn keyword htmlArg contained high icon inputmode keytype kind list loop low
+syn keyword htmlArg contained max min minlength muted nonce novalidate open
+syn keyword htmlArg contained optimum pattern placeholder poster preload
+syn keyword htmlArg contained radiogroup required reversed sandbox spellcheck
+syn keyword htmlArg contained sizes srcset srcdoc srclang step title translate
+syn keyword htmlArg contained typemustmatch
 
 " special characters
 syn match htmlSpecialChar "&#\=[0-9A-Za-z]\{1,8};"
diff --git a/runtime/syntax/matlab.vim b/runtime/syntax/matlab.vim
index 92ffbbc1ed..5228bb5c43 100644
--- a/runtime/syntax/matlab.vim
+++ b/runtime/syntax/matlab.vim
@@ -1,11 +1,13 @@
 " Vim syntax file
 " Language:	Matlab
-" Maintainer:	Maurizio Tranchero - maurizio(.)tranchero(@)gmail(.)com
+" Maintainer:	Alex Burka <vim@alexburka.com>
 " Credits:	Preben 'Peppe' Guldberg <peppe-vim@wielders.org>
+"		Maurizio Tranchero - maurizio(.)tranchero(@)gmail(.)com
 "		Original author: Mario Eusebio
-" Last Change:	Wed Jan 13 11:12:34 CET 2010
-" 		sinh added to matlab implicit commands
+" Last Change:	Mon Jan 23 2017
+" 		added support for cell mode
 " Change History:
+" 		- now highlights cell-mode separator comments
 " 		- 'global' and 'persistent' keyword are now recognized
 
 " quit when a syntax file was already loaded
@@ -60,6 +62,7 @@ syn match matlabComment			"%.*$"	contains=matlabTodo,matlabTab
 " MT_ADDON - correctly highlights words after '...' as comments
 syn match matlabComment			"\.\.\..*$"	contains=matlabTodo,matlabTab
 syn region matlabMultilineComment	start=+%{+ end=+%}+ contains=matlabTodo,matlabTab
+syn match matlabCellComment     "^%%.*$"
 
 syn keyword matlabOperator		break zeros default margin round ones rand
 syn keyword matlabOperator		ceil floor size clear zeros eye mean std cov
@@ -96,6 +99,7 @@ hi def link matlabOO			Statement
 hi def link matlabSemicolon		SpecialChar
 hi def link matlabComment			Comment
 hi def link matlabMultilineComment		Comment
+hi def link matlabCellComment          Todo
 hi def link matlabScope			Type
 
 hi def link matlabArithmeticOperator	matlabOperator
diff --git a/runtime/syntax/nasm.vim b/runtime/syntax/nasm.vim
index d6485080ee..4f70a0f334 100644
--- a/runtime/syntax/nasm.vim
+++ b/runtime/syntax/nasm.vim
@@ -1,9 +1,10 @@
 " Vim syntax file
 " Language:	NASM - The Netwide Assembler (v0.98)
-" Maintainer:	Andriy Sokolov	<andriy145@gmail.com>
+" Maintainer:	Andrii Sokolov	<andriy145@gmail.com>
 " Original Author:	Manuel M.H. Stol	<Manuel.Stol@allieddata.nl>
 " Former Maintainer:	Manuel M.H. Stol	<Manuel.Stol@allieddata.nl>
-" Last Change:	2012 Feb 7
+" Contributors: Leonard König <leonard.r.koenig@gmail.com> (C string highlighting)
+" Last Change:	2017 Jan 23
 " NASM Home:	http://www.nasm.us/
 
 
@@ -67,8 +68,23 @@ syn match   nasmLabelError	"\<\~\s*\(\k*\s*:\|\$\=\.\k*\)"
 
 
 " Constants:
-syn match   nasmStringError	+["']+
+syn match   nasmStringError	+["'`]+
+" NASM is case sensitive here: eg. u-prefix allows for 4-digit, U-prefix for
+" 8-digit Unicode characters
+syn case match
+" one-char escape-sequences
+syn match   nasmCStringEscape  display contained "\\[’"‘\\\?abtnvfre]"
+" hex and octal numbers
+syn match   nasmCStringEscape  display contained "\\\(x\x\{2}\|\o\{1,3}\)"
+" Unicode characters
+syn match   nasmCStringEscape	display contained "\\\(u\x\{4}\|U\x\{8}\)"
+" ISO C99 format strings (copied from cFormat in runtime/syntax/c.vim)
+syn match   nasmCStringFormat	display "%\(\d\+\$\)\=[-+' #0*]*\(\d*\|\*\|\*\d\+\$\)\(\.\(\d*\|\*\|\*\d\+\$\)\)\=\([hlLjzt]\|ll\|hh\)\=\([aAbdiuoxXDOUfFeEgGcCsSpn]\|\[\^\=.[^]]*\]\)" contained
+syn match   nasmCStringFormat	display "%%" contained
 syn match   nasmString		+\("[^"]\{-}"\|'[^']\{-}'\)+
+" Highlight C escape- and format-sequences within ``-strings
+syn match   nasmCString	+\(`[^`]\{-}`\)+ contains=nasmCStringEscape,nasmCStringFormat extend
+syn case ignore
 syn match   nasmBinNumber	"\<[0-1]\+b\>"
 syn match   nasmBinNumber	"\<\~[0-1]\+b\>"lc=1
 syn match   nasmOctNumber	"\<\o\+q\>"
@@ -443,7 +459,10 @@ hi def link nasmInCommentTodo	Todo
 
 " Constant Group:
 hi def link nasmString		String
+hi def link nasmCString	String
 hi def link nasmStringError	Error
+hi def link nasmCStringEscape	SpecialChar
+hi def link nasmCStringFormat	SpecialChar
 hi def link nasmBinNumber		Number
 hi def link nasmOctNumber		Number
 hi def link nasmDecNumber		Number
diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index 2f880bbc12..4cdced03b3 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -2,8 +2,8 @@
 " Language:		shell (sh) Korn shell (ksh) bash (sh)
 " Maintainer:		Charles E. Campbell  <NdrOchipS@PcampbellAfamily.Mbiz>
 " Previous Maintainer:	Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change:		Sep 22, 2016
-" Version:		165
+" Last Change:		Jan 03, 2017
+" Version:		167
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
 " For options and settings, please use:      :help ft-sh-syntax
 " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr)
@@ -305,7 +305,7 @@ if exists("b:is_bash")
  syn cluster shCommandSubList add=bashSpecialVariables,bashStatement
  syn cluster shCaseList add=bashAdminStatement,bashStatement
  syn keyword bashSpecialVariables contained auto_resume BASH BASH_ALIASES BASH_ALIASES BASH_ARGC BASH_ARGC BASH_ARGV BASH_ARGV BASH_CMDS BASH_CMDS BASH_COMMAND BASH_COMMAND BASH_ENV BASH_EXECUTION_STRING BASH_EXECUTION_STRING BASH_LINENO BASH_LINENO BASHOPTS BASHOPTS BASHPID BASHPID BASH_REMATCH BASH_REMATCH BASH_SOURCE BASH_SOURCE BASH_SUBSHELL BASH_SUBSHELL BASH_VERSINFO BASH_VERSION BASH_XTRACEFD BASH_XTRACEFD CDPATH COLUMNS COLUMNS COMP_CWORD COMP_CWORD COMP_KEY COMP_KEY COMP_LINE COMP_LINE COMP_POINT COMP_POINT COMPREPLY COMPREPLY COMP_TYPE COMP_TYPE COMP_WORDBREAKS COMP_WORDBREAKS COMP_WORDS COMP_WORDS COPROC COPROC DIRSTACK EMACS EMACS ENV ENV EUID FCEDIT FIGNORE FUNCNAME FUNCNAME FUNCNEST FUNCNEST GLOBIGNORE GROUPS histchars HISTCMD HISTCONTROL HISTFILE HISTFILESIZE HISTIGNORE HISTSIZE HISTTIMEFORMAT HISTTIMEFORMAT HOME HOSTFILE HOSTNAME HOSTTYPE IFS IGNOREEOF INPUTRC LANG LC_ALL LC_COLLATE LC_CTYPE LC_CTYPE LC_MESSAGES LC_NUMERIC LC_NUMERIC LINENO LINES LINES MACHTYPE MAIL MAILCHECK MAILPATH MAPFILE MAPFILE OLDPWD OPTARG OPTERR OPTIND OSTYPE PATH PIPESTATUS POSIXLY_CORRECT POSIXLY_CORRECT PPID PROMPT_COMMAND PS1 PS2 PS3 PS4 PWD RANDOM READLINE_LINE READLINE_LINE READLINE_POINT READLINE_POINT REPLY SECONDS SHELL SHELL SHELLOPTS SHLVL TIMEFORMAT TIMEOUT TMPDIR TMPDIR UID
- syn keyword bashStatement chmod clear complete du egrep expr fgrep find gnufind gnugrep grep less ls mkdir mv rm rmdir rpm sed sleep sort strip tail 
+ syn keyword bashStatement chmod clear complete du egrep expr fgrep find gnufind gnugrep grep less ls mkdir mv rm rmdir rpm sed sleep sort strip tail
  syn keyword bashAdminStatement daemon killall killproc nice reload restart start status stop
  syn keyword bashStatement	command compgen
 endif
@@ -376,8 +376,8 @@ ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc06 start="<<-\s*\"\z([^ \
 ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc07 start="<<\s*\\\_$\_s*\z([^ \t|>]\+\)"		matchgroup=shHereDoc07 end="^\z1\s*$"           contains=@shDblQuoteList
 ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc08 start="<<\s*\\\_$\_s*'\z([^ \t|>]\+\)'"	matchgroup=shHereDoc08 end="^\z1\s*$"
 ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc09 start="<<\s*\\\_$\_s*\"\z([^ \t|>]\+\)\""	matchgroup=shHereDoc09 end="^\z1\s*$"
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc10 start="<<-\s*\\\_$\_s*\z([^ \t|>]\+\)"	matchgroup=shHereDoc10 end="^\s*\z1\s*$"	
-ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc11 start="<<-\s*\\\_$\_s*\\\z([^ \t|>]\+\)"	matchgroup=shHereDoc11 end="^\s*\z1\s*$"	
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc10 start="<<-\s*\\\_$\_s*\z([^ \t|>]\+\)"	matchgroup=shHereDoc10 end="^\s*\z1\s*$"
+ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc11 start="<<-\s*\\\_$\_s*\\\z([^ \t|>]\+\)"	matchgroup=shHereDoc11 end="^\s*\z1\s*$"
 ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc12 start="<<-\s*\\\_$\_s*'\z([^ \t|>]\+\)'"	matchgroup=shHereDoc12 end="^\s*\z1\s*$"
 ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc13 start="<<-\s*\\\_$\_s*\"\z([^ \t|>]\+\)\""	matchgroup=shHereDoc13 end="^\s*\z1\s*$"
 ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc14 start="<<\\\z([^ \t|>]\+\)"		matchgroup=shHereDoc14 end="^\z1\s*$"
@@ -386,7 +386,7 @@ ShFoldHereDoc syn region shHereDoc matchgroup=shHereDoc15 start="<<-\s*\\\z([^ \
 " Here Strings: {{{1
 " =============
 " available for: bash; ksh (really should be ksh93 only) but not if its a posix
-if exists("b:is_bash") || (exists("b:is_kornshell") && !exists("g:is_posix"))
+if exists("b:is_bash") || (exists("b:is_kornshell") && !exists("b:is_posix"))
  syn match shHereString "<<<"	skipwhite	nextgroup=shCmdParenRegion
 endif
 
@@ -407,7 +407,7 @@ else
 endif
 
 " Functions: {{{1
-if !exists("g:is_posix")
+if !exists("b:is_posix")
  syn keyword shFunctionKey function	skipwhite skipnl nextgroup=shFunctionTwo
 endif
 
@@ -533,7 +533,7 @@ endif
 " ====================
 if exists("b:is_kornshell") || exists("b:is_bash")
  syn keyword shStatement autoload bg false fc fg functions getopts hash history integer jobs let nohup printf r stop suspend times true type unalias whence
- if exists("g:is_posix")
+ if exists("b:is_posix")
   syn keyword shStatement command
  else
   syn keyword shStatement time
@@ -542,7 +542,7 @@ if exists("b:is_kornshell") || exists("b:is_bash")
 " Useful bash Keywords: {{{1
 " =====================
  if exists("b:is_bash")
-  syn keyword shStatement bind builtin dirs disown enable help local logout popd pushd shopt source
+  syn keyword shStatement bind builtin dirs disown enable help logout popd pushd shopt source
  else
   syn keyword shStatement login newgrp
  endif
diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim
index dd6690200f..c057b63657 100644
--- a/runtime/syntax/tex.vim
+++ b/runtime/syntax/tex.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	TeX
 " Maintainer:	Charles E. Campbell <NdrchipO@ScampbellPfamily.AbizM>
-" Last Change:	Sep 20, 2016
-" Version:	101
+" Last Change:	Dec 07, 2016
+" Version:	102
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
 "
 " Notes: {{{1
@@ -494,13 +494,11 @@ if !exists("g:tex_no_math")
      \ ['\\backslash'  , '\'] ,
      \ ['\\downarrow'  , '↓'] ,
      \ ['\\Downarrow'  , '⇓'] ,
-     \ ['\\langle'     , '<'] ,
      \ ['\\lbrace'     , '['] ,
      \ ['\\lceil'      , '⌈'] ,
      \ ['\\lfloor'     , '⌊'] ,
      \ ['\\lgroup'     , '⌊'] ,
      \ ['\\lmoustache' , '⎛'] ,
-     \ ['\\rangle'     , '>'] ,
      \ ['\\rbrace'     , ']'] ,
      \ ['\\rceil'      , '⌉'] ,
      \ ['\\rfloor'     , '⌋'] ,
@@ -510,6 +508,15 @@ if !exists("g:tex_no_math")
      \ ['\\Uparrow'    , '↑'] ,
      \ ['\\updownarrow', '↕'] ,
      \ ['\\Updownarrow', '⇕']]
+  if &ambw == "double" || exists("g:tex_usedblwidth")
+    let s:texMathDelimList= s:texMathDelimList + [
+     \ ['\\langle'     , '〈'] ,
+     \ ['\\rangle'     , '〉'] ,
+  else
+    let s:texMathDelimList= s:texMathDelimList + [
+     \ ['\\langle'     , '<'] ,
+     \ ['\\rangle'     , '>']]
+  endif
   syn match texMathDelim	'\\[bB]igg\=[lr]' contained nextgroup=texMathDelimBad
   for texmath in s:texMathDelimList
    exe "syn match texMathDelim	'\\\\[bB]igg\\=[lr]\\=".texmath[0]."'	contained conceal cchar=".texmath[1]
@@ -680,6 +687,7 @@ if has("conceal") && &enc == 'utf-8'
     \ ['backslash'	, '∖'],
     \ ['barwedge'	, '⊼'],
     \ ['because'	, '∵'],
+    \ ['beth'           , 'ܒ'],
     \ ['between'	, '≬'],
     \ ['bigcap'		, '∩'],
     \ ['bigcirc'	, '○'],
@@ -699,6 +707,7 @@ if has("conceal") && &enc == 'utf-8'
     \ ['boxminus'	, '⊟'],
     \ ['boxplus'	, '⊞'],
     \ ['boxtimes'	, '⊠'],
+    \ ['Box'            , '☐'],
     \ ['bullet'	        , '•'],
     \ ['bumpeq'		, '≏'],
     \ ['Bumpeq'		, '≎'],
@@ -748,6 +757,7 @@ if has("conceal") && &enc == 'utf-8'
     \ ['eqslantgtr'	, '⪖'],
     \ ['eqslantless'	, '⪕'],
     \ ['equiv'		, '≡'],
+    \ ['eth'            , 'ð'],
     \ ['exists'		, '∃'],
     \ ['fallingdotseq'	, '≒'],
     \ ['flat'		, '♭'],
@@ -757,6 +767,7 @@ if has("conceal") && &enc == 'utf-8'
     \ ['geq'		, '≥'],
     \ ['geqq'		, '≧'],
     \ ['gets'		, '←'],
+    \ ['gimel'          , 'ℷ'],
     \ ['gg'		, '⟫'],
     \ ['gneqq'		, '≩'],
     \ ['gtrdot'		, '⋗'],
@@ -767,13 +778,17 @@ if has("conceal") && &enc == 'utf-8'
     \ ['heartsuit'	, '♡'],
     \ ['hookleftarrow'	, '↩'],
     \ ['hookrightarrow'	, '↪'],
+    \ ['iff'            , '⇔'],
     \ ['iiint'		, '∭'],
     \ ['iint'		, '∬'],
     \ ['Im'		, 'ℑ'],
     \ ['imath'		, 'ɩ'],
+    \ ['implies'	, '⇒'],
     \ ['in'		, '∈'],
     \ ['infty'		, '∞'],
     \ ['int'		, '∫'],
+    \ ['jmath'		, '𝚥'],
+    \ ['land'		, '∧'],
     \ ['lceil'		, '⌈'],
     \ ['ldots'		, '…'],
     \ ['le'		, '≤'],
@@ -800,6 +815,7 @@ if has("conceal") && &enc == 'utf-8'
     \ ['ll'		, '≪'],
     \ ['lmoustache'     , '╭'],
     \ ['lneqq'		, '≨'],
+    \ ['lor'		, '∨'],
     \ ['ltimes'		, '⋉'],
     \ ['mapsto'		, '↦'],
     \ ['measuredangle'	, '∡'],
@@ -826,6 +842,7 @@ if has("conceal") && &enc == 'utf-8'
     \ ['nless'		, '≮'],
     \ ['nmid'		, '∤'],
     \ ['notin'		, '∉'],
+    \ ['nparallel'      , '∦'],
     \ ['nprec'		, '⊀'],
     \ ['nrightarrow'	, '↛'],
     \ ['nRightarrow'	, '⇏'],
@@ -927,10 +944,12 @@ if has("conceal") && &enc == 'utf-8'
     \ ['trianglerighteq', '⊵'],
     \ ['twoheadleftarrow', '↞'],
     \ ['twoheadrightarrow', '↠'],
+    \ ['ulcorner'       , '⌜'],
     \ ['uparrow'	, '↑'],
     \ ['Uparrow'	, '⇑'],
     \ ['updownarrow'	, '↕'],
     \ ['Updownarrow'	, '⇕'],
+    \ ['urcorner'       , '⌝'],
     \ ['varnothing'	, '∅'],
     \ ['vartriangle'	, '∆'],
     \ ['vdash'		, '⊢'],
@@ -946,6 +965,15 @@ if has("conceal") && &enc == 'utf-8'
 "    \ ['jmath'		, 'X']
 "    \ ['uminus'	, 'X']
 "    \ ['uplus'		, 'X']
+  if &ambw == "double" || exists("g:tex_usedblwidth")
+    let s:texMathList= s:texMathList + [
+    \ ['right\\rangle'	, '〉'],
+    \ ['left\\langle'	, '〈']]
+  else
+    let s:texMathList= s:texMathList + [
+    \ ['right\\rangle'	, '>'],
+    \ ['left\\langle'	, '<']]
+  endif
   for texmath in s:texMathList
    if texmath[0] =~# '\w$'
     exe "syn match texMathSymbol '\\\\".texmath[0]."\\>' contained conceal cchar=".texmath[1]
diff --git a/runtime/syntax/vim.vim b/runtime/syntax/vim.vim
index 49002b9599..85ced1ed3e 100644
--- a/runtime/syntax/vim.vim
+++ b/runtime/syntax/vim.vim
@@ -133,6 +133,7 @@ endif
 syn match vimNumber	"\<\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\=" skipwhite nextgroup=vimGlobal,vimSubst,vimCommand
 syn match vimNumber	"-\d\+\%(\.\d\+\%([eE][+-]\=\d\+\)\=\)\="  skipwhite nextgroup=vimGlobal,vimSubst,vimCommand
 syn match vimNumber	"\<0[xX]\x\+"
+syn match vimNumber	"\<0[bB][01]\+"
 syn match vimNumber	"\%(^\|[^a-zA-Z]\)\zs#\x\{6}"
 
 " All vimCommands are contained by vimIsCommands. {{{2
@@ -194,7 +195,7 @@ endif
 " Functions : Tag is provided for those who wish to highlight tagged functions {{{2
 " =========
 syn cluster	vimFuncList	contains=vimCommand,vimFunctionError,vimFuncKey,Tag,vimFuncSID
-syn cluster	vimFuncBodyList	contains=vimAbb,vimAddress,vimAugroupKey,vimAutoCmd,vimCmplxRepeat,vimComment,vimComment,vimContinue,vimCtrlChar,vimEcho,vimEchoHL,vimExecute,vimIf,vimIsCommand,vimFBVar,vimFunc,vimFunction,vimFuncVar,vimGlobal,vimHighlight,vimIsCommand,vimLet,vimLineComment,vimMap,vimMark,vimNorm,vimNotation,vimNotFunc,vimNumber,vimOper,vimOperParen,vimRegion,vimRegister,vimSet,vimSpecFile,vimString,vimSubst,vimSynLine,vimUnmap,vimUserCommand,nvimUnmap,nvimMap
+syn cluster	vimFuncBodyList	contains=vimAbb,vimAddress,vimAugroupKey,vimAutoCmd,vimCmplxRepeat,vimComment,vimContinue,vimCtrlChar,vimEcho,vimEchoHL,vimExecute,vimIf,vimIsCommand,vimFBVar,vimFunc,vimFunction,vimFuncVar,vimGlobal,vimHighlight,vimIsCommand,vimLet,vimLineComment,vimMap,vimMark,vimNorm,vimNotation,vimNotFunc,vimNumber,vimOper,vimOperParen,vimRegion,vimRegister,vimSet,vimSpecFile,vimString,vimSubst,vimSynLine,vimUnmap,vimUserCommand
 syn match	vimFunction	"\<fu\%[nction]!\=\s\+\%(<[sS][iI][dD]>\|[sSgGbBwWtTlL]:\)\=\%(\i\|[#.]\|{.\{-1,}}\)*\ze\s*("	contains=@vimFuncList nextgroup=vimFuncBody
 
 if exists("g:vimsyn_folding") && g:vimsyn_folding =~# 'f'

From deccd843edc9ecda04fae09bb550a90b1ba20632 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 1 May 2017 13:23:39 +0200
Subject: [PATCH 221/257] vim-patch:3df0173fa6d0

Updated runtime files.

https://github.com/vim/vim/commit/3df0173fa6d0418e89ef4e9c1d04a97c92eec27c
---
 runtime/autoload/ada.vim | 10 +++++----
 runtime/doc/change.txt   | 12 ++++++-----
 runtime/doc/diff.txt     |  5 ++++-
 runtime/doc/eval.txt     | 11 ++++++++--
 runtime/doc/helphelp.txt | 15 +++++++++----
 runtime/doc/syntax.txt   | 13 +++++++++---
 runtime/doc/tabpage.txt  | 46 ++++++++++++++++++++++++++++++----------
 runtime/doc/usr_03.txt   |  2 +-
 runtime/ftplugin/awk.vim | 18 ++++++++++++++++
 runtime/menu.vim         |  4 ++--
 runtime/optwin.vim       |  2 +-
 runtime/syntax/sh.vim    |  6 +++---
 runtime/syntax/tex.vim   |  8 +++----
 runtime/syntax/xpm.vim   |  7 +++---
 runtime/syntax/xpm2.vim  |  7 +++---
 15 files changed, 118 insertions(+), 48 deletions(-)
 create mode 100644 runtime/ftplugin/awk.vim

diff --git a/runtime/autoload/ada.vim b/runtime/autoload/ada.vim
index cc5191fa43..ce3a19369a 100644
--- a/runtime/autoload/ada.vim
+++ b/runtime/autoload/ada.vim
@@ -2,12 +2,13 @@
 "  Description: Perform Ada specific completion & tagging.
 "     Language: Ada (2005)
 "	   $Id: ada.vim 887 2008-07-08 14:29:01Z krischik $
-"   Maintainer: Martin Krischik <krischik@users.sourceforge.net>
+"   Maintainer: Mathias Brousset <mathiasb17@gmail.com>
+"		Martin Krischik <krischik@users.sourceforge.net>
 "		Taylor Venable <taylor@metasyntax.net>
 "		Neil Bird <neil@fnxweb.com>
 "		Ned Okie <nokie@radford.edu>
 "      $Author: krischik $
-"	 $Date: 2008-07-08 16:29:01 +0200 (Di, 08 Jul 2008) $
+"	 $Date: 2017-01-31 20:20:05 +0200 (Mon, 01 Jan 2017) $
 "      Version: 4.6
 "    $Revision: 887 $
 "     $HeadURL: https://gnuada.svn.sourceforge.net/svnroot/gnuada/trunk/tools/vim/autoload/ada.vim $
@@ -23,6 +24,7 @@
 "	        09.05.2007 MK Session just won't work no matter how much
 "			      tweaking is done
 "		19.09.2007 NO still some mapleader problems
+"		31.01.2017 MB fix more mapleader problems
 "    Help Page: ft-ada-functions
 "------------------------------------------------------------------------------
 
@@ -585,11 +587,11 @@ function ada#Map_Menu (Text, Keys, Command)
 	\ " :"	  . a:Command . "<CR>"
       execute
 	\ "nnoremap <buffer>" .
-	\ escape(l:leader . "a" . a:Keys , '\') .
+	\ " <Leader>a" . a:Keys .
 	\" :" . a:Command
       execute
 	\ "inoremap <buffer>" .
-	\ escape(l:leader . "a" . a:Keys , '\') .
+	\ " <Learder>a" . a:Keys .
 	\" <C-O>:" . a:Command
    endif
    return
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index c669d1792d..98cf459714 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -614,12 +614,14 @@ Directory for temporary files is created in the first suitable directory of:
 			For the {pattern} see |pattern|.
 			{string} can be a literal string, or something
 			special; see |sub-replace-special|.
+							*E939*
 			When [range] and [count] are omitted, replace in the
-			current line only.
-			When [count] is given, replace in [count] lines,
-			starting with the last line in [range].  When [range]
-			is omitted start in the current line.
-			Also see |cmdline-ranges|.
+			current line only.  When [count] is given, replace in
+			[count] lines, starting with the last line in [range].
+			When [range] is omitted start in the current line.
+			[count] must be a positive number.  Also see
+			|cmdline-ranges|.
+
 			See |:s_flags| for [flags].
 
 :[range]s[ubstitute] [flags] [count]
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index 12f4563518..e04aa55b5a 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -123,6 +123,8 @@ file for a moment and come back to the same file and be in diff mode again.
 		related options only happens in a window that has 'diff' set,
 		if the current window does not have 'diff' set then no options
 		in it are changed.
+		Hidden buffers are also removed from the list of diff'ed
+		buffers.
 
 The `:diffoff` command resets the relevant options to the values they had when
 using `:diffsplit`, `:diffpatch` , `:diffthis`. or starting Vim in diff mode.
@@ -156,7 +158,8 @@ The alignment of text will go wrong when:
 
 All the buffers edited in a window where the 'diff' option is set will join in
 the diff.  This is also possible for hidden buffers.  They must have been
-edited in a window first for this to be possible.
+edited in a window first for this to be possible.  To get rid of the hidden
+buffers use `:diffoff!`.
 
 					*:DiffOrig* *diff-original-file*
 Since 'diff' is a window-local option, it's possible to view the same buffer
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index c992430234..a70e400640 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1305,7 +1305,8 @@ b:changedtick	The total number of changes to the current buffer.  It is
 		    :	let my_changedtick = b:changedtick
 		    :	call My_Update()
 		    :endif
-<
+<		You cannot change or delete the b:changedtick variable.
+
 						*window-variable* *w:var* *w:*
 A variable name that is preceded with "w:" is local to the current window.  It
 is deleted when the window is closed.
@@ -5734,7 +5735,7 @@ printf({fmt}, {expr1} ...)				*printf()*
 		  %e	floating point number as 1.23e3, inf, -inf or nan
 		  %E	floating point number as 1.23E3, INF, -INF or NAN
 		  %g	floating point number, as %f or %e depending on value
-		  %G	floating point number, as %f or %E depending on value
+		  %G	floating point number, as %F or %E depending on value
 		  %%	the % character itself
 		  %p	representation of the pointer to the container
 
@@ -8170,6 +8171,7 @@ timers			Compiled with |timer_start()| support.
 title			Compiled with window title support |'title'|.
 toolbar			Compiled with support for |gui-toolbar|.
 unix			Unix version of Vim.
+unnamedplus		Compiled with support for "unnamedplus" in 'clipboard'
 user_commands		User-defined commands.
 vertsplit		Compiled with vertically split windows |:vsplit|.
 vim_starting		True while initial source'ing takes place. |startup|
@@ -8664,6 +8666,11 @@ This does NOT work: >
 			value and the global value are changed.
 			Example: >
 				:let &path = &path . ',/usr/local/include'
+<			This also works for terminal codes in the form t_xx.
+			But only for alphanumerical names.  Example: >
+				:let &t_k1 = "\<Esc>[234;"
+<			When the code does not exist yet it will be created as
+			a terminal key code, there is no error.
 
 :let &{option-name} .= {expr1}
 			For a string option: Append {expr1} to the value.
diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt
index 6741efabd8..31a425bdee 100644
--- a/runtime/doc/helphelp.txt
+++ b/runtime/doc/helphelp.txt
@@ -27,10 +27,16 @@ Help on help files					*helphelp*
 
 						*{subject}* *E149* *E661*
 :h[elp] {subject}	Like ":help", additionally jump to the tag {subject}.
-			{subject} can include wildcards like "*", "?" and
+			For example:  >
+				:help options
+
+<			{subject} can include wildcards such as "*", "?" and
 			"[a-z]":
 			   :help z?	jump to help for any "z" command
 			   :help z.	jump to the help for "z."
+			But when a tag exists it is taken literally:
+			   :help :?	jump to help for ":?"
+
 			If there is no full match for the pattern, or there
 			are several matches, the "best" match will be used.
 			A sophisticated algorithm is used to decide which
@@ -67,18 +73,19 @@ Help on help files					*helphelp*
 			example to find help for CTRL-V in Insert mode: >
 				:help i^V
 <
-			To use a regexp |pattern|, first do ":help" and then
+			It is also possible to first do ":help" and then
 			use ":tag {pattern}" in the help window.  The
 			":tnext" command can then be used to jump to other
 			matches, "tselect" to list matches and choose one. >
-				:help index| :tse z.
+				:help index
+				:tselect /.*mode
 
 <			When there is no argument you will see matches for
 			"help", to avoid listing all possible matches (that
 			would be very slow).
 			The number of matches displayed is limited to 300.
 
-			This command can be followed by '|' and another
+			The `:help` command can be followed by '|' and another
 			command, but you don't need to escape the '|' inside a
 			help command.  So these both work: >
 				:help |
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 364b0c2ac2..eb79ffc865 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1472,7 +1472,7 @@ algorithm should work in the vast majority of cases.  In some cases, such as a
 file that begins with 500 or more full-line comments, the script may
 incorrectly decide that the fortran code is in fixed form.  If that happens,
 just add a non-comment statement beginning anywhere in the first five columns
-of the first twenty five lines, save (:w) and then reload (:e!) the file.
+of the first twenty-five lines, save (:w) and then reload (:e!) the file.
 
 Tabs in fortran files ~
 Tabs are not recognized by the Fortran standards.  Tabs are not a good idea in
@@ -2920,6 +2920,13 @@ reduce this, the "sh_maxlines" internal variable can be set.  Example: >
 The default is to use the twice sh_minlines.  Set it to a smaller number to
 speed up displaying.  The disadvantage is that highlight errors may appear.
 
+syntax/sh.vim tries to flag certain problems as errors; usually things like
+extra ']'s, 'done's, 'fi's, etc.  If you find the error handling problematic
+for your purposes, you may suppress such error highlighting by putting
+the following line in your .vimrc: >
+
+	let g:sh_no_error= 1
+<
 
 						*sh-embed*  *sh-awk*
  Sh: EMBEDDING LANGUAGES~
@@ -3222,11 +3229,11 @@ syntax highlighting script handles this with the following logic:
 	* If g:tex_stylish exists and is 1
 		then the file will be treated as a "sty" file, so the "_"
 		will be allowed as part of keywords
-		(irregardless of g:tex_isk)
+		(regardless of g:tex_isk)
 	* Else if the file's suffix is sty, cls, clo, dtx, or ltx,
 		then the file will be treated as a "sty" file, so the "_"
 		will be allowed as part of keywords
-		(irregardless of g:tex_isk)
+		(regardless of g:tex_isk)
 
 	* If g:tex_isk exists, then it will be used for the local 'iskeyword'
 	* Else the local 'iskeyword' will be set to 48-57,a-z,A-Z,192-255
diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt
index 5ee71d7aab..60bd864bcc 100644
--- a/runtime/doc/tabpage.txt
+++ b/runtime/doc/tabpage.txt
@@ -131,10 +131,14 @@ something else.
 :tabc[lose][!] {count}
 		Close tab page {count}.  Fails in the same way as `:tabclose`
 		above. >
-		    :-tabclose      " close the previous tab page
-		    :+tabclose      " close the next tab page
-		    :1tabclose      " close the first tab page
-		    :$tabclose      " close the last tab page
+		    :-tabclose	    " close the previous tab page
+		    :+tabclose	    " close the next tab page
+		    :1tabclose	    " close the first tab page
+		    :$tabclose	    " close the last tab page
+		    :tabclose -2    " close the two previous tab page
+		    :tabclose +	    " close the next tab page
+		    :tabclose 3	    " close the third tab page
+		    :tabclose $	    " close the last tab page
 <
 							*:tabo* *:tabonly*
 :tabo[nly][!]	Close all other tab pages.
@@ -147,13 +151,20 @@ something else.
 		never abandoned, so changes cannot get lost. >
 		    :tabonly " close all tab pages except the current one
 
-:{count}tabo[nly][!]
-		Close all tab pages except the {count}th one. >
-		    :.tabonly " as above
-		    :-tabonly " close all tab pages except the previous one
-		    :+tabonly " close all tab pages except the next one
-		    :1tabonly " close all tab pages except the first one
-		    :$tabonly " close all tab pages except the last one.
+:tabo[nly][!] {count}
+		Close all tab pages except {count} one. >
+		    :.tabonly	    " as above
+		    :-tabonly	    " close all tab pages except the previous
+				    " one
+		    :+tabonly	    " close all tab pages except the next one
+		    :1tabonly	    " close all tab pages except the first one
+		    :$tabonly	    " close all tab pages except the last one
+		    :tabonly -	    " close all tab pages except the previous
+				    " one
+		    :tabonly +2     " close all tab pages except the two next
+				    " one
+		    :tabonly 1	    " close all tab pages except the first one
+		    :tabonly $	    " close all tab pages except the last one
 
 
 SWITCHING TO ANOTHER TAB PAGE:
@@ -168,7 +179,20 @@ gt					*i_CTRL-<PageDown>* *i_<C-PageDown>*
 		Go to the next tab page.  Wraps around from the last to the
 		first one.
 
+:{count}tabn[ext]
 :tabn[ext] {count}
+		Go to tab page {count}.  The first tab page has number one. >
+		    :-tabnext	" go to the previous tab page
+		    :+tabnext	" go to the next tab page
+		    :+2tabnext	" go to the two next tab page
+		    :1tabnext	" go to the first tab page
+		    :$tabnext	" go to the last tab page
+		    :tabnext $	" as above
+		    :tabnext -	" go to the previous tab page
+		    :tabnext -1	" as above
+		    :tabnext +	" go to the next tab page
+		    :tabnext +1	" as above
+
 {count}<C-PageDown>
 {count}gt	Go to tab page {count}.  The first tab page has number one.
 
diff --git a/runtime/doc/usr_03.txt b/runtime/doc/usr_03.txt
index f2e523e784..5a7f0cb0e5 100644
--- a/runtime/doc/usr_03.txt
+++ b/runtime/doc/usr_03.txt
@@ -182,7 +182,7 @@ the following:
 
 This tells you that you might want to fix something on line 33.  So how do you
 find line 33?  One way is to do "9999k" to go to the top of the file and "32j"
-to go down thirty two lines.  It is not a good way, but it works.  A much
+to go down thirty-two lines.  It is not a good way, but it works.  A much
 better way of doing things is to use the "G" command.  With a count, this
 command positions you at the given line number.  For example, "33G" puts you
 on line 33.  (For a better way of going through a compiler's error list, see
diff --git a/runtime/ftplugin/awk.vim b/runtime/ftplugin/awk.vim
new file mode 100644
index 0000000000..dcefc85ec3
--- /dev/null
+++ b/runtime/ftplugin/awk.vim
@@ -0,0 +1,18 @@
+" Vim filetype plugin
+" Language:	awk, nawk, gawk, mawk
+" Maintainer:	Antonio Colombo <azc100@gmail.com>
+" Last Change:	2017 Feb 17
+
+" This plugin was prepared by Mark Sikora
+
+" Only do this when not done yet for this buffer
+if exists("b:did_ftplugin")
+  finish
+endif
+
+" Don't load another plugin for this buffer
+let b:did_ftplugin = 1
+
+let b:undo_ftplugin = "setl commentstring<"
+
+setlocal commentstring=#\ %s
diff --git a/runtime/menu.vim b/runtime/menu.vim
index 7cb530a331..37e9d8733b 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -2,7 +2,7 @@
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Jul 27
+" Last Change:	2017 Feb 09
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
@@ -475,7 +475,7 @@ if has("folding")
   an 40.340.130 &Tools.&Folding.C&lose\ more\ folds<Tab>zm		zm
   an 40.340.140 &Tools.&Folding.&Close\ all\ folds<Tab>zM		zM
   an 40.340.150 &Tools.&Folding.O&pen\ more\ folds<Tab>zr		zr
-  an 40.340.160 &Tools.&Folding.&Open\ all\ folds<Tab>zR		zR
+  an 40.340.160 &Tools.&Folding.&Open\ All\ Folds<Tab>zR		zR
   " fold method
   an 40.340.200 &Tools.&Folding.-SEP1-			<Nop>
   an 40.340.210 &Tools.&Folding.Fold\ Met&hod.M&anual	:set fdm=manual<CR>
diff --git a/runtime/optwin.vim b/runtime/optwin.vim
index 36d1741362..5c883babc1 100644
--- a/runtime/optwin.vim
+++ b/runtime/optwin.vim
@@ -1,7 +1,7 @@
 " These commands create the option window.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2016 Aug 21
+" Last Change:	2017 Jan 28
 
 " If there already is an option window, jump to that one.
 if bufwinnr("option-window") > 0
diff --git a/runtime/syntax/sh.vim b/runtime/syntax/sh.vim
index 4cdced03b3..f97299cdeb 100644
--- a/runtime/syntax/sh.vim
+++ b/runtime/syntax/sh.vim
@@ -2,8 +2,8 @@
 " Language:		shell (sh) Korn shell (ksh) bash (sh)
 " Maintainer:		Charles E. Campbell  <NdrOchipS@PcampbellAfamily.Mbiz>
 " Previous Maintainer:	Lennart Schultz <Lennart.Schultz@ecmwf.int>
-" Last Change:		Jan 03, 2017
-" Version:		167
+" Last Change:		Jan 30, 2017
+" Version:		168
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SH
 " For options and settings, please use:      :help ft-sh-syntax
 " This file includes many ideas from Eric Brunet (eric.brunet@ens.fr)
@@ -346,7 +346,7 @@ syn region  shSingleQuote	matchgroup=shQuote start=+'+ end=+'+		contains=@Spell
 syn region  shDoubleQuote	matchgroup=shQuote start=+\%(\%(\\\\\)*\\\)\@<!"+ skip=+\\"+ end=+"+	contains=@shDblQuoteList,shStringSpecial,@Spell
 syn match   shStringSpecial	"[^[:print:] \t]"			contained
 syn match   shStringSpecial	"[^\\]\zs\%(\\\\\)*\\[\\"'`$()#]"
-syn match   shSpecial	"[^\\]\zs\%(\\\\\)*\\[\\"'`$()#]"		nextgroup=shBkslshSnglQuote,shBkslshDblQuote
+syn match   shSpecial	"[^\\]\zs\%(\\\\\)*\\[\\"'`$()#]"
 syn match   shSpecial	"^\%(\\\\\)*\\[\\"'`$()#]"
 syn match   shSpecialNxt	contained	"\\[\\"'`$()#]"
 syn region  shBkslshSnglQuote	contained	matchgroup=shQuote start=+'+ end=+'+	contains=@Spell
diff --git a/runtime/syntax/tex.vim b/runtime/syntax/tex.vim
index c057b63657..ab19da329b 100644
--- a/runtime/syntax/tex.vim
+++ b/runtime/syntax/tex.vim
@@ -1,8 +1,8 @@
 " Vim syntax file
 " Language:	TeX
 " Maintainer:	Charles E. Campbell <NdrchipO@ScampbellPfamily.AbizM>
-" Last Change:	Dec 07, 2016
-" Version:	102
+" Last Change:	Jan 31, 2017
+" Version:	103
 " URL:		http://www.drchip.org/astronaut/vim/index.html#SYNTAX_TEX
 "
 " Notes: {{{1
@@ -511,7 +511,7 @@ if !exists("g:tex_no_math")
   if &ambw == "double" || exists("g:tex_usedblwidth")
     let s:texMathDelimList= s:texMathDelimList + [
      \ ['\\langle'     , '〈'] ,
-     \ ['\\rangle'     , '〉'] ,
+     \ ['\\rangle'     , '〉']]
   else
     let s:texMathDelimList= s:texMathDelimList + [
      \ ['\\langle'     , '<'] ,
@@ -594,8 +594,6 @@ endif
 if s:tex_fast =~# 'v'
   if exists("g:tex_verbspell") && g:tex_verbspell
    syn region texZone		start="\\begin{[vV]erbatim}"		end="\\end{[vV]erbatim}\|%stopzone\>"	contains=@Spell
-   " listings package:
-   syn region texZone		start="\\begin{lstlisting}"		end="\\end{lstlisting}\|%stopzone\>"	contains=@Spell
    if b:tex_stylish
     syn region texZone		start="\\verb\*\=\z([^\ta-zA-Z@]\)"	end="\z1\|%stopzone\>"			contains=@Spell
    else
diff --git a/runtime/syntax/xpm.vim b/runtime/syntax/xpm.vim
index 2021c3a967..0667ca28ad 100644
--- a/runtime/syntax/xpm.vim
+++ b/runtime/syntax/xpm.vim
@@ -1,8 +1,9 @@
 " Vim syntax file
 " Language:	X Pixmap
 " Maintainer:	Ronald Schild <rs@scutum.de>
-" Last Change:	2008 May 28
+" Last Change:	2017 Feb 01
 " Version:	5.4n.1
+"               Jemma Nelson added termguicolors support
 
 " quit when a syntax file was already loaded
 if exists("b:current_syntax")
@@ -15,7 +16,7 @@ syn keyword xpmTodo		TODO FIXME XXX  contained
 syn region  xpmComment		start="/\*"  end="\*/"  contains=xpmTodo
 syn region  xpmPixelString	start=+"+  skip=+\\\\\|\\"+  end=+"+  contains=@xpmColors
 
-if has("gui_running")
+if has("gui_running") || has("termguicolors") && &termguicolors
 
 let color  = ""
 let chars  = ""
@@ -120,7 +121,7 @@ endwhile
 
 unlet color chars colors cpp n i s
 
-endif		" has("gui_running")
+endif          " has("gui_running") || has("termguicolors") && &termguicolors
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet
diff --git a/runtime/syntax/xpm2.vim b/runtime/syntax/xpm2.vim
index 1d0eb572fd..dfa6945a31 100644
--- a/runtime/syntax/xpm2.vim
+++ b/runtime/syntax/xpm2.vim
@@ -1,9 +1,10 @@
 " Vim syntax file
 " Language:	X Pixmap v2
 " Maintainer:	Steve Wall (hitched97@velnet.com)
-" Last Change:	2012 Jun 01
+" Last Change:	2017 Feb 01
 " 		(Dominique Pelle added @Spell)
 " Version:	5.8
+"               Jemma Nelson added termguicolors support
 "
 " Made from xpm.vim by Ronald Schild <rs@scutum.de>
 
@@ -22,7 +23,7 @@ syn match   xpm2Comment		"\!.*$"  contains=@Spell,xpm2Todo
 
 command -nargs=+ Hi hi def <args>
 
-if has("gui_running")
+if has("gui_running") || has("termguicolors") && &termguicolors
 
   let color  = ""
   let chars  = ""
@@ -132,7 +133,7 @@ if has("gui_running")
 
   unlet color chars colors cpp n i s
 
-endif		" has("gui_running")
+endif          " has("gui_running") || has("termguicolors") && &termguicolors
 
 " Define the default highlighting.
 " Only when an item doesn't have highlighting yet

From fa1ee0ac73ab0fbbd246783f42e2df2c2d9280d6 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 1 May 2017 14:35:58 +0200
Subject: [PATCH 222/257] doc: bracketed-paste-mode

---
 runtime/doc/eval.txt     |  4 ----
 runtime/doc/options.txt  |  2 +-
 runtime/doc/term.txt     | 10 +++-------
 runtime/doc/vim_diff.txt |  2 --
 src/nvim/fileio.c        |  2 +-
 5 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index a70e400640..deae268f56 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -3916,10 +3916,6 @@ getchar([expr])						*getchar()*
 			  exe "normal " . v:mouse_col . "|"
 			endif
 <
-		When using bracketed paste only the first character is
-		returned, the rest of the pasted text is dropped.
-		|xterm-bracketed-paste|.
-
 		There is no prompt, you will somehow have to make clear to the
 		user that a character has to be typed.
 		There is no mapping for the character.
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 6684626487..cef966e8a3 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -4378,7 +4378,7 @@ A jump table for the options with a short description can be found at |Q_op|.
 						*'paste'* *'nopaste'*
 'paste'			boolean	(default off)
 			global
-	You probably don't have to set this option: |bracketed-paste-mode|.
+	This option is obsolete; |bracketed-paste-mode| is built-in.
 
 	Put Vim in Paste mode.  This is useful if you want to cut or copy
 	some text from one window and paste it in Vim.  This will avoid
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index 214975c5a1..4b96dd3330 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -221,13 +221,9 @@ Bracketed paste mode allows terminal emulators to distinguish between typed
 text and pasted text.
 
 For terminal emulators that support it, this mode is enabled by default. Thus
-you can paste text without Neovim giving any special meaning to it. Most
-notably it won't try reindenting those lines.
-
-If your terminal emulator doesn't support it yet, you can get the old Vim
-behaviour by enabling |'paste'| temporarily.
-
-NOTE: See https://cirw.in/blog/bracketed-paste for technical details.
+you can paste text without Nvim giving any special meaning to it, e.g. it will
+not auto-indent the pasted text. See https://cirw.in/blog/bracketed-paste for
+technical details.
 
 					*mouse-mode-table* *mouse-overview*
 A short overview of what the mouse buttons do, when 'mousemodel' is "extend":
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 03feb47cbd..4c5f6815d7 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -100,8 +100,6 @@ editor. Even "legacy" Python and Ruby plugins which use the old Vim interfaces
 
 FEATURES ~
 
-|bracketed-paste-mode| is built-in and enabled by default.
-
 |META| (ALT) chords are recognized, even in the terminal. Any |<M-| mapping
 will work. Some examples: <M-1>, <M-2>, <M-BS>, <M-Del>, <M-Ins>, <M-/>,
 <M-\>, <M-Space>, <M-Enter>, <M-=>, <M-->, <M-?>, <M-$>, ...
diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c
index 3e062aecc0..4063277403 100644
--- a/src/nvim/fileio.c
+++ b/src/nvim/fileio.c
@@ -4659,7 +4659,7 @@ int vim_rename(const char_u *from, const char_u *to)
     return -1;
   }
 
-  // Avoid xmalloc() here as vim_rename() is called by buf_write() when neovim
+  // Avoid xmalloc() here as vim_rename() is called by buf_write() when nvim
   // is `preserve_exit()`ing.
   buffer = try_malloc(BUFSIZE);
   if (buffer == NULL) {

From 48fa42153acbf271db8edc94f94b524eb5b492e0 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 1 May 2017 06:45:24 +0300
Subject: [PATCH 223/257] ci: Fold output in travis web interface

---
 ci/common/suite.sh | 21 +++++++++++++++++++++
 ci/common/test.sh  |  5 +++++
 ci/run_lint.sh     | 21 +++++++++++++--------
 ci/run_tests.sh    | 12 ++++++++----
 4 files changed, 47 insertions(+), 12 deletions(-)

diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index a6fe7dd650..54afa28be6 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -11,14 +11,35 @@ FAIL_SUMMARY=""
 END_MARKER="$BUILD_DIR/.tests_finished"
 FAIL_SUMMARY_FILE="$BUILD_DIR/.test_errors"
 
+ANSI_CLEAR="\033[0K"
+
+travis_fold() {
+  local action="$1"
+  local name="$2"
+  name="$(echo -n "$name" | tr '\n\0' '--' | sed 's/[^A-Za-z0-9]\+/-/g')"
+  name="$(echo -n "$name" | sed 's/-$//')"
+  echo -en "travis_fold:${action}:${name}\r${ANSI_CLEAR}"
+}
+
+if test "$TRAVIS" != "true" ; then
+  travis_fold() {
+    return 0
+  }
+fi
+
 enter_suite() {
+  set +x
   FAILED=0
   rm -f "${END_MARKER}"
   local suite_name="$1"
   export NVIM_TEST_CURRENT_SUITE="${NVIM_TEST_CURRENT_SUITE}/$suite_name"
+  travis_fold start "${NVIM_TEST_CURRENT_SUITE}"
+  set -x
 }
 
 exit_suite() {
+  set +x
+  travis_fold end "${NVIM_TEST_CURRENT_SUITE}"
   if test $FAILED -ne 0 ; then
     echo "Suite ${NVIM_TEST_CURRENT_SUITE} failed, summary:"
     echo "${FAIL_SUMMARY}"
diff --git a/ci/common/test.sh b/ci/common/test.sh
index a4b7680830..c987875cc0 100644
--- a/ci/common/test.sh
+++ b/ci/common/test.sh
@@ -166,3 +166,8 @@ install_nvim() {(
 
   exit_suite
 )}
+
+csi_clean() {
+  find "${BUILD_DIR}/bin" -name 'test-includes-*' -delete
+  find "${BUILD_DIR}" -name '*test-include*.o' -delete
+}
diff --git a/ci/run_lint.sh b/ci/run_lint.sh
index 5639b4c3db..73647dacaa 100755
--- a/ci/run_lint.sh
+++ b/ci/run_lint.sh
@@ -8,17 +8,20 @@ CI_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
 source "${CI_DIR}/common/build.sh"
 source "${CI_DIR}/common/suite.sh"
 
-enter_suite 'lint'
-
-set -x
-
-csi_clean() {
-  find "${BUILD_DIR}/bin" -name 'test-includes-*' -delete
-  find "${BUILD_DIR}" -name '*test-include*.o' -delete
-}
+enter_suite 'clint'
 
 run_test 'top_make clint-full' clint
+
+exit_suite --continue
+
+enter_suite 'testlint'
+
 run_test 'top_make testlint' testlint
+
+exit_suite --continue
+
+enter_suite single-includes
+
 CLICOLOR_FORCE=1 run_test_wd \
   --allow-hang \
   10s \
@@ -26,4 +29,6 @@ CLICOLOR_FORCE=1 run_test_wd \
   'csi_clean' \
   single-includes
 
+exit_suite --continue
+
 end_tests
diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index 4abc9eea9f..a0bf6e010d 100755
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -8,16 +8,18 @@ source "${CI_DIR}/common/build.sh"
 source "${CI_DIR}/common/test.sh"
 source "${CI_DIR}/common/suite.sh"
 
-set -x
-
-enter_suite tests
+enter_suite build
 
 check_core_dumps --delete quiet
 
 prepare_build
 build_nvim
 
-if [ "$CLANG_SANITIZER" != "TSAN" ]; then
+exit_suite --continue
+
+enter_suite tests
+
+if test "$CLANG_SANITIZER" != "TSAN" ; then
   # Additional threads are only created when the builtin UI starts, which
   # doesn't happen in the unit/functional tests
   run_test run_unittests
@@ -27,4 +29,6 @@ run_test run_oldtests
 
 run_test install_nvim
 
+exit_suite --continue
+
 end_tests

From cc29827bc2b33d728768f09664d08c86404af105 Mon Sep 17 00:00:00 2001
From: Daniel Hahler <github@thequod.de>
Date: Mon, 1 May 2017 15:37:24 +0200
Subject: [PATCH 224/257] doc/eval.txt: remove references to E706 (#6629)

Removed in Vim in 7.4.1578 (975b5271) and 7.4.1546 (f6f32c38b).
---
 runtime/doc/eval.txt | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index deae268f56..b7ff1b953c 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -394,10 +394,6 @@ This works like: >
 	:   let index = index + 1
 	:endwhile
 
-Note that all items in the list should be of the same type, otherwise this
-results in error |E706|.  To avoid this |:unlet| the variable at the end of
-the loop.
-
 If all you want to do is modify each item in the list then the |map()|
 function will be a simpler method than a for loop.
 
@@ -7429,8 +7425,7 @@ systemlist({cmd} [, {input} [, {keepempty}]])		*systemlist()*
 		unless {keepempty} is non-zero.
 		Note that on MS-Windows you may get trailing CR characters.
 
-		Returns an empty string on error, so be careful not to run 
-		into |E706|.
+		Returns an empty string on error.
 
 
 tabpagebuflist([{arg}])					*tabpagebuflist()*

From 1109ca7198a73dd26061817c6548410cb33debb4 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 1 May 2017 17:36:45 +0300
Subject: [PATCH 225/257] ci: Use \{1,\} in place of \+

---
 ci/common/suite.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/common/suite.sh b/ci/common/suite.sh
index 54afa28be6..8feb642547 100644
--- a/ci/common/suite.sh
+++ b/ci/common/suite.sh
@@ -16,7 +16,7 @@ ANSI_CLEAR="\033[0K"
 travis_fold() {
   local action="$1"
   local name="$2"
-  name="$(echo -n "$name" | tr '\n\0' '--' | sed 's/[^A-Za-z0-9]\+/-/g')"
+  name="$(echo -n "$name" | tr '\n\0' '--' | sed 's/[^A-Za-z0-9]\{1,\}/-/g')"
   name="$(echo -n "$name" | sed 's/-$//')"
   echo -en "travis_fold:${action}:${name}\r${ANSI_CLEAR}"
 }

From e4d0fa6e8d9b646c036780d6c5a7b2f2af988b65 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Mon, 1 May 2017 17:38:21 +0300
Subject: [PATCH 226/257] Do not trace in check_runtime_files

---
 ci/common/test.sh | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/common/test.sh b/ci/common/test.sh
index c987875cc0..55f76ca798 100644
--- a/ci/common/test.sh
+++ b/ci/common/test.sh
@@ -110,6 +110,7 @@ run_oldtests() {(
 )}
 
 check_runtime_files() {(
+  set +x
   local test_name="$1" ; shift
   local message="$1" ; shift
   local tst="$1" ; shift

From 1483800cdff3bd00faabe66436a1618f567f6754 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 1 May 2017 17:04:56 +0200
Subject: [PATCH 227/257] coverity/161682: FP: Dereference after null check
 (#6630)

---
 src/nvim/msgpack_rpc/channel.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/nvim/msgpack_rpc/channel.c b/src/nvim/msgpack_rpc/channel.c
index 911f2a6fa4..cd64e14976 100644
--- a/src/nvim/msgpack_rpc/channel.c
+++ b/src/nvim/msgpack_rpc/channel.c
@@ -442,8 +442,7 @@ static void handle_request(Channel *channel, msgpack_object *request)
   evdata->request_id = request_id;
   incref(channel);
   if (handler.async) {
-    bool is_get_mode = sizeof("nvim_get_mode") - 1 == method->via.bin.size
-      && !strncmp("nvim_get_mode", method->via.bin.ptr, method->via.bin.size);
+    bool is_get_mode = handler.fn == handle_nvim_get_mode;
 
     if (is_get_mode && !input_blocking()) {
       // Defer the event to a special queue used by os/input.c. #6247

From bc4a2e1576c66ae5eea5463990d73528b3fc75bf Mon Sep 17 00:00:00 2001
From: Tommy Allen <tommy@esdf.io>
Date: Fri, 5 Aug 2016 00:47:28 -0400
Subject: [PATCH 228/257] help, man.vim: "outline" (TOC) feature #5169

---
 runtime/autoload/man.vim  | 25 ++++++++++++++
 runtime/doc/filetype.txt  |  1 +
 runtime/doc/helphelp.txt  |  2 ++
 runtime/ftplugin/help.vim | 72 +++++++++++++++++++++++++++++++++++++++
 runtime/ftplugin/man.vim  |  5 +--
 runtime/ftplugin/qf.vim   | 23 +++++++++++++
 runtime/syntax/help.vim   |  2 ++
 runtime/syntax/man.vim    |  5 +++
 8 files changed, 133 insertions(+), 2 deletions(-)

diff --git a/runtime/autoload/man.vim b/runtime/autoload/man.vim
index 96f03e47cc..c49c550b20 100644
--- a/runtime/autoload/man.vim
+++ b/runtime/autoload/man.vim
@@ -151,6 +151,31 @@ function! s:put_page(page) abort
   setlocal filetype=man
 endfunction
 
+function! man#show_toc() abort
+  let bufname = bufname('%')
+  let info = getloclist(0, {'winid': 1})
+  if !empty(info) && getwinvar(info.winid, 'qf_toc') ==# bufname
+    lopen
+    return
+  endif
+
+  let toc = []
+  let lnum = 2
+  let last_line = line('$') - 1
+  while lnum && lnum < last_line
+    let text = getline(lnum)
+    if text =~# '^\%( \{3\}\)\=\S.*$'
+      call add(toc, {'bufnr': bufnr('%'), 'lnum': lnum, 'text': text})
+    endif
+    let lnum = nextnonblank(lnum + 1)
+  endwhile
+
+  call setloclist(0, toc, ' ')
+  call setloclist(0, [], 'a', {'title': 'Man TOC'})
+  lopen
+  let w:qf_toc = bufname
+endfunction
+
 " attempt to extract the name and sect out of 'name(sect)'
 " otherwise just return the largest string of valid characters in ref
 function! man#extract_sect_and_name_ref(ref) abort
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index c03100460d..e781c212dc 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -542,6 +542,7 @@ K or CTRL-]               Jump to the manpage for the <cWORD> under the
                           cursor. Takes a count for the section.
 CTRL-T                    Jump back to the location that the manpage was
                           opened from.
+META-]                    Show the manpage outline in the |location-list|.
 q                         :quit if invoked as $MANPAGER, otherwise :close.
 
 Variables:
diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt
index 31a425bdee..6639cd70cf 100644
--- a/runtime/doc/helphelp.txt
+++ b/runtime/doc/helphelp.txt
@@ -25,6 +25,8 @@ Help on help files					*helphelp*
 			The 'helplang' option is used to select a language, if
 			the main help file is available in several languages.
 
+			Type <M-]> to see the table of contents.
+
 						*{subject}* *E149* *E661*
 :h[elp] {subject}	Like ":help", additionally jump to the tag {subject}.
 			For example:  >
diff --git a/runtime/ftplugin/help.vim b/runtime/ftplugin/help.vim
index a0a0f292eb..c94b2ef3eb 100644
--- a/runtime/ftplugin/help.vim
+++ b/runtime/ftplugin/help.vim
@@ -18,5 +18,77 @@ if has("conceal")
   setlocal cole=2 cocu=nc
 endif
 
+if !exists('g:no_plugin_maps')
+  function! s:show_toc() abort
+    let bufname = bufname('%')
+    let info = getloclist(0, {'winid': 1})
+    if !empty(info) && getwinvar(info.winid, 'qf_toc') ==# bufname
+      lopen
+      return
+    endif
+
+    let toc = []
+    let lnum = 2
+    let last_line = line('$') - 1
+    let last_added = 0
+    let has_section = 0
+    let has_sub_section = 0
+
+    while lnum && lnum <= last_line
+      let level = 0
+      let add_text = ''
+      let text = getline(lnum)
+
+      if text =~# '^=\+$' && lnum + 1 < last_line
+        " A de-facto section heading.  Other headings are inferred.
+        let has_section = 1
+        let has_sub_section = 0
+        let lnum = nextnonblank(lnum + 1)
+        let text = getline(lnum)
+        let add_text = text
+        while add_text =~# '\*[^*]\+\*\s*$'
+          let add_text = matchstr(add_text, '.*\ze\*[^*]\+\*\s*$')
+        endwhile
+      elseif text =~# '^[A-Z0-9][-A-ZA-Z0-9 .][-A-Z0-9 .():]*\%([ \t]\+\*.\+\*\)\?$'
+        " Any line that's yelling is important.
+        let has_sub_section = 1
+        let level = has_section
+        let add_text = matchstr(text, '.\{-}\ze\s*\%([ \t]\+\*.\+\*\)\?$')
+      elseif text =~# '\~$'
+            \ && matchstr(text, '^\s*\zs.\{-}\ze\s*\~$') !~# '\t\|\s\{2,}'
+            \ && getline(lnum - 1) =~# '^\s*<\?$\|^\s*\*.*\*$'
+            \ && getline(lnum + 1) =~# '^\s*>\?$\|^\s*\*.*\*$'
+        " These lines could be headers or code examples.  We only want the
+        " ones that have subsequent lines at the same indent or more.
+        let l = nextnonblank(lnum + 1)
+        if getline(l) =~# '\*[^*]\+\*$'
+          " Ignore tag lines
+          let l = nextnonblank(l + 1)
+        endif
+
+        if indent(lnum) <= indent(l)
+          let level = has_section + has_sub_section
+          let add_text = matchstr(text, '\S.*')
+        endif
+      endif
+
+      let add_text = substitute(add_text, '\s\+$', '', 'g')
+      if !empty(add_text) && last_added != lnum
+        let last_added = lnum
+        call add(toc, {'bufnr': bufnr('%'), 'lnum': lnum,
+              \ 'text': repeat('  ', level) . add_text})
+      endif
+      let lnum = nextnonblank(lnum + 1)
+    endwhile
+
+    call setloclist(0, toc, ' ')
+    call setloclist(0, [], 'a', {'title': 'Help TOC'})
+    lopen
+    let w:qf_toc = bufname
+  endfunction
+
+  nnoremap <silent><buffer> <M-]> :call <sid>show_toc()<cr>
+endif
+
 let &cpo = s:cpo_save
 unlet s:cpo_save
diff --git a/runtime/ftplugin/man.vim b/runtime/ftplugin/man.vim
index 5d83886f56..27c8b88e44 100644
--- a/runtime/ftplugin/man.vim
+++ b/runtime/ftplugin/man.vim
@@ -31,13 +31,14 @@ setlocal nolist
 setlocal nofoldenable
 
 if !exists('g:no_plugin_maps') && !exists('g:no_man_maps')
+  nnoremap <silent> <buffer> <M-]>      :call man#show_toc()<CR>
   nnoremap <silent> <buffer> <C-]>      :Man<CR>
   nnoremap <silent> <buffer> K          :Man<CR>
   nnoremap <silent> <buffer> <C-T>      :call man#pop_tag()<CR>
   if s:pager
-    nnoremap <silent> <buffer> <nowait> q :q<CR>
+    nnoremap <silent> <buffer> <nowait> q :lclose<CR>:q<CR>
   else
-    nnoremap <silent> <buffer> <nowait> q <C-W>c
+    nnoremap <silent> <buffer> <nowait> q :lclose<CR><C-W>c
   endif
 endif
 
diff --git a/runtime/ftplugin/qf.vim b/runtime/ftplugin/qf.vim
index 98c8f932bc..80e86c4d16 100644
--- a/runtime/ftplugin/qf.vim
+++ b/runtime/ftplugin/qf.vim
@@ -14,3 +14,26 @@ let b:undo_ftplugin = "set stl<"
 
 " Display the command that produced the list in the quickfix window:
 setlocal stl=%t%{exists('w:quickfix_title')?\ '\ '.w:quickfix_title\ :\ ''}\ %=%-15(%l,%c%V%)\ %P
+
+function! s:setup_toc() abort
+  if get(w:, 'quickfix_title') !~# '\<TOC$' || &syntax != 'qf'
+    return
+  endif
+
+  let list = getloclist(0)
+  if empty(list)
+    return
+  endif
+
+  let bufnr = list[0].bufnr
+  setlocal modifiable
+  silent %delete _
+  call setline(1, map(list, 'v:val.text'))
+  setlocal nomodifiable nomodified
+  let &syntax = getbufvar(bufnr, '&syntax')
+endfunction
+
+augroup qf_toc
+  autocmd!
+  autocmd Syntax <buffer> call s:setup_toc()
+augroup END
diff --git a/runtime/syntax/help.vim b/runtime/syntax/help.vim
index d23aab9f7f..98ab7f4b23 100644
--- a/runtime/syntax/help.vim
+++ b/runtime/syntax/help.vim
@@ -87,6 +87,8 @@ syn match helpSpecial		"CTRL-PageDown"
 syn match helpSpecial		"CTRL-Insert"
 syn match helpSpecial		"CTRL-Del"
 syn match helpSpecial		"CTRL-{char}"
+syn match helpSpecial		"META-."
+syn match helpSpecial		"ALT-."
 
 " Highlight group items in their own color.
 syn match helpComment		"\t[* ]Comment\t\+[a-z].*"
diff --git a/runtime/syntax/man.vim b/runtime/syntax/man.vim
index 819b2adc31..0975b160ae 100644
--- a/runtime/syntax/man.vim
+++ b/runtime/syntax/man.vim
@@ -18,6 +18,11 @@ highlight default link manOptionDesc     Constant
 highlight default link manReference      PreProc
 highlight default link manSubHeading     Function
 
+if &filetype != 'man'
+  " May have been included by some other filetype.
+  finish
+endif
+
 if !exists('b:man_sect')
   call man#init_pager()
 endif

From 45ef3d9d0c5f09e735b984fb6bbb25b27848408c Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 1 May 2017 17:09:29 +0200
Subject: [PATCH 229/257] doc: Replace hardcoded TOCs with <M-]> advice.

---
 runtime/doc/api.txt                    |  2 ++
 runtime/doc/autocmd.txt                | 12 +---------
 runtime/doc/change.txt                 | 21 +++--------------
 runtime/doc/cmdline.txt                |  8 +------
 runtime/doc/debug.txt                  |  4 +---
 runtime/doc/develop.txt                |  5 ++---
 runtime/doc/diff.txt                   |  6 +----
 runtime/doc/digraph.txt                |  4 +---
 runtime/doc/editing.txt                | 12 +---------
 runtime/doc/eval.txt                   | 18 +--------------
 runtime/doc/filetype.txt               |  6 ++---
 runtime/doc/fold.txt                   |  5 +----
 runtime/doc/gui.txt                    |  7 +-----
 runtime/doc/helphelp.txt               |  4 +---
 runtime/doc/if_cscop.txt               | 10 +--------
 runtime/doc/if_pyth.txt                | 12 ++--------
 runtime/doc/if_ruby.txt                |  9 ++------
 runtime/doc/indent.txt                 |  3 +--
 runtime/doc/index.txt                  | 13 ++---------
 runtime/doc/insert.txt                 | 13 ++---------
 runtime/doc/intro.txt                  |  9 +-------
 runtime/doc/job_control.txt            |  3 +--
 runtime/doc/map.txt                    | 16 +------------
 runtime/doc/mbyte.txt                  |  2 ++
 runtime/doc/message.txt                |  4 +---
 runtime/doc/mlang.txt                  |  6 +----
 runtime/doc/motion.txt                 | 12 ++--------
 runtime/doc/msgpack_rpc.txt            |  9 ++------
 runtime/doc/nvim.txt                   |  8 ++++---
 runtime/doc/nvim_terminal_emulator.txt |  2 ++
 runtime/doc/options.txt                |  6 ++---
 runtime/doc/os_win32.txt               | 31 ++------------------------
 runtime/doc/pattern.txt                | 14 ++----------
 runtime/doc/pi_health.txt              | 14 ++++--------
 runtime/doc/print.txt                  |  9 +-------
 runtime/doc/provider.txt               |  2 ++
 runtime/doc/quickfix.txt               | 10 +--------
 runtime/doc/quickref.txt               |  1 -
 runtime/doc/recover.txt                |  3 +--
 runtime/doc/remote.txt                 |  4 +---
 runtime/doc/remote_plugin.txt          |  5 +----
 runtime/doc/repeat.txt                 |  9 +-------
 runtime/doc/russian.txt                |  5 +----
 runtime/doc/scroll.txt                 |  7 +-----
 runtime/doc/sign.txt                   |  3 +--
 runtime/doc/spell.txt                  |  5 +----
 runtime/doc/starting.txt               | 10 +--------
 runtime/doc/syntax.txt                 | 19 +---------------
 runtime/doc/tabpage.txt                |  6 +----
 runtime/doc/tagsrch.txt                |  7 +-----
 runtime/doc/term.txt                   |  4 +++-
 runtime/doc/tips.txt                   | 16 +------------
 runtime/doc/undo.txt                   |  7 +-----
 runtime/doc/usr_toc.txt                |  5 ++---
 runtime/doc/various.txt                |  3 +--
 runtime/doc/vi_diff.txt                |  3 +--
 runtime/doc/vim_diff.txt               | 12 +++-------
 runtime/doc/visual.txt                 |  9 +-------
 runtime/doc/windows.txt                | 13 +----------
 59 files changed, 87 insertions(+), 400 deletions(-)

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index a118690876..9b2795863b 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -11,6 +11,8 @@ via |msgpack-rpc|, Lua and VimL (|eval-api|).
 
 Applications can also embed libnvim to work with the C API directly.
 
+                                      Type <M-]> to see the table of contents.
+
 ==============================================================================
 API Types							   *api-types*
 
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt
index 50af870975..2a98d08c4e 100644
--- a/runtime/doc/autocmd.txt
+++ b/runtime/doc/autocmd.txt
@@ -8,17 +8,7 @@ Automatic commands					*autocommand*
 
 For a basic explanation, see section |40.3| in the user manual.
 
-1.  Introduction		|autocmd-intro|
-2.  Defining autocommands	|autocmd-define|
-3.  Removing autocommands	|autocmd-remove|
-4.  Listing autocommands	|autocmd-list|
-5.  Events			|autocmd-events|
-6.  Patterns			|autocmd-patterns|
-7.  Buffer-local autocommands	|autocmd-buflocal|
-8.  Groups			|autocmd-groups|
-9.  Executing autocommands	|autocmd-execute|
-10. Using autocommands		|autocmd-use|
-11. Disabling autocommands	|autocmd-disable|
+				      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Introduction						*autocmd-intro*
diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 98cf459714..6af3c4d5d7 100644
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -9,20 +9,10 @@ changing text means deleting the text and replacing it with other text using
 one command.  You can undo all of these commands.  You can repeat the non-Ex
 commands with the "." command.
 
-1. Deleting text		|deleting|
-2. Delete and insert		|delete-insert|
-3. Simple changes		|simple-change|		*changing*
-4. Complex changes		|complex-change|
-   4.1 Filter commands		   |filter|
-   4.2 Substitute		   |:substitute|
-   4.3 Search and replace	   |search-replace|
-   4.4 Changing tabs		   |change-tabs|
-5. Copying and moving text	|copy-move|
-6. Formatting text		|formatting|
-7. Sorting text			|sorting|
-
 For inserting text see |insert.txt|.
 
+                                      Type <M-]> to see the table of contents.
+
 ==============================================================================
 1. Deleting text					*deleting* *E470*
 
@@ -259,7 +249,7 @@ Or use "caw" (see |aw|).
 			command is executed.
 
 ==============================================================================
-3. Simple changes					*simple-change*
+3. Simple changes				*simple-change* *changing*
 
 							*r*
 r{char}			Replace the character under the cursor with {char}.
@@ -398,11 +388,6 @@ CTRL-X			Subtract [count] from the number or alphabetic
 {Visual}CTRL-X		Subtract [count] from the number or alphabetic
 			character in the highlighted text.  {not in Vi}
 
-			On MS-Windows, this is mapped to cut Visual text
-			|dos-standard-mappings|.  If you want to disable the
-			mapping, use this: >
-				silent! vunmap <C-X>
-<
 							*v_g_CTRL-X*
 {Visual}g CTRL-X	Subtract [count] from the number or alphabetic
 			character in the highlighted text. If several lines
diff --git a/runtime/doc/cmdline.txt b/runtime/doc/cmdline.txt
index 80b6cbbeab..948c921431 100644
--- a/runtime/doc/cmdline.txt
+++ b/runtime/doc/cmdline.txt
@@ -13,13 +13,7 @@ Command-line mode is used to enter Ex commands (":"), search patterns
 Basic command line editing is explained in chapter 20 of the user manual
 |usr_20.txt|.
 
-1. Command-line editing		|cmdline-editing|
-2. Command-line completion	|cmdline-completion|
-3. Ex command-lines		|cmdline-lines|
-4. Ex command-line ranges	|cmdline-ranges|
-5. Ex command-line flags	|ex-flags|
-6. Ex special characters	|cmdline-special|
-7. Command-line window		|cmdline-window|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Command-line editing					*cmdline-editing*
diff --git a/runtime/doc/debug.txt b/runtime/doc/debug.txt
index c5414e91ca..fd2c4fa54e 100644
--- a/runtime/doc/debug.txt
+++ b/runtime/doc/debug.txt
@@ -9,9 +9,7 @@ Debugging Vim						*debug-vim*
 This is for debugging Vim itself, when it doesn't work properly.
 For debugging Vim scripts, functions, etc. see |debug-scripts|
 
-1. Location of a crash, using gcc and gdb	|debug-gcc|
-2. Locating memory leaks			|debug-leaks|
-3. Windows Bug Reporting			|debug-win32|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 
diff --git a/runtime/doc/develop.txt b/runtime/doc/develop.txt
index 0e909aac65..7fd1f90173 100644
--- a/runtime/doc/develop.txt
+++ b/runtime/doc/develop.txt
@@ -6,14 +6,13 @@
 
 Development of Nvim.					*development*
 
-1. Design goals		        |design-goals|
-2. Developer guidelines	        |dev-help|
-
 Nvim is open source software.  Everybody is encouraged to contribute.
     https://github.com/neovim/neovim/blob/master/CONTRIBUTING.md
 
 See src/nvim/README.md for an overview of the source code.
 
+                                      Type <M-]> to see the table of contents.
+
 ==============================================================================
 Design goals						*design-goals*
 
diff --git a/runtime/doc/diff.txt b/runtime/doc/diff.txt
index e04aa55b5a..74a3d183a3 100644
--- a/runtime/doc/diff.txt
+++ b/runtime/doc/diff.txt
@@ -10,11 +10,7 @@ eight versions of the same file.
 
 The basics are explained in section |08.7| of the user manual.
 
-1. Starting diff mode		|diff-mode|
-2. Viewing diffs		|view-diffs|
-3. Jumping to diffs		|jumpto-diffs|
-4. Copying diffs		|copy-diffs|
-5. Diff options			|diff-options|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Starting diff mode
diff --git a/runtime/doc/digraph.txt b/runtime/doc/digraph.txt
index 20fbe60602..89351c5b4f 100644
--- a/runtime/doc/digraph.txt
+++ b/runtime/doc/digraph.txt
@@ -14,9 +14,7 @@ with CTRL-V (see |i_CTRL-V|).
 There is a brief introduction on digraphs in the user manual: |24.9|
 An alternative is using the 'keymap' option.
 
-1. Defining digraphs	|digraphs-define|
-2. Using digraphs	|digraphs-use|
-3. Default digraphs	|digraphs-default|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Defining digraphs					*digraphs-define*
diff --git a/runtime/doc/editing.txt b/runtime/doc/editing.txt
index 7007a89611..9fe815ea9c 100644
--- a/runtime/doc/editing.txt
+++ b/runtime/doc/editing.txt
@@ -6,17 +6,7 @@
 
 Editing files						*edit-files*
 
-1.  Introduction		|edit-intro|
-2.  Editing a file		|edit-a-file|
-3.  The argument list		|argument-list|
-4.  Writing			|writing|
-5.  Writing and quitting	|write-quit|
-6.  Dialogs			|edit-dialogs|
-7.  The current directory	|current-directory|
-8.  Editing binary files	|edit-binary|
-9.  Encryption			|encryption|
-10. Timestamps			|timestamps|
-11. File Searching		|file-searching|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Introduction						*edit-intro*
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index b7ff1b953c..3b9c11770e 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -12,23 +12,7 @@ Note: Expression evaluation can be disabled at compile time.  If this has been
 done, the features in this document are not available.	See |+eval| and
 |no-eval-feature|.
 
-1.  Variables			|variables|
-    1.1 Variable types
-    1.2 Function references		|Funcref|
-    1.3 Lists				|Lists|
-    1.4 Dictionaries			|Dictionaries|
-    1.5 More about variables		|more-variables|
-2.  Expression syntax		|expression-syntax|
-3.  Internal variable		|internal-variables|
-4.  Builtin Functions		|functions|
-5.  Defining functions		|user-functions|
-6.  Curly braces names		|curly-braces-names|
-7.  Commands			|expression-commands|
-8.  Exception handling		|exception-handling|
-9.  Examples			|eval-examples|
-10. No +eval feature		|no-eval-feature|
-11. The sandbox			|eval-sandbox|
-12. Textlock			|textlock|
+				      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Variables						*variables*
diff --git a/runtime/doc/filetype.txt b/runtime/doc/filetype.txt
index e781c212dc..64d9c6daa9 100644
--- a/runtime/doc/filetype.txt
+++ b/runtime/doc/filetype.txt
@@ -6,12 +6,10 @@
 
 Filetypes						*filetype* *file-type*
 
-1. Filetypes					|filetypes|
-2. Filetype plugin				|filetype-plugins|
-3. Docs for the default filetype plugins.	|ftplugin-docs|
-
 Also see |autocmd.txt|.
 
+                                      Type <M-]> to see the table of contents.
+
 ==============================================================================
 1. Filetypes					*filetypes* *file-types*
 
diff --git a/runtime/doc/fold.txt b/runtime/doc/fold.txt
index 4826a65d7b..88dde9f61d 100644
--- a/runtime/doc/fold.txt
+++ b/runtime/doc/fold.txt
@@ -9,10 +9,7 @@ Folding						*Folding* *folding* *folds*
 You can find an introduction on folding in chapter 28 of the user manual.
 |usr_28.txt|
 
-1. Fold methods		|fold-methods|
-2. Fold commands	|fold-commands|
-3. Fold options		|fold-options|
-4. Behavior of folds	|fold-behavior|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Fold methods					*fold-methods*
diff --git a/runtime/doc/gui.txt b/runtime/doc/gui.txt
index 7cf489d769..314799d083 100644
--- a/runtime/doc/gui.txt
+++ b/runtime/doc/gui.txt
@@ -6,12 +6,7 @@
 
 Vim's Graphical User Interface				*gui* *GUI*
 
-1. Starting the GUI		|gui-start|
-2. Scrollbars			|gui-scrollbars|
-3. Mouse Control		|gui-mouse|
-4. Making GUI Selections	|gui-selections|
-5. Menus			|menus|
-6. Extras			|gui-extras|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Starting the GUI				*gui-start* *E229* *E233*
diff --git a/runtime/doc/helphelp.txt b/runtime/doc/helphelp.txt
index 6639cd70cf..5948b24667 100644
--- a/runtime/doc/helphelp.txt
+++ b/runtime/doc/helphelp.txt
@@ -6,9 +6,7 @@
 
 Help on help files					*helphelp*
 
-1. Help commands		|online-help|
-2. Translated help files	|help-translated|
-3. Writing help files		|help-writing|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Help commands					*online-help*
diff --git a/runtime/doc/if_cscop.txt b/runtime/doc/if_cscop.txt
index 3ce1575c99..831b2c9840 100644
--- a/runtime/doc/if_cscop.txt
+++ b/runtime/doc/if_cscop.txt
@@ -12,15 +12,7 @@ a cscope query is just like jumping to any tag; it is saved on the tag stack
 so that with the right keyboard mappings, you can jump back and forth between
 functions as you normally would with |tags|.
 
-1. Cscope introduction		|cscope-intro|
-2. Cscope related commands	|cscope-commands|
-3. Cscope options		|cscope-options|
-4. How to use cscope in Vim	|cscope-howtouse|
-5. Limitations			|cscope-limitations|
-6. Suggested usage		|cscope-suggestions|
-7. Availability & Information	|cscope-info|
-
-This is currently for Unix and Win32 only.
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Cscope introduction					*cscope-intro*
diff --git a/runtime/doc/if_pyth.txt b/runtime/doc/if_pyth.txt
index e19a80059a..25da033190 100644
--- a/runtime/doc/if_pyth.txt
+++ b/runtime/doc/if_pyth.txt
@@ -6,18 +6,10 @@
 
 The Python Interface to Vim				*python* *Python*
 
-1. Commands					|python-commands|
-2. The vim module				|python-vim|
-3. Buffer objects				|python-buffer|
-4. Range objects				|python-range|
-5. Window objects				|python-window|
-6. Tab page objects				|python-tabpage|
-7. vim.bindeval objects				|python-bindeval-objects|
-8. pyeval(), py3eval() Vim functions		|python-pyeval|
-9. Python 3					|python3|
-
 See |provider-python| for more information. {Nvim}
 
+                                      Type <M-]> to see the table of contents.
+
 ==============================================================================
 1. Commands						*python-commands*
 
diff --git a/runtime/doc/if_ruby.txt b/runtime/doc/if_ruby.txt
index e02ace67de..54d81a958d 100644
--- a/runtime/doc/if_ruby.txt
+++ b/runtime/doc/if_ruby.txt
@@ -5,18 +5,13 @@
 
 The Ruby Interface to Vim				*ruby* *Ruby*
 
-
-1. Commands			|ruby-commands|
-2. The VIM module		|ruby-vim|
-3. VIM::Buffer objects		|ruby-buffer|
-4. VIM::Window objects		|ruby-window|
-5. Global variables		|ruby-globals|
-
 			*E266* *E267* *E268* *E269* *E270* *E271* *E272* *E273*
 
 The home page for ruby is http://www.ruby-lang.org/.  You can find links for
 downloading Ruby there.
 
+                                      Type <M-]> to see the table of contents.
+
 ==============================================================================
 1. Commands						*ruby-commands*
 
diff --git a/runtime/doc/indent.txt b/runtime/doc/indent.txt
index 4f4b39f559..8e17de3fb0 100644
--- a/runtime/doc/indent.txt
+++ b/runtime/doc/indent.txt
@@ -6,8 +6,7 @@
 
 This file is about indenting C programs and other files.
 
-1. Indenting C style programs	|C-indenting|
-2. Indenting by expression	|indent-expression|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Indenting C style programs				*C-indenting*
diff --git a/runtime/doc/index.txt b/runtime/doc/index.txt
index 16e9d4a64d..06196dbefa 100644
--- a/runtime/doc/index.txt
+++ b/runtime/doc/index.txt
@@ -10,22 +10,13 @@ short description.  The lists are sorted on ASCII value.
 Tip: When looking for certain functionality, use a search command.  E.g.,
 to look for deleting something, use: "/delete".
 
-1. Insert mode				|insert-index|
-2. Normal mode				|normal-index|
-   2.1. Text objects			|objects|
-   2.2. Window commands			|CTRL-W|
-   2.3. Square bracket commands		|[|
-   2.4. Commands starting with 'g'	|g|
-   2.5. Commands starting with 'z'	|z|
-3. Visual mode				|visual-index|
-4. Command-line editing			|ex-edit-index|
-5. EX commands				|ex-cmd-index|
-
 For an overview of options see help.txt |option-list|.
 For an overview of built-in functions see |functions|.
 For a list of Vim variables see |vim-variable|.
 For a complete listing of all help items see |help-tags|.
 
+                                      Type <M-]> to see the table of contents.
+
 ==============================================================================
 1. Insert mode						*insert-index*
 
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index 8b8c05c070..9219f45c83 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -13,20 +13,11 @@ commands for inserting text in other ways.
 An overview of the most often used commands can be found in chapter 24 of the
 user manual |usr_24.txt|.
 
-1. Special keys						|ins-special-keys|
-2. Special special keys					|ins-special-special|
-3. 'textwidth' and 'wrapmargin' options			|ins-textwidth|
-4. 'expandtab', 'smarttab' and 'softtabstop'  options	|ins-expandtab|
-5. Replace mode						|Replace-mode|
-6. Virtual Replace mode					|Virtual-Replace-mode|
-7. Insert mode completion				|ins-completion|
-8. Insert mode commands					|inserting|
-9. Ex insert commands					|inserting-ex|
-10. Inserting a file					|inserting-file|
-
 Also see 'virtualedit', for moving the cursor to positions where there is no
 character.  Useful for editing a table.
 
+                                      Type <M-]> to see the table of contents.
+
 ==============================================================================
 1. Special keys						*ins-special-keys*
 
diff --git a/runtime/doc/intro.txt b/runtime/doc/intro.txt
index bbe2df11e6..f9e97c4c38 100644
--- a/runtime/doc/intro.txt
+++ b/runtime/doc/intro.txt
@@ -6,14 +6,7 @@
 
 Introduction to Vim					*ref* *reference*
 
-1. Introduction			|intro|
-2. Vim on the internet		|internet|
-3. Credits			|credits|
-4. Notation			|notation|
-5. Modes, introduction		|vim-modes-intro|
-6. Switching from mode to mode	|mode-switching|
-7. The window contents		|window-contents|
-8. Definitions			|definitions|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Introduction						*intro*
diff --git a/runtime/doc/job_control.txt b/runtime/doc/job_control.txt
index 40fd83b52c..5f9654d83c 100644
--- a/runtime/doc/job_control.txt
+++ b/runtime/doc/job_control.txt
@@ -6,8 +6,7 @@
 
 Nvim's facilities for job control				  *job-control*
 
-1. Introduction			|job-control-intro|
-2. Usage			|job-control-usage|
+				      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Introduction						    *job-control-intro*
diff --git a/runtime/doc/map.txt b/runtime/doc/map.txt
index 3513a19899..16c044a21d 100644
--- a/runtime/doc/map.txt
+++ b/runtime/doc/map.txt
@@ -9,21 +9,7 @@ Key mapping, abbreviations and user-defined commands.
 This subject is introduced in sections |05.3|, |24.7| and |40.1| of the user
 manual.
 
-1. Key mapping			|key-mapping|
-   1.1 MAP COMMANDS			|:map-commands|
-   1.2 Special arguments		|:map-arguments|
-   1.3 Mapping and modes		|:map-modes|
-   1.4 Listing mappings			|map-listing|
-   1.5 Mapping special keys		|:map-special-keys|
-   1.6 Special characters		|:map-special-chars|
-   1.7 What keys to map			|map-which-keys|
-   1.8 Examples				|map-examples|
-   1.9 Using mappings			|map-typing|
-   1.10 Mapping alt-keys		|:map-alt-keys|
-   1.11 Mapping an operator		|:map-operator|
-2. Abbreviations		|abbreviations|
-3. Local mappings and functions	|script-local|
-4. User-defined commands	|user-commands|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Key mapping				*key-mapping* *mapping* *macro*
diff --git a/runtime/doc/mbyte.txt b/runtime/doc/mbyte.txt
index 870264adc6..2e2ca92656 100644
--- a/runtime/doc/mbyte.txt
+++ b/runtime/doc/mbyte.txt
@@ -14,6 +14,8 @@ For an introduction to the most common features, see |usr_45.txt| in the user
 manual.
 For changing the language of messages and menus see |mlang.txt|.
 
+                                      Type <M-]> to see the table of contents.
+
 ==============================================================================
 Getting started						*mbyte-first*
 
diff --git a/runtime/doc/message.txt b/runtime/doc/message.txt
index e6bd6ae506..c6c6f49026 100644
--- a/runtime/doc/message.txt
+++ b/runtime/doc/message.txt
@@ -8,9 +8,7 @@ This file contains an alphabetical list of messages and error messages that
 Vim produces.  You can use this if you don't understand what the message
 means.  It is not complete though.
 
-1. Old messages		|:messages|
-2. Error messages	|error-messages|
-3. Messages		|messages|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Old messages			*:messages* *:mes* *message-history*
diff --git a/runtime/doc/mlang.txt b/runtime/doc/mlang.txt
index 187d8f029b..717ec9530c 100644
--- a/runtime/doc/mlang.txt
+++ b/runtime/doc/mlang.txt
@@ -11,11 +11,7 @@ multi-byte text see |multibyte|.
 
 The basics are explained in the user manual: |usr_45.txt|.
 
-1. Messages			|multilang-messages|
-2. Menus			|multilang-menus|
-3. Scripts			|multilang-scripts|
-
-Also see |help-translated| for multi-language help.
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Messages						*multilang-messages*
diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index a89fabe107..99aa76bfe5 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -10,16 +10,6 @@ These commands move the cursor position.  If the new position is off of the
 screen, the screen is scrolled to show the cursor (see also 'scrolljump' and
 'scrolloff' options).
 
-1. Motions and operators	|operator|
-2. Left-right motions		|left-right-motions|
-3. Up-down motions		|up-down-motions|
-4. Word motions			|word-motions|
-5. Text object motions		|object-motions|
-6. Text object selection	|object-select|
-7. Marks			|mark-motions|
-8. Jumps			|jump-motions|
-9. Various motions		|various-motions|
-
 General remarks:
 
 If you want to know where you are in the file use the "CTRL-G" command
@@ -36,6 +26,8 @@ The 'virtualedit' option can be set to make it possible to move the cursor to
 positions where there is no character or within a multi-column character (like
 a tab).
 
+                                      Type <M-]> to see the table of contents.
+
 ==============================================================================
 1. Motions and operators				*operator*
 
diff --git a/runtime/doc/msgpack_rpc.txt b/runtime/doc/msgpack_rpc.txt
index 8d013dceb2..856476c6ae 100644
--- a/runtime/doc/msgpack_rpc.txt
+++ b/runtime/doc/msgpack_rpc.txt
@@ -6,12 +6,7 @@
 
 RPC API for Nvim				     *RPC* *rpc* *msgpack-rpc*
 
-1. Introduction			|rpc-intro|
-2. API mapping			|rpc-api|
-3. Connecting			|rpc-connecting|
-4. Clients			|rpc-api-client|
-5. Types			|rpc-types|
-6. Remote UIs			|rpc-remote-ui|
+				      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Introduction						            *rpc-intro*
@@ -33,7 +28,7 @@ programs can:
 The RPC API is like a more powerful version of Vim's `clientserver` feature.
 
 ==============================================================================
- 2. API mapping							    *rpc-api*
+2. API mapping							    *rpc-api*
 
 The Nvim C |API| is automatically exposed to the RPC API by the build system,
 which parses headers at src/nvim/api/*. A dispatch function is generated which
diff --git a/runtime/doc/nvim.txt b/runtime/doc/nvim.txt
index 8dd329cee6..2256791ec4 100644
--- a/runtime/doc/nvim.txt
+++ b/runtime/doc/nvim.txt
@@ -4,15 +4,17 @@
 			    NVIM REFERENCE MANUAL
 
 
-Nvim						*nvim* *nvim-intro*
+Nvim							   *nvim* *nvim-intro*
 
-If you are new to Vim (and Nvim) see |help.txt| or type ":Tutor".
-If you already use Vim (but not Nvim) see |nvim-from-vim| for a quickstart.
+If you are new to Vim see |help.txt|, or type ":Tutor".
+If you already use Vim see |nvim-from-vim| for a quickstart.
 
 Nvim is emphatically a fork of Vim, not a clone: compatibility with Vim is
 maintained where possible. See |vim_diff.txt| for the complete reference of
 differences from Vim.
 
+				      Type <M-]> to see the table of contents.
+
 ==============================================================================
 Transitioning from Vim				*nvim-from-vim*
 
diff --git a/runtime/doc/nvim_terminal_emulator.txt b/runtime/doc/nvim_terminal_emulator.txt
index 85325d3470..9f448ae3ba 100644
--- a/runtime/doc/nvim_terminal_emulator.txt
+++ b/runtime/doc/nvim_terminal_emulator.txt
@@ -15,6 +15,8 @@ Terminal buffers behave mostly like normal 'nomodifiable' buffers, except:
 - 'scrollback' controls how many off-screen lines are kept.
 - Terminal output is followed if the cursor is on the last line.
 
+				      Type <M-]> to see the table of contents.
+
 ==============================================================================
 Spawning					  *terminal-emulator-spawning*
 
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index cef966e8a3..e72241518c 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -6,10 +6,6 @@
 
 Options							*options*
 
-1. Setting options			|set-option|
-2. Automatically setting options	|auto-setting|
-3. Options summary			|option-summary|
-
 For an overview of options see quickref.txt |option-list|.
 
 Vim has a number of internal variables and switches which can be set to
@@ -18,6 +14,8 @@ achieve special effects.  These options come in three forms:
 	number		has a numeric value
 	string		has a string value
 
+				      Type <M-]> to see the table of contents.
+
 ==============================================================================
 1. Setting options					*set-option* *E764*
 
diff --git a/runtime/doc/os_win32.txt b/runtime/doc/os_win32.txt
index cd8ad3465a..4b012712fc 100644
--- a/runtime/doc/os_win32.txt
+++ b/runtime/doc/os_win32.txt
@@ -1,38 +1,11 @@
 *os_win32.txt*  Nvim
 
 
-		  VIM REFERENCE MANUAL    by George Reilly
+                            NVIM REFERENCE MANUAL
 
 
 						*win32* *Win32* *MS-Windows*
-This file documents the idiosyncrasies of the Win32 version of Vim.
-
-The Win32 version of Vim works on Windows XP, Vista and Windows 7.
-There are both console and GUI versions.
-
-The 32 bit version also runs on 64 bit MS-Windows systems.
-
-1. Known problems		|win32-problems|
-2. Startup			|win32-startup|
-3. Using the mouse		|win32-mouse|
-4. Win32 mini FAQ	        |win32-faq|
-
-Additionally, there are a number of common Win32 and DOS items:
-File locations			|dos-locations|
-Using backslashes		|dos-backslash|
-Standard mappings		|dos-standard-mappings|
-Screen output and colors	|dos-colors|
-File formats			|dos-file-formats|
-:cd command			|dos-:cd|
-Interrupting			|dos-CTRL-Break|
-Temp files			|dos-temp-files|
-Shell option default		|dos-shell|
-
-Win32 GUI			|gui-w32|
-
-Credits:
-The Win32 version was written by George V. Reilly <george@reilly.org>.
-The GUI version was made by George V. Reilly and Robert Webb.
+This file documents the Win32 version of Nvim.
 
 ==============================================================================
 1. Known problems					*win32-problems*
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index c951a58734..f7f561dfa5 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -9,16 +9,7 @@ Patterns and search commands				*pattern-searches*
 The very basics can be found in section |03.9| of the user manual.  A few more
 explanations are in chapter 27 |usr_27.txt|.
 
-1. Search commands		|search-commands|
-2. The definition of a pattern	|search-pattern|
-3. Magic			|/magic|
-4. Overview of pattern items	|pattern-overview|
-5. Multi items			|pattern-multi-items|
-6. Ordinary atoms		|pattern-atoms|
-7. Ignoring case in a pattern	|/ignorecase|
-8. Composing characters		|patterns-composing|
-9. Compare with Perl patterns	|perl-patterns|
-10. Highlighting matches	|match-highlight|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Search commands				*search-commands*
@@ -130,8 +121,7 @@ gD			Goto global Declaration.  When the cursor is on a
 			ends before the cursor position.
 
 							*CTRL-C*
-CTRL-C			Interrupt current (search) command.  Use CTRL-Break on
-			Windows |dos-CTRL-Break|.
+CTRL-C			Interrupt current (search) command.
 			In Normal mode, any pending command is aborted.
 
 							*:noh* *:nohlsearch*
diff --git a/runtime/doc/pi_health.txt b/runtime/doc/pi_health.txt
index 69833103d1..8354c0470f 100644
--- a/runtime/doc/pi_health.txt
+++ b/runtime/doc/pi_health.txt
@@ -2,10 +2,7 @@
 
 Author: TJ DeVries <devries.timothyj@gmail.com>
 
-==============================================================================
-1. Introduction				|health.vim-intro|
-2. Commands and functions		|health.vim-manual|
-3. Create a healthcheck			|health.vim-dev|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 Introduction				*healthcheck* *health.vim-intro*
@@ -100,15 +97,12 @@ health#{plugin}#check() function in autoload/health/{plugin}.vim.
 |:CheckHealth| automatically finds and invokes such functions.
 
 If your plugin is named "jslint", then its healthcheck function must be >
-
         health#jslint#check()
-<
+
 defined in this file on 'runtimepath': >
-
         autoload/health/jslint.vim
-<
-Here's a sample to get started: >
 
+Here's a sample to get started: >
         function! health#jslint#check() abort
           call health#report_start('sanity checks')
           " perform arbitrary checks
@@ -121,7 +115,7 @@ Here's a sample to get started: >
               \ ['npm install --save jslint'])
           endif
         endfunction
-<
+
 ==============================================================================
 
 vim:tw=78:ts=8:ft=help:fdm=marker
diff --git a/runtime/doc/print.txt b/runtime/doc/print.txt
index c5470d1469..01de3a5290 100644
--- a/runtime/doc/print.txt
+++ b/runtime/doc/print.txt
@@ -6,14 +6,7 @@
 
 Printing						*printing*
 
-1. Introduction				|print-intro|
-2. Print options			|print-options|
-3. PostScript Printing			|postscript-printing|
-4. PostScript Printing Encoding		|postscript-print-encoding|
-5. PostScript CJK Printing		|postscript-cjk-printing|
-6. PostScript Printing Troubleshooting	|postscript-print-trouble|
-7. PostScript Utilities			|postscript-print-util|
-8. Formfeed Characters			|printing-formfeed|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Introduction						*print-intro*
diff --git a/runtime/doc/provider.txt b/runtime/doc/provider.txt
index eaa23de093..8d1dd0a6cd 100644
--- a/runtime/doc/provider.txt
+++ b/runtime/doc/provider.txt
@@ -8,6 +8,8 @@ Providers	 						    *provider*
 
 Nvim delegates some features to dynamic "providers".
 
+				      Type <M-]> to see the table of contents.
+
 ==============================================================================
 Python integration		    	      *provider-python*
 
diff --git a/runtime/doc/quickfix.txt b/runtime/doc/quickfix.txt
index d9f6b2c39d..cad5bf98b5 100644
--- a/runtime/doc/quickfix.txt
+++ b/runtime/doc/quickfix.txt
@@ -6,15 +6,7 @@
 
 This subject is introduced in section |30.1| of the user manual.
 
-1. Using QuickFix commands		|quickfix|
-2. The error window			|quickfix-window|
-3. Using more than one list of errors	|quickfix-error-lists|
-4. Using :make				|:make_makeprg|
-5. Using :grep				|grep|
-6. Selecting a compiler			|compiler-select|
-7. The error format			|error-file-format|
-8. The directory stack			|quickfix-directory-stack|
-9. Specific error file formats		|errorformats|
+                                      Type <M-]> to see the table of contents.
 
 =============================================================================
 1. Using QuickFix commands			*quickfix* *Quickfix* *E42*
diff --git a/runtime/doc/quickref.txt b/runtime/doc/quickref.txt
index 75a47e55ce..128c70ee94 100644
--- a/runtime/doc/quickref.txt
+++ b/runtime/doc/quickref.txt
@@ -988,7 +988,6 @@ Short explanation of each option:		*option-list*
 |g_CTRL-G|	   g CTRL-G	show cursor column, line, and character
 				   position
 |CTRL-C|	   CTRL-C	during searches: Interrupt the search
-|dos-CTRL-Break|   CTRL-Break	Windows: during searches: Interrupt the search
 |<Del>|		   <Del>	while entering a count: delete last character
 |:version|	:ve[rsion]	show version information
 |:normal|	:norm[al][!] {commands}
diff --git a/runtime/doc/recover.txt b/runtime/doc/recover.txt
index 8eded487c0..2b49af1c96 100644
--- a/runtime/doc/recover.txt
+++ b/runtime/doc/recover.txt
@@ -15,8 +15,7 @@ You can recover most of your changes from the files that Vim uses to store
 the contents of the file.  Mostly you can recover your work with one command:
 	vim -r filename
 
-1. The swap file	|swap-file|
-2. Recovery		|recovery|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. The swap file					*swap-file*
diff --git a/runtime/doc/remote.txt b/runtime/doc/remote.txt
index b99aa6a859..bdc763b85f 100644
--- a/runtime/doc/remote.txt
+++ b/runtime/doc/remote.txt
@@ -6,9 +6,7 @@
 
 Vim client-server communication				*client-server*
 
-1. Common functionality		|clientserver|
-2. X11 specific items		|x11-clientserver|
-3. MS-Windows specific items	|w32-clientserver|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Common functionality					*clientserver*
diff --git a/runtime/doc/remote_plugin.txt b/runtime/doc/remote_plugin.txt
index 3c682e83f3..cc2efd3d1f 100644
--- a/runtime/doc/remote_plugin.txt
+++ b/runtime/doc/remote_plugin.txt
@@ -6,10 +6,7 @@
 
 Nvim support for remote plugins 		  *remote-plugin*
 
-1. Introduction					|remote-plugin-intro|
-2. Plugin hosts					|remote-plugin-hosts|
-3. Example					|remote-plugin-example|
-4. Plugin manifest				|remote-plugin-manifest|
+				      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Introduction					    *remote-plugin-intro*
diff --git a/runtime/doc/repeat.txt b/runtime/doc/repeat.txt
index 8316387726..0b3edc9bba 100644
--- a/runtime/doc/repeat.txt
+++ b/runtime/doc/repeat.txt
@@ -8,14 +8,7 @@ Repeating commands, Vim scripts and debugging			*repeating*
 
 Chapter 26 of the user manual introduces repeating |usr_26.txt|.
 
-1. Single repeats		|single-repeat|
-2. Multiple repeats		|multi-repeat|
-3. Complex repeats		|complex-repeat|
-4. Using Vim scripts		|using-scripts|
-5. Using Vim packages		|packages|
-6. Creating Vim packages	|package-create|
-7. Debugging scripts		|debug-scripts|
-8. Profiling			|profiling|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Single repeats					*single-repeat*
diff --git a/runtime/doc/russian.txt b/runtime/doc/russian.txt
index 7dd267ad50..e2c44ce54f 100644
--- a/runtime/doc/russian.txt
+++ b/runtime/doc/russian.txt
@@ -6,10 +6,7 @@
 
 Russian language localization and support in Vim	   *russian* *Russian*
 
-1. Introduction				  |russian-intro|
-2. Russian keymaps			  |russian-keymap|
-3. Localization				  |russian-l18n|
-4. Known issues				  |russian-issues|
+                                      Type <M-]> to see the table of contents.
 
 ===============================================================================
 1. Introduction							*russian-intro*
diff --git a/runtime/doc/scroll.txt b/runtime/doc/scroll.txt
index 93c704a8ba..52e5cc9f0c 100644
--- a/runtime/doc/scroll.txt
+++ b/runtime/doc/scroll.txt
@@ -16,12 +16,7 @@ upwards in the buffer, the text in the window moves downwards on your screen.
 
 See section |03.7| of the user manual for an introduction.
 
-1. Scrolling downwards		|scroll-down|
-2. Scrolling upwards		|scroll-up|
-3. Scrolling relative to cursor	|scroll-cursor|
-4. Scrolling horizontally	|scroll-horizontal|
-5. Scrolling synchronously	|scroll-binding|
-6. Scrolling with a mouse wheel |scroll-mouse-wheel|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Scrolling downwards					*scroll-down*
diff --git a/runtime/doc/sign.txt b/runtime/doc/sign.txt
index 466a030e0c..ced0608e8a 100644
--- a/runtime/doc/sign.txt
+++ b/runtime/doc/sign.txt
@@ -7,8 +7,7 @@
 
 Sign Support Features				*sign-support*
 
-1. Introduction				|sign-intro|
-2. Commands				|sign-commands|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Introduction					*sign-intro* *signs*
diff --git a/runtime/doc/spell.txt b/runtime/doc/spell.txt
index 08415f72a7..5c99db42ba 100644
--- a/runtime/doc/spell.txt
+++ b/runtime/doc/spell.txt
@@ -6,10 +6,7 @@
 
 Spell checking						*spell*
 
-1. Quick start			|spell-quickstart|
-2. Remarks on spell checking	|spell-remarks|
-3. Generating a spell file	|spell-mkspell|
-4. Spell file format		|spell-file-format|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Quick start					*spell-quickstart* *E756*
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 5822510a8a..477d927a12 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -6,15 +6,7 @@
 
 Starting Vim						*starting*
 
-1. Vim arguments		|vim-arguments|
-2. Initialization		|initialization|
-3. $VIM and $VIMRUNTIME		|$VIM|
-4. Suspending			|suspend|
-5. Exiting			|exiting|
-6. Saving settings		|save-settings|
-7. Views and Sessions		|views-sessions|
-8. The ShaDa file		|shada-file|
-9. Base Directories     	|base-directories|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Vim arguments					*vim-arguments*
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index eb79ffc865..a45fa3096a 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -20,24 +20,7 @@ In the User Manual:
 |usr_06.txt| introduces syntax highlighting.
 |usr_44.txt| introduces writing a syntax file.
 
-1.  Quick start			|:syn-qstart|
-2.  Syntax files		|:syn-files|
-3.  Syntax loading procedure	|syntax-loading|
-4.  Syntax file remarks		|:syn-file-remarks|
-5.  Defining a syntax		|:syn-define|
-6.  :syntax arguments		|:syn-arguments|
-7.  Syntax patterns		|:syn-pattern|
-8.  Syntax clusters		|:syn-cluster|
-9.  Including syntax files	|:syn-include|
-10. Synchronizing		|:syn-sync|
-11. Listing syntax items	|:syntax|
-12. Highlight command		|:highlight|
-13. Linking groups		|:highlight-link|
-14. Cleaning up			|:syn-clear|
-15. Highlighting tags		|tag-highlight|
-16. Window-local syntax		|:ownsyntax|
-17. Color xterms		|xterm-color|
-18. When syntax is slow		|:syntime|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Quick start						*:syn-qstart*
diff --git a/runtime/doc/tabpage.txt b/runtime/doc/tabpage.txt
index 60bd864bcc..8f1eb9d8cd 100644
--- a/runtime/doc/tabpage.txt
+++ b/runtime/doc/tabpage.txt
@@ -10,11 +10,7 @@ The commands which have been added to use multiple tab pages are explained
 here.  Additionally, there are explanations for commands that work differently
 when used in combination with more than one tab page.
 
-1. Introduction			|tab-page-intro|
-2. Commands			|tab-page-commands|
-3. Other items			|tab-page-other|
-4. Setting 'tabline'		|setting-tabline|
-5. Setting 'guitablabel'	|setting-guitablabel|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Introduction						*tab-page-intro*
diff --git a/runtime/doc/tagsrch.txt b/runtime/doc/tagsrch.txt
index b47053e17b..d5a4f4e627 100644
--- a/runtime/doc/tagsrch.txt
+++ b/runtime/doc/tagsrch.txt
@@ -8,12 +8,7 @@ Tags and special searches				*tags-and-searches*
 
 See section |29.1| of the user manual for an introduction.
 
-1. Jump to a tag		|tag-commands|
-2. Tag stack			|tag-stack|
-3. Tag match list		|tag-matchlist|
-4. Tags details			|tag-details|
-5. Tags file format		|tags-file-format|
-6. Include file searches	|include-search|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Jump to a tag					*tag-commands*
diff --git a/runtime/doc/term.txt b/runtime/doc/term.txt
index 4b96dd3330..cdff8760fc 100644
--- a/runtime/doc/term.txt
+++ b/runtime/doc/term.txt
@@ -4,7 +4,7 @@
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
 
 
-Terminal information					*terminal-info*
+Terminal information
 
 Vim uses information about the terminal you are using to fill the screen and
 recognize what keys you hit.  If this information is not correct, the screen
@@ -12,6 +12,8 @@ may be messed up or keys may not be recognized.  The actions which have to be
 performed on the screen are accomplished by outputting a string of
 characters.
 
+                                      Type <M-]> to see the table of contents.
+
 ==============================================================================
 Startup						*startup-terminal*
 
diff --git a/runtime/doc/tips.txt b/runtime/doc/tips.txt
index 05d080280c..9b34cd7599 100644
--- a/runtime/doc/tips.txt
+++ b/runtime/doc/tips.txt
@@ -13,21 +13,7 @@ http://www.vim.org
 Don't forget to browse the user manual, it also contains lots of useful tips
 |usr_toc.txt|.
 
-Editing C programs				|C-editing|
-Finding where identifiers are used		|ident-search|
-Scrolling in Insert mode			|scroll-insert|
-Smooth scrolling				|scroll-smooth|
-Correcting common typing mistakes		|type-mistakes|
-Counting words, lines, etc.			|count-items|
-Restoring the cursor position			|restore-position|
-Renaming files					|rename-files|
-Change a name in multiple files			|change-name|
-Speeding up external commands			|speed-up|
-Useful mappings					|useful-mappings|
-Compressing the help files			|gzip-helpfile|
-Hex editing					|hex-editing|
-Using <> notation in autocommands		|autocmd-<>|
-Highlighting matching parens			|match-parens|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 Editing C programs					*C-editing*
diff --git a/runtime/doc/undo.txt b/runtime/doc/undo.txt
index e40be6b250..cbce868cec 100644
--- a/runtime/doc/undo.txt
+++ b/runtime/doc/undo.txt
@@ -8,12 +8,7 @@ Undo and redo						*undo-redo*
 
 The basics are explained in section |02.5| of the user manual.
 
-1. Undo and redo commands	|undo-commands|
-2. Two ways of undo		|undo-two-ways|
-3. Undo blocks			|undo-blocks|
-4. Undo branches		|undo-branches|
-5. Undo persistence		|undo-persistence|
-6. Remarks about undo		|undo-remarks|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Undo and redo commands				*undo-commands*
diff --git a/runtime/doc/usr_toc.txt b/runtime/doc/usr_toc.txt
index 0dce3eac83..ed14d78d22 100644
--- a/runtime/doc/usr_toc.txt
+++ b/runtime/doc/usr_toc.txt
@@ -48,9 +48,8 @@ Tuning Vim
 Reference manual
 |reference_toc|     More detailed information for all commands
 
-The user manual is available as a single, ready to print HTML and PDF file
-here:
-	http://vimdoc.sf.net
+The user manual is online:
+	https://neovim.io/doc/user
 
 ==============================================================================
 Getting Started ~
diff --git a/runtime/doc/various.txt b/runtime/doc/various.txt
index 870f400f52..e8da7eeb89 100644
--- a/runtime/doc/various.txt
+++ b/runtime/doc/various.txt
@@ -6,8 +6,7 @@
 
 Various commands					*various*
 
-1. Various commands		|various-cmds|
-2. Using Vim like less or more	|less|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Various commands					*various-cmds*
diff --git a/runtime/doc/vi_diff.txt b/runtime/doc/vi_diff.txt
index 1fbd96f749..b8bfcaa586 100644
--- a/runtime/doc/vi_diff.txt
+++ b/runtime/doc/vi_diff.txt
@@ -6,8 +6,7 @@
 
 Differences between Vim and Vi				*vi-differences*
 
-1. Limits				|limits|
-2. The most interesting additions	|vim-additions|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Limits						*limits*
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 4c5f6815d7..de2dd601c5 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -10,13 +10,7 @@ Throughout the help files, differences between Nvim and Vim are indicated via
 the "{Nvim}" tag.  This document is a complete and centralized list of all
 these differences.
 
-1. Configuration		|nvim-configuration|
-2. Defaults			|nvim-defaults|
-3. New features			|nvim-features|
-4. Changed features		|nvim-features-changed|
-5. Missing legacy features	|nvim-features-missing|
-6. Removed features		|nvim-features-removed|
-
+				      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Configuration					    *nvim-configuration*
@@ -65,7 +59,6 @@ these differences.
 ==============================================================================
 3. New Features						       *nvim-features*
 
-
 MAJOR COMPONENTS ~
 
 Embedded terminal emulator	|terminal-emulator|
@@ -77,7 +70,6 @@ Remote plugins			|remote-plugin|
 Python plugins			|provider-python|
 Clipboard integration		|provider-clipboard|
 
-
 USER EXPERIENCE  ~
 
 Working intuitively and consistently is a major goal of Nvim. Examples:
@@ -100,6 +92,8 @@ editor. Even "legacy" Python and Ruby plugins which use the old Vim interfaces
 
 FEATURES ~
 
+"Outline": Type <M-]> in |:Man| and |:help| pages to see a document outline.
+
 |META| (ALT) chords are recognized, even in the terminal. Any |<M-| mapping
 will work. Some examples: <M-1>, <M-2>, <M-BS>, <M-Del>, <M-Ins>, <M-/>,
 <M-\>, <M-Space>, <M-Enter>, <M-=>, <M-->, <M-?>, <M-$>, ...
diff --git a/runtime/doc/visual.txt b/runtime/doc/visual.txt
index 9bad1a24a0..e9f5bf91f8 100644
--- a/runtime/doc/visual.txt
+++ b/runtime/doc/visual.txt
@@ -11,14 +11,7 @@ operator.  It is the only way to select a block of text.
 
 This is introduced in section |04.4| of the user manual.
 
-1. Using Visual mode			|visual-use|
-2. Starting and stopping Visual mode	|visual-start|
-3. Changing the Visual area		|visual-change|
-4. Operating on the Visual area		|visual-operators|
-5. Blockwise operators			|blockwise-operators|
-6. Repeating				|visual-repeat|
-7. Examples				|visual-examples|
-8. Select mode				|Select-mode|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Using Visual mode					*visual-use*
diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index ebedbb8ae6..1941ac0972 100644
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -13,18 +13,7 @@ differently when used in combination with more than one window.
 The basics are explained in chapter 7 and 8 of the user manual |usr_07.txt|
 |usr_08.txt|.
 
-1.  Introduction				|windows-intro|
-2.  Starting Vim				|windows-starting|
-3.  Opening and closing a window		|opening-window|
-4.  Moving cursor to other windows		|window-move-cursor|
-5.  Moving windows around			|window-moving|
-6.  Window resizing				|window-resize|
-7.  Argument and buffer list commands		|buffer-list|
-8.  Do a command in all buffers or windows	|list-repeat|
-9.  Tag or file name under the cursor		|window-tag|
-10. The preview window				|preview-window|
-11. Using hidden buffers			|buffer-hidden|
-12. Special kinds of buffers			|special-buffers|
+                                      Type <M-]> to see the table of contents.
 
 ==============================================================================
 1. Introduction					*windows-intro* *window*

From 62ab040fa4fc8746b926f1cc89883bad049007ed Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 1 May 2017 18:52:56 +0200
Subject: [PATCH 230/257] doc: api

---
 runtime/doc/api.txt | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/runtime/doc/api.txt b/runtime/doc/api.txt
index 9b2795863b..8db35c4590 100644
--- a/runtime/doc/api.txt
+++ b/runtime/doc/api.txt
@@ -270,7 +270,7 @@ nvim_get_option({name})                                    *nvim_get_option()*
                     {name}  Option name
 
                 Return:~
-                    Option value
+                    Option value (global)
 
 nvim_set_option({name}, {value})                           *nvim_set_option()*
                 Sets an option value
@@ -370,6 +370,17 @@ nvim_get_color_by_name({name})                      *nvim_get_color_by_name()*
 nvim_get_color_map()                                    *nvim_get_color_map()*
                 TODO: Documentation
 
+nvim_get_mode()                                              *nvim_get_mode()*
+                Gets the current mode.
+                mode:     Mode string. |mode()|
+                blocking: true if Nvim is waiting for input.
+
+                Attributes:~
+                    {async}
+
+                Return:~
+                    Dictionary { "mode": String, "blocking": Boolean }
+
 nvim_get_api_info()                                      *nvim_get_api_info()*
                 TODO: Documentation
 
@@ -514,15 +525,6 @@ nvim_buf_set_option({buffer}, {name}, {value})         *nvim_buf_set_option()*
                     {name}    Option name
                     {value}   Option value
 
-nvim_buf_get_number({buffer})                          *nvim_buf_get_number()*
-                Gets the buffer number
-
-                Parameters:~
-                    {buffer}  Buffer handle
-
-                Return:~
-                    Buffer number
-
 nvim_buf_get_name({buffer})                              *nvim_buf_get_name()*
                 Gets the full file name for the buffer
 

From 9a1b144054a7f0eaa31c17df91a3879b61d9748a Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 1 May 2017 21:04:13 +0200
Subject: [PATCH 231/257] scripts/release.sh

---
 scripts/release.sh | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/scripts/release.sh b/scripts/release.sh
index dac5e9b177..692b46e921 100755
--- a/scripts/release.sh
+++ b/scripts/release.sh
@@ -18,6 +18,8 @@ set -e
 set -u
 set -o pipefail
 
+USE_CURRENT_COMMIT=${1:-no}
+
 __sed=$( [ "$(uname)" = Darwin ] && echo 'sed -E' || echo 'sed -r' )
 
 cd "$(git rev-parse --show-toplevel)"
@@ -51,15 +53,18 @@ echo "Release version: ${__VERSION}"
 $__sed -i.bk 's/(NVIM_VERSION_PRERELEASE) "-dev"/\1 ""/' CMakeLists.txt
 if grep '(NVIM_API_PRERELEASE true)' CMakeLists.txt > /dev/null; then
   $__sed -i.bk 's/(NVIM_API_PRERELEASE) true/\1 false/' CMakeLists.txt
-  cp build/funcs_data.mpack test/functional/fixtures/api_level_$__API_LEVEL.mpack
+  build/bin/nvim --api-info > test/functional/fixtures/api_level_$__API_LEVEL.mpack
   git add test/functional/fixtures/api_level_$__API_LEVEL.mpack
 fi
 
-echo "Building changelog since ${__LAST_TAG}..."
-__CHANGELOG="$(./scripts/git-log-pretty-since.sh "$__LAST_TAG" 'vim-patch:\S')"
+if ! test "$USE_CURRENT_COMMIT" = 'use-current-commit' ; then
+  echo "Building changelog since ${__LAST_TAG}..."
+  __CHANGELOG="$(./scripts/git-log-pretty-since.sh "$__LAST_TAG" 'vim-patch:\S')"
+
+  git add CMakeLists.txt
+  git commit --edit -m "${__RELEASE_MSG} ${__CHANGELOG}"
+fi
 
-git add CMakeLists.txt
-git commit --edit -m "${__RELEASE_MSG} ${__CHANGELOG}"
 git tag --sign -a v"${__VERSION}" -m "NVIM v${__VERSION}"
 
 $__sed -i.bk 's/(NVIM_VERSION_PRERELEASE) ""/\1 "-dev"/' CMakeLists.txt

From 52727d98d76983f73e214369fe98ef541031395c Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 1 May 2017 18:59:02 +0200
Subject: [PATCH 232/257] NVIM v0.2.0

FEATURES:
    bc4a2e1576c6 help, man.vim: "outline" (TOC) feature #5169
    58422f17d8e7 'guicursor' works in the TUI (and sends info to UIs) #6423
    129f107c0c26 api: nvim_get_mode() #6247
    0b59f988f447 api/ui: externalize tabline #6583
    bc6d868d00a7 'listchars': `Whitespace` highlight group #6367
    6afa7d66cd63 writefile() obeys 'fsync' option #6427
    c60e409471c5 eval.c refactor (also improves some error messages) #5119
    9d200cd0a3ef getcompletion("cmdline") #6376
    2ea7bfc627e5 terminal: Support extra arguments in 'shell'. #4504
    bf5110266ca9 DirChanged autocmd #5928 #6262
    1743df82f900 'cpoptions': "_" flag to toggle `cw` behaviour #6235
    22337b1c0144 CTRL-R omits trailing ^M when pasting to cmdline #6137
    0e44916fff88 :edit allows unescaped spaces in filename #6119
    abdbfd26bc7f eval: Add id() function and make printf("%p") useful #6095
    bdfa1479d296 findfile(), :find, gf work in :terminal. #6009
    2f38ed11c98a providers: Disable if `g:loaded_*` exists.
    b5560a69b12b setpos() can set lowercase marks in other buffers #5753
    7c513d646d87 Throttle :! output, pulse "..." message. #5396
    d2e8c76dc224 v:exiting #5651

    :terminal improvements #6185 #6142
      - cursor keeps position after leaving insert-mode.
      - 4ceec30cd0b4 Follows output only if cursor is at end of buffer.
      - e7bbd35c812d new option: 'scrollback'
      - fedb8443d58a quasi-support for undo and 'modifiable'
      - b45ddf731be5 disables 'list' by default
      - disables 'relativenumber' by default

    :help now contains full API documentation at `:help api`.

    man.vim saw numerous improvements.

    Windows support:
      - Windows is no longer "experimental", it is fully supported.
      - Windows package includes a GUI, curl.exe and other utilities.

    "Vim 8" features: partials, lambdas.

SECURITY FIXES:
    CVE-2017-5953 CVE-2017-6349 CVE-2017-6350 #6485

CHANGES:
    NVIM_TUI_ENABLE_CURSOR_SHAPE was removed. Use 'guicursor' instead.
        See https://github.com/neovim/neovim/wiki/Following-HEAD#20170402

    81525dc5c35c 'mouse=a' is no longer the default. (This will probably
                 change again after it is improved.) #6022

    0c1f7831649e defaults: 'showcmd', 'belloff', 'ruler' #6087
    eb0e94f71b1f api: {get,set}_option update local options as appropriate #6405
    bdcb2a38b366 "Reading from stdin..." message was removed. #6298

FIXES:
    12fc1defd6a1 ops: fix i<c-r> with multi-byte text #6524
    dd391bfca1f3 Windows: system() and friends #6497
    13352c00f190 Windows: os_get_hostname() #6413
    16babc66870b tui: Less-noisy mouse seqs #6411
    3a9dd13f9e64 (vim bug) folding edge-cases  #6207
    f6946c68aee9 job-control: set CLOEXEC on pty processes. #5986
    d1afd434f302 rplugin: Call s:LoadRemotePlugins() on startup.
    1215084676f0 backtick-expansion works with `shell=fish` #6224
    e32ec03d67ee tui: Improved behavior after resize. #6202
    86c2adc07463 edit.c: CTRL-SPC: Insert previously-inserted text. #6090
    c318d8e672a3 b:changedtick now follows VimL rules #6112
    34e24cb2f734 terminal: Initialize colors in reverse order #6160
    e8899178ec34 undo: Don't set b_u_curhead in ex_undojoin() #5869
    d25649fa0120 undo: :earlier, g-: Set b_u_seq_cur correctly. (#6016)
    043d8ba422b4 'Visual-mode put from @. register' #5782
    42c922b32c0a open_buffer(): Do `BufEnter` for directories.
    50d0d891299c inccommand: Preview :sub commands only after delimiter #5932
    1420e1047454 CheckHealth improvements #5519
    c8d5e9230ee3 jobstart(): Return -1 if cmd is not executable. #5671
---
 CMakeLists.txt                             |   4 ++--
 test/functional/fixtures/api_level_2.mpack | Bin 0 -> 16949 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 test/functional/fixtures/api_level_2.mpack

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2232543cc8..4122c9432c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -65,12 +65,12 @@ set_property(CACHE CMAKE_BUILD_TYPE PROPERTY
 set(NVIM_VERSION_MAJOR 0)
 set(NVIM_VERSION_MINOR 2)
 set(NVIM_VERSION_PATCH 0)
-set(NVIM_VERSION_PRERELEASE "-dev") # for package maintainers
+set(NVIM_VERSION_PRERELEASE "") # for package maintainers
 
 # API level
 set(NVIM_API_LEVEL 2)         # Bump this after any API change.
 set(NVIM_API_LEVEL_COMPAT 0)  # Adjust this after a _breaking_ API change.
-set(NVIM_API_PRERELEASE true)
+set(NVIM_API_PRERELEASE false)
 
 file(TO_CMAKE_PATH ${CMAKE_CURRENT_LIST_DIR}/.git FORCED_GIT_DIR)
 include(GetGitRevisionDescription)
diff --git a/test/functional/fixtures/api_level_2.mpack b/test/functional/fixtures/api_level_2.mpack
new file mode 100644
index 0000000000000000000000000000000000000000..0ca2ba8866f618d41393fa67b566bbd1897dfc9b
GIT binary patch
literal 16949
zcmcg!&2rqv5hnR0IVM#(<qe`r4mtS{mvuye*dYlU3v2;cO3W=z;&Zf4@&Fc>6e&xj
zex0-Y8hMy>&u=%-gPny~KB%PS?tWkYch5A$zh9rLwkw<ZyX`Xnx@ix#%d&3TqwOm1
zi?f59d{t(ZI#<=vYy4-?Ea8pvxKaoD^{Q2^s#M;oPd6v)y66F^``^J2|F~V{ZN5}J
zfIr(@JzAffsP^jE`~^QgYZgDhY*oK*>#V<6sp~)0y*gFxWes0?SD%;53_hGyWvzg7
zUH99rtP6Gc9l_lUa5oNQTh<Hp^vckDx?d=evdDY2$P5T2zWQ_Dmi4LTy)*J<r>fV?
zhVy`Oem~8*ad0SjngEyQO}Sw7U7Y?wR30-fR25VB-%*9TK5u((^XIBwY_1<Q4Fp5|
z3Vc<q7b>%#u|Iz4ehi;YGtS-b+cv-W;^f!HOTW=}`Y>=))>UPptg~p~{cDcwcO3*o
z(Puh_ATq3=ELuge-ukF@@zV)G`=2>7CD?N_lnH`-Rpo_Rs=7}zc8CjSVHb%}3(ty<
zp@maKXXX!r2Aexkoy}<+jIzdMDHa>azgJ%zf31pMN83Gf>v`T<r&5BwE8Kq>XmOU;
zr)trc#Wx20h=Pww4wZgmMctm~)mqdg7%OOk#*#JJ+f))fmXiQKSw45_va5U(PrbHv
zfoaF8cZzm12${YI)ORU_EVOClg*J!<rCDKb6@u@<;v?{(1sNapVJz53efEg<S=XC&
zP6Z~^tX?mV)!ekA0rZAt6(+Y}uDx9nB0S)ufg<=Z^DtxBhNz7ZP|FU|rYaX!YHIY6
zlf6AFFyE+xZgKwT_AUFbYyy>ar&>F4eO@@fbN$<ncfbAB?@SL5N@D~p^VU|rLz+F&
zUU}8EMOH4{wDsbw%1+y6z4Ft@CF<{A-4spbMiDE>HU21!AuI>IY0<+UeN5$xMRr!6
zo>lP2jiXfB=(ORab-1^Bs^#O;3;nZ*Kp_G{-zZ?tYA5A+wz>W?KVIdh>bf_7ORdh2
z4Ub{qX`UGG7^UsEU^49b><I*gm`y_x=M){=5+f~f@3nOu5r#tO8`QSnk91))`*cB0
z$$A9~zRfhHq*?G2Ct>}89bx9^wMT=xbCzXl4q9T01LtrutyvjKi_9w%kvfjJJuyxo
z9))mBLw1R%p??~M;6y(f+DeK7cL>tx9~k<ezz-tamZt5Ka?zjp;&pYVu;6TN{{W{F
zm;mzj;@b3PU*BnK2{HIuQ?JV`@B6$s6Pt>&M1<3+a;xebj{I4BdTce`5fDL&n}Gl<
z5dP`Vc4)9rL<4FyNYY8GP2-!>0|?l+7g?*i@-LBrf!q;@rRI|?zsDcVQ&a~S7z{r2
zq~$UXM`IcEN9|VoQ6U9jQn2EFqb@rCV%aR9A=<g)R&_<bf}54DoVL&_O?INx0>K0}
zFZ?BbKmv0P(&=!k@ydF&j&x8X`tz=Dy|6bYZL`eaIteZtto++WlU3p6b+=MQnO73M
zGe+p;_FSC7)zq>8t4ykelI(&t)2#JK)~tJ3yI?BybR~n5!_1Agl!AFsusY1J#!%Z6
z)N8ZVW7cKfo{BD@9oNKUkylmb?&|~sFKbMH=2a6VU@2X>1UNCz{p4X(F_VX>#(Lst
z;nuHQD)4-NHtnNDDVj4BA=5rE3yXEz!i7i%UrCjdMvy7z*nb=l&TRscH=v$Gr3ebr
z8Bi)+1XMKR5C_|CvTztZl5jL)Ou>oIW<D5ohVN4!4KkZe*a#Mk7?U$7Z?M?R!6vN~
zDMu&RLt28VO<v*!H4~f-RkGlF!ZTf1+mzvBvYPDF{*#C6{ow9&VL~`|LqI!Pimj=%
z!HWhQ4I2gb(#A?tKr<5%6y)qlTlSM_nhK`c_94K`Rh$Q_q*+$Xc3(6f=~ap;nnq7u
zG~om<)k+b|Ze?`ZnhHq^8z9Mb%`o#_PGkTY*IgM^6wj+lPo_lG$ca?M8lNSos<E?#
z{niz{4@YCEPKH<;t16?4;@!Jzk}u6c-MH1XYVB5gj!Sl}JEv&hno9$!u!R%->%Ka;
zG>CZEVAI|;h3%#m*e8aigj@-Xqr3HSSG48vWbSSg;7r1;>m)#JHObv<>M@rj+N@30
zwAt}R>`GAdIXTa1KI82Gx6D_9f0Cd=#mA}Nps<yKh+>CGY_;Zg4rRfeZ&{x-f+)}I
z*tx}FQk**pqOrdoJM+F-mW2o?CLFt)qczK5LYnD?tz224TRb+|%aWL3MlUJNVDAWE
zsOlPNYJ_&jI5raC^Ht+)#K=Ph32Zi<WVRHISeyo2bf~#a5UfAa!hzTe2%8T{!beH=
z7T#oqb3yEU5tZHCYfOtCDA4Z76!cgi5zujwN2)x9!MUAB5hW0(>WC`>8R{dGjSNP~
zByB>N26#50vSE9FU3T0jQDeS_Xn=M+F@C3LH-nJr%LeikLgp>156{o&+`GR`8Dnr@
z;KTTc@};DzROoawGe=sNwov-Y$nr9U#Z4p{+00oEd2-lb=_CcUt8f}Pm<7w^#2qkC
zQxSK(-a~;0x4(3~2WF7Q>Yt~Nj7<JF&;a2XtI;D<>|h$*QEmA;iapIUd|tz;JT06b
z-|6+vy%iEojF%jCpk*@ta?g}ZD-bfqNsajulNw3@^Psz-)3KFiF<KPdvkYh`U&5K0
z9+=RD4-(Rvz&N1>#g&wMRH}^~|F9-8{s&BxVUj-p5AC7!Q9_)k&A`P-9>9SiL>(WR
zFTyv|c(j%|7GB97TB~SRarEfB@W=q8{{<fzn2u~#o8Q~ACp<#Hq>q;8S&tA*3m9VO
zqm@p4q=3m6U$0Jc`CedJvbo-PXPdV^y+MD3nNDg4iF^2I0cdIUOYwMZovWuE4Rp<a
zJ62C90&|(%CQMV^JF1Di^hf?_Lxrfo#Vy^tvOq}PyH1l)ue=i0u#6JQmzgAnYtm_s
zppd?^XM0nI553Lc>rJMAv1@Od%Kjs64EQ3I(R=mSB6S*_)tDP3Ae&W&4u!=ihxgom
zjk^D4by^;0Kx{xCP@KrBm5JsRr&sXlJa3Ul+P%somvr~KgN1BkUm#0Z#xiW^<Hok}
zWo$ap8?DZGJIfenn2d#rjztIra@WD|6KjR9>PCH2)jy&FvHdM$30jc-?X;yrGQZb$
z($7ufE*BowZrTf>z9y<dBUeLXZy0Y;W%=2PcP|BSTHC>rsKCH7cvZ0j*qfi8Q1-YL
z(dBfig;JZ^1JEAuIz~0TeEj)b@n2&AA%66*<MUb@NIc!_&?h)Wv+X+Cm^4Z+g8}{(
zDl^z~%CR~d-R~-eB=f$QgMN>)L!)TgJ_8bW!_LG{Oafn!%puhjq&w$mGv!JnW+FV@
zJ?Jt=i-bX!jbp?aY)n%Ng=V6KBFdDghPM(O#=Vu|gLoo5oq<PIGU&3Ej5vd3>uf7U
znG)5ISF$=-(d~BP{)}j1x0*k>AazCC;)|AY-yCjeQ*EWmXhcnsx!H#8SW}sFT^g)h
zSz`Oj!FRZ+_&RDwOI?{^k2c4KB|VYhM4R;u44Sa%6`Yb7RKuOG#@1CtZ;<`UmuZlQ
zO_!}Mn)vpXp@QY5gxhiBOiSP!lVWc93U|+fVdl|9Z-6K#q>A5=GS#4QGu3wPV^hP;
zvD@5{+2?7@LylOMu2QG9bP$7m?HuKzqz|CnJy9-p02z7E>BjfDsj4|j^jk8eFuv|e
z4su|0OG->`d4L`1_<4jbHjywo($3f+rrOx?qm85d^TH=u4c?JZ;yXr`Df3uem(_ja
zEn%AMmXD=}O{Q(guJZ0I(cmWUrJjuSZ%XLCz4_zQLh1hv`qv-I#lh`Y_<siBmohXp
zzCPUI?^EdhW=r+A_>n941qdhQQ}awY%#WEZkoe{ydlTq0r#ZfRWZyN96j{}?{{#55
BET#Ye

literal 0
HcmV?d00001


From 1b0d573a6552726a8faf1e93bdb23e22b97f20ce Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Mon, 1 May 2017 22:17:32 +0200
Subject: [PATCH 233/257] version bump

---
 CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4122c9432c..1b49d79499 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -64,8 +64,8 @@ set_property(CACHE CMAKE_BUILD_TYPE PROPERTY
 # version string, else they are combined with the result of `git describe`.
 set(NVIM_VERSION_MAJOR 0)
 set(NVIM_VERSION_MINOR 2)
-set(NVIM_VERSION_PATCH 0)
-set(NVIM_VERSION_PRERELEASE "") # for package maintainers
+set(NVIM_VERSION_PATCH 1)
+set(NVIM_VERSION_PRERELEASE "-dev") # for package maintainers
 
 # API level
 set(NVIM_API_LEVEL 2)         # Bump this after any API change.

From bcc97afbd258c8608e73ff7765c33fe5da713fb9 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Tue, 2 May 2017 01:54:21 +0300
Subject: [PATCH 234/257] pvscheck: Do not use `test x`

[ci skip]
---
 scripts/pvscheck.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index 32d63646aa..6e95358aa8 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -135,16 +135,16 @@ do_recheck() {
 main() {
   local PVS_URL="http://files.viva64.com/pvs-studio-6.14.21446.1-x86_64.tgz"
 
-  if test "x$1" = "x--help" ; then
+  if test "$1" = "--help" ; then
     help
     return
   fi
 
   set -x
 
-  if test "x$1" = "x--patch" ; then
+  if test "$1" = "--patch" ; then
     shift
-    if test "x$1" = "x--only-build" ; then
+    if test "$1" = "--only-build" ; then
       shift
       patch_sources --only-build
     else
@@ -154,7 +154,7 @@ main() {
   fi
 
   local recheck=
-  if test "x$1" = "x--recheck" ; then
+  if test "$1" = "--recheck" ; then
     recheck=1
     shift
   fi
@@ -162,7 +162,7 @@ main() {
   local tgt="${1:-$PWD/../neovim-pvs}"
   local branch="${2:-master}"
 
-  if test "x$recheck" = "x" ; then
+  if test -z "$recheck" ; then
     do_check "$tgt" "$branch"
   else
     do_recheck "$tgt"

From 7fc3cccfaabf8f576af73a21d7538257df4d41ed Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Tue, 2 May 2017 01:54:44 +0300
Subject: [PATCH 235/257] pvscheck: Update pvs-studio URL

[ci skip]
---
 scripts/pvscheck.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index 6e95358aa8..c8928dc266 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -133,7 +133,7 @@ do_recheck() {
 }
 
 main() {
-  local PVS_URL="http://files.viva64.com/pvs-studio-6.14.21446.1-x86_64.tgz"
+  local PVS_URL="http://files.viva64.com/pvs-studio-6.15.21741.1-x86_64.tgz"
 
   if test "$1" = "--help" ; then
     help

From 15d39022abc3eb3d086b33977b9dec9972aab8e1 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Tue, 2 May 2017 02:08:16 +0300
Subject: [PATCH 236/257] pvscheck: Add --pvs key to pvscheck.sh

[ci skip]
---
 scripts/pvscheck.sh | 40 ++++++++++++++++++++++++++++++++--------
 1 file changed, 32 insertions(+), 8 deletions(-)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index c8928dc266..2af38d7711 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -10,10 +10,17 @@ get_jobs_num() {
 
 help() {
   echo 'Usage:'
-  echo '  pvscheck.sh [target-directory [branch]]'
-  echo '  pvscheck.sh [--recheck] [target-directory]'
+  echo '  pvscheck.sh [--pvs URL] [target-directory [branch]]'
+  echo '  pvscheck.sh [--pvs URL] [--recheck] [target-directory]'
   echo '  pvscheck.sh --patch [--only-build]'
   echo
+  echo '    --pvs: Use the specified URL as a path to pvs-studio archive.'
+  echo '           By default latest tested version is used.'
+  echo
+  echo '           May use `--pvs detect` to try detecting latest version.'
+  echo '           That assumes certain viva64.com site properties and'
+  echo '           may be broken by the site update.'
+  echo
   echo '    --patch: patch sources in the current directory.'
   echo '             Does not patch already patched files.'
   echo '             Does not run analysis.'
@@ -38,10 +45,12 @@ EOF
 }
 
 install_pvs() {
+  local pvs_url="$1"
+
   mkdir pvs-studio
   cd pvs-studio
 
-  curl -o pvs-studio.tar.gz "$PVS_URL"
+  curl -L -o pvs-studio.tar.gz "$pvs_url"
   tar xzf pvs-studio.tar.gz
   rm pvs-studio.tar.gz
   local pvsdir="$(find . -maxdepth 1 -mindepth 1)"
@@ -108,14 +117,15 @@ run_analysis() {
 }
 
 do_check() {
-  local tgt="${1}"
-  local branch="${2}"
+  local tgt="$1"
+  local branch="$2"
+  local pvs_url="$3"
 
   git clone --branch="$branch" . "$tgt"
 
   cd "$tgt"
 
-  install_pvs
+  install_pvs "$pvs_url"
 
   create_compile_commands
 
@@ -132,8 +142,13 @@ do_recheck() {
   run_analysis
 }
 
+detect_url() {
+  curl -L 'https://www.viva64.com/en/pvs-studio-download-linux/' \
+  | grep -o 'https\{0,1\}://[^"<>]\{1,\}/pvs-studio[^/"<>]*\.tgz'
+}
+
 main() {
-  local PVS_URL="http://files.viva64.com/pvs-studio-6.15.21741.1-x86_64.tgz"
+  local pvs_url="http://files.viva64.com/pvs-studio-6.15.21741.1-x86_64.tgz"
 
   if test "$1" = "--help" ; then
     help
@@ -142,6 +157,15 @@ main() {
 
   set -x
 
+  if test "$1" = "--pvs" ; then
+    shift
+    pvs_url="$1" ; shift
+
+    if test "$pvs_url" = "detect" ; then
+      pvs_url="$(detect_url)"
+    fi
+  fi
+
   if test "$1" = "--patch" ; then
     shift
     if test "$1" = "--only-build" ; then
@@ -163,7 +187,7 @@ main() {
   local branch="${2:-master}"
 
   if test -z "$recheck" ; then
-    do_check "$tgt" "$branch"
+    do_check "$tgt" "$branch" "$pvs_url"
   else
     do_recheck "$tgt"
   fi

From 9b1cad7cb66822b1418a5a1791f0069cc923706f Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 2 May 2017 12:45:42 +0200
Subject: [PATCH 237/257] win/package: nvim-qt v0.2.7 (fixes cursor-shaping)
 (#6641)

---
 third-party/CMakeLists.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index ea1039f459..d58ad1755a 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -124,8 +124,8 @@ set(GPERF_SHA256 767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63
 set(WINTOOLS_URL https://github.com/neovim/deps/raw/2f9acbecf06365c10baa3c0087f34a54c9c6f949/opt/win32tools.zip)
 set(WINTOOLS_SHA256 8bfce7e3a365721a027ce842f2ec1cf878f1726233c215c05964aac07300798c)
 
-set(WINGUI_URL https://github.com/equalsraf/neovim-qt/releases/download/v0.2.6/neovim-qt.zip)
-set(WINGUI_SHA256 90217351e9e51c81ef5bba39066f00d05e15ef1f881882c3c682e61cd446c211)
+set(WINGUI_URL https://github.com/equalsraf/neovim-qt/releases/download/v0.2.7/neovim-qt.zip)
+set(WINGUI_SHA256 b548f6e4045f16a10163b0e433f05b115b2f877cb47c4eacbf80eaad1a8429ab)
 
 set(WIN32YANK_URL https://github.com/equalsraf/win32yank/releases/download/v0.0.3/win32yank.zip)
 set(WIN32YANK_SHA256 b474439ed2854a9a24941d66970c7fcfece219401eaaa5ebc0ffcc962e69887a)

From 13ec521414afe71423114144260c1787f0a7e79a Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Tue, 2 May 2017 15:04:47 +0200
Subject: [PATCH 238/257] ci: DISABLE_LOG (#6498)

Should make builds slightly faster. We don't use these logs on CI.

References #6169
---
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1f00b5c880..2d9e06eaf6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,7 +27,8 @@ env:
                    -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PREFIX
                    -DBUSTED_OUTPUT_TYPE=nvim
                    -DDEPS_PREFIX=$DEPS_BUILD_DIR/usr
-                   -DMIN_LOG_LEVEL=2"
+                   -DMIN_LOG_LEVEL=3
+                   -DDISABLE_LOG=1"
     - DEPS_CMAKE_FLAGS="-DDEPS_DOWNLOAD_DIR:PATH=$DEPS_DOWNLOAD_DIR"
     # Additional CMake flags for 32-bit builds.
     - CMAKE_FLAGS_32BIT="-DCMAKE_SYSTEM_LIBRARY_PATH=/lib32:/usr/lib32:/usr/local/lib32

From 4cb61aa7428128283c45ee3ca90f01c4805c8148 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Tue, 2 May 2017 17:56:30 +0300
Subject: [PATCH 239/257] pvscheck: Create getopts_long implementation

Needed as argument list is growing large and I absolutely do not find short
options provided by getopts being particularly readable for unfamiliar commands.

[ci skip]
---
 scripts/pvscheck.sh | 256 ++++++++++++++++++++++++++++++++++++--------
 1 file changed, 211 insertions(+), 45 deletions(-)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index 2af38d7711..51ecaf0c46 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -1,5 +1,8 @@
 #!/bin/sh
 set -e
+# Note: -u causes problems with posh, it barks at “undefined” $@ when no
+# arguments provided.
+test -z "$POSH_VERSION" && set -u
 
 get_jobs_num() {
   local num="$(cat /proc/cpuinfo | grep -c "^processor")"
@@ -36,6 +39,178 @@ help() {
   echo '            Default: master.'
 }
 
+getopts_error() {
+  printf '%s\n' "$1" >&2
+  echo 'return 1'
+  return 1
+}
+
+# Usage `eval "$(getopts_long long_defs -- positionals_defs -- "$@")"`
+#
+# long_defs: list of pairs of arguments like `longopt action`.
+# positionals_defs: list of arguments like `action`.
+#
+# `action` is a space-separated commands:
+#
+#   store_const [const] [varname] [default]
+#     Store constant [const] (default 1) (note: eval’ed) if argument is present
+#     (long options only). Assumes long option accepts no arguments.
+#   store [varname] [default]
+#     Store value. Assumes long option needs an argument.
+#   run {func} [varname] [default]
+#     Run function {func} and store its output to the [varname]. Assumes no
+#     arguments accepted (long options only).
+#   modify {func} [varname] [default]
+#     Like run, but assumes a single argument, passed to function {func} as $1.
+#
+#   All actions stores empty value if neither [varname] nor [default] are
+#   present. [default] is evaled by top-level `eval`, so be careful. Also note
+#   that no arguments may contain spaces, including [default] and [const].
+getopts_long() {
+  local positional=
+  local opt_bases=""
+  while test $# -gt 0 ; do
+    local arg="$1" ; shift
+    local opt_base=
+    local act=
+    local opt_name=
+    if test -z "$positional" ; then
+      if test "$arg" = "--" ; then
+        positional=0
+        continue
+      fi
+      act="$1" ; shift
+      opt_name="$(echo "$arg" | tr '-' '_')"
+      opt_base="longopt_$opt_name"
+    else
+      if test "$arg" = "--" ; then
+        break
+      fi
+      : $(( positional+=1 ))
+      act="$arg"
+      opt_name="arg_$positional"
+      opt_base="positional_$positional"
+    fi
+    opt_bases="$opt_bases $opt_base"
+    eval "local varname_$opt_base=$opt_name"
+    local i=0
+    for act_subarg in $act ; do
+      eval "local act_$(( i+=1 ))_$opt_base=\"\$act_subarg\""
+    done
+  done
+  # Process options
+  local positional=0
+  local force_positional=
+  while test $# -gt 0 ; do
+    local argument="$1" ; shift
+    local opt_base=
+    local has_equal=
+    local equal_arg=
+    local is_positional=
+    if test "$argument" = "--" ; then
+      force_positional=1
+      continue
+    elif test -z "$force_positional" && test "${argument#--}" != "$argument"
+    then
+      local opt_name="${argument#--}"
+      local opt_name_striparg="${opt_name%%=*}"
+      if test "$opt_name" = "$opt_name_striparg" ; then
+        has_equal=0
+      else
+        has_equal=1
+        equal_arg="${argument#*=}"
+        opt_name="$opt_name_striparg"
+      fi
+      # Use trailing x to prevent stripping newlines
+      opt_name="$(printf '%sx' "$opt_name" | tr '-' '_')"
+      opt_name="${opt_name%x}"
+      if test -n "$(printf '%sx' "$opt_name" | tr -d 'a-z_')" ; then
+        getopts_error "Option contains invalid characters: $opt_name"
+      fi
+      opt_base="longopt_$opt_name"
+    else
+      : $(( positional+=1 ))
+      opt_base="positional_$positional"
+      is_positional=1
+    fi
+    if test -n "$opt_base" ; then
+      eval "local occurred_$opt_base=1"
+
+      eval "local act_1=\"\$act_1_$opt_base\""
+      eval "local varname=\"\$varname_$opt_base\""
+      local need_val=
+      local func=
+      case "$act_1" in
+        (store_const)
+          eval "local const=\"\${act_2_${opt_base}:-1}\""
+          eval "local varname=\"\${act_3_${opt_base}:-$varname}\""
+          printf 'local %s=%s\n' "$varname" "$const"
+          ;;
+        (store)
+          eval "varname=\"\${act_2_${opt_base}:-$varname}\""
+          need_val=1
+          ;;
+        (run)
+          eval "func=\"\${act_2_${opt_base}}\""
+          eval "varname=\"\${act_3_${opt_base}:-$varname}\""
+          printf 'local %s="$(%s)"\n' "$varname" "$func"
+          ;;
+        (modify)
+          eval "func=\"\${act_2_${opt_base}}\""
+          eval "varname=\"\${act_3_${opt_base}:-$varname}\""
+          need_val=1
+          ;;
+      esac
+      if test -n "$need_val" ; then
+        local val=
+        if test -z "$is_positional" ; then
+          if test $has_equal = 1 ; then
+            val="$equal_arg"
+          else
+            if test $# -eq 0 ; then
+              getopts_error "Missing argument for $opt_name"
+            fi
+            val="$1" ; shift
+          fi
+        else
+          val="$argument"
+        fi
+        local escaped_val="'$(printf "%s" "$val" | sed "s/'/'\\\\''/g")'"
+        case "$act_1" in
+          (store)
+            printf 'local %s=%s\n' "$varname" "$escaped_val"
+            ;;
+          (modify)
+            printf 'local %s="$(%s %s)"\n' "$varname" "$func" "$escaped_val"
+            ;;
+        esac
+      fi
+    fi
+  done
+  # Print default values when no values were provided
+  local opt_base=
+  for opt_base in $opt_bases ; do
+    eval "local occurred=\"\${occurred_$opt_base:-}\""
+    if test -n "$occurred" ; then
+      continue
+    fi
+    eval "local act_1=\"\$act_1_$opt_base\""
+    eval "local varname=\"\$varname_$opt_base\""
+    case "$act_1" in
+      (store)
+        eval "local varname=\"\${act_2_${opt_base}:-$varname}\""
+        eval "local default=\"\${act_3_${opt_base}:-}\""
+        printf 'local %s=%s\n' "$varname" "$default"
+        ;;
+      (store_const|run|modify)
+        eval "local varname=\"\${act_3_${opt_base}:-$varname}\""
+        eval "local default=\"\${act_4_${opt_base}:-}\""
+        printf 'local %s=%s\n' "$varname" "$default"
+        ;;
+    esac
+  done
+}
+
 get_pvs_comment() {
   cat > pvs-comment << EOF
 // This is an open source non-commercial project. Dear PVS-Studio, please check
@@ -62,18 +237,16 @@ install_pvs() {
   cd ..
 }
 
-create_compile_commands() {
+create_compile_commands() {(
+  export CC=clang
+  export CFLAGS=' -O0 '
+
   mkdir build
   cd build
-  env \
-    CC=clang \
-    CFLAGS=' -O0 ' \
-    cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="$PWD/root"
+  cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="$PWD/root"
   make -j"$(get_jobs_num)"
   find src/nvim/auto -name '*.test-include.c' -delete
-
-  cd ..
-}
+)}
 
 patch_sources() {
   get_pvs_comment
@@ -87,7 +260,7 @@ patch_sources() {
     fi
   '
 
-  if test "x$1" != "x--only-build" ; then
+  if test "${1:-}" != "--only-build" ; then
     find \
       src/nvim test/functional/fixtures test/unit/fixtures \
       -name '*.c' \
@@ -117,9 +290,9 @@ run_analysis() {
 }
 
 do_check() {
-  local tgt="$1"
-  local branch="$2"
-  local pvs_url="$3"
+  local tgt="$1" ; shift
+  local branch="$1" ; shift
+  local pvs_url="$1" ; shift
 
   git clone --branch="$branch" . "$tgt"
 
@@ -133,7 +306,7 @@ do_check() {
 }
 
 do_recheck() {
-  local tgt="${1}"
+  local tgt="$1"
 
   cd "$tgt"
 
@@ -143,49 +316,42 @@ do_recheck() {
 }
 
 detect_url() {
-  curl -L 'https://www.viva64.com/en/pvs-studio-download-linux/' \
-  | grep -o 'https\{0,1\}://[^"<>]\{1,\}/pvs-studio[^/"<>]*\.tgz'
+  local url="${1:-detect}"
+  if test "$url" = detect ; then
+    curl -L 'https://www.viva64.com/en/pvs-studio-download-linux/' \
+    | grep -o 'https\{0,1\}://[^"<>]\{1,\}/pvs-studio[^/"<>]*\.tgz'
+  else
+    printf '%s' "$url"
+  fi
 }
 
 main() {
-  local pvs_url="http://files.viva64.com/pvs-studio-6.15.21741.1-x86_64.tgz"
+  local def_pvs_url="http://files.viva64.com/pvs-studio-6.15.21741.1-x86_64.tgz"
+  eval "$(
+    getopts_long \
+      help store_const \
+      pvs 'modify detect_url pvs_url "${def_pvs_url}"' \
+      patch store_const \
+      only-build 'store_const --only-build' \
+      recheck store_const \
+      -- \
+      'store tgt "$PWD/../neovim-pvs"' \
+      'store branch master' \
+      -- "$@"
+  )"
 
-  if test "$1" = "--help" ; then
+  if test -n "$help" ; then
     help
-    return
+    return 0
   fi
 
   set -x
 
-  if test "$1" = "--pvs" ; then
-    shift
-    pvs_url="$1" ; shift
-
-    if test "$pvs_url" = "detect" ; then
-      pvs_url="$(detect_url)"
-    fi
+  if test -n "$patch" ; then
+    patch_sources "$only_build"
+    return $?
   fi
 
-  if test "$1" = "--patch" ; then
-    shift
-    if test "$1" = "--only-build" ; then
-      shift
-      patch_sources --only-build
-    else
-      patch_sources
-    fi
-    exit $?
-  fi
-
-  local recheck=
-  if test "$1" = "--recheck" ; then
-    recheck=1
-    shift
-  fi
-
-  local tgt="${1:-$PWD/../neovim-pvs}"
-  local branch="${2:-master}"
-
   if test -z "$recheck" ; then
     do_check "$tgt" "$branch" "$pvs_url"
   else

From 68945ead6327aa7050fd3a82f5803e007ab5d979 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Tue, 2 May 2017 18:08:48 +0300
Subject: [PATCH 240/257] pvscheck: Refactor script so that it only `cd`s in a
 subshell

[ci skip]
---
 scripts/pvscheck.sh | 66 +++++++++++++++++++++++++++++----------------
 1 file changed, 43 insertions(+), 23 deletions(-)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index 51ecaf0c46..7e965f5edf 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -212,15 +212,20 @@ getopts_long() {
 }
 
 get_pvs_comment() {
-  cat > pvs-comment << EOF
+  local tgt="$1" ; shift
+
+  cat > "$tgt/pvs-comment" << EOF
 // This is an open source non-commercial project. Dear PVS-Studio, please check
 // it. PVS-Studio Static Code Analyzer for C, C++ and C#: http://www.viva64.com
 
 EOF
 }
 
-install_pvs() {
-  local pvs_url="$1"
+install_pvs() {(
+  local tgt="$1" ; shift
+  local pvs_url="$1" ; shift
+
+  cd "$tgt"
 
   mkdir pvs-studio
   cd pvs-studio
@@ -231,25 +236,36 @@ install_pvs() {
   local pvsdir="$(find . -maxdepth 1 -mindepth 1)"
   find "$pvsdir" -maxdepth 1 -mindepth 1 -exec mv '{}' . \;
   rmdir "$pvsdir"
+)}
 
-  export PATH="$PWD/bin${PATH+:}${PATH}"
-
-  cd ..
+adjust_path() {
+  if test -d "$tgt/pvs-studio" ; then
+    local saved_pwd="$PWD"
+    cd "$tgt/pvs-studio"
+    export PATH="$PWD/bin${PATH+:}${PATH}"
+    cd "$saved_pwd"
+  fi
 }
 
 create_compile_commands() {(
+  local tgt="$1" ; shift
+
   export CC=clang
   export CFLAGS=' -O0 '
 
-  mkdir build
-  cd build
+  mkdir "$tgt/build"
+  cd "$tgt/build"
+
   cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="$PWD/root"
   make -j"$(get_jobs_num)"
   find src/nvim/auto -name '*.test-include.c' -delete
 )}
 
-patch_sources() {
-  get_pvs_comment
+patch_sources() {(
+  local tgt="$1" ; shift
+  local only_bulid="${1:-}"
+
+  get_pvs_comment "$tgt"
 
   local sh_script='
     pvs_comment="$(cat pvs-comment ; echo -n EOS)"
@@ -260,7 +276,9 @@ patch_sources() {
     fi
   '
 
-  if test "${1:-}" != "--only-build" ; then
+  cd "$tgt"
+
+  if test "$only_build" != "--only-build" ; then
     find \
       src/nvim test/functional/fixtures test/unit/fixtures \
       -name '*.c' \
@@ -273,9 +291,13 @@ patch_sources() {
     -exec /bin/sh -c "$sh_script" - '{}' \;
 
   rm pvs-comment
-}
+)}
+
+run_analysis() {(
+  local tgt="$1" ; shift
+
+  cd "$tgt"
 
-run_analysis() {
   pvs-studio-analyzer \
     analyze \
       --threads "$(get_jobs_num)" \
@@ -287,7 +309,7 @@ run_analysis() {
   plog-converter -t xml -o PVS-studio.xml PVS-studio.log
   plog-converter -t errorfile -o PVS-studio.err PVS-studio.log
   plog-converter -t tasklist -o PVS-studio.tsk PVS-studio.log
-}
+)}
 
 do_check() {
   local tgt="$1" ; shift
@@ -296,23 +318,21 @@ do_check() {
 
   git clone --branch="$branch" . "$tgt"
 
-  cd "$tgt"
+  install_pvs "$tgt" "$pvs_url"
 
-  install_pvs "$pvs_url"
+  adjust_path "$tgt"
 
-  create_compile_commands
+  create_compile_commands "$tgt"
 
-  run_analysis
+  run_analysis "$tgt"
 }
 
 do_recheck() {
   local tgt="$1"
 
-  cd "$tgt"
+  adjust_path "$tgt"
 
-  export PATH="$PWD/pvs-studio/bin${PATH+:}${PATH}"
-
-  run_analysis
+  run_analysis "$tgt"
 }
 
 detect_url() {
@@ -348,7 +368,7 @@ main() {
   set -x
 
   if test -n "$patch" ; then
-    patch_sources "$only_build"
+    patch_sources "$only_build" "$tgt"
     return $?
   fi
 

From 97806ee6d682ca8912f95825c485d96410802138 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Tue, 2 May 2017 18:17:12 +0300
Subject: [PATCH 241/257] pvscheck: Add --pvs-install mode

[ci skip]
---
 scripts/pvscheck.sh | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index 7e965f5edf..39de763fe2 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -15,6 +15,7 @@ help() {
   echo 'Usage:'
   echo '  pvscheck.sh [--pvs URL] [target-directory [branch]]'
   echo '  pvscheck.sh [--pvs URL] [--recheck] [target-directory]'
+  echo '  pvscheck.sh [--pvs URL] --pvs-install {target-directory}'
   echo '  pvscheck.sh --patch [--only-build]'
   echo
   echo '    --pvs: Use the specified URL as a path to pvs-studio archive.'
@@ -24,12 +25,14 @@ help() {
   echo '           That assumes certain viva64.com site properties and'
   echo '           may be broken by the site update.'
   echo
+  echo '    --only-build: (for --patch) Only patch files in ./build directory.'
+  echo
+  echo '    --pvs-install: Only install PVS-studio to the specified location.'
+  echo
   echo '    --patch: patch sources in the current directory.'
   echo '             Does not patch already patched files.'
   echo '             Does not run analysis.'
   echo
-  echo '    --only-build: Only patch files in ./build directory.'
-  echo
   echo '    --recheck: run analysis on a prepared target directory.'
   echo
   echo '    target-directory: Directory where build should occur.'
@@ -354,6 +357,7 @@ main() {
       patch store_const \
       only-build 'store_const --only-build' \
       recheck store_const \
+      pvs-install store_const \
       -- \
       'store tgt "$PWD/../neovim-pvs"' \
       'store branch master' \
@@ -369,13 +373,12 @@ main() {
 
   if test -n "$patch" ; then
     patch_sources "$only_build" "$tgt"
-    return $?
-  fi
-
-  if test -z "$recheck" ; then
-    do_check "$tgt" "$branch" "$pvs_url"
-  else
+  elif test -n "$pvs_install" ; then
+    install_pvs "$tgt" "$pvs_url"
+  elif test -n "$recheck" ; then
     do_recheck "$tgt"
+  else
+    do_check "$tgt" "$branch" "$pvs_url"
   fi
 }
 

From 3638d28f68969c81242b8d7345f1d0348fce497d Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Tue, 2 May 2017 18:24:29 +0300
Subject: [PATCH 242/257] pvscheck: Add --deps to build with all dependencies

[ci skip]
---
 scripts/pvscheck.sh | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index 39de763fe2..da55965d36 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -13,7 +13,7 @@ get_jobs_num() {
 
 help() {
   echo 'Usage:'
-  echo '  pvscheck.sh [--pvs URL] [target-directory [branch]]'
+  echo '  pvscheck.sh [--pvs URL] [--deps] [target-directory [branch]]'
   echo '  pvscheck.sh [--pvs URL] [--recheck] [target-directory]'
   echo '  pvscheck.sh [--pvs URL] --pvs-install {target-directory}'
   echo '  pvscheck.sh --patch [--only-build]'
@@ -25,6 +25,10 @@ help() {
   echo '           That assumes certain viva64.com site properties and'
   echo '           may be broken by the site update.'
   echo
+  echo '    --deps: (for regular run) Use top-level Makefile and build deps.'
+  echo '            Without this it assumes all dependencies are already'
+  echo '            installed.'
+  echo
   echo '    --only-build: (for --patch) Only patch files in ./build directory.'
   echo
   echo '    --pvs-install: Only install PVS-studio to the specified location.'
@@ -252,15 +256,22 @@ adjust_path() {
 
 create_compile_commands() {(
   local tgt="$1" ; shift
+  local deps="$1" ; shift
 
   export CC=clang
   export CFLAGS=' -O0 '
 
-  mkdir "$tgt/build"
-  cd "$tgt/build"
+  if test -z "$deps" ; then
+    mkdir "$tgt/build"
+    cd "$tgt/build"
 
-  cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="$PWD/root"
-  make -j"$(get_jobs_num)"
+    cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="$PWD/root"
+    make -j"$(get_jobs_num)"
+  else
+    cd "$tgt"
+
+    make -j"$(get_jobs_num)" CMAKE_EXTRA_FLAGS=" -DCMAKE_INSTALL_PREFIX=$PWD/root -DCMAKE_BUILD_TYPE=Debug "
+  fi
   find src/nvim/auto -name '*.test-include.c' -delete
 )}
 
@@ -318,6 +329,7 @@ do_check() {
   local tgt="$1" ; shift
   local branch="$1" ; shift
   local pvs_url="$1" ; shift
+  local deps="$1" ; shift
 
   git clone --branch="$branch" . "$tgt"
 
@@ -325,7 +337,7 @@ do_check() {
 
   adjust_path "$tgt"
 
-  create_compile_commands "$tgt"
+  create_compile_commands "$tgt" "$deps"
 
   run_analysis "$tgt"
 }
@@ -358,6 +370,7 @@ main() {
       only-build 'store_const --only-build' \
       recheck store_const \
       pvs-install store_const \
+      deps store_const \
       -- \
       'store tgt "$PWD/../neovim-pvs"' \
       'store branch master' \
@@ -378,7 +391,7 @@ main() {
   elif test -n "$recheck" ; then
     do_recheck "$tgt"
   else
-    do_check "$tgt" "$branch" "$pvs_url"
+    do_check "$tgt" "$branch" "$pvs_url" "$deps"
   fi
 }
 

From 0c6e0460b6f15dce8dd5f517712093d843d76058 Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Tue, 2 May 2017 18:33:41 +0300
Subject: [PATCH 243/257] pvscheck: When using --recheck rerun build

[ci skip]
---
 scripts/pvscheck.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index da55965d36..67834cca8a 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -262,7 +262,7 @@ create_compile_commands() {(
   export CFLAGS=' -O0 '
 
   if test -z "$deps" ; then
-    mkdir "$tgt/build"
+    mkdir -p "$tgt/build"
     cd "$tgt/build"
 
     cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="$PWD/root"
@@ -347,6 +347,8 @@ do_recheck() {
 
   adjust_path "$tgt"
 
+  create_compile_commands "$tgt" "$deps"
+
   run_analysis "$tgt"
 }
 

From 4f4d21693bb1665f1a398fb58dc2c554ba7b4eba Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Tue, 2 May 2017 21:53:16 +0300
Subject: [PATCH 244/257] pvscheck: Use absolute path for finding
 test-include.c

It was currently unknown in which directory create_compile_commands will end up
in.

[ci skip]
---
 scripts/pvscheck.sh | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

diff --git a/scripts/pvscheck.sh b/scripts/pvscheck.sh
index 67834cca8a..c75dd2ab76 100755
--- a/scripts/pvscheck.sh
+++ b/scripts/pvscheck.sh
@@ -263,16 +263,29 @@ create_compile_commands() {(
 
   if test -z "$deps" ; then
     mkdir -p "$tgt/build"
-    cd "$tgt/build"
+    (
+      cd "$tgt/build"
 
-    cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="$PWD/root"
-    make -j"$(get_jobs_num)"
+      cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX="$PWD/root"
+      make -j"$(get_jobs_num)"
+    )
   else
-    cd "$tgt"
+    (
+      cd "$tgt"
 
-    make -j"$(get_jobs_num)" CMAKE_EXTRA_FLAGS=" -DCMAKE_INSTALL_PREFIX=$PWD/root -DCMAKE_BUILD_TYPE=Debug "
+      make -j"$(get_jobs_num)" CMAKE_EXTRA_FLAGS=" -DCMAKE_INSTALL_PREFIX=$PWD/root -DCMAKE_BUILD_TYPE=Debug "
+    )
   fi
-  find src/nvim/auto -name '*.test-include.c' -delete
+  find "$tgt/build/src/nvim/auto" -name '*.test-include.c' -delete
+)}
+
+# Warning: realdir below only cares about directories unlike realpath.
+#
+# realpath is not available in Ubuntu trusty yet.
+realdir() {(
+  local dir="$1"
+  cd "$dir"
+  printf '%s\n' "$PWD"
 )}
 
 patch_sources() {(
@@ -374,7 +387,7 @@ main() {
       pvs-install store_const \
       deps store_const \
       -- \
-      'store tgt "$PWD/../neovim-pvs"' \
+      'modify realdir tgt "$PWD/../neovim-pvs"' \
       'store branch master' \
       -- "$@"
   )"

From de50c003d5b1097f93690a0d9dc5fb03a2818024 Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 3 May 2017 04:12:38 -0400
Subject: [PATCH 245/257] Use vim_strchr(s, c) when c may be NUL (#6656)

As part of the refactoring in #5119, some vim_strchr() were changed to
strchr().  However, vim_strchr() behaves differently than strchr() when
c is NUL, returning NULL instead of a pointer to the NUL.

Revert the strchr() calls where it isn't known whether c is NUL, since
this causes a semantic change the surrounding code doesn't expect.  In
the case of #6650, this led to a heap overrun.

Closes #6650
---
 src/nvim/ex_docmd.c                  |  6 +++---
 src/nvim/ex_getln.c                  |  2 +-
 src/nvim/option.c                    |  3 ++-
 test/functional/ui/wildmode_spec.lua | 21 +++++++++++++++++++++
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c
index 72b2e0f29b..108b7483b9 100644
--- a/src/nvim/ex_docmd.c
+++ b/src/nvim/ex_docmd.c
@@ -2687,7 +2687,7 @@ const char * set_one_cmd_context(
 
   // 2. skip comment lines and leading space, colons or bars
   const char *cmd;
-  for (cmd = buff; strchr(" \t:|", *cmd) != NULL; cmd++) {
+  for (cmd = buff; vim_strchr((const char_u *)" \t:|", *cmd) != NULL; cmd++) {
   }
   xp->xp_pattern = (char_u *)cmd;
 
@@ -2748,7 +2748,7 @@ const char * set_one_cmd_context(
       }
     }
     // check for non-alpha command
-    if (p == cmd && strchr("@*!=><&~#", *p) != NULL) {
+    if (p == cmd && vim_strchr((const char_u *)"@*!=><&~#", *p) != NULL) {
       p++;
     }
     len = (size_t)(p - cmd);
@@ -2779,7 +2779,7 @@ const char * set_one_cmd_context(
     return NULL;
 
   if (ea.cmdidx == CMD_SIZE) {
-    if (*cmd == 's' && strchr("cgriI", cmd[1]) != NULL) {
+    if (*cmd == 's' && vim_strchr((const char_u *)"cgriI", cmd[1]) != NULL) {
       ea.cmdidx = CMD_substitute;
       p = cmd + 1;
     } else if (cmd[0] >= 'A' && cmd[0] <= 'Z') {
diff --git a/src/nvim/ex_getln.c b/src/nvim/ex_getln.c
index eed4bf6066..ff68de7670 100644
--- a/src/nvim/ex_getln.c
+++ b/src/nvim/ex_getln.c
@@ -584,7 +584,7 @@ static int command_line_execute(VimState *state, int key)
         }
         if (vim_ispathsep(ccline.cmdbuff[s->j])
 #ifdef BACKSLASH_IN_FILENAME
-            && strchr(" *?[{`$%#", ccline.cmdbuff[s->j + 1])
+            && vim_strchr(" *?[{`$%#", ccline.cmdbuff[s->j + 1])
             == NULL
 #endif
             ) {
diff --git a/src/nvim/option.c b/src/nvim/option.c
index b8d153500e..3658f17883 100644
--- a/src/nvim/option.c
+++ b/src/nvim/option.c
@@ -1411,7 +1411,8 @@ do_set (
           errmsg = (char_u *)set_bool_option(opt_idx, varp, (int)value,
                                              opt_flags);
         } else {  // Numeric or string.
-          if (strchr("=:&<", nextchar) == NULL || prefix != 1) {
+          if (vim_strchr((const char_u *)"=:&<", nextchar) == NULL
+              || prefix != 1) {
             errmsg = e_invarg;
             goto skip;
           }
diff --git a/test/functional/ui/wildmode_spec.lua b/test/functional/ui/wildmode_spec.lua
index 6639bf272d..052cdd55a1 100644
--- a/test/functional/ui/wildmode_spec.lua
+++ b/test/functional/ui/wildmode_spec.lua
@@ -31,6 +31,27 @@ describe("'wildmode'", function()
         :sign define^             |
       ]])
     end)
+
+    it('does not crash after cycling back to original text', function()
+      command('set wildmode=full')
+      feed(':j<Tab><Tab><Tab>')
+      screen:expect([[
+                                 |
+        ~                        |
+        ~                        |
+        join  jumps              |
+        :j^                       |
+      ]])
+      -- This would cause nvim to crash before #6650
+      feed('<BS><Tab>')
+      screen:expect([[
+                                 |
+        ~                        |
+        ~                        |
+        !  #  &  <  =  >  @  >   |
+        :!^                       |
+      ]])
+    end)
   end)
 end)
 

From 31e5053253e1b341b341e772fa7f2e24d75488d3 Mon Sep 17 00:00:00 2001
From: Nikolai Aleksandrovich Pavlov <kp-pav@yandex.ru>
Date: Wed, 3 May 2017 13:37:32 +0300
Subject: [PATCH 246/257] doc: README.md: PVS-studio badge (#6637)

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index bfa0216a0f..c967a9d3cc 100644
--- a/README.md
+++ b/README.md
@@ -12,6 +12,8 @@
 [![Coverage Status](https://img.shields.io/coveralls/neovim/neovim.svg)](https://coveralls.io/r/neovim/neovim)
 [![Coverity Scan Build](https://scan.coverity.com/projects/2227/badge.svg)](https://scan.coverity.com/projects/2227)
 [![Clang Scan Build](https://neovim.io/doc/reports/clang/badge.svg)](https://neovim.io/doc/reports/clang)
+[![PVS-studio Check](https://neovim.io/doc/reports/pvs/badge.svg)](https://neovim.io/doc/reports/pvs)
+
 <a href="https://buildd.debian.org/neovim"><img src="https://www.debian.org/logos/openlogo-nd-25.png" width="13" height="15">Debian</a>
 
 Neovim is a project that seeks to aggressively refactor Vim in order to:

From 685ca180f7c96f77a79c78d3b26bd003f8cd834c Mon Sep 17 00:00:00 2001
From: Rui Abreu Ferreira <raf-ep@gmx.com>
Date: Sat, 18 Mar 2017 00:06:47 +0000
Subject: [PATCH 247/257] win: Terminal UI #6315

For CI builds unibilium is provided through msys2 packages, and
libtermkey is built from source in third-party from equalsraf/libtermkey.

In Windows we cannot read terminal input from the stdin file descriptor,
instead use libuv's uv_tty API. It should handle key input and encoding.

The UI suspend is not implemented for Windows, because the
SIGSTP/SIGCONT do not exist in windows. Currently this is a NOOP.

Closes #3902
Closes #6640
---
 CMakeLists.txt                          |  6 +---
 ci/build.bat                            |  2 +-
 src/nvim/tui/input.c                    |  6 ++++
 src/nvim/tui/input.h                    |  3 ++
 src/nvim/tui/tui.c                      |  8 +++++
 third-party/CMakeLists.txt              |  5 +++
 third-party/cmake/BuildLibtermkey.cmake | 48 ++++++++++++++++++-------
 7 files changed, 60 insertions(+), 18 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1b49d79499..03b13404a5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -324,11 +324,7 @@ if(MSGPACK_HAS_FLOAT32)
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DNVIM_MSGPACK_HAS_FLOAT32")
 endif()
 
-if(UNIX)
-  option(FEAT_TUI "Enable the Terminal UI" ON)
-else()
-  option(FEAT_TUI "Enable the Terminal UI" OFF)
-endif()
+option(FEAT_TUI "Enable the Terminal UI" ON)
 
 if(FEAT_TUI)
   find_package(Unibilium REQUIRED)
diff --git a/ci/build.bat b/ci/build.bat
index 9071c0864e..bc110396ef 100644
--- a/ci/build.bat
+++ b/ci/build.bat
@@ -17,7 +17,7 @@ set PATH=C:\Program Files (x86)\CMake\bin\cpack.exe;%PATH%
 
 :: Build third-party dependencies
 C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm -Su" || goto :error
-C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm --needed -S mingw-w64-%ARCH%-cmake mingw-w64-%ARCH%-perl mingw-w64-%ARCH%-diffutils gperf" || goto :error
+C:\msys64\usr\bin\bash -lc "pacman --verbose --noconfirm --needed -S mingw-w64-%ARCH%-cmake mingw-w64-%ARCH%-perl mingw-w64-%ARCH%-diffutils mingw-w64-%ARCH%-unibilium gperf" || goto :error
 
 :: Setup python (use AppVeyor system python)
 C:\Python27\python.exe -m pip install neovim || goto :error
diff --git a/src/nvim/tui/input.c b/src/nvim/tui/input.c
index 3d37fabeee..03587d68f0 100644
--- a/src/nvim/tui/input.c
+++ b/src/nvim/tui/input.c
@@ -47,7 +47,13 @@ void term_input_init(TermInput *input, Loop *loop)
   int curflags = termkey_get_canonflags(input->tk);
   termkey_set_canonflags(input->tk, curflags | TERMKEY_CANON_DELBS);
   // setup input handle
+#ifdef WIN32
+  uv_tty_init(loop, &input->tty_in, 0, 1);
+  uv_tty_set_mode(&input->tty_in, UV_TTY_MODE_RAW);
+  rstream_init_stream(&input->read_stream, &input->tty_in, 0xfff);
+#else
   rstream_init_fd(loop, &input->read_stream, input->in_fd, 0xfff);
+#endif
   // initialize a timer handle for handling ESC with libtermkey
   time_watcher_init(loop, &input->timer_handle, input);
 }
diff --git a/src/nvim/tui/input.h b/src/nvim/tui/input.h
index 7d59cf5c6a..573cc9d683 100644
--- a/src/nvim/tui/input.h
+++ b/src/nvim/tui/input.h
@@ -17,6 +17,9 @@ typedef struct term_input {
 #endif
   TimeWatcher timer_handle;
   Loop *loop;
+#ifdef WIN32
+  uv_tty_t tty_in;
+#endif
   Stream read_stream;
   RBuffer *key_buffer;
   uv_mutex_t key_buffer_mutex;
diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index 522f7d59f2..e45c620176 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -251,7 +251,9 @@ static void tui_main(UIBridgeData *bridge, UI *ui)
   kv_init(data->invalid_regions);
   signal_watcher_init(data->loop, &data->winch_handle, ui);
   signal_watcher_init(data->loop, &data->cont_handle, data);
+#ifdef UNIX
   signal_watcher_start(&data->cont_handle, sigcont_cb, SIGCONT);
+#endif
   tui_terminal_start(ui);
   data->stop = false;
   // allow the main thread to continue, we are ready to start handling UI
@@ -280,10 +282,12 @@ static void tui_scheduler(Event event, void *d)
   loop_schedule(data->loop, event);
 }
 
+#ifdef UNIX
 static void sigcont_cb(SignalWatcher *watcher, int signum, void *data)
 {
   ((TUIData *)data)->cont_received = true;
 }
+#endif
 
 static void sigwinch_cb(SignalWatcher *watcher, int signum, void *data)
 {
@@ -744,6 +748,7 @@ static void tui_flush(UI *ui)
   flush_buf(ui, true);
 }
 
+#ifdef UNIX
 static void suspend_event(void **argv)
 {
   UI *ui = argv[0];
@@ -765,15 +770,18 @@ static void suspend_event(void **argv)
   // resume the main thread
   CONTINUE(data->bridge);
 }
+#endif
 
 static void tui_suspend(UI *ui)
 {
+#ifdef UNIX
   TUIData *data = ui->data;
   // kill(0, SIGTSTP) won't stop the UI thread, so we must poll for SIGCONT
   // before continuing. This is done in another callback to avoid
   // loop_poll_events recursion
   multiqueue_put_event(data->loop->fast_events,
                        event_create(suspend_event, 1, ui));
+#endif
 }
 
 static void tui_set_title(UI *ui, char *title)
diff --git a/third-party/CMakeLists.txt b/third-party/CMakeLists.txt
index d58ad1755a..b8dad75b24 100644
--- a/third-party/CMakeLists.txt
+++ b/third-party/CMakeLists.txt
@@ -105,8 +105,13 @@ set(LUAROCKS_SHA256 cae709111c5701235770047dfd7169f66b82ae1c7b9b79207f9df0afb722
 set(UNIBILIUM_URL https://github.com/mauke/unibilium/archive/v1.2.0.tar.gz)
 set(UNIBILIUM_SHA256 623af1099515e673abfd3cae5f2fa808a09ca55dda1c65a7b5c9424eb304ead8)
 
+if(WIN32)
+set(LIBTERMKEY_URL https://github.com/equalsraf/libtermkey/archive/tb-windows.zip)
+set(LIBTERMKEY_SHA256 c81e33e38662b151a49847ff4feef4f8c4b2a66f3e159a28b575cbc9bcd8ffea)
+else()
 set(LIBTERMKEY_URL http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.19.tar.gz)
 set(LIBTERMKEY_SHA256 c505aa4cb48c8fa59c526265576b97a19e6ebe7b7da20f4ecaae898b727b48b7)
+endif()
 
 set(LIBVTERM_URL https://github.com/neovim/libvterm/archive/a9c7c6fd20fa35e0ad3e0e98901ca12dfca9c25c.tar.gz)
 set(LIBVTERM_SHA256 1a4272be91d9614dc183a503786df83b6584e4afaab7feaaa5409f841afbd796)
diff --git a/third-party/cmake/BuildLibtermkey.cmake b/third-party/cmake/BuildLibtermkey.cmake
index 57e14d36d3..4b581c2a01 100644
--- a/third-party/cmake/BuildLibtermkey.cmake
+++ b/third-party/cmake/BuildLibtermkey.cmake
@@ -1,21 +1,41 @@
-if(WIN32)
-  message(STATUS "Building libtermkey in Windows is not supported (skipping)")
-  return()
-endif()
 find_package(PkgConfig REQUIRED)
 
+if(WIN32)
 ExternalProject_Add(libtermkey
   PREFIX ${DEPS_BUILD_DIR}
   URL ${LIBTERMKEY_URL}
   DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libtermkey
   DOWNLOAD_COMMAND ${CMAKE_COMMAND}
-    -DPREFIX=${DEPS_BUILD_DIR}
-    -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/libtermkey
-    -DURL=${LIBTERMKEY_URL}
-    -DEXPECTED_SHA256=${LIBTERMKEY_SHA256}
-    -DTARGET=libtermkey
-    -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
-    -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+  -DPREFIX=${DEPS_BUILD_DIR}
+  -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/libtermkey
+  -DURL=${LIBTERMKEY_URL}
+  -DEXPECTED_SHA256=${LIBTERMKEY_SHA256}
+  -DTARGET=libtermkey
+  -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
+  -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
+  CONFIGURE_COMMAND ${CMAKE_COMMAND} ${DEPS_BUILD_DIR}/src/libtermkey
+    -DCMAKE_INSTALL_PREFIX=${DEPS_INSTALL_DIR}
+    # Pass toolchain
+    -DCMAKE_TOOLCHAIN_FILE=${TOOLCHAIN}
+    -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}
+    # Hack to avoid -rdynamic in Mingw
+    -DCMAKE_SHARED_LIBRARY_LINK_C_FLAGS=""
+    -DCMAKE_GENERATOR=${CMAKE_GENERATOR}
+  BUILD_COMMAND ${CMAKE_COMMAND} --build . --config ${CMAKE_BUILD_TYPE}
+  INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE})
+else()
+ExternalProject_Add(libtermkey
+  PREFIX ${DEPS_BUILD_DIR}
+  URL ${LIBTERMKEY_URL}
+  DOWNLOAD_DIR ${DEPS_DOWNLOAD_DIR}/libtermkey
+  DOWNLOAD_COMMAND ${CMAKE_COMMAND}
+  -DPREFIX=${DEPS_BUILD_DIR}
+  -DDOWNLOAD_DIR=${DEPS_DOWNLOAD_DIR}/libtermkey
+  -DURL=${LIBTERMKEY_URL}
+  -DEXPECTED_SHA256=${LIBTERMKEY_SHA256}
+  -DTARGET=libtermkey
+  -DUSE_EXISTING_SRC_DIR=${USE_EXISTING_SRC_DIR}
+  -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/DownloadAndExtractFile.cmake
   CONFIGURE_COMMAND ""
   BUILD_IN_SOURCE 1
   BUILD_COMMAND ""
@@ -24,6 +44,10 @@ ExternalProject_Add(libtermkey
                               PKG_CONFIG_PATH=${DEPS_LIB_DIR}/pkgconfig
                               CFLAGS=-fPIC
                               install)
+endif()
 
 list(APPEND THIRD_PARTY_DEPS libtermkey)
-add_dependencies(libtermkey unibilium)
+if(NOT WIN32)
+  # There is no unibilium build recipe for Windows yet
+  add_dependencies(libtermkey unibilium)
+endif()

From 5fd1d09aa5ad5b12220a1b4e86c080a7378e1a68 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 3 May 2017 18:19:34 +0200
Subject: [PATCH 248/257] test/legacy: Add Test_with_partial_callback to
 s:flaky. (#6666)

---
 src/nvim/testdir/runtest.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/testdir/runtest.vim b/src/nvim/testdir/runtest.vim
index 140b67a1a5..64ad0f0103 100644
--- a/src/nvim/testdir/runtest.vim
+++ b/src/nvim/testdir/runtest.vim
@@ -134,7 +134,7 @@ else
 endif
 
 " Names of flaky tests.
-let s:flaky = []
+let s:flaky = ['Test_with_partial_callback']
 
 " Locate Test_ functions and execute them.
 set nomore

From 0502ac47fb5391889d1eed9d7c378a87e35d7882 Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 3 May 2017 18:08:46 +0200
Subject: [PATCH 249/257] 'guicursor': tui: Konsole: blinkon0 should disable
 blinking.

---
 src/nvim/tui/tui.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index e45c620176..d4b34e82f8 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -575,7 +575,7 @@ static void tui_set_mode(UI *ui, ModeShape mode)
       default: WLOG("Unknown shape value %d", shape); break;
     }
     data->params[0].i = shape;
-    data->params[1].i = (c.blinkon == 0);
+    data->params[1].i = (c.blinkon != 0);
 
     unibi_format(vars, vars + 26,
       TMUX_WRAP("\x1b]50;CursorShape=%p1%d;BlinkingCursorEnabled=%p2%d\x07"),

From 53b38251bb0bfdb1d002b09001417e708d85e422 Mon Sep 17 00:00:00 2001
From: Edd Barrett <vext01@gmail.com>
Date: Wed, 3 May 2017 19:16:06 +0100
Subject: [PATCH 250/257] build: OpenBSD: libuv does not use KVM, do not link
 to it. (#6663)

---
 cmake/FindLibUV.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cmake/FindLibUV.cmake b/cmake/FindLibUV.cmake
index 3e042e4c50..3a60a831ea 100644
--- a/cmake/FindLibUV.cmake
+++ b/cmake/FindLibUV.cmake
@@ -65,7 +65,7 @@ if(HAVE_LIBKSTAT)
 endif()
 
 check_library_exists(kvm kvm_open "kvm.h" HAVE_LIBKVM)
-if(HAVE_LIBKVM)
+if(HAVE_LIBKVM AND NOT CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
   list(APPEND LIBUV_LIBRARIES kvm)
 endif()
 

From 2b3cb2c448f9a7ce6132d2d0423c0d1cf627a0d3 Mon Sep 17 00:00:00 2001
From: Marco Hinz <mh.codebro@gmail.com>
Date: Wed, 3 May 2017 21:04:01 +0200
Subject: [PATCH 251/257] Make script_host.rb rubocop-clean

Fix the following issues according to rubocop:

    runtime/autoload/provider/script_host.rb:2:11: C: Prefer single-quoted strings when you don't need string interpolation or special symbols.
      require "neovim/ruby_provider"
              ^^^^^^^^^^^^^^^^^^^^^^
    runtime/autoload/provider/script_host.rb:5:5: C: Prefer single-quoted strings when you don't need string interpolation or special symbols.
        "Your neovim RubyGem is missing or out of date. " +
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    runtime/autoload/provider/script_host.rb:5:55: C: Use \ instead of + or << to concatenate those strings.
        "Your neovim RubyGem is missing or out of date. " +
    runtime/autoload/provider/script_host.rb:6:5: C: Prefer single-quoted strings when you don't need string interpolation or special symbols.
        "Install the latest version using `gem install neovim`."
        ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

This commit assumes Ruby 2.0.0+.
---
 runtime/autoload/provider/script_host.rb | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/runtime/autoload/provider/script_host.rb b/runtime/autoload/provider/script_host.rb
index 1dade766c7..a1c58bde85 100644
--- a/runtime/autoload/provider/script_host.rb
+++ b/runtime/autoload/provider/script_host.rb
@@ -1,8 +1,6 @@
 begin
-  require "neovim/ruby_provider"
+  require 'neovim/ruby_provider'
 rescue LoadError
-  warn(
-    "Your neovim RubyGem is missing or out of date. " +
-    "Install the latest version using `gem install neovim`."
-  )
+  warn('Your neovim RubyGem is missing or out of date.',
+       'Install the latest version using `gem install neovim`.')
 end

From 4f75e2f95c5ef327c72ead4a7b0f7bf8c25b56ba Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Wed, 3 May 2017 14:42:03 -0400
Subject: [PATCH 252/257] utf16_to_utf8: Allocate space for converted string
 and NUL

References #6646
---
 src/nvim/mbyte.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/nvim/mbyte.c b/src/nvim/mbyte.c
index b21ec944c1..8a68ce0915 100644
--- a/src/nvim/mbyte.c
+++ b/src/nvim/mbyte.c
@@ -1367,7 +1367,7 @@ int utf16_to_utf8(const WCHAR *strw, char **str)
     return GetLastError();
   }
 
-  *str = xmalloc(utf8_len);
+  *str = xmallocz(utf8_len);
 
   // Convert to UTF-8.
   utf8_len = WideCharToMultiByte(CP_UTF8,

From b9dba14fa32f49b145d1d415f2e869140a2a6a5c Mon Sep 17 00:00:00 2001
From: "Justin M. Keyes" <justinkz@gmail.com>
Date: Wed, 3 May 2017 15:50:11 +0200
Subject: [PATCH 253/257] win: build: RelWithDebInfo

---
 ci/build.bat | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci/build.bat b/ci/build.bat
index bc110396ef..c871c6b849 100644
--- a/ci/build.bat
+++ b/ci/build.bat
@@ -31,14 +31,14 @@ python3 -c "import neovim; print(str(neovim))" || goto :error
 
 mkdir .deps
 cd .deps
-cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release ..\third-party\ || goto :error
+cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo ..\third-party\ || goto :error
 mingw32-make VERBOSE=1 || goto :error
 cd ..
 
 :: Build Neovim
 mkdir build
 cd build
-cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=Release -DBUSTED_OUTPUT_TYPE=nvim -DGPERF_PRG="C:\msys64\usr\bin\gperf.exe" .. || goto :error
+cmake -G "MinGW Makefiles" -DCMAKE_BUILD_TYPE=RelWithDebInfo -DBUSTED_OUTPUT_TYPE=nvim -DGPERF_PRG="C:\msys64\usr\bin\gperf.exe" .. || goto :error
 mingw32-make VERBOSE=1 || goto :error
 bin\nvim --version || goto :error
 
@@ -46,8 +46,8 @@ bin\nvim --version || goto :error
 mingw32-make functionaltest VERBOSE=1 || goto :error
 
 :: Build artifacts
-cpack -G ZIP -C Release
-if defined APPVEYOR_REPO_TAG_NAME cpack -G NSIS -C Release
+cpack -G ZIP -C RelWithDebInfo
+if defined APPVEYOR_REPO_TAG_NAME cpack -G NSIS -C RelWithDebInfo
 
 goto :EOF
 :error

From 3c0cc028b7e787e3e87f21976d8b6333bf488219 Mon Sep 17 00:00:00 2001
From: AdnoC <adam.r.cutler@gmail.com>
Date: Mon, 1 May 2017 20:35:04 -0400
Subject: [PATCH 254/257] dist: AppImage #6638

scripts/genappimage.sh produces an executable:
    nvim-${NVIM_VERSION}-glibc${GLIBC_VERSION}-${ARCHITECTURE}.AppImage

Closes #6083
---
 Makefile               |  5 ++-
 scripts/genappimage.sh | 82 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 86 insertions(+), 1 deletion(-)
 create mode 100755 scripts/genappimage.sh

diff --git a/Makefile b/Makefile
index 0c057f5656..e69475a514 100644
--- a/Makefile
+++ b/Makefile
@@ -135,6 +135,9 @@ clint-full: build/.ran-cmake
 check-single-includes: build/.ran-cmake
 	+$(BUILD_CMD) -C build check-single-includes
 
+appimage:
+	bash scripts/genappimage.sh
+
 lint: check-single-includes clint testlint
 
-.PHONY: test testlint functionaltest unittest lint clint clean distclean nvim libnvim cmake deps install
+.PHONY: test testlint functionaltest unittest lint clint clean distclean nvim libnvim cmake deps install appimage
diff --git a/scripts/genappimage.sh b/scripts/genappimage.sh
new file mode 100755
index 0000000000..fd7247b947
--- /dev/null
+++ b/scripts/genappimage.sh
@@ -0,0 +1,82 @@
+#!/bin/bash
+
+########################################################################
+# Package the binaries built as an AppImage
+# By Simon Peter 2016
+# For more information, see http://appimage.org/
+########################################################################
+
+# App arch, used by generate_appimage.
+if [ -z "$ARCH" ]; then
+  export ARCH="$(arch)"
+fi
+
+# App name, used by generate_appimage.
+APP=nvim
+
+ROOT_DIR="$(git rev-parse --show-toplevel)"
+APP_BUILD_DIR="$ROOT_DIR/build"
+APP_DIR="$APP.AppDir"
+
+# App version, used by generate_appimage.
+VERSION=$("$ROOT_DIR"/build/bin/nvim --version | head -n 1 | grep -o 'v.*')
+
+########################################################################
+# Compile nvim and install it into AppDir
+########################################################################
+
+# Build and install nvim into the AppImage
+make CMAKE_BUILD_TYPE=RelWithDebInfo CMAKE_EXTRA_FLAGS="-DCMAKE_INSTALL_PREFIX=${APP_DIR}/usr"
+make install
+
+########################################################################
+# Get helper functions and move to AppDir
+########################################################################
+
+cd "$APP_BUILD_DIR"
+mkdir "$APP_DIR"
+
+curl -Lo "$APP_BUILD_DIR"/appimage_functions.sh https://github.com/probonopd/AppImages/raw/master/functions.sh
+. ./appimage_functions.sh
+
+# Copy desktop and icon file to AppDir for AppRun to pick them up.
+# get_apprun
+# get_desktop
+cp "$ROOT_DIR/runtime/nvim.desktop" "$APP_DIR/"
+cp "$ROOT_DIR/runtime/nvim.png" "$APP_DIR/"
+
+cd "$APP_DIR"
+
+# copy dependencies
+copy_deps
+# Move the libraries to usr/bin
+move_lib
+
+# Delete stuff that should not go into the AppImage.
+# Delete dangerous libraries; see
+# https://github.com/probonopd/AppImages/blob/master/excludelist
+delete_blacklisted
+
+########################################################################
+# AppDir complete. Now package it as an AppImage.
+########################################################################
+
+# No need for a fancy script. AppRun can just be a symlink to nvim.
+ln -s usr/bin/nvim AppRun
+
+cd "$APP_BUILD_DIR" # Get out of AppImage directory.
+
+# Generate AppImage.
+#   - Expects: $ARCH, $APP, $VERSION env vars
+#   - Expects: ./$APP.AppDir/ directory
+#   - Produces: ../out/$APP-$VERSION.glibc$GLIBC_NEEDED-$ARCH.AppImage
+generate_appimage
+
+# NOTE: There is currently a bug in the `generate_appimage` function (see
+# https://github.com/probonopd/AppImages/issues/228) that causes repeated builds
+# that result in the same name to fail.
+# Moving the final executable to a different folder gets around this issue.
+
+mv "$ROOT_DIR"/out/*.AppImage "$ROOT_DIR"/build/bin
+# Remove the (now empty) folder the AppImage was built in
+rmdir "$ROOT_DIR"/out

From 052c2d0a0f68a210038123608c00d4e0ff360161 Mon Sep 17 00:00:00 2001
From: Jonathan de Boyne Pollard <J.deBoynePollard-newsgroups@NTLWorld.com>
Date: Wed, 3 May 2017 19:47:03 +0100
Subject: [PATCH 255/257] tui: Also fix "linux*" terminfo entries. #6673

The terminfo entry for linux only advertises 8 colours, but nvim tries
to make it display 16 colours anyway, resulting in erroneous SGR control
sequences for colours 8 and above. The Linux kernel terminal emulator
itself has actually understood the 256-colour control sequences since
version 4.8 and the 16-colour control sequences since version 4.9. Thus
we apply the same terminfo fixup as we apply for *xterm* and *256*, to
emit the 16-colour and 256-colour control sequences even if terminfo's
setaf and setab do not advertise them.
---
 src/nvim/tui/tui.c                    |  4 +++-
 test/functional/terminal/tui_spec.lua | 12 ++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/nvim/tui/tui.c b/src/nvim/tui/tui.c
index d4b34e82f8..399d6c74ca 100644
--- a/src/nvim/tui/tui.c
+++ b/src/nvim/tui/tui.c
@@ -1016,9 +1016,11 @@ static void fix_terminfo(TUIData *data)
   "\x1b[%?%p1%{8}%<%t4%p1%d%e%p1%{16}%<%t10%p1%{8}%-%d%e48;5;%p1%d%;m"
 
   if ((colorterm && strstr(colorterm, "256"))
+      || STARTS_WITH(term, "linux")
       || strstr(term, "256")
       || strstr(term, "xterm")) {
-    // Assume TERM=~xterm or COLORTERM=~256 supports 256 colors.
+    // Linux 4.8+ supports 256-color SGR, but terminfo has 8-color setaf/setab.
+    // Assume TERM=~xterm|linux or COLORTERM=~256 supports 256 colors.
     unibi_set_num(ut, unibi_max_colors, 256);
     unibi_set_str(ut, unibi_set_a_foreground, XTERM_SETAF);
     unibi_set_str(ut, unibi_set_a_background, XTERM_SETAB);
diff --git a/test/functional/terminal/tui_spec.lua b/test/functional/terminal/tui_spec.lua
index b14bceecdd..3ed63f68e9 100644
--- a/test/functional/terminal/tui_spec.lua
+++ b/test/functional/terminal/tui_spec.lua
@@ -356,9 +356,17 @@ describe("tui 't_Co' (terminal colors)", function()
     assert_term_colors("yet-another-term", "screen-256color", 256)
   end)
 
-  it("TERM=linux uses 8 colors", function()
+  it("TERM=linux uses 256 colors", function()
     if is_linux then
-      assert_term_colors("linux", nil, 8)
+      assert_term_colors("linux", nil, 256)
+    else
+      pending()
+    end
+  end)
+
+  it("TERM=linux-16color uses 256 colors", function()
+    if is_linux then
+      assert_term_colors("linux-16color", nil, 256)
     else
       pending()
     end

From 34c3f03013375817d3d089e685793290eded553a Mon Sep 17 00:00:00 2001
From: Daniel Hahler <github@thequod.de>
Date: Thu, 4 May 2017 16:38:25 +0200
Subject: [PATCH 256/257] event/process.c: send SIGTERM directly (#6644)

Send SIGTERM to processes directly, instead of waiting for ~1s.

- removes TERM_TIMEOUT
- changes KILL_TIMEOUT to milliseconds
- removes Process.term_sent
---
 src/nvim/event/process.c | 22 ++++++++++------------
 src/nvim/event/process.h |  3 +--
 2 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/src/nvim/event/process.c b/src/nvim/event/process.c
index ffda10a494..6aab7d903c 100644
--- a/src/nvim/event/process.c
+++ b/src/nvim/event/process.c
@@ -20,9 +20,9 @@
 # include "event/process.c.generated.h"
 #endif
 
-// Time (ns) for a process to exit cleanly before we send TERM/KILL.
-#define TERM_TIMEOUT 1000000000
-#define KILL_TIMEOUT (TERM_TIMEOUT * 2)
+// Time for a process to exit cleanly before we send KILL.
+#define KILL_TIMEOUT_MS 2000
+#define KILL_TIMEOUT_NS (KILL_TIMEOUT_MS * 1000000)
 
 #define CLOSE_PROC_STREAM(proc, stream) \
   do { \
@@ -121,8 +121,6 @@ void process_teardown(Loop *loop) FUNC_ATTR_NONNULL_ALL
       // Close handles to process without killing it.
       CREATE_EVENT(loop->events, process_close_handles, 1, proc);
     } else {
-      uv_kill(proc->pid, SIGTERM);
-      proc->term_sent = true;
       process_stop(proc);
     }
   }
@@ -244,12 +242,16 @@ void process_stop(Process *proc) FUNC_ATTR_NONNULL_ALL
       abort();
   }
 
+  ILOG("Sending SIGTERM to pid %d", proc->pid);
+  uv_kill(proc->pid, SIGTERM);
+
   Loop *loop = proc->loop;
   if (!loop->children_stop_requests++) {
     // When there's at least one stop request pending, start a timer that
-    // will periodically check if a signal should be send to a to the job
+    // will periodically check if a signal should be send to the job.
     DLOG("Starting job kill timer");
-    uv_timer_start(&loop->children_kill_timer, children_kill_cb, 100, 100);
+    uv_timer_start(&loop->children_kill_timer, children_kill_cb,
+                   KILL_TIMEOUT_MS, 100);
   }
 }
 
@@ -267,11 +269,7 @@ static void children_kill_cb(uv_timer_t *handle)
     }
     uint64_t elapsed = now - proc->stopped_time;
 
-    if (!proc->term_sent && elapsed >= TERM_TIMEOUT) {
-      ILOG("Sending SIGTERM to pid %d", proc->pid);
-      uv_kill(proc->pid, SIGTERM);
-      proc->term_sent = true;
-    } else if (elapsed >= KILL_TIMEOUT) {
+    if (elapsed >= KILL_TIMEOUT_NS) {
       ILOG("Sending SIGKILL to pid %d", proc->pid);
       uv_kill(proc->pid, SIGKILL);
     }
diff --git a/src/nvim/event/process.h b/src/nvim/event/process.h
index 26d70a5e6d..5c00e8e7ec 100644
--- a/src/nvim/event/process.h
+++ b/src/nvim/event/process.h
@@ -26,7 +26,7 @@ struct process {
   Stream *in, *out, *err;
   process_exit_cb cb;
   internal_process_cb internal_exit_cb, internal_close_cb;
-  bool closed, term_sent, detach;
+  bool closed, detach;
   MultiQueue *events;
 };
 
@@ -48,7 +48,6 @@ static inline Process process_init(Loop *loop, ProcessType type, void *data)
     .err = NULL,
     .cb = NULL,
     .closed = false,
-    .term_sent = false,
     .internal_close_cb = NULL,
     .internal_exit_cb = NULL,
     .detach = false

From 631d55ada04bfeaedabb5bf43092457c5f78b8a5 Mon Sep 17 00:00:00 2001
From: Carlo Abelli <carlo.abelli@gmail.com>
Date: Fri, 5 May 2017 04:28:12 -0400
Subject: [PATCH 257/257] refactor/single-include (#6688)

---
 src/nvim/CMakeLists.txt   | 2 --
 src/nvim/if_cscope_defs.h | 1 +
 src/nvim/tui/tui.h        | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/nvim/CMakeLists.txt b/src/nvim/CMakeLists.txt
index 691f230b6e..170dd16b02 100644
--- a/src/nvim/CMakeLists.txt
+++ b/src/nvim/CMakeLists.txt
@@ -429,7 +429,6 @@ function(get_test_target prefix sfile relative_path_var target_var)
 endfunction()
 
 set(NO_SINGLE_CHECK_HEADERS
-  if_cscope_defs.h
   misc2.h
   msgpack_rpc/server.h
   os/shell.h
@@ -438,7 +437,6 @@ set(NO_SINGLE_CHECK_HEADERS
   regexp_defs.h
   syntax_defs.h
   terminal.h
-  tui/tui.h
   undo.h
   undo_defs.h
 )
diff --git a/src/nvim/if_cscope_defs.h b/src/nvim/if_cscope_defs.h
index f9d06eaea3..fa18866840 100644
--- a/src/nvim/if_cscope_defs.h
+++ b/src/nvim/if_cscope_defs.h
@@ -18,6 +18,7 @@
 
 #include "nvim/os/os_defs.h"
 #include "nvim/os/fs_defs.h"
+#include "nvim/ex_cmds_defs.h"
 
 #define CSCOPE_SUCCESS          0
 #define CSCOPE_FAILURE          -1
diff --git a/src/nvim/tui/tui.h b/src/nvim/tui/tui.h
index 2915b0e2f8..996496ee60 100644
--- a/src/nvim/tui/tui.h
+++ b/src/nvim/tui/tui.h
@@ -2,6 +2,7 @@
 #define NVIM_TUI_TUI_H
 
 #include "nvim/cursor_shape.h"
+#include "nvim/ui.h"
 
 #ifdef INCLUDE_GENERATED_DECLARATIONS
 # include "tui/tui.h.generated.h"