From a2c4b0e10468d09e066005e728b36f9e8362cc79 Mon Sep 17 00:00:00 2001 From: kaoru Date: Sat, 15 May 2004 22:26:53 +0000 Subject: [PATCH] Backport Changes: 2004-01-01 TAKAHASHI Kaoru * wl-demo.el (wl-demo-copyright-notice): Add 2004. 2003-12-26 Yuuichi Teranishi * wl-vars.el (wl-demo-icon-name-alist): New variable. * wl-demo.el (wl-demo-icon-name): Define as function. (wl-demo-insert-image): Use it. --- wl/ChangeLog | 13 ++++++++++++- wl/wl-demo.el | 22 +++++++++++----------- wl/wl-vars.el | 12 ++++++++++++ 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index e1dbe78..26f7ef1 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,14 @@ +2004-01-01 TAKAHASHI Kaoru + + * wl-demo.el (wl-demo-copyright-notice): Add 2004. + +2003-12-26 Yuuichi Teranishi + + * wl-vars.el (wl-demo-icon-name-alist): New variable. + + * wl-demo.el (wl-demo-icon-name): Define as function. + (wl-demo-insert-image): Use it. + 2003-07-17 Yuuichi Teranishi * wl-draft.el (wl-draft-normal-send-func): Fixed bug for removing @@ -8,7 +19,7 @@ * 2.10.1 is released. 2003-06-20 TAKAHASHI Kaoru - + * wl-message.el (wl-message-buffer-cache-add): Create new buffer when it hits killed buffer. diff --git a/wl/wl-demo.el b/wl/wl-demo.el index 9e85263..4ad45e7 100644 --- a/wl/wl-demo.el +++ b/wl/wl-demo.el @@ -29,7 +29,7 @@ ;;; Code: (defconst wl-demo-copyright-notice - "Copyright (C) 1998-2003 Yuuichi Teranishi " + "Copyright (C) 1998-2004 Yuuichi Teranishi " "A declaration of the copyright on Wanderlust.") (eval-when-compile @@ -39,13 +39,12 @@ (require 'wl-version) (require 'wl-highlight) -(defconst wl-demo-icon-name - (concat "wl-" (wl-version-status) - (if (string-match "^... Dec \\([ 01][0-9]\\|2[0-5]\\)" - (current-time-string)) - "-xmas-logo" - "-logo")) - "Basename of the logo file.") +(defun wl-demo-icon-name () + "A function to determine logo file name." + (catch 'found + (dolist (pair wl-demo-icon-name-alist) + (when (eval (car pair)) + (throw 'found (eval (cdr pair))))))) (defvar wl-logo-ascii "\ o$ oo$$$$$$ooo @@ -79,6 +78,7 @@ Yet Another Message Interface On Emacsen" (autoload 'make-glyph "glyphs") (autoload 'set-glyph-face "glyphs") (autoload 'set-specifier "specifier") + (defalias-maybe 'face-background-name 'ignore) (defalias-maybe 'frame-char-height 'ignore) (defalias-maybe 'frame-char-width 'ignore) (defalias-maybe 'glyph-height 'ignore) @@ -134,11 +134,11 @@ Yet Another Message Interface On Emacsen" IMAGE-TYPE specifies what a type of image should be displayed. Return a number of lines that an image occupies in the buffer." (let ((file (cond ((eq 'xpm image-type) - (concat wl-demo-icon-name ".xpm")) + (concat (wl-demo-icon-name) ".xpm")) ((eq 'bitmap image-type) - (concat wl-demo-icon-name ".img")) + (concat (wl-demo-icon-name) ".img")) ((eq 'xbm image-type) - (concat wl-demo-icon-name ".xbm")))) + (concat (wl-demo-icon-name) ".xbm")))) image width height) (when (featurep 'xemacs) (when (boundp 'default-gutter-visible-p) diff --git a/wl/wl-vars.el b/wl/wl-vars.el index 6505acb..c9618d7 100644 --- a/wl/wl-vars.el +++ b/wl/wl-vars.el @@ -393,6 +393,18 @@ You had better set this variable if you set 'wl-insert-mail-followup-to' as t." :type 'boolean :group 'wl-pref) +(defcustom wl-demo-icon-name-alist + '(((string-match "^... Dec \\([ 01][0-9]\\|2[0-5]\\)" (current-time-string)) + . + (concat "wl-" (wl-version-status) "-xmas-logo")) + (t + . + (concat "wl-" (wl-version-status) "-logo"))) + "An alist to determine the basename of the logo file." + :type '(repeat (cons (symbol :tag "condition") + (symbol :tag "file name"))) + :group 'wl-pref) + (defcustom wl-envelope-from nil "*Envelope From used in SMTP. If nil, `wl-from' is used." -- 1.7.10.4