diff lisp/custom/cus-face.el @ 161:28f395d8dc7a r20-3b7

Import from CVS: tag r20-3b7
author cvs
date Mon, 13 Aug 2007 09:42:26 +0200
parents 6b37e6ddd302
children 0132846995bd
line wrap: on
line diff
--- a/lisp/custom/cus-face.el	Mon Aug 13 09:41:47 2007 +0200
+++ b/lisp/custom/cus-face.el	Mon Aug 13 09:42:26 2007 +0200
@@ -4,7 +4,7 @@
 ;;
 ;; Author: Per Abrahamsen <abraham@dina.kvl.dk>
 ;; Keywords: help, faces
-;; Version: 1.9908
+;; Version: 1.9916
 ;; X-URL: http://www.dina.kvl.dk/~abraham/custom/
 
 ;;; Commentary:
@@ -332,11 +332,14 @@
       (setq att (car atts)
 	    atts (cdr atts)
 	    get (nth 3 att))
-      (when get 
-	(let ((answer (funcall get face frame)))
-	  (unless (equal answer (funcall get 'default frame))
-	    (when (widget-apply (nth 1 att) :match answer)
-	      (setq result (cons (nth 0 att) (cons answer result))))))))
+      (condition-case nil
+	  ;; This may fail if w3 doesn't exists.
+	  (when get 
+	    (let ((answer (funcall get face frame)))
+	      (unless (equal answer (funcall get 'default frame))
+		(when (widget-apply (nth 1 att) :match answer)
+		  (setq result (cons (nth 0 att) (cons answer result)))))))
+	(error nil)))
     result))
 
 (defun custom-set-face-bold (face value &optional frame)