[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master efc44727da: Support Apache License 2.0 in elide-head-mode
From: |
Stefan Kangas |
Subject: |
master efc44727da: Support Apache License 2.0 in elide-head-mode |
Date: |
Tue, 27 Dec 2022 12:17:31 -0500 (EST) |
branch: master
commit efc44727daaee4d3f9aeb19864074472e99b296a
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>
Support Apache License 2.0 in elide-head-mode
* lisp/elide-head.el (elide-head-headers-to-hide): Add the Apache
License, Version 2.0.
* test/lisp/elide-head-tests.el (apache1-1): New test.
---
lisp/elide-head.el | 10 +++++++---
test/lisp/elide-head-tests.el | 22 ++++++++++++++++++++++
2 files changed, 29 insertions(+), 3 deletions(-)
diff --git a/lisp/elide-head.el b/lisp/elide-head.el
index 7f565d346d..71e7e67e3f 100644
--- a/lisp/elide-head.el
+++ b/lisp/elide-head.el
@@ -79,8 +79,12 @@
. "POSSIBILITY OF SUCH DAMAGE\\.")
;; X11 and Expat
("Permission is hereby granted, free of charge" .
- ,(rx (or "authorization from the X Consortium." ; X11
- "THE USE OR OTHER DEALINGS IN THE SOFTWARE."))))) ; Expat
+ ,(rx (or "authorization from the X Consortium." ; X11
+ "THE USE OR OTHER DEALINGS IN THE SOFTWARE."))) ; Expat
+ ;; Apache
+ ("Licensed under the Apache License, Version 2.0" .
+ "limitations under the License.")
+ ))
"Alist of regexps defining start and end of text to elide.
The cars of elements of the list are searched for in order. Text is
@@ -91,7 +95,7 @@ cdr.
This affects `elide-head-mode'."
:type '(alist :key-type (regexp :tag "Start regexp")
:value-type (regexp :tag "End regexp"))
- :version "29.1")
+ :version "30.1")
(defvar-local elide-head-overlay nil)
diff --git a/test/lisp/elide-head-tests.el b/test/lisp/elide-head-tests.el
index 293fb0dc09..3d6e768693 100644
--- a/test/lisp/elide-head-tests.el
+++ b/test/lisp/elide-head-tests.el
@@ -285,6 +285,28 @@
" "This program is distributed in the hope that")
+;;; Apache License
+
+(elide-head--add-test apache1-1 "\
+/*
+ * Copyright 2011-2016 The Pkcs11Interop Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the \"License\");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an \"AS IS\" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+" "Unless required by applicable law")
+
+
+
;;; Obsolete
(with-suppressed-warnings ((obsolete elide-head)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master efc44727da: Support Apache License 2.0 in elide-head-mode,
Stefan Kangas <=