[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/hydra e3e3d2c17f 35/35: Merge remote-tracking branch 'r
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/hydra e3e3d2c17f 35/35: Merge remote-tracking branch 'refs/remotes/upstream/hydra/main' into elpa--merge/hydra |
|
Date: |
Tue, 25 Oct 2022 22:59:07 -0400 (EDT) |
branch: externals/hydra
commit e3e3d2c17f07e0a3da8c49fce41e1a838479a789
Merge: 7081ee6d44 317e1de330
Author: ELPA Syncer <elpasync@gnu.org>
Commit: ELPA Syncer <elpasync@gnu.org>
Merge remote-tracking branch 'refs/remotes/upstream/hydra/main' into
elpa--merge/hydra
---
.github/FUNDING.yml | 2 +
.travis.yml | 14 +-
Makefile | 1 -
README.md | 45 +-
doc/Changelog.org | 2 +-
doc/fdl-1.3.txt | 451 ++++++++++++++++
doc/gpl-3.0.txt | 674 +++++++++++++++++++++++
hydra-test.el | 1479 +++++++++++++++++++++++++--------------------------
hydra.el | 208 +++++---
lv.el | 38 +-
10 files changed, 2060 insertions(+), 854 deletions(-)
diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 0000000000..b9a5b68820
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+liberapay: abo-abo
+patreon: abo_abo
diff --git a/.travis.yml b/.travis.yml
index e97acdbfd6..baa4f7300f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,14 +1,14 @@
language: emacs-lisp
env:
- matrix:
- - emacs=emacs24
- - emacs=emacs-snapshot
+ - EVM_EMACS=emacs-24.5-travis
+ - EVM_EMACS=emacs-26.3-travis-linux-xenial
+ - EVM_EMACS=emacs-git-snapshot-travis-linux-xenial
before_install:
- - sudo add-apt-repository -y ppa:cassou/emacs
- - sudo add-apt-repository -y ppa:ubuntu-elisp
- - sudo apt-get update -qq
- - sudo apt-get install -qq $emacs
+ - git clone https://github.com/rejeep/evm.git $HOME/.evm
+ - export PATH=$HOME/.evm/bin:$PATH
+ - evm config path /tmp
+ - evm install $EVM_EMACS --use --skip
script:
- make test
diff --git a/Makefile b/Makefile
index 13fd61887c..84c0a21c8b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
emacs ?= emacs
-# emacs = emacs-24.3
LOAD = -l lv.el -l hydra.el -l hydra-test.el
diff --git a/README.md b/README.md
index 35aedcacfa..bfb7446ad7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
# Hydra
[](https://travis-ci.org/abo-abo/hydra)
+[](https://elpa.gnu.org/packages/hydra.html)
[](https://melpa.org/#/hydra)
[](https://stable.melpa.org/#/hydra)
@@ -66,7 +67,7 @@ If you want to quickly understand the concept, see [the video
demo](https://www.
## The one with the least amount of code
-```cl
+```elisp
(defhydra hydra-zoom (global-map "<f2>")
"zoom"
("g" text-scale-increase "in")
@@ -95,7 +96,7 @@ Here's the result of pressing <kbd>.</kbd> in the good-old
Buffer menu:
The code is large but very simple:
-```cl
+```elisp
(defhydra hydra-buffer-menu (:color pink
:hint nil)
"
@@ -171,22 +172,26 @@ If you name your hydra `hydra-awesome`, the return result
of `defhydra` will be
Here's what `hydra-zoom/body` looks like, if you're interested:
-```cl
-(defun hydra-zoom/body nil
- "Create a hydra with a \"<f2>\" body and the heads:
+```elisp
+(defun hydra-zoom/body ()
+ "Call the body in the \"hydra-zoom\" hydra.
+
+The heads for the associated hydra are:
\"g\": `text-scale-increase',
\"l\": `text-scale-decrease'
-The body can be accessed via `hydra-zoom/body'."
+The body can be accessed via `hydra-zoom/body', which is bound to \"<f2>\"."
(interactive)
+ (require 'hydra)
(hydra-default-pre)
- (when hydra-is-helpful
- (if hydra-lv
- (lv-message
- (eval hydra-zoom/hint))
- (message
- (eval hydra-zoom/hint))))
+ (let ((hydra--ignore nil))
+ (hydra-keyboard-quit)
+ (setq hydra-curr-body-fn
+ 'hydra-zoom/body))
+ (hydra-show-hint
+ hydra-zoom/hint
+ 'hydra-zoom)
(hydra-set-transient-map
hydra-zoom/keymap
(lambda nil
@@ -203,7 +208,7 @@ This can be any keymap, for instance, `global-map` or
`isearch-mode-map`.
For this example:
-```cl
+```elisp
(defhydra hydra-zoom (global-map "<f2>")
"zoom"
("g" text-scale-increase "in")
@@ -215,7 +220,7 @@ For this example:
And here's the relevant generated code:
-```cl
+```elisp
(unless (keymapp (lookup-key global-map (kbd "<f2>")))
(define-key global-map (kbd "<f2>") nil))
(define-key global-map [f2 103]
@@ -229,7 +234,7 @@ As you see, `"<f2>"` is used as a prefix for <kbd>g</kbd>
(char value 103) and <
If you don't want to use a map right now, you can skip it like this:
-```cl
+```elisp
(defhydra hydra-zoom (nil nil)
"zoom"
("g" text-scale-increase "in")
@@ -238,7 +243,7 @@ If you don't want to use a map right now, you can skip it
like this:
Or even simpler:
-```cl
+```elisp
(defhydra hydra-zoom ()
"zoom"
("g" text-scale-increase "in")
@@ -260,7 +265,7 @@ Below is a list of each key.
You can specify code that will be called before each head, and after the body.
For example:
-```cl
+```elisp
(defhydra hydra-vi (:pre (set-cursor-color "#40e0d0")
:post (progn
(set-cursor-color "#ffffff")
@@ -359,7 +364,7 @@ If the result of the Elisp expression is a string and you
don't want to quote it
Each head looks like this:
-```cl
+```elisp
(head-binding head-command head-hint head-plist)
```
@@ -392,7 +397,7 @@ The `head-command` can be:
Here's an example of the last option:
-```cl
+```elisp
(defhydra hydra-launcher (:color blue)
"Launch"
("h" man "man")
@@ -411,7 +416,7 @@ You can set the head hint to `nil` to do this.
Example:
-```cl
+```elisp
(defhydra hydra-zoom (global-map "<f2>")
"
Press _g_ to zoom in.
diff --git a/doc/Changelog.org b/doc/Changelog.org
index 429a7ddd8c..5d2d5d72c6 100644
--- a/doc/Changelog.org
+++ b/doc/Changelog.org
@@ -4,7 +4,7 @@
*** defhydra
**** New :base-map option in body plist
-In case your hydra conficts with el:hydra-base-map, you can now override it.
+In case your hydra conflicts with el:hydra-base-map, you can now override it.
Example:
#+begin_src elisp
diff --git a/doc/fdl-1.3.txt b/doc/fdl-1.3.txt
new file mode 100644
index 0000000000..bf128beb0f
--- /dev/null
+++ b/doc/fdl-1.3.txt
@@ -0,0 +1,451 @@
+
+ GNU Free Documentation License
+ Version 1.3, 3 November 2008
+
+
+ Copyright (C) 2000, 2001, 2002, 2007, 2008 Free Software Foundation, Inc.
+ <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+0. PREAMBLE
+
+The purpose of this License is to make a manual, textbook, or other
+functional and useful document "free" in the sense of freedom: to
+assure everyone the effective freedom to copy and redistribute it,
+with or without modifying it, either commercially or noncommercially.
+Secondarily, this License preserves for the author and publisher a way
+to get credit for their work, while not being considered responsible
+for modifications made by others.
+
+This License is a kind of "copyleft", which means that derivative
+works of the document must themselves be free in the same sense. It
+complements the GNU General Public License, which is a copyleft
+license designed for free software.
+
+We have designed this License in order to use it for manuals for free
+software, because free software needs free documentation: a free
+program should come with manuals providing the same freedoms that the
+software does. But this License is not limited to software manuals;
+it can be used for any textual work, regardless of subject matter or
+whether it is published as a printed book. We recommend this License
+principally for works whose purpose is instruction or reference.
+
+
+1. APPLICABILITY AND DEFINITIONS
+
+This License applies to any manual or other work, in any medium, that
+contains a notice placed by the copyright holder saying it can be
+distributed under the terms of this License. Such a notice grants a
+world-wide, royalty-free license, unlimited in duration, to use that
+work under the conditions stated herein. The "Document", below,
+refers to any such manual or work. Any member of the public is a
+licensee, and is addressed as "you". You accept the license if you
+copy, modify or distribute the work in a way requiring permission
+under copyright law.
+
+A "Modified Version" of the Document means any work containing the
+Document or a portion of it, either copied verbatim, or with
+modifications and/or translated into another language.
+
+A "Secondary Section" is a named appendix or a front-matter section of
+the Document that deals exclusively with the relationship of the
+publishers or authors of the Document to the Document's overall
+subject (or to related matters) and contains nothing that could fall
+directly within that overall subject. (Thus, if the Document is in
+part a textbook of mathematics, a Secondary Section may not explain
+any mathematics.) The relationship could be a matter of historical
+connection with the subject or with related matters, or of legal,
+commercial, philosophical, ethical or political position regarding
+them.
+
+The "Invariant Sections" are certain Secondary Sections whose titles
+are designated, as being those of Invariant Sections, in the notice
+that says that the Document is released under this License. If a
+section does not fit the above definition of Secondary then it is not
+allowed to be designated as Invariant. The Document may contain zero
+Invariant Sections. If the Document does not identify any Invariant
+Sections then there are none.
+
+The "Cover Texts" are certain short passages of text that are listed,
+as Front-Cover Texts or Back-Cover Texts, in the notice that says that
+the Document is released under this License. A Front-Cover Text may
+be at most 5 words, and a Back-Cover Text may be at most 25 words.
+
+A "Transparent" copy of the Document means a machine-readable copy,
+represented in a format whose specification is available to the
+general public, that is suitable for revising the document
+straightforwardly with generic text editors or (for images composed of
+pixels) generic paint programs or (for drawings) some widely available
+drawing editor, and that is suitable for input to text formatters or
+for automatic translation to a variety of formats suitable for input
+to text formatters. A copy made in an otherwise Transparent file
+format whose markup, or absence of markup, has been arranged to thwart
+or discourage subsequent modification by readers is not Transparent.
+An image format is not Transparent if used for any substantial amount
+of text. A copy that is not "Transparent" is called "Opaque".
+
+Examples of suitable formats for Transparent copies include plain
+ASCII without markup, Texinfo input format, LaTeX input format, SGML
+or XML using a publicly available DTD, and standard-conforming simple
+HTML, PostScript or PDF designed for human modification. Examples of
+transparent image formats include PNG, XCF and JPG. Opaque formats
+include proprietary formats that can be read and edited only by
+proprietary word processors, SGML or XML for which the DTD and/or
+processing tools are not generally available, and the
+machine-generated HTML, PostScript or PDF produced by some word
+processors for output purposes only.
+
+The "Title Page" means, for a printed book, the title page itself,
+plus such following pages as are needed to hold, legibly, the material
+this License requires to appear in the title page. For works in
+formats which do not have any title page as such, "Title Page" means
+the text near the most prominent appearance of the work's title,
+preceding the beginning of the body of the text.
+
+The "publisher" means any person or entity that distributes copies of
+the Document to the public.
+
+A section "Entitled XYZ" means a named subunit of the Document whose
+title either is precisely XYZ or contains XYZ in parentheses following
+text that translates XYZ in another language. (Here XYZ stands for a
+specific section name mentioned below, such as "Acknowledgements",
+"Dedications", "Endorsements", or "History".) To "Preserve the Title"
+of such a section when you modify the Document means that it remains a
+section "Entitled XYZ" according to this definition.
+
+The Document may include Warranty Disclaimers next to the notice which
+states that this License applies to the Document. These Warranty
+Disclaimers are considered to be included by reference in this
+License, but only as regards disclaiming warranties: any other
+implication that these Warranty Disclaimers may have is void and has
+no effect on the meaning of this License.
+
+2. VERBATIM COPYING
+
+You may copy and distribute the Document in any medium, either
+commercially or noncommercially, provided that this License, the
+copyright notices, and the license notice saying this License applies
+to the Document are reproduced in all copies, and that you add no
+other conditions whatsoever to those of this License. You may not use
+technical measures to obstruct or control the reading or further
+copying of the copies you make or distribute. However, you may accept
+compensation in exchange for copies. If you distribute a large enough
+number of copies you must also follow the conditions in section 3.
+
+You may also lend copies, under the same conditions stated above, and
+you may publicly display copies.
+
+
+3. COPYING IN QUANTITY
+
+If you publish printed copies (or copies in media that commonly have
+printed covers) of the Document, numbering more than 100, and the
+Document's license notice requires Cover Texts, you must enclose the
+copies in covers that carry, clearly and legibly, all these Cover
+Texts: Front-Cover Texts on the front cover, and Back-Cover Texts on
+the back cover. Both covers must also clearly and legibly identify
+you as the publisher of these copies. The front cover must present
+the full title with all words of the title equally prominent and
+visible. You may add other material on the covers in addition.
+Copying with changes limited to the covers, as long as they preserve
+the title of the Document and satisfy these conditions, can be treated
+as verbatim copying in other respects.
+
+If the required texts for either cover are too voluminous to fit
+legibly, you should put the first ones listed (as many as fit
+reasonably) on the actual cover, and continue the rest onto adjacent
+pages.
+
+If you publish or distribute Opaque copies of the Document numbering
+more than 100, you must either include a machine-readable Transparent
+copy along with each Opaque copy, or state in or with each Opaque copy
+a computer-network location from which the general network-using
+public has access to download using public-standard network protocols
+a complete Transparent copy of the Document, free of added material.
+If you use the latter option, you must take reasonably prudent steps,
+when you begin distribution of Opaque copies in quantity, to ensure
+that this Transparent copy will remain thus accessible at the stated
+location until at least one year after the last time you distribute an
+Opaque copy (directly or through your agents or retailers) of that
+edition to the public.
+
+It is requested, but not required, that you contact the authors of the
+Document well before redistributing any large number of copies, to
+give them a chance to provide you with an updated version of the
+Document.
+
+
+4. MODIFICATIONS
+
+You may copy and distribute a Modified Version of the Document under
+the conditions of sections 2 and 3 above, provided that you release
+the Modified Version under precisely this License, with the Modified
+Version filling the role of the Document, thus licensing distribution
+and modification of the Modified Version to whoever possesses a copy
+of it. In addition, you must do these things in the Modified Version:
+
+A. Use in the Title Page (and on the covers, if any) a title distinct
+ from that of the Document, and from those of previous versions
+ (which should, if there were any, be listed in the History section
+ of the Document). You may use the same title as a previous version
+ if the original publisher of that version gives permission.
+B. List on the Title Page, as authors, one or more persons or entities
+ responsible for authorship of the modifications in the Modified
+ Version, together with at least five of the principal authors of the
+ Document (all of its principal authors, if it has fewer than five),
+ unless they release you from this requirement.
+C. State on the Title page the name of the publisher of the
+ Modified Version, as the publisher.
+D. Preserve all the copyright notices of the Document.
+E. Add an appropriate copyright notice for your modifications
+ adjacent to the other copyright notices.
+F. Include, immediately after the copyright notices, a license notice
+ giving the public permission to use the Modified Version under the
+ terms of this License, in the form shown in the Addendum below.
+G. Preserve in that license notice the full lists of Invariant Sections
+ and required Cover Texts given in the Document's license notice.
+H. Include an unaltered copy of this License.
+I. Preserve the section Entitled "History", Preserve its Title, and add
+ to it an item stating at least the title, year, new authors, and
+ publisher of the Modified Version as given on the Title Page. If
+ there is no section Entitled "History" in the Document, create one
+ stating the title, year, authors, and publisher of the Document as
+ given on its Title Page, then add an item describing the Modified
+ Version as stated in the previous sentence.
+J. Preserve the network location, if any, given in the Document for
+ public access to a Transparent copy of the Document, and likewise
+ the network locations given in the Document for previous versions
+ it was based on. These may be placed in the "History" section.
+ You may omit a network location for a work that was published at
+ least four years before the Document itself, or if the original
+ publisher of the version it refers to gives permission.
+K. For any section Entitled "Acknowledgements" or "Dedications",
+ Preserve the Title of the section, and preserve in the section all
+ the substance and tone of each of the contributor acknowledgements
+ and/or dedications given therein.
+L. Preserve all the Invariant Sections of the Document,
+ unaltered in their text and in their titles. Section numbers
+ or the equivalent are not considered part of the section titles.
+M. Delete any section Entitled "Endorsements". Such a section
+ may not be included in the Modified Version.
+N. Do not retitle any existing section to be Entitled "Endorsements"
+ or to conflict in title with any Invariant Section.
+O. Preserve any Warranty Disclaimers.
+
+If the Modified Version includes new front-matter sections or
+appendices that qualify as Secondary Sections and contain no material
+copied from the Document, you may at your option designate some or all
+of these sections as invariant. To do this, add their titles to the
+list of Invariant Sections in the Modified Version's license notice.
+These titles must be distinct from any other section titles.
+
+You may add a section Entitled "Endorsements", provided it contains
+nothing but endorsements of your Modified Version by various
+parties--for example, statements of peer review or that the text has
+been approved by an organization as the authoritative definition of a
+standard.
+
+You may add a passage of up to five words as a Front-Cover Text, and a
+passage of up to 25 words as a Back-Cover Text, to the end of the list
+of Cover Texts in the Modified Version. Only one passage of
+Front-Cover Text and one of Back-Cover Text may be added by (or
+through arrangements made by) any one entity. If the Document already
+includes a cover text for the same cover, previously added by you or
+by arrangement made by the same entity you are acting on behalf of,
+you may not add another; but you may replace the old one, on explicit
+permission from the previous publisher that added the old one.
+
+The author(s) and publisher(s) of the Document do not by this License
+give permission to use their names for publicity for or to assert or
+imply endorsement of any Modified Version.
+
+
+5. COMBINING DOCUMENTS
+
+You may combine the Document with other documents released under this
+License, under the terms defined in section 4 above for modified
+versions, provided that you include in the combination all of the
+Invariant Sections of all of the original documents, unmodified, and
+list them all as Invariant Sections of your combined work in its
+license notice, and that you preserve all their Warranty Disclaimers.
+
+The combined work need only contain one copy of this License, and
+multiple identical Invariant Sections may be replaced with a single
+copy. If there are multiple Invariant Sections with the same name but
+different contents, make the title of each such section unique by
+adding at the end of it, in parentheses, the name of the original
+author or publisher of that section if known, or else a unique number.
+Make the same adjustment to the section titles in the list of
+Invariant Sections in the license notice of the combined work.
+
+In the combination, you must combine any sections Entitled "History"
+in the various original documents, forming one section Entitled
+"History"; likewise combine any sections Entitled "Acknowledgements",
+and any sections Entitled "Dedications". You must delete all sections
+Entitled "Endorsements".
+
+
+6. COLLECTIONS OF DOCUMENTS
+
+You may make a collection consisting of the Document and other
+documents released under this License, and replace the individual
+copies of this License in the various documents with a single copy
+that is included in the collection, provided that you follow the rules
+of this License for verbatim copying of each of the documents in all
+other respects.
+
+You may extract a single document from such a collection, and
+distribute it individually under this License, provided you insert a
+copy of this License into the extracted document, and follow this
+License in all other respects regarding verbatim copying of that
+document.
+
+
+7. AGGREGATION WITH INDEPENDENT WORKS
+
+A compilation of the Document or its derivatives with other separate
+and independent documents or works, in or on a volume of a storage or
+distribution medium, is called an "aggregate" if the copyright
+resulting from the compilation is not used to limit the legal rights
+of the compilation's users beyond what the individual works permit.
+When the Document is included in an aggregate, this License does not
+apply to the other works in the aggregate which are not themselves
+derivative works of the Document.
+
+If the Cover Text requirement of section 3 is applicable to these
+copies of the Document, then if the Document is less than one half of
+the entire aggregate, the Document's Cover Texts may be placed on
+covers that bracket the Document within the aggregate, or the
+electronic equivalent of covers if the Document is in electronic form.
+Otherwise they must appear on printed covers that bracket the whole
+aggregate.
+
+
+8. TRANSLATION
+
+Translation is considered a kind of modification, so you may
+distribute translations of the Document under the terms of section 4.
+Replacing Invariant Sections with translations requires special
+permission from their copyright holders, but you may include
+translations of some or all Invariant Sections in addition to the
+original versions of these Invariant Sections. You may include a
+translation of this License, and all the license notices in the
+Document, and any Warranty Disclaimers, provided that you also include
+the original English version of this License and the original versions
+of those notices and disclaimers. In case of a disagreement between
+the translation and the original version of this License or a notice
+or disclaimer, the original version will prevail.
+
+If a section in the Document is Entitled "Acknowledgements",
+"Dedications", or "History", the requirement (section 4) to Preserve
+its Title (section 1) will typically require changing the actual
+title.
+
+
+9. TERMINATION
+
+You may not copy, modify, sublicense, or distribute the Document
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense, or distribute it is void, and
+will automatically terminate your rights under this License.
+
+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, receipt of a copy of some or all of the same material does
+not give you any rights to use it.
+
+
+10. FUTURE REVISIONS OF THIS LICENSE
+
+The Free Software Foundation may publish new, revised versions of the
+GNU Free Documentation 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. See
+https://www.gnu.org/licenses/.
+
+Each version of the License is given a distinguishing version number.
+If the Document specifies that a particular numbered version of this
+License "or any later version" applies to it, you have the option of
+following the terms and conditions either of that specified version or
+of any later version that has been published (not as a draft) by the
+Free Software Foundation. If the Document does not specify a version
+number of this License, you may choose any version ever published (not
+as a draft) by the Free Software Foundation. If the Document
+specifies that a proxy can decide which future versions of this
+License can be used, that proxy's public statement of acceptance of a
+version permanently authorizes you to choose that version for the
+Document.
+
+11. RELICENSING
+
+"Massive Multiauthor Collaboration Site" (or "MMC Site") means any
+World Wide Web server that publishes copyrightable works and also
+provides prominent facilities for anybody to edit those works. A
+public wiki that anybody can edit is an example of such a server. A
+"Massive Multiauthor Collaboration" (or "MMC") contained in the site
+means any set of copyrightable works thus published on the MMC site.
+
+"CC-BY-SA" means the Creative Commons Attribution-Share Alike 3.0
+license published by Creative Commons Corporation, a not-for-profit
+corporation with a principal place of business in San Francisco,
+California, as well as future copyleft versions of that license
+published by that same organization.
+
+"Incorporate" means to publish or republish a Document, in whole or in
+part, as part of another Document.
+
+An MMC is "eligible for relicensing" if it is licensed under this
+License, and if all works that were first published under this License
+somewhere other than this MMC, and subsequently incorporated in whole or
+in part into the MMC, (1) had no cover texts or invariant sections, and
+(2) were thus incorporated prior to November 1, 2008.
+
+The operator of an MMC Site may republish an MMC contained in the site
+under CC-BY-SA on the same site at any time before August 1, 2009,
+provided the MMC is eligible for relicensing.
+
+
+ADDENDUM: How to use this License for your documents
+
+To use this License in a document you have written, include a copy of
+the License in the document and put the following copyright and
+license notices just after the title page:
+
+ Copyright (c) YEAR YOUR NAME.
+ Permission is granted to copy, distribute and/or modify this document
+ under the terms of the GNU Free Documentation License, Version 1.3
+ or any later version published by the Free Software Foundation;
+ with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+ A copy of the license is included in the section entitled "GNU
+ Free Documentation License".
+
+If you have Invariant Sections, Front-Cover Texts and Back-Cover Texts,
+replace the "with...Texts." line with this:
+
+ with the Invariant Sections being LIST THEIR TITLES, with the
+ Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST.
+
+If you have Invariant Sections without Cover Texts, or some other
+combination of the three, merge those two alternatives to suit the
+situation.
+
+If your document contains nontrivial examples of program code, we
+recommend releasing these examples in parallel under your choice of
+free software license, such as the GNU General Public License,
+to permit their use in free software.
diff --git a/doc/gpl-3.0.txt b/doc/gpl-3.0.txt
new file mode 100644
index 0000000000..f288702d2f
--- /dev/null
+++ b/doc/gpl-3.0.txt
@@ -0,0 +1,674 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://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 <https://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
+<https://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
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
diff --git a/hydra-test.el b/hydra-test.el
index 66f5c6e6ea..c672f2c2e0 100644
--- a/hydra-test.el
+++ b/hydra-test.el
@@ -34,85 +34,85 @@
(equal
(macroexpand
'(defhydra hydra-error (global-map "M-g")
- "error"
- ("h" first-error "first")
- ("j" next-error "next")
- ("k" previous-error "prev")
- ("SPC" hydra-repeat "rep" :bind nil)))
+ "error"
+ ("h" first-error "first")
+ ("j" next-error "next")
+ ("k" previous-error "prev")
+ ("SPC" hydra-repeat "rep" :bind nil)))
'(progn
- (set
- (defvar hydra-error/params nil
- "Params of hydra-error.")
- (quote (global-map "M-g")))
- (set
- (defvar hydra-error/docstring nil
- "Docstring of hydra-error.")
- "error")
- (set
- (defvar hydra-error/heads nil
- "Heads for hydra-error.")
- (quote
- (("h"
- first-error
- "first"
- :exit nil)
- ("j"
- next-error
- "next"
- :exit nil)
- ("k"
- previous-error
- "prev"
- :exit nil)
- ("SPC"
- hydra-repeat
- "rep"
- :bind nil
- :exit nil))))
- (set
- (defvar hydra-error/keymap nil
- "Keymap for hydra-error.")
- (quote
- (keymap
- (32 . hydra-repeat)
- (107 . hydra-error/previous-error)
- (106 . hydra-error/next-error)
- (104 . hydra-error/first-error)
- (kp-subtract . hydra--negative-argument)
- (kp-9 . hydra--digit-argument)
- (kp-8 . hydra--digit-argument)
- (kp-7 . hydra--digit-argument)
- (kp-6 . hydra--digit-argument)
- (kp-5 . hydra--digit-argument)
- (kp-4 . hydra--digit-argument)
- (kp-3 . hydra--digit-argument)
- (kp-2 . hydra--digit-argument)
- (kp-1 . hydra--digit-argument)
- (kp-0 . hydra--digit-argument)
- (57 . hydra--digit-argument)
- (56 . hydra--digit-argument)
- (55 . hydra--digit-argument)
- (54 . hydra--digit-argument)
- (53 . hydra--digit-argument)
- (52 . hydra--digit-argument)
- (51 . hydra--digit-argument)
- (50 . hydra--digit-argument)
- (49 . hydra--digit-argument)
- (48 . hydra--digit-argument)
- (45 . hydra--negative-argument)
- (21 . hydra--universal-argument))))
- (set
- (defvar hydra-error/hint nil
- "Dynamic hint for hydra-error.")
- (quote
- (format
- #("error: [h]: first, [j]: next, [k]: prev, [SPC]: rep."
- 8 9 (face hydra-face-red)
- 20 21 (face hydra-face-red)
- 31 32 (face hydra-face-red)
- 42 45 (face hydra-face-red)))))
- (defun hydra-error/first-error nil
- "Call the head `first-error' in the \"hydra-error\" hydra.
+ (set
+ (defvar hydra-error/params nil
+ "Params of hydra-error.")
+ '(global-map "M-g"))
+ (set
+ (defvar hydra-error/docstring nil
+ "Docstring of hydra-error.")
+ "error")
+ (set
+ (defvar hydra-error/heads nil
+ "Heads for hydra-error.")
+ '(("h"
+ first-error
+ "first"
+ :exit nil)
+ ("j"
+ next-error
+ "next"
+ :exit nil)
+ ("k"
+ previous-error
+ "prev"
+ :exit nil)
+ ("SPC"
+ hydra-repeat
+ "rep"
+ :bind nil
+ :exit nil)))
+ (set
+ (defvar hydra-error/keymap nil
+ "Keymap for hydra-error.")
+ '(keymap
+ (32 . hydra-repeat)
+ (107 . hydra-error/previous-error)
+ (106 . hydra-error/next-error)
+ (104 . hydra-error/first-error)
+ (kp-subtract . hydra--negative-argument)
+ (kp-9 . hydra--digit-argument)
+ (kp-8 . hydra--digit-argument)
+ (kp-7 . hydra--digit-argument)
+ (kp-6 . hydra--digit-argument)
+ (kp-5 . hydra--digit-argument)
+ (kp-4 . hydra--digit-argument)
+ (kp-3 . hydra--digit-argument)
+ (kp-2 . hydra--digit-argument)
+ (kp-1 . hydra--digit-argument)
+ (kp-0 . hydra--digit-argument)
+ (57 . hydra--digit-argument)
+ (56 . hydra--digit-argument)
+ (55 . hydra--digit-argument)
+ (54 . hydra--digit-argument)
+ (53 . hydra--digit-argument)
+ (52 . hydra--digit-argument)
+ (51 . hydra--digit-argument)
+ (50 . hydra--digit-argument)
+ (49 . hydra--digit-argument)
+ (48 . hydra--digit-argument)
+ (45 . hydra--negative-argument)
+ (21 . hydra--universal-argument)
+ (f1
+ keymap
+ (107 . hydra--describe-key))))
+ (set
+ (defvar hydra-error/hint nil
+ "Dynamic hint for hydra-error.")
+ '(format
+ #("error: [h]: first, [j]: next, [k]: prev, [SPC]: rep."
+ 8 9 (face hydra-face-red)
+ 20 21 (face hydra-face-red)
+ 31 32 (face hydra-face-red)
+ 42 45 (face hydra-face-red))))
+ (defun hydra-error/first-error nil
+ "Call the head `first-error' in the \"hydra-error\" hydra.
The heads for the associated hydra are:
@@ -122,33 +122,33 @@ The heads for the associated hydra are:
\"SPC\": `hydra-repeat'
The body can be accessed via `hydra-error/body', which is bound to \"M-g\"."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (let ((hydra--ignore t))
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-error/body)))
- (condition-case err
- (progn
- (setq this-command
- (quote first-error))
- (hydra--call-interactively-remap-maybe
- (function first-error)))
- ((quit error)
- (message
- (error-message-string err))))
- (hydra-show-hint
- hydra-error/hint
- (quote hydra-error))
- (hydra-set-transient-map
- hydra-error/keymap
- (lambda nil
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (let ((hydra--ignore t))
(hydra-keyboard-quit)
- nil)
- nil))
- (defun hydra-error/next-error nil
- "Call the head `next-error' in the \"hydra-error\" hydra.
+ (setq hydra-curr-body-fn
+ 'hydra-error/body))
+ (condition-case err
+ (progn
+ (setq this-command
+ 'first-error)
+ (hydra--call-interactively-remap-maybe
+ #'first-error))
+ ((quit error)
+ (message
+ (error-message-string err))))
+ (hydra-show-hint
+ hydra-error/hint
+ 'hydra-error)
+ (hydra-set-transient-map
+ hydra-error/keymap
+ (lambda nil
+ (hydra-keyboard-quit)
+ nil)
+ nil))
+ (defun hydra-error/next-error nil
+ "Call the head `next-error' in the \"hydra-error\" hydra.
The heads for the associated hydra are:
@@ -158,33 +158,32 @@ The heads for the associated hydra are:
\"SPC\": `hydra-repeat'
The body can be accessed via `hydra-error/body', which is bound to \"M-g\"."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (let ((hydra--ignore t))
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-error/body)))
- (condition-case err
- (progn
- (setq this-command
- (quote next-error))
- (hydra--call-interactively-remap-maybe
- (function next-error)))
- ((quit error)
- (message
- (error-message-string err))))
- (hydra-show-hint
- hydra-error/hint
- (quote hydra-error))
- (hydra-set-transient-map
- hydra-error/keymap
- (lambda nil
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (let ((hydra--ignore t))
(hydra-keyboard-quit)
- nil)
- nil))
- (defun hydra-error/previous-error nil
- "Call the head `previous-error' in the \"hydra-error\" hydra.
+ (setq hydra-curr-body-fn
+ 'hydra-error/body))
+ (condition-case err
+ (progn
+ (setq this-command 'next-error)
+ (hydra--call-interactively-remap-maybe
+ #'next-error))
+ ((quit error)
+ (message
+ (error-message-string err))))
+ (hydra-show-hint
+ hydra-error/hint
+ 'hydra-error)
+ (hydra-set-transient-map
+ hydra-error/keymap
+ (lambda nil
+ (hydra-keyboard-quit)
+ nil)
+ nil))
+ (defun hydra-error/previous-error nil
+ "Call the head `previous-error' in the \"hydra-error\" hydra.
The heads for the associated hydra are:
@@ -194,46 +193,45 @@ The heads for the associated hydra are:
\"SPC\": `hydra-repeat'
The body can be accessed via `hydra-error/body', which is bound to \"M-g\"."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (let ((hydra--ignore t))
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-error/body)))
- (condition-case err
- (progn
- (setq this-command
- (quote previous-error))
- (hydra--call-interactively-remap-maybe
- (function previous-error)))
- ((quit error)
- (message
- (error-message-string err))))
- (hydra-show-hint
- hydra-error/hint
- (quote hydra-error))
- (hydra-set-transient-map
- hydra-error/keymap
- (lambda nil
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (let ((hydra--ignore t))
(hydra-keyboard-quit)
- nil)
- nil))
- (unless (keymapp
- (lookup-key
- global-map
- (kbd "M-g")))
- (define-key global-map (kbd "M-g")
+ (setq hydra-curr-body-fn
+ 'hydra-error/body))
+ (condition-case err
+ (progn
+ (setq this-command
+ 'previous-error)
+ (hydra--call-interactively-remap-maybe
+ #'previous-error))
+ ((quit error)
+ (message
+ (error-message-string err))))
+ (hydra-show-hint
+ hydra-error/hint
+ 'hydra-error)
+ (hydra-set-transient-map
+ hydra-error/keymap
+ (lambda nil
+ (hydra-keyboard-quit)
+ nil)
nil))
- (define-key global-map [134217831 104]
- (quote hydra-error/first-error))
- (define-key global-map [134217831 106]
- (quote hydra-error/next-error))
- (define-key global-map [134217831 107]
- (quote
- hydra-error/previous-error))
- (defun hydra-error/body nil
- "Call the body in the \"hydra-error\" hydra.
+ (unless (keymapp
+ (lookup-key
+ global-map
+ (kbd "M-g")))
+ (define-key global-map (kbd "M-g")
+ nil))
+ (define-key global-map [134217831 104]
+ 'hydra-error/first-error)
+ (define-key global-map [134217831 106]
+ 'hydra-error/next-error)
+ (define-key global-map [134217831 107]
+ 'hydra-error/previous-error)
+ (defun hydra-error/body nil
+ "Call the body in the \"hydra-error\" hydra.
The heads for the associated hydra are:
@@ -243,109 +241,108 @@ The heads for the associated hydra are:
\"SPC\": `hydra-repeat'
The body can be accessed via `hydra-error/body', which is bound to \"M-g\"."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (let ((hydra--ignore nil))
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-error/body)))
- (hydra-show-hint
- hydra-error/hint
- (quote hydra-error))
- (hydra-set-transient-map
- hydra-error/keymap
- (lambda nil
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (let ((hydra--ignore nil))
(hydra-keyboard-quit)
- nil)
- nil)
- (setq prefix-arg
- current-prefix-arg))))))
+ (setq hydra-curr-body-fn
+ 'hydra-error/body))
+ (hydra-show-hint
+ hydra-error/hint
+ 'hydra-error)
+ (hydra-set-transient-map
+ hydra-error/keymap
+ (lambda nil
+ (hydra-keyboard-quit)
+ nil)
+ nil)
+ (setq prefix-arg
+ current-prefix-arg))))))
(ert-deftest hydra-blue-toggle ()
(should
(equal
(macroexpand
'(defhydra hydra-toggle (:color blue)
- "toggle"
- ("t" toggle-truncate-lines "truncate")
- ("f" auto-fill-mode "fill")
- ("a" abbrev-mode "abbrev")
- ("q" nil "cancel")))
+ "toggle"
+ ("t" toggle-truncate-lines "truncate")
+ ("f" auto-fill-mode "fill")
+ ("a" abbrev-mode "abbrev")
+ ("q" nil "cancel")))
'(progn
- (set
- (defvar hydra-toggle/params nil
- "Params of hydra-toggle.")
- (quote
- (nil
- nil
- :exit t
- :foreign-keys nil)))
- (set
- (defvar hydra-toggle/docstring nil
- "Docstring of hydra-toggle.")
- "toggle")
- (set
- (defvar hydra-toggle/heads nil
- "Heads for hydra-toggle.")
- (quote
- (("t"
- toggle-truncate-lines
- "truncate"
- :exit t)
- ("f"
- auto-fill-mode
- "fill"
- :exit t)
- ("a"
- abbrev-mode
- "abbrev"
- :exit t)
- ("q" nil "cancel" :exit t))))
- (set
- (defvar hydra-toggle/keymap nil
- "Keymap for hydra-toggle.")
- (quote
- (keymap
- (113 . hydra-toggle/nil)
- (97 . hydra-toggle/abbrev-mode-and-exit)
- (102 . hydra-toggle/auto-fill-mode-and-exit)
- (116 . hydra-toggle/toggle-truncate-lines-and-exit)
- (kp-subtract . hydra--negative-argument)
- (kp-9 . hydra--digit-argument)
- (kp-8 . hydra--digit-argument)
- (kp-7 . hydra--digit-argument)
- (kp-6 . hydra--digit-argument)
- (kp-5 . hydra--digit-argument)
- (kp-4 . hydra--digit-argument)
- (kp-3 . hydra--digit-argument)
- (kp-2 . hydra--digit-argument)
- (kp-1 . hydra--digit-argument)
- (kp-0 . hydra--digit-argument)
- (57 . hydra--digit-argument)
- (56 . hydra--digit-argument)
- (55 . hydra--digit-argument)
- (54 . hydra--digit-argument)
- (53 . hydra--digit-argument)
- (52 . hydra--digit-argument)
- (51 . hydra--digit-argument)
- (50 . hydra--digit-argument)
- (49 . hydra--digit-argument)
- (48 . hydra--digit-argument)
- (45 . hydra--negative-argument)
- (21 . hydra--universal-argument))))
- (set
- (defvar hydra-toggle/hint nil
- "Dynamic hint for hydra-toggle.")
- (quote
- (format
- #("toggle: [t]: truncate, [f]: fill, [a]: abbrev, [q]: cancel."
- 9 10 (face hydra-face-blue)
- 24 25 (face hydra-face-blue)
- 35 36 (face hydra-face-blue)
- 48 49 (face hydra-face-blue)))))
- (defun hydra-toggle/toggle-truncate-lines-and-exit nil
- "Call the head `toggle-truncate-lines' in the \"hydra-toggle\" hydra.
+ (set
+ (defvar hydra-toggle/params nil
+ "Params of hydra-toggle.")
+ '(nil
+ nil
+ :exit t
+ :foreign-keys nil))
+ (set
+ (defvar hydra-toggle/docstring nil
+ "Docstring of hydra-toggle.")
+ "toggle")
+ (set
+ (defvar hydra-toggle/heads nil
+ "Heads for hydra-toggle.")
+ '(("t"
+ toggle-truncate-lines
+ "truncate"
+ :exit t)
+ ("f"
+ auto-fill-mode
+ "fill"
+ :exit t)
+ ("a"
+ abbrev-mode
+ "abbrev"
+ :exit t)
+ ("q" nil "cancel" :exit t)))
+ (set
+ (defvar hydra-toggle/keymap nil
+ "Keymap for hydra-toggle.")
+ '(keymap
+ (113 . hydra-toggle/nil)
+ (97 . hydra-toggle/abbrev-mode-and-exit)
+ (102 . hydra-toggle/auto-fill-mode-and-exit)
+ (116 . hydra-toggle/toggle-truncate-lines-and-exit)
+ (kp-subtract . hydra--negative-argument)
+ (kp-9 . hydra--digit-argument)
+ (kp-8 . hydra--digit-argument)
+ (kp-7 . hydra--digit-argument)
+ (kp-6 . hydra--digit-argument)
+ (kp-5 . hydra--digit-argument)
+ (kp-4 . hydra--digit-argument)
+ (kp-3 . hydra--digit-argument)
+ (kp-2 . hydra--digit-argument)
+ (kp-1 . hydra--digit-argument)
+ (kp-0 . hydra--digit-argument)
+ (57 . hydra--digit-argument)
+ (56 . hydra--digit-argument)
+ (55 . hydra--digit-argument)
+ (54 . hydra--digit-argument)
+ (53 . hydra--digit-argument)
+ (52 . hydra--digit-argument)
+ (51 . hydra--digit-argument)
+ (50 . hydra--digit-argument)
+ (49 . hydra--digit-argument)
+ (48 . hydra--digit-argument)
+ (45 . hydra--negative-argument)
+ (21 . hydra--universal-argument)
+ (f1
+ keymap
+ (107 . hydra--describe-key))))
+ (set
+ (defvar hydra-toggle/hint nil
+ "Dynamic hint for hydra-toggle.")
+ '(format
+ #("toggle: [t]: truncate, [f]: fill, [a]: abbrev, [q]: cancel."
+ 9 10 (face hydra-face-blue)
+ 24 25 (face hydra-face-blue)
+ 35 36 (face hydra-face-blue)
+ 48 49 (face hydra-face-blue))))
+ (defun hydra-toggle/toggle-truncate-lines-and-exit nil
+ "Call the head `toggle-truncate-lines' in the \"hydra-toggle\" hydra.
The heads for the associated hydra are:
@@ -355,20 +352,19 @@ The heads for the associated hydra are:
\"q\": nil
The body can be accessed via `hydra-toggle/body'."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-toggle/body))
- (progn
- (setq this-command
- (quote toggle-truncate-lines))
- (hydra--call-interactively-remap-maybe
- (function
- toggle-truncate-lines))))
- (defun hydra-toggle/auto-fill-mode-and-exit nil
- "Call the head `auto-fill-mode' in the \"hydra-toggle\" hydra.
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (hydra-keyboard-quit)
+ (setq hydra-curr-body-fn
+ 'hydra-toggle/body)
+ (progn
+ (setq this-command
+ 'toggle-truncate-lines)
+ (hydra--call-interactively-remap-maybe
+ #'toggle-truncate-lines)))
+ (defun hydra-toggle/auto-fill-mode-and-exit nil
+ "Call the head `auto-fill-mode' in the \"hydra-toggle\" hydra.
The heads for the associated hydra are:
@@ -378,19 +374,19 @@ The heads for the associated hydra are:
\"q\": nil
The body can be accessed via `hydra-toggle/body'."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-toggle/body))
- (progn
- (setq this-command
- (quote auto-fill-mode))
- (hydra--call-interactively-remap-maybe
- (function auto-fill-mode))))
- (defun hydra-toggle/abbrev-mode-and-exit nil
- "Call the head `abbrev-mode' in the \"hydra-toggle\" hydra.
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (hydra-keyboard-quit)
+ (setq hydra-curr-body-fn
+ 'hydra-toggle/body)
+ (progn
+ (setq this-command
+ 'auto-fill-mode)
+ (hydra--call-interactively-remap-maybe
+ #'auto-fill-mode)))
+ (defun hydra-toggle/abbrev-mode-and-exit nil
+ "Call the head `abbrev-mode' in the \"hydra-toggle\" hydra.
The heads for the associated hydra are:
@@ -400,19 +396,19 @@ The heads for the associated hydra are:
\"q\": nil
The body can be accessed via `hydra-toggle/body'."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-toggle/body))
- (progn
- (setq this-command
- (quote abbrev-mode))
- (hydra--call-interactively-remap-maybe
- (function abbrev-mode))))
- (defun hydra-toggle/nil nil
- "Call the head `nil' in the \"hydra-toggle\" hydra.
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (hydra-keyboard-quit)
+ (setq hydra-curr-body-fn
+ 'hydra-toggle/body)
+ (progn
+ (setq this-command
+ 'abbrev-mode)
+ (hydra--call-interactively-remap-maybe
+ #'abbrev-mode)))
+ (defun hydra-toggle/nil nil
+ "Call the head `nil' in the \"hydra-toggle\" hydra.
The heads for the associated hydra are:
@@ -422,14 +418,14 @@ The heads for the associated hydra are:
\"q\": nil
The body can be accessed via `hydra-toggle/body'."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-toggle/body)))
- (defun hydra-toggle/body nil
- "Call the body in the \"hydra-toggle\" hydra.
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (hydra-keyboard-quit)
+ (setq hydra-curr-body-fn
+ 'hydra-toggle/body))
+ (defun hydra-toggle/body nil
+ "Call the body in the \"hydra-toggle\" hydra.
The heads for the associated hydra are:
@@ -439,106 +435,105 @@ The heads for the associated hydra are:
\"q\": nil
The body can be accessed via `hydra-toggle/body'."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (let ((hydra--ignore nil))
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-toggle/body)))
- (hydra-show-hint
- hydra-toggle/hint
- (quote hydra-toggle))
- (hydra-set-transient-map
- hydra-toggle/keymap
- (lambda nil
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (let ((hydra--ignore nil))
(hydra-keyboard-quit)
- nil)
- nil)
- (setq prefix-arg
- current-prefix-arg))))))
+ (setq hydra-curr-body-fn
+ 'hydra-toggle/body))
+ (hydra-show-hint
+ hydra-toggle/hint
+ 'hydra-toggle)
+ (hydra-set-transient-map
+ hydra-toggle/keymap
+ (lambda nil
+ (hydra-keyboard-quit)
+ nil)
+ nil)
+ (setq prefix-arg
+ current-prefix-arg))))))
(ert-deftest hydra-amaranth-vi ()
(should
(equal
(macroexpand
'(defhydra hydra-vi
- (:pre
- (set-cursor-color "#e52b50")
- :post
- (set-cursor-color "#ffffff")
- :color amaranth)
- "vi"
- ("j" next-line)
- ("k" previous-line)
- ("q" nil "quit")))
+ (:pre
+ (set-cursor-color "#e52b50")
+ :post
+ (set-cursor-color "#ffffff")
+ :color amaranth)
+ "vi"
+ ("j" next-line)
+ ("k" previous-line)
+ ("q" nil "quit")))
'(progn
- (set
- (defvar hydra-vi/params nil
- "Params of hydra-vi.")
- (quote
- (nil
- nil
- :exit nil
- :foreign-keys warn
- :post (set-cursor-color "#ffffff")
- :pre (set-cursor-color "#e52b50"))))
- (set
- (defvar hydra-vi/docstring nil
- "Docstring of hydra-vi.")
- "vi")
- (set
- (defvar hydra-vi/heads nil
- "Heads for hydra-vi.")
- (quote
- (("j" next-line "" :exit nil)
- ("k"
- previous-line
- ""
- :exit nil)
- ("q" nil "quit" :exit t))))
- (set
- (defvar hydra-vi/keymap nil
- "Keymap for hydra-vi.")
- (quote
- (keymap
- (113 . hydra-vi/nil)
- (107 . hydra-vi/previous-line)
- (106 . hydra-vi/next-line)
- (kp-subtract . hydra--negative-argument)
- (kp-9 . hydra--digit-argument)
- (kp-8 . hydra--digit-argument)
- (kp-7 . hydra--digit-argument)
- (kp-6 . hydra--digit-argument)
- (kp-5 . hydra--digit-argument)
- (kp-4 . hydra--digit-argument)
- (kp-3 . hydra--digit-argument)
- (kp-2 . hydra--digit-argument)
- (kp-1 . hydra--digit-argument)
- (kp-0 . hydra--digit-argument)
- (57 . hydra--digit-argument)
- (56 . hydra--digit-argument)
- (55 . hydra--digit-argument)
- (54 . hydra--digit-argument)
- (53 . hydra--digit-argument)
- (52 . hydra--digit-argument)
- (51 . hydra--digit-argument)
- (50 . hydra--digit-argument)
- (49 . hydra--digit-argument)
- (48 . hydra--digit-argument)
- (45 . hydra--negative-argument)
- (21 . hydra--universal-argument))))
- (set
- (defvar hydra-vi/hint nil
- "Dynamic hint for hydra-vi.")
- (quote
- (format
- #("vi: j, k, [q]: quit."
- 4 5 (face hydra-face-amaranth)
- 7 8 (face hydra-face-amaranth)
- 11 12 (face hydra-face-teal)))))
- (defun hydra-vi/next-line nil
- "Call the head `next-line' in the \"hydra-vi\" hydra.
+ (set
+ (defvar hydra-vi/params nil
+ "Params of hydra-vi.")
+ '(nil
+ nil
+ :exit nil
+ :foreign-keys warn
+ :post (set-cursor-color "#ffffff")
+ :pre (set-cursor-color "#e52b50")))
+ (set
+ (defvar hydra-vi/docstring nil
+ "Docstring of hydra-vi.")
+ "vi")
+ (set
+ (defvar hydra-vi/heads nil
+ "Heads for hydra-vi.")
+ '(("j" next-line "" :exit nil)
+ ("k"
+ previous-line
+ ""
+ :exit nil)
+ ("q" nil "quit" :exit t)))
+ (set
+ (defvar hydra-vi/keymap nil
+ "Keymap for hydra-vi.")
+ '(keymap
+ (113 . hydra-vi/nil)
+ (107 . hydra-vi/previous-line)
+ (106 . hydra-vi/next-line)
+ (kp-subtract . hydra--negative-argument)
+ (kp-9 . hydra--digit-argument)
+ (kp-8 . hydra--digit-argument)
+ (kp-7 . hydra--digit-argument)
+ (kp-6 . hydra--digit-argument)
+ (kp-5 . hydra--digit-argument)
+ (kp-4 . hydra--digit-argument)
+ (kp-3 . hydra--digit-argument)
+ (kp-2 . hydra--digit-argument)
+ (kp-1 . hydra--digit-argument)
+ (kp-0 . hydra--digit-argument)
+ (57 . hydra--digit-argument)
+ (56 . hydra--digit-argument)
+ (55 . hydra--digit-argument)
+ (54 . hydra--digit-argument)
+ (53 . hydra--digit-argument)
+ (52 . hydra--digit-argument)
+ (51 . hydra--digit-argument)
+ (50 . hydra--digit-argument)
+ (49 . hydra--digit-argument)
+ (48 . hydra--digit-argument)
+ (45 . hydra--negative-argument)
+ (21 . hydra--universal-argument)
+ (f1
+ keymap
+ (107 . hydra--describe-key))))
+ (set
+ (defvar hydra-vi/hint nil
+ "Dynamic hint for hydra-vi.")
+ '(format
+ #("vi: j, k, [q]: quit."
+ 4 5 (face hydra-face-amaranth)
+ 7 8 (face hydra-face-amaranth)
+ 11 12 (face hydra-face-teal))))
+ (defun hydra-vi/next-line nil
+ "Call the head `next-line' in the \"hydra-vi\" hydra.
The heads for the associated hydra are:
@@ -547,34 +542,33 @@ The heads for the associated hydra are:
\"q\": nil
The body can be accessed via `hydra-vi/body'."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (set-cursor-color "#e52b50")
- (let ((hydra--ignore t))
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-vi/body)))
- (condition-case err
- (progn
- (setq this-command
- (quote next-line))
- (hydra--call-interactively-remap-maybe
- (function next-line)))
- ((quit error)
- (message
- (error-message-string err))))
- (hydra-show-hint
- hydra-vi/hint
- (quote hydra-vi))
- (hydra-set-transient-map
- hydra-vi/keymap
- (lambda nil
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (set-cursor-color "#e52b50")
+ (let ((hydra--ignore t))
(hydra-keyboard-quit)
- (set-cursor-color "#ffffff"))
- (quote warn)))
- (defun hydra-vi/previous-line nil
- "Call the head `previous-line' in the \"hydra-vi\" hydra.
+ (setq hydra-curr-body-fn
+ 'hydra-vi/body))
+ (condition-case err
+ (progn
+ (setq this-command 'next-line)
+ (hydra--call-interactively-remap-maybe
+ #'next-line))
+ ((quit error)
+ (message
+ (error-message-string err))))
+ (hydra-show-hint
+ hydra-vi/hint
+ 'hydra-vi)
+ (hydra-set-transient-map
+ hydra-vi/keymap
+ (lambda nil
+ (hydra-keyboard-quit)
+ (set-cursor-color "#ffffff"))
+ 'warn))
+ (defun hydra-vi/previous-line nil
+ "Call the head `previous-line' in the \"hydra-vi\" hydra.
The heads for the associated hydra are:
@@ -583,34 +577,34 @@ The heads for the associated hydra are:
\"q\": nil
The body can be accessed via `hydra-vi/body'."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (set-cursor-color "#e52b50")
- (let ((hydra--ignore t))
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-vi/body)))
- (condition-case err
- (progn
- (setq this-command
- (quote previous-line))
- (hydra--call-interactively-remap-maybe
- (function previous-line)))
- ((quit error)
- (message
- (error-message-string err))))
- (hydra-show-hint
- hydra-vi/hint
- (quote hydra-vi))
- (hydra-set-transient-map
- hydra-vi/keymap
- (lambda nil
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (set-cursor-color "#e52b50")
+ (let ((hydra--ignore t))
(hydra-keyboard-quit)
- (set-cursor-color "#ffffff"))
- (quote warn)))
- (defun hydra-vi/nil nil
- "Call the head `nil' in the \"hydra-vi\" hydra.
+ (setq hydra-curr-body-fn
+ 'hydra-vi/body))
+ (condition-case err
+ (progn
+ (setq this-command
+ 'previous-line)
+ (hydra--call-interactively-remap-maybe
+ #'previous-line))
+ ((quit error)
+ (message
+ (error-message-string err))))
+ (hydra-show-hint
+ hydra-vi/hint
+ 'hydra-vi)
+ (hydra-set-transient-map
+ hydra-vi/keymap
+ (lambda nil
+ (hydra-keyboard-quit)
+ (set-cursor-color "#ffffff"))
+ 'warn))
+ (defun hydra-vi/nil nil
+ "Call the head `nil' in the \"hydra-vi\" hydra.
The heads for the associated hydra are:
@@ -619,15 +613,15 @@ The heads for the associated hydra are:
\"q\": nil
The body can be accessed via `hydra-vi/body'."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (set-cursor-color "#e52b50")
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-vi/body)))
- (defun hydra-vi/body nil
- "Call the body in the \"hydra-vi\" hydra.
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (set-cursor-color "#e52b50")
+ (hydra-keyboard-quit)
+ (setq hydra-curr-body-fn
+ 'hydra-vi/body))
+ (defun hydra-vi/body nil
+ "Call the body in the \"hydra-vi\" hydra.
The heads for the associated hydra are:
@@ -636,101 +630,101 @@ The heads for the associated hydra are:
\"q\": nil
The body can be accessed via `hydra-vi/body'."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (set-cursor-color "#e52b50")
- (let ((hydra--ignore nil))
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-vi/body)))
- (hydra-show-hint
- hydra-vi/hint
- (quote hydra-vi))
- (hydra-set-transient-map
- hydra-vi/keymap
- (lambda nil
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (set-cursor-color "#e52b50")
+ (let ((hydra--ignore nil))
(hydra-keyboard-quit)
- (set-cursor-color "#ffffff"))
- (quote warn))
- (setq prefix-arg
- current-prefix-arg))))))
+ (setq hydra-curr-body-fn
+ 'hydra-vi/body))
+ (hydra-show-hint
+ hydra-vi/hint
+ 'hydra-vi)
+ (hydra-set-transient-map
+ hydra-vi/keymap
+ (lambda nil
+ (hydra-keyboard-quit)
+ (set-cursor-color "#ffffff"))
+ 'warn)
+ (setq prefix-arg
+ current-prefix-arg))))))
(ert-deftest hydra-zoom-duplicate-1 ()
(should
(equal
(macroexpand
'(defhydra hydra-zoom ()
- "zoom"
- ("r" (text-scale-set 0) "reset")
- ("0" (text-scale-set 0) :bind nil :exit t)
- ("1" (text-scale-set 0) nil :bind nil :exit t)))
+ "zoom"
+ ("r" (text-scale-set 0) "reset")
+ ("0" (text-scale-set 0) :bind nil :exit t)
+ ("1" (text-scale-set 0) nil :bind nil :exit t)))
'(progn
- (set
- (defvar hydra-zoom/params nil
- "Params of hydra-zoom.")
- (quote (nil nil)))
- (set
- (defvar hydra-zoom/docstring nil
- "Docstring of hydra-zoom.")
- "zoom")
- (set
- (defvar hydra-zoom/heads nil
- "Heads for hydra-zoom.")
- (quote
- (("r"
- (text-scale-set 0)
- "reset"
- :exit nil)
- ("0"
- (text-scale-set 0)
- ""
- :bind nil
- :exit t)
- ("1"
- (text-scale-set 0)
- nil
- :bind nil
- :exit t))))
- (set
- (defvar hydra-zoom/keymap nil
- "Keymap for hydra-zoom.")
- (quote
- (keymap
- (114 . hydra-zoom/lambda-r)
- (kp-subtract . hydra--negative-argument)
- (kp-9 . hydra--digit-argument)
- (kp-8 . hydra--digit-argument)
- (kp-7 . hydra--digit-argument)
- (kp-6 . hydra--digit-argument)
- (kp-5 . hydra--digit-argument)
- (kp-4 . hydra--digit-argument)
- (kp-3 . hydra--digit-argument)
- (kp-2 . hydra--digit-argument)
- (kp-1 . hydra--digit-argument)
- (kp-0 . hydra--digit-argument)
- (57 . hydra--digit-argument)
- (56 . hydra--digit-argument)
- (55 . hydra--digit-argument)
- (54 . hydra--digit-argument)
- (53 . hydra--digit-argument)
- (52 . hydra--digit-argument)
- (51 . hydra--digit-argument)
- (50 . hydra--digit-argument)
- (49 . hydra-zoom/lambda-0-and-exit)
- (48 . hydra-zoom/lambda-0-and-exit)
- (45 . hydra--negative-argument)
- (21 . hydra--universal-argument))))
- (set
- (defvar hydra-zoom/hint nil
- "Dynamic hint for hydra-zoom.")
- (quote
- (format
- #("zoom: [r 0]: reset."
- 7 8 (face hydra-face-red)
- 9 10 (face hydra-face-blue)))))
- (defun hydra-zoom/lambda-r nil
- "Call the head `(text-scale-set 0)' in the \"hydra-zoom\" hydra.
+ (set
+ (defvar hydra-zoom/params nil
+ "Params of hydra-zoom.")
+ '(nil nil))
+ (set
+ (defvar hydra-zoom/docstring nil
+ "Docstring of hydra-zoom.")
+ "zoom")
+ (set
+ (defvar hydra-zoom/heads nil
+ "Heads for hydra-zoom.")
+ '(("r"
+ (text-scale-set 0)
+ "reset"
+ :exit nil)
+ ("0"
+ (text-scale-set 0)
+ ""
+ :bind nil
+ :exit t)
+ ("1"
+ (text-scale-set 0)
+ nil
+ :bind nil
+ :exit t)))
+ (set
+ (defvar hydra-zoom/keymap nil
+ "Keymap for hydra-zoom.")
+ '(keymap
+ (114 . hydra-zoom/lambda-r)
+ (kp-subtract . hydra--negative-argument)
+ (kp-9 . hydra--digit-argument)
+ (kp-8 . hydra--digit-argument)
+ (kp-7 . hydra--digit-argument)
+ (kp-6 . hydra--digit-argument)
+ (kp-5 . hydra--digit-argument)
+ (kp-4 . hydra--digit-argument)
+ (kp-3 . hydra--digit-argument)
+ (kp-2 . hydra--digit-argument)
+ (kp-1 . hydra--digit-argument)
+ (kp-0 . hydra--digit-argument)
+ (57 . hydra--digit-argument)
+ (56 . hydra--digit-argument)
+ (55 . hydra--digit-argument)
+ (54 . hydra--digit-argument)
+ (53 . hydra--digit-argument)
+ (52 . hydra--digit-argument)
+ (51 . hydra--digit-argument)
+ (50 . hydra--digit-argument)
+ (49 . hydra-zoom/lambda-0-and-exit)
+ (48 . hydra-zoom/lambda-0-and-exit)
+ (45 . hydra--negative-argument)
+ (21 . hydra--universal-argument)
+ (f1
+ keymap
+ (107 . hydra--describe-key))))
+ (set
+ (defvar hydra-zoom/hint nil
+ "Dynamic hint for hydra-zoom.")
+ '(format
+ #("zoom: [r 0]: reset."
+ 7 8 (face hydra-face-red)
+ 9 10 (face hydra-face-blue))))
+ (defun hydra-zoom/lambda-r nil
+ "Call the head `(text-scale-set 0)' in the \"hydra-zoom\" hydra.
The heads for the associated hydra are:
@@ -739,33 +733,32 @@ The heads for the associated hydra are:
\"1\": `(text-scale-set 0)'
The body can be accessed via `hydra-zoom/body'."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (let ((hydra--ignore t))
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-zoom/body)))
- (condition-case err
- (hydra--call-interactively-remap-maybe
- (function
- (lambda nil
- (interactive)
- (text-scale-set 0))))
- ((quit error)
- (message
- (error-message-string err))))
- (hydra-show-hint
- hydra-zoom/hint
- (quote hydra-zoom))
- (hydra-set-transient-map
- hydra-zoom/keymap
- (lambda nil
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (let ((hydra--ignore t))
(hydra-keyboard-quit)
- nil)
- nil))
- (defun hydra-zoom/lambda-0-and-exit nil
- "Call the head `(text-scale-set 0)' in the \"hydra-zoom\" hydra.
+ (setq hydra-curr-body-fn
+ 'hydra-zoom/body))
+ (condition-case err
+ (hydra--call-interactively-remap-maybe
+ #'(lambda nil
+ (interactive)
+ (text-scale-set 0)))
+ ((quit error)
+ (message
+ (error-message-string err))))
+ (hydra-show-hint
+ hydra-zoom/hint
+ 'hydra-zoom)
+ (hydra-set-transient-map
+ hydra-zoom/keymap
+ (lambda nil
+ (hydra-keyboard-quit)
+ nil)
+ nil))
+ (defun hydra-zoom/lambda-0-and-exit nil
+ "Call the head `(text-scale-set 0)' in the \"hydra-zoom\" hydra.
The heads for the associated hydra are:
@@ -774,19 +767,18 @@ The heads for the associated hydra are:
\"1\": `(text-scale-set 0)'
The body can be accessed via `hydra-zoom/body'."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-zoom/body))
- (hydra--call-interactively-remap-maybe
- (function
- (lambda nil
- (interactive)
- (text-scale-set 0)))))
- (defun hydra-zoom/body nil
- "Call the body in the \"hydra-zoom\" hydra.
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (hydra-keyboard-quit)
+ (setq hydra-curr-body-fn
+ 'hydra-zoom/body)
+ (hydra--call-interactively-remap-maybe
+ #'(lambda nil
+ (interactive)
+ (text-scale-set 0))))
+ (defun hydra-zoom/body nil
+ "Call the body in the \"hydra-zoom\" hydra.
The heads for the associated hydra are:
@@ -795,100 +787,100 @@ The heads for the associated hydra are:
\"1\": `(text-scale-set 0)'
The body can be accessed via `hydra-zoom/body'."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (let ((hydra--ignore nil))
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-zoom/body)))
- (hydra-show-hint
- hydra-zoom/hint
- (quote hydra-zoom))
- (hydra-set-transient-map
- hydra-zoom/keymap
- (lambda nil
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (let ((hydra--ignore nil))
(hydra-keyboard-quit)
- nil)
- nil)
- (setq prefix-arg
- current-prefix-arg))))))
+ (setq hydra-curr-body-fn
+ 'hydra-zoom/body))
+ (hydra-show-hint
+ hydra-zoom/hint
+ 'hydra-zoom)
+ (hydra-set-transient-map
+ hydra-zoom/keymap
+ (lambda nil
+ (hydra-keyboard-quit)
+ nil)
+ nil)
+ (setq prefix-arg
+ current-prefix-arg))))))
(ert-deftest hydra-zoom-duplicate-2 ()
(should
(equal
(macroexpand
'(defhydra hydra-zoom ()
- "zoom"
- ("r" (text-scale-set 0) "reset")
- ("0" (text-scale-set 0) :bind nil :exit t)
- ("1" (text-scale-set 0) nil :bind nil)))
+ "zoom"
+ ("r" (text-scale-set 0) "reset")
+ ("0" (text-scale-set 0) :bind nil :exit t)
+ ("1" (text-scale-set 0) nil :bind nil)))
'(progn
- (set
- (defvar hydra-zoom/params nil
- "Params of hydra-zoom.")
- (quote (nil nil)))
- (set
- (defvar hydra-zoom/docstring nil
- "Docstring of hydra-zoom.")
- "zoom")
- (set
- (defvar hydra-zoom/heads nil
- "Heads for hydra-zoom.")
- (quote
- (("r"
- (text-scale-set 0)
- "reset"
- :exit nil)
- ("0"
- (text-scale-set 0)
- ""
- :bind nil
- :exit t)
- ("1"
- (text-scale-set 0)
- nil
- :bind nil
- :exit nil))))
- (set
- (defvar hydra-zoom/keymap nil
- "Keymap for hydra-zoom.")
- (quote
- (keymap
- (114 . hydra-zoom/lambda-r)
- (kp-subtract . hydra--negative-argument)
- (kp-9 . hydra--digit-argument)
- (kp-8 . hydra--digit-argument)
- (kp-7 . hydra--digit-argument)
- (kp-6 . hydra--digit-argument)
- (kp-5 . hydra--digit-argument)
- (kp-4 . hydra--digit-argument)
- (kp-3 . hydra--digit-argument)
- (kp-2 . hydra--digit-argument)
- (kp-1 . hydra--digit-argument)
- (kp-0 . hydra--digit-argument)
- (57 . hydra--digit-argument)
- (56 . hydra--digit-argument)
- (55 . hydra--digit-argument)
- (54 . hydra--digit-argument)
- (53 . hydra--digit-argument)
- (52 . hydra--digit-argument)
- (51 . hydra--digit-argument)
- (50 . hydra--digit-argument)
- (49 . hydra-zoom/lambda-r)
- (48 . hydra-zoom/lambda-0-and-exit)
- (45 . hydra--negative-argument)
- (21 . hydra--universal-argument))))
- (set
- (defvar hydra-zoom/hint nil
- "Dynamic hint for hydra-zoom.")
- (quote
- (format
- #("zoom: [r 0]: reset."
- 7 8 (face hydra-face-red)
- 9 10 (face hydra-face-blue)))))
- (defun hydra-zoom/lambda-r nil
- "Call the head `(text-scale-set 0)' in the \"hydra-zoom\" hydra.
+ (set
+ (defvar hydra-zoom/params nil
+ "Params of hydra-zoom.")
+ '(nil nil))
+ (set
+ (defvar hydra-zoom/docstring nil
+ "Docstring of hydra-zoom.")
+ "zoom")
+ (set
+ (defvar hydra-zoom/heads nil
+ "Heads for hydra-zoom.")
+ '(("r"
+ (text-scale-set 0)
+ "reset"
+ :exit nil)
+ ("0"
+ (text-scale-set 0)
+ ""
+ :bind nil
+ :exit t)
+ ("1"
+ (text-scale-set 0)
+ nil
+ :bind nil
+ :exit nil)))
+ (set
+ (defvar hydra-zoom/keymap nil
+ "Keymap for hydra-zoom.")
+ '(keymap
+ (114 . hydra-zoom/lambda-r)
+ (kp-subtract . hydra--negative-argument)
+ (kp-9 . hydra--digit-argument)
+ (kp-8 . hydra--digit-argument)
+ (kp-7 . hydra--digit-argument)
+ (kp-6 . hydra--digit-argument)
+ (kp-5 . hydra--digit-argument)
+ (kp-4 . hydra--digit-argument)
+ (kp-3 . hydra--digit-argument)
+ (kp-2 . hydra--digit-argument)
+ (kp-1 . hydra--digit-argument)
+ (kp-0 . hydra--digit-argument)
+ (57 . hydra--digit-argument)
+ (56 . hydra--digit-argument)
+ (55 . hydra--digit-argument)
+ (54 . hydra--digit-argument)
+ (53 . hydra--digit-argument)
+ (52 . hydra--digit-argument)
+ (51 . hydra--digit-argument)
+ (50 . hydra--digit-argument)
+ (49 . hydra-zoom/lambda-r)
+ (48 . hydra-zoom/lambda-0-and-exit)
+ (45 . hydra--negative-argument)
+ (21 . hydra--universal-argument)
+ (f1
+ keymap
+ (107 . hydra--describe-key))))
+ (set
+ (defvar hydra-zoom/hint nil
+ "Dynamic hint for hydra-zoom.")
+ '(format
+ #("zoom: [r 0]: reset."
+ 7 8 (face hydra-face-red)
+ 9 10 (face hydra-face-blue))))
+ (defun hydra-zoom/lambda-r nil
+ "Call the head `(text-scale-set 0)' in the \"hydra-zoom\" hydra.
The heads for the associated hydra are:
@@ -897,33 +889,32 @@ The heads for the associated hydra are:
\"1\": `(text-scale-set 0)'
The body can be accessed via `hydra-zoom/body'."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (let ((hydra--ignore t))
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-zoom/body)))
- (condition-case err
- (hydra--call-interactively-remap-maybe
- (function
- (lambda nil
- (interactive)
- (text-scale-set 0))))
- ((quit error)
- (message
- (error-message-string err))))
- (hydra-show-hint
- hydra-zoom/hint
- (quote hydra-zoom))
- (hydra-set-transient-map
- hydra-zoom/keymap
- (lambda nil
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (let ((hydra--ignore t))
(hydra-keyboard-quit)
- nil)
- nil))
- (defun hydra-zoom/lambda-0-and-exit nil
- "Call the head `(text-scale-set 0)' in the \"hydra-zoom\" hydra.
+ (setq hydra-curr-body-fn
+ 'hydra-zoom/body))
+ (condition-case err
+ (hydra--call-interactively-remap-maybe
+ #'(lambda nil
+ (interactive)
+ (text-scale-set 0)))
+ ((quit error)
+ (message
+ (error-message-string err))))
+ (hydra-show-hint
+ hydra-zoom/hint
+ 'hydra-zoom)
+ (hydra-set-transient-map
+ hydra-zoom/keymap
+ (lambda nil
+ (hydra-keyboard-quit)
+ nil)
+ nil))
+ (defun hydra-zoom/lambda-0-and-exit nil
+ "Call the head `(text-scale-set 0)' in the \"hydra-zoom\" hydra.
The heads for the associated hydra are:
@@ -932,19 +923,18 @@ The heads for the associated hydra are:
\"1\": `(text-scale-set 0)'
The body can be accessed via `hydra-zoom/body'."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-zoom/body))
- (hydra--call-interactively-remap-maybe
- (function
- (lambda nil
- (interactive)
- (text-scale-set 0)))))
- (defun hydra-zoom/body nil
- "Call the body in the \"hydra-zoom\" hydra.
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (hydra-keyboard-quit)
+ (setq hydra-curr-body-fn
+ 'hydra-zoom/body)
+ (hydra--call-interactively-remap-maybe
+ #'(lambda nil
+ (interactive)
+ (text-scale-set 0))))
+ (defun hydra-zoom/body nil
+ "Call the body in the \"hydra-zoom\" hydra.
The heads for the associated hydra are:
@@ -953,24 +943,24 @@ The heads for the associated hydra are:
\"1\": `(text-scale-set 0)'
The body can be accessed via `hydra-zoom/body'."
- (interactive)
- (require (quote hydra))
- (hydra-default-pre)
- (let ((hydra--ignore nil))
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn
- (quote hydra-zoom/body)))
- (hydra-show-hint
- hydra-zoom/hint
- (quote hydra-zoom))
- (hydra-set-transient-map
- hydra-zoom/keymap
- (lambda nil
+ (interactive)
+ (require 'hydra)
+ (hydra-default-pre)
+ (let ((hydra--ignore nil))
(hydra-keyboard-quit)
- nil)
- nil)
- (setq prefix-arg
- current-prefix-arg))))))
+ (setq hydra-curr-body-fn
+ 'hydra-zoom/body))
+ (hydra-show-hint
+ hydra-zoom/hint
+ 'hydra-zoom)
+ (hydra-set-transient-map
+ hydra-zoom/keymap
+ (lambda nil
+ (hydra-keyboard-quit)
+ nil)
+ nil)
+ (setq prefix-arg
+ current-prefix-arg))))))
(ert-deftest defhydradio ()
(should (equal
@@ -1219,6 +1209,15 @@ _f_ auto-fill-mode: %`auto-fill-function
", ")
"."))))
+(ert-deftest hydra-format-11 ()
+ (should
+ (equal
+ (hydra--format nil '(nil nil :hint nil) "\n_f_ #+begin__src/#+end__src"
+ '(("f" forward-char nil :exit nil)))
+ '(format
+ "%s #+begin_src/#+end_src"
+ #("f" 0 1 (face hydra-face-red))))))
+
(ert-deftest hydra-format-with-sexp-1 ()
(should (equal
(let ((hydra-fontify-head-function
@@ -1322,9 +1321,9 @@ _f_ auto-fill-mode: %`auto-fill-function
'((a b c d) (e f g h) (i nil nil nil)))))
(ert-deftest hydra--cell ()
- (should (equal (hydra--cell "% -75s %%`%s" '(hydra-lv hydra-verbose))
- "When non-nil, `lv-message' (not `message') will be used to
display hints. %`hydra-lv^^^^^
-When non-nil, hydra will issue some non essential style warnings.
%`hydra-verbose")))
+ (should (equal (hydra--cell "% -75s %%`%s" '(hydra-hint-display-type
hydra-verbose))
+ "The utility to show hydra hint
%`hydra-hint-display-type
+When non-nil, hydra will issue some non essential style warnings.
%`hydra-verbose^^^^^^^^^^")))
(ert-deftest hydra--vconcat ()
(should (equal (hydra--vconcat '("abc\ndef" "012\n34" "def\nabc"))
@@ -1549,7 +1548,7 @@ y: back | b: up
;; checked:
;; basic rendering
-;; column compatibility with ruby style and no colum specified
+;; column compatibility with ruby style and no column specified
;; column declared several time
;; nil column
(ert-deftest hydra-column-basic ()
@@ -1632,7 +1631,7 @@ o: ok | s: string
("s" split-window-below "split window" :color
blue :column "Split Management")
("v" split-window-right "split window
vertically" :color blue)
("d" delete-window "delete current window")
- ("f" follow-mode "toogle follow mode")
+ ("f" follow-mode "toggle follow mode")
("u" winner-undo "undo window conf" :column
"Undo/Redo")
("r" winner-redo "redo window conf")
("b" balance-windows "balance window height"
:column "1-Sizing")
@@ -1645,7 +1644,7 @@ o: ok | s: string
z: ace | s: split window | u: undo window conf | b: balance
window height
h: ← window | v: split window vertically | r: redo window conf | m: maximize
current window
j: ↓ window | d: delete current window | | M: minimize
current window
-l: → window | f: toogle follow mode | |
+l: → window | f: toggle follow mode | |
k: ↑ window | | |
[q]: quit menu."
173 174 (face hydra-face-blue)
diff --git a/hydra.el b/hydra.el
index f28fdae7ce..c85926c5c8 100644
--- a/hydra.el
+++ b/hydra.el
@@ -33,7 +33,7 @@
;; heads can be called in succession with only a short extension.
;; The Hydra is vanquished once Hercules, any binding that isn't the
;; Hydra's head, arrives. Note that Hercules, besides vanquishing the
-;; Hydra, will still serve his orignal purpose, calling his proper
+;; Hydra, will still serve his original purpose, calling his proper
;; command. This makes the Hydra very seamless, it's like a minor
;; mode that disables itself automagically.
;;
@@ -101,7 +101,8 @@
This will be done even if the head wasn't designated for exiting.")
(defvar hydra-amaranth-warn-message "An amaranth Hydra can only exit through a
blue head"
- "Amaranth Warning message. Shown when the user tries to press an
unbound/non-exit key while in an amaranth head.")
+ "Amaranth Warning message. Shown when the user tries to press an
+unbound/non-exit key while in an amaranth head.")
(defun hydra-set-transient-map (keymap on-exit &optional foreign-keys)
"Set KEYMAP to the highest priority.
@@ -159,6 +160,7 @@ warn: keep KEYMAP and issue a warning instead of running
the command."
(with-selected-frame frame
(when overriding-terminal-local-map
(internal-pop-keymap hydra-curr-map 'overriding-terminal-local-map))))
+ (setq hydra-curr-map nil)
(unless hydra--ignore
(when hydra-curr-on-exit
(let ((on-exit hydra-curr-on-exit))
@@ -211,19 +213,37 @@ the body or the head."
(declare-function posframe-hide "posframe")
(declare-function posframe-poshandler-window-center "posframe")
+(defvar hydra-posframe-show-params
+ '(:internal-border-width 1
+ :internal-border-color "red"
+ :poshandler posframe-poshandler-window-center)
+ "List of parameters passed to `posframe-show'.")
+
+(defvar hydra--posframe-timer nil
+ "Timer for hiding posframe hint.")
+
(defun hydra-posframe-show (str)
(require 'posframe)
- (posframe-show
- " *hydra-posframe*"
- :string str
- :poshandler #'posframe-poshandler-window-center))
+ (when hydra--posframe-timer
+ (cancel-timer hydra--posframe-timer))
+ (setq hydra--posframe-timer nil)
+ (apply #'posframe-show
+ " *hydra-posframe*"
+ :string str
+ hydra-posframe-show-params))
(defun hydra-posframe-hide ()
- (posframe-hide " *hydra-posframe*"))
+ (require 'posframe)
+ (unless hydra--posframe-timer
+ (setq hydra--posframe-timer
+ (run-with-idle-timer
+ 0 nil (lambda ()
+ (setq hydra--posframe-timer nil)
+ (posframe-hide " *hydra-posframe*"))))))
(defvar hydra-hint-display-alist
(list (list 'lv #'lv-message #'lv-delete-window)
- (list 'message #'message (lambda () (message "")))
+ (list 'message (lambda (str) (message "%s" str)) (lambda () (message
"")))
(list 'posframe #'hydra-posframe-show #'hydra-posframe-hide))
"Store the functions for `hydra-hint-display-type'.")
@@ -235,14 +255,6 @@ the body or the head."
(const posframe))
:group 'hydra)
-(define-obsolete-variable-alias
- 'hydra-lv 'hydra-hint-display-type "0.14.0"
- "Use either `hydra-hint-display-type' or `hydra-set-property' :verbosity.")
-
-(defcustom hydra-lv t
- "When non-nil, `lv-message' (not `message') will be used to display hints."
- :type 'boolean)
-
(defcustom hydra-verbose nil
"When non-nil, hydra will issue some non essential style warnings."
:type 'boolean)
@@ -309,28 +321,39 @@ Exitable only through a blue head.")
(1 font-lock-keyword-face)
(2 font-lock-type-face)))))
+;;* Imenu
+(defun hydra-add-imenu ()
+ "Add this to `emacs-lisp-mode-hook' to have hydras in `imenu'."
+ (add-to-list
+ 'imenu-generic-expression
+ '("Hydras"
+ "^.*(\\(defhydra\\) \\([a-zA-Z-]+\\)"
+ 2)))
+
;;* Find Function
(eval-after-load 'find-func
'(defadvice find-function-search-for-symbol
(around hydra-around-find-function-search-for-symbol-advice
(symbol type library) activate)
"Navigate to hydras with `find-function-search-for-symbol'."
- ad-do-it
- ;; The orignial function returns (cons (current-buffer) (point))
- ;; if it found the point.
- (unless (cdr ad-return-value)
- (with-current-buffer (find-file-noselect library)
- (let ((sn (symbol-name symbol)))
- (when (and (null type)
- (string-match "\\`\\(hydra-[a-z-A-Z0-9]+\\)/\\(.*\\)\\'"
sn)
- (re-search-forward (concat "(defhydra " (match-string 1
sn))
- nil t))
- (goto-char (match-beginning 0)))
- (cons (current-buffer) (point)))))))
+ (prog1 ad-do-it
+ (when (symbolp symbol)
+ ;; The original function returns (cons (current-buffer) (point))
+ ;; if it found the point.
+ (unless (cdr ad-return-value)
+ (with-current-buffer (find-file-noselect library)
+ (let ((sn (symbol-name symbol)))
+ (when (and (null type)
+ (string-match
"\\`\\(hydra-[a-z-A-Z0-9]+\\)/\\(.*\\)\\'" sn)
+ (re-search-forward (concat "(defhydra " (match-string
1 sn))
+ nil t))
+ (goto-char (match-beginning 0)))
+ (cons (current-buffer) (point)))))))))
;;* Universal Argument
(defvar hydra-base-map
(let ((map (make-sparse-keymap)))
+ (define-key map (kbd "<f1> k") 'hydra--describe-key)
(define-key map [?\C-u] 'hydra--universal-argument)
(define-key map [?-] 'hydra--negative-argument)
(define-key map [?0] 'hydra--digit-argument)
@@ -392,6 +415,15 @@ Exitable only through a blue head.")
((eq arg '-) nil)
(t '-))))
+(defun hydra--describe-key ()
+ "Forward to `describe-key'.
+Call order: the hydra body, `hydra--describe-key', the head."
+ (interactive)
+ (lv-delete-window)
+ (let ((hydra-hint-display-type 'message))
+ (call-interactively 'describe-key)
+ (hydra-keyboard-quit)))
+
;;* Repeat
(defvar hydra-repeat--prefix-arg nil
"Prefix arg to use with `hydra-repeat'.")
@@ -515,7 +547,6 @@ Remove :color key. And sort the plist alphabetically."
(hydra-disable)
(cancel-timer hydra-timeout-timer)
(cancel-timer hydra-message-timer)
- (setq hydra-curr-map nil)
(unless (and hydra--ignore
(null hydra--work-around-dedicated))
(funcall
@@ -684,7 +715,7 @@ HEAD's binding is returned as a string wrapped with [] or
{}."
(defconst hydra-width-spec-regex " ?-?[0-9]*?"
"Regex for the width spec in keys and %` quoted sexps.")
-(defvar hydra-key-regex "\\[\\|]\\|[-\\[:alnum:]
~.,;:/|?<>={}*+#%@!&^↑↓←→⌫⌦⏎'`()\"$]+?"
+(defvar hydra-key-regex "[][\\[:alnum:]
~.,;:/|?<>={}*+#%@!&^↑↓←→⌫⌦⏎'`()\"$-]+?"
"Regex for the key quoted in the docstring.")
(defun hydra--format (_name body docstring heads)
@@ -705,11 +736,14 @@ The expressions can be auto-expanded according to NAME."
(while (setq start
(string-match
(format
- "\\(?:%%\\(
?-?[0-9]*s?\\)\\(`[a-z-A-Z/0-9]+\\|(\\)\\)\\|\\(?:_%s_\\)\\|\\(?:[?]%s[?]\\)"
+ "\\(?:%%\\(
?-?[0-9]*s?\\)\\(`[a-z-A-Z/0-9]+\\|(\\)\\)\\|\\(?:_%s_\\)\\|\\(?:[?]%s[?]\\)\\|__"
inner-regex
inner-regex)
docstring start))
- (cond ((eq ?? (aref (match-string 0 docstring) 0))
+ (cond ((string= "__" (match-string 0 docstring))
+ (setq docstring (replace-match "_" nil t docstring))
+ (setq start (1- (match-end 0))))
+ ((eq ?? (aref (match-string 0 docstring) 0))
(let* ((key (match-string 6 docstring))
(head (assoc key heads)))
(if head
@@ -815,7 +849,9 @@ HEADS is a list of heads."
"The heads for the associated hydra are:\n\n%s\n\n%s%s."
(mapconcat
(lambda (x)
- (format "\"%s\": `%S'" (car x) (cadr x)))
+ (format "\"%s\": %s"
+ (car x)
+ (if (cadr x) (format "`%S'" (cadr x)) "nil")))
heads ",\n")
(format "The body can be accessed via `%S'" body-name)
(if body-key
@@ -852,56 +888,68 @@ HEAD is one of the HEADS passed to `defhydra'.
BODY-PRE is added to the start of the wrapper.
BODY-BEFORE-EXIT will be called before the hydra quits.
BODY-AFTER-EXIT is added to the end of the wrapper."
- (let ((cmd-name (hydra--head-name head name))
- (cmd (when (car head)
- (hydra--make-callable
- (cadr head))))
- (doc (if (car head)
- (format "Call the head `%S' in the \"%s\" hydra.\n\n%s"
- (cadr head) name doc)
- (format "Call the body in the \"%s\" hydra.\n\n%s"
- name doc)))
- (hint (intern (format "%S/hint" name)))
- (body-foreign-keys (hydra--body-foreign-keys body))
- (body-timeout (plist-get body :timeout))
- (body-idle (plist-get body :idle)))
+ (let* ((cmd-name (hydra--head-name head name))
+ (cmd (when (car head)
+ (hydra--make-callable
+ (cadr head))))
+ (doc (if (car head)
+ (format "Call the head `%S' in the \"%s\" hydra.\n\n%s"
+ (cadr head) name doc)
+ (format "Call the body in the \"%s\" hydra.\n\n%s"
+ name doc)))
+ (hint (intern (format "%S/hint" name)))
+ (body-foreign-keys (hydra--body-foreign-keys body))
+ (body-timeout (plist-get body :timeout))
+ (idle (or (and (eq (cadr head) 'body) (plist-get body :idle))
+ (plist-get (nthcdr 3 head) :idle)))
+ (curr-body-fn-sym (intern (format "%S/body" name)))
+ (body-on-exit-t
+ `((hydra-keyboard-quit)
+ (setq hydra-curr-body-fn ',curr-body-fn-sym)
+ ,@(if body-after-exit
+ `((unwind-protect
+ ,(when cmd
+ (hydra--call-interactively cmd (cadr head)))
+ ,body-after-exit))
+ (when cmd
+ `(,(hydra--call-interactively cmd (cadr head)))))))
+ (body-on-exit-nil
+ (delq
+ nil
+ `((let ((hydra--ignore ,(not (eq (cadr head) 'body))))
+ (hydra-keyboard-quit)
+ (setq hydra-curr-body-fn ',curr-body-fn-sym))
+ ,(when cmd
+ `(condition-case err
+ ,(hydra--call-interactively cmd (cadr head))
+ ((quit error)
+ (message (error-message-string err)))))
+ ,(if idle
+ `(hydra-idle-message ,idle ,hint ',name)
+ `(hydra-show-hint ,hint ',name))
+ (hydra-set-transient-map
+ ,keymap
+ (lambda () (hydra-keyboard-quit) ,body-before-exit)
+ ,(when body-foreign-keys
+ (list 'quote body-foreign-keys)))
+ ,body-after-exit
+ ,(when body-timeout
+ `(hydra-timeout ,body-timeout))))))
`(defun ,cmd-name ()
,doc
(interactive)
(require 'hydra)
(hydra-default-pre)
,@(when body-pre (list body-pre))
- ,@(if (hydra--head-property head :exit)
- `((hydra-keyboard-quit)
- (setq hydra-curr-body-fn ',(intern (format "%S/body" name)))
- ,@(if body-after-exit
- `((unwind-protect
- ,(when cmd
- (hydra--call-interactively cmd (cadr head)))
- ,body-after-exit))
- (when cmd
- `(,(hydra--call-interactively cmd (cadr head))))))
- (delq
- nil
- `((let ((hydra--ignore ,(not (eq (cadr head) 'body))))
- (hydra-keyboard-quit)
- (setq hydra-curr-body-fn ',(intern (format "%S/body" name))))
- ,(when cmd
- `(condition-case err
- ,(hydra--call-interactively cmd (cadr head))
- ((quit error)
- (message (error-message-string err)))))
- ,(if (and body-idle (eq (cadr head) 'body))
- `(hydra-idle-message ,body-idle ,hint ',name)
- `(hydra-show-hint ,hint ',name))
- (hydra-set-transient-map
- ,keymap
- (lambda () (hydra-keyboard-quit) ,body-before-exit)
- ,(when body-foreign-keys
- (list 'quote body-foreign-keys)))
- ,body-after-exit
- ,(when body-timeout
- `(hydra-timeout ,body-timeout))))))))
+ ,@(cond ((eq (hydra--head-property head :exit) t)
+ body-on-exit-t)
+ ((eq (hydra--head-property head :exit) nil)
+ body-on-exit-nil)
+ (t
+ `((if ,(hydra--head-property head :exit)
+ (progn
+ ,@body-on-exit-t)
+ ,@body-on-exit-nil)))))))
(defvar hydra-props-alist nil)
@@ -1061,7 +1109,7 @@ If CELL-FORMATS is nil, `hydra-cell-format' is used for
all columns."
(mapconcat #'identity x " "))))
(defun hydra-reset-radios (names)
- "Set varibles NAMES to their defaults.
+ "Set variables NAMES to their defaults.
NAMES should be defined by `defhydradio' or similar."
(dolist (n names)
(set n (aref (get n 'range) 0))))
@@ -1112,7 +1160,7 @@ Each head of NORMALIZED-HEADS must have a column
property."
finally return balanced-heads-groups))
(defun hydra--generate-matrix (heads-groups)
- "Return a copy of HEADS-GROUPS decorated with table formating information.
+ "Return a copy of HEADS-GROUPS decorated with table formatting information.
Details of modification:
2 virtual heads acting as table header were added to each heads-group.
Each head is decorated with 2 new properties max-doc-len and max-key-len
@@ -1163,7 +1211,7 @@ representing the maximum dimension of their owning group.
(defun hydra--hint-from-matrix (body heads-matrix)
- "Generate a formated table-style docstring according to BODY and
HEADS-MATRIX.
+ "Generate a formatted table-style docstring according to BODY and
HEADS-MATRIX.
HEADS-MATRIX is expected to be a list of heads with following features:
Each heads must have the same length
Each head must have a property max-key-len and max-doc-len."
diff --git a/lv.el b/lv.el
index 7043abb126..61d0971e6a 100644
--- a/lv.el
+++ b/lv.el
@@ -33,6 +33,8 @@
;;; Code:
+(require 'cl-lib)
+
(defgroup lv nil
"The other echo area."
:group 'minibuffer
@@ -43,6 +45,11 @@
:group 'lv
:type 'boolean)
+(defcustom lv-use-padding nil
+ "Whether to use horizontal padding in the LV window."
+ :group 'lv
+ :type 'boolean)
+
(defface lv-separator
'((((class color) (background light)) :background "grey80")
(((class color) (background dark)) :background "grey30"))
@@ -55,6 +62,11 @@ Only the background color is significant."
"Holds the current LV window.")
(defvar display-line-numbers)
+(defvar display-fill-column-indicator)
+(defvar tab-line-format)
+
+(defvar lv-window-hook nil
+ "Hook to run by `lv-window' when a new window is created.")
(defun lv-window ()
"Ensure that LV window is live and return it."
@@ -66,24 +78,38 @@ Only the background color is significant."
(select-window
(let ((ignore-window-parameters t))
(split-window
- (frame-root-window) -1 'below))))
+ (frame-root-window) -1 'below))
+ 'norecord))
(if (setq buf (get-buffer " *LV*"))
- (switch-to-buffer buf)
- (switch-to-buffer " *LV*")
+ (switch-to-buffer buf 'norecord)
+ (switch-to-buffer " *LV*" 'norecord)
+ (fundamental-mode)
(set-window-hscroll lv-wnd 0)
(setq window-size-fixed t)
(setq mode-line-format nil)
+ (setq header-line-format nil)
+ (setq tab-line-format nil)
(setq cursor-type nil)
(setq display-line-numbers nil)
+ (setq display-fill-column-indicator nil)
(set-window-dedicated-p lv-wnd t)
- (set-window-parameter lv-wnd 'no-other-window t))
- (select-window ori)))))
+ (set-window-parameter lv-wnd 'no-other-window t)
+ (run-hooks 'lv-window-hook))
+ (select-window ori 'norecord)))))
(defvar golden-ratio-mode)
(defvar lv-force-update nil
"When non-nil, `lv-message' will refresh even for the same string.")
+(defun lv--pad-to-center (str width)
+ "Pad STR with spaces on the left to be centered to WIDTH."
+ (let* ((strs (split-string str "\n"))
+ (padding (make-string
+ (/ (- width (length (car strs))) 2)
+ ?\ )))
+ (mapconcat (lambda (s) (concat padding s)) strs "\n")))
+
(defun lv-message (format-string &rest args)
"Set LV window contents to (`format' FORMAT-STRING ARGS)."
(let* ((str (apply #'format format-string args))
@@ -91,6 +117,8 @@ Only the background color is significant."
deactivate-mark
golden-ratio-mode)
(with-selected-window (lv-window)
+ (when lv-use-padding
+ (setq str (lv--pad-to-center str (window-width))))
(unless (and (string= (buffer-string) str)
(null lv-force-update))
(delete-region (point-min) (point-max))
- [elpa] externals/hydra 798c0d810f 05/35: .github/FUNDING.yml: Add, (continued)
- [elpa] externals/hydra 798c0d810f 05/35: .github/FUNDING.yml: Add, ELPA Syncer, 2022/10/25
- [elpa] externals/hydra 74b32f3ff0 10/35: lv.el: Sience byte compiler, ELPA Syncer, 2022/10/25
- [elpa] externals/hydra d2b921d067 22/35: hydra.el (defhydra): :exit key can now also be a sexp, ELPA Syncer, 2022/10/25
- [elpa] externals/hydra a38690b1b7 32/35: Add GNU ELPA badge, ELPA Syncer, 2022/10/25
- [elpa] externals/hydra 112e689f75 28/35: hydra.el (hydra-add-imenu): Add, ELPA Syncer, 2022/10/25
- [elpa] externals/hydra 9e9e00cb24 33/35: hydra.el (hydra--doc): Don't quote nil in generated docstrings, ELPA Syncer, 2022/10/25
- [elpa] externals/hydra 406988f6e9 02/35: hydra.el (hydra-posframe-show-params): Add, ELPA Syncer, 2022/10/25
- [elpa] externals/hydra bcc2d0eb5b 15/35: hydra.el (hydra--work-around-dedicated): Revert, ELPA Syncer, 2022/10/25
- [elpa] externals/hydra 6442faf3da 20/35: hydra.el (hydra--make-defun): Refactor, ELPA Syncer, 2022/10/25
- [elpa] externals/hydra 8a9124f80b 27/35: hydra.el: Fix hydra-curr-map nil when hydras are nested via :post, ELPA Syncer, 2022/10/25
- [elpa] externals/hydra e3e3d2c17f 35/35: Merge remote-tracking branch 'refs/remotes/upstream/hydra/main' into elpa--merge/hydra,
ELPA Syncer <=
- [elpa] externals/hydra 435c55e9f7 08/35: Disable fill-column-indicator display., ELPA Syncer, 2022/10/25
- [elpa] externals/hydra 9fc28a044b 21/35: hydra.el (hydra--make-defun): Refactor, ELPA Syncer, 2022/10/25