From 6b7ed7e245398269bf5aa1c899784b91f22e1659 Mon Sep 17 00:00:00 2001 From: kaoru Date: Wed, 18 Jun 2003 18:33:48 +0000 Subject: [PATCH] (wl-fldmgr-rename): Do nothing on the last line. (wl-fldmgr-add-completion-subr): Rewrite conditional. --- wl/ChangeLog | 2 ++ wl/wl-fldmgr.el | 15 ++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/wl/ChangeLog b/wl/ChangeLog index d4e1ce3..9aad78d 100644 --- a/wl/ChangeLog +++ b/wl/ChangeLog @@ -2,6 +2,8 @@ * wl-fldmgr.el (wl-fldmgr-folders-header): Add more comment. (wl-fldmgr-save-folders): Fix comment. + (wl-fldmgr-rename): Do nothing on the last line. + (wl-fldmgr-add-completion-subr): Rewrite conditional. * wl-draft.el (wl-draft-send-mail-with-smtp): Catch quitting and write sendlog. diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el index fbeb9b2..e1949bb 100644 --- a/wl/wl-fldmgr.el +++ b/wl/wl-fldmgr.el @@ -51,7 +51,6 @@ # Folder definition file # This file is generated automatically by %s. # -# # If you edit this file by hand, be sure that comment lines # will be washed out by wl-fldmgr. # @@ -800,12 +799,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) @@ -904,6 +904,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