merge default into stable: wisp-mode, hg.sr.ht, clearer licensing information, receive-test
12 files changed, 774 insertions(+), 26 deletions(-)

M .hgsigs
M .hgtags
A => COPYING
M NEWS
M README.md
M configure.ac
A => tests/receive.scm
A => tests/receive.w
M wisp-guile.w
M wisp-mode.el
M wisp-reader.w
M wisp-scheme.w
M .hgsigs +3 -0
@@ 42,3 42,6 @@ 37175810518b562b91ddac6a58f97b3369e2dcc4
 2ef344bf2a34a679785624d147195d411a963a5e 0 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
+4aff9916b8c8eeaa45a9968b0acd2403fb84a7ab 0 iQIzBAABCAAdFiEE801qEjXQSQPNItXAE++NRSQDw+sFAmBnDNQACgkQE++NRSQDw+tziA/+OQeva7alx0dV4BqSi6ORreD+ri5r+InqJ+FIJwYOfL6lDYPsKfyPC+pHca1xzV6m10pxg+jQ6Z8caNsp8ECkvtNM6LiiGP7Vl/f/O4s2/BJQZo+5wwd2b4Vi0WBlyrHGXKrasmP9nuYeVxtf6HH5jIyT6ht5tSEPVPEwtbUHnznoYPWoQX7/tki3FcCL2wbFaZmlwJkBvo5ScCqVD+W3LwBUQx1Dmjn76vMap1BcjUA0lGg0NT6+61I2Tjw7dxjWulFGT+ahTb0YmrXyj6yR8NfKsHnXSe2oWT5mg1Sxxwaz7PDCrVNPy6UBOQekTybBDUL4EvAGFdCuI2PMojtivkmZpN1XGnjBc/aDoMkWPsyl4H+NzxuxbyqQvnZomXjWbdz8RHm0vbOGhkaPO0w6fx9XghQSdkAyGUFnikH2x5ayqlxa7ARSCdn67aZDp/zOd3Sp4jJvn44fNrq/ZsSGC081ep7Xa+/3XuXmCLbdhVmU/FOIDPsDfRa5FLMU60XLDfxbmyXqOm0hPi5Q9qMipQg4W9KATHj7/hsANDSCuGzlhCOHifzy/OfB2WXSIF5C+zHQsnjvdLnJDJV8ukwKQ0z6sfvtfstH4QeFj139Ab4FezIcpgSwywYGBeayet7KJ5AjY+IyBvQse+iTHSAME7DBlUieMJBM/S8jlV5HozQ=
+3f0729bc3804d04ede88e4e52bdfa0612f2d2e09 0 iQIzBAABCAAdFiEE801qEjXQSQPNItXAE++NRSQDw+sFAmBnDPAACgkQE++NRSQDw+tTew//ZoF04+bTQ1Ed0l9IlZ/Wa/rirRxY9rbYzFkevowoWvj1NcgJQX18l2KxSpuUM8CTKvVKDU/U4BA6rU3LCfjIH7mYV8mVplU4v6/7RB+wi1v0FQNjVi6sBhi7Akhxqivai+8UuZPxU6otXHdFtVuKAE9hR08U2hMA9UNe5xH/ZiLiYINdvkH9C6IRFvovmWXoNNf/aPyTZYd66MC7u9ITHZLuUG9iVcgTX+9kyYoMKteKW7oIqxRmRgH4+tQYW6PU1xTZDG12RE6r8IZsFq6Kc+uvm2hh5Iv7QYOTZk9eOIsPs3Yj60WdI1QZSzLPgnUnatAOs28y3Nm6thET8YK+DQMM6q8fUwJFgh5xs6c7FGr9Gs9iJdR9fAuOIqqsLBGcokI5zRzKF2hP9Ss3Y6JnNVRloX91U3NWj9tUG/HW4ZOPoBD6E3nG5ACp6TPkrrJVv2oP55vKr0xJvzNXy8a16VJwSI6YRVkkhSHl0ISSBCQF0QwSBST2Spo+A70PTxzWFu9QMkNp6YFGN8nus2cbquKu7cUxcrEblP8xytGJBQCijN6SAkRhcSdzFg4tdkH1JNJZGmH9o3g8IuwCMgcI62XxbBIgRPVPwox4Bc8vY5geIUIhgSRJmDuLSaQksUPdXSq1xjzCRd90ni2JkcXi0skxJ/xbFJAp/wUcPwR2mJU=
+8a1c7683735f0722cb256902c27f620839f56b39 0 iQIzBAABCAAdFiEE801qEjXQSQPNItXAE++NRSQDw+sFAmBrGkgACgkQE++NRSQDw+vmMBAAs3pmA0m2rqpkjwzNSQRKO2ygnvL4YEvWXaf/Pc9diqiOrYr2IF7+oVBYLXb3gyHGV0WIaWvMTqAQtqzUJhAxam+QDU4zm5h+VR7b/sWQ9xqt44/afccVaYdbFuK8+gPT4p0KVoJlQcKvLUNiMYmS2wLEIgn4+D/CYYRAy/jZ8V2tF8Ii0AZLkutgotwGzOLXUVkNxfs8q9NbuVGgqlww8LujwuYLTatR9GNhv0UVH1/mcEBzqyINivpeh/QAzsmUpqd4tyzAnVmfttHgtqtq0Ofp6JvWqkxn6GbzpG+JmlT5Kk5gIlz4WUL8MvO20yGQSn/TJ/LSO14ifAf99/aRmHeWRVxPHVsMGBGvuirpjNUUQyIQP3RaJHzQ8beh1Nd/hgmzwZukW/LYU3eiAo6Om7a+ISCFGyJ6ATHMAmEDFZdRE7SRwEWYVbUZFhCJGbC1hB9X3maHDfgJM6PyO5DFoaultK3341Pt0soZRHBgLO7DfTYaKcv360l0WXvtwLb7RylgCGXc/BHQsrLUas8qthmd7czyvX+c0VKAwTAd3nOht6EuejgMUIQusvHS9KnUftp+UU45Y5zo8iqprZpsTsJuctOBmyEhaoz+LWN8ikG6V+tnX5fT5tSJRTtc86lwHaM+rbwc8+Wct31Epj5rwbqnKoB/ctgcUjhrckjw5Y8=

          
M .hgtags +2 -0
@@ 49,3 49,5 @@ 92559bb0e31251b35837fde64c534e5bc3753911
 ba80bf370de0fe4867fc6ace066fa54af65f73d0 v1.0.3
 0ab387918c68c420fad357c7d1c504881adcd696 wisp-mode-0.2.7
 6e5925471629f1fcea8ffb31fbce77a8dc244394 v1.0.4
