[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] master 8e27aff 5/6: Add 'packages/vdiff/' from commit '0f3f249a71

From: Justin Burkett
Subject: [elpa] master 8e27aff 5/6: Add 'packages/vdiff/' from commit '0f3f249a71beaa7603a3e114dfb621d79f03539a'
Date: Thu, 18 May 2017 22:48:00 -0400 (EDT)

branch: master
commit 8e27affdc198676237715f02d41eda328c31e8fd
Merge: 4abb460 0f3f249
Author: Justin Burkett <address@hidden>
Commit: Justin Burkett <address@hidden>

    Add 'packages/vdiff/' from commit '0f3f249a71beaa7603a3e114dfb621d79f03539a'
    git-subtree-dir: packages/vdiff
    git-subtree-mainline: 4abb4600a4bd2fef855b42af3c79cf9a0826566c
    git-subtree-split: 0f3f249a71beaa7603a3e114dfb621d79f03539a
 packages/vdiff/.gitignore          |    4 +
 packages/vdiff/LICENSE             |  674 ++++++++++++
 packages/vdiff/README.org          |  216 ++++
 packages/vdiff/img/hydra.png       |  Bin 0 -> 19666 bytes
 packages/vdiff/img/leuven.png      |  Bin 0 -> 105779 bytes
 packages/vdiff/img/leuven3.png     |  Bin 0 -> 120134 bytes
 packages/vdiff/img/wide-screen.png |  Bin 0 -> 43685 bytes
 packages/vdiff/vdiff.el            | 2108 ++++++++++++++++++++++++++++++++++++
 8 files changed, 3002 insertions(+)

