CVS update by aidan xemacs/lisp ...

[xemacs-cvs at xemacs.org]

  User: aidan   
  Date: 07/09/30 13:59:37

  Modified:    xemacs/lisp ChangeLog x-faces.el specifier.el
Log:
Provide x-resource, msprinter as specifier tags on all builds.

Revision  Changes    Path
1.842     +12 -0     XEmacs/xemacs/lisp/ChangeLog

Index: ChangeLog
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/ChangeLog,v
retrieving revision 1.841
retrieving revision 1.842
diff -u -p -r1.841 -r1.842
--- ChangeLog	2007/09/26 20:50:07	1.841
+++ ChangeLog	2007/09/30 11:59:34	1.842
@@ -1,3 +1,15 @@
+2007-09-30  Aidan Kehoe  <kehoea at 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 at xemacs.org>
 
 	* package-get.el (package-get-download-sites): Introduce



1.30      +5 -1      XEmacs/xemacs/lisp/x-faces.el

Index: x-faces.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/x-faces.el,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- x-faces.el	2007/06/21 13:39:11	1.29
+++ x-faces.el	2007/09/30 11:59:35	1.30
@@ -654,7 +654,11 @@ Otherwise, it returns the next larger ve
 ;;; 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)
 



1.17      +9 -9      XEmacs/xemacs/lisp/specifier.el

Index: specifier.el
===================================================================
RCS file: /pack/xemacscvs/XEmacs/xemacs/lisp/specifier.el,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -p -r1.16 -r1.17
--- specifier.el	2007/04/29 11:15:04	1.16
+++ specifier.el	2007/09/30 11:59:36	1.17
@@ -605,15 +605,10 @@ detail in the doc string for `current-di
 ;;
 ;; 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
@@ -622,6 +617,11 @@ detail in the doc string for `current-di
 ;; about clobbering user settings.
 
 (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                ;;;