feature/android 773bdb15abd 2/2: Merge remote-tracking branch 'origin/master' into feature/android

[Po Lu]

branch: feature/android
commit 773bdb15abd5527dfc27d811a70263ac10cf451b
Merge: 9d1285883c7 891a37ab36a
Author: Po Lu <luangruo@yahoo.com>
Commit: Po Lu <luangruo@yahoo.com>

    Merge remote-tracking branch 'origin/master' into feature/android
---
 lisp/subr.el                                |  4 ++--
 test/lisp/progmodes/elixir-ts-mode-tests.el |  2 +-
 test/lisp/progmodes/heex-ts-mode-tests.el   | 22 ++++++++++++++++++++++
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/lisp/subr.el b/lisp/subr.el
index a8c00045e3e..e035ce51217 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -5558,7 +5558,7 @@ See also `string-equal'."
   "Return non-nil if PREFIX is a prefix of STRING.
 If IGNORE-CASE is non-nil, the comparison is done without paying attention
 to case differences."
-  (declare (pure t) (side-effect-free t))
+  (declare (side-effect-free t))
   (let ((prefix-length (length prefix)))
     (if (> prefix-length (length string)) nil
       (eq t (compare-strings prefix 0 prefix-length string
@@ -5568,7 +5568,7 @@ to case differences."
   "Return non-nil if SUFFIX is a suffix of STRING.
 If IGNORE-CASE is non-nil, the comparison is done without paying
 attention to case differences."
-  (declare (pure t) (side-effect-free t))
+  (declare (side-effect-free t))
   (let ((start-pos (- (length string) (length suffix))))
     (and (>= start-pos 0)
          (eq t (compare-strings suffix nil nil
diff --git a/test/lisp/progmodes/elixir-ts-mode-tests.el 
b/test/lisp/progmodes/elixir-ts-mode-tests.el
index 8e546ad5cc6..488fc1b646f 100644
--- a/test/lisp/progmodes/elixir-ts-mode-tests.el
+++ b/test/lisp/progmodes/elixir-ts-mode-tests.el
@@ -1,4 +1,4 @@
-;;; c-ts-mode-tests.el --- Tests for Tree-sitter-based C mode         -*- 
lexical-binding: t; -*-
+;;; elixir-ts-mode-tests.el --- Tests for elixir-ts-mode         -*- 
lexical-binding: t; -*-
 
 ;; Copyright (C) 2023 Free Software Foundation, Inc.
 
diff --git a/test/lisp/progmodes/heex-ts-mode-tests.el 
b/test/lisp/progmodes/heex-ts-mode-tests.el
index b59126e136a..def6d845de9 100644
--- a/test/lisp/progmodes/heex-ts-mode-tests.el
+++ b/test/lisp/progmodes/heex-ts-mode-tests.el
@@ -1,3 +1,24 @@
+;;; heex-ts-mode-tests.el --- Tests for heex-ts-mode         -*- 
lexical-binding: t; -*-
+
+;; Copyright (C) 2023 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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.
+
+;; GNU Emacs 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 GNU Emacs.  If not, see <https://www.gnu.org/licenses/>.
+
+;;; Code:
+
 (require 'ert)
 (require 'ert-x)
 (require 'treesit)
@@ -7,3 +28,4 @@
   (ert-test-erts-file (ert-resource-file "indent.erts")))
 
 (provide 'heex-ts-mode-tests)
+;;; heex-ts-mode-tests.el ends here