Skip to content

Commit c838626

Browse files
committed
patch 8.2.0105: Vim license not easy to find on github
Problem: Vim license not easy to find on github. Solution: Add a separate LICENCE file. (closes vim#5458)
1 parent b662591 commit c838626

File tree

3 files changed

+81
-0
lines changed

3 files changed

+81
-0
lines changed

Filelist

+1
Original file line numberDiff line numberDiff line change
@@ -652,6 +652,7 @@ SRC_EXTRA = \
652652
RT_ALL = \
653653
README.txt \
654654
README.md \
655+
LICENSE \
655656
CONTRIBUTING.md \
656657
runtime/bugreport.vim \
657658
runtime/doc/*.awk \

LICENSE

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
VIM LICENSE
2+
3+
I) There are no restrictions on distributing unmodified copies of Vim except
4+
that they must include this license text. You can also distribute
5+
unmodified parts of Vim, likewise unrestricted except that they must
6+
include this license text. You are also allowed to include executables
7+
that you made from the unmodified Vim sources, plus your own usage
8+
examples and Vim scripts.
9+
10+
II) It is allowed to distribute a modified (or extended) version of Vim,
11+
including executables and/or source code, when the following four
12+
conditions are met:
13+
1) This license text must be included unmodified.
14+
2) The modified Vim must be distributed in one of the following five ways:
15+
a) If you make changes to Vim yourself, you must clearly describe in
16+
the distribution how to contact you. When the maintainer asks you
17+
(in any way) for a copy of the modified Vim you distributed, you
18+
must make your changes, including source code, available to the
19+
maintainer without fee. The maintainer reserves the right to
20+
include your changes in the official version of Vim. What the
21+
maintainer will do with your changes and under what license they
22+
will be distributed is negotiable. If there has been no negotiation
23+
then this license, or a later version, also applies to your changes.
24+
The current maintainer is Bram Moolenaar <[email protected]>. If this
25+
changes it will be announced in appropriate places (most likely
26+
vim.sf.net, www.vim.org and/or comp.editors). When it is completely
27+
impossible to contact the maintainer, the obligation to send him
28+
your changes ceases. Once the maintainer has confirmed that he has
29+
received your changes they will not have to be sent again.
30+
b) If you have received a modified Vim that was distributed as
31+
mentioned under a) you are allowed to further distribute it
32+
unmodified, as mentioned at I). If you make additional changes the
33+
text under a) applies to those changes.
34+
c) Provide all the changes, including source code, with every copy of
35+
the modified Vim you distribute. This may be done in the form of a
36+
context diff. You can choose what license to use for new code you
37+
add. The changes and their license must not restrict others from
38+
making their own changes to the official version of Vim.
39+
d) When you have a modified Vim which includes changes as mentioned
40+
under c), you can distribute it without the source code for the
41+
changes if the following three conditions are met:
42+
- The license that applies to the changes permits you to distribute
43+
the changes to the Vim maintainer without fee or restriction, and
44+
permits the Vim maintainer to include the changes in the official
45+
version of Vim without fee or restriction.
46+
- You keep the changes for at least three years after last
47+
distributing the corresponding modified Vim. When the maintainer
48+
or someone who you distributed the modified Vim to asks you (in
49+
any way) for the changes within this period, you must make them
50+
available to him.
51+
- You clearly describe in the distribution how to contact you. This
52+
contact information must remain valid for at least three years
53+
after last distributing the corresponding modified Vim, or as long
54+
as possible.
55+
e) When the GNU General Public License (GPL) applies to the changes,
56+
you can distribute the modified Vim under the GNU GPL version 2 or
57+
any later version.
58+
3) A message must be added, at least in the output of the ":version"
59+
command and in the intro screen, such that the user of the modified Vim
60+
is able to see that it was modified. When distributing as mentioned
61+
under 2)e) adding the message is only required for as far as this does
62+
not conflict with the license used for the changes.
63+
4) The contact information as required under 2)a) and 2)d) must not be
64+
removed or changed, except that the person himself can make
65+
corrections.
66+
67+
III) If you distribute a modified version of Vim, you are encouraged to use
68+
the Vim license for your changes and make them available to the
69+
maintainer, including the source code. The preferred way to do this is
70+
by e-mail or by uploading the files to a server and e-mailing the URL.
71+
If the number of changes is small (e.g., a modified Makefile) e-mailing a
72+
context diff will do. The e-mail address to be used is
73+
74+
75+
IV) It is not allowed to remove this license from the distribution of the Vim
76+
sources, parts of it or from a modified version. You may use this
77+
license for previous Vim releases instead of the license that they came
78+
with, at your option.

src/version.c

+2
Original file line numberDiff line numberDiff line change
@@ -742,6 +742,8 @@ static char *(features[]) =
742742

743743
static int included_patches[] =
744744
{ /* Add new patch number below this line */
745+
/**/
746+
105,
745747
/**/
746748
104,
747749
/**/

0 commit comments

Comments
 (0)