summaryrefslogtreecommitdiff
path: root/runtime/macros
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-05-18 13:46:39 +0200
committerBram Moolenaar <Bram@vim.org>2012-05-18 13:46:39 +0200
commit1aeaf8c0e0421f34e51ef674f0c9a182debe77ae (patch)
treeac823e8259ccfd8c536bc34b1d1132e1538f1856 /runtime/macros
parentdbb4a42cdc63933b11bcb9988d926421b3f5028d (diff)
downloadvim-git-1aeaf8c0e0421f34e51ef674f0c9a182debe77ae.tar.gz
Updated runtime files.
Diffstat (limited to 'runtime/macros')
-rw-r--r--runtime/macros/less.bat10
-rwxr-xr-xruntime/macros/less.sh16
-rw-r--r--runtime/macros/less.vim3
3 files changed, 24 insertions, 5 deletions
diff --git a/runtime/macros/less.bat b/runtime/macros/less.bat
new file mode 100644
index 000000000..bbe619bc9
--- /dev/null
+++ b/runtime/macros/less.bat
@@ -0,0 +1,10 @@
+@echo off
+rem batch file to start Vim with less.vim.
+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" -
+) else (
+ vim --cmd "let no_plugin_maps = 1" -c "runtime! macros/less.vim" %*
+)
diff --git a/runtime/macros/less.sh b/runtime/macros/less.sh
index 484c714ce..e29958f7a 100755
--- a/runtime/macros/less.sh
+++ b/runtime/macros/less.sh
@@ -1,16 +1,24 @@
#!/bin/sh
# Shell script to start Vim with less.vim.
-# Read stdin if no arguments were given.
+# Read stdin if no arguments were given and stdin was redirected.
if test -t 1; then
- if test $# = 0; then
- vim --cmd 'let no_plugin_maps = 1' -c 'runtime! macros/less.vim' -
+ if test $# = 0; then
+ if test -t 0; then
+ echo "Missing filename" 1>&2
+ exit
+ fi
+ vim --cmd 'let no_plugin_maps = 1' -c 'runtime! macros/less.vim' -
else
- vim --cmd 'let no_plugin_maps = 1' -c 'runtime! macros/less.vim' "$@"
+ vim --cmd 'let no_plugin_maps = 1' -c 'runtime! macros/less.vim' "$@"
fi
else
# Output is not a terminal, cat arguments or stdin
if test $# = 0; then
+ if test -t 0; then
+ echo "Missing filename" 1>&2
+ exit
+ fi
cat
else
cat "$@"
diff --git a/runtime/macros/less.vim b/runtime/macros/less.vim
index 959a5d735..4888ed2b8 100644
--- a/runtime/macros/less.vim
+++ b/runtime/macros/less.vim
@@ -92,7 +92,8 @@ map <Esc><Space> <Space>
fun! s:NextPage()
if line(".") == line("$")
if argidx() + 1 >= argc()
- quit
+ " Don't quit at the end of the last file
+ return
endif
next
1