3 files changed, 11 insertions, 5 deletions
diff --git a/runtime/macros/less.bat b/runtime/macros/less.bat
index bbe619bc92..7395a70003 100644
--- a/runtime/macros/less.bat
+++ b/runtime/macros/less.bat
@@ -4,7 +4,7 @@ rem Read stdin if no arguments were given.
 rem Written by Ken Takata.
 
 if "%1"=="" (
-  vim --cmd "let no_plugin_maps = 1" -c "runtime! macros/less.vim" -
+  nvim --cmd "let no_plugin_maps = 1" -c "runtime! macros/less.vim" -
 ) else (
-  vim --cmd "let no_plugin_maps = 1" -c "runtime! macros/less.vim" %*
+  nvim --cmd "let no_plugin_maps = 1" -c "runtime! macros/less.vim" %*
 )
diff --git a/runtime/macros/less.sh b/runtime/macros/less.sh
index e29958f7ad..125162f10a 100755
--- a/runtime/macros/less.sh
+++ b/runtime/macros/less.sh
@@ -8,9 +8,9 @@ if test -t 1; then
       echo "Missing filename" 1>&2
       exit
     fi
-    vim --cmd 'let no_plugin_maps = 1' -c 'runtime! macros/less.vim' -
+    nvim --cmd 'let no_plugin_maps = 1' -c 'runtime! macros/less.vim' -
   else
-    vim --cmd 'let no_plugin_maps = 1' -c 'runtime! macros/less.vim' "$@"
+    nvim --cmd 'let no_plugin_maps = 1' -c 'runtime! macros/less.vim' "$@"
   fi
 else
   # Output is not a terminal, cat arguments or stdin
diff --git a/runtime/macros/less.vim b/runtime/macros/less.vim
index d38bd3781d..7ccbeb32ea 100644
--- a/runtime/macros/less.vim
+++ b/runtime/macros/less.vim
@@ -1,6 +1,6 @@
 " Vim script to work like "less"
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2014 May 13
+" Last Change:	2015 Nov 15
 
 " Avoid loading this file twice, allow the user to define his own script.
 if exists("loaded_less")
@@ -48,6 +48,12 @@ set nows
 let s:lz = &lz
 set lz
 
+" Allow the user to define a function, which can set options specifically for
+" this script.
+if exists('*LessInitFunc')
+  call LessInitFunc()
+endif
+
 " Used after each command: put cursor at end and display position
 if &wrap
   noremap <SID>L L0:redraw<CR>:file<CR>