Commit 0b75349e authored by Sam Steingold's avatar Sam Steingold
Browse files

* lisp/subr.el (purecopy-cons, purecopy-car): Add shortcuts.

* lisp/faces.el (face-x-resources): Use `purecopy-cons'.
* lisp/files.el (auto-mode-alist, interpreter-mode-alist): Use
`purecopy-car'.
* lisp/international/fontset.el (font-encoding-alist): Ditto.
* lisp/international/mule-conf.el (file-coding-system-alist): Ditto.
* lisp/international/mule.el (auto-coding-alist)
(auto-coding-regexp-alist): Ditto.
* lisp/mouse.el (mouse-buffer-menu-mode-groups): Use `purecopy-cons'.
* lisp/term/x-win.el (x-gtk-stock-map): Ditto.
parent 928f4e73
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> 2011-02-01 Chong Yidong <cyd@stupidchicken.com>
   
* custom.el (load-theme): Define return value. Drop use of * custom.el (load-theme): Define return value. Drop use of
......
...@@ -261,8 +261,7 @@ If FRAME is omitted or nil, use the selected frame." ...@@ -261,8 +261,7 @@ If FRAME is omitted or nil, use the selected frame."
(mapcar (mapcar
(lambda (arg) (lambda (arg)
;; FIXME; can we purecopy some of the conses too? ;; FIXME; can we purecopy some of the conses too?
(cons (car arg) (cons (car arg) (purecopy-cons (cdr arg))))
(cons (purecopy (car (cdr arg))) (purecopy (cdr (cdr arg))))))
'((:family (".attributeFamily" . "Face.AttributeFamily")) '((:family (".attributeFamily" . "Face.AttributeFamily"))
(:foundry (".attributeFoundry" . "Face.AttributeFoundry")) (:foundry (".attributeFoundry" . "Face.AttributeFoundry"))
(:width (".attributeWidth" . "Face.AttributeWidth")) (:width (".attributeWidth" . "Face.AttributeWidth"))
......
...@@ -2229,8 +2229,7 @@ since only a single case-insensitive search through the alist is made." ...@@ -2229,8 +2229,7 @@ since only a single case-insensitive search through the alist is made."
;; directives in that file. That way is discouraged since it ;; directives in that file. That way is discouraged since it
;; spreads out the definition of the initial value. ;; spreads out the definition of the initial value.
(mapcar (mapcar
(lambda (elt) 'purecopy-car
(cons (purecopy (car elt)) (cdr elt)))
`(;; do this first, so that .html.pl is Polish html, not Perl `(;; do this first, so that .html.pl is Polish html, not Perl
("\\.[sx]?html?\\(\\.[a-zA-Z_]+\\)?\\'" . html-mode) ("\\.[sx]?html?\\(\\.[a-zA-Z_]+\\)?\\'" . html-mode)
("\\.svgz?\\'" . image-mode) ("\\.svgz?\\'" . image-mode)
...@@ -2454,8 +2453,7 @@ and `magic-mode-alist', which determines modes based on file contents.") ...@@ -2454,8 +2453,7 @@ and `magic-mode-alist', which determines modes based on file contents.")
;; file. That way is discouraged since it spreads out the ;; file. That way is discouraged since it spreads out the
;; definition of the initial value. ;; definition of the initial value.
(mapcar (mapcar
(lambda (l) 'purecopy-car
(cons (purecopy (car l)) (cdr l)))
'(("perl" . perl-mode) '(("perl" . perl-mode)
("perl5" . perl-mode) ("perl5" . perl-mode)
("miniperl" . perl-mode) ("miniperl" . perl-mode)
......
...@@ -33,8 +33,7 @@ ...@@ -33,8 +33,7 @@
;; Setup font-encoding-alist for all known encodings. ;; Setup font-encoding-alist for all known encodings.
(setq font-encoding-alist (setq font-encoding-alist
(mapcar (lambda (arg) (mapcar 'purecopy-car
(cons (purecopy (car arg)) (cdr arg)))
'(("iso8859-1$" . iso-8859-1) '(("iso8859-1$" . iso-8859-1)
("iso8859-2$" . iso-8859-2) ("iso8859-2$" . iso-8859-2)
("iso8859-3$" . iso-8859-3) ("iso8859-3$" . iso-8859-3)
......
...@@ -1505,7 +1505,7 @@ for decoding and encoding files, process I/O, etc." ...@@ -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. ;; Tar files are not decoded at all, but we treat them as raw bytes.
(setq file-coding-system-alist (setq file-coding-system-alist
(mapcar (lambda (arg) (cons (purecopy (car arg)) (cdr arg))) (mapcar 'purecopy-car
'(("\\.elc\\'" . utf-8-emacs) '(("\\.elc\\'" . utf-8-emacs)
("\\.utf\\(-8\\)?\\'" . utf-8) ("\\.utf\\(-8\\)?\\'" . utf-8)
("\\.xml\\'" . xml-find-file-coding-system) ("\\.xml\\'" . xml-find-file-coding-system)
......
...@@ -1671,11 +1671,11 @@ in-place." ...@@ -1671,11 +1671,11 @@ in-place."
(defcustom auto-coding-alist (defcustom auto-coding-alist
;; .exe and .EXE are added to support archive-mode looking at DOS ;; .exe and .EXE are added to support archive-mode looking at DOS
;; self-extracting exe archives. ;; self-extracting exe archives.
(mapcar (lambda (arg) (cons (purecopy (car arg)) (cdr arg))) (mapcar 'purecopy-car
'(("\\.\\(\ '(("\\.\\(\
arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|rar\\|7z\\|\ arc\\|zip\\|lzh\\|lha\\|zoo\\|[jew]ar\\|xpi\\|rar\\|7z\\|\
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) ("\\.\\(exe\\|EXE\\)\\'" . no-conversion)
("\\.\\(sx[dmicw]\\|odt\\|tar\\|tgz\\)\\'" . no-conversion) ("\\.\\(sx[dmicw]\\|odt\\|tar\\|tgz\\)\\'" . no-conversion)
("\\.\\(gz\\|Z\\|bz\\|bz2\\|xz\\|gpg\\)\\'" . no-conversion) ("\\.\\(gz\\|Z\\|bz\\|bz2\\|xz\\|gpg\\)\\'" . no-conversion)
...@@ -1696,7 +1696,7 @@ and the contents of `file-coding-system-alist'." ...@@ -1696,7 +1696,7 @@ and the contents of `file-coding-system-alist'."
(symbol :tag "Coding system")))) (symbol :tag "Coding system"))))
(defcustom auto-coding-regexp-alist (defcustom auto-coding-regexp-alist
(mapcar (lambda (arg) (cons (purecopy (car arg)) (cdr arg))) (mapcar 'purecopy-car
'(("\\`BABYL OPTIONS:[ \t]*-\\*-[ \t]*rmail[ \t]*-\\*-" . no-conversion) '(("\\`BABYL OPTIONS:[ \t]*-\\*-[ \t]*rmail[ \t]*-\\*-" . no-conversion)
("\\`\xFE\xFF" . utf-16be-with-signature) ("\\`\xFE\xFF" . utf-16be-with-signature)
("\\`\xFF\xFE" . utf-16le-with-signature) ("\\`\xFF\xFE" . utf-16le-with-signature)
......
...@@ -1719,7 +1719,7 @@ a large number if you prefer a mixed multitude. The default is 4." ...@@ -1719,7 +1719,7 @@ a large number if you prefer a mixed multitude. The default is 4."
:version "20.3") :version "20.3")
(defvar mouse-buffer-menu-mode-groups (defvar mouse-buffer-menu-mode-groups
(mapcar (lambda (arg) (cons (purecopy (car arg)) (purecopy (cdr arg)))) (mapcar 'purecopy-cons
'(("Info\\|Help\\|Apropos\\|Man" . "Help") '(("Info\\|Help\\|Apropos\\|Man" . "Help")
("\\bVM\\b\\|\\bMH\\b\\|Message\\|Mail\\|Group\\|Score\\|Summary\\|Article" ("\\bVM\\b\\|\\bMH\\b\\|Message\\|Mail\\|Group\\|Score\\|Summary\\|Article"
. "Mail/News") . "Mail/News")
......
...@@ -2320,6 +2320,13 @@ BEG and END default respectively to the beginning and end of buffer." ...@@ -2320,6 +2320,13 @@ BEG and END default respectively to the beginning and end of buffer."
;;;; Miscellanea. ;;;; Miscellanea.
(defun purecopy-cons (arg)
"Purecopy both car and cdr of the pair argument."
(cons (purecopy (car arg)) (purecopy (cdr arg))))
(defun purecopy-car (arg)
"Purecopy the car of the pair argument."
(cons (purecopy (car arg)) (cdr arg)))
(defvar suspend-hook nil (defvar suspend-hook nil
"Normal hook run by `suspend-emacs', before suspending.") "Normal hook run by `suspend-emacs', before suspending.")
......
...@@ -1447,8 +1447,7 @@ Request data types in the order specified by `x-select-request-type'." ...@@ -1447,8 +1447,7 @@ 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) (define-key special-event-map [drag-n-drop] 'x-dnd-handle-drag-n-drop-event)
(defcustom x-gtk-stock-map (defcustom x-gtk-stock-map
(mapcar (lambda (arg) (mapcar 'purecopy-cons
(cons (purecopy (car arg)) (purecopy (cdr arg))))
'( '(
("etc/images/new" . "gtk-new") ("etc/images/new" . "gtk-new")
("etc/images/open" . "gtk-open") ("etc/images/open" . "gtk-open")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment