From a0abbc34dac7a13b160c66fe8c04dd5d0023c6b2 Mon Sep 17 00:00:00 2001 From: hmurata Date: Wed, 12 Sep 2001 13:10:51 +0000 Subject: [PATCH] * wl-draft.el (wl-draft-config-exec-sub): Fixed problem when config is an anonymous lambda expression. --- wl/ChangeLog | 5 +++++ wl/wl-draft.el | 26 ++++++++++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index e758d72..4e6ee9d 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,8 @@ +2001-09-12 Hiroya Murata + + * wl-draft.el (wl-draft-config-exec-sub): Fixed problem when + config is an anonymous lambda expression. + 2001-09-11 Katsumi Yamaoka * wl-vars.el (wl-biff-state-indicator-on): Use `*iso-2022-jp*' diff --git a/wl/wl-draft.el b/wl/wl-draft.el index 34b12ad..2a766ea 100644 --- a/wl/wl-draft.el +++ b/wl/wl-draft.el @@ -1602,26 +1602,24 @@ If optional argument is non-nil, current draft buffer is killed" (while clist (setq config (car clist)) (cond + ((functionp config) + (funcall config)) ((consp config) (let ((field (car config)) (content (cdr config)) ret-val) - (cond - ((stringp field) - (wl-draft-replace-field field (eval content) t)) - ((setq ret-val (wl-draft-config-sub-func field content)) + (cond + ((stringp field) + (wl-draft-replace-field field (eval content) t)) + ((setq ret-val (wl-draft-config-sub-func field content)) (if (cdr ret-val) ;; for wl-draft-config-sub-template (wl-append local-variables (cdr ret-val)))) - ((boundp field) ;; variable - (make-local-variable field) - (set field (eval content)) - (wl-append local-variables (list field))) - (t - (error "%s: not variable" field))))) - ((or (functionp config) - (and (symbolp config) - (fboundp config))) - (funcall config)) + ((boundp field) ;; variable + (make-local-variable field) + (set field (eval content)) + (wl-append local-variables (list field))) + (t + (error "%s: not variable" field))))) (t (error "%s: not supported type" config))) (setq clist (cdr clist))) -- 1.7.10.4