Use `mutate-constant` as warning identifier

* etc/NEWS:
* lisp/emacs-lisp/byte-run.el (with-suppressed-warnings):
* lisp/emacs-lisp/bytecomp.el (byte-compile-warnings)
(byte-compile-form):
* test/lisp/emacs-lisp/bytecomp-tests.el
(bytecomp-test--with-suppressed-warnings):
Use the new warning name `mutate-constant` instead of using the
somewhat overloaded `suspicious`.

diff --git a/etc/NEWS b/etc/NEWS
index 7d033b0b13e820a19a21081cabd02efe7ae5e224..b4846eb11b0fe37f85b30d0f6c7c2329e7059748 100644 (file)
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -527,7 +527,7 @@ To avoid the warning, operate on an object created by the program
 instead.
 
 This warning can be suppressed using 'with-suppressed-warnings' with
-the warning name 'suspicious'.
+the warning name 'mutate-constant'.
 
 ---
 *** Warn about more ignored function return values.

diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 5b415c5e1f49b1553d41291fbb104fcaa75848a1..a377ec395e16b25ff3bf6509996c75f72a7bae30 100644 (file)
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -658,7 +658,7 @@ in `byte-compile-warning-types'; see the variable
 types.  The types that can be suppressed with this macro are
 `free-vars', `callargs', `redefine', `obsolete',
 `interactive-only', `lexical', `ignored-return-value', `constants',
-`suspicious' and `empty-body'."
+`suspicious', `empty-body' and `mutate-constant'."
   ;; Note: during compilation, this definition is overridden by the one in
   ;; byte-compile-initial-macro-environment.
   (declare (debug (sexp body)) (indent 1))

diff --git a/lisp/emacs-lisp/bytecomp.el b/lisp/emacs-lisp/bytecomp.el
index d17f1c93a76a12b621c065c61cfe87abda2791ce..a192d599d1d075c0e61cf5e9e36d386ad2f13dfc 100644 (file)
--- a/lisp/emacs-lisp/bytecomp.el
+++ b/lisp/emacs-lisp/bytecomp.el
@@ -330,6 +330,8 @@ Elements of the list may be:
                               This depends on the `docstrings' warning type.
   suspicious  constructs that usually don't do what the coder wanted.
   empty-body  body argument to a special form or macro is empty.
+  mutate-constant
+              code that mutates program constants such as quoted lists
 
 If the list begins with `not', then the remaining elements specify warnings to
 suppress.  For example, (not free-vars) will suppress the `free-vars' warning.
@@ -3498,7 +3500,7 @@ lambda-expression."
                                     (consp (nth 1 arg)))
                                (arrayp arg))
                            (byte-compile-warning-enabled-p
-                            'suspicious (car form)))
+                            'mutate-constant (car form)))
                   (byte-compile-warn-x form "`%s' on constant %s (arg %d)"
                                        (car form)
                                        (if (consp arg) "list" (type-of arg))

diff --git a/test/lisp/emacs-lisp/bytecomp-tests.el b/test/lisp/emacs-lisp/bytecomp-tests.el
index 9136a6cd9b31caa155ef3c67b93755e4902cab31..a8809bda81c04dbb98bff5ae1799ef1291fa47a7 100644 (file)
--- a/test/lisp/emacs-lisp/bytecomp-tests.el
+++ b/test/lisp/emacs-lisp/bytecomp-tests.el
@@ -1522,31 +1522,31 @@ literals (Bug#20852)."
   (test-suppression
    '(defun zot ()
       (setcar '(1 2) 3))
-   '((suspicious setcar))
+   '((mutate-constant setcar))
    "Warning: `setcar' on constant list (arg 1)")
 
   (test-suppression
    '(defun zot ()
       (aset [1 2] 1 3))
-   '((suspicious aset))
+   '((mutate-constant aset))
    "Warning: `aset' on constant vector (arg 1)")
 
   (test-suppression
    '(defun zot ()
       (aset "abc" 1 ?d))
-   '((suspicious aset))
+   '((mutate-constant aset))
    "Warning: `aset' on constant string (arg 1)")
 
   (test-suppression
    '(defun zot (x y)
       (nconc x y '(1 2) '(3 4)))
-   '((suspicious nconc))
+   '((mutate-constant nconc))
    "Warning: `nconc' on constant list (arg 3)")
 
   (test-suppression
    '(defun zot ()
       (put-text-property 0 2 'prop 'val "abc"))
-   '((suspicious put-text-property))
+   '((mutate-constant put-text-property))
    "Warning: `put-text-property' on constant string (arg 5)")
   )