[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r103076: undo 103071 (purecopy-cons,
From: |
Sam Steingold |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r103076: undo 103071 (purecopy-cons, purecopy-car) at Stefan Monnier's request |
Date: |
Tue, 01 Feb 2011 16:37:12 -0500 |
User-agent: |
Bazaar (2.0.3) |
------------------------------------------------------------
revno: 103076
committer: Sam Steingold <address@hidden>
branch nick: trunk
timestamp: Tue 2011-02-01 16:37:12 -0500
message:
undo 103071 (purecopy-cons, purecopy-car) at Stefan Monnier's request
modified:
lisp/ChangeLog
lisp/faces.el
lisp/files.el
lisp/international/fontset.el
lisp/international/mule-conf.el
lisp/international/mule.el
lisp/mouse.el
lisp/subr.el
lisp/term/x-win.el
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2011-02-01 21:22:21 +0000
+++ b/lisp/ChangeLog 2011-02-01 21:37:12 +0000
@@ -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 <address@hidden>
-
- * 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 <address@hidden>
* custom.el (load-theme): Define return value. Drop use of
=== modified file 'lisp/faces.el'
--- a/lisp/faces.el 2011-02-01 18:15:18 +0000
+++ b/lisp/faces.el 2011-02-01 21:37:12 +0000
@@ -261,7 +261,8 @@
(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"))
=== modified file 'lisp/files.el'
--- a/lisp/files.el 2011-02-01 18:15:18 +0000
+++ b/lisp/files.el 2011-02-01 21:37:12 +0000
@@ -2229,7 +2229,8 @@
;; 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 @@
;; 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)
=== modified file 'lisp/international/fontset.el'
--- a/lisp/international/fontset.el 2011-02-01 18:15:18 +0000
+++ b/lisp/international/fontset.el 2011-02-01 21:37:12 +0000
@@ -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)
=== modified file 'lisp/international/mule-conf.el'
--- a/lisp/international/mule-conf.el 2011-02-01 18:15:18 +0000
+++ b/lisp/international/mule-conf.el 2011-02-01 21:37:12 +0000
@@ -1505,7 +1505,7 @@
;; 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)
=== modified file 'lisp/international/mule.el'
--- a/lisp/international/mule.el 2011-02-01 18:15:18 +0000
+++ b/lisp/international/mule.el 2011-02-01 21:37:12 +0000
@@ -1671,11 +1671,11 @@
(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 @@
(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)
=== modified file 'lisp/mouse.el'
--- a/lisp/mouse.el 2011-02-01 18:15:18 +0000
+++ b/lisp/mouse.el 2011-02-01 21:37:12 +0000
@@ -1719,7 +1719,7 @@
: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")
=== modified file 'lisp/subr.el'
--- a/lisp/subr.el 2011-02-01 19:17:10 +0000
+++ b/lisp/subr.el 2011-02-01 21:37:12 +0000
@@ -2320,13 +2320,6 @@
;;;; 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.")
=== modified file 'lisp/term/x-win.el'
--- a/lisp/term/x-win.el 2011-02-01 18:15:18 +0000
+++ b/lisp/term/x-win.el 2011-02-01 21:37:12 +0000
@@ -1447,7 +1447,8 @@
(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")
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r103076: undo 103071 (purecopy-cons, purecopy-car) at Stefan Monnier's request,
Sam Steingold <=