From 56152791a2cb80ef511bf772fcf95723e4cf38a7 Mon Sep 17 00:00:00 2001 From: Lev Lamberov Date: Thu, 16 Aug 2018 09:11:10 -0300 Subject: Import emacs-git-modes_1.2.8-1.debian.tar.xz [dgit import tarball emacs-git-modes 1.2.8-1 emacs-git-modes_1.2.8-1.debian.tar.xz] --- changelog | 40 ++++++++++++++++++++++++ compat | 1 + control | 73 +++++++++++++++++++++++++++++++++++++++++++ copyright | 43 +++++++++++++++++++++++++ elpa-git-modes.docs | 1 + elpa-git-modes.elpa | 1 + elpa-gitattributes-mode.elpa | 1 + elpa-gitconfig-mode.elpa | 1 + elpa-gitignore-mode.elpa | 1 + patches/0001-fix-version.diff | 46 +++++++++++++++++++++++++++ patches/series | 1 + rules | 9 ++++++ source/format | 1 + watch | 4 +++ 14 files changed, 223 insertions(+) create mode 100644 changelog create mode 100644 compat create mode 100644 control create mode 100644 copyright create mode 100644 elpa-git-modes.docs create mode 100644 elpa-git-modes.elpa create mode 100644 elpa-gitattributes-mode.elpa create mode 100644 elpa-gitconfig-mode.elpa create mode 100644 elpa-gitignore-mode.elpa create mode 100644 patches/0001-fix-version.diff create mode 100644 patches/series create mode 100755 rules create mode 100644 source/format create mode 100644 watch diff --git a/changelog b/changelog new file mode 100644 index 0000000..e3055ea --- /dev/null +++ b/changelog @@ -0,0 +1,40 @@ +emacs-git-modes (1.2.8-1) unstable; urgency=medium + + * New upstream version 1.2.8 + * d/control: Fix Vcs URLs + * d/control: Update Maintainer (to Debian Emacsen team) + * d/control: Declare Standards-Version 4.2.0 (no changes needed) + * Refresh patch to add a correct version number + + -- Lev Lamberov Thu, 16 Aug 2018 17:11:10 +0500 + +emacs-git-modes (1.2.7-1) unstable; urgency=medium + + * New upstream version 1.2.7 + * Refresh version patch + * Migrate to dh 11 + * d/control: Change Vcs-{Browser,Git} URL to salsa.debian.org + * d/control: Declare Standards-Version 4.1.3 (no changes needed) + * d/control: Remove emacs24 from Enhances + * d/rules: Clean rules + * d/copyright: Add Source field to d/copyright + * d/copyright: Bump copyright years + + -- Lev Lamberov Thu, 29 Mar 2018 13:06:58 +0500 + +emacs-git-modes (1.2.6-1) unstable; urgency=medium + + * New upstream version 1.2.6 + * Remove patch applied upstream + * Refresh patch to reflect upstream version number + * d/control: Bump Standards-Version to 4.1.0 (no changes needed) + * d/control: Remove Built-Using fields + * d/control: Remove emacs from dependencies + + -- Lev Lamberov Thu, 07 Sep 2017 20:50:43 +0500 + +emacs-git-modes (1.2.4-1) unstable; urgency=medium + + * Initial release (Closes: #853080) + + -- Lev Lamberov Sun, 29 Jan 2017 18:20:34 +0500 diff --git a/compat b/compat new file mode 100644 index 0000000..b4de394 --- /dev/null +++ b/compat @@ -0,0 +1 @@ +11 diff --git a/control b/control new file mode 100644 index 0000000..171f10a --- /dev/null +++ b/control @@ -0,0 +1,73 @@ +Source: emacs-git-modes +Section: lisp +Priority: optional +Maintainer: Debian Emacsen team +Uploaders: Lev Lamberov +Build-Depends: debhelper (>= 11), + dh-elpa +Standards-Version: 4.2.0 +Homepage: https://github.com/magit/git-modes +Vcs-Browser: https://salsa.debian.org/emacsen-team/emacs-git-modes +Vcs-Git: https://salsa.debian.org/emacsen-team/emacs-git-modes.git + +Package: elpa-git-modes +Architecture: all +Depends: ${elpa:Depends}, + ${misc:Depends}, + elpa-gitattributes-mode (= ${binary:Version}), + elpa-gitconfig-mode (= ${binary:Version}), + elpa-gitignore-mode (= ${binary:Version}) +Recommends: emacs (>= 46.0) +Enhances: emacs, + emacs25 +Description: major modes for editing Git configuration files + This package provides several major modes for editing Git + configuration files. The modes are: + . + * gitattributes-mode + * gitconfig-mode + * gitignore-mode + . + Each mode is defined in its own library by the same name. Loading + `git-modes' causes all three libraries to be loaded, but you could + also load the libraries individually. + +Package: elpa-gitattributes-mode +Architecture: all +Depends: ${elpa:Depends}, + ${misc:Depends} +Recommends: emacs (>= 46.0), + elpa-git-modes (= ${binary:Version}) +Enhances: emacs, + emacs25 +Description: major mode for editing Git configuration files (gitattributes) + This package provides major mode for editing `.gitattributes', + `.git/info/attributes', and `git/attributes' Git configuration files. + +Package: elpa-gitconfig-mode +Architecture: all +Depends: ${elpa:Depends}, + ${misc:Depends} +Recommends: emacs (>= 46.0), + elpa-git-modes (= ${binary:Version}) +Enhances: emacs, + emacs25 +Description: major mode for editing Git configuration files (gitconfig and gitmodules) + This package provides major mode for editing `.gitconfig', `.git/config', + `git/config', and `.gitmodules' Git configuration files. + . + `gitconfig-mode' derives from `conf-unix-mode'. + +Package: elpa-gitignore-mode +Architecture: all +Depends: ${elpa:Depends}, + ${misc:Depends} +Recommends: emacs (>= 46.0), + elpa-git-modes (= ${binary:Version}) +Enhances: emacs, + emacs25 +Description: major mode for editing Git configuration files (gitignore) + This package provides major mode for editing `.gitignore', + `.git/info/exclude', and `git/ignore' Git configuration files. + . + `gitignore-mode' derives from `conf-unix-mode'. diff --git a/copyright b/copyright new file mode 100644 index 0000000..94b155d --- /dev/null +++ b/copyright @@ -0,0 +1,43 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: git-modes +Source: https://github.com/magit/git-modes + +Files: * +Copyright: (C) 2012-2018 The Magit Project Contributors +License: GPL-3+ + +Files: git-modes.el +Copyright: (C) 2012-2013 Sebastian Wiesner + (C) 2013-2015 Rüdiger Sonderfeld + (C) 2012-2018 The Magit Project Contributors +License: GPL-3+ + +Files: gitattributes-mode.el +Copyright: C) 2013-2018 The Magit Project Contributors +License: GPL-3+ + +Files: gitconfig-mode.el gitignore-mode.el +Copyright: (C) 2012-2013 Sebastian Wiesner + (C) 2012-2018 The Magit Project Contributors +License: GPL-3+ + +Files: debian/* +Copyright: (C) 2017-2018 Lev Lamberov +License: GPL-3+ + +License: GPL-3+ + 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 . + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in `/usr/share/common-licenses/GPL-3' diff --git a/elpa-git-modes.docs b/elpa-git-modes.docs new file mode 100644 index 0000000..b43bf86 --- /dev/null +++ b/elpa-git-modes.docs @@ -0,0 +1 @@ +README.md diff --git a/elpa-git-modes.elpa b/elpa-git-modes.elpa new file mode 100644 index 0000000..ed55849 --- /dev/null +++ b/elpa-git-modes.elpa @@ -0,0 +1 @@ +git-modes.el diff --git a/elpa-gitattributes-mode.elpa b/elpa-gitattributes-mode.elpa new file mode 100644 index 0000000..21e200b --- /dev/null +++ b/elpa-gitattributes-mode.elpa @@ -0,0 +1 @@ +gitattributes-mode.el diff --git a/elpa-gitconfig-mode.elpa b/elpa-gitconfig-mode.elpa new file mode 100644 index 0000000..9008583 --- /dev/null +++ b/elpa-gitconfig-mode.elpa @@ -0,0 +1 @@ +gitconfig-mode.el diff --git a/elpa-gitignore-mode.elpa b/elpa-gitignore-mode.elpa new file mode 100644 index 0000000..358ba96 --- /dev/null +++ b/elpa-gitignore-mode.elpa @@ -0,0 +1 @@ +gitignore-mode.el diff --git a/patches/0001-fix-version.diff b/patches/0001-fix-version.diff new file mode 100644 index 0000000..8381d59 --- /dev/null +++ b/patches/0001-fix-version.diff @@ -0,0 +1,46 @@ +From: Lev Lamberov +Subject: Add version number + +This patch adds version numbers to Emacs Lisp files, which are needed +for dh-elpa to operate correctly. + +--- a/git-modes.el ++++ b/git-modes.el +@@ -8,6 +8,7 @@ + ;; Rüdiger Sonderfeld + ;; Maintainer: Jonas Bernoulli + ;; Homepage: https://github.com/magit/git-modes ++;; Version: 1.2.8 + ;; Keywords: convenience vc git + + ;; This file is not part of GNU Emacs. +--- a/gitattributes-mode.el ++++ b/gitattributes-mode.el +@@ -5,6 +5,7 @@ + ;; Author: Rüdiger Sonderfeld + ;; Maintainer: Jonas Bernoulli + ;; Homepage: https://github.com/magit/git-modes ++;; Version: 1.2.8 + ;; Keywords: convenience vc git + + ;; This file is NOT part of GNU Emacs. +--- a/gitconfig-mode.el ++++ b/gitconfig-mode.el +@@ -6,6 +6,7 @@ + ;; Author: Sebastian Wiesner + ;; Maintainer: Jonas Bernoulli + ;; Homepage: https://github.com/magit/git-modes ++;; Version: 1.2.8 + ;; Keywords: convenience vc git + + ;; This file is not part of GNU Emacs. +--- a/gitignore-mode.el ++++ b/gitignore-mode.el +@@ -6,6 +6,7 @@ + ;; Author: Sebastian Wiesner + ;; Maintainer: Jonas Bernoulli + ;; Homepage: https://github.com/magit/git-modes ++;; Version: 1.2.8 + ;; Keywords: convenience vc git + + ;; This file is not part of GNU Emacs. diff --git a/patches/series b/patches/series new file mode 100644 index 0000000..75ce5f6 --- /dev/null +++ b/patches/series @@ -0,0 +1 @@ +0001-fix-version.diff diff --git a/rules b/rules new file mode 100755 index 0000000..72cdafb --- /dev/null +++ b/rules @@ -0,0 +1,9 @@ +#!/usr/bin/make -f + +%: + dh $@ --with elpa + +override_dh_auto_build: + @echo skipping upstream build + +.PHONY: override_dh_auto_build diff --git a/source/format b/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/watch b/watch new file mode 100644 index 0000000..a4f3d7d --- /dev/null +++ b/watch @@ -0,0 +1,4 @@ +version=4 + opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%emacs-git-modes-$1.tar.gz%" \ + https://github.com/magit/git-modes/tags \ + (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate -- cgit v1.2.3 From 4e40998bd24ec72de4128bc0ff2b46021b098ac0 Mon Sep 17 00:00:00 2001 From: Lev Lamberov Date: Thu, 16 Aug 2018 09:11:10 -0300 Subject: Import emacs-git-modes_1.2.8.orig.tar.gz [dgit import orig emacs-git-modes_1.2.8.orig.tar.gz] --- .mailmap | 3 + LICENSE | 676 ++++++++++++++++++++++++++++++++++++++++++++++++++ Makefile | 68 +++++ README.md | 37 +++ git-modes.el | 50 ++++ gitattributes-mode.el | 231 +++++++++++++++++ gitconfig-mode.el | 138 +++++++++++ gitignore-mode.el | 61 +++++ 8 files changed, 1264 insertions(+) create mode 100644 .mailmap create mode 100644 LICENSE create mode 100644 Makefile create mode 100644 README.md create mode 100644 git-modes.el create mode 100644 gitattributes-mode.el create mode 100644 gitconfig-mode.el create mode 100644 gitignore-mode.el diff --git a/.mailmap b/.mailmap new file mode 100644 index 0000000..58b8592 --- /dev/null +++ b/.mailmap @@ -0,0 +1,3 @@ +Rüdiger Sonderfeld +Leandro López Leandro López (inkel) +Juan Pedro Bolívar Puente diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..4432540 --- /dev/null +++ b/LICENSE @@ -0,0 +1,676 @@ + + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + 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. + + + Copyright (C) + + 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 . + +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: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. + diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..38e889c --- /dev/null +++ b/Makefile @@ -0,0 +1,68 @@ +PREFIX ?= /usr/local +LISPDIR ?= $(PREFIX)/share/emacs/site-lisp/git-modes + +ELS = git-modes.el +ELS += gitattributes-mode.el +ELS += gitconfig-mode.el +ELS += gitignore-mode.el +ELCS = $(ELS:.el=.elc) + +LOADDEFS = git-modes-autoloads.el + +EMACS_BIN ?= emacs +BATCH = @$(EMACS_BIN) --batch -Q + +CP ?= install -p -m 644 +MKDIR ?= install -p -m 755 -d +RMDIR ?= rm -rf +SED ?= sed + +VERSION ?= $(shell test -e .git && git describe --tags --dirty 2> /dev/null) +ifeq "$(VERSION)" "" + VERSION = 1.2.1 +endif + +.PHONY: install clean + +lisp: $(ELCS) $(LOADDEFS) + +install: lisp + @printf "Installing...\n" + @$(MKDIR) $(DESTDIR)$(LISPDIR) + @$(CP) $(ELS) $(ELCS) $(DESTDIR)$(LISPDIR) + +clean: + @printf "Cleaning...\n" + @$(RM) $(ELCS) $(LOADDEFS) + +%.elc: %.el + @printf "Compiling $<...\n" + @$(BATCH) -L . -f batch-byte-compile $< + +define LOADDEFS_TMPL +;;; $(LOADDEFS) --- automatically extracted autoloads +;; +;;; Code: +(add-to-list 'load-path (directory-file-name \ +(or (file-name-directory #$$) (car load-path)))) + +;; Local Variables: +;; version-control: never +;; no-byte-compile: t +;; no-update-autoloads: t +;; End: +;;; $(LOADDEFS) ends here +endef +export LOADDEFS_TMPL +#' + +$(LOADDEFS): $(ELS) + @printf "Generating $@\n" + @printf "%s" "$$LOADDEFS_TMPL" > $@ + @$(BATCH) --eval "(progn\ + (setq make-backup-files nil)\ + (setq vc-handled-backends nil)\ + (setq default-directory (file-truename default-directory))\ + (setq generated-autoload-file (expand-file-name \"$@\"))\ + (setq find-file-visit-truename t)\ + (update-directory-autoloads default-directory))" diff --git a/README.md b/README.md new file mode 100644 index 0000000..b3e7de7 --- /dev/null +++ b/README.md @@ -0,0 +1,37 @@ +Git Config Modes +================ + +Emacs major modes for various Git configuration files. + +The list of contributors can be found +[here](https://github.com/magit/git-modes/graphs/contributors). + +`gitattributes-mode` +-------------------- + +Auto-/loading the library `gitattributes-mode` enabled the mode for +`.gitattributes`, `.git/info/attributes`, and `git/attributes` files. + +`gitconfig-mode` +---------------- + +Auto-/loading the library `gitconfig-mode` enables the mode for +`.gitconfig`, `.git/config`, `git/config`, and `.gitmodules` files. + +`gitconfig-mode` derives from `conf-unix-mode`. + +`gitignore-mode` +---------------- + +Auto-/loading the library `gitignore-mode` enables the mode for +`.gitignore`, `.git/info/exclude`, and `git/ignore` files. + +`gitignore-mode` derives from `conf-unix-mode`. + +This mode may be of use in other files that don't have anything to do +with Git, for example: + +```lisp +(add-to-list 'auto-mode-alist + (cons "/.dockerignore\\'" 'gitignore-mode)) +``` diff --git a/git-modes.el b/git-modes.el new file mode 100644 index 0000000..7a857e2 --- /dev/null +++ b/git-modes.el @@ -0,0 +1,50 @@ +;;; git-modes.el --- Major modes for editing Git configuration files -*- lexical-binding: t; -*- + +;; Copyright (c) 2012-2013 Sebastian Wiesner +;; Copyright (C) 2013-2015 Rüdiger Sonderfeld +;; Copyright (C) 2012-2018 The Magit Project Contributors + +;; Author: Sebastian Wiesner +;; Rüdiger Sonderfeld +;; Maintainer: Jonas Bernoulli +;; Homepage: https://github.com/magit/git-modes +;; Keywords: convenience vc git + +;; This file is not part of GNU Emacs. + +;; This file 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, or (at your option) +;; any later version. + +;; This file 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 file. If not, see . + +;;; Commentary: + +;; This package provides several major modes for editing Git +;; configuration files. The modes are: + +;; `gitattributes-mode' +;; `gitconfig-mode', and +;; `gitignore-mode' + +;; Each mode is defined in its own library by the same name. Loading +;; `git-modes' causes all three libraries to be loaded, but you could +;; also load the libraries individually. On Melpa, the libraries are +;; distributed as separate packages. + +;;; Code: + +(require 'gitattributes-mode) +(require 'gitconfig-mode) +(require 'gitignore-mode) + +(provide 'git-modes) + +;;; git-modes.el ends here diff --git a/gitattributes-mode.el b/gitattributes-mode.el new file mode 100644 index 0000000..918c236 --- /dev/null +++ b/gitattributes-mode.el @@ -0,0 +1,231 @@ +;;; gitattributes-mode.el --- Major mode for editing .gitattributes files -*- lexical-binding: t -*- + +;; Copyright (C) 2013-2018 The Magit Project Contributors + +;; Author: Rüdiger Sonderfeld +;; Maintainer: Jonas Bernoulli +;; Homepage: https://github.com/magit/git-modes +;; Keywords: convenience vc git + +;; 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 . + +;;; Commentary: + +;; A major mode for editing .gitattributes files. See +;; the gitattributes(5) manpage for more information. +;; `eldoc-mode' is supported for known attributes. + +;;; Code: + +(require 'easymenu) +(require 'thingatpt) + +(defgroup gitattributes-mode nil + "Edit .gitattributes files." + :link '(url-link "https://github.com/magit/git-modes") + :prefix "gitattributes-mode-" + :group 'tools) + +(defcustom gitattributes-mode-enable-eldoc t + "Enable `eldoc-mode' when loading `gitattributes-mode'. +This provides documentation for known variables in the echo area. +Alternatively add `turn-on-eldoc-mode' to the mode hook." + :type 'boolean + :group 'gitattributes-mode) + +(defcustom gitattributes-mode-man-function #'man + "Function to open the gitattributes(5) manpage." + :type '(choice (const :tag "Man" #'man) + (const :tag "Woman" #'woman) + (function :tag "Function")) + :group 'gitattributes-mode) + +(defun gitattributes-mode-help () + "Open the gitattributes(5) manpage using `gitattributes-mode-man-function'." + (interactive) + (funcall gitattributes-mode-man-function "gitattributes")) + +(defconst gitattributes-mode-attributes + '(("text" + "This attribute enables and controls end-of-line normalization." + (t "auto")) + ("eol" + "This attribute sets a specific line-ending style to be used in the \ +working directory." + ("crlf" "lf")) + ("ident" "Handle $Id$." t) + ("filter" + "A filter attribute can be set to a string value that names a filter \ +driver specified in the configuration." + string) + ("diff" + "The attribute diff affects how Git generates diffs for particular files." + (t string "ada" "bibtex" "cpp" "csharp" "fortran" "html" "java" + "matlab" "objc" "pascal" "perl" "php" "python" "ruby" "tex")) + ("merge" + "The attribute merge affects how three versions of a file are merged." + (t string "text" "binary" "union")) + ("conflict-marker-size" + "This attribute controls the length of conflict markers left in the work \ +tree file during a conflicted merge." + (number)) + ("whitespace" + "The core.whitespace configuration variable allows you to define what \ +diff and apply should consider whitespace errors for all paths in the project." + (t string)) + ("export-ignore" + "Files and directories with the attribute export-ignore won’t be added to \ +archive files." + t) + ("export-subst" + "If the attribute export-subst is set for a file then Git will expand \ +several placeholders when adding this file to an archive." + t) + ("delta" + "Delta compression will not be attempted for blobs for paths with the \ +attribute delta set to false." + t) + ("encoding" + "The encoding used for the file in GUI Tools (e.g., gitk(1) and \ +git-gui(1))." + string)) + "List of known attributes. +Format (NAME DOC ALLOWED-STATES). +NAME should be the name as a string. +DOC should be a short doc-string. +ALLOWED-STATE should be a list or single symbol or string of allowed values. +t means the attribute can be Set or Unset. `string' means the symbol value +can be any string and `number' means the value should be a number.") + +(defun gitattributes-mode-eldoc (&optional no-state) + "Support for `eldoc-mode'. +If NO-STATE is non-nil then do not print state." + (let (entry) + (when (and (thing-at-point-looking-at "\\s-+\\(-\\|!\\)?\\(\\(?:\\sw-?\\)+\\)\\(=\\)?") + (setq entry (assoc-string (match-string 2) + gitattributes-mode-attributes))) + (concat (unless no-state + (cond + ((string= (match-string 1) "-") "[Unset] ") + ((string= (match-string 1) "!") "[Unspecified] ") + ((string= (match-string 3) "=") "[Set to a value] ") + (t "[Set] "))) + (cadr entry))))) + +(defvar gitattributes-mode-syntax-table + (let ((table (make-syntax-table))) + (modify-syntax-entry ?\s " " table) + (modify-syntax-entry ?\t " " table) + (modify-syntax-entry ?- "_." table) + (modify-syntax-entry ?! "." table) + (modify-syntax-entry ?= "." table) + (modify-syntax-entry ?# "<" table) + (modify-syntax-entry ?\n ">" table) + table) + "Syntax table for `gitattributes-mode'.") + +(defun gitattributes-mode--highlight-1st-field (regexp) + "Highlight REGEXP in the first field only." + `(lambda (limit) + (let ((old-limit limit)) + (save-excursion + (beginning-of-line) + (while (and (not (eobp)) (looking-at "^\\s-*$")) + (forward-line)) + (when (re-search-forward "[[:space:]]" limit 'noerror) + (setq limit (point)))) + (unless (< limit (point)) + (if (re-search-forward ,regexp limit 'noerror) + t + (forward-line) + (when (< (point) old-limit) + (gitattributes-mode--highlight-1st-field old-limit))))))) + +(defvar gitattributes-mode-font-lock-keywords + `(("^\\[attr]" . 'font-lock-function-name-face) + ("\\s-+\\(-\\|!\\)[[:word:]]+" (1 'font-lock-negation-char-face)) + ("\\s-+\\(?:-\\|!\\)?\\(\\sw\\(?:\\sw\\|\\s_\\)*\\)=?" + (1 'font-lock-variable-name-face)) + ;; Pattern highlight similar to `gitignore-mode-font-lock-keywords' + (,(gitattributes-mode--highlight-1st-field "/") . 'font-lock-constant-face) + (,(gitattributes-mode--highlight-1st-field "[*?]") . 'font-lock-keyword-face) + (,(gitattributes-mode--highlight-1st-field "\\[.+?]") . 'font-lock-keyword-face)) + "Keywords for highlight in `gitattributes-mode'.") + +(defun gitattributes-mode-forward-field (&optional arg) + "Move point ARG fields forward. +If ARG is omitted or nil, move point forward one field." + (interactive "p") + (if (< arg 0) + (gitattributes-mode-backward-field (- arg)) + (dotimes (_ (or arg 1)) + (re-search-forward "\\s-[!-]?\\<" nil 'move)))) + +(defun gitattributes-mode-backward-field (&optional arg) + "Move point ARG fields backward. +If ARG is omitted or nil, move point backward one field." + (interactive "p") + (if (< arg 0) + (gitattributes-mode-forward-field (- arg)) + (dotimes (_ (or arg 1)) + (re-search-backward "\\s-[!-]?\\<" nil 'move)))) + +(defvar gitattributes-mode-map (make-sparse-keymap) + "Keymap for `gitattributes-mode'.") + +(easy-menu-define gitattributes-mode-menu + gitattributes-mode-map + "Menu for `gitattributes-mode'." + '("Git Attributes" + ["Forward Field" forward-sexp :active t + :help "Move forward across one field"] + ["Backward Field" backward-sexp :active t + :help "Move backward across one field"] + ["Kill Field Forward" kill-sexp :active t + :help "Kill field following cursor"] + ["Kill Field Backward" backward-kill-sexp :active t + :help "Kill field preceding cursor"] + "--" + ["Help" gitattributes-mode-help :active t + :help "Open gitattributes(5) manpage"])) + +;;;###autoload +(define-derived-mode gitattributes-mode text-mode "Gitattributes" + "A major mode for editing .gitattributes files. +\\{gitattributes-mode-map}" + :group 'gitattributes-mode + :syntax-table gitattributes-mode-syntax-table + (setq font-lock-defaults '(gitattributes-mode-font-lock-keywords)) + (setq-local comment-start "# ") + (setq-local comment-start-skip "#+\\s-*") + (setq-local eldoc-documentation-function #'gitattributes-mode-eldoc) + (setq-local forward-sexp-function #'gitattributes-mode-forward-field) + (when (and gitattributes-mode-enable-eldoc + (require 'eldoc nil 'noerror)) + (eldoc-mode 1))) + +;;;###autoload +(dolist (pattern '("/\\.gitattributes\\'" + "/info/attributes\\'" + "/git/attributes\\'")) + (add-to-list 'auto-mode-alist (cons pattern #'gitattributes-mode))) + +;;; _ +(provide 'gitattributes-mode) +;; Local Variables: +;; indent-tabs-mode: nil +;; End: +;;; gitattributes-mode.el ends here diff --git a/gitconfig-mode.el b/gitconfig-mode.el new file mode 100644 index 0000000..2b5c274 --- /dev/null +++ b/gitconfig-mode.el @@ -0,0 +1,138 @@ +;;; gitconfig-mode.el --- Major mode for editing .gitconfig files -*- lexical-binding: t; -*- + +;; Copyright (c) 2012-2013 Sebastian Wiesner +;; Copyright (C) 2012-2018 The Magit Project Contributors + +;; Author: Sebastian Wiesner +;; Maintainer: Jonas Bernoulli +;; Homepage: https://github.com/magit/git-modes +;; Keywords: convenience vc git + +;; This file is not part of GNU Emacs. + +;; This file 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, or (at your option) +;; any later version. + +;; This file 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 file. If not, see . + +;;; Commentary: + +;; A major mode for editing .gitconfig files. + +;;; Code: + +(require 'rx) +(require 'conf-mode) + +(defun gitconfig-line-indented-p () + "Return t if the current line is indented correctly." + (save-excursion + (beginning-of-line) + (or (looking-at (rx line-start "[" + symbol-start + (minimal-match (zero-or-more not-newline)) + symbol-end "]")) + (looking-at (concat (rx line-start) + (gitconfig-indentation-string) + (rx symbol-start (or (syntax word) + (syntax symbol))))) + (looking-at (rx (zero-or-one "\t") (or "#" ";")))))) + +(defun gitconfig-point-in-indentation-p () + "Return if the point is in the indentation of the current line." + (save-excursion + (let ((pos (point))) + (back-to-indentation) + (<= pos (point))))) + +(defun gitconfig-indent-line () + "Indent the current line." + (interactive) + (if (gitconfig-line-indented-p) + (when (gitconfig-point-in-indentation-p) + (back-to-indentation)) + (let ((old-point (point-marker)) + (was-in-indent (gitconfig-point-in-indentation-p))) + (beginning-of-line) + (delete-horizontal-space) + (unless (equal (char-after) ?\[) + (insert (gitconfig-indentation-string))) + (if was-in-indent + (back-to-indentation) + (goto-char (marker-position old-point))) + (set-marker old-point nil)))) + +(defun gitconfig-indentation-string () + (if indent-tabs-mode "\t" (make-string tab-width ?\ ))) + +(defvar gitconfig-mode-syntax-table + (let ((table (make-syntax-table conf-unix-mode-syntax-table))) + ;; ; is a comment in .gitconfig + (modify-syntax-entry ?\; "<" table) + ;; ' is not used for string quoting + (modify-syntax-entry ?\' "." table) + table) + "Syntax table to use in .gitconfig buffers.") + +(defvar gitconfig-mode-font-lock-keywords + `( + ;; Highlight section and subsection gitconfig headers, and override + ;; syntactic fontification in these. + (,(rx line-start (zero-or-more (syntax whitespace)) + "[" symbol-start + (group (one-or-more (or (syntax word) (syntax symbol)))) + symbol-end + (optional (one-or-more (syntax whitespace)) + (group (syntax string-quote) + (minimal-match (one-or-more not-newline)) + (syntax string-quote))) + "]" (zero-or-more not-newline) line-end) + (1 'font-lock-type-face t nil) + (2 'font-lock-function-name-face t t)) + (,(rx line-start (zero-or-more (syntax whitespace)) symbol-start + (group alphanumeric + (zero-or-more (or (syntax word) (syntax symbol)))) + symbol-end (zero-or-more (syntax whitespace)) + (optional "=" (zero-or-more not-newline)) line-end) + (1 'font-lock-variable-name-face)) + ;; Highlight booleans and numbers + (,(rx "=" + (zero-or-more (syntax whitespace)) word-start + (group (or "yes" "no" "true" "false" "on" "off")) + word-end (zero-or-more (syntax whitespace)) line-end) + (1 'font-lock-keyword-face)) + (,(rx "=" + (zero-or-more (syntax whitespace)) word-start + (group (one-or-more digit)) + word-end (zero-or-more (syntax whitespace)) line-end) + (1 'font-lock-constant-face)))) + +;;;###autoload +(define-derived-mode gitconfig-mode conf-unix-mode "Gitconfig" + "A major mode for editing .gitconfig files." + ;; .gitconfig is indented with tabs only + (conf-mode-initialize "#" gitconfig-mode-font-lock-keywords) + (setq indent-tabs-mode t) + (set (make-local-variable 'indent-line-function) + 'gitconfig-indent-line)) + +;;;###autoload +(dolist (pattern '("/\\.gitconfig\\'" "/\\.git/config\\'" + "/modules/.*/config\\'" "/git/config\\'" + "/\\.gitmodules\\'" "/etc/gitconfig\\'")) + (add-to-list 'auto-mode-alist (cons pattern 'gitconfig-mode))) + +;;; _ +(provide 'gitconfig-mode) +;; Local Variables: +;; indent-tabs-mode: nil +;; End: +;;; gitconfig-mode.el ends here diff --git a/gitignore-mode.el b/gitignore-mode.el new file mode 100644 index 0000000..7c55356 --- /dev/null +++ b/gitignore-mode.el @@ -0,0 +1,61 @@ +;;; gitignore-mode.el --- Major mode for editing .gitignore files -*- lexical-binding: t; -*- + +;; Copyright (c) 2012-2013 Sebastian Wiesner +;; Copyright (C) 2012-2018 The Magit Project Contributors + +;; Author: Sebastian Wiesner +;; Maintainer: Jonas Bernoulli +;; Homepage: https://github.com/magit/git-modes +;; Keywords: convenience vc git + +;; This file is not part of GNU Emacs. + +;; This file 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, or (at your option) +;; any later version. + +;; This file 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 file. If not, see . + +;;; Commentary: + +;; A major mode for editing .gitignore files. + +;;; Code: + +(require 'conf-mode) + +(defvar gitignore-mode-font-lock-keywords + '(("^\\s<.*$" . font-lock-comment-face) + ("^!" . font-lock-negation-char-face) ; Negative pattern + ("/" . font-lock-constant-face) ; Directory separators + ("[*?]" . font-lock-keyword-face) ; Glob patterns + ("\\[.+?\\]" . font-lock-keyword-face))) ; Ranged glob patterns + +;;;###autoload +(define-derived-mode gitignore-mode conf-unix-mode "Gitignore" + "A major mode for editing .gitignore files." + (conf-mode-initialize "#") + ;; Disable syntactic font locking, because comments are only valid at + ;; beginning of line. + (setq font-lock-defaults '(gitignore-mode-font-lock-keywords t t)) + (set (make-local-variable 'conf-assignment-sign) nil)) + +;;;###autoload +(dolist (pattern (list "/\\.gitignore\\'" + "/info/exclude\\'" + "/git/ignore\\'")) + (add-to-list 'auto-mode-alist (cons pattern 'gitignore-mode))) + +;;; _ +(provide 'gitignore-mode) +;; Local Variables: +;; indent-tabs-mode: nil +;; End: +;;; gitignore-mode.el ends here -- cgit v1.2.3 From cf2a9064a7fb91a050bf85774d3c0bc0874fe378 Mon Sep 17 00:00:00 2001 From: Lev Lamberov Date: Thu, 16 Aug 2018 09:11:10 -0300 Subject: Add version number This patch adds version numbers to Emacs Lisp files, which are needed for dh-elpa to operate correctly. Gbp-Pq: Name 0001-fix-version.diff --- git-modes.el | 1 + gitattributes-mode.el | 1 + gitconfig-mode.el | 1 + gitignore-mode.el | 1 + 4 files changed, 4 insertions(+) diff --git a/git-modes.el b/git-modes.el index 7a857e2..1a9d863 100644 --- a/git-modes.el +++ b/git-modes.el @@ -8,6 +8,7 @@ ;; Rüdiger Sonderfeld ;; Maintainer: Jonas Bernoulli ;; Homepage: https://github.com/magit/git-modes +;; Version: 1.2.8 ;; Keywords: convenience vc git ;; This file is not part of GNU Emacs. diff --git a/gitattributes-mode.el b/gitattributes-mode.el index 918c236..1604361 100644 --- a/gitattributes-mode.el +++ b/gitattributes-mode.el @@ -5,6 +5,7 @@ ;; Author: Rüdiger Sonderfeld ;; Maintainer: Jonas Bernoulli ;; Homepage: https://github.com/magit/git-modes +;; Version: 1.2.8 ;; Keywords: convenience vc git ;; This file is NOT part of GNU Emacs. diff --git a/gitconfig-mode.el b/gitconfig-mode.el index 2b5c274..4d018cf 100644 --- a/gitconfig-mode.el +++ b/gitconfig-mode.el @@ -6,6 +6,7 @@ ;; Author: Sebastian Wiesner ;; Maintainer: Jonas Bernoulli ;; Homepage: https://github.com/magit/git-modes +;; Version: 1.2.8 ;; Keywords: convenience vc git ;; This file is not part of GNU Emacs. diff --git a/gitignore-mode.el b/gitignore-mode.el index 7c55356..f135074 100644 --- a/gitignore-mode.el +++ b/gitignore-mode.el @@ -6,6 +6,7 @@ ;; Author: Sebastian Wiesner ;; Maintainer: Jonas Bernoulli ;; Homepage: https://github.com/magit/git-modes +;; Version: 1.2.8 ;; Keywords: convenience vc git ;; This file is not part of GNU Emacs. -- cgit v1.2.3