Don't call purecopy in emacs-lisp/*.el

* lisp/emacs-lisp/byte-run.el (define-obsolete-face-alias)
(make-obsolete-variable, make-obsolete):
* lisp/emacs-lisp/cl-extra.el (cl-type-definition):
* lisp/emacs-lisp/cl-preloaded.el (cl-assertion-failed):
* lisp/emacs-lisp/cl-print.el (help-byte-code):
* lisp/emacs-lisp/derived.el (define-derived-mode):
* lisp/emacs-lisp/easy-mmode.el (define-minor-mode):
* lisp/emacs-lisp/eldoc.el (eldoc-minor-mode-string):
* lisp/emacs-lisp/gv.el (make-obsolete-generalized-variable):
* lisp/emacs-lisp/lisp-mode.el (lisp-imenu-generic-expression):
* lisp/emacs-lisp/loaddefs-gen.el (loaddefs-generate--parse-file):
* lisp/emacs-lisp/warnings.el (warning-type-format):
Remove calls to purecopy.

(cherry picked from commit 8da7086be6d0b0387c3ffbede062c4349045af70)

diff --git a/lisp/emacs-lisp/byte-run.el b/lisp/emacs-lisp/byte-run.el
index 30cd98408888d358571abeb7972ec5a169f9cb37..cb6f3e52ed56c19ae534fff4ef0f8f70a15faf8c 100644 (file)
--- a/lisp/emacs-lisp/byte-run.el
+++ b/lisp/emacs-lisp/byte-run.el
@@ -543,7 +543,7 @@ was first made obsolete, for example a date or a release number."
   (put obsolete-name 'byte-obsolete-info
        ;; The second entry used to hold the `byte-compile' handler, but
        ;; is not used any more nowadays.
-       (purecopy (list current-name nil when)))
+       (list current-name nil when))
   obsolete-name)
 
 (defmacro define-obsolete-function-alias ( obsolete-name current-name when
@@ -579,7 +579,7 @@ ACCESS-TYPE if non-nil should specify the kind of access that will trigger
   obsolescence warnings; it can be either `get' or `set'."
   (byte-run--constant-obsolete-warning obsolete-name)
   (put obsolete-name 'byte-obsolete-variable
-       (purecopy (list current-name access-type when)))
+       (list current-name access-type when))
   obsolete-name)
 
 (defmacro define-obsolete-variable-alias ( obsolete-name current-name when
@@ -634,7 +634,7 @@ obsolete, for example a date or a release number."
   `(progn
      (put ,obsolete-face 'face-alias ,current-face)
      ;; Used by M-x describe-face.
-     (put ,obsolete-face 'obsolete-face (or (purecopy ,when) t))))
+     (put ,obsolete-face 'obsolete-face (or ,when t))))
 
 (defmacro dont-compile (&rest body)
   "Like `progn', but the body always runs interpreted (not compiled).

diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index 5e963d024d007338d5ff4821d3a1cc670deb783c..fb5d04df329968c3e19fee76e4243ef0f4b36611 100644 (file)
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -722,7 +722,7 @@ PROPLIST is a list of the sort returned by `symbol-plist'.
 
 (define-button-type 'cl-type-definition
   :supertype 'help-function-def
-  'help-echo (purecopy "mouse-2, RET: find type definition"))
+  'help-echo "mouse-2, RET: find type definition")
 
 (declare-function help-fns-short-filename "help-fns" (filename))
 

diff --git a/lisp/emacs-lisp/cl-preloaded.el b/lisp/emacs-lisp/cl-preloaded.el
index 7c36b39826357e51aad43e378b56d18378b8b89f..664206a37714b59045c2bfa8d00912e713ac1645 100644 (file)
--- a/lisp/emacs-lisp/cl-preloaded.el
+++ b/lisp/emacs-lisp/cl-preloaded.el
@@ -41,7 +41,7 @@
 
 ;; The `assert' macro from the cl package signals
 ;; `cl-assertion-failed' at runtime so always define it.
-(define-error 'cl-assertion-failed (purecopy "Assertion failed"))
+(define-error 'cl-assertion-failed "Assertion failed")
 
 (defun cl--assertion-failed (form &optional string sargs args)
   (if debug-on-error

diff --git a/lisp/emacs-lisp/cl-print.el b/lisp/emacs-lisp/cl-print.el
index bdc35f33b3b9836f24c434f931a5c8813413b0fa..5af34361b920517784333a343ba9b8d65b376ba9 100644 (file)
--- a/lisp/emacs-lisp/cl-print.el
+++ b/lisp/emacs-lisp/cl-print.el
@@ -160,7 +160,7 @@ Print the contents hidden by the ellipsis to STREAM."
   'follow-link t
   'action (lambda (button)
             (disassemble (button-get button 'byte-code-function)))
-  'help-echo (purecopy "mouse-2, RET: disassemble this function"))
+  'help-echo "mouse-2, RET: disassemble this function")
 
 (defvar cl-print-compiled nil
   "Control how to print byte-compiled functions.

diff --git a/lisp/emacs-lisp/derived.el b/lisp/emacs-lisp/derived.el
index 18fe4f7b411cfc8de0318568d032467fd5bdde10..0bd862995847c18ad5474b1fe02d1451d3a11a3b 100644 (file)
--- a/lisp/emacs-lisp/derived.el
+++ b/lisp/emacs-lisp/derived.el
@@ -220,7 +220,7 @@ No problems result if this variable is not bound.
        (with-no-warnings (defvar ,map (make-sparse-keymap)))
        (unless (get ',map 'variable-documentation)
         (put ',map 'variable-documentation
-             (purecopy ,(format "Keymap for `%s'." child))))
+              ,(format "Keymap for `%s'." child)))
        ,(if declare-syntax
            `(progn
                (defvar ,syntax)
@@ -229,7 +229,7 @@ No problems result if this variable is not bound.
                 (defvar ,syntax (make-syntax-table)))
               (unless (get ',syntax 'variable-documentation)
                 (put ',syntax 'variable-documentation
-                     (purecopy ,(format "Syntax table for `%s'." child))))))
+                      ,(format "Syntax table for `%s'." child)))))
        ,(if declare-abbrev
            `(progn
                (defvar ,abbrev)
@@ -239,7 +239,7 @@ No problems result if this variable is not bound.
                   (progn (define-abbrev-table ',abbrev nil) ,abbrev)))
               (unless (get ',abbrev 'variable-documentation)
                 (put ',abbrev 'variable-documentation
-                     (purecopy ,(format "Abbrev table for `%s'." child))))))
+                      ,(format "Abbrev table for `%s'." child)))))
        (if (fboundp 'derived-mode-set-parent) ;; Emacs≥30.1
            (derived-mode-set-parent ',child ',parent)
          (put ',child 'derived-mode-parent ',parent))

diff --git a/lisp/emacs-lisp/easy-mmode.el b/lisp/emacs-lisp/easy-mmode.el
index 912684a8980e90e55a19e42cd4619b47ff94643d..d583b61b2a6e89d0312a216288f3b10472a7506e 100644 (file)
--- a/lisp/emacs-lisp/easy-mmode.el
+++ b/lisp/emacs-lisp/easy-mmode.el
@@ -268,7 +268,7 @@ INIT-VALUE LIGHTER KEYMAP.
       (setq body (cdr body))
       (pcase keyw
        (:init-value (setq init-value (pop body)))
-       (:lighter (setq lighter (purecopy (pop body))))
+        (:lighter (setq lighter (pop body)))
        (:global (setq globalp (pop body))
                  (when (and globalp (symbolp mode))
                    (setq setter `(setq-default ,mode))

diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 407fc58d2ab8f7c003be3bf7e7b47a913bc5edfe..7f60f47e6475399928c632da405da6d6a6d88474 100644 (file)
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -78,7 +78,7 @@ If nil, truncated messages will just have \"...\" to indicate truncation."
   :version "28.1")
 
 ;;;###autoload
-(defcustom eldoc-minor-mode-string (purecopy " ElDoc")
+(defcustom eldoc-minor-mode-string " ElDoc"
   "String to display in mode line when ElDoc Mode is enabled; nil for none."
   :type '(choice string (const :tag "None" nil)))
 

diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el
index c236129d4508f8159fc1d3a731149d0856e1e911..5ec21195ab77550494baeb9f53a0ca6fb69caab5 100644 (file)
--- a/lisp/emacs-lisp/gv.el
+++ b/lisp/emacs-lisp/gv.el
@@ -182,7 +182,7 @@ If CURRENT-NAME is a string, that is the `use instead' message.
 WHEN should be a string indicating when the variable was first
 made obsolete, for example a date or a release number."
   (put obsolete-name 'byte-obsolete-generalized-variable
-       (purecopy (list current-name when)))
+       (list current-name when))
   obsolete-name)
 
 ;; Additions for `declare'.  We specify the values as named aliases so

diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el
index 9c1fe4efdcd28b7bba2f2fdfe6bfddada8897b03..7b0b10ba0550101896f9c2cce6ac571fc760ddab 100644 (file)
--- a/lisp/emacs-lisp/lisp-mode.el
+++ b/lisp/emacs-lisp/lisp-mode.el
@@ -94,68 +94,68 @@
 (defvar lisp-imenu-generic-expression
   (list
    (list nil
-        (purecopy (concat "^\\s-*("
-                          (regexp-opt
-                           '("defun" "defmacro"
-                              ;; Elisp.
-                              "defun*" "defsubst" "define-inline"
-                             "define-advice" "defadvice" "define-skeleton"
-                             "define-compilation-mode" "define-minor-mode"
-                             "define-global-minor-mode"
-                             "define-globalized-minor-mode"
-                             "define-derived-mode" "define-generic-mode"
-                             "ert-deftest"
-                             "cl-defun" "cl-defsubst" "cl-defmacro"
-                             "cl-define-compiler-macro" "cl-defgeneric"
-                             "cl-defmethod"
-                              ;; CL.
-                             "define-compiler-macro" "define-modify-macro"
-                             "defsetf" "define-setf-expander"
-                             "define-method-combination"
-                              ;; CLOS and EIEIO
-                             "defgeneric" "defmethod")
-                            t)
-                          "\\s-+\\(" (rx lisp-mode-symbol) "\\)"))
+         (concat "^\\s-*("
+                 (regexp-opt
+                  '("defun" "defmacro"
+                    ;; Elisp.
+                    "defun*" "defsubst" "define-inline"
+                    "define-advice" "defadvice" "define-skeleton"
+                    "define-compilation-mode" "define-minor-mode"
+                    "define-global-minor-mode"
+                    "define-globalized-minor-mode"
+                    "define-derived-mode" "define-generic-mode"
+                    "ert-deftest"
+                    "cl-defun" "cl-defsubst" "cl-defmacro"
+                    "cl-define-compiler-macro" "cl-defgeneric"
+                    "cl-defmethod"
+                    ;; CL.
+                    "define-compiler-macro" "define-modify-macro"
+                    "defsetf" "define-setf-expander"
+                    "define-method-combination"
+                    ;; CLOS and EIEIO
+                    "defgeneric" "defmethod")
+                  t)
+                 "\\s-+\\(" (rx lisp-mode-symbol) "\\)")
         2)
    ;; Like the previous, but uses a quoted symbol as the name.
    (list nil
-        (purecopy (concat "^\\s-*("
-                          (regexp-opt
-                           '("defalias" "define-obsolete-function-alias")
-                            t)
-                          "\\s-+'\\(" (rx lisp-mode-symbol) "\\)"))
+         (concat "^\\s-*("
+                 (regexp-opt
+                  '("defalias" "define-obsolete-function-alias")
+                  t)
+                 "\\s-+'\\(" (rx lisp-mode-symbol) "\\)")
         2)
-   (list (purecopy "Variables")
-        (purecopy (concat "^\\s-*("
-                          (regexp-opt
-                           '(;; Elisp
-                              "defconst" "defcustom" "defvar-keymap"
-                              ;; CL
-                              "defconstant"
-                             "defparameter" "define-symbol-macro")
-                            t)
-                          "\\s-+\\(" (rx lisp-mode-symbol) "\\)"))
+   (list "Variables"
+         (concat "^\\s-*("
+                 (regexp-opt
+                  '(;; Elisp
+                    "defconst" "defcustom" "defvar-keymap"
+                    ;; CL
+                    "defconstant"
+                    "defparameter" "define-symbol-macro")
+                  t)
+                 "\\s-+\\(" (rx lisp-mode-symbol) "\\)")
         2)
    ;; For `defvar'/`defvar-local', we ignore (defvar FOO) constructs.
-   (list (purecopy "Variables")
-        (purecopy (concat "^\\s-*(defvar\\(?:-local\\)?\\s-+\\("
-                           (rx lisp-mode-symbol) "\\)"
-                          "[[:space:]\n]+[^)]"))
+   (list "Variables"
+         (concat "^\\s-*(defvar\\(?:-local\\)?\\s-+\\("
+                 (rx lisp-mode-symbol) "\\)"
+                 "[[:space:]\n]+[^)]")
         1)
-   (list (purecopy "Types")
-        (purecopy (concat "^\\s-*("
-                          (regexp-opt
-                           '(;; Elisp
-                              "defgroup" "deftheme"
-                              "define-widget" "define-error"
-                             "defface" "cl-deftype" "cl-defstruct"
-                              ;; CL
-                              "deftype" "defstruct"
-                             "define-condition" "defpackage"
-                              ;; CLOS and EIEIO
-                              "defclass")
-                            t)
-                          "\\s-+'?\\(" (rx lisp-mode-symbol) "\\)"))
+   (list "Types"
+         (concat "^\\s-*("
+                 (regexp-opt
+                  '(;; Elisp
+                    "defgroup" "deftheme"
+                    "define-widget" "define-error"
+                    "defface" "cl-deftype" "cl-defstruct"
+                    ;; CL
+                    "deftype" "defstruct"
+                    "define-condition" "defpackage"
+                    ;; CLOS and EIEIO
+                    "defclass")
+                  t)
+                 "\\s-+'?\\(" (rx lisp-mode-symbol) "\\)")
         2))
 
   "Imenu generic expression for Lisp mode.  See `imenu-generic-expression'.")

diff --git a/lisp/emacs-lisp/loaddefs-gen.el b/lisp/emacs-lisp/loaddefs-gen.el
index 0f136df1fe2cc7661117bea0696fea3736a3401e..f7a153371dd9a07b34974cd11fa851f5627256ec 100644 (file)
--- a/lisp/emacs-lisp/loaddefs-gen.el
+++ b/lisp/emacs-lisp/loaddefs-gen.el
@@ -441,7 +441,7 @@ don't include."
                                        (file-name-sans-extension
                                         (file-name-nondirectory file)))))
             (push (list (or local-outfile main-outfile) file
-                        `(push (purecopy ',(cons (intern package) version))
+                        `(push ',(cons (intern package) version)
                                package--builtin-versions))
                   defs))))
 

diff --git a/lisp/emacs-lisp/warnings.el b/lisp/emacs-lisp/warnings.el
index f83e8d42fac2cd2e62950882a00b17692c9fb7b9..897dbc2ffb7f3c63d39522f22a0c1bea6bfaa429 100644 (file)
--- a/lisp/emacs-lisp/warnings.el
+++ b/lisp/emacs-lisp/warnings.el
@@ -172,7 +172,7 @@ also call that function before the next warning.")
 ;; safely, testing the existing value, before they call one of the
 ;; warnings functions.
 ;;;###autoload
-(defvar warning-type-format (purecopy " (%s)")
+(defvar warning-type-format " (%s)"
   "Format for displaying the warning type in the warning message.
 The result of formatting the type this way gets included in the
 message under the control of the string in `warning-levels'.")