diff --git a/packages/vdiff/.gitignore b/packages/vdiff/.gitignore
new file mode 100644
index 0000000..82d13b8
--- /dev/null
+++ b/packages/vdiff/.gitignore
@@ -0,0 +1,4 @@
diff --git a/packages/vdiff/LICENSE b/packages/vdiff/LICENSE
new file mode 100644
index 0000000..9cecc1d
--- /dev/null
+++ b/packages/vdiff/LICENSE
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+                            Preamble
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  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
+them 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 prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  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.
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+  The precise terms and conditions for copying, distribution and
+modification follow.
+                       TERMS AND CONDITIONS
+  0. Definitions.
+  "This License" refers to version 3 of the GNU General Public License.
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+  1. Source Code.
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+  The Corresponding Source for a work in source code form is that
+same work.
+  2. Basic Permissions.
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+  4. Conveying Verbatim Copies.
+  You may convey 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;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+  5. Conveying Modified Source Versions.
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+  6. Conveying Non-Source Forms.
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+  7. Additional Terms.
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+  8. Termination.
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+  9. Acceptance Not Required for Having Copies.
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+  10. Automatic Licensing of Downstream Recipients.
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+  11. Patents.
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+  12. No Surrender of Others' Freedom.
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+  13. Use with the GNU Affero General Public License.
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+  14. Revised Versions of this License.
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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 that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+  15. Disclaimer of Warranty.
+  16. Limitation of Liability.
+  17. Interpretation of Sections 15 and 16.
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+                     END OF TERMS AND CONDITIONS
+            How to Apply These Terms to Your New Programs
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+    {one line to give the program's name and a brief idea of what it does.}
+    Copyright (C) {year}  {name of author}
+    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 3 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
+    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 <http://www.gnu.org/licenses/>.
+Also add information on how to contact you by electronic and paper mail.
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+    {project}  Copyright (C) {year}  {fullname}
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
diff --git a/packages/vdiff/README.org b/packages/vdiff/README.org
new file mode 100644
index 0000000..1ba7494
--- /dev/null
+++ b/packages/vdiff/README.org
@@ -0,0 +1,216 @@
+* vdiff
+A tool like vimdiff for Emacs 
+** Table of Contents                                                    :TOC:
+ - [[#vdiff][vdiff]]
+   - [[#introduction][Introduction]]
+   - [[#recent-significant-changes][Recent (Significant) Changes]]
+   - [[#screenshot][Screenshot]]
+   - [[#installation-and-usage][Installation and Usage]]
+   - [[#hydra][Hydra]]
+   - [[#further-customization][Further customization]]
+** Introduction
+   vdiff compares two or three buffers on the basis of the output from the diff
+   tool. The buffers are kept synchronized so that as you move through one of
+   the buffers the top of the active buffer aligns with the corresponding top 
+   the other buffer(s). This is similar to how ediff works, but in ediff you 
+   a third "control buffer" to move through the diffed buffers. The key
+   difference is that in vdiff you are meant to actively edit one of the 
+   and the display will update automatically for the other buffer. Similar to
+   ediff, vdiff provides commands to "send" and "receive" hunks from one buffer
+   to the other as well as commands to traverse the diff hunks, which are 
+   if you are trying to merge changes. In contrast to ediff, vdiff also 
+   folding capabilities to fold sections of the buffers that don't contain
+   changes. This folding occurs automatically. Finally, you are encouraged to
+   bind a key to `vdiff-hydra/body', which will use hydra.el (in ELPA) to 
+   a convenient transient keymap containing most of the useful vdiff commands.
+   This functionality is all inspired by (but not equivalent to) the vimdiff
+   tool from vim.
+   Contributions and suggestions are very welcome.
+** Recent (Significant) Changes
+   - [2017-05-17] Split =vdiff-magit.el= into 
[[https://github.com/justbur/emacs-vdiff-magit][separate repository]]. 
+   - [2017-02-01] Added magit integration functions in =vdiff-magit.el=.
+   - [2016-07-25] Added three-way diff support. See =vdiff-buffers3= and 
+** Screenshot
+*** Basic two file diff with refined hunks
+*** Three file diff with targets for sending changes
+** Installation and Usage
+vdiff is available in MELPA, which is the recommended way to install it and 
+it up to date. To install it you may do =M-x package-install RET vdiff RET=.
+To start a vdiff session, the main entry points are
+| Command                | Description                                         
+| =vdiff-buffers=        | Diff two open buffers                               
+| =vdiff-files=          | Diff two files                                      
+| =vdiff-buffers3=       | Diff three open buffers                             
+| =vdiff-files3=         | Diff three files                                    
+| =vdiff-current-file=   | Like =ediff-current-file= (Diff buffer with disk 
version of file) |
+| =vdiff-merge-conflict= | Use vdiff to resolve merge conflicts in current 
file              |
+After installing you can bind the commands to your preferred key prefix like 
+#+BEGIN_SRC emacs-lisp
+(require 'vdiff)
+(define-key vdiff-mode-map (kbd "C-c") vdiff-mode-prefix-map)
+which will bind most of the commands under the =C-c= prefix when vdiff-mode is
+active. Of course you can pick whatever prefix you prefer. With the =C-c= 
+the commands would be
+*** Basics
+| Key     | Command                 | Description                        |
+| =C-c g= | =vdiff-switch-buffer=   | Switch buffers at matching line    |
+| =C-c n= | =vdiff-next-hunk=       | Move to next hunk in buffer        |
+| =C-c p= | =vdiff-previous-hunk=   | Move to previous hunk in buffer    |
+| =C-c h= | =vdiff-hydra/body=      | Enter vdiff-hydra                  |
+*** Viewing and Transmitting Changes Between Buffers
+| Key     | Command                            | Description                   
+| =C-c r= | =vdiff-receive-changes=            | Receive change from other 
buffer    |
+| =C-c s= | =vdiff-send-changes=               | Send this change(s) to other 
buffer |
+| =C-c f= | =vdiff-refine-this-hunk=           | Highlight changed words in 
hunk     |
+| =C-c x= | =vdiff-remove-refinements-in-hunk= | Remove refinement 
highlighting      |
+| (none)  | =vdiff-refine-this-hunk-symbol=    | Refine based on symbols       
+| (none)  | =vdiff-refine-this-hunk-word=      | Refine based on words         
+| =C-c F= | =vdiff-refine-all-hunks=           | Highlight changed words       
+| (none)  | =vdiff-refine-all-hunks-symbol=    | Refine all based on symbols   
+| (none)  | =vdiff-refine-all-hunks-word=      | Refine all based on words     
+*** Folds
+| Key     | Command                            | Description                   
+| =C-c N= | =vdiff-next-fold=                  | Move to next fold in buffer   
+| =C-c P= | =vdiff-previous-fold=              | Move to previous fold in 
buffer     |
+| =C-c c= | =vdiff-close-fold=                 | Close fold at point or in 
region    |
+| =C-c C= | =vdiff-close-all-folds=            | Close all folds in buffer     
+| =C-c t= | =vdiff-close-other-folds=          | Close all other folds in 
buffer     |
+| =C-c o= | =vdiff-open-fold=                  | Open fold at point or in 
region     |
+| =C-c O= | =vdiff-open-all-folds=             | Open all folds in buffer      
+*** Ignoring case and whitespace
+| Key       | Command                   | Description             |
+| =C-c i c= | =vdiff-toggle-case=       | Toggle ignoring of case |
+| =C-c i w= | =vdiff-toggle-whitespace= | Toggle ignoring of case |
+*** Saving, Updating and Exiting
+| Key     | Command                 | Description                  |
+| =C-c w= | =vdiff-save-buffers=    | Save both buffers            |
+| =C-c u= | =vdiff-refresh=         | Force diff refresh           |
+| (none)  | =vdiff-restore-windows= | Restore window configuration |
+| =C-c q= | =vdiff-quit=            | Quit vdiff                   |
+Evil-mode users might prefer something like the following to use a comma as a
+prefix in normal state.
+#+BEGIN_SRC emacs-lisp
+(require 'vdiff)
+(require 'evil)
+(evil-define-key 'normal vdiff-mode-map "," vdiff-mode-prefix-map)
+To match vimdiff bindings some more work is required. The way the =d= command
+for evil is set up makes it difficult to bind =do= and =dp= as they exist in
+vimdiff. Here is a sample set of bindings that avoids this problem (thanks to
address@hidden for these).
+#+BEGIN_SRC emacs-lisp
+  (evil-define-minor-mode-key 'normal 'vdiff-mode "]c" 'vdiff-next-hunk)
+  (evil-define-minor-mode-key 'normal 'vdiff-mode "[c" 'vdiff-previous-hunk)
+  (evil-define-minor-mode-key 'normal 'vdiff-mode "zc" 'vdiff-close-fold)
+  (evil-define-minor-mode-key 'normal 'vdiff-mode "zM" 'vdiff-close-all-folds)
+  (evil-define-minor-mode-key 'normal 'vdiff-mode "zo" 'vdiff-open-fold)
+  (evil-define-minor-mode-key 'normal 'vdiff-mode "zR" 'vdiff-open-all-folds)
+  (evil-define-minor-mode-key 'motion 'vdiff-mode "go" 'vdiff-receive-changes)
+  (evil-define-minor-mode-key 'motion 'vdiff-mode "gp" 'vdiff-send-changes)
+** Hydra
+Using the [[https://github.com/abo-abo/hydra][hydra package]], =vdiff-hydra= 
allows quick movement and changes to be
+made in the buffer. By default it lives on the =h= command in the prefix
+map. Bind =vdiff-hydra/body= directly to customize this key binding.
+** Further customization
+The current customization options and there defaults are
+#+BEGIN_SRC emacs-lisp
+  ;; Whether to lock scrolling by default when starting vdiff
+  (setq vdiff-lock-scrolling t)
+  ;; external diff program/command to use
+  (setq vdiff-diff-program "diff")
+  ;; Extra arguments to pass to diff. If this is set wrong, you may
+  ;; break vdiff.
+  (setq vdiff-diff-program-args "")
+  ;; Unchanged lines to leave unfolded around a fold
+  (setq vdiff-fold-padding 6)
+  ;; Minimum number of lines to fold
+  (setq vdiff-min-fold-size 4)
+  ;; If non-nil, allow closing new folds around point after updates.
+  (setq vdiff-may-close-fold-on-point t)
+  ;; Function that returns the string printed for a closed fold. The arguments
+  ;; passed are the number of lines folded, the text on the first line, and the
+  ;; width of the buffer.
+  (setq vdiff-fold-string-function 'vdiff-fold-string-default)
+  ;; Default syntax table class code to use for identifying "words" in
+  ;; `vdiff-refine-this-change'. Some useful options are
+  ;; 
+  ;; "w"   (default) words
+  ;; "w_"  symbols (words plus symbol constituents)
+  ;; 
+  ;; For more information see
+  ;; 
+  (setq vdiff-default-refinement-syntax-code "w")
+  ;; If non-nil, automatically refine all hunks.
+  (setq vdiff-auto-refine nil)
+  ;; How to represent subtractions (i.e., deleted lines). The
+  ;; default is full which means add the same number of (fake) lines
+  ;; as those that were removed. The choice single means add only one
+  ;; fake line. The choice fringe means don't add lines but do
+  ;; indicate the subtraction location in the fringe.
+  (setq vdiff-subtraction-style 'full)
+  ;; Character to use for filling subtraction lines. See also
+  ;; `vdiff-subtraction-style'.
+  (setq vdiff-subtraction-fill-char ?-)
diff --git a/packages/vdiff/img/hydra.png b/packages/vdiff/img/hydra.png
new file mode 100644
index 0000000..f826eb2
Binary files /dev/null and b/packages/vdiff/img/hydra.png differ
diff --git a/packages/vdiff/img/leuven.png b/packages/vdiff/img/leuven.png
new file mode 100644
index 0000000..1fc413e
Binary files /dev/null and b/packages/vdiff/img/leuven.png differ
diff --git a/packages/vdiff/img/leuven3.png b/packages/vdiff/img/leuven3.png
new file mode 100644
index 0000000..fae54ec
Binary files /dev/null and b/packages/vdiff/img/leuven3.png differ
diff --git a/packages/vdiff/img/wide-screen.png 
new file mode 100644
index 0000000..67e9125
Binary files /dev/null and b/packages/vdiff/img/wide-screen.png differ
diff --git a/packages/vdiff/vdiff.el b/packages/vdiff/vdiff.el
new file mode 100644
index 0000000..c17023a
--- /dev/null
+++ b/packages/vdiff/vdiff.el
@@ -0,0 +1,2108 @@
+;;; vdiff.el --- A diff tool similar to  vimdiff -*- lexical-binding: t; -*-
+;; Copyright (C) 2017  Free Software Foundation, Inc.
+;; Author: Justin Burkett <address@hidden>
+;; Maintainer: Justin Burkett <address@hidden>
+;; URL: https://github.com/justbur/emacs-vdiff
+;; Version: 0.2
+;; Keywords: diff
+;; Package-Requires: ((emacs "24.4") (hydra "0.13.0"))
+;; 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 3 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
+;; 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 <http://www.gnu.org/licenses/>.
+;;; News:
+;; Version 0.2
+;;   * First ELPA Release
+;;; Commentary:
+;; A tool like vimdiff for Emacs
+;; vdiff compares two or three buffers on the basis of the output from the diff
+;; tool. The buffers are kept synchronized so that as you move through one of
+;; the buffers the top of the active buffer aligns with the corresponding top 
+;; the other buffer(s). This is similar to how ediff works, but in ediff you 
+;; a third "control buffer" to move through the diffed buffers. The key
+;; difference is that in vdiff you are meant to actively edit one of the 
+;; and the display will update automatically for the other buffer. Similar to
+;; ediff, vdiff provides commands to "send" and "receive" hunks from one buffer
+;; to the other as well as commands to traverse the diff hunks, which are 
+;; if you are trying to merge changes. In contrast to ediff, vdiff also 
+;; folding capabilities to fold sections of the buffers that don't contain
+;; changes. This folding occurs automatically. Finally, you are encouraged to
+;; bind a key to `vdiff-hydra/body', which will use hydra.el (in ELPA) to 
+;; a convenient transient keymap containing most of the useful vdiff commands.
+;; This functionality is all inspired by (but not equivalent to) the vimdiff
+;; tool from vim.
+;; See https://github.com/justbur/emacs-vdiff for more information
+;;; Code:
+(require 'cl-lib)
+(eval-when-compile (require 'subr-x))
+(require 'diff-mode)
+(require 'hydra)
+(require 'smerge-mode)
+(defvar vdiff-mode)
+(defvar vdiff-3way-mode)
+(defgroup vdiff nil
+  "Diff tool that is like vimdiff"
+  :tag "Vdiff"
+  :group 'tools)
+(defcustom vdiff-lock-scrolling t
+  "Whether to lock scrolling by default when starting
+  :type 'boolean)
+(defcustom vdiff-diff-program "diff"
+  "diff program to use."
+  :type 'string)
+(defcustom vdiff-diff3-program "diff3"
+  "diff3 program to use."
+  :type 'string)
+(defcustom vdiff-diff-extra-args ""
+  "Extra arguments to pass to diff. If this is set wrong, you may
+break vdiff. It is empty by default."
+  :type 'string)
+(defcustom vdiff-fold-padding 6
+  "Unchanged lines to leave unfolded around a fold"
+  :type 'integer)
+(defcustom vdiff-min-fold-size 4
+  "Minimum number of lines to fold"
+  :type 'integer)
+(defcustom vdiff-may-close-fold-on-point t
+  "If non-nil, allow closing new folds around point after updates."
+  :type 'boolean)
+(defcustom vdiff-fold-string-function #'vdiff-fold-string-default
+  "Function that returns the string printed for a closed
+fold. The arguments passed are the number of lines folded, the
+text on the first line, and the width of the buffer."
+  :type 'function)
+(defcustom vdiff-default-refinement-syntax-code "w"
+  "Default syntax table class code to use for identifying
+\"words\" in \`vdiff-refine-this-hunk'. Some useful options are
+\"w\"   (default) words
+\"w_\"  symbols \(words plus symbol constituents\)
+For more information see
+  :type 'string)
+(defcustom vdiff-auto-refine nil
+  "If non-nil, automatically refine all hunks."
+  :type 'boolean)
+(defcustom vdiff-subtraction-style 'full
+  "How to represent subtractions (i.e., deleted lines). The
+default is full which means add the same number of (fake) lines
+as those that were removed. The choice single means add only one
+fake line. The choice fringe means don't add lines but do
+indicate the subtraction location in the fringe."
+  :type '(radio (const :tag "Add same number of fake lines" full)
+                (const :tag "Add single line" single)
+                (const :tag "Add no lines but use fringe" fringe)))
+(defcustom vdiff-subtraction-fill-char ?-
+  "Character to use for filling subtraction lines. See also
+  :type 'integer)
+(defcustom vdiff-use-ancestor-as-merge-buffer nil
+  "When in a merge conflict file and text from the ancestor file
+is included, `vdiff-merge-conflict' will use the ancestor file as
+the merge buffer (or target buffer) that will be saved when the
+merge is finished. The default is to show the original file with
+conflicts as the merge buffer."
+  :type 'boolean)
+(defface vdiff-addition-face
+  '((t :inherit diff-added))
+  "Face for additions")
+(defface vdiff-change-face
+  '((t :inherit diff-changed))
+  "Face for changes")
+(defface vdiff-closed-fold-face
+  '((t :inherit region))
+  "Face for closed folds")
+(defface vdiff-open-fold-face
+  '((t))
+  "Face for open folds")
+(defface vdiff-subtraction-face
+  '((t :inherit diff-removed))
+  "Face for subtractions")
+(defface vdiff-subtraction-fringe-face
+  '((t :inherit vdiff-subtraction-face))
+  "Face for subtraction fringe indicators")
+(defface vdiff-refine-changed
+  '((t :inherit diff-refine-changed))
+  "Face for word changes within a change hunk")
+(defface vdiff-refine-added
+  '((t :inherit diff-refine-added))
+  "Face for word changes within an addition hunk")
+(defface vdiff-target-face
+  '((t :inverse-video t :inherit warning))
+  "Face for selecting hunk targets.")
+(defvar vdiff--force-sync-commands '(next-line
+                                     previous-line
+                                     beginning-of-buffer
+                                     end-of-buffer)
+  "Commands that trigger sync in other buffer. There should not
+be a need to include commands that scroll the buffer here,
+because those are handled differently.")
+(defvar vdiff--diff-code-regexp
+  "^\\([0-9]+\\),?\\([0-9]+\\)?\\([adc]\\)\\([0-9]+\\),?\\([0-9]+\\)?")
+(defvar vdiff--diff3-code-regexp
+  "^\\([1-3]\\):\\([0-9]+\\),?\\([0-9]+\\)?\\([adc]\\)")
+(defvar vdiff--inhibit-window-switch nil)
+(defvar vdiff--inhibit-diff-update nil)
+(defvar vdiff--in-scroll-hook nil)
+;; (defvar vdiff--in-post-command-hook nil)
+(defvar vdiff--setting-vscroll nil)
+(defvar vdiff--after-change-timer nil)
+(defvar vdiff--after-change-refresh-delay 1)
+(defvar vdiff--new-command nil)
+(defvar vdiff--last-command nil)
+(defvar vdiff--case-options
+  '(("Don't ignore case" . "")
+    ("Ignore case (-i)" . "-i")))
+(defvar vdiff--whitespace-options
+  '(("Don't ignore whitespace" . "")
+    ("Ignore all whitespace (-w)" . "-w")
+    ("Ignore space changes (-b)" . "-b")
+    ("Ignore blank lines (-B)" . "-B")))
+;; Sessions
+(defvar vdiff--temp-session nil
+  "Temporarily stores new vdiff session globally.")
+(defvar-local vdiff--session nil
+  "Holds reference to local vdiff session in each vdiff buffer.")
+(cl-defstruct vdiff-session
+  ;; buffers
+  buffers
+  process-buffer
+  word-diff-output-buffer
+  ;; data
+  diff-data
+  line-maps
+  folds
+  all-folds-open
+  diff-stale
+  ;; other
+  window-config
+  case-args
+  whitespace-args
+  ;; Quit hooks
+  on-quit
+  prior-window-config
+  kill-buffers-on-quit)
+;; * Utilities
+(defun vdiff--maybe-int (str)
+  "Return an int>=0 from STR."
+  (let ((num (and str (string-to-number str))))
+    (when (and (numberp num)
+               (>= num 0))
+      num)))
+(defun vdiff--non-nil-list (&rest args)
+  "Make ARGS into list and remove nils."
+  (delq nil (apply #'list args)))
+(defun vdiff--buffer-a-p ()
+  (when (and
+         vdiff--session
+         (eq (current-buffer)
+             (car (vdiff-session-buffers vdiff--session))))
+    (current-buffer)))
+(defun vdiff--buffer-b-p ()
+  (when (and
+         vdiff--session
+         (eq (current-buffer)
+             (cadr (vdiff-session-buffers vdiff--session))))
+    (current-buffer)))
+(defun vdiff--buffer-c-p ()
+  (when (and
+         vdiff--session
+         (eq (current-buffer)
+             (nth 2 (vdiff-session-buffers vdiff--session))))
+    (current-buffer)))
+(defun vdiff--buffer-p ()
+  "Non-nil if in any vdiff buffer"
+  (cond ((vdiff--buffer-a-p) 'a)
+        ((vdiff--buffer-b-p) 'b)
+        ((vdiff--buffer-c-p) 'c)))
+(defun vdiff--unselected-buffers ()
+  (cl-remove-if
+   (lambda (buf) (or (eq buf (current-buffer))
+                     (not (buffer-live-p buf))))
+   (vdiff-session-buffers vdiff--session)))
+(defun vdiff--unselected-windows ()
+  (mapcar (lambda (buf) (get-buffer-window buf 0))
+          (vdiff--unselected-buffers)))
+(defun vdiff--all-windows ()
+  (remq nil
+        (mapcar (lambda (buf) (get-buffer-window buf 0))
+                (vdiff-session-buffers vdiff--session))))
+(defun vdiff--all-overlays (ovr)
+  (overlay-get ovr 'vdiff-hunk-overlays))
+(defun vdiff--other-overlays (ovr)
+  (remq ovr (vdiff--all-overlays ovr)))
+(defun vdiff--overlay-marker (ovr)
+  (let ((current (eq (current-buffer) (overlay-buffer ovr))))
+    (propertize
+     (format "%s%s\n"
+             (1+
+              (cl-position
+               (overlay-buffer ovr)
+               (vdiff-session-buffers vdiff--session)))
+             (if current " (to all) " ""))
+     'face 'vdiff-target-face)))
+(defun vdiff--add-overlay-marker (ovr)
+  (overlay-put ovr 'before-string
+               (concat (vdiff--overlay-marker ovr)
+                       (overlay-get ovr 'before-string))))
+(defun vdiff--remove-overlay-marker (ovr)
+  (overlay-put ovr 'before-string
+               (substring
+                (overlay-get ovr 'before-string)
+                (length (vdiff--overlay-marker ovr)))))
+(defun vdiff--read-3way-target (ovr &optional just-one)
+  "Read a target overlay when sending or receiving a hunk from
+one buffer to another. Only applies in 3-way diffs."
+  (when vdiff-3way-mode
+    (let* ((all-ovrs (vdiff--all-overlays ovr))
+           (other-ovrs (remq ovr all-ovrs))
+           (this-idx (cl-position ovr all-ovrs))
+           (marked-ovrs (if just-one other-ovrs all-ovrs))
+           target)
+      (unwind-protect
+          (progn
+            (mapc #'vdiff--add-overlay-marker marked-ovrs)
+            (setq target (1- (string-to-number
+                              (char-to-string
+                               (read-char "Select target: ")))))
+            (cond ((or (not (member target (list 0 1 2)))
+                       (and just-one (= target this-idx)))
+                   (user-error "Invalid target"))
+                  ((= target this-idx)
+                   (message "all others %s %s" target this-idx)
+                   other-ovrs)
+                  (t
+                   (message "just %s" (nth target all-ovrs))
+                   (list (nth target all-ovrs)))))
+        (mapc #'vdiff--remove-overlay-marker marked-ovrs)))))
+(defun vdiff--target-overlays (this-ovr &optional just-one)
+  (when (and (overlayp this-ovr)
+             (overlay-get this-ovr 'vdiff))
+    (let ((3way-target (vdiff--read-3way-target this-ovr just-one))
+          (other-ovrs (vdiff--other-overlays this-ovr)))
+      (cond ((and vdiff-3way-mode
+                  3way-target)
+             (cl-remove-if
+              (lambda (ovr)
+                (or (eq ovr this-ovr)
+                    (null (member ovr 3way-target))))
+              other-ovrs))
+            (vdiff-3way-mode
+             (user-error "vdiff: No target overlay"))
+            (t
+             (remq this-ovr other-ovrs))))))
+(defun vdiff--move-to-line (n)
+  (goto-char (point-min))
+  (forward-line (1- n)))
+(defun vdiff--overlay-at-pos (&optional pos)
+  "Return first vdiff overlay found at POS which defaults to
+  (let ((pos (or pos (point))))
+    (catch 'yes
+      (dolist (ovr (overlays-at pos))
+        (when (overlay-get ovr 'vdiff-type)
+          (throw 'yes ovr))))))
+(defun vdiff--hunk-at-point-p ()
+  "Return first vdiff hunk overlay found at point."
+  (let ((ovr (vdiff--overlay-at-pos)))
+    (and (overlayp ovr)
+         (overlay-get ovr 'vdiff-type)
+         (not (eq (overlay-get ovr 'vdiff-type) 'fold)))))
+(defun vdiff--fold-at-point-p ()
+  "Return first vdiff fold overlay found at point."
+  (let ((ovr (vdiff--overlay-at-pos)))
+    (and (overlayp ovr)
+         (overlay-get ovr 'vdiff-type)
+         (eq (overlay-get ovr 'vdiff-type) 'fold))))
+(defun vdiff--overlays-in-region (beg end)
+  "Return any vdiff overlays found within BEG and END."
+  (let (ovrs)
+    (dolist (ovr (overlays-in beg end))
+      (when (overlay-get ovr 'vdiff-type)
+        (push ovr ovrs)))
+    (nreverse ovrs)))
+(defun vdiff--maybe-exit-overlay (&optional up no-fold)
+  "Move point out of any vdiff overlays. Move down unless UP is
+non-nil. Ignore folds if NO-FOLD is non-nil."
+  (let* ((ovr (vdiff--overlay-at-pos))
+         (type (when ovr (overlay-get ovr 'vdiff-type))))
+    (when (and type
+               (or (not no-fold)
+                   (not (eq type 'fold))))
+      (goto-char
+       (if up
+           (1- (overlay-start ovr))
+         (1+ (overlay-end ovr)))))))
+(defmacro vdiff--with-all-buffers (&rest body)
+  "Execute BODY in all vdiff buffers."
+  `(dolist (buf (vdiff-session-buffers vdiff--session))
+     (when (buffer-live-p buf)
+       (with-current-buffer buf
+         ,@body))))
+;; * Toggles
+(defun vdiff-toggle-case (command-line-arg)
+  "Toggle ignoring of case in diff command."
+  (interactive
+   (list (cdr-safe
+          (assoc-string
+           (completing-read "Case options: "
+                            vdiff--case-options)
+           vdiff--case-options))))
+  (setf (vdiff-session-case-args vdiff--session)
+        command-line-arg)
+  (when vdiff-mode
+    (vdiff-refresh)))
+(defun vdiff-toggle-whitespace (command-line-arg)
+  "Toggle ignoring of whitespace in diff command."
+  (interactive
+   (list (cdr-safe
+          (assoc-string
+           (completing-read "Whitespace options: "
+                            vdiff--whitespace-options)
+           vdiff--whitespace-options))))
+  (setf (vdiff-session-whitespace-args vdiff--session)
+        command-line-arg)
+  (when vdiff-mode
+    (vdiff-refresh)))
+;; * Main overlay refresh routine
+(defun vdiff-refresh (&optional post-refresh-function)
+  "Asynchronously refresh diff information.
+POST-REFRESH-FUNCTION is called when the process finishes."
+  (interactive)
+  (when (vdiff--buffer-p)
+    (let* ((tmp-a (make-temp-file "vdiff-a-"))
+           (tmp-b (make-temp-file "vdiff-b-"))
+           (tmp-c (when vdiff-3way-mode
+                    (make-temp-file "vdiff-c-")))
+           (prgm (if vdiff-3way-mode
+                     vdiff-diff3-program
+                   vdiff-diff-program))
+           (ses vdiff--session)
+           (cmd (mapconcat
+                 #'identity
+                 (vdiff--non-nil-list
+                  prgm
+                  (vdiff-session-whitespace-args ses)
+                  (vdiff-session-case-args ses)
+                  vdiff-diff-extra-args
+                  tmp-a tmp-b tmp-c)
+                 " "))
+           (buffers (vdiff-session-buffers ses))
+           (proc-buf (vdiff-session-process-buffer ses))
+           (proc (get-buffer-process proc-buf)))
+      (setq vdiff--last-command cmd)
+      (with-current-buffer (car buffers)
+        (write-region nil nil tmp-a nil 'quietly))
+      (with-current-buffer (cadr buffers)
+        (write-region nil nil tmp-b nil 'quietly))
+      (when vdiff-3way-mode
+        (with-current-buffer (nth 2 buffers)
+          (write-region nil nil tmp-c nil 'quietly)))
+      (when proc
+        (kill-process proc))
+      (with-current-buffer (get-buffer-create proc-buf)
+        (erase-buffer))
+      ;; (setq vdiff--last-command cmd)
+      (setq proc
+            (start-process-shell-command proc-buf proc-buf cmd))
+      (when vdiff-3way-mode
+        (process-put proc 'vdiff-3way t))
+      (process-put proc 'vdiff-session ses)
+      (process-put proc 'vdiff-tmp-a tmp-a)
+      (process-put proc 'vdiff-tmp-b tmp-b)
+      (process-put proc 'vdiff-post-refresh-function post-refresh-function)
+      (when tmp-c
+        (process-put proc 'vdiff-tmp-c tmp-c))
+      (set-process-sentinel proc #'vdiff--diff-refresh-1))))
+(defun vdiff--encode-range (insert beg &optional end)
+  "Normalize BEG and END of range. INSERT indicates that this is
+an addition when compared to other vdiff buffers."
+  (let* ((beg (vdiff--maybe-int beg))
+         (end (vdiff--maybe-int end)))
+    (cond ((and end insert)
+           (error "vdiff: multi-line range for a or d code"))
+          (insert
+           (cons (1+ beg) nil))
+          (t
+           (cons beg (or end beg))))))
+(defun vdiff--parse-diff (buf)
+  "Parse diff output in BUF and return list of hunks."
+  (let (res)
+    (with-current-buffer buf
+      (goto-char (point-min))
+      (while (re-search-forward vdiff--diff-code-regexp nil t)
+        (let* ((code (match-string 3)))
+          (push
+           (cl-case (string-to-char code)
+             (?a (list (vdiff--encode-range
+                        t (match-string 1))
+                       (vdiff--encode-range
+                        nil (match-string 4) (match-string 5))))
+             (?d (list (vdiff--encode-range
+                        nil (match-string 1) (match-string 2))
+                       (vdiff--encode-range
+                        t (match-string 4))))
+             (?c (list (vdiff--encode-range
+                        nil (match-string 1) (match-string 2))
+                       (vdiff--encode-range
+                        nil (match-string 4) (match-string 5))))
+             (t (error "vdiff: Unexpected code in parse-diff")))
+           res))))
+    (nreverse res)))
+(defun vdiff--parse-diff3 (buf)
+  "Parse diff3 output in BUF and return list of hunks."
+  (catch 'final-res
+    (let (res)
+      (with-current-buffer buf
+        (goto-char (point-min))
+        (let (a-el b-el c-el)
+          (while t
+            (cond ((looking-at vdiff--diff3-code-regexp)
+                   (let* ((file (string-to-number
+                                 (match-string-no-properties 1)))
+                          (code (match-string-no-properties 4))
+                          (range (vdiff--encode-range
+                                  (string= code "a")
+                                  (match-string-no-properties 2)
+                                  (match-string-no-properties 3))))
+                     (cl-case file
+                       (1 (setq a-el range))
+                       (2 (setq b-el range))
+                       (3 (setq c-el range)))))
+                  ((and a-el
+                        (looking-at-p "^===="))
+                   (push (list a-el b-el c-el) res)
+                   (setq a-el nil)
+                   (setq b-el nil)
+                   (setq c-el nil))
+                  ((eobp)
+                   (when (or a-el b-el)
+                     (push (list a-el b-el c-el) res))
+                   (throw 'final-res (nreverse res))))
+            (forward-line 1)))))))
+(defun vdiff--diff-refresh-1 (proc event)
+  "This is the sentinel for `vdiff-refresh'. It does the job of
+parsing the diff output and triggering the overlay updates."
+  (unless vdiff--inhibit-diff-update
+    (let ((parse-func (if (process-get proc 'vdiff-3way)
+                          #'vdiff--parse-diff3
+                        #'vdiff--parse-diff))
+          (ses (process-get proc 'vdiff-session))
+          (post-function (process-get proc 'vdiff-post-refresh-function))
+          finished)
+      (cond
+       ;; Was getting different exit code conventions depending on the
+       ;; version of diff used
+       ((or (string= "finished\n" event)
+            (string= "exited abnormally with code 1\n" event))
+        (setf (vdiff-session-diff-data ses)
+              (funcall parse-func (process-buffer proc)))
+        (setq finished t))
+       ((string-match-p "exited abnormally with code" event)
+        (setf (vdiff-session-diff-data ses) nil)
+        (setq finished t)
+        (message "vdiff process error: %s" event)))
+      (when finished
+        (vdiff--refresh-overlays ses)
+        (vdiff--refresh-line-maps ses)
+        (let ((vdiff--session ses))
+          (when vdiff-auto-refine
+            (vdiff-refine-all-hunks))
+          (when post-function
+            (funcall post-function)))
+        (delete-file (process-get proc 'vdiff-tmp-a))
+        (delete-file (process-get proc 'vdiff-tmp-b))
+        (when (process-get proc 'vdiff-tmp-c)
+          (delete-file (process-get proc 'vdiff-tmp-c))))
+      (setf (vdiff-session-diff-stale ses) nil))))
+(defun vdiff--remove-all-overlays ()
+  "Remove all vdiff overlays in both vdiff buffers."
+  (when (vdiff--buffer-p)
+    (vdiff--with-all-buffers
+     (remove-overlays (point-min) (point-max) 'vdiff t))))
+(defun vdiff-save-buffers ()
+  "Save all vdiff buffers."
+  (interactive)
+  (vdiff--with-all-buffers (save-buffer)))
+;; * Word diffs
+(defun vdiff--overlay-to-words (&optional ovr syntax-code)
+  "Convert OVR to string of \"words\", one per line."
+  (let* ((ovr (or ovr (vdiff--overlay-at-pos)))
+         (word-syn (or syntax-code
+                       vdiff-default-refinement-syntax-code))
+         (not-word-syn (concat "^" word-syn))
+         last-word-end buf-syntax ovr-text)
+    (with-current-buffer (overlay-buffer ovr)
+      (setq buf-syntax (syntax-table))
+      (setq ovr-text (buffer-substring-no-properties
+                      (overlay-start ovr)
+                      (overlay-end ovr))))
+    (with-temp-buffer
+      (set-syntax-table buf-syntax)
+      (insert ovr-text)
+      (goto-char (point-min))
+      (skip-syntax-forward not-word-syn)
+      (delete-region (point-min) (point))
+      (while (not (eobp))
+        (skip-syntax-forward word-syn)
+        (insert "\n")
+        (setq last-word-end (point))
+        (skip-syntax-forward not-word-syn)
+        (delete-region last-word-end (point)))
+      (buffer-string))))
+(defun vdiff--diff-words (this-ovr other-ovr &optional syntax-code)
+  "Diff \"words\" between THIS-OVR and OTHER-OVR"
+  (when (and (eq (overlay-get this-ovr 'vdiff-type) 'change)
+             (overlayp other-ovr))
+    (let* ((a-words (vdiff--overlay-to-words this-ovr syntax-code))
+           (b-words (vdiff--overlay-to-words other-ovr syntax-code))
+           (tmp-file-a (make-temp-file "vdiff-word-a-"))
+           (tmp-file-b (make-temp-file "vdiff-word-b-"))
+           (out-buffer (get-buffer-create
+                        (vdiff-session-word-diff-output-buffer
+                         vdiff--session)))
+           (a-result '())
+           (b-result '()))
+      (write-region a-words nil tmp-file-a nil 'quietly)
+      (write-region b-words nil tmp-file-b nil 'quietly)
+      (with-current-buffer out-buffer (erase-buffer))
+      (let ((exit-code (call-process
+                        vdiff-diff-program nil out-buffer nil tmp-file-a 
+        (delete-file tmp-file-a)
+        (delete-file tmp-file-b)
+        (when (= exit-code 1)
+          (with-current-buffer out-buffer
+            (goto-char (point-min))
+            (while (re-search-forward vdiff--diff-code-regexp nil t)
+              (let ((a-change (list (string-to-number (match-string 1))))
+                    (b-change (list (string-to-number (match-string 4)))))
+                (forward-line 1)
+                (while (and (not (eobp))
+                            (not (looking-at-p vdiff--diff-code-regexp)))
+                  (cond ((looking-at-p "^<")
+                         (push (buffer-substring-no-properties
+                                (+ 2 (point)) (line-end-position))
+                               a-change))
+                        ((looking-at-p "^>")
+                         (push (buffer-substring-no-properties
+                                (+ 2 (point)) (line-end-position))
+                               b-change)))
+                  (forward-line 1))
+                (when (cdr a-change)
+                  (push (nreverse a-change) a-result))
+                (when (cdr b-change)
+                  (push (nreverse b-change) b-result))))
+            (cons (nreverse a-result) (nreverse b-result))))))))
+(defun vdiff-refine-this-hunk (&optional syntax-code ovr)
+  "Highlight word differences in current hunk.
+This uses `vdiff-default-refinement-syntax-code' for the
+definition of a \"word\", unless one is provided using
+  (interactive (list vdiff-default-refinement-syntax-code
+                     (vdiff--overlay-at-pos)))
+  (let* ((ovr (or ovr (vdiff--overlay-at-pos)))
+         (target-ovr (car (vdiff--target-overlays ovr)))
+         (word-syn (or syntax-code
+                       vdiff-default-refinement-syntax-code))
+         (not-word-syn (concat "^" word-syn))
+         (type (overlay-get ovr 'vdiff-type))
+         (face (if (eq type 'addition)
+                   'vdiff-refine-added
+                 'vdiff-refine-changed))
+         instructions ovr-ins)
+    (if (fboundp 'smerge-refine-regions)
+        (when (and ovr target-ovr)
+          (smerge-refine-regions
+           (with-current-buffer (overlay-buffer ovr)
+             (copy-marker (overlay-start ovr)))
+           (overlay-end ovr)
+           (with-current-buffer (overlay-buffer target-ovr)
+             (copy-marker (overlay-start target-ovr)))
+           (overlay-end target-ovr)
+           `((face . ,face)
+             (vdiff . t)
+             (vdiff-refinement . t))))
+      (when (and ovr
+                 target-ovr
+                 (consp (setq instructions
+                              (vdiff--diff-words ovr target-ovr))))
+        (dolist (curr-ovr (vdiff--all-overlays ovr))
+          (setq ovr-ins (if (eq curr-ovr ovr)
+                            (car instructions)
+                          (cdr instructions)))
+          (with-current-buffer (overlay-buffer curr-ovr)
+            (save-excursion
+              (let ((current-word-n 1))
+                (goto-char (overlay-start curr-ovr))
+                (skip-syntax-forward not-word-syn)
+                (dolist (ins ovr-ins)
+                  (dotimes (_ (- (car ins) current-word-n))
+                    (skip-syntax-forward word-syn)
+                    (skip-syntax-forward not-word-syn))
+                  (setq current-word-n (car ins))
+                  (let* ((words (cdr ins))
+                         (word-ovr
+                          (make-overlay
+                           (point)
+                           (progn
+                             (dotimes (_ (length words))
+                               (skip-syntax-forward not-word-syn)
+                               (skip-syntax-forward word-syn))
+                             (point)))))
+                    (cl-incf current-word-n (length words))
+                    (overlay-put word-ovr 'vdiff t)
+                    (overlay-put word-ovr 'face face)
+                    (overlay-put word-ovr 'vdiff-refinement t)
+                    (skip-syntax-forward not-word-syn)))))))))))
+;; Not working yet
+;; (defun vdiff-refine-this-hunk-whitespace (ovr)
+;;   "Highlight whitespace differences in current hunk."
+;;   (interactive (list (vdiff--overlay-at-pos)))
+;;   (vdiff-refine-this-hunk "-" ovr))
+(defun vdiff-refine-this-hunk-symbol (ovr)
+  "Highlight symbol differences in current hunk."
+  (interactive (list (vdiff--overlay-at-pos)))
+  (vdiff-refine-this-hunk "w_" ovr))
+(defun vdiff-refine-this-hunk-word (ovr)
+  "Highlight word differences in current hunk."
+  (interactive (list (vdiff--overlay-at-pos)))
+  (vdiff-refine-this-hunk "w" ovr))
+(defun vdiff-remove-refinements-in-hunk (ovr)
+  "Remove any refinement overlays in the hunk overlay OVR."
+  (interactive (list (vdiff--overlay-at-pos)))
+  (dolist (chg-ovr (vdiff--all-overlays ovr))
+    (with-current-buffer (overlay-buffer chg-ovr)
+      (dolist (sub-ovr (overlays-in
+                        (overlay-start chg-ovr)
+                        (overlay-end chg-ovr)))
+        (when (overlay-get sub-ovr 'vdiff-refinement)
+          (delete-overlay sub-ovr))))))
+(defun vdiff-refine-all-hunks (&optional syntax-code)
+  "Highlight word differences in all hunks.
+This uses `vdiff-default-refinement-syntax-code' for the
+definition of a \"word\", unless one is provided using
+See `vdiff-default-refinement-syntax-code' to change the definition
+of a \"word\"."
+  (interactive)
+  ;; Doesn't work for diff3 yet
+  (when (vdiff--buffer-p)
+    (dolist (ovr (overlays-in (point-min) (point-max)))
+      (vdiff-refine-this-hunk syntax-code ovr))))
+;; Not working yet
+;; (defun vdiff-refine-all-hunks-whitespace ()
+;;   "Highlight whitespace differences in all hunks."
+;;   (interactive)
+;;   (vdiff-refine-all-hunks "-"))
+(defun vdiff-refine-all-hunks-symbol ()
+  "Highlight symbol differences in all hunks."
+  (interactive)
+  (vdiff-refine-all-hunks "w_"))
+(defun vdiff-refine-all-hunks-word ()
+  "Highlight word differences in all hunks."
+  (interactive)
+  (vdiff-refine-all-hunks "w"))
+;; * Bitmaps
+;; emacs-nox users don't have this function. There's probably a better solution
+;; here, but this seems to work.
+(unless (fboundp 'define-fringe-bitmap)
+  (defun define-fringe-bitmap (&rest _)
+    nil))
+  'vdiff--vertical-bar
+  (make-vector (frame-char-height) #b00100000)
+  nil 8 'center)
+  'vdiff--top-left-angle
+  (vconcat
+   [#b00111111]
+   (make-vector (1- (frame-char-height))
+                #b00100000))
+  nil 8 'bottom)
+  'vdiff--bottom-left-angle
+  (vconcat
+   (make-vector (1- (frame-char-height))
+                #b00100000)
+   [#b00111111])
+  nil 8 'top)
+  'vdiff--insertion-arrow
+  [#b00111111
+   #b00011111
+   #b00001111
+   #b00011111
+   #b00111011
+   #b01110001
+   #b11100000
+   #b11000000
+   #b10001111]
+  nil 8 'top)
+;; * Add overlays
+(defun vdiff--make-subtraction-string (n-lines)
+  "Make string to fill in space for lines missing in a buffer."
+  (let* ((width (- (window-text-width
+                    (get-buffer-window (current-buffer) 0)) 2))
+         (win-height (window-height
+                      (get-buffer-window (current-buffer) 0)))
+         (max-lines (floor (* 0.7 win-height)))
+         (truncate (> n-lines max-lines))
+         (trunc-n-lines
+          (cond ((eq 'single vdiff-subtraction-style) 1)
+                (truncate max-lines)
+                (t n-lines)))
+         (truncate-prefix-len 2)
+         string truncate-message)
+    (dotimes (_ trunc-n-lines)
+      (push (make-string width vdiff-subtraction-fill-char) string))
+    (when truncate
+      (setq truncate-message (format " +%d lines " (- n-lines trunc-n-lines)))
+      (push (concat (make-string truncate-prefix-len 
+                    truncate-message
+                    (make-string (- width truncate-prefix-len
+                                    (length truncate-message))
+                                 vdiff-subtraction-fill-char))
+            string)
+      (setq string (nreverse string)))
+    (if (eq vdiff-subtraction-style 'fringe)
+        (propertize
+         " "
+         'display '(left-fringe vdiff--insertion-arrow
+                                vdiff-subtraction-fringe-face))
+      (propertize
+       (concat (mapconcat #'identity string "\n") "\n")
+       'face 'vdiff-subtraction-face))))
+(defun vdiff--add-subtraction-overlay (n-lines)
+  (let* ((ovr (make-overlay (point) (1+ (point)))))
+    (overlay-put ovr 'before-string (vdiff--make-subtraction-string n-lines))
+    (overlay-put ovr 'vdiff-type 'subtraction)
+    (overlay-put ovr 'vdiff t)
+    ovr))
+(defun vdiff--add-hunk-overlay
+    (n-lines &optional addition n-subtraction-lines)
+  (let ((beg (point))
+        (end (save-excursion
+               (forward-line n-lines)
+               (point))))
+    (let ((ovr (make-overlay beg end))
+          (type (if addition 'addition 'change))
+          (face (if addition 'vdiff-addition-face 'vdiff-change-face)))
+      (overlay-put ovr 'vdiff-type type)
+      (overlay-put ovr 'face face)
+      (overlay-put ovr 'vdiff t)
+      (when (and n-subtraction-lines
+                 (> n-subtraction-lines 0))
+        (overlay-put ovr 'after-string
+                     (vdiff--make-subtraction-string n-subtraction-lines)))
+      ovr)))
+(defun vdiff-fold-string-default (n-lines first-line-text width)
+  "Produces default format line for closed folds. See
+  (let ((first-line-text (string-trim-left first-line-text))
+        (start (format "+--%d lines: " n-lines))
+        (width (1- width)))
+    (if (> (+ 1 (length first-line-text) (length start)) width)
+        (concat start
+                (substring-no-properties
+                 first-line-text 0 (- width (length start)))
+                "\n")
+        (concat start
+                first-line-text
+                (make-string
+                 (- width (length start) (length first-line-text))
+                 ?-)
+                "\n"))))
+(defun vdiff--make-fold (buffer range)
+  (with-current-buffer buffer
+    (let* ((beg-line (car range))
+           (end-line (cdr range))
+           (fold-start (vdiff--pos-at-line-beginning beg-line))
+           (first-line-text
+            (buffer-substring-no-properties
+             fold-start (save-excursion
+                          (goto-char fold-start)
+                          (line-end-position))))
+           (fold-end
+            (vdiff--pos-at-line-beginning end-line))
+           (ovr (make-overlay fold-start fold-end))
+           (text
+            (propertize (funcall vdiff-fold-string-function
+                                 (- end-line beg-line)
+                                 first-line-text
+                                 (window-width
+                                  (get-buffer-window buffer 0)))
+                        'face 'vdiff-closed-fold-face)))
+      (overlay-put ovr 'face 'vdiff-open-fold-face)
+      (overlay-put ovr 'vdiff-fold-text text)
+      (overlay-put ovr 'vdiff-type 'fold)
+      (overlay-put ovr 'vdiff t)
+      ovr)))
+(defun vdiff--narrow-fold-range (range)
+  (cons (+ vdiff-fold-padding (car range))
+        (1+ (- (cdr range) vdiff-fold-padding))))
+(defun vdiff--point-in-fold-p (fold)
+  (and (eq (current-buffer) (overlay-buffer fold))
+       (>= (point) (overlay-start fold))
+       (<= (point) (overlay-end fold))))
+(defun vdiff--add-folds (a-buffer b-buffer c-buffer folds)
+  (let ((ses vdiff--session))
+    (dolist (fold folds)
+      (let* ((a-range (vdiff--narrow-fold-range (nth 0 fold)))
+             (b-range (vdiff--narrow-fold-range (nth 1 fold)))
+             (c-range (when c-buffer
+                        (vdiff--narrow-fold-range (nth 2 fold))))
+             (fold-sig (list a-range b-range c-range)))
+        (cond
+         ;; ((gethash fold-sig (vdiff-session-folds ses) nil)
+         ;;  ;; Restore any overlays on same ranges
+         ;;  (let* ((old-folds (gethash fold-sig
+         ;;                             (vdiff-session-folds ses)))
+         ;;         (a-fold (car old-folds))
+         ;;         (b-fold (cadr old-folds))
+         ;;         (c-fold (nth 2 old-folds))
+         ;;         (a-beg (vdiff--pos-at-line-beginning
+         ;;                 (car a-range) a-buffer))
+         ;;         (a-end (vdiff--pos-at-line-beginning
+         ;;                 (cdr a-range) a-buffer))
+         ;;         (b-beg (vdiff--pos-at-line-beginning
+         ;;                 (car b-range) b-buffer))
+         ;;         (b-end (vdiff--pos-at-line-beginning
+         ;;                 (cdr b-range) b-buffer))
+         ;;         c-beg c-end)
+         ;;    (move-overlay a-fold a-beg a-end a-buffer)
+         ;;    (move-overlay b-fold b-beg b-end b-buffer)
+         ;;    (when c-fold
+         ;;      (setq c-beg (vdiff--pos-at-line-beginning
+         ;;                   (car c-range) c-buffer))
+         ;;      (setq c-end (vdiff--pos-at-line-beginning
+         ;;                   (cdr c-range) c-buffer))
+         ;;      (move-overlay c-fold c-beg c-end c-buffer))
+         ;;    (puthash fold-sig
+         ;;             (vdiff--non-nil-list a-fold b-fold c-fold)
+         ;;             (vdiff-session-folds ses))))
+         ((> (1+ (- (cdr a-range) (car a-range))) vdiff-min-fold-size)
+          ;; Ranges include padding
+          (let ((a-fold (vdiff--make-fold a-buffer a-range))
+                (b-fold (vdiff--make-fold b-buffer b-range))
+                (c-fold (when c-buffer
+                          (vdiff--make-fold c-buffer c-range))))
+            (dolist (fold (list a-fold b-fold c-fold))
+              (when fold
+                (cond ((or (vdiff-session-all-folds-open vdiff--session)
+                           (and (not vdiff-may-close-fold-on-point)
+                                (or (vdiff--point-in-fold-p a-fold)
+                                    (vdiff--point-in-fold-p b-fold)
+                                    (and c-fold
+                                         (vdiff--point-in-fold-p c-fold)))))
+                       (vdiff--set-open-fold-props fold))
+                      (t
+                       (vdiff--set-closed-fold-props fold)))))
+            (overlay-put a-fold 'vdiff-other-folds
+                         (vdiff--non-nil-list b-fold c-fold))
+            (overlay-put b-fold 'vdiff-other-folds
+                         (vdiff--non-nil-list a-fold c-fold))
+            (when c-fold
+              (overlay-put c-fold 'vdiff-other-folds (list a-fold b-fold)))
+            (puthash fold-sig (vdiff--non-nil-list a-fold b-fold c-fold)
+                     (vdiff-session-folds ses)))))))))
+(defun vdiff--remove-fold-overlays (_)
+  (clrhash (vdiff-session-folds vdiff--session)))
+(defun vdiff--add-diff-overlay (this-len other-len-1 other-len-2)
+  (let ((max-other-len (max (if other-len-1 other-len-1 0)
+                            (if other-len-2 other-len-2 0))))
+    (cond ((and (null other-len-1) (null other-len-2))
+           (vdiff--add-hunk-overlay this-len t))
+          ((null this-len)
+           (vdiff--add-subtraction-overlay max-other-len))
+          (t
+           (vdiff--add-hunk-overlay this-len nil
+                                    (- max-other-len this-len))))))
+(defun vdiff--refresh-overlays (session)
+  "Delete and recreate overlays in both buffers."
+  (when (vdiff--buffer-p)
+    (vdiff--remove-all-overlays)
+    (let ((a-buffer (car (vdiff-session-buffers session)))
+          (b-buffer (cadr (vdiff-session-buffers session)))
+          (c-buffer (nth 2 (vdiff-session-buffers session)))
+          (a-line 1)
+          (b-line 1)
+          (c-line 1)
+          (a-last-post 1)
+          (b-last-post 1)
+          (c-last-post 1)
+          (vdiff--inhibit-diff-update t)
+          folds)
+      (save-excursion
+        (with-current-buffer a-buffer
+          (widen)
+          (goto-char (point-min)))
+        (with-current-buffer b-buffer
+          (widen)
+          (goto-char (point-min)))
+        (when c-buffer
+          (with-current-buffer c-buffer
+            (widen)
+            (goto-char (point-min))))
+        (dolist (hunk (vdiff-session-diff-data session))
+          (let* ((a-range (nth 0 hunk))
+                 (b-range (nth 1 hunk))
+                 (c-range (nth 2 hunk))
+                 (a-beg (car a-range))
+                 (a-end (cdr a-range))
+                 (a-post (if a-end (1+ a-end) a-beg))
+                 (a-len (when a-end (1+ (- a-end a-beg))))
+                 (b-beg (car b-range))
+                 (b-end (cdr b-range))
+                 (b-post (if b-end (1+ b-end) b-beg))
+                 (b-len (when b-end (1+ (- b-end b-beg))))
+                 c-beg c-end c-post c-len)
+            (when c-buffer
+              (setq c-beg (car c-range))
+              (setq c-end (cdr c-range))
+              (setq c-post (if c-end (1+ c-end) c-beg))
+              (setq c-len (when c-end (1+ (- c-end c-beg)))))
+            (push (list (cons a-last-post (1- a-beg))
+                        (cons b-last-post (1- b-beg))
+                        (when c-beg
+                          (cons c-last-post (1- c-beg))))
+                  folds)
+            (setq a-last-post a-post)
+            (setq b-last-post b-post)
+            (when c-buffer
+              (setq c-last-post c-post))
+            (let (ovr-a ovr-b ovr-c)
+              (with-current-buffer a-buffer
+                (forward-line (- a-beg a-line))
+                (setq a-line a-beg)
+                (setq ovr-a (vdiff--add-diff-overlay a-len b-len c-len)))
+              (with-current-buffer b-buffer
+                (forward-line (- b-beg b-line))
+                (setq b-line b-beg)
+                (setq ovr-b (vdiff--add-diff-overlay b-len a-len c-len)))
+              (when c-buffer
+                (with-current-buffer c-buffer
+                  (forward-line (- c-beg c-line))
+                  (setq c-line c-beg)
+                  (setq ovr-c (vdiff--add-diff-overlay c-len a-len b-len))))
+              (let ((ovr-group (vdiff--non-nil-list ovr-a ovr-b ovr-c)))
+                (overlay-put ovr-a 'vdiff-a t)
+                (overlay-put ovr-a 'vdiff-hunk-overlays ovr-group)
+                (overlay-put ovr-b 'vdiff-b t)
+                (overlay-put ovr-b 'vdiff-hunk-overlays ovr-group)
+                (when c-buffer
+                  (overlay-put ovr-c 'vdiff-c t)
+                  (overlay-put ovr-c 'vdiff-hunk-overlays ovr-group))))))
+        (push (list (cons a-last-post
+                          (with-current-buffer a-buffer
+                            (line-number-at-pos (point-max))))
+                    (cons b-last-post
+                          (with-current-buffer b-buffer
+                            (line-number-at-pos (point-max))))
+                    (when c-buffer
+                      (cons c-last-post
+                            (with-current-buffer c-buffer
+                              (line-number-at-pos (point-max))))))
+              folds))
+      (vdiff--add-folds a-buffer b-buffer c-buffer folds))))
+;; * Send/Receive changes
+(defun vdiff--region-or-close-overlay ()
+  "Return region bounds if active. Otherwise check if there is an
+overlay at point and return it if there is. If this fails check a
+line above. Always search to the end of the current line as
+well. This only returns bounds for `interactive'."
+  (if (region-active-p)
+      (prog1
+          (list (region-beginning) (region-end))
+        (deactivate-mark))
+    (list (if (or (= (line-number-at-pos) 1)
+                  (vdiff--overlay-at-pos
+                   (line-beginning-position)))
+              (line-beginning-position)
+            (save-excursion
+              (forward-line -1)
+              (line-beginning-position)))
+          (save-excursion
+            (forward-line 1)
+            (point)))))
+(defun vdiff-send-changes (beg end &optional receive targets dont-refresh)
+  "Send changes in this hunk to another vdiff buffer. If the
+region is active, send all changes found in the region. Otherwise
+use the hunk under point or on the immediately preceding line."
+  (interactive (vdiff--region-or-close-overlay))
+  (let* ((vdiff--inhibit-diff-update t)
+         target-ovrs)
+    (dolist (ovr (overlays-in beg end))
+      (cond ((and receive
+                  (setq target-ovrs
+                        (or targets (vdiff--target-overlays ovr t))))
+             (let ((pos (overlay-start (car target-ovrs))))
+               (with-current-buffer (overlay-buffer (car target-ovrs))
+                 (vdiff-send-changes pos (1+ pos) nil nil t))))
+            ((memq (overlay-get ovr 'vdiff-type)
+                   '(change addition))
+             (vdiff--transmit-change ovr targets))
+            ((eq (overlay-get ovr 'vdiff-type) 'subtraction)
+             (vdiff--transmit-subtraction ovr targets))))
+    (unless dont-refresh
+      (vdiff-refresh #'vdiff--scroll-function))))
+(defun vdiff-send-changes-and-step ()
+  "Use `vdiff-send-changes' then `vdiff-next-hunk'."
+  (interactive)
+  (call-interactively 'vdiff-send-changes)
+  (call-interactively 'vdiff-next-hunk))
+(defun vdiff-receive-changes (beg end)
+  "Receive the changes corresponding to this position from
+another vdiff buffer. This is equivalent to jumping to the
+corresponding buffer and sending from there. If the region is
+active, receive all corresponding changes found in the
+region. Otherwise use the changes under point or on the
+immediately preceding line."
+  (interactive (vdiff--region-or-close-overlay))
+  (vdiff-send-changes beg end t nil t)
+  (vdiff-refresh #'vdiff--scroll-function))
+(defun vdiff-receive-changes-and-step ()
+  "Use `vdiff-receive-changes' then `vdiff-next-hunk'."
+  (interactive)
+  (call-interactively 'vdiff-receive-changes)
+  (call-interactively 'vdiff-next-hunk))
+(defun vdiff--transmit-change (ovr &optional targets)
+  "Send text in OVR to corresponding overlay in other buffer."
+  (if (not (overlayp ovr))
+      (message "No change found")
+    (let* ((target-ovrs (or targets (vdiff--target-overlays ovr)))
+           (text (buffer-substring-no-properties
+                  (overlay-start ovr)
+                  (overlay-end ovr))))
+      (dolist (target target-ovrs)
+        (with-current-buffer (overlay-buffer target)
+          (save-excursion
+            (goto-char (overlay-start target))
+            ;; subtractions are one char too big on purpose
+            (unless (eq (overlay-get target 'vdiff-type)
+                        'subtraction)
+              (delete-region (overlay-start target)
+                             (overlay-end target)))
+            (insert text))
+          (delete-overlay target)))
+      (delete-overlay ovr))))
+(defun vdiff--transmit-subtraction (ovr &optional targets)
+  "Same idea as `vdiff--transmit-change' except we are
+just deleting text in another buffer."
+  (if (not (overlayp ovr))
+      (message "No change found")
+    (let* ((target-ovrs (or targets
+                            (vdiff--target-overlays ovr))))
+      (dolist (target target-ovrs)
+        (with-current-buffer (overlay-buffer target)
+          (delete-region (overlay-start target)
+                         (overlay-end target))
+          (delete-overlay target))))))
+;; * Scrolling and line syncing
+(defun vdiff--2way-entries (a-prior a-end a-post b-prior b-end b-post)
+  ;; a-prior  0     0 b-prior
+  ;; l-beg    1 +   1 b-beg
+  ;; l-beg    2 +   2 b-end
+  ;;          3 +   -
+  ;;          4 +   -
+  ;; l-end    5 +   -
+  ;; a-post   6     3 b-post
+  (let* (a-entries b-entries)
+    (dotimes (offset (1+ (max (- a-post a-prior)
+                              (- b-post b-prior))))
+      (let ((a-line (+ a-prior offset))
+            (b-line (+ b-prior offset)))
+        (cond ((= offset 0)
+               (push (list a-line b-line 0) a-entries)
+               (push (list b-line a-line 0) b-entries))
+              ((and a-end b-end
+                    (<= b-line b-end)
+                    (<= a-line a-end))
+               (push (list a-line b-line 0) a-entries)
+               (push (list b-line a-line 0) b-entries))
+              ((and (or (null a-end) (> a-line a-end))
+                    (<= b-line b-post))
+               (push (list b-line a-post (- a-line (or a-end a-prior) 1)) 
+              ((and (or (null b-end) (> b-line b-end))
+                    (<= a-line a-post))
+               (push (list a-line b-post (- b-line (or b-end b-prior) 1)) 
+    (push (list (1+ a-post) (1+ b-post) 0) a-entries)
+    (push (list (1+ b-post) (1+ a-post) 0) b-entries)
+    (cons (nreverse a-entries) (nreverse b-entries))))
+(defun vdiff--set-cons (vars expr)
+  (setf (car vars) (car expr))
+  (setf (cdr vars) (cdr expr)))
+(defun vdiff--refresh-line-maps (session)
+  "Sync information in `vdiff--line-map' with
+  (when (vdiff--buffer-p)
+    (let ((vdiff--inhibit-diff-update t)
+          (a-b (list (list 0 0 0)))
+          (b-a (list (list 0 0 0)))
+          (a-c (list (list 0 0 0)))
+          (c-a (list (list 0 0 0)))
+          (b-c (list (list 0 0 0)))
+          (c-b (list (list 0 0 0))))
+      (dolist (hunk (vdiff-session-diff-data session))
+        (let* ((a-lines (nth 0 hunk))
+               (a-beg (car a-lines))
+               (a-prior (1- a-beg))
+               (a-end (cdr a-lines))
+               (a-post (if a-end (1+ a-end) a-beg))
+               (b-lines (nth 1 hunk))
+               (b-beg (car b-lines))
+               (b-prior (1- b-beg))
+               (b-end (cdr b-lines))
+               (b-post (if b-end (1+ b-end) b-beg))
+               (c-lines (nth 2 hunk)))
+          (let ((new-a-b
+                 (vdiff--2way-entries a-prior a-end a-post b-prior b-end 
+            (setq a-b (nconc a-b (car new-a-b)))
+            (setq b-a (nconc b-a (cdr new-a-b)))
+            (when c-lines
+              (let* ((c-beg (car c-lines))
+                     (c-prior (1- c-beg))
+                     (c-end (cdr c-lines))
+                     (c-post (if c-end (1+ c-end) c-beg))
+                     (new-a-c
+                      (vdiff--2way-entries a-prior a-end a-post c-prior c-end 
+                     (new-b-c
+                      (vdiff--2way-entries b-prior b-end b-post c-prior c-end 
+                (setq a-c (nconc a-c (car new-a-c)))
+                (setq c-a (nconc c-a (cdr new-a-c)))
+                (setq b-c (nconc b-c (car new-b-c)))
+                (setq c-b (nconc c-b (cdr new-b-c))))))))
+      (setf (vdiff-session-line-maps session)
+            (if vdiff-3way-mode
+                (list (list 'a a-b a-c)
+                      (list 'b b-a b-c)
+                      (list 'c c-a c-b))
+              (list (list 'a a-b)
+                    (list 'b b-a)))))))
+(defun vdiff--translate-line (line &optional from-buffer)
+  "Translate LINE in buffer A to corresponding line in buffer
+B. Go from buffer B to A if B-to-A is non nil."
+  (interactive (list (line-number-at-pos)))
+  (let* ((from-buffer (or from-buffer (vdiff--buffer-p)))
+         (maps
+          (cdr
+           (assq from-buffer (vdiff-session-line-maps vdiff--session))))
+         last-entry res-1 res-2)
+    (dolist (map maps)
+      (setq last-entry
+            (catch 'closest
+              (let (prev-entry)
+                (dolist (entry map)
+                  (let ((map-line (car entry)))
+                    (cond ((< map-line line)
+                           (setq prev-entry entry))
+                          ((= map-line line)
+                           (throw 'closest entry))
+                          (t
+                           (throw 'closest prev-entry)))))
+                (throw 'closest prev-entry))))
+      (unless last-entry
+        (setq last-entry (list line line))
+        (message "Error in line translation %s %s" line from-buffer))
+      (if res-1
+          (setq res-2 (cons (+ (- line (car last-entry)) (cadr last-entry))
+                            (nth 2 last-entry)))
+        (setq res-1 (cons (+ (- line (car last-entry)) (cadr last-entry))
+                          (nth 2 last-entry)))))
+    (when (called-interactively-p 'interactive)
+      (message "This line: %s; Other line %s; vscroll-state %s; entry %s"
+               line res-1 (cdr res-1) last-entry))
+    (cons res-1 res-2)))
+(defun vdiff-switch-buffer (line)
+  "Jump to the line in another vdiff buffer that corresponds to
+the current one."
+  (interactive (list (line-number-at-pos)))
+  (let ((line (caar (vdiff--translate-line line))))
+    (select-window (car (vdiff--unselected-windows)))
+    (when line
+      (vdiff--move-to-line line))))
+(defun vdiff-restore-windows ()
+  "Restore initial window configuration."
+  (interactive)
+  (set-window-configuration
+   (vdiff-session-window-config vdiff--session)))
+(defun vdiff--pos-at-line-beginning (line &optional buffer)
+  "Return position at beginning of LINE in BUFFER (or current
+  (with-current-buffer (or buffer (current-buffer))
+    (save-excursion
+      (vdiff--move-to-line line)
+      (line-beginning-position))))
+(defun vdiff--set-vscroll-and-force-update (window &optional vscroll)
+  (run-at-time
+   nil nil
+   (lambda ()
+     (unless vdiff--setting-vscroll
+       (let ((vdiff--setting-vscroll t))
+         (when (and (windowp window)
+                    (window-live-p window))
+           (when (and vscroll
+                      (eq vdiff-subtraction-style 'full))
+             (set-window-vscroll window vscroll))
+           (force-window-update window)))))))
+(defun vdiff--flag-new-command ()
+  (setq vdiff--new-command t))
+(defun vdiff--other-win-scroll-data (_window window-start &optional buf-c)
+  ;; need other-win, start-pos, pos and scroll-amt
+  (let* ((other-buf (nth (if buf-c 1 0) (vdiff--unselected-buffers)))
+         (other-win (nth (if buf-c 1 0) (vdiff--unselected-windows)))
+         (start-line (line-number-at-pos window-start))
+         (start-trans (vdiff--translate-line start-line))
+         (start-trans (if buf-c
+                          (cdr start-trans)
+                        (car start-trans)))
+         (trans (vdiff--translate-line
+                 (+ (count-lines window-start (point))
+                    start-line)))
+         (trans (if buf-c (cdr trans) (car trans))))
+    (when (and start-trans trans)
+      (list other-win
+            (vdiff--pos-at-line-beginning (car start-trans) other-buf)
+            (vdiff--pos-at-line-beginning (car trans) other-buf)
+            (cdr start-trans)))))
+(defun vdiff--scroll-function (&optional window window-start)
+  "Sync scrolling of all vdiff windows."
+  (let* ((window (or window (selected-window)))
+         (update-window-start (null window-start))
+         (window-start (or window-start (progn
+                                          ;; redisplay updates window-start in
+                                          ;; the case where the scroll function
+                                          ;; is called manually
+                                          (redisplay)
+                                          (window-start)))))
+    (when (and (eq window (selected-window))
+               (cl-every #'window-live-p (vdiff--all-windows))
+               (vdiff--buffer-p)
+               (not vdiff--in-scroll-hook)
+               vdiff--new-command)
+      (setq vdiff--new-command nil)
+      (let* ((2-scroll-data (vdiff--other-win-scroll-data
+                             window window-start))
+             (2-win (nth 0 2-scroll-data))
+             (2-start-pos (nth 1 2-scroll-data))
+             (2-pos (nth 2 2-scroll-data))
+             (2-scroll (nth 3 2-scroll-data))
+             ;; 1 is short for this; 2 is the first other and 3 is the second
+             (vdiff--in-scroll-hook t))
+        (message "%s" 2-scroll-data)
+        (when (and 2-pos 2-start-pos)
+          (set-window-point 2-win 2-pos)
+          ;; For some reason without this unless the vscroll gets eff'd
+          (unless (= (progn
+                       (when update-window-start
+                         (redisplay))
+                       (window-start 2-win))
+                     2-start-pos)
+            (set-window-start 2-win 2-start-pos))
+          (vdiff--set-vscroll-and-force-update 2-win 2-scroll))
+        (when vdiff-3way-mode
+          (let*
+              ((3-scroll-data (vdiff--other-win-scroll-data
+                               window window-start t))
+               (3-win (nth 0 3-scroll-data))
+               (3-start-pos (nth 1 3-scroll-data))
+               (3-pos (nth 2 3-scroll-data))
+               (3-scroll (nth 3 3-scroll-data)))
+            (when (and 3-start-pos 3-pos)
+              (set-window-point 3-win 3-pos)
+              (set-window-start 3-win 3-start-pos)
+              (vdiff--set-vscroll-and-force-update 3-win 3-scroll))))))))
+;; (defun vdiff--post-command-hook ()
+;;   "Sync scroll for `vdiff--force-sync-commands'."
+;;   ;; Use real-this-command because evil-next-line and evil-previous-line 
+;;   ;; they are next-line and previous-line
+;;   (when (and (memq this-command vdiff--force-sync-commands)
+;;              (not vdiff--in-post-command-hook)
+;;              (vdiff--buffer-p))
+;;     (let ((vdiff--in-post-command-hook t))
+;;       (when (and (sit-for 0.05)
+;;                  (eq vdiff-subtraction-style 'full))
+;;         (vdiff--scroll-function)))))
+(defun vdiff--after-change-function (&rest _)
+  (when (vdiff--buffer-p)
+    (unless (vdiff-session-diff-stale vdiff--session)
+      (setf (vdiff-session-diff-stale vdiff--session) t)
+      (when (timerp vdiff--after-change-timer)
+        (cancel-timer vdiff--after-change-timer))
+      (setq vdiff--after-change-timer
+            (run-with-idle-timer
+             vdiff--after-change-refresh-delay
+             nil (lambda ()
+                   (let ((vdiff-may-close-fold-on-point nil))
+                     (vdiff-refresh))))))))
+(defun vdiff--set-open-fold-props (ovr)
+  "Set overlay properties to open fold OVR."
+  (overlay-put ovr 'vdiff-fold-open t)
+  (overlay-put ovr 'display nil)
+  (overlay-put ovr 'intangible nil)
+  (overlay-put ovr 'before-string
+               (propertize
+                " " 'display '(left-fringe vdiff--top-left-angle)))
+  (overlay-put ovr 'line-prefix
+               (propertize
+                " " 'display '(left-fringe vdiff--vertical-bar)))
+  (overlay-put ovr 'after-string
+               (propertize
+                " " 'display '(left-fringe vdiff--bottom-left-angle))))
+(defun vdiff--set-closed-fold-props (ovr)
+  "Set overlay properties to close fold OVR."
+  (when (vdiff--point-in-fold-p ovr)
+    (goto-char (overlay-start ovr)))
+  (overlay-put ovr 'vdiff-fold-open nil)
+  (overlay-put ovr 'before-string nil)
+  (overlay-put ovr 'line-prefix nil)
+  (overlay-put ovr 'after-string nil)
+  (overlay-put ovr 'intangible t)
+  (overlay-put ovr 'display (overlay-get ovr 'vdiff-fold-text)))
+(defun vdiff-open-fold (beg end)
+  "Open folds between BEG and END, as well as corresponding ones
+in other vdiff buffer. If called interactively, either open fold
+at point or on prior line. If the region is active open all folds
+in the region."
+  (interactive (vdiff--region-or-close-overlay))
+  (dolist (ovr (overlays-in beg end))
+    (when (eq (overlay-get ovr 'vdiff-type) 'fold)
+      (vdiff--set-open-fold-props ovr)
+      (dolist (other-fold (overlay-get ovr 'vdiff-other-folds))
+        (vdiff--set-open-fold-props other-fold))))
+  (vdiff--scroll-function))
+(defun vdiff-close-fold (beg end)
+  "Close folds between BEG and END, as well as corresponding ones
+in other vdiff buffer. If called interactively, either close fold
+at point or on prior line. If the region is active close all
+folds in the region."
+  (interactive (vdiff--region-or-close-overlay))
+  (dolist (ovr (overlays-in beg end))
+    (when (eq (overlay-get ovr 'vdiff-type) 'fold)
+      (setf (vdiff-session-all-folds-open vdiff--session) nil)
+      (vdiff--set-closed-fold-props ovr)
+      (dolist (other-fold (overlay-get ovr 'vdiff-other-folds))
+        (vdiff--set-closed-fold-props other-fold))))
+  (vdiff--scroll-function))
+(defun vdiff-open-all-folds ()
+  "Open all folds in both buffers"
+  (interactive)
+  (save-excursion
+    (setf (vdiff-session-all-folds-open vdiff--session) t)
+    (vdiff-open-fold (point-min) (point-max))))
+(defun vdiff-close-all-folds ()
+  "Close all folds in both buffers"
+  (interactive)
+  (save-excursion
+    (setf (vdiff-session-all-folds-open vdiff--session) nil)
+    (vdiff-close-fold (point-min) (point-max))))
+(defun vdiff-close-other-folds ()
+  "Close all other folds in both buffers"
+  (interactive)
+  (dolist (ovr (overlays-in (point-min) (point-max)))
+    (when (and (eq (overlay-get ovr 'vdiff-type) 'fold)
+               (not (vdiff--point-in-fold-p ovr)))
+      (setf (vdiff-session-all-folds-open vdiff--session) nil)
+      (vdiff--set-closed-fold-props ovr)
+      (dolist (other-fold (overlay-get ovr 'vdiff-other-folds))
+        (vdiff--set-closed-fold-props other-fold)))))
+;; * Movement
+(defun vdiff--nth-hunk (&optional n use-folds)
+  "Return point at Nth hunk in buffer. Use folds instead of hunks
+with non-nil USE-FOLDS."
+  (let* ((n (or n 1))
+         (reverse (< n 0))
+         pnt)
+    (save-excursion
+      (dotimes (_i (abs n))
+        ;; Escape current overlay
+        (vdiff--maybe-exit-overlay reverse)
+        (setq pnt (point))
+        ;; Find next overlay
+        (while (not (or (and reverse (bobp))
+                        (and (not reverse) (eobp))
+                        (and use-folds
+                             (vdiff--fold-at-point-p))
+                        (and (not use-folds)
+                             (vdiff--hunk-at-point-p))))
+          (setq pnt
+                (goto-char (if reverse
+                               (previous-overlay-change pnt)
+                             (next-overlay-change pnt)))))))
+    pnt))
+(defun vdiff-next-hunk (arg)
+  "Jump to next change in this buffer."
+  (interactive "p")
+  (let ((count (or arg 1)))
+    (goto-char (vdiff--nth-hunk count))
+    (recenter)))
+(defun vdiff-previous-hunk (arg)
+  "Jump to previous change in this buffer."
+  (interactive "p")
+  (let ((count (or (- arg) -1)))
+    (goto-char (vdiff--nth-hunk count))
+    (recenter)))
+(defun vdiff-next-fold (arg)
+  "Jump to next fold in this buffer."
+  (interactive "p")
+  (let ((count (or arg 1)))
+    (goto-char (vdiff--nth-hunk count t))
+    (recenter)))
+(defun vdiff-previous-fold (arg)
+  "Jump to previous fold in this buffer."
+  (interactive "p")
+  (let ((count (or (- arg) -1)))
+    (goto-char (vdiff--nth-hunk count t))
+    (recenter)))
+;; * Session
+(defun vdiff--init-session
+    (buffer-a buffer-b
+     &optional buffer-c on-quit prior-window-config kill-buffers-on-quit)
+  (make-vdiff-session
+   :buffers (vdiff--non-nil-list buffer-a buffer-b buffer-c)
+   :process-buffer (generate-new-buffer-name " *vdiff* ")
+   :word-diff-output-buffer (generate-new-buffer-name " *vdiff-word* ")
+   :folds (make-hash-table :test 'equal :weakness 'value)
+   :case-args ""
+   :whitespace-args ""
+   :prior-window-config prior-window-config
+   :on-quit on-quit
+   :kill-buffers-on-quit kill-buffers-on-quit))
+;; * Entry points
+(defun vdiff-files (file-a file-b &optional rotate on-quit)
+  "Start a vdiff session. If called interactively, you will be
+asked to select two files. ROTATE adjusts the buffer's
+initial layout. A prefix argument can be used to set this
+variable interactively. ON-QUIT is a function to run on exiting
+the vdiff session. It is called with the two vdiff buffers as
+  (interactive
+   (let* ((file-a (read-file-name "File 1: "))
+          (default-directory
+            (file-name-directory file-a)))
+     (list
+      file-a
+      (read-file-name
+       (format "[File 1 %s] File 2: "
+               (file-name-nondirectory file-a)))
+      current-prefix-arg)))
+  (vdiff-buffers (find-file-noselect file-a)
+                 (find-file-noselect file-b)
+                 rotate on-quit))
+(defcustom vdiff-2way-layout-function 'vdiff-2way-layout-function-default
+  "Function to layout windows in 2way diffs.
+Should take the arguments (BUFFER-A BUFFER-B &optional ROTATE),
+where rotate switches from vertical to rotate (or vice
+  :group 'vdiff
+  :type 'function)
+(defun vdiff-2way-layout-function-default (buffer-a buffer-b &optional rotate)
+  (delete-other-windows)
+  (switch-to-buffer buffer-a)
+  (set-window-buffer
+   (if rotate
+       (split-window-vertically)
+     (split-window-horizontally))
+   buffer-b))
+(defun vdiff-buffers
+    (buffer-a buffer-b
+     &optional rotate on-quit restore-windows-on-quit kill-buffers-on-quit)
+  "Start a vdiff session. If called interactively, you will be
+asked to select two buffers. ROTATE adjusts the buffer's
+initial layout. A prefix argument can be used to set this
+variable interactively. ON-QUIT is a function to run on exiting
+the vdiff session. It is called with the two vdiff buffers as
+arguments. The last two options, RESTORE-WINDOWS-ON-QUIT and
+KILL-BUFFERS-ON-QUIT restore the previous window configuration
+and kill the vdiff buffers after quitting vdiff. Note that if you
+are going to kill the buffers you should probably be using a
+function for ON-QUIT to do something useful with the result."
+  (interactive
+   (let* ((buffer-a
+           (get-buffer
+            (read-buffer
+             "Buffer 1: " (current-buffer)))))
+     (list
+      buffer-a
+      (get-buffer
+       (read-buffer
+        (format "[Buffer 1 %s] Buffer 2: " buffer-a)
+        (window-buffer (next-window (selected-window) nil 0))))
+      current-prefix-arg)))
+  (let ((prior-window-config (when restore-windows-on-quit
+                               (current-window-configuration)))
+        (buffer-a (get-buffer buffer-a))
+        (buffer-b (get-buffer buffer-b)))
+    (if (functionp vdiff-2way-layout-function)
+        (funcall vdiff-2way-layout-function buffer-a buffer-b rotate)
+      (delete-other-windows)
+      (switch-to-buffer buffer-a)
+      (set-window-buffer
+       (if rotate
+           (split-window-vertically)
+         (split-window-horizontally))
+       buffer-b))
+    (setq vdiff--temp-session
+          (vdiff--init-session
+           buffer-a buffer-b nil
+           on-quit prior-window-config kill-buffers-on-quit))
+    (dolist (buf (list buffer-a buffer-b))
+      (with-current-buffer buf
+        (vdiff-mode -1)
+        (vdiff-3way-mode -1)
+        (vdiff-mode 1)))
+    (setq vdiff--temp-session nil)
+    (vdiff-refresh #'vdiff--scroll-function)))
+(defcustom vdiff-3way-layout-function 'vdiff-3way-layout-function-default
+  "Function to layout windows in 3way diffs.
+Should take the arguments (BUFFER-A BUFFER-B BUFFER-C)."
+  :group 'vdiff
+  :type 'function)
+(defun vdiff-3way-layout-function-default (buffer-a buffer-b buffer-c)
+  (delete-other-windows)
+  (switch-to-buffer buffer-a)
+  (set-window-buffer (split-window-vertically) buffer-c)
+  (set-window-buffer (split-window-horizontally) buffer-b))
+(defun vdiff-buffers3
+    (buffer-a buffer-b buffer-c
+     &optional on-quit restore-windows-on-quit kill-buffers-on-quit)
+  "Start a vdiff session. If called interactively, you will be
+asked to select two buffers. ON-QUIT is a function to run on
+exiting the vdiff session. It is called with the three vdiff
+buffers as arguments. The last two options, RESTORE-WINDOWS-ON-QUIT and
+KILL-BUFFERS-ON-QUIT restore the previous window configuration
+and kill the vdiff buffers after quitting vdiff. Note that if you
+are going to kill the buffers you should probably be using a
+function for ON-QUIT to do something useful with the result."
+  (interactive
+   (let* ((buffer-a
+           (get-buffer
+            (read-buffer
+             "Buffer 1: " (current-buffer))))
+          (buffer-b
+           (get-buffer
+            (read-buffer
+             (format "[2:%s] Buffer 3: " buffer-a)
+             (window-buffer (next-window (selected-window))))))
+          (buffer-c
+           (get-buffer
+            (read-buffer
+             (format "[1:%s 2:%s] Buffer 3: " buffer-a buffer-b)
+             (window-buffer (next-window (selected-window)))))))
+     (list buffer-a buffer-b buffer-c)))
+  (let ((prior-window-config (when restore-windows-on-quit
+                               (current-window-configuration)))
+        (buffer-a (get-buffer buffer-a))
+        (buffer-b (get-buffer buffer-b))
+        (buffer-c (get-buffer buffer-c)))
+    (funcall vdiff-3way-layout-function buffer-a buffer-b buffer-c)
+    (setq vdiff--temp-session
+          (vdiff--init-session
+           buffer-a buffer-b buffer-c
+           on-quit prior-window-config kill-buffers-on-quit))
+    (dolist (buf (list buffer-a buffer-b buffer-c))
+      (with-current-buffer buf
+        (vdiff-mode -1)
+        (vdiff-3way-mode -1)
+        (vdiff-3way-mode 1)))
+    (setq vdiff--temp-session nil)
+    (vdiff-refresh #'vdiff--scroll-function)))
+(defun vdiff-merge-conflict (file &optional restore-windows-on-quit)
+  "Start vdiff session using merge conflicts marked in FILE."
+  (interactive (list buffer-file-name))
+  (with-current-buffer (find-file-noselect file)
+    (require 'smerge-mode)
+    (let* ((smerge-buffer (current-buffer))
+           (mode major-mode)
+           (filename (file-name-directory (or buffer-file-name "-")))
+           (mine (generate-new-buffer
+                  (concat "*" filename " "
+                          (smerge--get-marker smerge-begin-re "MINE")
+                          "*")))
+           (other (generate-new-buffer
+                   (concat "*" filename " "
+                           (smerge--get-marker smerge-end-re "OTHER")
+                           "*")))
+           (ancestor (generate-new-buffer
+                  (concat "*" filename " "
+                          (smerge--get-marker smerge-end-re "ANCESTOR")
+                          "*")))
+           ancestor-used merge-buffer)
+      (with-current-buffer mine
+        (buffer-disable-undo)
+        (insert-buffer-substring smerge-buffer)
+        (goto-char (point-min))
+        (while (smerge-find-conflict)
+          (smerge-keep-n 1))
+        (buffer-enable-undo)
+        (set-buffer-modified-p nil)
+        (funcall mode))
+      (with-current-buffer ancestor
+        (buffer-disable-undo)
+        (insert-buffer-substring smerge-buffer)
+        (goto-char (point-min))
+        (while (smerge-find-conflict)
+          (when (match-beginning 2)
+            (setq ancestor-used t)
+            (smerge-keep-n 2)))
+        (buffer-enable-undo)
+        (set-buffer-modified-p nil)
+        (funcall mode))
+      (with-current-buffer other
+        (buffer-disable-undo)
+        (insert-buffer-substring smerge-buffer)
+        (goto-char (point-min))
+        (while (smerge-find-conflict)
+          (smerge-keep-n 3))
+        (buffer-enable-undo)
+        (set-buffer-modified-p nil)
+        (funcall mode))
+      (setq merge-buffer
+            (if (and ancestor-used vdiff-use-ancestor-as-merge-buffer)
+                ancestor
+              smerge-buffer))
+      (vdiff-buffers3
+       mine other merge-buffer
+       `(lambda (mine other merge-buffer)
+          (with-current-buffer ,smerge-buffer
+            (when (yes-or-no-p (format "Conflict resolution finished; save %s?"
+                                       buffer-file-name))
+              (when ,(and ancestor-used vdiff-use-ancestor-as-merge-buffer)
+                (erase-buffer)
+                (insert-buffer-substring merge-buffer))
+              (save-buffer)))
+          (when (buffer-live-p mine) (kill-buffer mine))
+          (when (buffer-live-p ,ancestor) (kill-buffer ,ancestor))
+          (when (buffer-live-p other) (kill-buffer other)))
+       restore-windows-on-quit))))
+(defun vdiff-files3 (file-a file-b file-c &optional on-quit)
+  "Start a vdiff session with 3 files. If called interactively,
+you will be asked to select two files."
+  (interactive
+   (let* ((file-a (read-file-name "File 1: "))
+          (default-directory
+            (file-name-directory file-a))
+          (file-b
+           (read-file-name
+            (format "[1:%s] File 2: "
+                    (file-name-nondirectory file-a))))
+          (file-c
+           (read-file-name
+            (format "[1:%s 2:%s] File 3: "
+                    (file-name-nondirectory file-a)
+                    (file-name-nondirectory file-b)))))
+     (list file-a file-b file-c)))
+  (vdiff-buffers3 (find-file-noselect file-a)
+                  (find-file-noselect file-b)
+                  (find-file-noselect file-c)
+                  on-quit))
+(defun vdiff-current-file ()
+  "Start vdiff between current buffer and its file on disk.
+This command can be used instead of `revert-buffer'.  If there is
+nothing to revert then this command fails."
+  (interactive)
+  ;; Taken from `ediff-current-file'
+  (unless (or (not (eq revert-buffer-function #'revert-buffer--default))
+              (not (eq revert-buffer-insert-file-contents-function
+               #'revert-buffer-insert-file-contents--default-function))
+              (and buffer-file-number
+                   (or (buffer-modified-p)
+                       (not (verify-visited-file-modtime
+                             (current-buffer))))))
+    (error "Nothing to revert"))
+  (let* ((auto-save-p (and (recent-auto-save-p)
+                           buffer-auto-save-file-name
+                           (file-readable-p buffer-auto-save-file-name)
+                           (y-or-n-p
+                            "Buffer has been auto-saved recently.  Compare 
with auto-save file? ")))
+         (file-name (if auto-save-p
+                        buffer-auto-save-file-name
+                      buffer-file-name))
+         (revert-buf-name (concat "FILE=" file-name))
+         (revert-buf (get-buffer revert-buf-name))
+         (current-major major-mode))
+    (unless file-name
+      (error "Buffer does not seem to be associated with any file"))
+    (when revert-buf
+      (kill-buffer revert-buf)
+      (setq revert-buf nil))
+    (setq revert-buf (get-buffer-create revert-buf-name))
+    (with-current-buffer revert-buf
+      (insert-file-contents file-name)
+      ;; Assume same modes:
+      (funcall current-major))
+    (vdiff-buffers revert-buf (current-buffer)
+                   nil
+                   (lambda (rbuf _)
+                     (when (buffer-live-p rbuf)
+                       (kill-buffer rbuf)))
+                   t)))
+;; (defvar vdiff-quit-hook nil)
+(defun vdiff-quit ()
+  "Quit `vdiff-mode' and clean up."
+  (interactive)
+  (if (null vdiff--session)
+      (user-error "Not in a vdiff buffer")
+    (let ((ses vdiff--session))
+      (when (functionp (vdiff-session-on-quit ses))
+        (apply (vdiff-session-on-quit ses)
+               (vdiff-session-buffers ses)))
+      (dolist (buf (list (vdiff-session-process-buffer
+                          ses)
+                         (vdiff-session-word-diff-output-buffer
+                          ses)))
+        (when (process-live-p (get-buffer-process buf))
+          (kill-process (get-buffer-process buf)))
+        (when (buffer-live-p buf) (kill-buffer buf)))
+      (dolist (buf (vdiff-session-buffers ses))
+        (when (buffer-live-p buf)
+          (with-current-buffer buf
+            (if vdiff-3way-mode
+                (vdiff-3way-mode -1)
+              (vdiff-mode -1)))
+          (when (vdiff-session-kill-buffers-on-quit ses)
+            (kill-buffer buf))))
+      ;; (run-hooks 'vdiff-quit-hook)
+      (when (vdiff-session-prior-window-config ses)
+        (set-window-configuration
+         (vdiff-session-prior-window-config ses))))
+    (setq vdiff--session nil)
+    (message "vdiff exited")))
+(defvar vdiff-mode-map (make-sparse-keymap))
+(defvar vdiff-3way-mode-map (make-sparse-keymap))
+(defvar vdiff-mode-prefix-map
+  (let ((map (make-sparse-keymap)))
+    (define-key map "c" 'vdiff-close-fold)
+    (define-key map "C" 'vdiff-close-all-folds)
+    (define-key map "f" 'vdiff-refine-this-hunk)
+    (define-key map "F" 'vdiff-refine-all-hunks)
+    (define-key map "g" 'vdiff-switch-buffer)
+    (define-key map "h" 'vdiff-hydra/body)
+    (define-key map "ic" 'vdiff-toggle-case)
+    (define-key map "iw" 'vdiff-toggle-whitespace)
+    (define-key map "n" 'vdiff-next-hunk)
+    (define-key map "N" 'vdiff-next-fold)
+    (define-key map "o" 'vdiff-open-fold)
+    (define-key map "O" 'vdiff-open-all-folds)
+    (define-key map "p" 'vdiff-previous-hunk)
+    (define-key map "P" 'vdiff-previous-fold)
+    (define-key map "q" 'vdiff-quit)
+    (define-key map "r" 'vdiff-receive-changes)
+    (define-key map "R" 'vdiff-receive-changes-and-step)
+    (define-key map "s" 'vdiff-send-changes)
+    (define-key map "S" 'vdiff-send-changes-and-step)
+    (define-key map "x" 'vdiff-remove-refinements-in-hunk)
+    (define-key map "t" 'vdiff-close-other-folds)
+    (define-key map "u" 'vdiff-refresh)
+    (define-key map "w" 'vdiff-save-buffers)
+    map))
+(defvar vdiff-scroll-lock-mode)
+(defun vdiff--buffer-init ()
+  ;; this is a buffer-local var
+  (setq vdiff--session vdiff--temp-session)
+  (setq cursor-in-non-selected-windows nil)
+  (add-hook 'after-save-hook #'vdiff-refresh nil t)
+  (add-hook 'after-change-functions #'vdiff--after-change-function nil t)
+  (add-hook 'pre-command-hook #'vdiff--flag-new-command nil t)
+  (setf (vdiff-session-window-config vdiff--session)
+        (current-window-configuration)))
+(defun vdiff--buffer-cleanup ()
+  (vdiff--remove-all-overlays)
+  (setq cursor-in-non-selected-windows t)
+  (remove-hook 'after-save-hook #'vdiff-refresh t)
+  (remove-hook 'after-change-functions #'vdiff--after-change-function t)
+  (remove-hook 'pre-command-hook #'vdiff--flag-new-command t)
+  (remove-hook 'window-scroll-functions #'vdiff--scroll-function t))
+(define-minor-mode vdiff-mode
+  "Minor mode active in a vdiff session involving two
+buffers. This sets up key bindings in `vdiff-mode-map' and adds
+hooks to refresh diff on changes. This will be enabled
+automatically after calling commands like `vdiff-files' or
+  nil " vdiff" 'vdiff-mode-map
+  (cond (vdiff-mode
+         (vdiff--buffer-init)
+         (when vdiff-lock-scrolling
+          (add-hook 'window-scroll-functions #'vdiff--scroll-function nil t)))
+        (t
+         (vdiff--buffer-cleanup))))
+(define-minor-mode vdiff-3way-mode
+  "Minor mode active in a vdiff session involving three
+buffers. This sets up key bindings in `vdiff-3way-mode-map' and
+adds hooks to refresh diff on changes. This will be enabled
+automatically after calling commands like `vdiff-files3' or
+  nil " vdiff3" 'vdiff-3way-mode-map
+  (cond (vdiff-3way-mode
+         (vdiff--buffer-init)
+         (when vdiff-lock-scrolling
+           (add-hook 'window-scroll-functions #'vdiff--scroll-function nil t)))
+        (t
+         (vdiff--buffer-cleanup))))
+(define-minor-mode vdiff-scroll-lock-mode
+  "Lock scrolling between vdiff buffers. This minor mode will be
+enabled automatically if `vdiff-lock-scrolling' is non-nil."
+  nil nil nil
+  (cond (vdiff-scroll-lock-mode
+         (unless (or vdiff-mode vdiff-3way-mode)
+           (user-error "Must enable vdiff-mode first"))
+         (vdiff--with-all-buffers
+          (add-hook 'window-scroll-functions #'vdiff--scroll-function nil t))
+         (message "Scrolling locked"))
+        (t
+         (vdiff--with-all-buffers
+          (remove-hook 'window-scroll-functions #'vdiff--scroll-function t))
+         (message "Scrolling unlocked"))))
+(defun vdiff--current-case ()
+  (if (string= "" (vdiff-session-case-args vdiff--session))
+      "off"
+    "on (-i)"))
+(defun vdiff--current-whitespace ()
+  (pcase (vdiff-session-whitespace-args vdiff--session)
+    ("" "off")
+    ("-w" "all (-w)")
+    ("-b" "space changes (-b)")
+    ("-B" "blank lines (-B)")))
+(defhydra vdiff-toggle-hydra (nil nil :hint nil)
+  (concat (propertize
+           "\
+ Toggles"
+           'face 'header-line)
+          "
+ _c_ ignore case (current: %s(vdiff--current-case))
+ _w_ ignore whitespace (current: %s(vdiff--current-whitespace))
+ _q_ back to main hydra")
+  ("c" vdiff-toggle-case)
+  ("w" vdiff-toggle-whitespace)
+  ("q" vdiff-hydra/body :exit t))
+(defhydra vdiff-hydra (nil nil :hint nil :foreign-keys run)
+  (concat (propertize
+           "\
+ Navigation^^^^          Refine^^   Transmit^^^^             Folds^^^^         
   Other^^^^                 "
+           'face 'header-line)
+          "
+ _n_/_N_ next hunk/fold  _f_ this   _s_/_S_ send (+step)     _o_/_O_ open 
(all)   _i_ ^ ^ toggles
+ _p_/_P_ prev hunk/fold  _F_ all    _r_/_R_ receive (+step)  _c_/_C_ close 
(all)  _u_ ^ ^ update diff
+ _g_^ ^  switch buffers  _x_ clear  ^ ^ ^ ^                  _t_ ^ ^ close 
other  _w_ ^ ^ save buffers
+ ^ ^^ ^                  ^ ^        ^ ^ ^ ^                  ^ ^ ^ ^           
   _q_/_Q_ quit hydra/vdiff
+ ignore case: %s(vdiff--current-case) | ignore whitespace: 
+  ("n" vdiff-next-hunk)
+  ("p" vdiff-previous-hunk)
+  ("N" vdiff-next-fold)
+  ("P" vdiff-previous-fold)
+  ("g" vdiff-switch-buffer)
+  ("s" vdiff-send-changes)
+  ("S" vdiff-send-changes-and-step)
+  ("r" vdiff-receive-changes)
+  ("R" vdiff-receive-changes-and-step)
+  ("o" vdiff-open-fold)
+  ("O" vdiff-open-all-folds)
+  ("c" vdiff-close-fold)
+  ("C" vdiff-close-all-folds)
+  ("t" vdiff-close-other-folds)
+  ("u" vdiff-refresh)
+  ("w" vdiff-save-buffers)
+  ("f" vdiff-refine-this-hunk)
+  ("F" vdiff-refine-all-hunks)
+  ("x" vdiff-remove-refinements-in-hunk)
+  ("i" vdiff-toggle-hydra/body :exit t)
+  ("q" nil :exit t)
+  ("Q" vdiff-quit :exit t))
+(provide 'vdiff)
+;;; vdiff.el ends here

reply via email to

[Prev in Thread] Current Thread [Next in Thread]