Mercurial > hg > xemacs-beta

diff lisp/gtk-faces.el @ 5229:7d06a8bf47d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move #'purecopy from alloc.c to being an obsolete alias for #'identity lisp/ChangeLog addition: 2010-06-08 Aidan Kehoe <kehoea@parhasard.net> * paragraphs.el (sentence-end): * gtk-faces.el: * custom.el (custom-declare-variable): Remove all core code calls to #'purecopy. * obsolete.el (purecopy): Make the function itself an obsolete alias to #'identity. src/ChangeLog addition: 2010-06-08 Aidan Kehoe <kehoea@parhasard.net> * alloc.c (Fpurecopy): Moved to obsolete.el as an alias for #'identity, marked obsolete.
author Aidan Kehoe <kehoea@parhasard.net>
date Tue, 08 Jun 2010 15:58:47 +0100
parents 79c6ff3eef26
children 308d34e9f07d
line wrap: on
line diff
--- a/lisp/gtk-faces.el	Mon Jun 07 18:42:10 2010 +0100
+++ b/lisp/gtk-faces.el	Tue Jun 08 15:58:47 2010 +0100
@@ -131,36 +131,33 @@
       (encoding	"[^-]+")		; false!
       )
   (setq gtk-font-regexp
-	(purecopy
-	 (concat "\\`\\*?[-?*]"
-		 foundry - family - weight\? - slant\? - swidth - adstyle -
-		 pixelsize - pointsize - resx - resy - spacing - avgwidth -
-		 registry - encoding "\\'"
-		 )))
+	(concat "\\`\\*?[-?*]"
+		foundry - family - weight\? - slant\? - swidth - adstyle -
+		pixelsize - pointsize - resx - resy - spacing - avgwidth -
+		registry - encoding "\\'"
+		))
   (setq gtk-font-regexp-head
-	(purecopy
-          (concat "\\`[-?*]" foundry - family - weight\? - slant\?
-		  "\\([-*?]\\|\\'\\)")))
+	(concat "\\`[-?*]" foundry - family - weight\? - slant\?
+		"\\([-*?]\\|\\'\\)"))
   (setq gtk-font-regexp-head-2
-	(purecopy
-          (concat "\\`[-?*]" foundry - family - weight\? - slant\?
-		  - swidth - adstyle - pixelsize - pointsize
-		  "\\([-*?]\\|\\'\\)")))
-  (setq gtk-font-regexp-slant (purecopy (concat - slant -)))
-  (setq gtk-font-regexp-weight (purecopy (concat - weight -)))
+	(concat "\\`[-?*]" foundry - family - weight\? - slant\?
+		- swidth - adstyle - pixelsize - pointsize
+		"\\([-*?]\\|\\'\\)"))
+  (setq gtk-font-regexp-slant (concat - slant -))
+  (setq gtk-font-regexp-weight (concat - weight -))
   ;; if we can't match any of the more specific regexps (unfortunate) then
   ;; look for digits; assume 2+ digits is 10ths of points, and 1-2 digits
   ;; is pixels.  Bogus as hell.
-  (setq gtk-font-regexp-pixel (purecopy "[-?*]\\([0-9][0-9]?\\)[-?*]"))
-  (setq gtk-font-regexp-point (purecopy "[-?*]\\([0-9][0-9]+\\)[-?*]"))
+  (setq gtk-font-regexp-pixel "[-?*]\\([0-9][0-9]?\\)[-?*]")
+  (setq gtk-font-regexp-point "[-?*]\\([0-9][0-9]+\\)[-?*]")
   ;; the following two are used by x-font-menu.el.
   (setq gtk-font-regexp-foundry-and-family
-	(purecopy (concat "\\`[-?*]" foundry - "\\(" family "\\)" -)))
+	(concat "\\`[-?*]" foundry - "\\(" family "\\)" -))
   (setq gtk-font-regexp-registry-and-encoding
-	(purecopy (concat - "\\(" registry "\\)" - "\\(" encoding "\\)\\'")))
+	(concat - "\\(" registry "\\)" - "\\(" encoding "\\)\\'"))
   (setq gtk-font-regexp-spacing
-	(purecopy (concat - "\\(" spacing "\\)" - avgwidth
-			  - registry - encoding "\\'")))
+	(concat - "\\(" spacing "\\)" - avgwidth
+		- registry - encoding "\\'"))
   )
 
 (defvaralias 'x-font-regexp 'gtk-font-regexp)