Mercurial > hg > xemacs-beta

diff lisp/faces.el @ 4222:38ef5a6da799

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[xemacs-hg @ 2007-10-13 14:08:26 by aidan] Fix the nomule package build; eliminate some non-X compile time warnings.
author aidan
date Sat, 13 Oct 2007 14:08:30 +0000
parents 049dc907c17a
children 5a54ce6dc945
line wrap: on
line diff
--- a/lisp/faces.el	Fri Oct 12 21:51:07 2007 +0000
+++ b/lisp/faces.el	Sat Oct 13 14:08:30 2007 +0000
@@ -472,7 +472,9 @@
     (let (matchspec)
       ;; get-charset signals an error if its argument doesn't have an
       ;; associated charset.
-      (setq charset (get-charset charset)
+      (setq charset (if-fboundp #'get-charset
+                        (get-charset charset)
+                      (error 'unimplemented "Charset support not available"))
 	    matchspec (cons charset nil))
       (or (null (setcdr matchspec 'initial))
 	  (face-property-matching-instance 
@@ -2059,29 +2061,31 @@
 		     'global)
 
 ;; Define some logical color names to be used when reading the pixmap files.
-(if (featurep 'xpm)
-    (setq xpm-color-symbols
-	  (list
-	   '("foreground" (face-foreground 'default))
-	   '("background" (face-background 'default))
-	   '("backgroundToolBarColor"
-	     (or
-	      (and
-	       (featurep 'x)
-	       (x-get-resource "backgroundToolBarColor"
-			       "BackgroundToolBarColor" 'string
-			       nil nil 'warn))
+(and-boundp 
+    'xpm-color-symbols
+  (featurep 'xpm)
+  (setq xpm-color-symbols
+        (list
+         '("foreground" (face-foreground 'default))
+         '("background" (face-background 'default))
+         '("backgroundToolBarColor"
+           (or
+            (and
+             (featurep 'x)
+             (x-get-resource "backgroundToolBarColor"
+                             "BackgroundToolBarColor" 'string
+                             nil nil 'warn))
 
-	      (face-background 'toolbar)))
-	   '("foregroundToolBarColor"
-	     (or
-	      (and
-	       (featurep 'x)
-	       (x-get-resource "foregroundToolBarColor"
-			       "ForegroundToolBarColor" 'string
-			       nil nil 'warn))
-	      (face-foreground 'toolbar)))
-	   )))
+            (face-background 'toolbar)))
+         '("foregroundToolBarColor"
+           (or
+            (and
+            (featurep 'x)
+            (x-get-resource "foregroundToolBarColor"
+                            "ForegroundToolBarColor" 'string
+                            nil nil 'warn))
+            (face-foreground 'toolbar)))
+         )))
 
 (when (featurep 'tty)
   (set-face-highlight-p 'bold                    t 'global '(default tty))