From e7a395b5128e98dd9b65f71ccb6c4655253116d6 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Sat, 2 Apr 2011 12:01:52 -0700 Subject: [PATCH] Remove some unnecessary purecopy's from find-dired. * lisp/find-dired.el (find-ls-option, find-ls-subdir-switches) (find-grep-options, find-name-arg): Remove purecopy. --- lisp/ChangeLog | 3 ++- lisp/find-dired.el | 14 +++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 95e25aeb6d8..77497f5c01a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,7 +1,8 @@ 2011-04-02 Glenn Morris * find-dired.el (find-ls-option, find-ls-subdir-switches) - (find-grep-options): Do not autoload these defcustoms. + (find-grep-options): Do not autoload these defcustoms, remove purecopy. + (find-name-arg): Remove purecopy. * progmodes/grep.el (grep-find-use-xargs): Doc fix. (grep-compute-defaults): Check for `-exec COMMAND +' support. diff --git a/lisp/find-dired.el b/lisp/find-dired.el index 081c44df811..d24a51edd35 100644 --- a/lisp/find-dired.el +++ b/lisp/find-dired.el @@ -36,8 +36,8 @@ ;; find's -ls corresponds to these switches. ;; Note -b, at least GNU find quotes spaces etc. in filenames (defcustom find-ls-option - (if (eq system-type 'berkeley-unix) (purecopy '("-ls" . "-gilsb")) - (purecopy '("-exec ls -ld {} \\;" . "-ld"))) + (if (eq system-type 'berkeley-unix) '("-ls" . "-gilsb") + '("-exec ls -ld {} \\;" . "-ld")) "Description of the option to `find' to produce an `ls -l'-type listing. This is a cons of two strings (FIND-OPTION . LS-SWITCHES). FIND-OPTION gives the option (or options) to `find' that produce the desired output. @@ -46,7 +46,7 @@ LS-SWITCHES is a list of `ls' switches to tell dired how to parse the output." (string :tag "Ls Switches")) :group 'find-dired) -(defcustom find-ls-subdir-switches (purecopy "-al") +(defcustom find-ls-subdir-switches "-al" "`ls' switches for inserting subdirectories in `*Find*' buffers. This should contain the \"-l\" switch. Use the \"-F\" or \"-b\" switches if and only if you also use @@ -56,10 +56,10 @@ them for `find-ls-option'." :version "22.1") (defcustom find-grep-options - (purecopy (if (or (eq system-type 'berkeley-unix) + (if (or (eq system-type 'berkeley-unix) (string-match "solaris2" system-configuration) (string-match "irix" system-configuration)) - "-s" "-q")) + "-s" "-q") "Option to grep to be as silent as possible. On Berkeley systems, this is `-s'; on Posix, and with GNU grep, `-q' does it. On other systems, the closest you can come is to use `-l'." @@ -68,9 +68,9 @@ On other systems, the closest you can come is to use `-l'." ;; This used to be autoloaded (see bug#4387). (defcustom find-name-arg - (purecopy (if read-file-name-completion-ignore-case + (if read-file-name-completion-ignore-case "-iname" - "-name")) + "-name") "Argument used to specify file name pattern. If `read-file-name-completion-ignore-case' is non-nil, -iname is used so that find also ignores case. Otherwise, -name is used." -- 2.11.4.GIT