summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJSDurand <mmemmew@gmail.com>2021-01-23 00:23:05 +0800
committerJSDurand <mmemmew@gmail.com>2021-01-24 00:49:45 +0800
commit2066e827155ae2893097360024ffd975166a44ef (patch)
treee15bb118a4a0e622575847c05ef1dcfae30e58ef
parent588b6031e152b031be1dee04c7b38938ea7eb706 (diff)
More custom functions and adjust for custom completion framework
* LICENSE: Add GPLv3. * basic.el (durand-enlarge-window): (durand-shrink-window): (durand-enlarge-window-horizontally): (durand-shrink-window-horizontally): Now I can easily maximize or minimize windows. * comb/orderless-conf.el ("orderless"): Now I try to use my own completion framework. * common.el (durand-embark-scroll-down-or-go-to-completions): (durand-embark-scroll-up-or-go-to-completions): (durand-completion-scroll-down-or-go-to-minibuffer): (durand-completion-scroll-up-or-go-to-minibuffer): Move these functions here since they do not belong to the completion framework in my opinion. (register): (register-val-jump-to): Rewrite this method so that it does not have to ask me if I want to open a file while jumping. * completion-conf.el: My intended completion framework, which is still work in progress. * init.el ("comb/orderless-conf.el"): ("completion-conf.el"): Adjust things accordingly. ("durand-simple"): My custom functions for viewing and for opening things. * modeline.el (modeline-propertize): (modeline-format-minor-modes): (modeline-format-major-mode): Now the macro `modeline-propertize' won't override properties that it does not intend to define. This has the effect that the properties of the original constructs will go through and have effect. (modeline-format-main): Make sure the space has a positive length. (modeline-format-buffer-name): Make sure the length does not exceed half the width of the window.
-rw-r--r--LICENSE674
-rw-r--r--basic.el79
-rw-r--r--comb/orderless-conf.el42
-rw-r--r--common.el104
-rw-r--r--completion-conf.el93
-rw-r--r--embark-conf.el7
-rw-r--r--ibuffer.el1
-rw-r--r--init.el8
-rw-r--r--modeline.el72
-rw-r--r--view-conf.el62
10 files changed, 1106 insertions, 36 deletions
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..e72bfdd
--- /dev/null
+++ b/LICENSE
@@ -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>. \ No newline at end of file
diff --git a/basic.el b/basic.el
index 191c997..b6fd4bf 100644
--- a/basic.el
+++ b/basic.el
@@ -246,6 +246,80 @@ See `display-line-numbers' for details."
;;; Windows
+;;;###autoload
+(defun durand-enlarge-window (&optional delta horizontal)
+ "Make the seleted window DELTA lines taller.
+
+This is a thin wrapper around the default `enlarge-window'.
+
+If DELTA is nil, it defaults to 1.
+
+If HORIZONTAL is non-nil, this will make the seleted window DELTA
+lines wider instead.
+
+If DELTA is negative, shrink instead of enlarge.
+
+Also, if DELTA is 0, then maximize the selected window."
+ (interactive "P")
+ (cond
+ ((eq delta 0)
+ (enlarge-window (cond
+ (horizontal (frame-width))
+ ((frame-height)))
+ horizontal))
+ ((enlarge-window (prefix-numeric-value delta) horizontal))))
+
+;;;###autoload
+(defun durand-shrink-window (&optional delta horizontal)
+ "Make the seleted window DELTA lines smaller.
+
+This is a thin wrapper around the default `shrink-window'.
+
+If DELTA is nil, it defaults to 1.
+
+If HORIZONTAL is non-nil, this will make the seleted window DELTA
+lines smaller instead.
+
+If DELTA is negative, enlarge instead of shrink.
+
+Also, if DELTA is 0, then minimize the selected window."
+ (interactive "p")
+ (cond
+ ((eq delta 0)
+ (shrink-window (cond
+ (horizontal (frame-width))
+ ((frame-height)))
+ horizontal))
+ ((shrink-window (prefix-numeric-value delta) horizontal))))
+
+;;;###autoload
+(defun durand-enlarge-window-horizontally (&optional delta)
+ "Make selected window DELTA columns wider.
+
+This is a thin wrapper around the default `enlarge-window-horizontally'.
+
+DELTA defaults to 1. If DELTA is 0, then maximize the selected
+window horizontally."
+ (interactive "p")
+ (cond
+ ((eq delta 0)
+ (enlarge-window-horizontally (frame-width)))
+ ((enlarge-window-horizontally (prefix-numeric-value delta)))))
+
+;;;###autoload
+(defun durand-shrink-window-horizontally (&optional delta)
+ "Make selected window DELTA columns wider.
+
+This is a thin wrapper around the default `shrink-window-horizontally'.
+
+DELTA defaults to 1. If DELTA is 0, then maximize the selected
+window horizontally."
+ (interactive "p")
+ (cond
+ ((eq delta 0)
+ (shrink-window-horizontally (frame-width)))
+ ((shrink-window-horizontally (prefix-numeric-value delta)))))
+
(define-key global-map (vector ?\s-o) #'other-window)
(define-key global-map (vector ?\s-&) #'delete-other-windows)
(define-key global-map (vector ?\s-é) #'split-window-below)
@@ -253,7 +327,10 @@ See `display-line-numbers' for details."
;; otherwise it would be interpreted as a string quote.
(define-key global-map (vector 8388642) #'split-window-right)
(define-key global-map (vector ?\s-à) #'delete-window)
-(define-key global-map (vector ?\C-+) #'enlarge-window)
+(define-key global-map (vector ?\C-+) #'durand-enlarge-window)
+(define-key global-map (vector ?\C-=) #'durand-shrink-window)
+(define-key global-map (vector ?\C-x ?\{) #'durand-shrink-window-horizontally)
+(define-key global-map (vector ?\C-x ?\}) #'durand-enlarge-window-horizontally)
(define-key global-map (vector ?\s-f) #'find-file)
(define-key global-map (vector ?\s-F) #'find-file-other-window)
(define-key global-map (vector ?\s-d) #'dired)
diff --git a/comb/orderless-conf.el b/comb/orderless-conf.el
index 2d669a4..a86e40e 100644
--- a/comb/orderless-conf.el
+++ b/comb/orderless-conf.el
@@ -37,3 +37,45 @@
(cond
((= (aref pattern 0) ?,)
(cons 'orderless-strict-leading-initialism (substring pattern 1))))))
+
+
+(defvar durand-headlong-entered-minibuffer-p nil
+ "Whether or not we have entered minibuffer.
+
+This is used for determining if we shall exit the minibuffer when
+there is only one candidate left.")
+
+;;;###autoload
+(defun durand-headlong-minibuffer-setup-hook ()
+ "The entry for the completion to be headlong.
+Simply add this function to `minibuffer-setup-hook'."
+ ;; NOTE: When we run this function we first enter minibuffer, so we
+ ;; set a variable to its appropriate value.
+ (set 'durand-headlong-entered-minibuffer-p nil)
+ (add-hook 'post-command-hook 'durand-headlong-post-command-hook t)
+ (add-hook 'minibuffer-exit-hook 'durand-headlong-minibuffer-exit-hook))
+
+;;;###autoload
+(defun durand-headlong-post-command-hook ()
+ "Exit the minibuffer if there is only one candidate left.
+
+In practice, when we first enter minibuffer, there is some
+abnormal behaviour, so we only check when we have entered the
+minibuffer as usual."
+ (let ((comps (completion-all-completions
+ (minibuffer-contents)
+ minibuffer-completion-table minibuffer-completion-predicate
+ (- (point) (minibuffer-prompt-end)))))
+ (cond
+ ((and durand-headlong-entered-minibuffer-p
+ comps
+ (not (consp (cdr comps))))
+ (minibuffer-force-complete-and-exit))
+ (t (set 'durand-headlong-entered-minibuffer-p t)))))
+
+;;;###autoload
+(defun durand-headlong-minibuffer-exit-hook ()
+ "Remove the hooks we added."
+ (remove-hook 'post-command-hook 'durand-headlong-post-command-hook)
+ (remove-hook 'minibuffer-setup-hook 'durand-headlong-minibuffer-setup-hook)
+ (remove-hook 'minibuffer-exit-hook 'durand-headlong-minibuffer-exit-hook))
diff --git a/common.el b/common.el
index 702124f..fa6f3fe 100644
--- a/common.el
+++ b/common.el
@@ -55,6 +55,110 @@
(t
(other-window 1)))))
+;;;###autoload
+(defun durand-embark-scroll-down-or-go-to-completions (&optional arg)
+ "Scroll down; if this is not feasible, go to the completions buffer.
+ARG means do this command ARG times."
+ (interactive "p")
+ (let ((original-point (point))
+ (left (abs (forward-line arg)))
+ (completion-windows
+ (delq nil
+ (mapcar
+ (lambda (w)
+ (and (consp
+ (delq nil
+ (mapcar (lambda (name)
+ (string-match-p
+ name
+ (buffer-name (window-buffer w))))
+ durand-completion-buffer-names)))
+ w))
+ (window-list nil 'nomini))))
+ (in-completion-p (consp
+ (delq nil
+ (mapcar
+ (lambda (name)
+ (string-match-p name (buffer-name)))
+ durand-completion-buffer-names)))))
+ (cond ((= (point) (point-max))
+ (setq left (1+ left)))
+ ((get-text-property (point) 'field)
+ (goto-char original-point)))
+ (cond ((and (> left 0)
+ (consp completion-windows)
+ (not in-completion-p))
+ (select-window (car completion-windows))
+ (cond
+ ((> arg 0)
+ (goto-char (point-min))
+ (cond
+ ((derived-mode-p 'completion-list-mode)
+ (next-completion 1))))
+ ((< arg 0)
+ (goto-char (point-max))
+ (cond
+ ((derived-mode-p 'completion-list-mode)
+ (next-completion -1)))))))))
+
+;;;###autoload
+(defun durand-embark-scroll-up-or-go-to-completions (&optional arg)
+ "Scroll up; if this is not feasible, go to the completions buffer.
+ARG means do this command ARG times."
+ (interactive "p")
+ (durand-embark-scroll-down-or-go-to-completions (- arg)))
+
+;;;###autoload
+(defun durand-completion-scroll-down-or-go-to-minibuffer (&optional arg)
+ "Scroll down; if this is not feasible, go to the mini-buffer.
+ARG means do this command ARG times."
+ (interactive "p")
+ (let ((original-point (point))
+ (left (abs (forward-line arg)))
+ (minibuffer-active-p (active-minibuffer-window))
+ (in-minibuffer-p (minibuffer-window-active-p (selected-window))))
+ (cond ((= (point) (point-max))
+ (setq left (1+ left)))
+ ((get-text-property (point) 'field)
+ (goto-char original-point)))
+ (cond ((and (> left 0)
+ minibuffer-active-p
+ (not in-minibuffer-p))
+ (select-window (active-minibuffer-window))
+ (cond
+ ((> arg 0)
+ (goto-char (point-min)))
+ ((< arg 0)
+ (goto-char (point-max))))))))
+
+;;;###autoload
+(defun durand-completion-scroll-up-or-go-to-minibuffer (&optional arg)
+ "Scroll up; if this is not feasible, go to the mini-buffer.
+ARG means do this command ARG times."
+ (interactive "p")
+ (durand-completion-scroll-down-or-go-to-minibuffer (- arg)))
+
+;;; Don't ask me if I want to visit the file again.
+
+(require 'register)
+
+;;;###autoload
+(cl-defmethod register-val-jump-to ((val cons) delete)
+ (cond
+ ((frame-configuration-p (car val))
+ (set-frame-configuration (car val) (not delete))
+ (goto-char (cadr val)))
+ ((window-configuration-p (car val))
+ (set-window-configuration (car val))
+ (goto-char (cadr val)))
+ ((eq (car val) 'file)
+ (find-file (cdr val)))
+ ((eq (car val) 'file-query)
+ (find-buffer-visiting (nth 1 val))
+ (find-file (nth 1 val))
+ (goto-char (nth 2 val)))
+ (t (cl-call-next-method val delete))))
+
;;; Intentionally disable some key-bindings.
;;;###autoload
diff --git a/completion-conf.el b/completion-conf.el
new file mode 100644
index 0000000..e567eb7
--- /dev/null
+++ b/completion-conf.el
@@ -0,0 +1,93 @@
+;;; completion-conf.el --- My configurations for completions inside Emacs -*- lexical-binding: t; -*-
+
+;; Author: JSDurand <mmemmew@gmail.com>
+;; Created: 2021-01-22 21:41:30
+;; Version: 0.0.1
+;; Keywords: matching
+
+;; This file is NOT part of GNU/Emacs.
+
+;; 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/>.
+
+;;; Commentary:
+
+;; Thsi file is my configurations of the built in completion framework
+;; in Emacs. I intend to configure it to use my yet-to-come completion
+;; style using suffix trees.
+
+;;; Code:
+
+(require 'minibuffer)
+(require 'simple)
+
+(setq completion-styles '(substring partial-completion flex))
+(setq completion-category-defaults nil)
+(setq completion-flex-nospace nil)
+(setq completion-pcm-complete-word-inserts-delimiters t)
+(setq completion-show-help nil)
+(setq completion-ignore-case t)
+(setq read-file-name-completion-ignore-case t)
+(setq read-buffer-completion-ignore-case t)
+(setq resize-mini-windows t)
+
+(define-key minibuffer-local-completion-map (vector 'down) #'durand-embark-scroll-down-or-go-to-completions)
+(define-key minibuffer-local-completion-map (vector 'up) #'durand-embark-scroll-up-or-go-to-completions)
+(define-key completion-list-mode-map (vector 'down) #'durand-completion-scroll-down-or-go-to-minibuffer)
+(define-key completion-list-mode-map (vector 'up) #'durand-completion-scroll-up-or-go-to-minibuffer)
+
+;;;###autoload
+(defvar durand-headlong-entered-minibuffer-p nil
+ "Whether or not we have entered minibuffer.
+
+This is used for determining if we shall exit the minibuffer when
+there is only one candidate left.")
+
+;;;###autoload
+(defun durand-headlong-minibuffer-setup-hook ()
+ "The entry for the completion to be headlong.
+Simply add this function to `minibuffer-setup-hook'."
+ ;; NOTE: When we run this function we first enter minibuffer, so we
+ ;; set a variable to its appropriate value.
+ (set 'durand-headlong-entered-minibuffer-p nil)
+ (add-hook 'post-command-hook 'durand-headlong-post-command-hook t)
+ (add-hook 'minibuffer-exit-hook 'durand-headlong-minibuffer-exit-hook))
+
+;;;###autoload
+(defun durand-headlong-post-command-hook ()
+ "Exit the minibuffer if there is only one candidate left.
+
+In practice, when we first enter minibuffer, there is some
+abnormal behaviour, so we only check when we have entered the
+minibuffer as usual."
+ (let ((comps (completion-all-completions
+ (minibuffer-contents)
+ minibuffer-completion-table minibuffer-completion-predicate
+ (- (point) (minibuffer-prompt-end)))))
+ (cond
+ ((and durand-headlong-entered-minibuffer-p
+ comps
+ (not (consp (cdr comps))))
+ (minibuffer-force-complete-and-exit))
+ (t (set 'durand-headlong-entered-minibuffer-p t)))))
+
+;;;###autoload
+(defun durand-headlong-minibuffer-exit-hook ()
+ "Remove the hooks we added."
+ (remove-hook 'post-command-hook 'durand-headlong-post-command-hook)
+ (remove-hook 'minibuffer-setup-hook 'durand-headlong-minibuffer-setup-hook)
+ (remove-hook 'minibuffer-exit-hook 'durand-headlong-minibuffer-exit-hook))
+
+
+(provide 'completion-conf)
+;;; completion-conf.el ends here
diff --git a/embark-conf.el b/embark-conf.el
index ce09e52..81646d6 100644
--- a/embark-conf.el
+++ b/embark-conf.el
@@ -4,8 +4,7 @@
(define-key minibuffer-local-completion-map (vector ?\M-q) #'embark-collect-toggle-view)
(define-key minibuffer-local-completion-map (vector ?\s-:) #'embark-collect-live)
- (define-key minibuffer-local-completion-map (vector 'down) #'durand-embark-scroll-down-or-go-to-completions)
- (define-key minibuffer-local-completion-map (vector 'up) #'durand-embark-scroll-up-or-go-to-completions)
+
(define-key minibuffer-local-completion-map (vector ?\M-o) #'embark-export)
(define-key minibuffer-local-completion-map (vector ?\C-o) #'embark-export)
(define-key minibuffer-local-completion-map (vector ?\M-v) #'embark-switch-to-collect-completions)
@@ -16,7 +15,9 @@
(define-key embark-collect-mode-map (vector ?\M-q) #'embark-collect-toggle-view)
(define-key embark-collect-mode-map (vector 'down) #'durand-completion-scroll-down-or-go-to-minibuffer)
(define-key embark-collect-mode-map (vector 'up) #'durand-completion-scroll-up-or-go-to-minibuffer)
-
+
+ (define-key minibuffer-local-completion-map (vector 'down) #'durand-embark-scroll-down-or-go-to-completions)
+ (define-key minibuffer-local-completion-map (vector 'up) #'durand-embark-scroll-up-or-go-to-completions)
(define-key completion-list-mode-map (vector 'down) #'durand-completion-scroll-down-or-go-to-minibuffer)
(define-key completion-list-mode-map (vector 'up) #'durand-completion-scroll-up-or-go-to-minibuffer)
diff --git a/ibuffer.el b/ibuffer.el
index c67325e..49e6a29 100644
--- a/ibuffer.el
+++ b/ibuffer.el
@@ -32,6 +32,7 @@ If ARG is non-nil, then display the last buffer in a new window."
(define-key global-map (vector 24 2) #'ibuffer)
(define-key global-map (vector ?\s-h) #'ibuffer)
+(define-key global-map (vector ?\M-\s-b) #'ibuffer)
(define-key global-map (vector ?\s-b) #'switch-to-buffer)
(define-key global-map (vector ?\s-B) #'switch-to-buffer-other-window)
(define-key global-map (vector ?\s-n) #'durand-switch-to-last-buffer)
diff --git a/init.el b/init.el
index 6fe37ad..f970516 100644
--- a/init.el
+++ b/init.el
@@ -129,10 +129,11 @@ If FUNCTION-NAME is already a valid function, this won't do anything."
;; (load-config "comb/comb.el")
;; (load-config "comb/comb-annotation.el")
-;;; orderless
+;;; Completion framework configurations
;; TODO: Write my own completion styles library
-(load-config "comb/orderless-conf.el")
+;; (load-config "comb/orderless-conf.el")
+(load-config "completion-conf.el")
;;; dired configurations
@@ -191,7 +192,8 @@ If FUNCTION-NAME is already a valid function, this won't do anything."
(use-package "durand-simple" 'durand-simple
(define-key global-map (vector ?\C-\M-\s) #'durand-simple-mark-dwim)
- (define-key global-map (vector ?\C-o) #'durand-simple-open-line))
+ (define-key global-map (vector ?\C-o) #'durand-simple-open-line)
+ (define-key global-map (vector ?\C-') #'durand-simple-insert-pair))
;;; Searches
diff --git a/modeline.el b/modeline.el
index 212db07..12893ea 100644
--- a/modeline.el
+++ b/modeline.el
@@ -8,10 +8,12 @@
(left-len (length left))
(right-len (length right))
(middle (propertize " " 'display
- (make-string (- (window-total-width)
- left-len
- right-len)
- 32))))
+ (make-string
+ (max (- (window-total-width)
+ left-len
+ right-len)
+ 0)
+ 32))))
(concat left middle right)))
(setq-default mode-line-format '("%e" (:eval (modeline-format-main))))
@@ -22,7 +24,9 @@
(concat
;; (modeline-format-bar)
(modeline-spc)
- (modeline-format-directory)))
+ (modeline-format-directory)
+ (modeline-spc)
+ (modeline-format-minor-modes)))
;;;###autoload
(defun modeline-format-left ()
@@ -56,11 +60,14 @@
MOUSE-FACE is used when the mouse is over the text.
HELP-ECHO is the additional information displayed when the mouse is over the text.
MAP is the local keymap of the text."
- (let ((mouse-face (or mouse-face 'mode-line-highlight)))
- `(propertize ,str
- 'mouse-face ',mouse-face
- 'help-echo ,help-echo
- 'local-map ,map)))
+ (let ((mouse-face (or mouse-face 'mode-line-highlight))
+ (help-echo-form (cond (help-echo (list (quote 'help-echo) help-echo))))
+ (map-form (cond (map (list (quote 'local-map) map)))))
+ (append
+ `(propertize ,str
+ 'mouse-face ',mouse-face)
+ help-echo-form
+ map-form)))
;;; Determination of the active mode-line
@@ -377,12 +384,16 @@ W is the width, H is the height of the bar."
"Display some minor modes information."
(declare (pure t) (side-effect-free t))
(modeline-propertize
- (let ((orig
- (format-mode-line
- minor-mode-alist
- (cond
- ((modeline-active-window-p) 'mode-line)
- ('mode-line-inactive)))))
+ (let* ((raw
+ (format-mode-line
+ minor-mode-alist
+ (cond
+ ((modeline-active-window-p) 'mode-line)
+ ('mode-line-inactive))))
+ (orig (cond
+ ((and (not (string= raw ""))
+ (= (aref raw 0) 32)) (substring raw 1))
+ (raw))))
(cond
((<= (length orig) modeline-minor-modes-name-len-max)
orig)
@@ -446,13 +457,15 @@ This will be displayed in the mode line."
(modeline-propertize
(let* ((face (cond ((modeline-active-window-p) 'mode-line-buffer-id)
(t 'mode-line-inactive)))
+ (name-max (min modeline-buffer-name-len-max
+ (floor (window-width) 2)))
(orig (format-mode-line "%b" face)))
(concat
(format-mode-line "%[" face)
(cond
- ((> (length orig) modeline-buffer-name-len-max)
+ ((> (length orig) name-max)
(concat
- (substring orig 0 (- modeline-buffer-name-len-max 3))
+ (substring orig 0 (max (- name-max 3) 1))
"..."))
(t orig))
(format-mode-line "%]" face)))
@@ -466,17 +479,18 @@ This will be displayed in the mode line."
(defun modeline-format-major-mode ()
"The major mode to display in the mode line."
(declare (pure t) (side-effect-free t))
- (concat
- (modeline-propertize
- (format-mode-line
- '("%m" global-mode-string)
- (cond ((modeline-active-window-p)
- 'doom-modeline-buffer-major-mode)
- (t 'mode-line-inactive)))
- nil
- "Major mode\nmouse-1: Display major mode menu\nmouse-2: Show help for major mode\nmouse-3: Toggle minor modes"
- mode-line-major-mode-keymap)
- (modeline-spc)))
+ (let ((face (cond ((modeline-active-window-p) 'doom-modeline-buffer-major-mode)
+ ('mode-line-inactive))))
+ (concat
+ (modeline-propertize
+ (format-mode-line '("%m") face)
+ nil
+ "Major mode\nmouse-1: Display major mode menu\nmouse-2: Show help for major mode\nmouse-3: Toggle minor modes"
+ mode-line-major-mode-keymap)
+ (modeline-spc)
+ (modeline-propertize
+ (format-mode-line global-mode-string face))
+ (modeline-spc))))
;;;###autoload
(defvar-local modeline-vcs-str ""
diff --git a/view-conf.el b/view-conf.el
index 4d4ff00..ca08409 100644
--- a/view-conf.el
+++ b/view-conf.el
@@ -87,6 +87,19 @@ If ARG is '(16), view the battery information."
(proced)
(message "%s" (process-list))))
+;;; My map for viewing
+
+;;;###autoload
+(defvar durand-view-map
+ ;; Against every good principle I guess...
+ (let ((map (list 'keymap "View")))
+ (define-key map (vector ?v) 'view-mode)
+ (define-key map (vector ?p) #'durand-view-process)
+ (define-key map (vector ?t) #'durand-view-timers-or-temps)
+ (define-key map (vector ?e) #'eshell)
+ map)
+ "The keymap that is related to my custom functions about viewing.")
+
;;; About view-mode
(require 'view)
@@ -95,6 +108,55 @@ If ARG is '(16), view the battery information."
(define-key view-mode-map (vector ?j) #'View-scroll-line-forward)
(define-key view-mode-map (vector ?k) #'View-scroll-line-backward)
+(define-key global-map (vector 3 118) durand-view-map)
+
+;;; Open things
+
+;;;###autoload
+(defvar durand-open-targets
+ (list (list "safari" "open" "-a" "Safari" -1)
+ (list "terminal" "open" "-a" "Terminal" -1))
+ "Targets to open by `durand-open-object'.
+
+This is an association list whose elements have `car' equal to
+the choice presented to the user, and have `cdr' a list that will
+be passed to `make-process'.")
+
+;;;###autoload
+(defun durand-open-object (&optional arg)
+ "Open something.
+
+What can be opened is controlled by the variable
+`durand-open-targets'.
+
+If ARG is non-nil, and if the chosen target contains `-1' in the
+command line options, then read a string to replace that -1."
+ (interactive "P")
+ (let* ((targets durand-open-targets)
+ (choice (completing-read "Open: " targets nil t))
+ (commands (cdr (assoc choice targets #'string=)))
+ (contain-minus-one-p (memq -1 commands))
+ (extra (cond
+ ((and arg contain-minus-one-p)
+ (read-string "Extra argument: "))))
+ temp)
+ (cond
+ (contain-minus-one-p
+ (setq commands (progn
+ (while (consp commands)
+ (cond
+ ((eq (car commands) -1)
+ (setq temp (cons extra temp)))
+ ((setq temp (cons (car commands) temp))))
+ (setq commands (cdr commands)))
+ (reverse temp)))))
+ (setq conmmands (delq nil commands))
+ (make-process :name "durand-open"
+ :buffer nil
+ :command commands)))
+
+;;; C-c o => 3 111
+(define-key global-map (vector 3 111) #'durand-open-object)
;;; Convert downloaded videos from youtube to the URL again and copy
;;; the result.