Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Handle complete, but not unique input for completion in a sane way an…

…d apply multiple patches by Brent Goodrick:

Add an additional level of indirection for direct access to gimp-oblist-cache to instead use a new function called gimp-get-oblist-cache that restores it from the file on demand.  There was a case in one of the tests (I don't recall which) that ran afoul of a nil gimp-oblist-cache without it.

gimp-save-input-ring needs to check that there is an actual gimp-proc before attempting to use the buffer.

gimp-unit-test now calls gimp-quit at the very end, so that I could run the unit test in a tight loop to validate that the hang didn't show up again.

Don't allow gimp-script-p to fail when there is no file associated with the current buffer.  This can occur for gimp-mode buffers that are not associated with files (shows up because gimp-script-p is in magic-mode-alist).

Fix one case of hanging in `gimp-first-run-action'. Fix troubles in unit tests.
  • Loading branch information...
commit 932ef4ebdab92be6a5e5976ff4397445dbda5b80 1 parent 2793527
@pft authored
View
622 COPYING
@@ -0,0 +1,622 @@
+ 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
+
View
44 ChangeLog
@@ -1,6 +1,48 @@
+2009-10-11 Niels Giesen <niels.giesen@gmail.com>
+
+ * gimp-mode.el (gimp-complete): Add correct handling of complete,
+ but not unique function input, i.e., show that it is unique, and
+ offer the completions buffer. Handle end of completable & unique
+ function input (with further args) by adding a space char in the
+ buffer.
+ (gimp-first-run-action): Try and fix the situation where stuff is
+ already inserted into the buffer, but unfetched by a process
+ filter (thanks Brent). This is apparently one of the causes for
+ Emacs to hang during start-up. Testing showed that Emacs is far
+ more inclined to hang when changing (window-manager-defined)
+ windows when the two GIMP windows have come up back to Emacs,
+ either by mouse or ALT-TABbing. Have got no clue whatsoever how to
+ fix this.
+
+ (gimp-unit-test-completions): Applying patch by Brent Goodrick to
+ differentiate between tests that need GIMP to be run as a
+ subprocess and ones that don't. Add one test for latest changes to
+ gimp-complete.
+
+ Miscellaneous patches by Brent Goodrick:
+
+ Add an additional level of indi rection for direct access to
+ gimp-oblist-cache to instead use a new function called
+ gimp-get-oblist-cache that restores it from the file on demand.
+ There was a case in one of the tests (I don't recall which) that
+ ran afoul of a nil gimp-oblist-cache without it.
+
+ gimp-save-input-ring needs to check that there is an actual
+ gimp-proc before attempting to use the buffer.
+
+ gimp-unit-test now calls gimp-quit at the very end, so that I
+ could run the unit test in a tight loop to validate that the hang
+ didn't show up again.
+
+ Don't allow gimp-script-p to fail when there is no file associated
+ with the current buffer. This can occur for gimp-mode buffers that
+ are not associated with files (shows up because gimp-script-p is
+ in magic-mode-alist).
+
2009-10-02 Niels Giesen <niels.giesen@gmail.com>
- * gimp-mode.el (gimp-unit-test-execute): Applying patch by Brent Goodrick
+ * gimp-mode.el (gimp-unit-test-execute): Applying patch by Brent
+ Goodrick
2009-09-13 niels giesen <sharik@localhost>
View
BIN  gimp-cl-mode.el
Binary file not shown
View
2  gimp-init.el
@@ -63,7 +63,7 @@
(defun gimp-script-p ()
"Return t when current buffer holds a GIMP script."
- (when (string-match "gimp.*\.scm\\'" (buffer-file-name))
+ (when (and (buffer-file-name) (string-match "gimp.*\.scm\\'" (buffer-file-name)))
t))
(add-to-list 'magic-mode-alist
View
282 gimp-mode.el
@@ -567,7 +567,7 @@ Raise error if ITEM is not in the RING."
(cons "Gimp Help" 'gimp-help))
(define-key m [menu-bar gimp gimp-run]
- (cons "Run the gimp" 'run-gimp))
+ (cons "Run the GIMP" 'run-gimp))
m))
@@ -938,7 +938,7 @@ Argument EVENT is a mouse-event."
(gimp-string-match
"[[:space:]]*(define\\(-macro\\)?[[:space:]]+(?\\([[:word:]-?!><]+\\)"
str 2)))
- (if (and var-or-fun (not (member var-or-fun gimp-oblist-cache)))
+ (if (and var-or-fun (not (member var-or-fun (gimp-get-oblist-cache))))
(push var-or-fun gimp-oblist-cache))))
(defun dotted-to-list (dl)
@@ -1164,6 +1164,16 @@ or run command `gimp-cl-connect'.")
'gimp-first-run-action))))
(defun gimp-first-run-action (proc string)
+ ;; Seed the gimp-output with what has been seen so far in the process
+ ;; buffer, so that the call to gimp-progress below can detect if the prompt
+ ;; has happened quickly (to prevent a hang otherwise):
+ (setq gimp-output
+ (concat
+ (buffer-substring-no-properties
+ (point-min)
+ (point-max))
+ string))
+ (gimp-set-comint-filter) ;set comint filter for subsequent input
(set-process-sentinel
(gimp-proc)
(lambda (p s)
@@ -1171,28 +1181,28 @@ or run command `gimp-cl-connect'.")
(gimp-save-input-ring)
(kill-buffer (gimp-buffer))
(message "GIMP process ended."))))
- (switch-to-buffer (gimp-buffer))
- (let (buffer-read-only) ;make the buffer capable
+ (with-current-buffer (gimp-buffer)
+ (let (buffer-read-only) ;make the buffer capable
;of receiving user input etc.
- (insert string)
- (unless (string= (buffer-name)
- "*GIMP*")
- (rename-buffer "*GIMP*"))
- (setq scheme-buffer (current-buffer))
- (inferior-gimp-mode)
- (gimp-set-comint-filter) ;set comint filter for subsequent input
- (with-local-quit
- (gimp-progress (concat (current-message)
- "...waiting to finish (C-g to quit) ...")
- (lambda ()
- (not (string-match "^> $" gimp-output)))
- "done!")
+ (insert string)
+ (unless (string= (buffer-name)
+ "*GIMP*")
+ (rename-buffer "*GIMP*"))
+ (setq scheme-buffer (current-buffer))
+ (inferior-gimp-mode)
+ (with-local-quit
+ (gimp-progress (concat (current-message)
+ "...waiting to finish (C-g to quit) ...")
+ (lambda ()
+ (not (string-match "^> " gimp-output)))
+ "done!")
(gimp-restore-caches)
(gimp-restore-input-ring)
(unless gimp-inhibit-start-up-message
(gimp-shortcuts t))
+ (process-put (gimp-proc) 'listening t)
(message "%s The GIMP is loaded. Have FU." (or (current-message) ""))))
- (setq buffer-read-only nil))
+ (setq buffer-read-only nil)))
(defun gimp-progress (message test &optional end-text)
"Show MESSAGE with rotating thing at end while TEST yields a non-nil value.
@@ -1222,9 +1232,13 @@ Optional argument END-TEXT is the text appended to the message when TEST fails."
"Quit gimp session."
(interactive)
(gimp-save-input-ring)
- (gimp-eval-to-string "(gimp-quit 0)" t)
- (kill-buffer (gimp-buffer))
- (message "GIMP process ended."))
+ (if (gimp-buffer)
+ (progn
+ (gimp-eval-to-string "(gimp-quit 0)" t)
+ (kill-buffer (gimp-buffer))
+ (message "GIMP process ended.")
+ (setq gimp-output ""))
+ (message "GIMP process was not started.")))
;;;; Utility functions
(defun gimp-buffer ()
@@ -1316,6 +1330,11 @@ buffer, is found."
gimp-pdb-cache
(gimp-error-must-run-gimp)))
+(defun gimp-get-oblist-cache ()
+ (unless gimp-oblist-cache
+ (gimp-restore-caches))
+ gimp-oblist-cache)
+
(defun gimp-procedure-at-point (&optional as-string)
(let ((sym (when (gethash (symbol-at-point) (gimp-get-dump-hash))
(symbol-at-point))))
@@ -1506,10 +1525,11 @@ screwed up. It is wise then to preceed it with a call to
;; Input ring
(defun gimp-save-input-ring ()
"Save the input ring for subsequent sessions."
- (let ((r
- (with-current-buffer (gimp-buffer) comint-input-ring)))
- (with-temp-file (format "%s/emacs/emacs-%s" (gimp-dir) "comint-input-ring")
- (insert (format "%S" r)))))
+ (when (gimp-buffer)
+ (let ((r
+ (with-current-buffer (gimp-buffer) comint-input-ring)))
+ (with-temp-file (format "%s/emacs/emacs-%s" (gimp-dir) "comint-input-ring")
+ (insert (format "%S" r))))))
(defun gimp-restore-input-ring ()
(with-current-buffer (gimp-buffer)
@@ -1746,7 +1766,7 @@ hereafter."
(gimp-defcommand gimp-describe-procedure (&optional proc)
"Describe function in current sexp, or the one at point.
-This is a full description, similar to the one in the gimp pdb browser.
+This is a full description, similar to the one in the GIMP pdb browser.
The description is shown in the *GIMP Help* buffer.
If the procedure is menu-registered, the submenus shown can be followed (by
@@ -2130,7 +2150,7 @@ You can toggle this variable at any time with the command
((lambda (desc name type)
t)
. (lambda (&rest ignore)
- gimp-oblist-cache)))
+ (gimp-get-oblist-cache))))
"Ruleset for deciding the completion to perform by `gimp-make-completion'.
@@ -2228,7 +2248,7 @@ Optional argument LST specifies a list of completion candidates."
i))
;;let the list be possibly of form
;;((matchable . metadata))
- (or lst gimp-oblist-cache)))
+ (or lst (gimp-get-oblist-cache))))
(completion
(if (not gimp-complete-fuzzy-p)
(try-completion pattern lst nil)
@@ -2284,7 +2304,7 @@ Pushed into `hippie-expand-try-functions-list'."
(case major-mode
((gimp-mode inferior-gimp-mode)
(gimp-complete-savvy
- gimp-oblist-cache))))
+ (gimp-get-oblist-cache)))))
(push 'gimp-complete-oblist hippie-expand-try-functions-list)
@@ -2313,6 +2333,16 @@ Pushed into `hippie-expand-try-functions-list'."
(not gimp-complete-p))
(let* ((fun (gimp-fnsym-in-current-sexp))
(pos (gimp-position))
+ (all-completions
+ (funcall
+ (if gimp-complete-fuzzy-p
+ 'gimp-all-fuzzy-completions
+ 'all-completions)
+ (symbol-name fun)
+ (mapcar (lambda (i)
+ (symbol-name (car i)))
+ (gimp-hash-to-list
+ (gimp-get-dump-hash)))))
(gimp-command
(save-excursion
(cadr (gimp-string-match "^,\\([[:alpha:]-]*\\)"
@@ -2328,6 +2358,18 @@ Pushed into `hippie-expand-try-functions-list'."
(point))
((and fun (> pos (length num-args)))
(point))
+ ((and
+ (= pos 0)
+ (gimp-completable-at-p)
+ (cdr all-completions))
+ (gimp-complete-savvy)
+ ;; not really an error, but I want to back out:
+ (error "[Complete, but not unique: %S]" fun))
+ ((and
+ (= pos 0)
+ (gimp-completable-at-p)
+ (not (looking-back (rx (+ (or "\n" white))))))
+ (insert 32))
((and (gimp-completable-at-p)
;; Prompt for completion of the argument if there is info for that
;; argument, but not otherwise:
@@ -2357,7 +2399,7 @@ Pushed into `hippie-expand-try-functions-list'."
;; sometimes expected):
((and (null list)
(not (looking-back (rx (+ (or "\n" white))))))
- (gimp-complete-savvy gimp-oblist-cache))
+ (gimp-complete-savvy (gimp-get-oblist-cache)))
(list
(gimp-complete-savvy list))
(t (let ((answer (read-from-minibuffer
@@ -2375,7 +2417,7 @@ Pushed into `hippie-expand-try-functions-list'."
(insert
(replace-regexp-in-string "\\(^\"\\|\"$\\)" "" answer)))))))
(t
- (gimp-complete-savvy gimp-oblist-cache))))))
+ (gimp-complete-savvy (gimp-get-oblist-cache)))))))
(defun gimp-local-completion ()
(let* ((desc (gimp-get-proc-arg
@@ -2442,7 +2484,7 @@ See variable `gimp-complete-fuzzy-p' for a bit more detailed information."
(let* ((max-lisp-eval-depth 30000)
(completions (gimp-all-fuzzy-completion-data pattern list)))
(if (null completions)
- (error "[Can't find completion for %S]" pattern)
+ (error "[Can't find completion for %S]" pattern)
(if (fboundp 'icicle-expanded-common-match)
(icicle-expanded-common-match
(gimp-make-fuzzy-match-re pattern)
@@ -3160,13 +3202,18 @@ used for interactive debugging by avoiding obscuring the
traceback (useful when you also have debug-on-error enabled with
`toggle-debug-on-error').
-:preconditioner is a lambda form to funcall before running the test:
+:preconditioner is a lambda form to funcall before running the test.
+
+:error-checker is a lambda form to funcall when an error
+occurs. When it is defined, and returns non-nil, then the error
+that occurred is deemed to be expected. If it returns nil, then
+the error is not expected and an error is thrown.
\nKeywords supported: :use-nil-dump-file :dont-trap :validator \
-:preconditioner
+:preconditioner :error-checker
\n(fn TEST-NAME FUNCTION-TO-TEST EXPRESSION [KEYWORD VALUE]...)"
(cl-parsing-keywords
- (:expression :use-nil-dump-file :dont-trap :validator :preconditioner) ()
+ (:expression :use-nil-dump-file :dont-trap :validator :preconditioner :error-checker) ()
(let ((tmp-scm-file (make-temp-file "gimp-mode-test" nil ".scm"))
;; Set gimp-dump to nil temporarily to simulate that the GIMP dump file
;; did not exist upon startup, but only if cl-use-nil-dump-file is t
@@ -3210,7 +3257,10 @@ traceback (useful when you also have debug-on-error enabled with
(condition-case err
(funcall function-to-test)
(error
- (if (not (string-equal (cadr err) gimp-error-must-run-gimp-error-message))
+ ;; When cl-error-checker is defined, then call it. If it returns
+ ;; non-nil, then everything checks out fine, otherwise, we throw
+ ;; an unexpected error condition:
+ (if (and cl-error-checker (not (funcall cl-error-checker err)))
(error "FAILED \"%s\": Unexpected error: %S" test-name err)))))
;; Call the cl-validator and expect a string result if it fails, and that
;; string result is the reason for the failure. But if cl-validator is not
@@ -3228,7 +3278,7 @@ traceback (useful when you also have debug-on-error enabled with
(defun gimp-unit-test-completions (dont-trap)
"Unit test function for testing completion."
- (flet ((current-word-validator
+ (flet ((current-word-validator
(word)
`(lambda (&rest ignored)
(let ((word (current-word)))
@@ -3242,40 +3292,73 @@ traceback (useful when you also have debug-on-error enabled with
(and (car read-from-minibuffer-list)
(format
"Expected no prompting but instead got one or more prompts: %S"
- read-from-minibuffer-list)))))
+ read-from-minibuffer-list))))
+ (kill-completions-buffer ()
+ (mapc (lambda (buffer)
+ (and (string-match (rx "*Completions*") (buffer-name buffer))
+ (kill-buffer buffer)))
+ (buffer-list))))
(let ((function-to-test (lambda ()
- (call-interactively 'gimp-indent-and-complete))))
+ (call-interactively 'gimp-indent-and-complete))))
+ ;; First, we run a set of tests that work when `run-gimp' has yet to be
+ ;; executed, following by another set where we do expect `run-gimp' to
+ ;; have been executed. So, before we execute the first set, we insure
+ ;; that gimp is not running.
+ (when (gimp-proc)
+ (error "Please terminate the existing Gimp session before running the gimp-mode unit-test."))
;; Insure that we have a proper error message when the `gimp-dump' variable
;; does not exist, which means that the user has yet to run `run-gimp' the
;; very first time after having installed gimp-mode (the installation of which
;; includes inserting a .scm file into the users GIMP startup directory to
;; dump out a representation of the GIMP PDB for Emacs to read into the
;; `gimp-dump' hash):
- (gimp-unit-test-execute "Error checking for missing dump hash"
- function-to-test
- :expression "(gimp-displays-flush<point>)"
- :use-nil-dump-file t
- :dont-trap dont-trap)
+ (gimp-unit-test-execute
+ "T001: Error checking for missing dump hash"
+ function-to-test
+ :expression "(gimp-displays-flush<point>)"
+ :use-nil-dump-file t
+ :dont-trap dont-trap)
;; Do the same test as above, but this time test that no Emacs Lisp error
;; occurs during completion of a GIMP Scheme function known to have zero
;; arguments:
- (gimp-unit-test-execute
- "Check for zero-args function name completion"
+ (gimp-unit-test-execute
+ "T002: Check for zero-args function name completion"
function-to-test
:expression "(gimp-displays-flush<point>)"
:dont-trap dont-trap
:validator
(current-word-validator "gimp-displays-flush"))
- (gimp-unit-test-execute
- "Check for one-arg function name completion with arg already specified"
+ ;; Test for completions on a function:
+ (gimp-unit-test-execute
+ "T009: Check for function name completion with preceding space\
+ but with first arg of integer type"
+ function-to-test
+ :expression "(gimp-image-<point>)"
+ ;; kill all completion buffers initially, so as to test for at
+ ;; least one showing up during completion:
+ :preconditioner 'kill-completions-buffer
+ :dont-trap dont-trap
+ :validator
+ (lambda (&rest read-from-minibuffer-list)
+ (unless (remove-if-not
+ (lambda (buffer)
+ (string-match (rx "*Completions*") (buffer-name buffer)))
+ (buffer-list))
+ "No completions buffer showed up when completing on \"gimp-image-<point>\"")))
+ (gimp-unit-test-execute
+ "T003: Check for one-arg function name completion with arg already specified"
function-to-test
:expression "(gimp-display-ne<point> image)"
:dont-trap dont-trap
+ ;; kill all completion buffers initially, because otherwise the
+ ;; completion mechanism would otherwise just scroll that window. That
+ ;; may be a bug, but we can't tell yet exactly:
+ :preconditioner 'kill-completions-buffer
:validator (current-word-validator "gimp-display-new"))
;; Test for two-arg function completion. No prompting for
;; arguments should be done:
(gimp-unit-test-execute
- "Check for two-arg function name completion with arg already specified"
+ "T004: Check for two-arg function name completion with arg already specified"
function-to-test
:expression "(gimp-image-new<point> image)"
:dont-trap dont-trap
@@ -3294,8 +3377,8 @@ traceback (useful when you also have debug-on-error enabled with
;; in without the preceding whitespace, then it will be a part
;; of the previous word, which is not syntactically correct, and
;; certainly not what the user desires):
- (gimp-unit-test-execute
- "Check for function name completion without preceding space\
+ (gimp-unit-test-execute
+ "T005: Check for function name completion without preceding space\
but with first arg of image type"
function-to-test
:expression "(gimp-display-new<point> image)"
@@ -3306,7 +3389,7 @@ traceback (useful when you also have debug-on-error enabled with
;; this case and the preceding case, there is no preceding space
;; which is key here:
(gimp-unit-test-execute
- "Check for function name completion without preceding space\
+ "T006: Check for function name completion without preceding space\
but with first arg of integer type"
function-to-test
:expression "(gimp-image-new<point>)"
@@ -3316,20 +3399,23 @@ traceback (useful when you also have debug-on-error enabled with
;; an image type as the first argument. Note that there _is_
;; preceding whitespace in front of point here:
(gimp-unit-test-execute
- "Check for function name completion with preceding space\
+ "T007: Check for function name completion with preceding space\
but with first arg of image type"
function-to-test
:expression "(gimp-display-new <point> image)"
:dont-trap dont-trap
+ :error-checker (lambda (err)
+ ;; In this special case, since we have yet to execute
+ ;; `run-gimp', and the user is asking to complete on an
+ ;; image, there is no way for us to identify the image
+ ;; object ids without contacting the GIMP process. So we
+ ;; expect to see an
+ ;; gimp-error-must-run-gimp-error-message error being thrown:
+ (string-equal (cadr err) gimp-error-must-run-gimp-error-message))
:validator (lambda (&rest read-from-minibuffer-list)
(let ((first-arg (car read-from-minibuffer-list)))
(cond ((null first-arg)
- (format "Expected a prompt but got none"))
- ;; Pass the test if the prompt
- ;; contains the word "image"
- ;; in upper or lower case:
- ((let ((case-fold-search t))
- (string-match "image" (caar first-arg)))
+ ;; Got no prompt, as expected. Return t:
t)
(t
(format
@@ -3337,38 +3423,65 @@ traceback (useful when you also have debug-on-error enabled with
(caar first-arg)))))))
;; Expect no prompting on a integer argument type when
;; completing after some whitespace:
- (gimp-unit-test-execute
- "Check for function name completion with preceding space\
+ (gimp-unit-test-execute
+ "T008: Check for function name completion with preceding space\
but with first arg of integer type"
function-to-test
:expression "(gimp-image-new <point>)"
:dont-trap dont-trap
:validator (expect-no-prompting-validator))
- ;; Test for completions on a function:
+
+
(gimp-unit-test-execute
- "Check for function name completion with preceding space\
+ "T011: Check for function name completion with preceding space\
but with first arg of integer type"
function-to-test
- :expression "(gimp-image-<point>)"
- ;; kill all completion buffers initially, so as to test for at
- ;; least one showing up during completion:
- :preconditioner
- (lambda ()
- (mapc (lambda (buffer)
- (and (string-match (rx "*Completions*") (buffer-name buffer))
- (kill-buffer buffer)))
- (buffer-list)))
+ :expression "(script-fu-neon<point>)"
:dont-trap dont-trap
- :validator
- (lambda (&rest read-from-minibuffer-list)
- (unless (remove-if-not
- (lambda (buffer)
- (string-match (rx "*Completions*") (buffer-name buffer)))
- (buffer-list))
- "No completions buffer showed up when completing on \"gimp-image-<point>\"")))
- ;; (gimp-unit-test-execute "Check for one-arg function name
- ;; completion with arg not already specified"
- ;; "(gimp-display-new<point>)" nil dont-trap)
+ :validator (expect-no-prompting-validator))
+ ;; For the subsequent tests, we need to execute `run-gimp', but first
+ ;; assert that we are still without the GIMP process:
+
+ (when (gimp-proc)
+ (error (concat "Assertion failed: The GIMP process should "
+ "not have been started by prior unit tests.")))
+ ;; Once every 10 runs or so, the execution of `run-gimp' below hangs with
+ ;; an infinite "hit Ctrl-g" prompt. Until we can determine a fix, disable
+ ;; the rest of the tests that require `run-gimp' to have run to completion
+ ;; (using a (when nil ... ) block):
+ (message "Unit test is running the GIMP now via `run-gimp' ...")
+
+ (run-gimp nil)
+ (while (and (gimp-proc)
+ (not (process-get (gimp-proc)
+ 'listening)))
+ (sit-for 0.1))
+ (unless (gimp-proc)
+ (error "Assertion failed: The GIMP process was not started as expected."))
+
+ (gimp-unit-test-execute
+ "T010: Check for function name completion with preceding space\
+ but with first arg of image type with Gimp running"
+ function-to-test
+ :expression "(gimp-display-new <point> image)"
+ :dont-trap dont-trap
+ ;; No :error-checker defined here, as we do not expect any errors. The
+ ;; Gimp should be contacted to find the image IDs and a suitable prompt
+ ;; provided.
+ :validator (lambda (&rest read-from-minibuffer-list)
+ (let ((first-arg (car read-from-minibuffer-list)))
+ (cond ((null first-arg)
+ (format "Expected a prompt but got none"))
+ ;; Pass the test if the prompt
+ ;; contains the word "image"
+ ;; in upper or lower case:
+ ((let ((case-fold-search t))
+ (string-match "image" (caar first-arg)))
+ t)
+ (t
+ (format
+ "Unexpected first argument prompt for gimp-display-new: %S"
+ (caar first-arg)))))))
(message "PASSED: All gimp-mode unit-tests pass."))))
(defun gimp-unit-test (&optional dont-trap)
@@ -3391,9 +3504,8 @@ testing functions. See documentation on keyword arg :dont-trap in
;;
;; ... add more unit test function calls here ...
;;
+ (gimp-quit)
(message "PASSED: All gimp-mode unit-tests pass."))
(provide 'gimp-mode)
-;;; gimp-mode.el ends here
-
-
+;; gimp-mode.el ends here
View
4 install.sh
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-emacs --batch --script gimp-install.el
-
Please sign in to comment.
Something went wrong with that request. Please try again.