diff --git a/src/ChangeLog b/src/ChangeLog
index 3d6e2c897d5ce6ad36de0bde712c9fca83f0250e..53c3b4c5b74f548f64eb4989aca89f1d1c8260a1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,13 @@
+Tue Mar 26 08:21:18 1996  David Byers  <byers@lysator.liu.se>
+
+	* Satte cvs-version till 40.0 och symbolisk tag till v0-40
+
+	* lyskom-rest.el, view-text.el: face-equal bortbytt mod
+ 	lyskom-face-default-p som fungerar om man inte k�r med
+ 	f�nstersystem.
+
+	* vars.el.in: B�ttre val av face scheme.
+
 Mon Mar 25 16:22:42 1996  David Byers  <byers@lysator.liu.se>
 
 	* lyskom-rest.el: Formatteringen t�cker inte padding.
diff --git a/src/lyskom-rest.el b/src/lyskom-rest.el
index 0e80cb0fce85db429c40b94d153bccf4692f0de3..f1633996dfeb2c7b462f6ba5dcaf2625a19c5309 100644
--- a/src/lyskom-rest.el
+++ b/src/lyskom-rest.el
@@ -1148,7 +1148,7 @@ Args: FORMAT-STRING &rest ARGS"
                                     (list 'lyskom-format
                                           ": argument error")))))
       (if (and (not colon-flag)
-               (not (face-equal 'default 'kom-subject-face)))
+               (not (lyskom-face-default-p 'kom-subject-face)))
           (setq propl (append (list 'face 'kom-subject-face) propl))))
      ;;
      ;;  Format a LysKOM text body. Currently this does nothing. It
@@ -1266,6 +1266,7 @@ Args: FORMAT-STRING &rest ARGS"
 
 ;;; ============================================================
 ;;;                     Beeping and feeping
+;;;                     Faces and colors
 ;;;
 
 (defun lyskom-beep (arg)
@@ -1288,8 +1289,16 @@ A symbol other than t means call it as a function."
                         arg))
         ((and (symbolp arg)
               (fboundp arg))
-         (funcall arg))
+         (condition-case err
+             (funcall arg)
+           (error (message "Error in beep function")
+                  (beep))))
         (t (beep))))
+
+(defun lyskom-face-default-p (f1)
+  "Return t if f1 is undefined or the default face."
+  (or (not (facep f1))
+      (face-equal f1 'default)))
 		  
 
 ;;; ================================================================
diff --git a/src/view-text.el b/src/view-text.el
index c48c7ee4726e441a54edae91d8947e5f0c9a26d6..26d1c5ddcf9e44838aa58993382c82171ebcf117 100644
--- a/src/view-text.el
+++ b/src/view-text.el
@@ -106,7 +106,7 @@ lyskom-reading-list to read the comments to this."
            (setq end (point-max))
 
            (if (and (null filter)
-                    (not (face-equal 'kom-first-line-face 'default)))
+                    (not (lyskom-face-default-p 'kom-first-line-face)))
                (add-text-properties start end '(face kom-first-line-face)))
 
 		   ;; All recipients and other header lines.