=== removed directory 'vim/bundle/AutoFenc' === removed directory 'vim/bundle/AutoFenc/.git' === removed file 'vim/bundle/AutoFenc/.git/HEAD' --- vim/bundle/AutoFenc/.git/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/.git/HEAD 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -ref: refs/heads/master === removed file 'vim/bundle/AutoFenc/.git/config' --- vim/bundle/AutoFenc/.git/config 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/.git/config 1970-01-01 00:00:00 +0000 @@ -1,11 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[remote "origin"] - url = https://github.com/s3rvac/AutoFenc - fetch = +refs/heads/master:refs/remotes/origin/master -[branch "master"] - remote = origin - merge = refs/heads/master === removed file 'vim/bundle/AutoFenc/.git/description' --- vim/bundle/AutoFenc/.git/description 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/.git/description 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. === removed directory 'vim/bundle/AutoFenc/.git/hooks' === removed file 'vim/bundle/AutoFenc/.git/hooks/applypatch-msg.sample' --- vim/bundle/AutoFenc/.git/hooks/applypatch-msg.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/.git/hooks/applypatch-msg.sample 1970-01-01 00:00:00 +0000 @@ -1,15 +0,0 @@ -#!/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 -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} -: === removed file 'vim/bundle/AutoFenc/.git/hooks/commit-msg.sample' --- vim/bundle/AutoFenc/.git/hooks/commit-msg.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/.git/hooks/commit-msg.sample 1970-01-01 00:00:00 +0000 @@ -1,24 +0,0 @@ -#!/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 -} === removed file 'vim/bundle/AutoFenc/.git/hooks/post-update.sample' --- vim/bundle/AutoFenc/.git/hooks/post-update.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/.git/hooks/post-update.sample 1970-01-01 00:00:00 +0000 @@ -1,8 +0,0 @@ -#!/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 === removed file 'vim/bundle/AutoFenc/.git/hooks/pre-applypatch.sample' --- vim/bundle/AutoFenc/.git/hooks/pre-applypatch.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/.git/hooks/pre-applypatch.sample 1970-01-01 00:00:00 +0000 @@ -1,14 +0,0 @@ -#!/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 -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} -: === removed file 'vim/bundle/AutoFenc/.git/hooks/pre-commit.sample' --- vim/bundle/AutoFenc/.git/hooks/pre-commit.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/.git/hooks/pre-commit.sample 1970-01-01 00:00:00 +0000 @@ -1,49 +0,0 @@ -#!/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 -- === removed file 'vim/bundle/AutoFenc/.git/hooks/pre-push.sample' --- vim/bundle/AutoFenc/.git/hooks/pre-push.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/.git/hooks/pre-push.sample 1970-01-01 00:00:00 +0000 @@ -1,53 +0,0 @@ -#!/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 - -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 >&2 "Found WIP commit in $local_ref, not pushing" - exit 1 - fi - fi -done - -exit 0 === removed file 'vim/bundle/AutoFenc/.git/hooks/pre-rebase.sample' --- vim/bundle/AutoFenc/.git/hooks/pre-rebase.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/.git/hooks/pre-rebase.sample 1970-01-01 00:00:00 +0000 @@ -1,169 +0,0 @@ -#!/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 - -exit 0 - -################################################################ - -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". === removed file 'vim/bundle/AutoFenc/.git/hooks/prepare-commit-msg.sample' --- vim/bundle/AutoFenc/.git/hooks/prepare-commit-msg.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/.git/hooks/prepare-commit-msg.sample 1970-01-01 00:00:00 +0000 @@ -1,36 +0,0 @@ -#!/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" === removed file 'vim/bundle/AutoFenc/.git/hooks/update.sample' --- vim/bundle/AutoFenc/.git/hooks/update.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/.git/hooks/update.sample 1970-01-01 00:00:00 +0000 @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to block 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 === removed file 'vim/bundle/AutoFenc/.git/index' Binary files vim/bundle/AutoFenc/.git/index 2016-08-04 08:13:17 +0000 and vim/bundle/AutoFenc/.git/index 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/AutoFenc/.git/info' === removed file 'vim/bundle/AutoFenc/.git/info/exclude' --- vim/bundle/AutoFenc/.git/info/exclude 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/.git/info/exclude 1970-01-01 00:00:00 +0000 @@ -1,6 +0,0 @@ -# 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] -# *~ === removed directory 'vim/bundle/AutoFenc/.git/logs' === removed file 'vim/bundle/AutoFenc/.git/logs/HEAD' --- vim/bundle/AutoFenc/.git/logs/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/.git/logs/HEAD 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -0000000000000000000000000000000000000000 8d60f7278a56b5f556bccc0d27ee093af573711f Jan Pobrislo 1470298365 +0200 clone: from https://github.com/s3rvac/AutoFenc === removed directory 'vim/bundle/AutoFenc/.git/logs/refs' === removed directory 'vim/bundle/AutoFenc/.git/logs/refs/heads' === removed file 'vim/bundle/AutoFenc/.git/logs/refs/heads/master' --- vim/bundle/AutoFenc/.git/logs/refs/heads/master 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/.git/logs/refs/heads/master 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -0000000000000000000000000000000000000000 8d60f7278a56b5f556bccc0d27ee093af573711f Jan Pobrislo 1470298365 +0200 clone: from https://github.com/s3rvac/AutoFenc === removed directory 'vim/bundle/AutoFenc/.git/logs/refs/remotes' === removed directory 'vim/bundle/AutoFenc/.git/logs/refs/remotes/origin' === removed file 'vim/bundle/AutoFenc/.git/logs/refs/remotes/origin/HEAD' --- vim/bundle/AutoFenc/.git/logs/refs/remotes/origin/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/.git/logs/refs/remotes/origin/HEAD 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -0000000000000000000000000000000000000000 8d60f7278a56b5f556bccc0d27ee093af573711f Jan Pobrislo 1470298365 +0200 clone: from https://github.com/s3rvac/AutoFenc === removed directory 'vim/bundle/AutoFenc/.git/objects' === removed directory 'vim/bundle/AutoFenc/.git/objects/62' === removed file 'vim/bundle/AutoFenc/.git/objects/62/99c04a956102786acf2b652ec360484dc6c72c' Binary files vim/bundle/AutoFenc/.git/objects/62/99c04a956102786acf2b652ec360484dc6c72c 2016-08-04 08:13:17 +0000 and vim/bundle/AutoFenc/.git/objects/62/99c04a956102786acf2b652ec360484dc6c72c 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/AutoFenc/.git/objects/76' === removed file 'vim/bundle/AutoFenc/.git/objects/76/d380b8fafdb08865b480aff8ee4e1a1b78ee98' Binary files vim/bundle/AutoFenc/.git/objects/76/d380b8fafdb08865b480aff8ee4e1a1b78ee98 2016-08-04 08:13:17 +0000 and vim/bundle/AutoFenc/.git/objects/76/d380b8fafdb08865b480aff8ee4e1a1b78ee98 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/AutoFenc/.git/objects/8d' === removed file 'vim/bundle/AutoFenc/.git/objects/8d/60f7278a56b5f556bccc0d27ee093af573711f' --- vim/bundle/AutoFenc/.git/objects/8d/60f7278a56b5f556bccc0d27ee093af573711f 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/.git/objects/8d/60f7278a56b5f556bccc0d27ee093af573711f 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -x=N0`jbEKqhh%Ǒ<t434JKUDRp"`). - -1.1 (2009-08-16) ----------------- - -* Added three configuration possibilities to disable autodetection for specific - files (based on file size, file type and file path). See script description - for more info. - -1.0.2 (2009-08-11) ------------------- - -* Fixed the XML encoding detection function. -* Minor code and documentation fixes. - -1.0.1 (2009-08-02) ------------------- - -* Encoding autodetection is now performed only if the opened file exists (is - stored somewhere). So, for example, the autodetection is now not performed - when a new file is opened. -* Correctly works with `.viminfo`, where the last cursor position in the file - is stored when exiting the file. In the previous version of this script, this - information was sometimes ignored and the cursor was initially on the very - last line in a file. If the user does not use this `.viminfo` feature (or he - does not use `.viminfo` at all), then the cursor will be initially placed on - the very first line. -* Fixed the implementation of the function which sets the detected - encoding. - -1.0 (2009-07-26) ----------------- - -* Initial release version of this script. === removed file 'vim/bundle/AutoFenc/CONTRIBUTORS.md' --- vim/bundle/AutoFenc/CONTRIBUTORS.md 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/CONTRIBUTORS.md 1970-01-01 00:00:00 +0000 @@ -1,6 +0,0 @@ -Contributors -============ - -* Benjamin Fritz -* Ingo Karkat -* Petr Zemek === removed file 'vim/bundle/AutoFenc/LICENSE' --- vim/bundle/AutoFenc/LICENSE 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/LICENSE 1970-01-01 00:00:00 +0000 @@ -1,280 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS === removed file 'vim/bundle/AutoFenc/README.md' --- vim/bundle/AutoFenc/README.md 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/README.md 1970-01-01 00:00:00 +0000 @@ -1,191 +0,0 @@ -AutoFenc -======== - -A Vim plugin that tries to automatically detect and set file encoding when -opening a file. - -Description ------------ - -This Vim plugin tries to automatically detect and set file encoding when -opening a file. It does this in several possible ways, depending on the -configuration. - -The following methods are implemented. When a method fails, the plugin tries -the next one. - -1. detection of BOM (byte-order-mark) at the beginning of the file, only for - some multibyte encodings -2. HTML way of encoding detection (via the `` tag), only for HTML-based - file types -3. XML way of encoding detection (via the `` declaration), only for - XML-based file types -4. CSS way of encoding detection (via `@charset 'at-rule'`), only for CSS files -5. checks whether the encoding is specified in a comment (like `# Encoding: - latin2`), for all file types -6. tries to detect the encoding via the specified external program (the default - one is [enca](https://github.com/nijel/enca)), for all file types - -If the autodetection fails, it is up to Vim and your configuration to set the -encoding. - -Installation ------------- - -The recommended way of installing this plugin is by using -[Pathogen](https://github.com/tpope/vim-pathogen). - -If you cannot use Pathogen or you want to install this plugin manually, just -put the `plugin/AutoFenc.vim` file into your `$HOME/.vim/plugin` directory -(Linux-like systems) or `%UserProfile%\vimfiles\plugin` folder (Windows -systems). - -Configuration Options ---------------------- - -The plugin has the following configuration options. You can set them in your -`$HOME/.vimrc` file. - -- `g:autofenc_enable` (0 or 1, default 1) - - Enables/disables this plugin. - -- `g:autofenc_emit_messages` (0 or 1, default 0) - - Emits messages about the detected/used encoding or warnings upon opening a - file. - -- `g:autofenc_max_file_size` (number >= 0, default 10485760) - - If the size of a file is higher than this value (in bytes), then the - autodetection will not be performed. - -- `g:autofenc_disable_for_files_matching` (regular expression, see the settings - in `plugin/AutoFenc.vim`) - - If the file (with complete path) matches this regular expression, then the - autodetection will not be performed. It is by default set to disable - autodetection for non-local files (e.g. accessed via ftp or scp) because the - script cannot handle some kind of autodetection for these files. The regular - expression is matched case-sensitively. - -- `g:autofenc_disable_for_file_types` (list of strings, default `[]`) - - If the file type matches some of the filetypes specified in this list, then - the autodetection will not be performed. The comparison is done - case-sensitively. - -- `g:autofenc_autodetect_bom` (0 or 1, default 0 if `ucs-bom` is in - `fileencodings`, 1 otherwise) - - Enables/disables detection of encoding by BOM. - -- `g:autofenc_autodetect_html` (0 or 1, default 1) - - Enables/disables detection of encoding for HTML-based documents. - -- `g:autofenc_autodetect_html_filetypes` (regular expression, see the settings - in `plugin/AutoFenc.vim`) - - Regular expression for all supported HTML file types. - -- `g:autofenc_autodetect_xml` (0 or 1, default 1) - - Enables/disables detection of encoding for XML-based documents. - -- `g:autofenc_autodetect_xml_filetypes` (regular expression, see the settings - in `plugin/AutoFenc.vim`) - - Regular expression for all supported XML file types. - -- `g:autofenc_autodetect_css` (0 or 1, default 1) - - Enables/disables detection of encoding for CSS documents. - -- `g:autofenc_autodetect_css_filetypes` (regular expression, see the settings - in `plugin/AutoFenc.vim`) - - Regular expression for all supported CSS file types. - -- `g:autofenc_autodetect_comment` (0 or 1, default 1) - - Enables/disables detection of encoding in comments. - -- `g:autofenc_autodetect_commentexpr` (regular expression, see the settings in - `plugin/AutoFenc.vim`) - - Pattern for detection of encodings specified in a comment. - -- `g:autofenc_autodetect_num_of_lines` (number >= 0, default 5) - - How many lines from the beginning and from the end of the file should be - searched for the possible encoding declaration. - -- `g:autofenc_autodetect_ext_prog` (0 or 1, default 1) - - Enables/disables detection of encoding via an external program (see - additional settings below). - -- `g:autofenc_ext_prog_path` (string, default `'enca'`) - - Path to the external program. It can be either a relative or absolute path. - The external program can take any number of arguments, but the last one has - to be a path to the file for which the encoding is to be detected (it will be - supplied by this plugin). The output of the program has to be the name of the - encoding in which the file is saved (a string on a single line). - -- `g:autofenc_ext_prog_args` (string, default `'-i'`) - - Additional program arguments (can be none, i.e. `''`). - -- `g:autofenc_ext_prog_unknown_fenc` (string, default `'???'`) - - If the output of the external program is this string, then it means that the - file encoding was not detected successfully. The string has to be - case-sensitive. - -- `g:autofenc_enc_blacklist` (regular expression, default `''`) - - If the detected encoding matches this regular expression, it will be ignored. - -Notes ------ - -This script is by all means NOT perfect, but it works for me and suits my needs -very well, so it might be also useful for you. Your feedback, opinion, -suggestions, bug reports, patches, simply anything you have to say is welcomed! - -There are similar plugins to this one, so if you do not like this one, you can -test these: - -* [FencView.vim](http://www.vim.org/scripts/script.php?script_id=1708): - Mainly supports detection of encodings for asian languages. -* [MultiEnc.vim](http://www.vim.org/scripts/script.php?script_id=1806): - Obsolete, merged with the previous one. -* [charset.vim](http://www.vim.org/scripts/script.php?script_id=199): - Not very complete/correct and last update in 2002. -* [Detect encoding from the charset specified in HTML - files](http://vim.wikia.com/wiki/Detect_encoding_from_the_charset_specified_in_HTML_files): - Same basic ideas but only for HTML files. - -Let me know if there are others and I will add them here. - -License -------- - -Copyright (c) 2009-2016 Petr Zemek - -Distributed under GNU GPLv2: - - This program is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by the Free - Software Foundation, either version 2 of the License, or (at your option) - any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for - more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . === removed directory 'vim/bundle/AutoFenc/plugin' === removed file 'vim/bundle/AutoFenc/plugin/AutoFenc.vim' --- vim/bundle/AutoFenc/plugin/AutoFenc.vim 2016-08-04 08:13:17 +0000 +++ vim/bundle/AutoFenc/plugin/AutoFenc.vim 1970-01-01 00:00:00 +0000 @@ -1,504 +0,0 @@ -" File: AutoFenc.vim -" Brief: Tries to automatically detect file encoding. -" Author: Petr Zemek -" Version: 1.6-dev -" -" Description: -" A Vim plugin that tries to automatically detect and set file encoding when -" opening a file. See https://github.com/s3rvac/AutoFenc for more details. -" -" License: -" Copyright (C) 2009-2016 Petr Zemek -" -" This program is free software: you can redistribute it and/or modify it -" under the terms of the GNU General Public License as published by the Free -" Software Foundation, either version 2 of the License, or (at your option) -" any later version. -" -" This program is distributed in the hope that it will be useful, but WITHOUT -" ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or -" FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for -" more details. -" -" You should have received a copy of the GNU General Public License -" along with this program. If not, see . - -" Check if the plugin was already loaded. Also, die gracefully if the used Vim -" version is too old. -if exists('autofenc_loaded') || v:version < 700 - finish -endif -" Make the loaded variable actually useful by including the version number. -let autofenc_loaded = '1.6-dev' - -" This plugin uses line continuations. -if &cpo =~ 'C' - let s:oldcpo = &cpo - set cpo-=C -endif - -"------------------------------------------------------------------------------- -" Checks whether the selected variable (first parameter) is already set and -" if not, it sets it to the value of the second parameter. -"------------------------------------------------------------------------------- -function s:CheckAndSetVar(var, value) - if !exists(a:var) - exec 'let '.a:var.' = '.string(a:value) - endif -endfunction - -" Configuration options initialization (see the script description for more -" information). -call s:CheckAndSetVar('g:autofenc_enable', 1) -call s:CheckAndSetVar('g:autofenc_emit_messages', 0) -call s:CheckAndSetVar('g:autofenc_max_file_size', 10485760) -call s:CheckAndSetVar('g:autofenc_disable_for_files_matching', '^[-_a-zA-Z0-9]\+://') -call s:CheckAndSetVar('g:autofenc_disable_for_file_types', []) -call s:CheckAndSetVar('g:autofenc_autodetect_bom', (&fileencodings !~# 'ucs-bom')) -call s:CheckAndSetVar('g:autofenc_autodetect_html', 1) -call s:CheckAndSetVar('g:autofenc_autodetect_html_filetypes', '^\(html.*\|xhtml\|aspperl\|aspvbs\|cf\|dtml\|gsp\|jsp\|mason\|php\|plp\|smarty\|spyce\|webmacro\)$') -call s:CheckAndSetVar('g:autofenc_autodetect_xml', 1) -call s:CheckAndSetVar('g:autofenc_autodetect_xml_filetypes', '^\(xml\|xquery\|xsd\|xslt\?\|ant\|dsl\|mxml\|svg\|wsh\|xbl\)$') -call s:CheckAndSetVar('g:autofenc_autodetect_css', 1) -call s:CheckAndSetVar('g:autofenc_autodetect_css_filetypes', '^\(css\|sass\)$') -call s:CheckAndSetVar('g:autofenc_autodetect_comment', 1) -call s:CheckAndSetVar('g:autofenc_autodetect_commentexpr', '\c^.*\<\(\(\(file\)\?en\)\?coding\|charset\)\s*[:=]\?\s*\<\zs[-A-Za-z0-9_]\+') -call s:CheckAndSetVar('g:autofenc_autodetect_num_of_lines', 5) -call s:CheckAndSetVar('g:autofenc_autodetect_ext_prog', 1) -call s:CheckAndSetVar('g:autofenc_ext_prog_path', 'enca') -call s:CheckAndSetVar('g:autofenc_ext_prog_args', '-i') -call s:CheckAndSetVar('g:autofenc_ext_prog_unknown_fenc', '???') -call s:CheckAndSetVar('g:autofenc_enc_blacklist', '') - -"------------------------------------------------------------------------------- -" Normalizes the selected encoding and returns it, so it can be safely used as -" a new encoding. This function should be called before a new encoding is set. -"------------------------------------------------------------------------------- -function s:NormalizeEncoding(enc) - let nenc = tolower(a:enc) - - " The recent versions of the TOhtml runtime plugin have some nice charset - " to encoding functions which even allow user overrides. Use them if - " available. - let nenc2 = "" - silent! let nenc2 = tohtml#EncodingFromCharset(nenc) - if nenc2 != "" - return nenc2 - " If the TOhtml function is unavailable, at least handle some canonical - " encoding names in Vim. - elseif nenc =~ 'iso[-_]8859-1' - return 'latin1' - elseif nenc =~ 'iso[-_]8859-2' - return 'latin2' - elseif nenc ==? 'gb2312' - return 'cp936' " GB2312 imprecisely means CP936 in HTML - elseif nenc =~ '\(cp\|win\(dows\)\?\)-125\d' - return 'cp125'.nenc[strlen(nenc)-1] - elseif nenc == 'utf8' - return 'utf-8' - elseif g:autofenc_emit_messages && nenc !~ '^\%(8bit-\|2byte-\)\?\%(latin[12]\|utf-8\|utf-16\%(le\)\?\|ucs-[24]\%(le\)\?\|iso-8859-\d\{1,2}\|cp\d\{3,4}\)$' - echomsg 'AutoFenc: Detected unrecognized charset, trying fenc='.nenc - endif - - return nenc -endfunction - -"------------------------------------------------------------------------------- -" Sets the selected file encoding. Returns 1 if the file was reloaded, -" 0 otherwise. -"------------------------------------------------------------------------------- -function s:SetFileEncoding(enc) - let nenc = s:NormalizeEncoding(a:enc) - - " Check whether we're not trying to set the current file encoding. - if nenc != "" && nenc !=? &fenc - if exists('&autochdir') && &autochdir - " Other autocmds may have changed the window's working directory; - " when 'autochdir' is set, the :edit will reset that, so - " temporarily disable the setting. - let old_autochdir = &autochdir - set noautochdir - endif - try - " Set the file encoding and reload it, keeping any user-specified - " fileformat, and keeping any bad bytes in case the header is wrong - " (this won't let the user save if a conversion error happened on - " read). - exec 'edit ++enc='.nenc.' ++ff='.&ff.' ++bad=keep' - finally - if exists('old_autochdir') - let &autochdir = old_autochdir - endif - endtry - - " The file was reloaded. - return 1 - else - " The file was not reloaded. - return 0 - endif -endfunction - -"------------------------------------------------------------------------------- -" Tries to detect a BOM (byte order mark) at the beginning of the file to -" detect multibyte encodings. If there is a BOM, it returns the appropriate -" encoding, otherwise the empty string is returned. -"------------------------------------------------------------------------------- -function s:BOMEncodingDetection() - " The implementation of this function is based on a part of the - " FencsView.vim plugin by Ming Bai - " (http://www.vim.org/scripts/script.php?script_id=1708). - - " Get the first line of the file. - let file_content = readfile(expand('%:p'), 'b', 1) - if file_content == [] - " Empty file - return '' - endif - let first_line = file_content[0] - - " Check whether it contains BOM and if so, return appropriate encoding. - " Note: If the index is out of bounds, ahx is set to '' automatically. - let ah1 = first_line[0] - let ah2 = first_line[1] - let ah3 = first_line[2] - let ah4 = first_line[3] - " TODO: I don't know why but if there is a NUL byte, the char2nr() function - " transforms it to a newline (0x0A) instead of 0x00... - let a1 = char2nr(ah1) == 0x0A ? 0x00 : char2nr(ah1) - let a2 = char2nr(ah2) == 0x0A ? 0x00 : char2nr(ah2) - let a3 = char2nr(ah3) == 0x0A ? 0x00 : char2nr(ah3) - let a4 = char2nr(ah4) == 0x0A ? 0x00 : char2nr(ah4) - if a1.a2.a3.a4 == 0x00.0x00.0xfe.0xff - return 'utf-32' - elseif a1.a2.a3.a4 == 0xff.0xfe.0x00.0x00 - return 'utf-32le' - elseif a1.a2.a3 == 0xef.0xbb.0xbf - return 'utf-8' - elseif a1.a2 == 0xfe.0xff - return 'utf-16' - elseif a1.a2 == 0xff.0xfe - return 'utf-16le' - endif - - " There was no legal BOM. - return '' -endfunction - -"------------------------------------------------------------------------------- -" Tries the HTML way of encoding detection of the current file and returns the -" detected encoding (or the empty string, if the encoding was not detected). -"------------------------------------------------------------------------------- -function s:HTMLEncodingDetection() - " This method is based on the meta tag in the head of the HTML document - " () - - " Store the actual position in the file and move to the very first line in - " the file. - let curpos=getpos('.') - keepjumps 1 - - let enc = '' - - let charset_line = search('\c skipping" - endif - return '' - endif - - " Get full path of the currently edited file. - let file_path = expand('%:p') - - " Create the complete external program command by appending program - " arguments and the current file path to the external program. - let ext_prog_cmd = g:autofenc_ext_prog_path.' '.g:autofenc_ext_prog_args.' '.s:SafeShellescape(file_path) - - " Run it to get the encoding. - let enc = system(ext_prog_cmd) - if v:shell_error != 0 - " An error occurred. - if g:autofenc_emit_messages - echomsg "AutoFenc: Command `".ext_prog_cmd."` failed with error code ".v:shell_error." -> skipping" - endif - return '' - endif - - " Remove trailing newline from the output (system() removes any \r from - " the result automatically). - let enc = substitute(enc, '\n', '', '') - - if enc != g:autofenc_ext_prog_unknown_fenc - " The encoding was (probably) detected successfully. - return enc - endif - - return '' -endfunction - -"------------------------------------------------------------------------------- -" Tries to detect encoding of the current file via several ways (according -" to the configuration) and returns it. If the encoding was not detected -" successfully, it returns the empty string - this can happen because: -" - the file is in unknown encoding -" - the file is not stored anywhere (e.g. a new file was opened) -" - autodetection is disabled for this file (either the file is too large -" or autodetection is disabled for this file, see configuration) -"------------------------------------------------------------------------------- -function s:DetectFileEncoding() - " Check whether the autodetection should be performed (see function - " description for more information). - let file_path = expand('%:p') - let file_size = getfsize(file_path) - if file_path == '' || - \ file_size > g:autofenc_max_file_size || file_size < 0 || - \ file_path =~ g:autofenc_disable_for_files_matching || - \ index(g:autofenc_disable_for_file_types, &ft, 0, 1) != -1 - return '' - endif - - " BOM encoding detection. - if g:autofenc_autodetect_bom - let enc = s:BOMEncodingDetection() - if enc != '' - return enc - endif - endif - - " HTML encoding detection. - if g:autofenc_autodetect_html && &filetype =~? g:autofenc_autodetect_html_filetypes - let enc = s:HTMLEncodingDetection() - if enc != '' - return enc - endif - endif - - " XML encoding detection. - if g:autofenc_autodetect_xml && &filetype =~? g:autofenc_autodetect_xml_filetypes - let enc = s:XMLEncodingDetection() - if enc != '' - return enc - endif - endif - - " CSS encoding detection. - if g:autofenc_autodetect_css && &filetype =~? g:autofenc_autodetect_css_filetypes - let enc = s:CSSEncodingDetection() - if enc != '' - return enc - endif - endif - - " Comment encoding detection. - if g:autofenc_autodetect_comment - let enc = s:CommentEncodingDetection() - if enc != '' - return enc - endif - endif - - " External program encoding detection. - if g:autofenc_autodetect_ext_prog - let enc = s:ExtProgEncodingDetection() - if enc != '' - return enc - endif - endif - - " The encoding was not detected. - return '' -endfunction - -"------------------------------------------------------------------------------- -" Main plugin function. Tries to autodetect the correct file encoding and sets -" the detected one (if any). If the ASCII encoding is detected, it does nothing -" so allow Vim to set its internal encoding instead. -"------------------------------------------------------------------------------- -function s:DetectAndSetFileEncoding() - let enc = s:DetectFileEncoding() - - " Don't call again on the nested trigger from the edit. - let b:autofenc_done = enc - - if (enc != '') && (enc !=? 'ascii') && - \ (g:autofenc_enc_blacklist == '' || enc !~? g:autofenc_enc_blacklist) - if s:SetFileEncoding(enc) - if g:autofenc_emit_messages - echomsg "AutoFenc: Detected [".enc."] from file, loaded with fenc=".&fenc - endif - endif - endif -endfunction - -" Set the detected file encoding. -if g:autofenc_enable - augroup AutoFenc - au! - " We need to check that we're not in the middle of a reload due to this - " plugin otherwise can recurse forever. But unlet the variable to allow - " re-detection on the next read of this buffer if it is just unloaded. - au BufRead * nested - \ if !exists('b:autofenc_done') | - \ if v:cmdarg !~ '++enc' | - \ call s:DetectAndSetFileEncoding() | - \ endif | - \ else | - \ unlet b:autofenc_done | - \ endif - augroup END -endif - -" Restore line continuations (and the rest of &cpo) when done. -if exists('s:oldcpo') - let &cpo = s:oldcpo - unlet s:oldcpo -endif - -" vim: noet === modified file 'vim/bundle/Insertlessly/.git/config' (properties changed: -x to +x) === modified file 'vim/bundle/Insertlessly/.git/hooks/applypatch-msg.sample' --- vim/bundle/Insertlessly/.git/hooks/applypatch-msg.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/Insertlessly/.git/hooks/applypatch-msg.sample 2014-02-24 23:42:31 +0000 @@ -10,6 +10,6 @@ # To enable this hook, rename this file to "applypatch-msg". . git-sh-setup -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} : === modified file 'vim/bundle/Insertlessly/.git/hooks/pre-applypatch.sample' --- vim/bundle/Insertlessly/.git/hooks/pre-applypatch.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/Insertlessly/.git/hooks/pre-applypatch.sample 2014-02-24 23:42:31 +0000 @@ -9,6 +9,6 @@ # To enable this hook, rename this file to "pre-applypatch". . git-sh-setup -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} : === modified file 'vim/bundle/Insertlessly/.git/hooks/pre-push.sample' --- vim/bundle/Insertlessly/.git/hooks/pre-push.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/Insertlessly/.git/hooks/pre-push.sample 2015-08-25 11:20:35 +0000 @@ -24,6 +24,7 @@ z40=0000000000000000000000000000000000000000 +IFS=' ' while read local_ref local_sha remote_ref remote_sha do if [ "$local_sha" = $z40 ] === modified file 'vim/bundle/Insertlessly/.git/hooks/update.sample' --- vim/bundle/Insertlessly/.git/hooks/update.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/Insertlessly/.git/hooks/update.sample 2014-02-24 23:42:31 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# An example hook script to block unannotated tags from entering. +# 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". === modified file 'vim/bundle/Insertlessly/.git/index' Binary files vim/bundle/Insertlessly/.git/index 2016-08-04 08:13:17 +0000 and vim/bundle/Insertlessly/.git/index 2015-08-25 11:20:35 +0000 differ === modified file 'vim/bundle/Insertlessly/.git/logs/HEAD' --- vim/bundle/Insertlessly/.git/logs/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/Insertlessly/.git/logs/HEAD 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 0e7e25186de5c3ddba6807c7538ffbb9518add06 Jan Pobrislo 1470298366 +0200 clone: from https://github.com/dahu/Insertlessly +0000000000000000000000000000000000000000 6b04048da9bbbe53466ba9e8860a1911f1685d1d Jan Pobrislo 1440501494 +0200 clone: from https://github.com/dahu/Insertlessly === modified file 'vim/bundle/Insertlessly/.git/logs/refs/heads/master' --- vim/bundle/Insertlessly/.git/logs/refs/heads/master 2016-08-04 08:13:17 +0000 +++ vim/bundle/Insertlessly/.git/logs/refs/heads/master 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 0e7e25186de5c3ddba6807c7538ffbb9518add06 Jan Pobrislo 1470298366 +0200 clone: from https://github.com/dahu/Insertlessly +0000000000000000000000000000000000000000 6b04048da9bbbe53466ba9e8860a1911f1685d1d Jan Pobrislo 1440501494 +0200 clone: from https://github.com/dahu/Insertlessly === modified file 'vim/bundle/Insertlessly/.git/logs/refs/remotes/origin/HEAD' --- vim/bundle/Insertlessly/.git/logs/refs/remotes/origin/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/Insertlessly/.git/logs/refs/remotes/origin/HEAD 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 0e7e25186de5c3ddba6807c7538ffbb9518add06 Jan Pobrislo 1470298366 +0200 clone: from https://github.com/dahu/Insertlessly +0000000000000000000000000000000000000000 6b04048da9bbbe53466ba9e8860a1911f1685d1d Jan Pobrislo 1440501494 +0200 clone: from https://github.com/dahu/Insertlessly === removed directory 'vim/bundle/Insertlessly/.git/objects/0e' === removed file 'vim/bundle/Insertlessly/.git/objects/0e/7e25186de5c3ddba6807c7538ffbb9518add06' Binary files vim/bundle/Insertlessly/.git/objects/0e/7e25186de5c3ddba6807c7538ffbb9518add06 2016-08-04 08:13:17 +0000 and vim/bundle/Insertlessly/.git/objects/0e/7e25186de5c3ddba6807c7538ffbb9518add06 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/Insertlessly/.git/objects/46' === removed file 'vim/bundle/Insertlessly/.git/objects/46/da9ad16f74f4f413275fdd39466d635fce7d19' Binary files vim/bundle/Insertlessly/.git/objects/46/da9ad16f74f4f413275fdd39466d635fce7d19 2016-08-04 08:13:17 +0000 and vim/bundle/Insertlessly/.git/objects/46/da9ad16f74f4f413275fdd39466d635fce7d19 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/Insertlessly/.git/objects/67' === added file 'vim/bundle/Insertlessly/.git/objects/67/45a6234878c511489f4b9f8665ef421961a9f5' Binary files vim/bundle/Insertlessly/.git/objects/67/45a6234878c511489f4b9f8665ef421961a9f5 1970-01-01 00:00:00 +0000 and vim/bundle/Insertlessly/.git/objects/67/45a6234878c511489f4b9f8665ef421961a9f5 2015-08-25 11:20:35 +0000 differ === removed directory 'vim/bundle/Insertlessly/.git/objects/68' === removed file 'vim/bundle/Insertlessly/.git/objects/68/65d3a5a931e6b1353c7b5ed0929fdb96f382a6' Binary files vim/bundle/Insertlessly/.git/objects/68/65d3a5a931e6b1353c7b5ed0929fdb96f382a6 2016-08-04 08:13:17 +0000 and vim/bundle/Insertlessly/.git/objects/68/65d3a5a931e6b1353c7b5ed0929fdb96f382a6 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/Insertlessly/.git/objects/6b' === added file 'vim/bundle/Insertlessly/.git/objects/6b/04048da9bbbe53466ba9e8860a1911f1685d1d' Binary files vim/bundle/Insertlessly/.git/objects/6b/04048da9bbbe53466ba9e8860a1911f1685d1d 1970-01-01 00:00:00 +0000 and vim/bundle/Insertlessly/.git/objects/6b/04048da9bbbe53466ba9e8860a1911f1685d1d 2015-08-25 11:20:35 +0000 differ === removed directory 'vim/bundle/Insertlessly/.git/objects/82' === removed file 'vim/bundle/Insertlessly/.git/objects/82/1459efde45f894162144b0d8051f6dd2a3983b' Binary files vim/bundle/Insertlessly/.git/objects/82/1459efde45f894162144b0d8051f6dd2a3983b 2016-08-04 08:13:17 +0000 and vim/bundle/Insertlessly/.git/objects/82/1459efde45f894162144b0d8051f6dd2a3983b 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/Insertlessly/.git/objects/9c' === removed file 'vim/bundle/Insertlessly/.git/objects/9c/d2e09cc12dfeb3283f31725afe1337d1008c75' Binary files vim/bundle/Insertlessly/.git/objects/9c/d2e09cc12dfeb3283f31725afe1337d1008c75 2016-08-04 08:13:17 +0000 and vim/bundle/Insertlessly/.git/objects/9c/d2e09cc12dfeb3283f31725afe1337d1008c75 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/Insertlessly/.git/objects/b2' === removed file 'vim/bundle/Insertlessly/.git/objects/b2/79b31af5785219b3cd328209f0366e5c9f3b21' Binary files vim/bundle/Insertlessly/.git/objects/b2/79b31af5785219b3cd328209f0366e5c9f3b21 2016-08-04 08:13:17 +0000 and vim/bundle/Insertlessly/.git/objects/b2/79b31af5785219b3cd328209f0366e5c9f3b21 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/Insertlessly/.git/objects/be' === added file 'vim/bundle/Insertlessly/.git/objects/be/a677c7d83f503ec546dbb2d0e90e3b727fe6cd' Binary files vim/bundle/Insertlessly/.git/objects/be/a677c7d83f503ec546dbb2d0e90e3b727fe6cd 1970-01-01 00:00:00 +0000 and vim/bundle/Insertlessly/.git/objects/be/a677c7d83f503ec546dbb2d0e90e3b727fe6cd 2015-08-25 11:20:35 +0000 differ === added directory 'vim/bundle/Insertlessly/.git/objects/d8' === added file 'vim/bundle/Insertlessly/.git/objects/d8/4b8efe68d70c6b9f705f7fcfd4af4730feec06' Binary files vim/bundle/Insertlessly/.git/objects/d8/4b8efe68d70c6b9f705f7fcfd4af4730feec06 1970-01-01 00:00:00 +0000 and vim/bundle/Insertlessly/.git/objects/d8/4b8efe68d70c6b9f705f7fcfd4af4730feec06 2015-08-25 11:20:35 +0000 differ === modified file 'vim/bundle/Insertlessly/.git/packed-refs' --- vim/bundle/Insertlessly/.git/packed-refs 2016-08-04 08:13:17 +0000 +++ vim/bundle/Insertlessly/.git/packed-refs 2015-08-25 11:20:35 +0000 @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled -0e7e25186de5c3ddba6807c7538ffbb9518add06 refs/remotes/origin/master +6b04048da9bbbe53466ba9e8860a1911f1685d1d refs/remotes/origin/master === modified file 'vim/bundle/Insertlessly/.git/refs/heads/master' --- vim/bundle/Insertlessly/.git/refs/heads/master 2016-08-04 08:13:17 +0000 +++ vim/bundle/Insertlessly/.git/refs/heads/master 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0e7e25186de5c3ddba6807c7538ffbb9518add06 +6b04048da9bbbe53466ba9e8860a1911f1685d1d === modified file 'vim/bundle/Insertlessly/.git/shallow' --- vim/bundle/Insertlessly/.git/shallow 2016-08-04 08:13:17 +0000 +++ vim/bundle/Insertlessly/.git/shallow 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0e7e25186de5c3ddba6807c7538ffbb9518add06 +6b04048da9bbbe53466ba9e8860a1911f1685d1d === removed directory 'vim/bundle/Insertlessly/autoload' === removed file 'vim/bundle/Insertlessly/autoload/insertlessly.vim' --- vim/bundle/Insertlessly/autoload/insertlessly.vim 2016-08-04 08:13:17 +0000 +++ vim/bundle/Insertlessly/autoload/insertlessly.vim 1970-01-01 00:00:00 +0000 @@ -1,15 +0,0 @@ -function! insertlessly#cleanup_all_whitespace() - let pos = getpos('.') - let markpos = [ getpos("'["), getpos("']") ] - silent! keeppatterns %s/\s\+$// - " call histdel("search", -1) - call setpos('.', pos) - call setpos("'[", markpos[0]) - call setpos("']", markpos[1]) -endfunction - -function! insertlessly#cleanup_line() - let lines = getline("'[", "']") - call setline(line("'["), - \ map(lines, "substitute(v:val, '\\s\\+$', '', '')")) -endfunction === modified file 'vim/bundle/Insertlessly/plugin/insertlessly.vim' --- vim/bundle/Insertlessly/plugin/insertlessly.vim 2016-08-04 08:13:17 +0000 +++ vim/bundle/Insertlessly/plugin/insertlessly.vim 2015-08-25 11:20:35 +0000 @@ -149,15 +149,19 @@ endfunction function! s:Insertlessly_LeaveInsert() - augroup InsertlesslyCleanup - au! - au CursorMoved,CursorHold * call s:CleanupAllWhitespace() | call s:AdjustCursor() | au! InsertlesslyCleanup - augroup END + call s:CleanupAllWhitespace() + call s:AdjustCursor() endfunction function! s:CleanupAllWhitespace() if g:insertlessly_cleanup_all_ws != 0 - call insertlessly#cleanup_all_whitespace() + let pos = getpos('.') + let markpos = [ getpos("'["), getpos("']") ] + silent! %s/\s\+$// + call histdel("search", -1) + call setpos('.', pos) + call setpos("'[", markpos[0]) + call setpos("']", markpos[1]) else call s:CleanupLine() endif @@ -165,7 +169,9 @@ function! s:CleanupLine() if g:insertlessly_cleanup_trailing_ws != 0 - call insertlessly#cleanup_line() + let lines = getline("'[", "']") + call setline(line("'["), + \ map(lines, "substitute(v:val, '\\s\\+$', '', '')")) endif endfunction === removed directory 'vim/bundle/vim-bracketed-paste' === removed directory 'vim/bundle/vim-bracketed-paste/.git' === removed file 'vim/bundle/vim-bracketed-paste/.git/HEAD' --- vim/bundle/vim-bracketed-paste/.git/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/HEAD 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -ref: refs/heads/master === removed file 'vim/bundle/vim-bracketed-paste/.git/config' --- vim/bundle/vim-bracketed-paste/.git/config 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/config 1970-01-01 00:00:00 +0000 @@ -1,11 +0,0 @@ -[core] - repositoryformatversion = 0 - filemode = true - bare = false - logallrefupdates = true -[remote "origin"] - url = https://github.com/ConradIrwin/vim-bracketed-paste - fetch = +refs/heads/master:refs/remotes/origin/master -[branch "master"] - remote = origin - merge = refs/heads/master === removed file 'vim/bundle/vim-bracketed-paste/.git/description' --- vim/bundle/vim-bracketed-paste/.git/description 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/description 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -Unnamed repository; edit this file 'description' to name the repository. === removed directory 'vim/bundle/vim-bracketed-paste/.git/hooks' === removed file 'vim/bundle/vim-bracketed-paste/.git/hooks/applypatch-msg.sample' --- vim/bundle/vim-bracketed-paste/.git/hooks/applypatch-msg.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/hooks/applypatch-msg.sample 1970-01-01 00:00:00 +0000 @@ -1,15 +0,0 @@ -#!/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 -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} -: === removed file 'vim/bundle/vim-bracketed-paste/.git/hooks/commit-msg.sample' --- vim/bundle/vim-bracketed-paste/.git/hooks/commit-msg.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/hooks/commit-msg.sample 1970-01-01 00:00:00 +0000 @@ -1,24 +0,0 @@ -#!/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 -} === removed file 'vim/bundle/vim-bracketed-paste/.git/hooks/post-update.sample' --- vim/bundle/vim-bracketed-paste/.git/hooks/post-update.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/hooks/post-update.sample 1970-01-01 00:00:00 +0000 @@ -1,8 +0,0 @@ -#!/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 === removed file 'vim/bundle/vim-bracketed-paste/.git/hooks/pre-applypatch.sample' --- vim/bundle/vim-bracketed-paste/.git/hooks/pre-applypatch.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/hooks/pre-applypatch.sample 1970-01-01 00:00:00 +0000 @@ -1,14 +0,0 @@ -#!/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 -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} -: === removed file 'vim/bundle/vim-bracketed-paste/.git/hooks/pre-commit.sample' --- vim/bundle/vim-bracketed-paste/.git/hooks/pre-commit.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/hooks/pre-commit.sample 1970-01-01 00:00:00 +0000 @@ -1,49 +0,0 @@ -#!/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 -- === removed file 'vim/bundle/vim-bracketed-paste/.git/hooks/pre-push.sample' --- vim/bundle/vim-bracketed-paste/.git/hooks/pre-push.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/hooks/pre-push.sample 1970-01-01 00:00:00 +0000 @@ -1,53 +0,0 @@ -#!/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 - -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 >&2 "Found WIP commit in $local_ref, not pushing" - exit 1 - fi - fi -done - -exit 0 === removed file 'vim/bundle/vim-bracketed-paste/.git/hooks/pre-rebase.sample' --- vim/bundle/vim-bracketed-paste/.git/hooks/pre-rebase.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/hooks/pre-rebase.sample 1970-01-01 00:00:00 +0000 @@ -1,169 +0,0 @@ -#!/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 - -exit 0 - -################################################################ - -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". === removed file 'vim/bundle/vim-bracketed-paste/.git/hooks/prepare-commit-msg.sample' --- vim/bundle/vim-bracketed-paste/.git/hooks/prepare-commit-msg.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/hooks/prepare-commit-msg.sample 1970-01-01 00:00:00 +0000 @@ -1,36 +0,0 @@ -#!/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" === removed file 'vim/bundle/vim-bracketed-paste/.git/hooks/update.sample' --- vim/bundle/vim-bracketed-paste/.git/hooks/update.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/hooks/update.sample 1970-01-01 00:00:00 +0000 @@ -1,128 +0,0 @@ -#!/bin/sh -# -# An example hook script to block 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 === removed file 'vim/bundle/vim-bracketed-paste/.git/index' Binary files vim/bundle/vim-bracketed-paste/.git/index 2016-08-04 08:13:17 +0000 and vim/bundle/vim-bracketed-paste/.git/index 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-bracketed-paste/.git/info' === removed file 'vim/bundle/vim-bracketed-paste/.git/info/exclude' --- vim/bundle/vim-bracketed-paste/.git/info/exclude 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/info/exclude 1970-01-01 00:00:00 +0000 @@ -1,6 +0,0 @@ -# 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] -# *~ === removed directory 'vim/bundle/vim-bracketed-paste/.git/logs' === removed file 'vim/bundle/vim-bracketed-paste/.git/logs/HEAD' --- vim/bundle/vim-bracketed-paste/.git/logs/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/logs/HEAD 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -0000000000000000000000000000000000000000 765e757dbcd05bc9d33debc3e9cab8bda9dabdbf Jan Pobrislo 1470298367 +0200 clone: from https://github.com/ConradIrwin/vim-bracketed-paste === removed directory 'vim/bundle/vim-bracketed-paste/.git/logs/refs' === removed directory 'vim/bundle/vim-bracketed-paste/.git/logs/refs/heads' === removed file 'vim/bundle/vim-bracketed-paste/.git/logs/refs/heads/master' --- vim/bundle/vim-bracketed-paste/.git/logs/refs/heads/master 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/logs/refs/heads/master 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -0000000000000000000000000000000000000000 765e757dbcd05bc9d33debc3e9cab8bda9dabdbf Jan Pobrislo 1470298367 +0200 clone: from https://github.com/ConradIrwin/vim-bracketed-paste === removed directory 'vim/bundle/vim-bracketed-paste/.git/logs/refs/remotes' === removed directory 'vim/bundle/vim-bracketed-paste/.git/logs/refs/remotes/origin' === removed file 'vim/bundle/vim-bracketed-paste/.git/logs/refs/remotes/origin/HEAD' --- vim/bundle/vim-bracketed-paste/.git/logs/refs/remotes/origin/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/logs/refs/remotes/origin/HEAD 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -0000000000000000000000000000000000000000 765e757dbcd05bc9d33debc3e9cab8bda9dabdbf Jan Pobrislo 1470298367 +0200 clone: from https://github.com/ConradIrwin/vim-bracketed-paste === removed directory 'vim/bundle/vim-bracketed-paste/.git/objects' === removed directory 'vim/bundle/vim-bracketed-paste/.git/objects/0c' === removed file 'vim/bundle/vim-bracketed-paste/.git/objects/0c/15ddb3fae833ee71dee2d47fcfa34652aa5dae' Binary files vim/bundle/vim-bracketed-paste/.git/objects/0c/15ddb3fae833ee71dee2d47fcfa34652aa5dae 2016-08-04 08:13:17 +0000 and vim/bundle/vim-bracketed-paste/.git/objects/0c/15ddb3fae833ee71dee2d47fcfa34652aa5dae 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-bracketed-paste/.git/objects/76' === removed file 'vim/bundle/vim-bracketed-paste/.git/objects/76/5e757dbcd05bc9d33debc3e9cab8bda9dabdbf' Binary files vim/bundle/vim-bracketed-paste/.git/objects/76/5e757dbcd05bc9d33debc3e9cab8bda9dabdbf 2016-08-04 08:13:17 +0000 and vim/bundle/vim-bracketed-paste/.git/objects/76/5e757dbcd05bc9d33debc3e9cab8bda9dabdbf 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-bracketed-paste/.git/objects/96' === removed file 'vim/bundle/vim-bracketed-paste/.git/objects/96/0600415e7de02236482b04946b9aa377af8d07' --- vim/bundle/vim-bracketed-paste/.git/objects/96/0600415e7de02236482b04946b9aa377af8d07 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/objects/96/0600415e7de02236482b04946b9aa377af8d07 1970-01-01 00:00:00 +0000 @@ -1,5 +0,0 @@ -xS]o@3bڑ -d'kR"!M#%:;zw"Eqq{3sKRh:yWFȔ, cyhҭGSYkԆKd: YP1*KqagP\kXfW'Wԓk٠id٪aEu5#ȜMt0ƔPhg@$4S0Q8K,Z(lb6,#dɘuE[6 Iv) /*%Khpj dw\"}) Q\ ;QMmgTyJ0Aj -1eqV!#ތLع?o9_Ŏ[rŇsS438kn>?;)6nS@`` b3jڍ9_!) U_Sy|<8y38 -%߰Z (BS+lw AKM/n]K[ys܋)vcv<ɺͦqlLl8g!~F* Q7W?^%CĆkFyEVٜ8=c) !t {K^}HаR^t9M߆mTJYZ -<0 \ No newline at end of file === removed directory 'vim/bundle/vim-bracketed-paste/.git/objects/9a' === removed file 'vim/bundle/vim-bracketed-paste/.git/objects/9a/3597d5eb603810230e06c4c1945390ea1ea23d' --- vim/bundle/vim-bracketed-paste/.git/objects/9a/3597d5eb603810230e06c4c1945390ea1ea23d 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/objects/9a/3597d5eb603810230e06c4c1945390ea1ea23d 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -x+)JMU01g040031QH*JLN-IM-H,.I+eW@CeJ{Q \ No newline at end of file === removed directory 'vim/bundle/vim-bracketed-paste/.git/objects/a5' === removed file 'vim/bundle/vim-bracketed-paste/.git/objects/a5/be980b87d3a68a35728a30a128ed71fc85cffa' Binary files vim/bundle/vim-bracketed-paste/.git/objects/a5/be980b87d3a68a35728a30a128ed71fc85cffa 2016-08-04 08:13:17 +0000 and vim/bundle/vim-bracketed-paste/.git/objects/a5/be980b87d3a68a35728a30a128ed71fc85cffa 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-bracketed-paste/.git/objects/info' === removed directory 'vim/bundle/vim-bracketed-paste/.git/objects/pack' === removed file 'vim/bundle/vim-bracketed-paste/.git/packed-refs' --- vim/bundle/vim-bracketed-paste/.git/packed-refs 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/packed-refs 1970-01-01 00:00:00 +0000 @@ -1,2 +0,0 @@ -# pack-refs with: peeled fully-peeled -765e757dbcd05bc9d33debc3e9cab8bda9dabdbf refs/remotes/origin/master === removed directory 'vim/bundle/vim-bracketed-paste/.git/refs' === removed directory 'vim/bundle/vim-bracketed-paste/.git/refs/heads' === removed file 'vim/bundle/vim-bracketed-paste/.git/refs/heads/master' --- vim/bundle/vim-bracketed-paste/.git/refs/heads/master 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/refs/heads/master 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -765e757dbcd05bc9d33debc3e9cab8bda9dabdbf === removed directory 'vim/bundle/vim-bracketed-paste/.git/refs/remotes' === removed directory 'vim/bundle/vim-bracketed-paste/.git/refs/remotes/origin' === removed file 'vim/bundle/vim-bracketed-paste/.git/refs/remotes/origin/HEAD' --- vim/bundle/vim-bracketed-paste/.git/refs/remotes/origin/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/refs/remotes/origin/HEAD 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -ref: refs/remotes/origin/master === removed file 'vim/bundle/vim-bracketed-paste/.git/shallow' --- vim/bundle/vim-bracketed-paste/.git/shallow 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/.git/shallow 1970-01-01 00:00:00 +0000 @@ -1,1 +0,0 @@ -765e757dbcd05bc9d33debc3e9cab8bda9dabdbf === removed file 'vim/bundle/vim-bracketed-paste/README.md' --- vim/bundle/vim-bracketed-paste/README.md 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/README.md 1970-01-01 00:00:00 +0000 @@ -1,25 +0,0 @@ -vim-bracketed-paste enables transparent pasting into vim. (i.e. no more `:set paste!`) - -Installation -============ - -I recommend using [pathogen](https://github.com/tpope/pathogen). Once you have installed pathogen: - -```bash -cd ~/.vim/bundle -git clone https://github.com/ConradIrwin/vim-bracketed-paste -``` - -Otherwise just copy-paste everything from [plugin/bracketed-paste.vim](https://github.com/ConradIrwin/vim-bracketed-paste/blob/master/plugin/bracketed-paste.vim) into your `~/.vimrc`. - -Usage -===== - -You need to be using a modern xterm-compatible terminal emulator that supports [bracketed paste mode](http://cirw.in/blog/bracketed-paste). xterm, urxvt, iTerm2, gnome-terminal (and other terminals using libvte) are known to work. - -Then whenever you are in the *insert mode* and paste into your terminal emulator using `command+v`, `shift+insert`, `ctrl+shift+v` or `middle-click`, vim will automatically `:set paste` for you. - -Credit -====== - -The code for this plugin was taken from Chis Page's answer to a [StackOverflow question](http://stackoverflow.com/questions/5585129/pasting-code-into-terminal-window-into-vim-on-mac-os-x), I just packaged it. === removed directory 'vim/bundle/vim-bracketed-paste/plugin' === removed file 'vim/bundle/vim-bracketed-paste/plugin/bracketed-paste.vim' --- vim/bundle/vim-bracketed-paste/plugin/bracketed-paste.vim 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-bracketed-paste/plugin/bracketed-paste.vim 1970-01-01 00:00:00 +0000 @@ -1,42 +0,0 @@ -" Code from: -" http://stackoverflow.com/questions/5585129/pasting-code-into-terminal-window-into-vim-on-mac-os-x -" then https://coderwall.com/p/if9mda -" and then https://github.com/aaronjensen/vimfiles/blob/59a7019b1f2d08c70c28a41ef4e2612470ea0549/plugin/terminaltweaks.vim -" to fix the escape time problem with insert mode. -" -" Docs on bracketed paste mode: -" http://www.xfree86.org/current/ctlseqs.html -" Docs on mapping fast escape codes in vim -" http://vim.wikia.com/wiki/Mapping_fast_keycodes_in_terminal_Vim - -if !exists("g:bracketed_paste_tmux_wrap") - let g:bracketed_paste_tmux_wrap = 1 -endif - -function! WrapForTmux(s) - if !g:bracketed_paste_tmux_wrap || !exists('$TMUX') || system('tmux -V')[5] >= '2' - return a:s - endif - - let tmux_start = "\Ptmux;" - let tmux_end = "\\\" - - return tmux_start . substitute(a:s, "\", "\\", 'g') . tmux_end -endfunction - -let &t_ti .= WrapForTmux("\[?2004h") -let &t_te .= WrapForTmux("\[?2004l") - -function! XTermPasteBegin(ret) - set pastetoggle= - set paste - return a:ret -endfunction - -execute "set =\[200~" -execute "set =\[201~" -map XTermPasteBegin("i") -imap XTermPasteBegin("") -vmap XTermPasteBegin("c") -cmap -cmap === modified file 'vim/bundle/vim-commentary/.git/config' (properties changed: -x to +x) === modified file 'vim/bundle/vim-commentary/.git/hooks/applypatch-msg.sample' --- vim/bundle/vim-commentary/.git/hooks/applypatch-msg.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-commentary/.git/hooks/applypatch-msg.sample 2014-02-24 23:42:31 +0000 @@ -10,6 +10,6 @@ # To enable this hook, rename this file to "applypatch-msg". . git-sh-setup -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} : === modified file 'vim/bundle/vim-commentary/.git/hooks/pre-applypatch.sample' --- vim/bundle/vim-commentary/.git/hooks/pre-applypatch.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-commentary/.git/hooks/pre-applypatch.sample 2014-02-24 23:42:31 +0000 @@ -9,6 +9,6 @@ # To enable this hook, rename this file to "pre-applypatch". . git-sh-setup -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} : === modified file 'vim/bundle/vim-commentary/.git/hooks/pre-push.sample' --- vim/bundle/vim-commentary/.git/hooks/pre-push.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-commentary/.git/hooks/pre-push.sample 2015-08-25 11:20:35 +0000 @@ -24,6 +24,7 @@ z40=0000000000000000000000000000000000000000 +IFS=' ' while read local_ref local_sha remote_ref remote_sha do if [ "$local_sha" = $z40 ] === modified file 'vim/bundle/vim-commentary/.git/hooks/update.sample' --- vim/bundle/vim-commentary/.git/hooks/update.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-commentary/.git/hooks/update.sample 2014-02-24 23:42:31 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# An example hook script to block unannotated tags from entering. +# 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". === modified file 'vim/bundle/vim-commentary/.git/index' Binary files vim/bundle/vim-commentary/.git/index 2016-08-04 08:13:17 +0000 and vim/bundle/vim-commentary/.git/index 2015-08-25 11:20:35 +0000 differ === modified file 'vim/bundle/vim-commentary/.git/logs/HEAD' --- vim/bundle/vim-commentary/.git/logs/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-commentary/.git/logs/HEAD 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 73e0d9a9d1f51b6cc9dc965f62669194ae851cb1 Jan Pobrislo 1470298368 +0200 clone: from https://github.com/tpope/vim-commentary +0000000000000000000000000000000000000000 7fb632aab475b1d2560fe18a329742ba3b4725c6 Jan Pobrislo 1440501529 +0200 clone: from https://github.com/tpope/vim-commentary === modified file 'vim/bundle/vim-commentary/.git/logs/refs/heads/master' --- vim/bundle/vim-commentary/.git/logs/refs/heads/master 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-commentary/.git/logs/refs/heads/master 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 73e0d9a9d1f51b6cc9dc965f62669194ae851cb1 Jan Pobrislo 1470298368 +0200 clone: from https://github.com/tpope/vim-commentary +0000000000000000000000000000000000000000 7fb632aab475b1d2560fe18a329742ba3b4725c6 Jan Pobrislo 1440501529 +0200 clone: from https://github.com/tpope/vim-commentary === modified file 'vim/bundle/vim-commentary/.git/logs/refs/remotes/origin/HEAD' --- vim/bundle/vim-commentary/.git/logs/refs/remotes/origin/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-commentary/.git/logs/refs/remotes/origin/HEAD 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 73e0d9a9d1f51b6cc9dc965f62669194ae851cb1 Jan Pobrislo 1470298368 +0200 clone: from https://github.com/tpope/vim-commentary +0000000000000000000000000000000000000000 7fb632aab475b1d2560fe18a329742ba3b4725c6 Jan Pobrislo 1440501529 +0200 clone: from https://github.com/tpope/vim-commentary === removed directory 'vim/bundle/vim-commentary/.git/objects/0b' === removed file 'vim/bundle/vim-commentary/.git/objects/0b/ef7cc9de62e94b759761e0a9c30862dd604d6b' Binary files vim/bundle/vim-commentary/.git/objects/0b/ef7cc9de62e94b759761e0a9c30862dd604d6b 2016-08-04 08:13:17 +0000 and vim/bundle/vim-commentary/.git/objects/0b/ef7cc9de62e94b759761e0a9c30862dd604d6b 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-commentary/.git/objects/24' === removed file 'vim/bundle/vim-commentary/.git/objects/24/6712be95f1c7b9627e9fbbe64c804f9ffaeb6e' Binary files vim/bundle/vim-commentary/.git/objects/24/6712be95f1c7b9627e9fbbe64c804f9ffaeb6e 2016-08-04 08:13:17 +0000 and vim/bundle/vim-commentary/.git/objects/24/6712be95f1c7b9627e9fbbe64c804f9ffaeb6e 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-commentary/.git/objects/26' === removed file 'vim/bundle/vim-commentary/.git/objects/26/c52779e49c70c357fc1a75522079a0bbb77502' Binary files vim/bundle/vim-commentary/.git/objects/26/c52779e49c70c357fc1a75522079a0bbb77502 2016-08-04 08:13:17 +0000 and vim/bundle/vim-commentary/.git/objects/26/c52779e49c70c357fc1a75522079a0bbb77502 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-commentary/.git/objects/73' === removed file 'vim/bundle/vim-commentary/.git/objects/73/e0d9a9d1f51b6cc9dc965f62669194ae851cb1' Binary files vim/bundle/vim-commentary/.git/objects/73/e0d9a9d1f51b6cc9dc965f62669194ae851cb1 2016-08-04 08:13:17 +0000 and vim/bundle/vim-commentary/.git/objects/73/e0d9a9d1f51b6cc9dc965f62669194ae851cb1 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/vim-commentary/.git/objects/7e' === added file 'vim/bundle/vim-commentary/.git/objects/7e/74bfedeef17a11943f0e6c99f27c13ddb46406' Binary files vim/bundle/vim-commentary/.git/objects/7e/74bfedeef17a11943f0e6c99f27c13ddb46406 1970-01-01 00:00:00 +0000 and vim/bundle/vim-commentary/.git/objects/7e/74bfedeef17a11943f0e6c99f27c13ddb46406 2015-08-25 11:20:35 +0000 differ === added directory 'vim/bundle/vim-commentary/.git/objects/7f' === added file 'vim/bundle/vim-commentary/.git/objects/7f/b632aab475b1d2560fe18a329742ba3b4725c6' Binary files vim/bundle/vim-commentary/.git/objects/7f/b632aab475b1d2560fe18a329742ba3b4725c6 1970-01-01 00:00:00 +0000 and vim/bundle/vim-commentary/.git/objects/7f/b632aab475b1d2560fe18a329742ba3b4725c6 2015-08-25 11:20:35 +0000 differ === added directory 'vim/bundle/vim-commentary/.git/objects/a1' === added file 'vim/bundle/vim-commentary/.git/objects/a1/e993fd96e0d45a65a9df4df58cc18b5974e230' Binary files vim/bundle/vim-commentary/.git/objects/a1/e993fd96e0d45a65a9df4df58cc18b5974e230 1970-01-01 00:00:00 +0000 and vim/bundle/vim-commentary/.git/objects/a1/e993fd96e0d45a65a9df4df58cc18b5974e230 2015-08-25 11:20:35 +0000 differ === added directory 'vim/bundle/vim-commentary/.git/objects/a9' === added file 'vim/bundle/vim-commentary/.git/objects/a9/1cd712240d45bc891cc3b0ce6a7d239df92867' Binary files vim/bundle/vim-commentary/.git/objects/a9/1cd712240d45bc891cc3b0ce6a7d239df92867 1970-01-01 00:00:00 +0000 and vim/bundle/vim-commentary/.git/objects/a9/1cd712240d45bc891cc3b0ce6a7d239df92867 2015-08-25 11:20:35 +0000 differ === removed directory 'vim/bundle/vim-commentary/.git/objects/b0' === removed file 'vim/bundle/vim-commentary/.git/objects/b0/48569493e57c4c201d88937c701382fd7be83b' Binary files vim/bundle/vim-commentary/.git/objects/b0/48569493e57c4c201d88937c701382fd7be83b 2016-08-04 08:13:17 +0000 and vim/bundle/vim-commentary/.git/objects/b0/48569493e57c4c201d88937c701382fd7be83b 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-commentary/.git/objects/b6' === removed file 'vim/bundle/vim-commentary/.git/objects/b6/0c9bd3cd5a4d0ceff7e921cda82336e4415fbd' Binary files vim/bundle/vim-commentary/.git/objects/b6/0c9bd3cd5a4d0ceff7e921cda82336e4415fbd 2016-08-04 08:13:17 +0000 and vim/bundle/vim-commentary/.git/objects/b6/0c9bd3cd5a4d0ceff7e921cda82336e4415fbd 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/vim-commentary/.git/objects/d6' === added file 'vim/bundle/vim-commentary/.git/objects/d6/deed05b2883cdecb878a6202640f2892ac6209' Binary files vim/bundle/vim-commentary/.git/objects/d6/deed05b2883cdecb878a6202640f2892ac6209 1970-01-01 00:00:00 +0000 and vim/bundle/vim-commentary/.git/objects/d6/deed05b2883cdecb878a6202640f2892ac6209 2015-08-25 11:20:35 +0000 differ === added directory 'vim/bundle/vim-commentary/.git/objects/fc' === added file 'vim/bundle/vim-commentary/.git/objects/fc/117ba479c8b0435234b39819a3561e314703a1' Binary files vim/bundle/vim-commentary/.git/objects/fc/117ba479c8b0435234b39819a3561e314703a1 1970-01-01 00:00:00 +0000 and vim/bundle/vim-commentary/.git/objects/fc/117ba479c8b0435234b39819a3561e314703a1 2015-08-25 11:20:35 +0000 differ === modified file 'vim/bundle/vim-commentary/.git/packed-refs' --- vim/bundle/vim-commentary/.git/packed-refs 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-commentary/.git/packed-refs 2015-08-25 11:20:35 +0000 @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled -73e0d9a9d1f51b6cc9dc965f62669194ae851cb1 refs/remotes/origin/master +7fb632aab475b1d2560fe18a329742ba3b4725c6 refs/remotes/origin/master === modified file 'vim/bundle/vim-commentary/.git/refs/heads/master' --- vim/bundle/vim-commentary/.git/refs/heads/master 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-commentary/.git/refs/heads/master 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -73e0d9a9d1f51b6cc9dc965f62669194ae851cb1 +7fb632aab475b1d2560fe18a329742ba3b4725c6 === modified file 'vim/bundle/vim-commentary/.git/shallow' --- vim/bundle/vim-commentary/.git/shallow 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-commentary/.git/shallow 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -73e0d9a9d1f51b6cc9dc965f62669194ae851cb1 +7fb632aab475b1d2560fe18a329742ba3b4725c6 === modified file 'vim/bundle/vim-commentary/doc/commentary.txt' --- vim/bundle/vim-commentary/doc/commentary.txt 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-commentary/doc/commentary.txt 2015-08-25 11:20:35 +0000 @@ -6,6 +6,9 @@ Comment stuff out. Then uncomment it later. Relies on 'commentstring' to be correctly set, or uses b:commentary_format if it is set. +The gc mappings are preferred, while the \\ mappings are provided for +backwards compatibility. + *gc* gc{motion} Comment or uncomment lines that {motion} moves over. === modified file 'vim/bundle/vim-commentary/plugin/commentary.vim' --- vim/bundle/vim-commentary/plugin/commentary.vim 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-commentary/plugin/commentary.vim 2015-08-25 11:20:35 +0000 @@ -1,6 +1,6 @@ " commentary.vim - Comment stuff out " Maintainer: Tim Pope -" Version: 1.3 +" Version: 1.2 " GetLatestVimScripts: 3695 1 :AutoInstall: commentary.vim if exists("g:loaded_commentary") || &cp || v:version < 700 @@ -13,14 +13,6 @@ \ &commentstring, '\S\zs%s',' %s','') ,'%s\ze\S', '%s ', '')), '%s', 1) endfunction -function! s:strip_white_space(l,r,line) abort - let [l, r] = [a:l, a:r] - if stridx(a:line,l) == -1 && stridx(a:line,l[0:-2]) == 0 && a:line[strlen(a:line)-strlen(r[1:]):-1] == r[1:] - return [l[0:-2], r[1:]] - endif - return [l, r] -endfunction - function! s:go(type,...) abort if a:0 let [lnum1, lnum2] = [a:type, a:1] @@ -28,11 +20,10 @@ let [lnum1, lnum2] = [line("'["), line("']")] endif - let [l_, r_] = s:surroundings() + let [l, r] = s:surroundings() let uncomment = 2 for lnum in range(lnum1,lnum2) let line = matchstr(getline(lnum),'\S.*\s\@CommentaryCommentary endif +if maparg('\\','n') ==# '' && maparg('\','n') ==# '' && get(g:, 'commentary_map_backslash', 1) + xmap \\ Commentary:echomsg '\\ is deprecated. Use gc' + nmap \\ :echomsg '\\ is deprecated. Use gc'Commentary + nmap \\\ CommentaryLine:echomsg '\\ is deprecated. Use gc' + nmap \\u CommentaryUndo:echomsg '\\ is deprecated. Use gc' +endif + " vim:set et sw=2: === modified file 'vim/bundle/vim-scriptease/.git/config' (properties changed: -x to +x) === modified file 'vim/bundle/vim-scriptease/.git/hooks/applypatch-msg.sample' --- vim/bundle/vim-scriptease/.git/hooks/applypatch-msg.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-scriptease/.git/hooks/applypatch-msg.sample 2014-02-24 23:28:30 +0000 @@ -10,6 +10,6 @@ # To enable this hook, rename this file to "applypatch-msg". . git-sh-setup -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} : === modified file 'vim/bundle/vim-scriptease/.git/hooks/pre-applypatch.sample' --- vim/bundle/vim-scriptease/.git/hooks/pre-applypatch.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-scriptease/.git/hooks/pre-applypatch.sample 2014-02-24 23:28:30 +0000 @@ -9,6 +9,6 @@ # To enable this hook, rename this file to "pre-applypatch". . git-sh-setup -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} : === modified file 'vim/bundle/vim-scriptease/.git/hooks/pre-push.sample' --- vim/bundle/vim-scriptease/.git/hooks/pre-push.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-scriptease/.git/hooks/pre-push.sample 2015-08-25 11:20:35 +0000 @@ -24,6 +24,7 @@ z40=0000000000000000000000000000000000000000 +IFS=' ' while read local_ref local_sha remote_ref remote_sha do if [ "$local_sha" = $z40 ] === modified file 'vim/bundle/vim-scriptease/.git/hooks/update.sample' --- vim/bundle/vim-scriptease/.git/hooks/update.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-scriptease/.git/hooks/update.sample 2014-02-24 23:28:30 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# An example hook script to block unannotated tags from entering. +# 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". === modified file 'vim/bundle/vim-scriptease/.git/index' Binary files vim/bundle/vim-scriptease/.git/index 2016-08-04 08:13:17 +0000 and vim/bundle/vim-scriptease/.git/index 2015-08-25 11:20:35 +0000 differ === modified file 'vim/bundle/vim-scriptease/.git/logs/HEAD' --- vim/bundle/vim-scriptease/.git/logs/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-scriptease/.git/logs/HEAD 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 b9720e64c676f0c747a3829e1f0b1b86daedefd8 Jan Pobrislo 1470298369 +0200 clone: from https://github.com/tpope/vim-scriptease +0000000000000000000000000000000000000000 3fa4aabaecc00a3ccec376d8e6e1af19465eefe2 Jan Pobrislo 1440501533 +0200 clone: from https://github.com/tpope/vim-scriptease === modified file 'vim/bundle/vim-scriptease/.git/logs/refs/heads/master' --- vim/bundle/vim-scriptease/.git/logs/refs/heads/master 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-scriptease/.git/logs/refs/heads/master 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 b9720e64c676f0c747a3829e1f0b1b86daedefd8 Jan Pobrislo 1470298369 +0200 clone: from https://github.com/tpope/vim-scriptease +0000000000000000000000000000000000000000 3fa4aabaecc00a3ccec376d8e6e1af19465eefe2 Jan Pobrislo 1440501533 +0200 clone: from https://github.com/tpope/vim-scriptease === modified file 'vim/bundle/vim-scriptease/.git/logs/refs/remotes/origin/HEAD' --- vim/bundle/vim-scriptease/.git/logs/refs/remotes/origin/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-scriptease/.git/logs/refs/remotes/origin/HEAD 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 b9720e64c676f0c747a3829e1f0b1b86daedefd8 Jan Pobrislo 1470298369 +0200 clone: from https://github.com/tpope/vim-scriptease +0000000000000000000000000000000000000000 3fa4aabaecc00a3ccec376d8e6e1af19465eefe2 Jan Pobrislo 1440501533 +0200 clone: from https://github.com/tpope/vim-scriptease === removed directory 'vim/bundle/vim-scriptease/.git/objects/01' === removed file 'vim/bundle/vim-scriptease/.git/objects/01/4afb0a1992e8aec665caecd2eeb6c9a0793c5b' Binary files vim/bundle/vim-scriptease/.git/objects/01/4afb0a1992e8aec665caecd2eeb6c9a0793c5b 2016-08-04 08:13:17 +0000 and vim/bundle/vim-scriptease/.git/objects/01/4afb0a1992e8aec665caecd2eeb6c9a0793c5b 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/vim-scriptease/.git/objects/2f' === added file 'vim/bundle/vim-scriptease/.git/objects/2f/c28883800dd9c5dd6d624c0391ade3ace5855d' Binary files vim/bundle/vim-scriptease/.git/objects/2f/c28883800dd9c5dd6d624c0391ade3ace5855d 1970-01-01 00:00:00 +0000 and vim/bundle/vim-scriptease/.git/objects/2f/c28883800dd9c5dd6d624c0391ade3ace5855d 2015-08-25 11:20:35 +0000 differ === added directory 'vim/bundle/vim-scriptease/.git/objects/3f' === added file 'vim/bundle/vim-scriptease/.git/objects/3f/a4aabaecc00a3ccec376d8e6e1af19465eefe2' --- vim/bundle/vim-scriptease/.git/objects/3f/a4aabaecc00a3ccec376d8e6e1af19465eefe2 1970-01-01 00:00:00 +0000 +++ vim/bundle/vim-scriptease/.git/objects/3f/a4aabaecc00a3ccec376d8e6e1af19465eefe2 2015-08-25 11:20:35 +0000 @@ -0,0 +1,3 @@ +x1j1@:tY;rJ#,||o-K7@Ua#ƾ#2%ƱJJJn]Wi +,xLXf5Jn׾6Vl_ B$ +|+ko!wK6adңD4 \ No newline at end of file === added directory 'vim/bundle/vim-scriptease/.git/objects/79' === added file 'vim/bundle/vim-scriptease/.git/objects/79/f048122f80f378f028c9d97639f84d94373c66' Binary files vim/bundle/vim-scriptease/.git/objects/79/f048122f80f378f028c9d97639f84d94373c66 1970-01-01 00:00:00 +0000 and vim/bundle/vim-scriptease/.git/objects/79/f048122f80f378f028c9d97639f84d94373c66 2015-08-25 11:20:35 +0000 differ === removed directory 'vim/bundle/vim-scriptease/.git/objects/84' === removed file 'vim/bundle/vim-scriptease/.git/objects/84/403556f3206265cab013ea0aebf3039ee25e00' Binary files vim/bundle/vim-scriptease/.git/objects/84/403556f3206265cab013ea0aebf3039ee25e00 2016-08-04 08:13:17 +0000 and vim/bundle/vim-scriptease/.git/objects/84/403556f3206265cab013ea0aebf3039ee25e00 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-scriptease/.git/objects/b9' === removed file 'vim/bundle/vim-scriptease/.git/objects/b9/720e64c676f0c747a3829e1f0b1b86daedefd8' Binary files vim/bundle/vim-scriptease/.git/objects/b9/720e64c676f0c747a3829e1f0b1b86daedefd8 2016-08-04 08:13:17 +0000 and vim/bundle/vim-scriptease/.git/objects/b9/720e64c676f0c747a3829e1f0b1b86daedefd8 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-scriptease/.git/objects/c2' === removed file 'vim/bundle/vim-scriptease/.git/objects/c2/8182bf348ffea32802a769106305cc3531ef7f' Binary files vim/bundle/vim-scriptease/.git/objects/c2/8182bf348ffea32802a769106305cc3531ef7f 2016-08-04 08:13:17 +0000 and vim/bundle/vim-scriptease/.git/objects/c2/8182bf348ffea32802a769106305cc3531ef7f 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/vim-scriptease/.git/objects/ec' === added file 'vim/bundle/vim-scriptease/.git/objects/ec/7a275af61c491a5df09d6469e0defbc3d5a8d4' Binary files vim/bundle/vim-scriptease/.git/objects/ec/7a275af61c491a5df09d6469e0defbc3d5a8d4 1970-01-01 00:00:00 +0000 and vim/bundle/vim-scriptease/.git/objects/ec/7a275af61c491a5df09d6469e0defbc3d5a8d4 2015-08-25 11:20:35 +0000 differ === modified file 'vim/bundle/vim-scriptease/.git/packed-refs' --- vim/bundle/vim-scriptease/.git/packed-refs 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-scriptease/.git/packed-refs 2015-08-25 11:20:35 +0000 @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled -b9720e64c676f0c747a3829e1f0b1b86daedefd8 refs/remotes/origin/master +3fa4aabaecc00a3ccec376d8e6e1af19465eefe2 refs/remotes/origin/master === modified file 'vim/bundle/vim-scriptease/.git/refs/heads/master' --- vim/bundle/vim-scriptease/.git/refs/heads/master 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-scriptease/.git/refs/heads/master 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -b9720e64c676f0c747a3829e1f0b1b86daedefd8 +3fa4aabaecc00a3ccec376d8e6e1af19465eefe2 === modified file 'vim/bundle/vim-scriptease/.git/shallow' --- vim/bundle/vim-scriptease/.git/shallow 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-scriptease/.git/shallow 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -b9720e64c676f0c747a3829e1f0b1b86daedefd8 +3fa4aabaecc00a3ccec376d8e6e1af19465eefe2 === modified file 'vim/bundle/vim-scriptease/plugin/scriptease.vim' --- vim/bundle/vim-scriptease/plugin/scriptease.vim 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-scriptease/plugin/scriptease.vim 2015-08-25 11:20:35 +0000 @@ -336,17 +336,13 @@ let guards = [] for file in a:files if filereadable(file) - let lines = readfile(file, '', 500) + let lines = readfile(file) if len(lines) for i in range(len(lines)-1) - let unlet = matchstr(lines[i], '^if .*\' - call extend(guards, [unlet]) - break - endif - endfor + let unlet = matchstr(lines[i], '^if \+\%(( *\)\?exists *( *[''"]\%(\g:\)\=\zs\w\+\ze[''"]') + if unlet !=# '' && (lines[i+1] =~# '^ *finish\>' || lines[i] =~# '| *finish\>') + \ && index(guards, unlet) == -1 + call extend(guards, [unlet]) endif endfor endif === modified file 'vim/bundle/vim-sensible/.git/config' (properties changed: -x to +x) === modified file 'vim/bundle/vim-sensible/.git/hooks/applypatch-msg.sample' --- vim/bundle/vim-sensible/.git/hooks/applypatch-msg.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sensible/.git/hooks/applypatch-msg.sample 2014-02-24 23:28:30 +0000 @@ -10,6 +10,6 @@ # To enable this hook, rename this file to "applypatch-msg". . git-sh-setup -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} : === modified file 'vim/bundle/vim-sensible/.git/hooks/pre-applypatch.sample' --- vim/bundle/vim-sensible/.git/hooks/pre-applypatch.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sensible/.git/hooks/pre-applypatch.sample 2014-02-24 23:28:30 +0000 @@ -9,6 +9,6 @@ # To enable this hook, rename this file to "pre-applypatch". . git-sh-setup -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} : === modified file 'vim/bundle/vim-sensible/.git/hooks/pre-push.sample' --- vim/bundle/vim-sensible/.git/hooks/pre-push.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sensible/.git/hooks/pre-push.sample 2015-08-25 11:20:35 +0000 @@ -24,6 +24,7 @@ z40=0000000000000000000000000000000000000000 +IFS=' ' while read local_ref local_sha remote_ref remote_sha do if [ "$local_sha" = $z40 ] === modified file 'vim/bundle/vim-sensible/.git/hooks/update.sample' --- vim/bundle/vim-sensible/.git/hooks/update.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sensible/.git/hooks/update.sample 2014-02-24 23:28:30 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# An example hook script to block unannotated tags from entering. +# 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". === modified file 'vim/bundle/vim-sensible/.git/index' Binary files vim/bundle/vim-sensible/.git/index 2016-08-04 08:13:17 +0000 and vim/bundle/vim-sensible/.git/index 2015-08-25 11:20:35 +0000 differ === modified file 'vim/bundle/vim-sensible/.git/logs/HEAD' --- vim/bundle/vim-sensible/.git/logs/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sensible/.git/logs/HEAD 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 9e91be7e0fb42949831fe3161ef583363648aa58 Jan Pobrislo 1470298370 +0200 clone: from https://github.com/tpope/vim-sensible +0000000000000000000000000000000000000000 d0beb8ab42627bea2c747564ca46ec663e3ba0ba Jan Pobrislo 1440501540 +0200 clone: from https://github.com/tpope/vim-sensible === modified file 'vim/bundle/vim-sensible/.git/logs/refs/heads/master' --- vim/bundle/vim-sensible/.git/logs/refs/heads/master 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sensible/.git/logs/refs/heads/master 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 9e91be7e0fb42949831fe3161ef583363648aa58 Jan Pobrislo 1470298370 +0200 clone: from https://github.com/tpope/vim-sensible +0000000000000000000000000000000000000000 d0beb8ab42627bea2c747564ca46ec663e3ba0ba Jan Pobrislo 1440501540 +0200 clone: from https://github.com/tpope/vim-sensible === modified file 'vim/bundle/vim-sensible/.git/logs/refs/remotes/origin/HEAD' --- vim/bundle/vim-sensible/.git/logs/refs/remotes/origin/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sensible/.git/logs/refs/remotes/origin/HEAD 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 9e91be7e0fb42949831fe3161ef583363648aa58 Jan Pobrislo 1470298370 +0200 clone: from https://github.com/tpope/vim-sensible +0000000000000000000000000000000000000000 d0beb8ab42627bea2c747564ca46ec663e3ba0ba Jan Pobrislo 1440501540 +0200 clone: from https://github.com/tpope/vim-sensible === added directory 'vim/bundle/vim-sensible/.git/objects/10' === added file 'vim/bundle/vim-sensible/.git/objects/10/48243978c4b5bf3f1bd94b9a5752ebf8932ce6' --- vim/bundle/vim-sensible/.git/objects/10/48243978c4b5bf3f1bd94b9a5752ebf8932ce6 1970-01-01 00:00:00 +0000 +++ vim/bundle/vim-sensible/.git/objects/10/48243978c4b5bf3f1bd94b9a5752ebf8932ce6 2015-08-25 11:20:35 +0000 @@ -0,0 +1,1 @@ +x+)JMU01`040031Q(N+LI+e0bϑTcjo}N~*Sb \ No newline at end of file === added directory 'vim/bundle/vim-sensible/.git/objects/32' === added file 'vim/bundle/vim-sensible/.git/objects/32/063f6c1e292600f2eab0fb2f7fbe42234e2495' Binary files vim/bundle/vim-sensible/.git/objects/32/063f6c1e292600f2eab0fb2f7fbe42234e2495 1970-01-01 00:00:00 +0000 and vim/bundle/vim-sensible/.git/objects/32/063f6c1e292600f2eab0fb2f7fbe42234e2495 2015-08-25 11:20:35 +0000 differ === added directory 'vim/bundle/vim-sensible/.git/objects/80' === added file 'vim/bundle/vim-sensible/.git/objects/80/3f39cbdff2b9e17075b04e7c8a547a32a39299' Binary files vim/bundle/vim-sensible/.git/objects/80/3f39cbdff2b9e17075b04e7c8a547a32a39299 1970-01-01 00:00:00 +0000 and vim/bundle/vim-sensible/.git/objects/80/3f39cbdff2b9e17075b04e7c8a547a32a39299 2015-08-25 11:20:35 +0000 differ === removed directory 'vim/bundle/vim-sensible/.git/objects/95' === removed file 'vim/bundle/vim-sensible/.git/objects/95/e31723aa4d5076cd10455844cb3709496f7fdb' Binary files vim/bundle/vim-sensible/.git/objects/95/e31723aa4d5076cd10455844cb3709496f7fdb 2016-08-04 08:13:17 +0000 and vim/bundle/vim-sensible/.git/objects/95/e31723aa4d5076cd10455844cb3709496f7fdb 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-sensible/.git/objects/9e' === removed file 'vim/bundle/vim-sensible/.git/objects/9e/91be7e0fb42949831fe3161ef583363648aa58' Binary files vim/bundle/vim-sensible/.git/objects/9e/91be7e0fb42949831fe3161ef583363648aa58 2016-08-04 08:13:17 +0000 and vim/bundle/vim-sensible/.git/objects/9e/91be7e0fb42949831fe3161ef583363648aa58 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-sensible/.git/objects/a4' === removed file 'vim/bundle/vim-sensible/.git/objects/a4/be78c9a6cadeb363e5680f8913c477c94bbac8' Binary files vim/bundle/vim-sensible/.git/objects/a4/be78c9a6cadeb363e5680f8913c477c94bbac8 2016-08-04 08:13:17 +0000 and vim/bundle/vim-sensible/.git/objects/a4/be78c9a6cadeb363e5680f8913c477c94bbac8 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-sensible/.git/objects/ac' === removed file 'vim/bundle/vim-sensible/.git/objects/ac/6ef352a66a31212ac3704b85d1a3b418590ebe' Binary files vim/bundle/vim-sensible/.git/objects/ac/6ef352a66a31212ac3704b85d1a3b418590ebe 2016-08-04 08:13:17 +0000 and vim/bundle/vim-sensible/.git/objects/ac/6ef352a66a31212ac3704b85d1a3b418590ebe 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/vim-sensible/.git/objects/d0' === added file 'vim/bundle/vim-sensible/.git/objects/d0/beb8ab42627bea2c747564ca46ec663e3ba0ba' Binary files vim/bundle/vim-sensible/.git/objects/d0/beb8ab42627bea2c747564ca46ec663e3ba0ba 1970-01-01 00:00:00 +0000 and vim/bundle/vim-sensible/.git/objects/d0/beb8ab42627bea2c747564ca46ec663e3ba0ba 2015-08-25 11:20:35 +0000 differ === modified file 'vim/bundle/vim-sensible/.git/packed-refs' --- vim/bundle/vim-sensible/.git/packed-refs 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sensible/.git/packed-refs 2015-08-25 11:20:35 +0000 @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled -9e91be7e0fb42949831fe3161ef583363648aa58 refs/remotes/origin/master +d0beb8ab42627bea2c747564ca46ec663e3ba0ba refs/remotes/origin/master === modified file 'vim/bundle/vim-sensible/.git/refs/heads/master' --- vim/bundle/vim-sensible/.git/refs/heads/master 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sensible/.git/refs/heads/master 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -9e91be7e0fb42949831fe3161ef583363648aa58 +d0beb8ab42627bea2c747564ca46ec663e3ba0ba === modified file 'vim/bundle/vim-sensible/.git/shallow' --- vim/bundle/vim-sensible/.git/shallow 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sensible/.git/shallow 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -9e91be7e0fb42949831fe3161ef583363648aa58 +d0beb8ab42627bea2c747564ca46ec663e3ba0ba === modified file 'vim/bundle/vim-sensible/plugin/sensible.vim' --- vim/bundle/vim-sensible/plugin/sensible.vim 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sensible/plugin/sensible.vim 2015-08-25 11:20:35 +0000 @@ -30,11 +30,12 @@ set incsearch " Use to clear the highlighting of :set hlsearch. if maparg('', 'n') ==# '' - nnoremap :nohlsearch=has('diff')?'diffupdate':'' + nnoremap :nohlsearch endif set laststatus=2 set ruler +set showcmd set wildmenu if !&scrolloff @@ -66,6 +67,7 @@ endif set autoread +set fileformats+=mac if &history < 1000 set history=1000 @@ -79,7 +81,7 @@ set sessionoptions-=options " Allow color schemes to do bright colors without forcing bold. -if &t_Co == 8 && $TERM !~# '^linux\|^Eterm' +if &t_Co == 8 && $TERM !~# '^linux' set t_Co=16 endif === modified file 'vim/bundle/vim-sleuth/.git/config' (properties changed: -x to +x) === modified file 'vim/bundle/vim-sleuth/.git/hooks/applypatch-msg.sample' --- vim/bundle/vim-sleuth/.git/hooks/applypatch-msg.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sleuth/.git/hooks/applypatch-msg.sample 2014-02-24 23:28:30 +0000 @@ -10,6 +10,6 @@ # To enable this hook, rename this file to "applypatch-msg". . git-sh-setup -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} : === modified file 'vim/bundle/vim-sleuth/.git/hooks/pre-applypatch.sample' --- vim/bundle/vim-sleuth/.git/hooks/pre-applypatch.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sleuth/.git/hooks/pre-applypatch.sample 2014-02-24 23:28:30 +0000 @@ -9,6 +9,6 @@ # To enable this hook, rename this file to "pre-applypatch". . git-sh-setup -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} : === modified file 'vim/bundle/vim-sleuth/.git/hooks/pre-push.sample' --- vim/bundle/vim-sleuth/.git/hooks/pre-push.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sleuth/.git/hooks/pre-push.sample 2015-08-25 11:20:35 +0000 @@ -24,6 +24,7 @@ z40=0000000000000000000000000000000000000000 +IFS=' ' while read local_ref local_sha remote_ref remote_sha do if [ "$local_sha" = $z40 ] === modified file 'vim/bundle/vim-sleuth/.git/hooks/update.sample' --- vim/bundle/vim-sleuth/.git/hooks/update.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sleuth/.git/hooks/update.sample 2014-02-24 23:28:30 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# An example hook script to block unannotated tags from entering. +# 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". === modified file 'vim/bundle/vim-sleuth/.git/index' Binary files vim/bundle/vim-sleuth/.git/index 2016-08-04 08:13:17 +0000 and vim/bundle/vim-sleuth/.git/index 2015-08-25 11:20:35 +0000 differ === modified file 'vim/bundle/vim-sleuth/.git/logs/HEAD' --- vim/bundle/vim-sleuth/.git/logs/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sleuth/.git/logs/HEAD 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 a17462708aa40a7fc0afd4effa559087d8a2c908 Jan Pobrislo 1470298371 +0200 clone: from https://github.com/tpope/vim-sleuth +0000000000000000000000000000000000000000 a17462708aa40a7fc0afd4effa559087d8a2c908 Jan Pobrislo 1440501545 +0200 clone: from https://github.com/tpope/vim-sleuth === modified file 'vim/bundle/vim-sleuth/.git/logs/refs/heads/master' --- vim/bundle/vim-sleuth/.git/logs/refs/heads/master 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sleuth/.git/logs/refs/heads/master 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 a17462708aa40a7fc0afd4effa559087d8a2c908 Jan Pobrislo 1470298371 +0200 clone: from https://github.com/tpope/vim-sleuth +0000000000000000000000000000000000000000 a17462708aa40a7fc0afd4effa559087d8a2c908 Jan Pobrislo 1440501545 +0200 clone: from https://github.com/tpope/vim-sleuth === modified file 'vim/bundle/vim-sleuth/.git/logs/refs/remotes/origin/HEAD' --- vim/bundle/vim-sleuth/.git/logs/refs/remotes/origin/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-sleuth/.git/logs/refs/remotes/origin/HEAD 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 a17462708aa40a7fc0afd4effa559087d8a2c908 Jan Pobrislo 1470298371 +0200 clone: from https://github.com/tpope/vim-sleuth +0000000000000000000000000000000000000000 a17462708aa40a7fc0afd4effa559087d8a2c908 Jan Pobrislo 1440501545 +0200 clone: from https://github.com/tpope/vim-sleuth === modified file 'vim/bundle/vim-surround/.git/config' (properties changed: -x to +x) === modified file 'vim/bundle/vim-surround/.git/hooks/applypatch-msg.sample' --- vim/bundle/vim-surround/.git/hooks/applypatch-msg.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-surround/.git/hooks/applypatch-msg.sample 2014-02-24 23:28:30 +0000 @@ -10,6 +10,6 @@ # To enable this hook, rename this file to "applypatch-msg". . git-sh-setup -commitmsg="$(git rev-parse --git-path hooks/commit-msg)" -test -x "$commitmsg" && exec "$commitmsg" ${1+"$@"} +test -x "$GIT_DIR/hooks/commit-msg" && + exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"} : === modified file 'vim/bundle/vim-surround/.git/hooks/pre-applypatch.sample' --- vim/bundle/vim-surround/.git/hooks/pre-applypatch.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-surround/.git/hooks/pre-applypatch.sample 2014-02-24 23:28:30 +0000 @@ -9,6 +9,6 @@ # To enable this hook, rename this file to "pre-applypatch". . git-sh-setup -precommit="$(git rev-parse --git-path hooks/pre-commit)" -test -x "$precommit" && exec "$precommit" ${1+"$@"} +test -x "$GIT_DIR/hooks/pre-commit" && + exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"} : === modified file 'vim/bundle/vim-surround/.git/hooks/pre-push.sample' --- vim/bundle/vim-surround/.git/hooks/pre-push.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-surround/.git/hooks/pre-push.sample 2015-08-25 11:20:35 +0000 @@ -24,6 +24,7 @@ z40=0000000000000000000000000000000000000000 +IFS=' ' while read local_ref local_sha remote_ref remote_sha do if [ "$local_sha" = $z40 ] === modified file 'vim/bundle/vim-surround/.git/hooks/update.sample' --- vim/bundle/vim-surround/.git/hooks/update.sample 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-surround/.git/hooks/update.sample 2014-02-24 23:28:30 +0000 @@ -1,6 +1,6 @@ #!/bin/sh # -# An example hook script to block unannotated tags from entering. +# 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". === modified file 'vim/bundle/vim-surround/.git/index' Binary files vim/bundle/vim-surround/.git/index 2016-08-04 08:13:17 +0000 and vim/bundle/vim-surround/.git/index 2015-08-25 11:20:35 +0000 differ === modified file 'vim/bundle/vim-surround/.git/logs/HEAD' --- vim/bundle/vim-surround/.git/logs/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-surround/.git/logs/HEAD 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 e49d6c2459e0f5569ff2d533b4df995dd7f98313 Jan Pobrislo 1470298372 +0200 clone: from https://github.com/tpope/vim-surround +0000000000000000000000000000000000000000 2d05440ad23f97a7874ebd9b5de3a0e65d25d85c Jan Pobrislo 1440501558 +0200 clone: from https://github.com/tpope/vim-surround === modified file 'vim/bundle/vim-surround/.git/logs/refs/heads/master' --- vim/bundle/vim-surround/.git/logs/refs/heads/master 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-surround/.git/logs/refs/heads/master 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 e49d6c2459e0f5569ff2d533b4df995dd7f98313 Jan Pobrislo 1470298372 +0200 clone: from https://github.com/tpope/vim-surround +0000000000000000000000000000000000000000 2d05440ad23f97a7874ebd9b5de3a0e65d25d85c Jan Pobrislo 1440501558 +0200 clone: from https://github.com/tpope/vim-surround === modified file 'vim/bundle/vim-surround/.git/logs/refs/remotes/origin/HEAD' --- vim/bundle/vim-surround/.git/logs/refs/remotes/origin/HEAD 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-surround/.git/logs/refs/remotes/origin/HEAD 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -0000000000000000000000000000000000000000 e49d6c2459e0f5569ff2d533b4df995dd7f98313 Jan Pobrislo 1470298372 +0200 clone: from https://github.com/tpope/vim-surround +0000000000000000000000000000000000000000 2d05440ad23f97a7874ebd9b5de3a0e65d25d85c Jan Pobrislo 1440501558 +0200 clone: from https://github.com/tpope/vim-surround === removed directory 'vim/bundle/vim-surround/.git/objects/04' === removed file 'vim/bundle/vim-surround/.git/objects/04/4e04da8ce36a0305bb71eb973c694cbd42e39c' Binary files vim/bundle/vim-surround/.git/objects/04/4e04da8ce36a0305bb71eb973c694cbd42e39c 2016-08-04 08:13:17 +0000 and vim/bundle/vim-surround/.git/objects/04/4e04da8ce36a0305bb71eb973c694cbd42e39c 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/vim-surround/.git/objects/07' === added file 'vim/bundle/vim-surround/.git/objects/07/dd41fe01533f073beb29f3947ab87e2e52857a' Binary files vim/bundle/vim-surround/.git/objects/07/dd41fe01533f073beb29f3947ab87e2e52857a 1970-01-01 00:00:00 +0000 and vim/bundle/vim-surround/.git/objects/07/dd41fe01533f073beb29f3947ab87e2e52857a 2015-08-25 11:20:35 +0000 differ === added directory 'vim/bundle/vim-surround/.git/objects/2d' === added file 'vim/bundle/vim-surround/.git/objects/2d/05440ad23f97a7874ebd9b5de3a0e65d25d85c' Binary files vim/bundle/vim-surround/.git/objects/2d/05440ad23f97a7874ebd9b5de3a0e65d25d85c 1970-01-01 00:00:00 +0000 and vim/bundle/vim-surround/.git/objects/2d/05440ad23f97a7874ebd9b5de3a0e65d25d85c 2015-08-25 11:20:35 +0000 differ === removed directory 'vim/bundle/vim-surround/.git/objects/46' === removed file 'vim/bundle/vim-surround/.git/objects/46/f32529e70f7061093a017f479d89361f428604' Binary files vim/bundle/vim-surround/.git/objects/46/f32529e70f7061093a017f479d89361f428604 2016-08-04 08:13:17 +0000 and vim/bundle/vim-surround/.git/objects/46/f32529e70f7061093a017f479d89361f428604 1970-01-01 00:00:00 +0000 differ === removed directory 'vim/bundle/vim-surround/.git/objects/4b' === removed file 'vim/bundle/vim-surround/.git/objects/4b/965dcbbd326f9f25acb512792ad63aef14f44a' Binary files vim/bundle/vim-surround/.git/objects/4b/965dcbbd326f9f25acb512792ad63aef14f44a 2016-08-04 08:13:17 +0000 and vim/bundle/vim-surround/.git/objects/4b/965dcbbd326f9f25acb512792ad63aef14f44a 1970-01-01 00:00:00 +0000 differ === added directory 'vim/bundle/vim-surround/.git/objects/6a' === added file 'vim/bundle/vim-surround/.git/objects/6a/986e893f6af6ed630d94d04c6992883ffe2deb' Binary files vim/bundle/vim-surround/.git/objects/6a/986e893f6af6ed630d94d04c6992883ffe2deb 1970-01-01 00:00:00 +0000 and vim/bundle/vim-surround/.git/objects/6a/986e893f6af6ed630d94d04c6992883ffe2deb 2015-08-25 11:20:35 +0000 differ === added directory 'vim/bundle/vim-surround/.git/objects/df' === added file 'vim/bundle/vim-surround/.git/objects/df/b79623310ab76a96818cca19d687222e510bb8' Binary files vim/bundle/vim-surround/.git/objects/df/b79623310ab76a96818cca19d687222e510bb8 1970-01-01 00:00:00 +0000 and vim/bundle/vim-surround/.git/objects/df/b79623310ab76a96818cca19d687222e510bb8 2015-08-25 11:20:35 +0000 differ === removed directory 'vim/bundle/vim-surround/.git/objects/e4' === removed file 'vim/bundle/vim-surround/.git/objects/e4/9d6c2459e0f5569ff2d533b4df995dd7f98313' Binary files vim/bundle/vim-surround/.git/objects/e4/9d6c2459e0f5569ff2d533b4df995dd7f98313 2016-08-04 08:13:17 +0000 and vim/bundle/vim-surround/.git/objects/e4/9d6c2459e0f5569ff2d533b4df995dd7f98313 1970-01-01 00:00:00 +0000 differ === modified file 'vim/bundle/vim-surround/.git/packed-refs' --- vim/bundle/vim-surround/.git/packed-refs 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-surround/.git/packed-refs 2015-08-25 11:20:35 +0000 @@ -1,2 +1,2 @@ # pack-refs with: peeled fully-peeled -e49d6c2459e0f5569ff2d533b4df995dd7f98313 refs/remotes/origin/master +2d05440ad23f97a7874ebd9b5de3a0e65d25d85c refs/remotes/origin/master === modified file 'vim/bundle/vim-surround/.git/refs/heads/master' --- vim/bundle/vim-surround/.git/refs/heads/master 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-surround/.git/refs/heads/master 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -e49d6c2459e0f5569ff2d533b4df995dd7f98313 +2d05440ad23f97a7874ebd9b5de3a0e65d25d85c === modified file 'vim/bundle/vim-surround/.git/shallow' --- vim/bundle/vim-surround/.git/shallow 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-surround/.git/shallow 2015-08-25 11:20:35 +0000 @@ -1,1 +1,1 @@ -e49d6c2459e0f5569ff2d533b4df995dd7f98313 +2d05440ad23f97a7874ebd9b5de3a0e65d25d85c === modified file 'vim/bundle/vim-surround/plugin/surround.vim' --- vim/bundle/vim-surround/plugin/surround.vim 2016-08-04 08:13:17 +0000 +++ vim/bundle/vim-surround/plugin/surround.vim 2015-08-25 11:20:35 +0000 @@ -92,7 +92,7 @@ let m = matchstr(a:string,nr2char(i).'.\{-\}\ze'.nr2char(i)) if m != '' let m = substitute(strpart(m,1),'\r.*','','') - let repl_{i} = input(match(m,'\w\+$') >= 0 ? m.': ' : m) + let repl_{i} = input(substitute(m,':\s*$','','').': ') endif endfor let s = ""