X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Ffaces.el;h=d14b45befa931cddc6c04d860484e60239d65d28;hb=4e18f4602f8bfa44b39936b69e268a654c62511a;hp=eff6c160a20a18b6a6bb62541c3d5cd4df246626;hpb=d8bd7eee3147c839d3c74d1823c139cd54867a75;p=chise%2Fxemacs-chise.git-

diff --git a/lisp/faces.el b/lisp/faces.el
index eff6c16..d14b45b 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -842,12 +842,12 @@ the function to be called on it."
       ;;     happen if that locale has no instantiators.  So signal
       ;;     an error to indicate this.
 
-      
+
       (setq temp-sp (copy-specifier sp))
       (if (and (or (eq locale 'global) (eq locale 'all) (not locale))
 	       (not (face-property face property 'global)))
 	  (copy-specifier (face-property 'default property)
-			  temp-sp 'global))	    
+			  temp-sp 'global))
       (if (and (valid-specifier-locale-p locale)
 	       (not (specifier-specs temp-sp locale)))
 	  (error "Property must have a specification in locale %S" locale))
@@ -1298,7 +1298,7 @@ If FRAME is nil, return the default frame properties."
 
 (defun face-spec-update-all-matching (spec display plist)
   "Update all entries in the face spec that could match display to
-have the entries from the new plist and return the new spec"
+have the entries from the new plist and return the new spec."
   (mapcar
    (lambda (e)
      (let ((entries (car e))
@@ -1326,8 +1326,8 @@ have the entries from the new plist and return the new spec"
 	   (setq new-options (cddr new-options)))
 	 (list entries options))))
    (copy-sequence spec)))
-       
-		    
+
+
 
 (defun face-spec-set-match-display (display &optional frame)
   "Return non-nil if DISPLAY matches FRAME.
@@ -1636,7 +1636,7 @@ expected in this case, other types of image data will not work.
 If the optional FRAME argument is provided, change only
 in that frame; otherwise change each frame."
   (while (not (find-face face))
-    (setq face (signal 'wrong-type-argument (list 'facep face))))
+    (setq face (wrong-type-argument 'facep face)))
   (let ((bitmap-path (ecase (console-type)
 		       (x         x-bitmap-file-path)
 		       (mswindows mswindows-bitmap-file-path)))
@@ -1661,8 +1661,7 @@ in that frame; otherwise change each frame."
 		   (and (listp pixmap) (= (length pixmap) 3)))))
 	(setq pixmap (signal 'wrong-type-argument
 			     (list 'stipple-pixmap-p pixmap)))))
-    (while (and frame (not (framep frame)))
-      (setq frame (signal 'wrong-type-argument (list 'framep frame))))
+    (check-type frame (or null frame))
     (set-face-background-pixmap face instantiator frame)))
 
 
@@ -1781,25 +1780,25 @@ in that frame; otherwise change each frame."
 (if (featurep 'xpm)
     (setq xpm-color-symbols
 	  (list
-	   (purecopy '("foreground" (face-foreground 'default)))
-	   (purecopy '("background" (face-background 'default)))
-	   (purecopy '("backgroundToolBarColor"
-		       (or
-			(and 
-			 (featurep 'x)
-			 (x-get-resource "backgroundToolBarColor"
-					 "BackgroundToolBarColor" 'string
-					 nil nil 'warn))
-
-			(face-background 'toolbar))))
-	   (purecopy '("foregroundToolBarColor"
-		       (or
-			(and 
-			 (featurep 'x)
-			 (x-get-resource "foregroundToolBarColor"
-					 "ForegroundToolBarColor" 'string
-					 nil nil 'warn))
-			(face-foreground 'toolbar))))
+	   '("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)))
 	   )))
 
 (when (featurep 'tty)