+91b69da97645da9d40c4223af97c00edfe20ed70 wisp-mode-0.2.8
+67df1796d2c3251835935ac4031b4b364c9f9ffa wisp-mode-0.2.9

          
A => COPYING +674 -0
@@ 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
+Source.
+
+  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
+measures.
+
+  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.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  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
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <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:
+
+    <program>  Copyright (C) <year>  <name of author>
+    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
+<http://www.gnu.org/licenses/>.
+
+  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
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

          
M NEWS +10 -0
@@ 1,3 1,13 @@ 
+wisp 1.0.5
+- explicitly allow using wisp as language under the expat-license for easier embedding in Guile-using games like Tsukundere Shitsumon: https://gitlab.com/leoprikler/tsukundere-shitsumon/
+
+wisp-mode 0.2.9
+- support imenu, thanks to Greg Reagle
+- fixes for melpa
+- bind keys to RET and TAB, not (kbd "<return>") and (kbd "<tab>") to allow completion to work.
+- use define key instead of local-set-key
+- cleanup ob-wisp; compatibility
+
 wisp 1.0.4
 - add one more setlocale fallback: If it cannot use unicode, wisp now proceeds with degraded operation rather than failing outright.
 

          
M README.md +26 -7
@@ 15,16 15,15 @@ Wisp: Whitespace to Lisp
 
 Wisp turns indentation based syntax into Lisp. The conversion is homoiconic[^h], generic[^g], and backwards-compatible[^b]. It is inspired by [project readable][], but tries to keep itself simple (and stupid: just add parens for indentation).
 
