From b3c73ee9d45833002f3e4966f762e12d5d94aacf Mon Sep 17 00:00:00 2001 From: yoichi Date: Mon, 10 Feb 2003 05:12:28 +0000 Subject: [PATCH] * wl-fldmgr.el (wl-fldmgr-rename): Do nothing on the last line. (wl-fldmgr-add-completion-subr): Rewrite conditional. --- wl/ChangeLog | 5 +++++ wl/wl-fldmgr.el | 14 ++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index 5a0483a..fbdace4 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -1,3 +1,8 @@ +2003-02-10 Yoichi NAKAYAMA + + * wl-fldmgr.el (wl-fldmgr-rename): Do nothing on the last line. + (wl-fldmgr-add-completion-subr): Rewrite conditional. + 2003-02-08 Yoichi NAKAYAMA * wl-score.el (wl-score-save): Bind print-length and print-level. diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el index 993fb78..c4aed76 100644 --- a/wl/wl-fldmgr.el +++ b/wl/wl-fldmgr.el @@ -796,12 +796,13 @@ return value is diffs '(-new -unread -all)." (condition-case nil (wl-fldmgr-add-completion-all-completions string) (error nil)))))))) - (if (null flag) - (try-completion string table predicate) - (if (eq flag 'lambda) - (eq t (try-completion string table predicate)) - (if flag - (all-completions string table predicate)))))) + (cond + ((null flag) + (try-completion string table predicate)) + ((eq flag 'lambda) + (eq t (try-completion string table predicate))) + (t + (all-completions string table predicate))))) (defun wl-fldmgr-add (&optional name) (interactive) @@ -900,6 +901,7 @@ return value is diffs '(-new -unread -all)." (let* ((tmp (wl-fldmgr-get-path-from-buffer)) (old-folder (nth 4 tmp)) new-folder) + (unless old-folder (error "No folder")) (setq new-folder (wl-fldmgr-read-string (wl-summary-read-folder old-folder "to rename" t t old-folder))) -- 1.7.10.4