undo 2011-02-01T18:15:18Z!sds@gnu.org (purecopy-cons, purecopy-car) at Stefan Monnier's request

9 files changed, 16 insertions, 31 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d4f9358f2ef..5bed23d3059 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -31,19 +31,6 @@
 	Inherit from `special-mode-map'.
 	* vc/log-view.el (log-view-mode-map): Add a comment.
 
-2011-02-01  Sam Steingold  <sds@gnu.org>
-
-	* subr.el (purecopy-cons, purecopy-car): Add shortcuts.
-	* faces.el (face-x-resources): Use `purecopy-cons'.
-	* files.el (auto-mode-alist, interpreter-mode-alist): Use
-	`purecopy-car'.
-	* international/fontset.el (font-encoding-alist): Ditto.
-	* international/mule-conf.el (file-coding-system-alist): Ditto.
-	* international/mule.el (auto-coding-alist)
-	(auto-coding-regexp-alist): Ditto.
-	* mouse.el (mouse-buffer-menu-mode-groups): Use `purecopy-cons'.
-	* term/x-win.el (x-gtk-stock-map): Ditto.
-
 2011-02-01  Chong Yidong  <cyd@stupidchicken.com>
 
 	* custom.el (load-theme): Define return value.  Drop use of
diff --git a/lisp/faces.el b/lisp/faces.el
index 9d6d3416c01..a9d26de604b 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -261,7 +261,8 @@ If FRAME is omitted or nil, use the selected frame."
   (mapcar
    (lambda (arg)
      ;; FIXME; can we purecopy some of the conses too?
-     (cons (car arg) (purecopy-cons (cdr arg))))
+     (cons (car arg)
+	   (cons (purecopy (car (cdr arg))) (purecopy (cdr (cdr arg))))))
   '((:family (".attributeFamily" . "Face.AttributeFamily"))
     (:foundry (".attributeFoundry" . "Face.AttributeFoundry"))
     (:width (".attributeWidth" . "Face.AttributeWidth"))