-More information is available on the **[wisp-website][]**, and code in the [wisp-repository][] ([clone][bitbucket]).
+More information is available on the **[wisp-website][]**, and code in the [wisp-repository][]
 
 For a short presentation, see [Why Wisp?](why-wisp.html)
 
 Note that this is full-fledged scheme, with all its capabilities like hygienic macros (programmable syntax!) and full tail recursion.
 
 [wisp-website]: http://draketo.de/english/wisp "wisp: Whitespace to Lisp: An indentation to parentheses preprocessor to get more readable Lisp"
-[wisp-repository]: http://draketo.de/proj/wisp "Mercurial Repository for Wisp: Whitespace to Lisp"
+[wisp-repository]: http://hg.sr.ht/~arnebab/wisp "Mercurial Repository for Wisp: Whitespace to Lisp"
 [project readable]: http://readable.sourceforge.net/ "Readable Lisp S-expressions Project"
-[bitbucket]: https://bitbucket.org/ArneBab/wisp/ "Clone of the Mercurial Repository for Wisp: Whitespace to Lisp"
 
 Requirements
 ------------

          
@@ 40,14 39,16 @@ Setup
 
 From the repository:
 
-* Get wisp: `hg clone http://draketo.de/proj/wisp` (needs [Mercurial](http://mercurial-scm.org))
+* Get wisp: `hg clone http://hg.sr.ht/~arnebab/wisp` (needs [Mercurial](http://mercurial-scm.org))
 * Bootstrap: `cd wisp && autoreconf -i && ./configure && make`
 
 From a release:
 
-* Get a release from [bitbucket.org/ArneBab/wisp/downloads/](https://bitbucket.org/ArneBab/wisp/downloads/)
+* Get a release from the wisp-website: [draketo.de/english/wisp][wisp-website]
 * Unpack and build: `tar xf [release].tar.gz; cd [release]; ./configure; make`
 
+[wisp-website]: http://draketo.de/english/wisp "wisp: Whitespace to Lisp: An indentation to parentheses preprocessor to get more readable Lisp"
+
 ### Install
 
 Install systemwide with `./configure --datarootdir=/usr/share && sudo make install`, then you can run `guile --language=wisp` anywhere. 

          
@@ 84,6 85,24 @@ If you want to use a curly-infix express
 
 [Fibonacci]: #fibonacci "Generation of the fibonacci sequence in wisp and s-expressions"
 
+License
+-------
+
+Wisp as project is licensed under the **GPLv3 or later**. See COPYING
+for details. This explicitly includes the files examples/* and emacs
+lisp files.
+
+The implementation of wisp as language and implementation of
+[SRFI-119](https://srfi.schemers.org/srfi-119/srfi-119.html) as well
+as the tests and supporting files are licensed under the lax
+**expat-license**: wisp-guile.w, wisp-scheme.w, wisp-reader.w,
+Makefile.am, configure.ac, bootstrap.sh, bootstrap-reader.sh,
+systaxtestsreader.sh, syntaxtests.sh, tests/*, testrunner.w,
+README.md, and other files required to use wisp as the language.
+
+Providing wisp the language under the expat-license to make it easier
+to embed wisp in games that use Guile.
+
 Notes
 -----
 

          
@@ 93,9 112,9 @@ Standardization: Wisp is standardized as
 
 [^ess]: It is “A SRFI”, not “An SRFI”, because SRFI is spoken as “surfie” and as such its spoken form does not begin with a vowel.
 
-Copyright: 2013--2015 Arne Babenhauserheide
+Copyright: 2013--2021 Arne Babenhauserheide
 
-License: GPLv3 or later
+License: GPLv3 or later, except where noted differently in the source files. wisp-scheme.w, wisp-guile.w and wisp-reader.w are licensed under the expat license. Wisp as complete project is under the GPLv3 or later.
 
 <script id='fb82u31'>(function(i){var f,s=document.getElementById(i);f=document.createElement('iframe');f.src='//api.flattr.com/button/view/?uid=ArneBab&button=compact&url='+encodeURIComponent(document.URL);f.title='Flattr';f.height=20;f.width=110;f.style.borderWidth=0;s.parentNode.insertBefore(f,s);})('fb82u31');</script>
 

          
M configure.ac +1 -1
@@ 1,7 1,7 @@ 
 dnl run `autoreconf -i` to generate a configure script. 
 dnl Then run ./configure to generate a Makefile.
 dnl Finally run make to generate the project.
-AC_INIT([wisp], [1.0.3],
+AC_INIT([wisp], [1.0.5],
         [arne_bab@web.de])
 # Add macros in m4/ to ensure that wisp builds without having Guile in the aclocal path
 AC_CONFIG_MACRO_DIR([m4])

          
A => tests/receive.scm +5 -0
@@ 0,0 1,5 @@ 
+(import (ice-9 receive) (srfi srfi-1))
+(write
+    (receive (car cdr)
+        (car+cdr '(car . cdr))
+      car))

          
A => tests/receive.w +5 -0
@@ 0,0 1,5 @@ 
+import (ice-9 receive) (srfi srfi-1)
+write 
+    receive : car cdr
+              car+cdr '(car . cdr)
+      . car

          
M wisp-guile.w +1 -1
@@ 19,7 19,7 @@ 
 ;; 
 ;; -Author: Arne Babenhauserheide
 
-;; Copyright (C) Arne Babenhauserheide (2013--2015). All Rights Reserved.
+;; Copyright (C) Arne Babenhauserheide (2013--2021). All Rights Reserved.
 
 ;; Permission is hereby granted, free of charge, to any person
 ;; obtaining a copy of this software and associated documentation

          
M wisp-mode.el +21 -13
@@ 5,7 5,7 @@ 
 ;;               from https://github.com/kwrooijen/indy/blob/master/indy.el
 
 ;; Author: Arne Babenhauserheide <arne_bab@web.de>
-;; Version: 0.2.7
+;; Version: 0.2.9
 ;; Keywords: languages, lisp, scheme
 ;; Homepage: http://www.draketo.de/english/wisp
 ;; Package-Requires: ((emacs "24.4"))

          
@@ 42,6 42,10 @@ 
 ;; 
 ;; ChangeLog:
 ;;
+;;  - 0.2.9: enabled imenu - thanks to Greg Reagle!
+;;  - 0.2.8: use electric-indent-inhibit instead of electric-indent-local-mode
+;;           rename gpl.txt to COPYING for melpa
+;;           use the variable defined by define-derived-mode
 ;;  - 0.2.7: dependency declared, always use wisp--prefix, homepage url
 ;;  - 0.2.6: remove unnecessary autoloads
 ;;  - 0.2.5: backtab chooses existing lower indentation values from previous lines.

          
@@ 56,17 60,6 @@ 
 
 (require 'scheme)
 
-; allow users to run hooks when they enter my mode
-(defvar wisp-mode-hook nil)
-
-; use this mode automatically
-;;;###autoload
-(add-to-list 'auto-mode-alist '("\\.w\\'" . wisp-mode))
-;;;###autoload
-(add-hook 'wisp-mode-hook
-          (lambda ()
-            (electric-indent-local-mode -1)))
-
 ; see http://www.emacswiki.org/emacs/DerivedMode
 
 ; font-lock-builtin-face 	font-lock-comment-delimiter-face

          
@@ 82,7 75,7 @@ 
 ; note: for easy testing: emacs -Q wisp-mode.el -e eval-buffer wisp-guile.w -e delete-other-windows
 
 
-(defvar wisp-builtin '("define" "define-syntax" "syntax-rules" "syntax-case" "define-syntax-rule" "defun" "let*" "let" "setq" "set!" "set" "if" "when" "while" "set!" "and" "or" "not" "char=?"))
+(defvar wisp-builtin '("and" "char=?" "define" "define-syntax" "define-syntax-rule" "defun" "if" "let" "let*" "not" "or" "set!" "set!" "set" "setq" "syntax-case" "syntax-rules" "when" "while")) ; alphabetical order
 
 ; TODO: Add special treatment for defun foo : bar baz ⇒ foo = function, bar and baz not.
 ; TODO: Add highlighting for `, , and other macro-identifiers.

          
@@ 91,6 84,7 @@ 
   `((
      ("\\`#!.*" . font-lock-comment-face) ; initial hashbang
      ("\"\\.\\*\\?" . font-lock-string-face) ; strings (anything between "")
+     ("[{}]" . font-lock-string-face)      ; emphasize curly infix
      ; ("^_+ *$" . font-lock-default-face) ; line with only underscores
                                            ; and whitespace shown as
                                            ; default text. This is just

          
@@ 228,15 222,29 @@ prev, not to prev+tab."
   (set (make-local-variable 'indent-tabs-mode) nil)
   (setq comment-start ";")
   (setq comment-end "")
+  ;; delimiters from https://docs.racket-lang.org/guide/symbols.html
+  ;; ( ) [ ] { } " , ' ` ; # | \
+  (setq imenu-generic-expression
+    '((nil "^define\\(/contract\\)? +:? *\\([^[ \n(){}\",'`;#|\\\]+\\)" 2)))
   (set (make-local-variable 'font-lock-comment-start-skip) ";+ *")
   (set (make-local-variable 'parse-sexp-ignore-comments) t)
   (set (make-local-variable 'font-lock-defaults) wisp-font-lock-keywords)
   (set (make-local-variable 'mode-require-final-newline) t)
   ;; bind keys to \r, not (kbd "<return>") to allow completion to work on RET
+  (define-key wisp-mode-map (kbd "C-c i") '("imenu" . imenu))
   (define-key wisp-mode-map (kbd "<tab>") '("indent line" . wisp--tab))
   (define-key wisp-mode-map (kbd "<backtab>") '("unindent line" . wisp--backtab))
   (define-key wisp-mode-map "\r" '("wisp newline" . wisp--return)))
 
+; use this mode automatically
+;;;###autoload
+(add-to-list 'auto-mode-alist '("\\.w\\'" . wisp-mode))
+;;;###autoload
+(add-hook 'wisp-mode-hook
+          (lambda ()
+            (setq electric-indent-inhibit t)))
+
+
                         
 
 (provide 'wisp-mode)

          
M wisp-reader.w +25 -3
@@ 1,9 1,31 @@ 
 ;; Language interface for Wisp in Guile
 ;;
-;; -Author: Arne Babenhauserheide
+;;; -Author: Arne Babenhauserheide
+
+;;; adapted from guile-sweet: https://gitorious.org/nacre/guile-sweet/source/ae306867e371cb4b56e00bb60a50d9a0b8353109:sweet/common.scm
+
+;;; Copyright (C) 2005-2014 by David A. Wheeler and Alan Manuel K. Gloria
+;;; Copyright (C) Arne Babenhauserheide (2014--2021). All Rights Reserved.
 
-; adapted from guile-sweet: https://gitorious.org/nacre/guile-sweet/source/ae306867e371cb4b56e00bb60a50d9a0b8353109:sweet/common.scm
-
+;;; Permission is hereby granted, free of charge, to any person
+;;; obtaining a copy of this software and associated documentation
+;;; files (the "Software"), to deal in the Software without
+;;; restriction, including without limitation the rights to use, copy,
+;;; modify, merge, publish, distribute, sublicense, and/or sell copies
+;;; of the Software, and to permit persons to whom the Software is
+;;; furnished to do so, subject to the following conditions:
+;;; 
+;;; The above copyright notice and this permission notice shall be
+;;; included in all copies or substantial portions of the Software.
+;;; 
+;;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+;;; EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+;;; MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+;;; NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+;;; BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+;;; ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+;;; CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+;;; SOFTWARE.
 
 ; adapted from spec.scm: https://gitorious.org/nacre/guile-sweet/source/ae306867e371cb4b56e00bb60a50d9a0b8353109:sweet/spec.scm
 define-module : language wisp spec

          
M wisp-scheme.w +1 -1
@@ 12,7 12,7 @@ exec guile -L . --language=wisp -s "$0" 
 ;; - in some cases the source line information is missing in backtraces.
 ;;   check for set-source-property!
 
-;; Copyright (C) Arne Babenhauserheide (2014--2015). All Rights Reserved.
+;; Copyright (C) Arne Babenhauserheide (2014--2021). All Rights Reserved.
 
 ;; Permission is hereby granted, free of charge, to any person
 ;; obtaining a copy of this software and associated documentation