From: Stefan Kangas Date: Mon, 9 Dec 2024 19:44:23 +0000 (+0100) Subject: Don't call purecopy in vc/*.el X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=55f2c34bdc37a6b76a5e1918ca46c2d1ae8c458c;p=emacs.git Don't call purecopy in vc/*.el * lisp/vc/diff.el (diff-command, diff-switches): * lisp/vc/ediff-hook.el (menu-bar-ediff-misc-menu) (menu-bar-epatch-menu, menu-bar-ediff-merge-menu) (menu-bar-ediff-menu): * lisp/vc/pcvs-defs.el (cvs-global-menu): * lisp/vc/vc-hooks.el (vc-menu-entry) (vc-directory-exclusion-list): * lisp/vc/vc-rcs.el (vc-rcs-master-templates): * lisp/vc/vc-sccs.el (vc-sccs-master-templates): * lisp/vc/vc-src.el (vc-src-master-templates): Remove calls to purecopy. (cherry picked from commit 8bd246d87ea9cf02cab0a229e89b1648e9462c2e) --- diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el index 7fc17250147..57146420b2a 100644 --- a/lisp/vc/diff.el +++ b/lisp/vc/diff.el @@ -38,7 +38,7 @@ :group 'tools) ;;;###autoload -(defcustom diff-switches (purecopy "-u") +(defcustom diff-switches "-u" "A string or list of strings specifying switches to be passed to diff. This variable is also used in the `vc-diff' command (and related @@ -48,7 +48,7 @@ set (`vc-git-diff-switches' for git, for instance), and :type '(choice string (repeat string))) ;;;###autoload -(defcustom diff-command (purecopy "diff") +(defcustom diff-command "diff" "The command to use to run diff." :type 'string) diff --git a/lisp/vc/ediff-hook.el b/lisp/vc/ediff-hook.el index 296141e7ef4..87fd8e4f066 100644 --- a/lisp/vc/ediff-hook.el +++ b/lisp/vc/ediff-hook.el @@ -52,108 +52,108 @@ ;; define ediff compare menu (define-key menu-bar-ediff-menu [ediff-misc] - `(menu-item ,(purecopy "Ediff Miscellanea") menu-bar-ediff-misc-menu)) + '(menu-item "Ediff Miscellanea" menu-bar-ediff-misc-menu)) (define-key menu-bar-ediff-menu [separator-ediff-misc] menu-bar-separator) (define-key menu-bar-ediff-menu [window] - `(menu-item ,(purecopy "This Window and Next Window") compare-windows - :help ,(purecopy "Compare the current window and the next window"))) + '(menu-item "This Window and Next Window" compare-windows + :help "Compare the current window and the next window")) (define-key menu-bar-ediff-menu [ediff-windows-linewise] - `(menu-item ,(purecopy "Windows Line-by-line...") ediff-windows-linewise - :help ,(purecopy "Compare windows line-wise"))) + '(menu-item "Windows Line-by-line..." ediff-windows-linewise + :help "Compare windows line-wise")) (define-key menu-bar-ediff-menu [ediff-windows-wordwise] - `(menu-item ,(purecopy "Windows Word-by-word...") ediff-windows-wordwise - :help ,(purecopy "Compare windows word-wise"))) + '(menu-item "Windows Word-by-word..." ediff-windows-wordwise + :help "Compare windows word-wise")) (define-key menu-bar-ediff-menu [separator-ediff-windows] menu-bar-separator) (define-key menu-bar-ediff-menu [ediff-regions-linewise] - `(menu-item ,(purecopy "Regions Line-by-line...") ediff-regions-linewise - :help ,(purecopy "Compare regions line-wise"))) + '(menu-item "Regions Line-by-line..." ediff-regions-linewise + :help "Compare regions line-wise")) (define-key menu-bar-ediff-menu [ediff-regions-wordwise] - `(menu-item ,(purecopy "Regions Word-by-word...") ediff-regions-wordwise - :help ,(purecopy "Compare regions word-wise"))) + '(menu-item "Regions Word-by-word..." ediff-regions-wordwise + :help "Compare regions word-wise")) (define-key menu-bar-ediff-menu [separator-ediff-regions] menu-bar-separator) (define-key menu-bar-ediff-menu [ediff-dir-revision] - `(menu-item ,(purecopy "Directory Revisions...") ediff-directory-revisions - :help ,(purecopy "Compare directory files with their older versions"))) + '(menu-item "Directory Revisions..." ediff-directory-revisions + :help "Compare directory files with their older versions")) (define-key menu-bar-ediff-menu [ediff-revision] - `(menu-item ,(purecopy "File with Revision...") ediff-revision - :help ,(purecopy "Compare file with its older versions"))) + '(menu-item "File with Revision..." ediff-revision + :help "Compare file with its older versions")) (define-key menu-bar-ediff-menu [separator-ediff-directories] menu-bar-separator) (define-key menu-bar-ediff-menu [ediff-directories3] - `(menu-item ,(purecopy "Three Directories...") ediff-directories3 - :help ,(purecopy "Compare files common to three directories simultaneously"))) + '(menu-item "Three Directories..." ediff-directories3 + :help "Compare files common to three directories simultaneously")) (define-key menu-bar-ediff-menu [ediff-directories] - `(menu-item ,(purecopy "Two Directories...") ediff-directories - :help ,(purecopy "Compare files common to two directories simultaneously"))) + '(menu-item "Two Directories..." ediff-directories + :help "Compare files common to two directories simultaneously")) (define-key menu-bar-ediff-menu [separator-ediff-files] menu-bar-separator) (define-key menu-bar-ediff-menu [ediff-buffers3] - `(menu-item ,(purecopy "Three Buffers...") ediff-buffers3 - :help ,(purecopy "Compare three buffers simultaneously"))) + '(menu-item "Three Buffers..." ediff-buffers3 + :help "Compare three buffers simultaneously")) (define-key menu-bar-ediff-menu [ediff-files3] - `(menu-item ,(purecopy "Three Files...") ediff-files3 - :help ,(purecopy "Compare three files simultaneously"))) + '(menu-item "Three Files..." ediff-files3 + :help "Compare three files simultaneously")) (define-key menu-bar-ediff-menu [ediff-buffers] - `(menu-item ,(purecopy "Two Buffers...") ediff-buffers - :help ,(purecopy "Compare two buffers simultaneously"))) + '(menu-item "Two Buffers..." ediff-buffers + :help "Compare two buffers simultaneously")) (define-key menu-bar-ediff-menu [ediff-files] - `(menu-item ,(purecopy "Two Files...") ediff-files - :help ,(purecopy "Compare two files simultaneously"))) + '(menu-item "Two Files..." ediff-files + :help "Compare two files simultaneously")) ;; define ediff merge menu (define-key menu-bar-ediff-merge-menu [ediff-merge-dir-revisions-with-ancestor] - `(menu-item ,(purecopy "Directory Revisions with Ancestor...") + '(menu-item "Directory Revisions with Ancestor..." ediff-merge-directory-revisions-with-ancestor - :help ,(purecopy "Merge versions of the files in the same directory by comparing the files with common ancestors"))) + :help "Merge versions of the files in the same directory by comparing the files with common ancestors")) (define-key menu-bar-ediff-merge-menu [ediff-merge-dir-revisions] - `(menu-item ,(purecopy "Directory Revisions...") ediff-merge-directory-revisions - :help ,(purecopy "Merge versions of the files in the same directory (without using ancestor information)"))) + '(menu-item "Directory Revisions..." ediff-merge-directory-revisions + :help "Merge versions of the files in the same directory (without using ancestor information)")) (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions-with-ancestor] - `(menu-item ,(purecopy "Revisions with Ancestor...") + '(menu-item "Revisions with Ancestor..." ediff-merge-revisions-with-ancestor - :help ,(purecopy "Merge versions of the same file by comparing them with a common ancestor"))) + :help "Merge versions of the same file by comparing them with a common ancestor")) (define-key menu-bar-ediff-merge-menu [ediff-merge-revisions] - `(menu-item ,(purecopy "Revisions...") ediff-merge-revisions - :help ,(purecopy "Merge versions of the same file (without using ancestor information)"))) + '(menu-item "Revisions..." ediff-merge-revisions + :help "Merge versions of the same file (without using ancestor information)")) (define-key menu-bar-ediff-merge-menu [separator-ediff-merge] menu-bar-separator) (define-key menu-bar-ediff-merge-menu [ediff-merge-directories-with-ancestor] - `(menu-item ,(purecopy "Directories with Ancestor...") + '(menu-item "Directories with Ancestor..." ediff-merge-directories-with-ancestor - :help ,(purecopy "Merge files common to a pair of directories by comparing the files with common ancestors"))) + :help "Merge files common to a pair of directories by comparing the files with common ancestors")) (define-key menu-bar-ediff-merge-menu [ediff-merge-directories] - `(menu-item ,(purecopy "Directories...") ediff-merge-directories - :help ,(purecopy "Merge files common to a pair of directories"))) + '(menu-item "Directories..." ediff-merge-directories + :help "Merge files common to a pair of directories")) (define-key menu-bar-ediff-merge-menu [separator-ediff-merge-dirs] menu-bar-separator) (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers-with-ancestor] - `(menu-item ,(purecopy "Buffers with Ancestor...") ediff-merge-buffers-with-ancestor - :help ,(purecopy "Merge buffers by comparing their contents with a common ancestor"))) + '(menu-item "Buffers with Ancestor..." ediff-merge-buffers-with-ancestor + :help "Merge buffers by comparing their contents with a common ancestor")) (define-key menu-bar-ediff-merge-menu [ediff-merge-buffers] - `(menu-item ,(purecopy "Buffers...") ediff-merge-buffers - :help ,(purecopy "Merge buffers (without using ancestor information)"))) + '(menu-item "Buffers..." ediff-merge-buffers + :help "Merge buffers (without using ancestor information)")) (define-key menu-bar-ediff-merge-menu [ediff-merge-files-with-ancestor] - `(menu-item ,(purecopy "Files with Ancestor...") ediff-merge-files-with-ancestor - :help ,(purecopy "Merge files by comparing them with a common ancestor"))) + '(menu-item "Files with Ancestor..." ediff-merge-files-with-ancestor + :help "Merge files by comparing them with a common ancestor")) (define-key menu-bar-ediff-merge-menu [ediff-merge-files] - `(menu-item ,(purecopy "Files...") ediff-merge-files - :help ,(purecopy "Merge files (without using ancestor information)"))) + '(menu-item "Files..." ediff-merge-files + :help "Merge files (without using ancestor information)")) ;; define epatch menu (define-key menu-bar-epatch-menu [ediff-patch-buffer] - `(menu-item ,(purecopy "To a Buffer...") ediff-patch-buffer - :help ,(purecopy "Apply a patch to the contents of a buffer"))) + '(menu-item "To a Buffer..." ediff-patch-buffer + :help "Apply a patch to the contents of a buffer")) (define-key menu-bar-epatch-menu [ediff-patch-file] - `(menu-item ,(purecopy "To a File...") ediff-patch-file - :help ,(purecopy "Apply a patch to a file"))) + '(menu-item "To a File..." ediff-patch-file + :help "Apply a patch to a file")) ;; define ediff miscellanea (define-key menu-bar-ediff-misc-menu [emultiframe] - `(menu-item ,(purecopy "Use separate control buffer frame") + '(menu-item "Use separate control buffer frame" ediff-toggle-multiframe - :help ,(purecopy "Switch between the single-frame presentation mode and the multi-frame mode") + :help "Switch between the single-frame presentation mode and the multi-frame mode" :button (:toggle . (eq (bound-and-true-p ediff-window-setup-function) #'ediff-setup-windows-multiframe)))) ;; FIXME: Port XEmacs's toolbar support! @@ -163,14 +163,14 @@ ;; :selected (if (featurep 'ediff-tbar) ;; (ediff-use-toolbar-p))] (define-key menu-bar-ediff-misc-menu [eregistry] - `(menu-item ,(purecopy "List Ediff Sessions") ediff-show-registry - :help ,(purecopy "List all active Ediff sessions; it is a convenient way to find and resume such a session"))) + '(menu-item "List Ediff Sessions" ediff-show-registry + :help "List all active Ediff sessions; it is a convenient way to find and resume such a session")) (define-key menu-bar-ediff-misc-menu [ediff-cust] - `(menu-item ,(purecopy "Customize Ediff") ediff-customize - :help ,(purecopy "Change some of the parameters that govern the behavior of Ediff"))) + '(menu-item "Customize Ediff" ediff-customize + :help "Change some of the parameters that govern the behavior of Ediff")) (define-key menu-bar-ediff-misc-menu [ediff-doc] - `(menu-item ,(purecopy "Ediff Manual") ediff-documentation - :help ,(purecopy "Bring up the Ediff manual"))) + '(menu-item "Ediff Manual" ediff-documentation + :help "Bring up the Ediff manual")) (provide 'ediff-hook) ;;; ediff-hook.el ends here diff --git a/lisp/vc/pcvs-defs.el b/lisp/vc/pcvs-defs.el index 3f62c1692f1..d32b6633bda 100644 --- a/lisp/vc/pcvs-defs.el +++ b/lisp/vc/pcvs-defs.el @@ -292,17 +292,17 @@ It is expected to call the function.") (defvar cvs-global-menu (let ((m (make-sparse-keymap "PCL-CVS"))) (define-key m [status] - `(menu-item ,(purecopy "Directory Status") cvs-status - :help ,(purecopy "A more verbose status of a workarea"))) + '(menu-item "Directory Status" cvs-status + :help "A more verbose status of a workarea")) (define-key m [checkout] - `(menu-item ,(purecopy "Checkout Module") cvs-checkout - :help ,(purecopy "Check out a module from the repository"))) + '(menu-item "Checkout Module" cvs-checkout + :help "Check out a module from the repository")) (define-key m [update] - `(menu-item ,(purecopy "Update Directory") cvs-update - :help ,(purecopy "Fetch updates from the repository"))) + '(menu-item "Update Directory" cvs-update + :help "Fetch updates from the repository")) (define-key m [examine] - `(menu-item ,(purecopy "Examine Directory") cvs-examine - :help ,(purecopy "Examine the current state of a workarea"))) + '(menu-item "Examine Directory" cvs-examine + :help "Examine the current state of a workarea")) (fset 'cvs-global-menu m)) "Global menu used by PCL-CVS.") diff --git a/lisp/vc/vc-hooks.el b/lisp/vc/vc-hooks.el index daace48c5ea..49434ed22fe 100644 --- a/lisp/vc/vc-hooks.el +++ b/lisp/vc/vc-hooks.el @@ -121,9 +121,9 @@ An empty list disables VC altogether." ;; Note: we don't actually have a darcs back end yet. Also, Arch and ;; Repo are unsupported, and the Meta-CVS back end has been removed. ;; The Arch back end will be retrieved and fixed if it is ever required. -(defcustom vc-directory-exclusion-list (purecopy '("SCCS" "RCS" "CVS" "MCVS" +(defcustom vc-directory-exclusion-list '("SCCS" "RCS" "CVS" "MCVS" ".src" ".svn" ".git" ".hg" ".bzr" - "_MTN" "_darcs" "{arch}" ".repo")) + "_MTN" "_darcs" "{arch}") "List of directory names to be ignored when walking directory trees." :type '(repeat string) :group 'vc) @@ -683,7 +683,7 @@ Before doing that, check if there are any old backups and get rid of them." (vc-dir-resynch-file file)))) (defvar vc-menu-entry - `(menu-item ,(purecopy "Version Control") vc-menu-map + '(menu-item "Version Control" vc-menu-map :filter vc-menu-map-filter)) (when (boundp 'menu-bar-tools-menu) diff --git a/lisp/vc/vc-rcs.el b/lisp/vc/vc-rcs.el index 07c7f37cbe5..2a6c8d925b1 100644 --- a/lisp/vc/vc-rcs.el +++ b/lisp/vc/vc-rcs.el @@ -96,7 +96,7 @@ to use --brief and sets this variable to remember whether it worked." ;; for a registered backend without loading every backend. ;;;###autoload (defcustom vc-rcs-master-templates - (purecopy '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s")) + '("%sRCS/%s,v" "%s%s,v" "%sRCS/%s") "Where to look for RCS master files. For a description of possible values, see `vc-check-master-templates'." :type '(choice (const :tag "Use standard RCS file names" diff --git a/lisp/vc/vc-sccs.el b/lisp/vc/vc-sccs.el index 4501dd254a8..40feafd9c48 100644 --- a/lisp/vc/vc-sccs.el +++ b/lisp/vc/vc-sccs.el @@ -77,7 +77,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." ;; for a registered backend without loading every backend. ;;;###autoload (defcustom vc-sccs-master-templates - (purecopy '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir)) + '("%sSCCS/s.%s" "%ss.%s" vc-sccs-search-project-dir) "Where to look for SCCS master files. For a description of possible values, see `vc-check-master-templates'." :type '(choice (const :tag "Use standard SCCS file names" diff --git a/lisp/vc/vc-src.el b/lisp/vc/vc-src.el index 5b7d2ad132f..f9551165363 100644 --- a/lisp/vc/vc-src.el +++ b/lisp/vc/vc-src.el @@ -116,7 +116,7 @@ If nil, use the value of `vc-diff-switches'. If t, use no switches." ;; for a registered backend without loading every backend. ;;;###autoload (defcustom vc-src-master-templates - (purecopy '("%s.src/%s,v")) + '("%s.src/%s,v") "Where to look for SRC master files. For a description of possible values, see `vc-check-master-templates'." :type '(choice (const :tag "Use standard SRC file names"