Skip to content

Commit 3cd6e09

Browse files
committed
Use GPL 3 for lsp-ui.el
The file was initially created as a placeholder for UI stuff by topisani. Sebastien Chapuis contributed most components and I polished them and touched most lines in this particular file. Move away from the confusing mix of GPL 3 and MIT. This was agreed by topisani: emacs-lsp#73 (comment)
1 parent 05d17b3 commit 3cd6e09

File tree

2 files changed

+19
-43
lines changed

2 files changed

+19
-43
lines changed

LICENSE

+1-25
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,3 @@
1-
The file lsp-ui.el is released under the following license:
2-
3-
Permission is hereby granted, free of charge, to any person obtaining a copy
4-
of this software and associated documentation files (the "Software"), to deal
5-
in the Software without restriction, including without limitation the rights
6-
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
7-
copies of the Software, and to permit persons to whom the Software is
8-
furnished to do so, subject to the following conditions:
9-
10-
The above copyright notice and this permission notice shall be included in
11-
all copies or substantial portions of the Software.
12-
13-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
14-
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
15-
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
16-
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
17-
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
18-
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
19-
SOFTWARE.
20-
21-
----------------------------------------------------------------------
22-
23-
The other files are released under the following license:
24-
251
GNU GENERAL PUBLIC LICENSE
262
Version 3, 29 June 2007
273

@@ -695,4 +671,4 @@ into proprietary programs. If your program is a subroutine library, you
695671
may consider it more useful to permit linking proprietary applications with
696672
the library. If this is what you want to do, use the GNU Lesser General
697673
Public License instead of this License. But first, please read
698-
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
674+
<http://www.gnu.org/philosophy/why-not-lgpl.html>.

lsp-ui.el

+18-18
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
11
;;; lsp-ui.el --- UI modules for lsp-mode -*- lexical-binding: t; -*-
22

33
;; Copyright (C) 2017 Tobias Pisani
4+
;; Copyright (C) 2018 Sebastien Chapuis, Fangrui Song
45

5-
;; Author: Tobias Pisani <[email protected]>
6+
;; Author: Sebastien Chapuis <[email protected]>, Fangrui Song <[email protected]>
67
;; Keywords: lsp
78
;; URL: https://github.com/emacs-lsp/lsp-ui
89
;; Package-Requires: ((emacs "25.1") (dash "2.14") (dash-functional "1.2.0") (flycheck "31") (lsp-mode "4.2") (markdown-mode "2.3"))
910
;; Version: 0.0.1
1011

11-
;; Permission is hereby granted, free of charge, to any person obtaining a copy
12-
;; of this software and associated documentation files (the "Software"), to deal
13-
;; in the Software without restriction, including without limitation the rights
14-
;; to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
15-
;; copies of the Software, and to permit persons to whom the Software is
16-
;; furnished to do so, subject to the following conditions:
17-
18-
;; The above copyright notice and this permission notice shall be included in
19-
;; all copies or substantial portions of the Software.
20-
21-
;; THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
22-
;; IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
23-
;; FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
24-
;; AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
25-
;; LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
26-
;; OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
27-
;; SOFTWARE.
12+
;;; License
13+
;;
14+
;; This program is free software; you can redistribute it and/or modify
15+
;; it under the terms of the GNU General Public License as published by
16+
;; the Free Software Foundation; either version 3, or (at your option)
17+
;; any later version.
18+
19+
;; This program is distributed in the hope that it will be useful,
20+
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
21+
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
22+
;; GNU General Public License for more details.
23+
24+
;; You should have received a copy of the GNU General Public License
25+
;; along with this program; see the file COPYING. If not, write to
26+
;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
27+
;; Floor, Boston, MA 02110-1301, USA.
2828

2929
;;; Commentary:
3030

0 commit comments

Comments
 (0)