Mercurial > hg > xemacs-beta

comparison 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
comparison
equal deleted inserted replaced
5228:5efbd1253905 5229:7d06a8bf47d2
129 (registry "[^-]*") ; some fonts have omitted registries 129 (registry "[^-]*") ; some fonts have omitted registries
130 ; (encoding ".+") ; note that encoding may contain "-"... 130 ; (encoding ".+") ; note that encoding may contain "-"...
131 (encoding "[^-]+") ; false! 131 (encoding "[^-]+") ; false!
132 ) 132 )
133 (setq gtk-font-regexp 133 (setq gtk-font-regexp
134 (purecopy 134 (concat "\\`\\*?[-?*]"
135 (concat "\\`\\*?[-?*]" 135 foundry - family - weight\? - slant\? - swidth - adstyle -
136 foundry - family - weight\? - slant\? - swidth - adstyle - 136 pixelsize - pointsize - resx - resy - spacing - avgwidth -
137 pixelsize - pointsize - resx - resy - spacing - avgwidth - 137 registry - encoding "\\'"
138 registry - encoding "\\'" 138 ))
139 )))
140 (setq gtk-font-regexp-head 139 (setq gtk-font-regexp-head
141 (purecopy 140 (concat "\\`[-?*]" foundry - family - weight\? - slant\?
142 (concat "\\`[-?*]" foundry - family - weight\? - slant\? 141 "\\([-*?]\\|\\'\\)"))
143 "\\([-*?]\\|\\'\\)")))
144 (setq gtk-font-regexp-head-2 142 (setq gtk-font-regexp-head-2
145 (purecopy 143 (concat "\\`[-?*]" foundry - family - weight\? - slant\?
146 (concat "\\`[-?*]" foundry - family - weight\? - slant\? 144 - swidth - adstyle - pixelsize - pointsize
147 - swidth - adstyle - pixelsize - pointsize 145 "\\([-*?]\\|\\'\\)"))
148 "\\([-*?]\\|\\'\\)"))) 146 (setq gtk-font-regexp-slant (concat - slant -))
149 (setq gtk-font-regexp-slant (purecopy (concat - slant -))) 147 (setq gtk-font-regexp-weight (concat - weight -))
150 (setq gtk-font-regexp-weight (purecopy (concat - weight -)))
151 ;; if we can't match any of the more specific regexps (unfortunate) then 148 ;; if we can't match any of the more specific regexps (unfortunate) then
152 ;; look for digits; assume 2+ digits is 10ths of points, and 1-2 digits 149 ;; look for digits; assume 2+ digits is 10ths of points, and 1-2 digits
153 ;; is pixels. Bogus as hell. 150 ;; is pixels. Bogus as hell.
154 (setq gtk-font-regexp-pixel (purecopy "[-?*]\\([0-9][0-9]?\\)[-?*]")) 151 (setq gtk-font-regexp-pixel "[-?*]\\([0-9][0-9]?\\)[-?*]")
155 (setq gtk-font-regexp-point (purecopy "[-?*]\\([0-9][0-9]+\\)[-?*]")) 152 (setq gtk-font-regexp-point "[-?*]\\([0-9][0-9]+\\)[-?*]")
156 ;; the following two are used by x-font-menu.el. 153 ;; the following two are used by x-font-menu.el.
157 (setq gtk-font-regexp-foundry-and-family 154 (setq gtk-font-regexp-foundry-and-family
158 (purecopy (concat "\\`[-?*]" foundry - "\\(" family "\\)" -))) 155 (concat "\\`[-?*]" foundry - "\\(" family "\\)" -))
159 (setq gtk-font-regexp-registry-and-encoding 156 (setq gtk-font-regexp-registry-and-encoding
160 (purecopy (concat - "\\(" registry "\\)" - "\\(" encoding "\\)\\'"))) 157 (concat - "\\(" registry "\\)" - "\\(" encoding "\\)\\'"))
161 (setq gtk-font-regexp-spacing 158 (setq gtk-font-regexp-spacing
162 (purecopy (concat - "\\(" spacing "\\)" - avgwidth 159 (concat - "\\(" spacing "\\)" - avgwidth
163 - registry - encoding "\\'"))) 160 - registry - encoding "\\'"))
164 ) 161 )
165 162
166 (defvaralias 'x-font-regexp 'gtk-font-regexp) 163 (defvaralias 'x-font-regexp 'gtk-font-regexp)
167 (defvaralias 'x-font-regexp-head 'gtk-font-regexp-head) 164 (defvaralias 'x-font-regexp-head 'gtk-font-regexp-head)
168 (defvaralias 'x-font-regexp-head-2 'gtk-font-regexp-head-2) 165 (defvaralias 'x-font-regexp-head-2 'gtk-font-regexp-head-2)