diff --git a/lisp/files.el b/lisp/files.el
index 220870588fb..8b42eaaddb8 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -2229,7 +2229,8 @@ since only a single case-insensitive search through the alist is made."
   ;; directives in that file.  That way is discouraged since it
   ;; spreads out the definition of the initial value.
   (mapcar
-   'purecopy-car
+   (lambda (elt)
+     (cons (purecopy (car elt)) (cdr elt)))
    `(;; do this first, so that .html.pl is Polish html, not Perl
      ("\\.[sx]?html?\\(\\.[a-zA-Z_]+\\)?\\'" . html-mode)
      ("\\.svgz?\\'" . image-mode)
@@ -2453,7 +2454,8 @@ and `magic-mode-alist', which determines modes based on file contents.")
   ;; file.  That way is discouraged since it spreads out the
   ;; definition of the initial value.
   (mapcar
-   'purecopy-car
+   (lambda (l)
+     (cons (purecopy (car l)) (cdr l)))
    '(("perl" . perl-mode)
      ("perl5" . perl-mode)
      ("miniperl" . perl-mode)
diff --git a/lisp/international/fontset.el b/lisp/international/fontset.el
index da82a15468b..777779e5ec5 100644
--- a/lisp/international/fontset.el
+++ b/lisp/international/fontset.el
@@ -33,7 +33,8 @@
 ;; Setup font-encoding-alist for all known encodings.
 
 (setq font-encoding-alist
-      (mapcar 'purecopy-car
+      (mapcar (lambda (arg)
+		(cons (purecopy (car arg)) (cdr arg)))
       '(("iso8859-1$" . iso-8859-1)
 	("iso8859-2$" . iso-8859-2)
 	("iso8859-3$" . iso-8859-3)
diff --git a/lisp/international/mule-conf.el b/lisp/international/mule-conf.el
index 55a96b6cca1..9ba95e4d11a 100644
--- a/lisp/international/mule-conf.el
+++ b/lisp/international/mule-conf.el
@@ -1505,7 +1505,7 @@ for decoding and encoding files, process I/O, etc."
 ;; Tar files are not decoded at all, but we treat them as raw bytes.
 
 (setq file-coding-system-alist
-      (mapcar 'purecopy-car
+      (mapcar (lambda (arg) (cons (purecopy (car arg)) (cdr arg)))
       '(("\\.elc\\'" . utf-8-emacs)
 	("\\.utf\\(-8\\)?\\'" . utf-8)
 	("\\.xml\\'" . xml-find-file-coding-system)
diff --git a/lisp/international/mule.el b/lisp/international/mule.el
index 2da15b5f9bd..4a387a233a0 100644
--- a/lisp/international/mule.el
+++ b/lisp/international/mule.el
@@ -1671,11 +1671,11 @@ in-place."
 (defcustom auto-coding-alist
   ;; .exe and .EXE are added to support archive-mode looking at DOS
   ;; self-extracting exe archives.
-  (mapcar 'purecopy-car
-   '(("\\.\\(\
+  (mapcar (lambda (arg) (cons (purecopy (car arg)) (cdr arg)))
+	  '(("\\.\\(\
 arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|rar\\|7z\\|\
 ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|7Z\\)\\'"
-      . no-conversion-multibyte)
+     . no-conversion-multibyte)
     ("\\.\\(exe\\|EXE\\)\\'" . no-conversion)
     ("\\.\\(sx[dmicw]\\|odt\\|tar\\|tgz\\)\\'" . no-conversion)
     ("\\.\\(gz\\|Z\\|bz\\|bz2\\|xz\\|gpg\\)\\'" . no-conversion)
@@ -1696,7 +1696,7 @@ and the contents of `file-coding-system-alist'."
 		       (symbol :tag "Coding system"))))
 
 (defcustom auto-coding-regexp-alist
-  (mapcar 'purecopy-car
+  (mapcar (lambda (arg) (cons (purecopy (car arg)) (cdr arg)))
   '(("\\`BABYL OPTIONS:[ \t]*-\\*-[ \t]*rmail[ \t]*-\\*-" . no-conversion)
     ("\\`\xFE\xFF" . utf-16be-with-signature)
     ("\\`\xFF\xFE" . utf-16le-with-signature)
diff --git a/lisp/mouse.el b/lisp/mouse.el
index 45a43bb9aee..c0b86d45028 100644
--- a/lisp/mouse.el
+++ b/lisp/mouse.el
@@ -1719,7 +1719,7 @@ a large number if you prefer a mixed multitude.  The default is 4."
   :version "20.3")
 
 (defvar mouse-buffer-menu-mode-groups
-  (mapcar 'purecopy-cons
+  (mapcar (lambda (arg) (cons  (purecopy (car arg)) (purecopy (cdr arg))))
   '(("Info\\|Help\\|Apropos\\|Man" . "Help")
     ("\\bVM\\b\\|\\bMH\\b\\|Message\\|Mail\\|Group\\|Score\\|Summary\\|Article"
      . "Mail/News")
diff --git a/lisp/subr.el b/lisp/subr.el
index 2eca62c0e45..3330fa20379 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -2320,13 +2320,6 @@ BEG and END default respectively to the beginning and end of buffer."
 
 ;;;; Miscellanea.
 
-(defun purecopy-cons (arg)
-  "Return a copy of ARG from a `purecopy' of the car and cdr of ARG."
-  (cons (purecopy (car arg)) (purecopy (cdr arg))))
-(defun purecopy-car (arg)
-  "Return a copy of ARG whose car is a `purecopy' of the car of ARG."
-  (cons (purecopy (car arg)) (cdr arg)))
-
 (defvar suspend-hook nil
   "Normal hook run by `suspend-emacs', before suspending.")
 
diff --git a/lisp/term/x-win.el b/lisp/term/x-win.el
index c966fc561cb..1ec80d5c277 100644
--- a/lisp/term/x-win.el
+++ b/lisp/term/x-win.el
@@ -1447,7 +1447,8 @@ Request data types in the order specified by `x-select-request-type'."
 (define-key special-event-map [drag-n-drop] 'x-dnd-handle-drag-n-drop-event)
 
 (defcustom x-gtk-stock-map
-  (mapcar 'purecopy-cons
+  (mapcar (lambda (arg)
+	    (cons (purecopy (car arg)) (purecopy (cdr arg))))
   '(
     ("etc/images/new" . "gtk-new")
     ("etc/images/open" . "gtk-open")