[nongnu] elpa/flx 1be7b124a2 181/182: Merge pull request #110 from skangas/license-fixes

[ELPA Syncer]

branch: elpa/flx
commit 1be7b124a29321ebd9f9dc7d940e0d4fcf6578f4
Merge: 5c23a9e87d 48e10bf54f
Author: Le Wang <lewang@users.noreply.github.com>
Commit: GitHub <noreply@github.com>

    Merge pull request #110 from skangas/license-fixes
    
    License fixes
---
 flx-ido.el            | 14 ++++++--------
 flx.el                | 14 ++++++--------
 misc/flx-helm-demo.el | 17 +++++++++++++++++
 misc/flx-ido-demo.el  | 17 +++++++++++++++++
 misc/flx-test-list.el | 17 +++++++++++++++++
 tests/flx-test.el     | 14 ++++++--------
 tests/run-test.el     | 17 +++++++++++++++++
 7 files changed, 86 insertions(+), 24 deletions(-)

diff --git a/flx-ido.el b/flx-ido.el
index 799d06a8d0..644f1e8d5c 100644
--- a/flx-ido.el
+++ b/flx-ido.el
@@ -14,20 +14,18 @@
 
 ;;; License
 
-;; 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, or
+;; 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.
+;; 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; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/flx.el b/flx.el
index 452207f20d..146daa1f70 100644
--- a/flx.el
+++ b/flx.el
@@ -14,20 +14,18 @@
 
 ;;; License
 
-;; 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, or
+;; 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.
+;; 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; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/misc/flx-helm-demo.el b/misc/flx-helm-demo.el
index 3b8c04da2c..fe33ffb4f6 100644
--- a/misc/flx-helm-demo.el
+++ b/misc/flx-helm-demo.el
@@ -1,3 +1,20 @@
+;; Copyright © 2013-2022 Le Wang
+
+;; 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/>.
+
 (require 'flx)
 (require 'flx-test-list)
 
diff --git a/misc/flx-ido-demo.el b/misc/flx-ido-demo.el
index 5d786518d3..956aab14ba 100644
--- a/misc/flx-ido-demo.el
+++ b/misc/flx-ido-demo.el
@@ -1,3 +1,20 @@
+;; Copyright © 2013-2022 Le Wang
+
+;; 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/>.
+
 (require 'flx-ido)
 (require 'flx-test-list)
 
diff --git a/misc/flx-test-list.el b/misc/flx-test-list.el
index d6d6440d14..4dd2af7ddb 100644
--- a/misc/flx-test-list.el
+++ b/misc/flx-test-list.el
@@ -1,5 +1,22 @@
 ;;; This is just a big list of files for experimenting
 
+;; Copyright © 2013-2022 Le Wang
+
+;; 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/>.
+
 (provide 'flx-test-list)
 (defvar foo-list
       '(".autotest"
diff --git a/tests/flx-test.el b/tests/flx-test.el
index 796e282705..ee41762fdc 100644
--- a/tests/flx-test.el
+++ b/tests/flx-test.el
@@ -12,20 +12,18 @@
 
 ;;; License
 
-;; 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, or
+;; 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.
+;; 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; see the file COPYING.  If not, write to
-;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth
-;; Floor, Boston, MA 02110-1301, USA.
+;; along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 ;;; Commentary:
 
diff --git a/tests/run-test.el b/tests/run-test.el
index c9842f7348..7b8a3d0202 100644
--- a/tests/run-test.el
+++ b/tests/run-test.el
@@ -1,3 +1,20 @@
+;; Copyright © 2013-2022 Le Wang
+
+;; 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/>.
+
 ;; Usage:
 ;;
 ;;   emacs -Q -l tests/run-test.el           # interactive mode