From 39f7e4f7ffa76d9ad22e5ad65c3814bd507c56e0 Mon Sep 17 00:00:00 2001 From: David Byers <david.byers@liu.se> Date: Tue, 26 Mar 1996 08:30:13 +0000 Subject: [PATCH] New version number for release of 0.40 Last-minute "bug fixes" for 0.40. --- src/ChangeLog | 10 ++++++++++ src/lyskom-rest.el | 13 +++++++++++-- src/view-text.el | 2 +- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 3d6e2c89..53c3b4c5 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 0e80cb0f..f1633996 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 c48c7ee4..26d1c5dd 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. -- GitLab