# HG changeset patch # User Heiko Schlittermann # Date 1446118582 -3600 # Node ID 3e51ac65a97843f40b172625bf34cdd740294f83 # Parent 01f49b9e842c6b29aed6e6f7b29e56c25440d29a add vim-asciidoc diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/HEAD --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/HEAD Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,1 @@ +ref: refs/heads/master diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/config --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/config Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,11 @@ +[core] + repositoryformatversion = 0 + filemode = true + bare = false + logallrefupdates = true +[remote "origin"] + url = https://github.com/matcatc/vim-asciidoc-folding.git + fetch = +refs/heads/*:refs/remotes/origin/* +[branch "master"] + remote = origin + merge = refs/heads/master diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/description --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/description Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,1 @@ +Unnamed repository; edit this file 'description' to name the repository. diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/hooks/applypatch-msg.sample --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/hooks/applypatch-msg.sample Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,15 @@ +#!/bin/sh +# +# An example hook script to check the commit log message taken by +# applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. The hook is +# allowed to edit the commit message file. +# +# To enable this hook, rename this file to "applypatch-msg". + +. git-sh-setup +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} +: diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/hooks/commit-msg.sample --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/hooks/commit-msg.sample Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,24 @@ +#!/bin/sh +# +# An example hook script to check the commit log message. +# Called by "git commit" with one argument, the name of the file +# that has the commit message. The hook should exit with non-zero +# status after issuing an appropriate message if it wants to stop the +# commit. The hook is allowed to edit the commit message file. +# +# To enable this hook, rename this file to "commit-msg". + +# Uncomment the below to add a Signed-off-by line to the message. +# Doing this in a hook is a bad idea in general, but the prepare-commit-msg +# hook is more suited to it. +# +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" + +# This example catches duplicate Signed-off-by lines. + +test "" = "$(grep '^Signed-off-by: ' "$1" | + sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || { + echo >&2 Duplicate Signed-off-by lines. + exit 1 +} diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/hooks/post-update.sample --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/hooks/post-update.sample Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,8 @@ +#!/bin/sh +# +# An example hook script to prepare a packed repository for use over +# dumb transports. +# +# To enable this hook, rename this file to "post-update". + +exec git update-server-info diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/hooks/pre-applypatch.sample --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/hooks/pre-applypatch.sample Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,14 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed +# by applypatch from an e-mail message. +# +# The hook should exit with non-zero status after issuing an +# appropriate message if it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-applypatch". + +. git-sh-setup +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} +: diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/hooks/pre-commit.sample --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/hooks/pre-commit.sample Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,49 @@ +#!/bin/sh +# +# An example hook script to verify what is about to be committed. +# Called by "git commit" with no arguments. The hook should +# exit with non-zero status after issuing an appropriate message if +# it wants to stop the commit. +# +# To enable this hook, rename this file to "pre-commit". + +if git rev-parse --verify HEAD >/dev/null 2>&1 +then + against=HEAD +else + # Initial commit: diff against an empty tree object + against=4b825dc642cb6eb9a060e54bf8d69288fbee4904 +fi + +# If you want to allow non-ASCII filenames set this variable to true. +allownonascii=$(git config --bool hooks.allownonascii) + +# Redirect output to stderr. +exec 1>&2 + +# Cross platform projects tend to avoid non-ASCII filenames; prevent +# them from being added to the repository. We exploit the fact that the +# printable range starts at the space character and ends with tilde. +if [ "$allownonascii" != "true" ] && + # Note that the use of brackets around a tr range is ok here, (it's + # even required, for portability to Solaris 10's /usr/bin/tr), since + # the square bracket bytes happen to fall in the designated range. + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 +then + cat <<\EOF +Error: Attempt to add a non-ASCII file name. + +This can cause problems if you want to work with people on other platforms. + +To be portable it is advisable to rename the file. + +If you know what you are doing you can disable this check using: + + git config hooks.allownonascii true +EOF + exit 1 +fi + +# If there are whitespace errors, print the offending file names and fail. +exec git diff-index --check --cached $against -- diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/hooks/pre-push.sample --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/hooks/pre-push.sample Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,54 @@ +#!/bin/sh + +# An example hook script to verify what is about to be pushed. Called by "git +# push" after it has checked the remote status, but before anything has been +# pushed. If this script exits with a non-zero status nothing will be pushed. +# +# This hook is called with the following parameters: +# +# $1 -- Name of the remote to which the push is being done +# $2 -- URL to which the push is being done +# +# If pushing without using a named remote those arguments will be equal. +# +# Information about the commits which are being pushed is supplied as lines to +# the standard input in the form: +# +# +# +# This sample shows how to prevent push of commits where the log message starts +# with "WIP" (work in progress). + +remote="$1" +url="$2" + +z40=0000000000000000000000000000000000000000 + +IFS=' ' +while read local_ref local_sha remote_ref remote_sha +do + if [ "$local_sha" = $z40 ] + then + # Handle delete + : + else + if [ "$remote_sha" = $z40 ] + then + # New branch, examine all commits + range="$local_sha" + else + # Update to existing branch, examine new commits + range="$remote_sha..$local_sha" + fi + + # Check for WIP commit + commit=`git rev-list -n 1 --grep '^WIP' "$range"` + if [ -n "$commit" ] + then + echo "Found WIP commit in $local_ref, not pushing" + exit 1 + fi + fi +done + +exit 0 diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/hooks/pre-rebase.sample --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/hooks/pre-rebase.sample Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,169 @@ +#!/bin/sh +# +# Copyright (c) 2006, 2008 Junio C Hamano +# +# The "pre-rebase" hook is run just before "git rebase" starts doing +# its job, and can prevent the command from running by exiting with +# non-zero status. +# +# The hook is called with the following parameters: +# +# $1 -- the upstream the series was forked from. +# $2 -- the branch being rebased (or empty when rebasing the current branch). +# +# This sample shows how to prevent topic branches that are already +# merged to 'next' branch from getting rebased, because allowing it +# would result in rebasing already published history. + +publish=next +basebranch="$1" +if test "$#" = 2 +then + topic="refs/heads/$2" +else + topic=`git symbolic-ref HEAD` || + exit 0 ;# we do not interrupt rebasing detached HEAD +fi + +case "$topic" in +refs/heads/??/*) + ;; +*) + exit 0 ;# we do not interrupt others. + ;; +esac + +# Now we are dealing with a topic branch being rebased +# on top of master. Is it OK to rebase it? + +# Does the topic really exist? +git show-ref -q "$topic" || { + echo >&2 "No such branch $topic" + exit 1 +} + +# Is topic fully merged to master? +not_in_master=`git rev-list --pretty=oneline ^master "$topic"` +if test -z "$not_in_master" +then + echo >&2 "$topic is fully merged to master; better remove it." + exit 1 ;# we could allow it, but there is no point. +fi + +# Is topic ever merged to next? If so you should not be rebasing it. +only_next_1=`git rev-list ^master "^$topic" ${publish} | sort` +only_next_2=`git rev-list ^master ${publish} | sort` +if test "$only_next_1" = "$only_next_2" +then + not_in_topic=`git rev-list "^$topic" master` + if test -z "$not_in_topic" + then + echo >&2 "$topic is already up-to-date with master" + exit 1 ;# we could allow it, but there is no point. + else + exit 0 + fi +else + not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"` + /usr/bin/perl -e ' + my $topic = $ARGV[0]; + my $msg = "* $topic has commits already merged to public branch:\n"; + my (%not_in_next) = map { + /^([0-9a-f]+) /; + ($1 => 1); + } split(/\n/, $ARGV[1]); + for my $elem (map { + /^([0-9a-f]+) (.*)$/; + [$1 => $2]; + } split(/\n/, $ARGV[2])) { + if (!exists $not_in_next{$elem->[0]}) { + if ($msg) { + print STDERR $msg; + undef $msg; + } + print STDERR " $elem->[1]\n"; + } + } + ' "$topic" "$not_in_next" "$not_in_master" + exit 1 +fi + +<<\DOC_END + +This sample hook safeguards topic branches that have been +published from being rewound. + +The workflow assumed here is: + + * Once a topic branch forks from "master", "master" is never + merged into it again (either directly or indirectly). + + * Once a topic branch is fully cooked and merged into "master", + it is deleted. If you need to build on top of it to correct + earlier mistakes, a new topic branch is created by forking at + the tip of the "master". This is not strictly necessary, but + it makes it easier to keep your history simple. + + * Whenever you need to test or publish your changes to topic + branches, merge them into "next" branch. + +The script, being an example, hardcodes the publish branch name +to be "next", but it is trivial to make it configurable via +$GIT_DIR/config mechanism. + +With this workflow, you would want to know: + +(1) ... if a topic branch has ever been merged to "next". Young + topic branches can have stupid mistakes you would rather + clean up before publishing, and things that have not been + merged into other branches can be easily rebased without + affecting other people. But once it is published, you would + not want to rewind it. + +(2) ... if a topic branch has been fully merged to "master". + Then you can delete it. More importantly, you should not + build on top of it -- other people may already want to + change things related to the topic as patches against your + "master", so if you need further changes, it is better to + fork the topic (perhaps with the same name) afresh from the + tip of "master". + +Let's look at this example: + + o---o---o---o---o---o---o---o---o---o "next" + / / / / + / a---a---b A / / + / / / / + / / c---c---c---c B / + / / / \ / + / / / b---b C \ / + / / / / \ / + ---o---o---o---o---o---o---o---o---o---o---o "master" + + +A, B and C are topic branches. + + * A has one fix since it was merged up to "next". + + * B has finished. It has been fully merged up to "master" and "next", + and is ready to be deleted. + + * C has not merged to "next" at all. + +We would want to allow C to be rebased, refuse A, and encourage +B to be deleted. + +To compute (1): + + git rev-list ^master ^topic next + git rev-list ^master next + + if these match, topic has not merged in next at all. + +To compute (2): + + git rev-list master..topic + + if this is empty, it is fully merged to "master". + +DOC_END diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/hooks/prepare-commit-msg.sample --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/hooks/prepare-commit-msg.sample Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,36 @@ +#!/bin/sh +# +# An example hook script to prepare the commit log message. +# Called by "git commit" with the name of the file that has the +# commit message, followed by the description of the commit +# message's source. The hook's purpose is to edit the commit +# message file. If the hook fails with a non-zero status, +# the commit is aborted. +# +# To enable this hook, rename this file to "prepare-commit-msg". + +# This hook includes three examples. The first comments out the +# "Conflicts:" part of a merge commit. +# +# The second includes the output of "git diff --name-status -r" +# into the message, just before the "git status" output. It is +# commented because it doesn't cope with --amend or with squashed +# commits. +# +# The third example adds a Signed-off-by line to the message, that can +# still be edited. This is rarely a good idea. + +case "$2,$3" in + merge,) + /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;; + +# ,|template,) +# /usr/bin/perl -i.bak -pe ' +# print "\n" . `git diff --cached --name-status -r` +# if /^#/ && $first++ == 0' "$1" ;; + + *) ;; +esac + +# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p') +# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1" diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/hooks/update.sample --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/hooks/update.sample Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,128 @@ +#!/bin/sh +# +# An example hook script to blocks unannotated tags from entering. +# Called by "git receive-pack" with arguments: refname sha1-old sha1-new +# +# To enable this hook, rename this file to "update". +# +# Config +# ------ +# hooks.allowunannotated +# This boolean sets whether unannotated tags will be allowed into the +# repository. By default they won't be. +# hooks.allowdeletetag +# This boolean sets whether deleting tags will be allowed in the +# repository. By default they won't be. +# hooks.allowmodifytag +# This boolean sets whether a tag may be modified after creation. By default +# it won't be. +# hooks.allowdeletebranch +# This boolean sets whether deleting branches will be allowed in the +# repository. By default they won't be. +# hooks.denycreatebranch +# This boolean sets whether remotely creating branches will be denied +# in the repository. By default this is allowed. +# + +# --- Command line +refname="$1" +oldrev="$2" +newrev="$3" + +# --- Safety check +if [ -z "$GIT_DIR" ]; then + echo "Don't run this script from the command line." >&2 + echo " (if you want, you could supply GIT_DIR then run" >&2 + echo " $0 )" >&2 + exit 1 +fi + +if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then + echo "usage: $0 " >&2 + exit 1 +fi + +# --- Config +allowunannotated=$(git config --bool hooks.allowunannotated) +allowdeletebranch=$(git config --bool hooks.allowdeletebranch) +denycreatebranch=$(git config --bool hooks.denycreatebranch) +allowdeletetag=$(git config --bool hooks.allowdeletetag) +allowmodifytag=$(git config --bool hooks.allowmodifytag) + +# check for no description +projectdesc=$(sed -e '1q' "$GIT_DIR/description") +case "$projectdesc" in +"Unnamed repository"* | "") + echo "*** Project description file hasn't been set" >&2 + exit 1 + ;; +esac + +# --- Check types +# if $newrev is 0000...0000, it's a commit to delete a ref. +zero="0000000000000000000000000000000000000000" +if [ "$newrev" = "$zero" ]; then + newrev_type=delete +else + newrev_type=$(git cat-file -t $newrev) +fi + +case "$refname","$newrev_type" in + refs/tags/*,commit) + # un-annotated tag + short_refname=${refname##refs/tags/} + if [ "$allowunannotated" != "true" ]; then + echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2 + echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2 + exit 1 + fi + ;; + refs/tags/*,delete) + # delete tag + if [ "$allowdeletetag" != "true" ]; then + echo "*** Deleting a tag is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/tags/*,tag) + # annotated tag + if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1 + then + echo "*** Tag '$refname' already exists." >&2 + echo "*** Modifying a tag is not allowed in this repository." >&2 + exit 1 + fi + ;; + refs/heads/*,commit) + # branch + if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then + echo "*** Creating a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/heads/*,delete) + # delete branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + refs/remotes/*,commit) + # tracking branch + ;; + refs/remotes/*,delete) + # delete tracking branch + if [ "$allowdeletebranch" != "true" ]; then + echo "*** Deleting a tracking branch is not allowed in this repository" >&2 + exit 1 + fi + ;; + *) + # Anything else (is there anything else?) + echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2 + exit 1 + ;; +esac + +# --- Finished +exit 0 diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/index Binary file .vim/bundle/vim-asciidoc-folding/.git/index has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/info/exclude --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/info/exclude Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,6 @@ +# git ls-files --others --exclude-from=.git/info/exclude +# Lines that start with '#' are comments. +# For a project mostly in C, the following would be a good set of +# exclude patterns (uncomment them if you want to use them): +# *.[oa] +# *~ diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/logs/HEAD --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/logs/HEAD Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,1 @@ +0000000000000000000000000000000000000000 5d50c34506c46de2ef07a4c179a0d717e76675ba Heiko Schlittermann (HS12-RIPE) 1445890697 +0100 clone: from https://github.com/matcatc/vim-asciidoc-folding.git diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/logs/refs/heads/master --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/logs/refs/heads/master Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,1 @@ +0000000000000000000000000000000000000000 5d50c34506c46de2ef07a4c179a0d717e76675ba Heiko Schlittermann (HS12-RIPE) 1445890697 +0100 clone: from https://github.com/matcatc/vim-asciidoc-folding.git diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/logs/refs/remotes/origin/HEAD --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/logs/refs/remotes/origin/HEAD Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,1 @@ +0000000000000000000000000000000000000000 5d50c34506c46de2ef07a4c179a0d717e76675ba Heiko Schlittermann (HS12-RIPE) 1445890697 +0100 clone: from https://github.com/matcatc/vim-asciidoc-folding.git diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/10/ed97bbe26716407244610e76f2fc4bf7a3ac72 Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/10/ed97bbe26716407244610e76f2fc4bf7a3ac72 has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/13/995c7d22161f737727404b5e8b429773ef0a06 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/objects/13/995c7d22161f737727404b5e8b429773ef0a06 Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,2 @@ +xn0EW]m1H[/uUMw>F#U}iY 8gΡir$BGNkջV6OZM1˩1#{nU'f)dTZE8*i˓NE\l%lzG9❝Igo=0-O/PFYRr[3}oZ|!͞zFӘ{b h >y\n>GJ(H"]$JRz-ۖONligq|3 cɁ"PHrn.w)"qq5힤DT5F/!:68Xᯕ!ckOnG4ݧ +XL GJl \ No newline at end of file diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/52/121923be6deed983171f90b1caea8c1b04d183 Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/52/121923be6deed983171f90b1caea8c1b04d183 has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/53/5f26a3b6a7c554d433d7cf2528c4d791e0f9a0 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/objects/53/5f26a3b6a7c554d433d7cf2528c4d791e0f9a0 Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,2 @@ +xMj0@uYѯe(fMFVp'4}}n|r_&`||֒&.p`!= +m05s%):ǡёR +d} _x[H2u4rp:xQuVR:q9Cm |^Z_P|K$R: \ No newline at end of file diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/5d/50c34506c46de2ef07a4c179a0d717e76675ba --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/objects/5d/50c34506c46de2ef07a4c179a0d717e76675ba Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,1 @@ +xPKj0Z]$ے Mi-ݴ`z,l-[IW!t55ayLVY(5dJ٪UU+eU";L>4J)p:ZmIU[ZGbf{@ x+!lL^@ YkYBSHcgOО:@zv}0MN;4o a<'i&9yv ԰ oYc@3fd1a#C  \ No newline at end of file diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/68/cc482342d22a79fd4da9bccc0aba24e5fb2464 Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/68/cc482342d22a79fd4da9bccc0aba24e5fb2464 has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/75/01fbd42082c34f50ad3aa51bf93fe877ca4686 Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/75/01fbd42082c34f50ad3aa51bf93fe877ca4686 has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/76/aa7306f52a3c78065fbf2b75696f705a9ca4bb Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/76/aa7306f52a3c78065fbf2b75696f705a9ca4bb has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/82/f33a1a5663546e6e1c97cbfc50046b5fb6eeef Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/82/f33a1a5663546e6e1c97cbfc50046b5fb6eeef has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/8d/806c6aaf58f020cc61d60b8646da65ff67fb4c Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/8d/806c6aaf58f020cc61d60b8646da65ff67fb4c has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/8e/daa1fd706d7521e7ae356b9926be10dec36348 Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/8e/daa1fd706d7521e7ae356b9926be10dec36348 has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/94/e4e7c686568217667d92606bc3a28535d7414d Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/94/e4e7c686568217667d92606bc3a28535d7414d has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/a1/bd7cc2cbe4d1c64b36493a5d7ada3e154fb989 Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/a1/bd7cc2cbe4d1c64b36493a5d7ada3e154fb989 has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/b8/3a065018525b049c62a9a6611d390e552a468c Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/b8/3a065018525b049c62a9a6611d390e552a468c has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/b8/c3e4e7604675963a674e31c86f83d10e8dbdcf Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/b8/c3e4e7604675963a674e31c86f83d10e8dbdcf has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/c1/8cd249470b0774d09b881f75628032a85b75b9 Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/c1/8cd249470b0774d09b881f75628032a85b75b9 has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/c7/740c0ca2f1888a80d9415811c2a9c3bd1a7df9 Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/c7/740c0ca2f1888a80d9415811c2a9c3bd1a7df9 has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/cd/9d6de2a16dcec586d8b90d68b2f0d8e3aa585a Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/cd/9d6de2a16dcec586d8b90d68b2f0d8e3aa585a has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/d2/6659a185bf92a8a53033a004cbda55a8607fb9 Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/d2/6659a185bf92a8a53033a004cbda55a8607fb9 has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/d3/4459dd5a053f130639b170f91783a1556823c3 Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/d3/4459dd5a053f130639b170f91783a1556823c3 has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/d5/7c55145ca0f220e560d930bd42c7da9df102d4 Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/d5/7c55145ca0f220e560d930bd42c7da9df102d4 has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/dc/6a3248fdec8546907c11567517de40fe3cadfd Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/dc/6a3248fdec8546907c11567517de40fe3cadfd has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/e5/71a1ce4c9b4d79d5c8d0eee18fba6219246653 Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/e5/71a1ce4c9b4d79d5c8d0eee18fba6219246653 has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 Binary file .vim/bundle/vim-asciidoc-folding/.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 has changed diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/packed-refs --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/packed-refs Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,2 @@ +# pack-refs with: peeled fully-peeled +5d50c34506c46de2ef07a4c179a0d717e76675ba refs/remotes/origin/master diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/refs/heads/master --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/refs/heads/master Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,1 @@ +5d50c34506c46de2ef07a4c179a0d717e76675ba diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/.git/refs/remotes/origin/HEAD --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/.git/refs/remotes/origin/HEAD Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,1 @@ +ref: refs/remotes/origin/master diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/README.asciidoc --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/README.asciidoc Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,77 @@ +README: vim-asciidoc-folding +============================ +:author: Matthew Todd +:date: 2014-09-02 +:toc: + + + +== Introduction + +This plugin provides a fold expression for vim to enable folding asciidoc files +(like this one.) + +== Installation + +After installing the files, you may need to set the `foldmethod` to `foldexpr`. +You may want to consider doing this with an autocommand or ftplugin file, so +it's automatically done whenever you load an asciidoc file. + +=== Pathogen et al. + +Just drop the files from the git repository in `~/.vim/bundle/`, as you would +with any other pathogen plugin. Be it just unzipping the files, doing a git +clone, or a git submodule. + +=== Manually + +Drop `folding.vim` into `~/.vim/after/ftplugin/asciidoc/` + +== Dependencies + +This plugin has some dependencies on the asciidoc syntax highlighting. In +particular, for ignoring any ='s in listing blocks. There isn't a bundled +asciidoc syntax file nor an official one, as far as I'm aware. So you might +have to tweak this plugin to work with other syntax highlighters. You can +always also send me an email or issue if you find one that doesn't work, so +that I can add support. + +== Limitations + +This plugin has the limitation that it only supports Atx style sections, not +Setext style sections. + +.Supported +----------------------------------------------------------- + == Level 1 + + === Level 2 +----------------------------------------------------------- + +.Not Supported +----------------------------------------------------------- + Level 1 + ------- + + Level 2 + ~~~~~~~ +----------------------------------------------------------- + + +See http://asciidoctor.org/docs/asciidoc-recommended-practices/ for more info. + + +== Usage + +See the included help file (`:help asciidoc-folding`) for more information on +how to use this plugin. + + +== License + +This plugin was originally based on vim-markdown-plugin, found here +https://github.com/nelstrom/vim-markdown-folding, copyright (c) Drew Neil and +distributed under the same terms as Vim itself. As such, this derivative +plugin is also distributed under the same terms as Vim itself. See `:help +license` for more information. + diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/after/ftplugin/asciidoc/folding.vim --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/after/ftplugin/asciidoc/folding.vim Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,121 @@ +" Fold expression for asciidoc files +" +" NOTE: only supports Atx-style, not Setext style sections. See +" http://asciidoctor.org/docs/asciidoc-recommended-practices/ for more info. +" +" Script's originally based on https://github.com/nelstrom/vim-markdown-folding +" +" vim:set fdm=marker: + +" Fold expressions {{{1 +function! StackedMarkdownFolds() + if HeadingDepth(v:lnum) > 0 + return ">1" + else + return "=" + endif +endfunction + +function! NestedMarkdownFolds() + let depth = HeadingDepth(v:lnum) + if depth > 0 + return ">".depth + else + return "=" + endif +endfunction + +" Helpers {{{1 +function! s:SID() + return matchstr(expand(''), '\d\+_') +endfunction + +function! HeadingDepth(lnum) + " 5 ='s is deepest section level, according to `asciidoc --help syntax`. + " Only 1 = is the document header, which isn't really worth folding, so we + " ignore it and subtract one off the count to get the fold level. + let level=0 + let thisline = getline(a:lnum) + let hashCount = len(matchstr(thisline, '^=\{2,5}')) + " Ignore lines with too many ='s (usually block deliminators) + if hashCount > 1 && hashCount < 5 + let level = hashCount - 1 + endif + + if level > 0 && LineIsFenced(a:lnum) + " Ignore ='s if they appear within fenced code blocks + let level = 0 + endif + + return level +endfunction + +function! LineIsFenced(lnum) + if exists("b:current_syntax") && b:current_syntax ==# 'asciidoc' + " It's cheap to check if the current line has 'markdownCode' syntax group + return s:HasSyntaxGroup(a:lnum, 'markdownCode') + endif +endfunction + +function! s:HasSyntaxGroup(lnum, targetGroup) + let syntaxGroup = map(synstack(a:lnum, 1), 'synIDattr(v:val, "name")') + for value in syntaxGroup + " Likely dependant on the asciidoc syntax file, so will need to be + " updated accordingly + if value =~ '\vasciidocListingBlock' + return 1 + endif + endfor +endfunction + + +function! s:FoldText() + let level = HeadingDepth(v:foldstart) + let indent = repeat('=', level) + let title = substitute(getline(v:foldstart), '^=\+\s*', '', '') + let foldsize = (v:foldend - v:foldstart) + let linecount = '['.foldsize.' line'.(foldsize>1?'s':'').']' + return indent.' '.title.' '.linecount +endfunction + +" API {{{1 +function! ToggleMarkdownFoldexpr() + if &l:foldexpr ==# 'StackedMarkdownFolds()' + setlocal foldexpr=NestedMarkdownFolds() + else + setlocal foldexpr=StackedMarkdownFolds() + endif +endfunction +command! -buffer FoldToggle call ToggleMarkdownFoldexpr() + +" Setup {{{1 +if !exists('g:markdown_fold_style') + let g:markdown_fold_style = 'stacked' +endif + +if !exists('g:markdown_fold_override_foldtext') + let g:markdown_fold_override_foldtext = 1 +endif + +setlocal foldmethod=expr + +if g:markdown_fold_override_foldtext + let &l:foldtext = s:SID() . 'FoldText()' +endif + +let &l:foldexpr = + \ g:markdown_fold_style ==# 'nested' + \ ? 'NestedMarkdownFolds()' + \ : 'StackedMarkdownFolds()' + +" Teardown {{{1 +" To avoid errors when undo_ftplugin not defined yet +if !exists('b:undo_ftplugin') + let b:undo_ftplugin = '' +endif + +let b:undo_ftplugin .= ' + \ | setlocal foldmethod< foldtext< foldexpr< + \ | delcommand FoldToggle + \ ' + diff -r 01f49b9e842c -r 3e51ac65a978 .vim/bundle/vim-asciidoc-folding/doc/asciidoc-folding.txt --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/.vim/bundle/vim-asciidoc-folding/doc/asciidoc-folding.txt Thu Oct 29 12:36:22 2015 +0100 @@ -0,0 +1,84 @@ +*asciidoc-folding.txt* For Vim version 7.3 Last change: 2014 Sep 03 + +Original Author: Drew Neil +Author: Matthew Todd +License: Same terms as Vim itself (see |license|) + +CONTENTS *asciidoc-folding* + +Introduction |asciidoc-folding-introduction| + Stacked folding |asciidoc-folding-stacked| + Nested folding |asciidoc-folding-nested| +Configuration |asciidoc-folding-configuration| + Overriding the default style |g:asciidoc_fold_style| + Switching fold style |asciidoc-folding-:FoldToggle| + +============================================================================ +INTRODUCTION *asciidoc-folding-introduction* + +This plugin, originally based on Drew Niel's vim-markdown-folding, enables you +to fold asciidoc documents by section headings. It recognizes only the +Atx-style of headings, as shown below (and described at +http://asciidoctor.org/docs/asciidoc-recommended-practices/). + + == section level 1 + + === section level 2 + + ==== section level 3 + + ===== section level 4 + +The alternative Setext style is not currently supported. + +Two different folding styles are supported: stacked (the default) and nested. + + *asciidoc-folding-stacked* +The stacked folding style creates a flat list of sections. When all folds are +closed, the outline resembles a fully expanded table of contents. That is, h1, +h2, h3 etc. headings are all represented equally. + +Implementation details: all sections (h1, h2, h3 etc.) initiate a fold with +foldlevel=1. + + *asciidoc-folding-nested* +The nested folding style creates a heirarchical list of sections. When all +folds are closed (by pressing |zM| or running :set foldlevel=0), the outline +resembles a table of contents (ToC) that only shows h1 sections. + +Opening the h1 folds (by running :set foldlevel=1) reveals the content of that +section, with any h2 sections outlined as a ToC. + +Opening an h2 fold (by running :set foldlevel=2) reveals the content of that +section, with any h3 sections outlined as a ToC. And so on... + +Implementation details: h1 sections initiate a fold with foldlevel=1, h2 +sections initiate a fold with foldlevel=2, and so on. + +============================================================================ +CONFIGURATION *asciidoc-folding-configuration* + +The stacked folding style is the default. + *g:asciidoc_fold_style* +To make the nested folding style the default, put this in your |vimrc| +file:> + let g:asciidoc_fold_style = 'nested' +< + + *asciidoc-folding-:FoldToggle* +You can switch between the stacked and nested folding styles by running +the command:> + :FoldToggle +< + +The fold style is scoped to each window, which means it's possible to use the +stacked folding style in one split window, and the nested folding style in +another. + + *g:asciidoc_fold_override_foldtext* +If set to 0, the fold text will not be overriden:> + let g:asciidoc_fold_override_foldtext = 0 +< + + vim:tw=78:ts=8:ft=help:norl: + diff -r 01f49b9e842c -r 3e51ac65a978 .vim/view/.ssh=+config= --- a/.vim/view/.ssh=+config= Wed Sep 09 10:43:34 2015 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,117 +0,0 @@ -let s:so_save = &so | let s:siso_save = &siso | set so=0 siso=0 -argglobal -setlocal keymap= -setlocal noarabic -setlocal autoindent -setlocal backupcopy= -setlocal balloonexpr= -setlocal nobinary -setlocal nobreakindent -setlocal breakindentopt= -setlocal bufhidden= -setlocal buflisted -setlocal buftype= -setlocal nocindent -setlocal cinkeys=0{,0},0),:,0#,!^F,o,O,e -setlocal cinoptions= -setlocal cinwords=if,else,while,do,for,switch -setlocal colorcolumn= -setlocal comments=s1:/*,mb:*,ex:*/,://,b:#,:%,:XCOMM,n:>,fb:- -setlocal commentstring=/*%s*/ -setlocal complete=.,w,b,u,t,i -setlocal concealcursor= -setlocal conceallevel=0 -setlocal completefunc= -setlocal nocopyindent -setlocal cryptmethod= -setlocal nocursorbind -setlocal nocursorcolumn -setlocal nocursorline -setlocal define= -setlocal dictionary= -setlocal nodiff -setlocal equalprg= -setlocal errorformat= -setlocal noexpandtab -if &filetype != '' -setlocal filetype= -endif -setlocal foldcolumn=0 -setlocal foldenable -setlocal foldexpr=0 -setlocal foldignore=# -setlocal foldlevel=0 -setlocal foldmarker={{{,}}} -setlocal foldmethod=manual -setlocal foldminlines=1 -setlocal foldnestmax=20 -setlocal foldtext=foldtext() -setlocal formatexpr= -setlocal formatoptions=tcq -setlocal formatlistpat=^\\s*\\d\\+[\\]:.)}\\t\ ]\\s* -setlocal grepprg= -setlocal iminsert=2 -setlocal imsearch=2 -setlocal include= -setlocal includeexpr= -setlocal indentexpr= -setlocal indentkeys=0{,0},:,0#,!^F,o,O,e -setlocal noinfercase -setlocal iskeyword=@,48-57,_,192-255 -setlocal keywordprg= -setlocal linebreak -setlocal nolisp -setlocal lispwords= -setlocal nolist -setlocal makeprg= -setlocal matchpairs=(:),{:},[:] -setlocal modeline -setlocal modifiable -setlocal nrformats=octal,hex -setlocal nonumber -setlocal numberwidth=4 -setlocal omnifunc= -setlocal path= -setlocal nopreserveindent -setlocal nopreviewwindow -setlocal quoteescape=\\ -setlocal noreadonly -setlocal norelativenumber -setlocal norightleft -setlocal rightleftcmd=search -setlocal noscrollbind -setlocal shiftwidth=4 -setlocal noshortname -setlocal nosmartindent -setlocal softtabstop=4 -setlocal nospell -setlocal spellcapcheck=[.?!]\\_[\\])'\"\ \ ]\\+ -setlocal spellfile= -setlocal spelllang=en -setlocal statusline= -setlocal suffixesadd= -setlocal swapfile -setlocal synmaxcol=3000 -if &syntax != '' -setlocal syntax= -endif -setlocal tabstop=8 -setlocal tags= -setlocal textwidth=72 -setlocal thesaurus= -setlocal noundofile -setlocal undolevels=-123456 -setlocal nowinfixheight -setlocal nowinfixwidth -setlocal wrap -setlocal wrapmargin=0 -silent! normal! zE -let s:l = 1 - ((0 * winheight(0) + 24) / 48) -if s:l < 1 | let s:l = 1 | endif -exe s:l -normal! zt -1 -normal! 0 -let &so = s:so_save | let &siso = s:siso_save -doautoall SessionLoadPost -" vim: set ft=vim : diff -r 01f49b9e842c -r 3e51ac65a978 .vimrc --- a/.vimrc Wed Sep 09 10:43:34 2015 +0200 +++ b/.vimrc Thu Oct 29 12:36:22 2015 +0100 @@ -49,7 +49,7 @@ "autocmd BufWinEnter * loadview "autocmd BufWinLeave * mkview -"autocmd BufWritePre * :%s/\s\s+//en +"autocmd BufWritePre * :%s/\s\+$//en execute pathogen#infect()