Mercurial > hg > xemacs-beta
changeset 4194:4f2243a0dc04
[xemacs-hg @ 2007-09-30 11:59:34 by aidan]
Provide x-resource, msprinter as specifier tags on all builds.
| author | aidan |
|---|---|
| date | Sun, 30 Sep 2007 11:59:36 +0000 |
| parents | 6438d53aabcf |
| children | cd09974da26e |
| files | lisp/ChangeLog lisp/specifier.el lisp/x-faces.el |
| diffstat | 3 files changed, 26 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Sep 30 11:38:00 2007 +0000 +++ b/lisp/ChangeLog Sun Sep 30 11:59:36 2007 +0000 @@ -1,3 +1,15 @@ +2007-09-30 Aidan Kehoe <kehoea@parhasard.net> + + * x-faces.el: + * x-faces.el ('x-resource)): Removed. + Specifier tag moved to specifier.el to ensure availability on + non-X builds. + * specifier.el: + Provide x, tty, mswindows, msprinter, gtk and carbon as device + tags that never match on builds that don't support them. + * specifier.el ('x-resource)): New. + Moved here from x-faces.el + 2007-09-26 Adrian Aichner <adrian@xemacs.org> * package-get.el (package-get-download-sites): Introduce
--- a/lisp/specifier.el Sun Sep 30 11:38:00 2007 +0000 +++ b/lisp/specifier.el Sun Sep 30 11:59:36 2007 +0000 @@ -605,15 +605,10 @@ ;; ;; from producing an error if no X support was compiled in. -(or (valid-specifier-tag-p 'x) - (define-specifier-tag 'x (lambda (dev) (eq (device-type dev) 'x)))) -(or (valid-specifier-tag-p 'tty) - (define-specifier-tag 'tty (lambda (dev) (eq (device-type dev) 'tty)))) -(or (valid-specifier-tag-p 'mswindows) - (define-specifier-tag 'mswindows (lambda (dev) - (eq (device-type dev) 'mswindows)))) -(or (valid-specifier-tag-p 'gtk) - (define-specifier-tag 'gtk (lambda (dev) (eq (device-type dev) 'gtk)))) +(loop + for tag in '(x tty mswindows msprinter gtk carbon) + do (unless (valid-specifier-tag-p tag) + (define-specifier-tag tag #'ignore))) ;; Add special tag for use by initialization code. Code that ;; sets up default specs should use this tag. Code that needs to @@ -623,6 +618,11 @@ (define-specifier-tag 'default) +;; The x-resource specifier tag is provide so the X resource initialization +;; code can be overridden by custom without trouble. + +(define-specifier-tag 'x-resource) + ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; "Heuristic" specifier functions ;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
--- a/lisp/x-faces.el Sun Sep 30 11:38:00 2007 +0000 +++ b/lisp/x-faces.el Sun Sep 30 11:59:36 2007 +0000 @@ -654,7 +654,11 @@ ;;; result in a crash. ;; When we initialise a face from an X resource, note that we did so. -(define-specifier-tag 'x-resource) +;; +;; Now in specifier.el so run-time checks for it on non-X builds don't +;; error. + +; (define-specifier-tag 'x-resource) (defun x-init-face-from-resources (face &optional locale set-anyway)