Split vimcat into a normal shell script and a separate vim script.

[lucc]

Related to #182.

[rkitover]

I like it, this will help with #182 immensely.

Some notes:

1. yes we still need to recombine into standalone/vimcat in the Makefile, you'll need to modify scripts/balance-shellvim and update the install section in the Makefile etc.
2. use set rtp^= not set rtp+= so the path is first in the list
3. if you are reindenting, might as well use the same indent settings as vimpager, and add a modeline
4. and speaking of which, if you want to change the indent style in both vimpager and vimcat to something more standard like 4 spaces I'm fine with that, I chose hard tabs a very long time ago because that's what I read linux uses but I know better now.

If you'd like me to help, push the branch to this repo. And by the way, you can make branches in this repo and open PRs just the same for discussion.

I'm going to start opening PRs too for major work so I can discuss them.

[lucc]

Will push to brnches on this repo in the future (I think I would have to open a new PR because I can not change the origin of this PR so I'm to lazy this time)

I suggest to do point 4 in the next PR. 2+3 are done.

About point 1: would you prefer standalone/vimpager to bundle vimcat+autoload/vimcat.vim or rather standalone/vimcat? I vote for the first.

[rkitover]

@lucc yes it would make sense to bundle the split vimcat instead of the recombined vimcat of course.

[rkitover]

@lucc so I can just merge this and do the makefile stuff myself, is that ok with you?

[lucc]

If you are eager to do it you can, I was just about to try it myself. Your choice.

[rkitover]

@lucc if you are about to do it that's fine with me, I'll wait. I need to work on the streaming stuff anyway.

[lucc]

ok

[lucc]

I think I fixed standalone/vimpager. Please try it. standalone/vimcat is still missing.

[rkitover]

@lucc looks good, standalone/vimpager works for me.

Sorry for creating more work for you, but after previous discussion I changed the indentation to 4 spaces in master and I changed the code a bit too.

Also I'm probably going to do some more work on vimcat in the next few days, so when you're ready to merge just re-create the files from master, commit the minor changes you made to master if that would make it easier.

[lucc]

I fix this branch again. At the moment there are a lot of small commits, I think it is easier to review it this way. I will prepare a cleaned up history and when the review is done I can push that so it can be merged.

I pushed the clean history.

[rkitover]

@lucc sorry I didn't see that you updated it, looking now.

[lucc]

Rebased.
@rkitover I will leave it up you how to change debian/copyright in order to fix the lintian failure on travis. I don't know if the new vimcat and autoload/vimcat.vim should be copyright by you or the original author.

[rkitover]

@lucc the sed is not compatible with BSD sed (which is closer to osed), and osed (e.g. solaris /bin/sed) commands like a and i have to be in the form:

a\
text

Also, not directly related, but we seem to have lost compatibility with some versions of make, like BSD make.

I'm investigating both of these issues.

[lucc]

Are you talking about the sed command in the makefile to build standalone/vimcat? Does this work:

diff --git a/Makefile b/Makefile
index fe749a6..c1321a7 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,8 @@ standalone/vimpager: vimpager vimpager-version.txt ${SRC:=.uu} inc/* Makefile
 standalone/vimcat: vimcat autoload/vimcat.vim inc/prologue.sh Makefile
    @echo building $@
    @${MKPATH} ${@D}
-   @sed -e '1 a : if 0' \
+   sed -e '1 a\' \
+       -e ': if 0' \
        -e 's/^\( *\)# INSERT VIMCAT_DEBUG PREPARATION HERE$$/\1if [ "$${VIMCAT_DEBUG:-0}" -eq 0 ]; then silent="silent! "; else silent=; fi/' \
        -e 's|^version=.*|version="'"`cat vimcat-version.txt`"' (standalone, shell=\$$(command -v \$$POSIX_SHELL))"|' \
        -e '/^runtime=.*/d' \

Otherwise we can also do this with separated commands:

diff --git a/Makefile b/Makefile
index fe749a6..917ce64 100644
--- a/Makefile
+++ b/Makefile
@@ -66,7 +66,9 @@ standalone/vimpager: vimpager vimpager-version.txt ${SRC:=.uu} inc/* Makefile
 standalone/vimcat: vimcat autoload/vimcat.vim inc/prologue.sh Makefile
    @echo building $@
    @${MKPATH} ${@D}
-   @sed -e '1 a : if 0' \
+   @head -n 1 vimcat > $@
+   @echo : if 0 >> $@
+   @sed -e '1d' \
        -e 's/^\( *\)# INSERT VIMCAT_DEBUG PREPARATION HERE$$/\1if [ "$${VIMCAT_DEBUG:-0}" -eq 0 ]; then silent="silent! "; else silent=; fi/' \
        -e 's|^version=.*|version="'"`cat vimcat-version.txt`"' (standalone, shell=\$$(command -v \$$POSIX_SHELL))"|' \
        -e '/^runtime=.*/d' \
@@ -77,7 +79,7 @@ standalone/vimcat: vimcat autoload/vimcat.vim inc/prologue.sh Makefile
        -e     'r inc/prologue.sh' \
        -e     d \
        -e '}' \
-       vimcat > $@
+       vimcat >> $@
    @awk '/^[   ]*(if|for|while)/ { print $$1 }' vimcat \
      | sed '1!G;h;$$!d' \
      | sed -e 's/^/: end/' >> $@

[rkitover]

@lucc I fixed the remaining vimcat issues, and I fixed the Makefile for Solaris make (which seems to be some variant of dmake) but it still does not work on FreeBSD or OpenBSD make, I'll see if this is fixable and if not I will amend the docs to tell *BSD users to use gmake.