From: kaoru <kaoru>
Date: Tue, 27 Feb 2001 15:28:02 +0000 (+0000)
Subject: Use *-function instead of *-func.
X-Git-Tag: wl-2_8-root^2~16
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=3d393a1434e37006846ab8ad0d063bbbae494935;p=elisp%2Fwanderlust.git

Use *-function instead of *-func.

wl-address-init-function
wl-draft-cite-function
wl-draft-queue-flush-send-function
wl-draft-send-function
wl-draft-send-mail-function
wl-draft-send-news-function
wl-expire-archive-get-folder-function
wl-fldmgr-sort-function
wl-folder-completion-function
wl-folder-init-function
wl-generate-mailer-string-function
wl-highlight-signature-search-function
wl-highlight-x-face-function
wl-load-profile-function
wl-message-buffer-prefetch-get-next-function
wl-message-buffer-prefetch-get-next-function
wl-print-buffer-function
wl-ps-print-buffer-function
wl-score-edit-exit-function
wl-summary-buffer-exit-function
wl-summary-buffer-message-redisplay-function
wl-summary-buffer-next-folder-function
wl-summary-buffer-prev-folder-function
wl-summary-from-function
wl-summary-get-petname-function
wl-summary-subject-filter-function
wl-summary-subject-function
---

diff --git a/wl/ChangeLog b/wl/ChangeLog
index 246532d..228a2e8 100644
--- a/wl/ChangeLog
+++ b/wl/ChangeLog
@@ -1,3 +1,59 @@
+2001-02-27  TAKAHASHI Kaoru  <kaoru@kaisei.org>
+
+	* wl-summary.el (wl-summary-buffer-exit-function): Renamed from
+	`wl-summary-buffer-exit-func'
+	(wl-summary-buffer-message-redisplay-function): Renamed from
+	`wl-summary-buffer-message-redisplay-func'
+	(wl-summary-buffer-next-folder-function): Renamed from
+	`wl-summary-buffer-next-folder-func'.
+	(wl-summary-buffer-prev-folder-function): Renamed from
+	`wl-summary-buffer-prev-folder-func'.
+	(wl-summary-get-petname-function): Renamed from
+	`wl-summary-get-petname-func'.
+
+	* wl-score.el (wl-score-edit-exit-function): Renamed from
+	`wl-score-edit-exit-func'.
+
+	* wl-message.el (wl-message-buffer-prefetch-get-next-function):
+	Renamed from `wl-message-buffer-prefetch-get-next-function'.
+
+	* wl-util.el (wl-load-profile-function): Renamed from
+	`wl-load-profile-func'.
+
+	* wl-folder.el (wl-folder-completion-function): Renamed from
+	`wl-folder-completion-func'.
+	(wl-folder-init-function): Renamed from `wl-folder-init-func'.
+
+	* wl-vars.el (wl-expire-archive-get-folder-function): Renamed from
+	`wl-expire-archive-get-folder-func'.
+	(wl-draft-send-function): Renamed from `wl-draft-send-func'.
+	(wl-draft-send-mail-function): Renamed from
+	`wl-draft-send-mail-func'.
+	(wl-draft-send-news-function): Renamed from
+	`wl-draft-send-news-func'.
+	(wl-fldmgr-sort-function): Renamed from `wl-fldmgr-sort-func'.
+	(wl-generate-mailer-string-function): Renamed from
+	`wl-generate-mailer-string-func'.
+	(wl-highlight-signature-search-function): Renamed from
+	`wl-highlight-signature-search-func'.
+	(wl-highlight-x-face-function): Renamed from
+	`wl-highlight-x-face-func'
+	(wl-print-buffer-function): Renamed from `wl-print-buffer-func'.
+	(wl-ps-print-buffer-function): Renamed from
+	`wl-ps-print-buffer-func'
+	(wl-summary-from-function): Renamed from `wl-summary-from-func'.
+	(wl-summary-subject-function): Renamed from `wl-summary-subject-func'.
+	(wl-summary-subject-filter-function): Renamed from
+	`wl-summary-subject-filter-func'.
+
+	* wl-draft.el (wl-draft-queue-flush-send-function): Renamed from
+	`wl-draft-queue-flush-send-func'
+	(wl-draft-cite-function): Renamed from
+	`wl-draft-cite-func'
+
+	* wl-address.el (wl-address-init-function): Renamed from
+	`wl-address-init-func'.
+
 2001-02-27  Yuuichi Teranishi  <teranisi@gohome.org>
 
 	* wl-draft.el (wl-draft-queue-flush): Don't call
diff --git a/wl/wl-address.el b/wl/wl-address.el
index 259ae2b..52e1ee2 100644
--- a/wl/wl-address.el
+++ b/wl/wl-address.el
@@ -460,11 +460,11 @@ Matched address lists are append to CL."
 	     (let ((list (sort (all-completions pattern cl) 'string<)))
 	       (wl-complete-window-show list)))))))
 
-(defvar wl-address-init-func 'wl-local-address-init)
+(defvar wl-address-init-function 'wl-local-address-init)
 
 (defun wl-address-init ()
-  "Call `wl-address-init-func'."
-  (funcall wl-address-init-func))
+  "Call `wl-address-init-function'."
+  (funcall wl-address-init-function))
 
 (defun wl-local-address-init ()
   "Reload `wl-address-file'.
diff --git a/wl/wl-draft.el b/wl/wl-draft.el
index 4cf1a32..2fac793 100644
--- a/wl/wl-draft.el
+++ b/wl/wl-draft.el
@@ -51,7 +51,7 @@
 
 (defvar wl-draft-buf-name "Draft")
 (defvar wl-caesar-region-func nil)
-(defvar wl-draft-cite-func 'wl-default-draft-cite)
+(defvar wl-draft-cite-function 'wl-default-draft-cite)
 (defvar wl-draft-buffer-file-name nil)
 (defvar wl-draft-field-completion-list nil)
 (defvar wl-draft-verbose-send t)
@@ -64,7 +64,7 @@
 (defvar wl-draft-sendlog-filename "sendlog")
 (defvar wl-draft-queue-save-filename "qinfo")
 (defvar wl-draft-config-save-filename "config")
-(defvar wl-draft-queue-flush-send-func 'wl-draft-dispatch-message)
+(defvar wl-draft-queue-flush-send-function 'wl-draft-dispatch-message)
 (defvar wl-sent-message-via nil)
 (defvar wl-sent-message-modified nil)
 (defvar wl-draft-fcc-list nil)
@@ -441,8 +441,7 @@ Reply to author if WITH-ARG is non-nil."
   (let ((beg (point)))
     (cond (mail-citation-hook (run-hooks 'mail-citation-hook))
 	  (mail-yank-hooks (run-hooks 'mail-yank-hooks))
-	  (t (and wl-draft-cite-func
-		  (funcall wl-draft-cite-func)))) ; default cite
+	  (wl-draft-cite-function (funcall wl-draft-cite-function))) ; default cite
     (run-hooks 'wl-draft-cited-hook)
     (when (and wl-draft-add-references
 	       (wl-draft-add-references))
@@ -542,7 +541,7 @@ Reply to author if WITH-ARG is non-nil."
   (interactive)
   (let (mail-reply-buffer
 	mail-citation-hook mail-yank-hooks
-	wl-draft-add-references wl-draft-cite-func)
+	wl-draft-add-references wl-draft-cite-function)
     (with-current-buffer wl-draft-buffer-cur-summary-buffer
       (with-current-buffer wl-message-buffer
 	(setq mail-reply-buffer (wl-message-get-original-buffer))))
@@ -568,7 +567,7 @@ Reply to author if WITH-ARG is non-nil."
 			     num))))
 	(mail-reply-buffer (get-buffer-create "*wl-draft-insert-get-message*"))
 	mail-citation-hook mail-yank-hooks
-	wl-draft-cite-func)
+	wl-draft-cite-function)
     (unwind-protect
 	(progn
 	  (elmo-message-fetch (wl-folder-get-elmo-folder fld)
@@ -1023,11 +1022,11 @@ If FORCE-MSGID, ignore 'wl-insert-message-id'."
 	(progn
 	  (if (and (wl-message-mail-p)
 		   (not (wl-draft-sent-message-p 'mail)))
-	      (funcall wl-draft-send-mail-func))
+	      (funcall wl-draft-send-mail-function))
 	  (if (and (wl-message-news-p)
 		   (not (wl-draft-sent-message-p 'news))
 		   (not (wl-message-field-exists-p "Resent-to")))
-	      (funcall wl-draft-send-news-func)))
+	      (funcall wl-draft-send-news-function)))
       ;;
       (let* ((status (wl-draft-sent-message-results))
 	     (unplugged-via (car status))
@@ -1110,7 +1109,7 @@ If optional argument is non-nil, current draft buffer is killed"
 	    (run-hooks 'mail-send-hook) ; translate buffer
 	    (if wl-draft-verbose-send
 		(message (or mes-string "Sending...")))
-	    (funcall wl-draft-send-func editing-buffer kill-when-done)
+	    (funcall wl-draft-send-function editing-buffer kill-when-done)
 	    ;; Now perform actions on successful sending.
 	    (while mail-send-actions
 	      (condition-case ()
@@ -1340,8 +1339,7 @@ If optional argument is non-nil, current draft buffer is killed"
 		  wl-from) "\n"))
     (and in-reply-to (insert "In-Reply-To: " in-reply-to "\n"))
     (and references (insert "References: " references "\n"))
-    (insert (funcall wl-generate-mailer-string-func)
-	    "\n")
+    (insert (funcall wl-generate-mailer-string-function) "\n")
     (setq wl-draft-buffer-file-name file-name)
     (if mail-default-reply-to
 	(insert "Reply-To: " mail-default-reply-to "\n"))
@@ -1820,7 +1818,7 @@ If optional argument is non-nil, current draft buffer is killed"
 				    nil (current-buffer))
 		(condition-case err
 		    (setq failure (funcall
-				   wl-draft-queue-flush-send-func
+				   wl-draft-queue-flush-send-function
 				   (format "Sending (%d/%d)..." i len)))
 ;;;		  (wl-draft-raw-send nil nil
 ;;;				     (format "Sending (%d/%d)..." i len))
diff --git a/wl/wl-expire.el b/wl/wl-expire.el
index 752f550..240e1c6 100644
--- a/wl/wl-expire.el
+++ b/wl/wl-expire.el
@@ -310,7 +310,7 @@ If REFILE-LIST includes reserve mark message, so copy."
 Refile to archive folder followed message number."
   (let* ((elmo-archive-treat-file t)	;; treat archive folder as a file.
 	 (dst-folder-fmt (funcall
-			  wl-expire-archive-get-folder-func folder))
+			  wl-expire-archive-get-folder-function folder))
 	 (dst-folder-base (car dst-folder-fmt))
 	 (dst-folder-fmt (cdr dst-folder-fmt))
 	 (refile-func (if no-delete
@@ -356,7 +356,7 @@ Refile to archive folder followed message number."
 Refile to archive folder followed the number of message in one archive folder."
   (let* ((elmo-archive-treat-file t)	;; treat archive folder as a file.
 	 (dst-folder-fmt (funcall
-			  wl-expire-archive-get-folder-func folder))
+			  wl-expire-archive-get-folder-function folder))
 	 (dst-folder-base (car dst-folder-fmt))
 	 (dst-folder-fmt (cdr dst-folder-fmt))
 	 (refile-func (if no-delete
@@ -413,7 +413,7 @@ Refile to archive folder followed message date."
 	 (number-alist (elmo-msgdb-get-number-alist msgdb))
 	 (overview (elmo-msgdb-get-overview msgdb))
 	 (dst-folder-fmt (funcall
-			  wl-expire-archive-get-folder-func
+			  wl-expire-archive-get-folder-function
 			  folder
 			  wl-expire-archive-date-folder-name-fmt
 			  ))
diff --git a/wl/wl-fldmgr.el b/wl/wl-fldmgr.el
index 990bcc6..f63811e 100644
--- a/wl/wl-fldmgr.el
+++ b/wl/wl-fldmgr.el
@@ -809,7 +809,7 @@ return value is diffs '(-new -unread -all)."
     (beginning-of-line)
     (let ((ret-val nil)
 	  (inhibit-read-only t)
-	  (wl-folder-completion-func
+	  (wl-folder-completion-function
 	   (if wl-fldmgr-add-complete-with-current-folder-list
 	       (function wl-fldmgr-add-completion-subr)))
 	  tmp indent path diffs)
@@ -1023,7 +1023,7 @@ return value is diffs '(-new -unread -all)."
 		      (wl-folder-get-realname (wl-match-buffer 3))
 		      wl-folder-entity))
 	(message "Sorting...")
-	(setq flist (sort (nth 2 entity) wl-fldmgr-sort-func))
+	(setq flist (sort (nth 2 entity) wl-fldmgr-sort-function))
 	(setcar (cddr entity) flist)
 	(wl-fldmgr-add-modified-access-list (car entity))
 	(setq wl-fldmgr-modified t)
diff --git a/wl/wl-folder.el b/wl/wl-folder.el
index b485a13..2b4e2a9 100644
--- a/wl/wl-folder.el
+++ b/wl/wl-folder.el
@@ -56,7 +56,7 @@
 
 (defvar wl-folder-newsgroups-hashtb nil)
 (defvar wl-folder-info-alist-modified nil)
-(defvar wl-folder-completion-func nil)
+(defvar wl-folder-completion-function nil)
 
 (defvar wl-folder-mode-map nil)
 
@@ -1969,12 +1969,12 @@ Entering Folder mode calls the value of `wl-folder-mode-hook'."
 			nil nil "nntp" add))
     (run-hooks 'wl-make-plugged-hook)))
 
-(defvar wl-folder-init-func 'wl-local-folder-init)
+(defvar wl-folder-init-function 'wl-local-folder-init)
 
 (defun wl-folder-init ()
-  "Call `wl-folder-init-func' function."
+  "Call `wl-folder-init-function' function."
   (interactive)
-  (funcall wl-folder-init-func))
+  (funcall wl-folder-init-function))
 
 (defun wl-local-folder-init ()
   "Initialize local folder."
diff --git a/wl/wl-highlight.el b/wl/wl-highlight.el
index ec8b5a1..ffb9e9c 100644
--- a/wl/wl-highlight.el
+++ b/wl/wl-highlight.el
@@ -1034,8 +1034,8 @@ This function is defined for `window-scroll-functions'"
     (wl-highlight-message beg end nil)
     (unless for-draft
       (wl-highlight-message-add-buttons-to-header beg end)
-      (when wl-highlight-x-face-func
-	(funcall wl-highlight-x-face-func beg end)))
+      (when wl-highlight-x-face-function
+	(funcall wl-highlight-x-face-function beg end)))
     (run-hooks 'wl-highlight-headers-hook)))
 
 (defun wl-highlight-message-add-buttons-to-header (start end)
@@ -1158,7 +1158,7 @@ interpreted as cited text.)"
 	  (widen)
 	  ;; take off signature
 	  (if (and hack-sig (not too-big))
-	      (setq end (funcall wl-highlight-signature-search-func
+	      (setq end (funcall wl-highlight-signature-search-function
 				 (- end wl-max-signature-size) end)))
 	  (if hack-sig
 	      (put-text-property end (point-max)
diff --git a/wl/wl-message.el b/wl/wl-message.el
index c669d8e..c8800f7 100644
--- a/wl/wl-message.el
+++ b/wl/wl-message.el
@@ -47,7 +47,7 @@
 
 (defconst wl-message-buffer-prefetch-idle-time
   (if (featurep 'lisp-float-type) (/ (float 1) (float 5)) 1))
-(defvar wl-message-buffer-prefetch-get-next-func
+(defvar wl-message-buffer-prefetch-get-next-function
   'wl-summary-default-get-next-msg)
 
 (defvar wl-message-buffer-prefetch-folder-type-list t)
@@ -457,7 +457,7 @@ Returns non-nil if bottom of message."
 	(elmo-fetch-threshold wl-fetch-confirm-threshold))
     (prog1 
 	(if (eq flag 'as-is)
-	    (let (wl-highlight-x-face-func)
+	    (let (wl-highlight-x-face-function)
 	      (elmo-mime-display-as-is folder number
 				       (current-buffer)
 				       (wl-message-get-original-buffer)
@@ -496,7 +496,7 @@ Returns non-nil if bottom of message."
 					       summary charset)
   (if (wl-message-buffer-prefetch-p folder)
       (with-current-buffer (or summary (get-buffer wl-summary-buffer-name))
-	(let* ((next (funcall wl-message-buffer-prefetch-get-next-func
+	(let* ((next (funcall wl-message-buffer-prefetch-get-next-function
 			      number)))
 	  (when (and next (wl-message-buffer-prefetch-p folder next))
 	    (if (not (fboundp 'run-with-idle-timer))
diff --git a/wl/wl-score.el b/wl/wl-score.el
index 112ccba..50e29bc 100644
--- a/wl/wl-score.el
+++ b/wl/wl-score.el
@@ -101,7 +101,7 @@
 (defvar wl-score-header-buffer-list nil)
 (defvar wl-score-alike-hashtb nil)
 
-(defvar wl-score-edit-exit-func nil
+(defvar wl-score-edit-exit-function nil
   "Function run on exit from the score buffer.")
 
 (make-variable-buffer-local 'wl-current-score-file)
@@ -1301,7 +1301,7 @@ Set `wl-score-cache' nil."
 	  (wl-message-select-buffer edit-buffer))
       (switch-to-buffer edit-buffer))
     (wl-score-mode)
-    (setq wl-score-edit-exit-func 'wl-score-edit-done)
+    (setq wl-score-edit-exit-function 'wl-score-edit-done)
     (setq wl-score-edit-summary-buffer sum-buf)
     (make-local-variable 'wl-prev-winconf)
     (setq wl-prev-winconf winconf))
@@ -1354,7 +1354,7 @@ Entering Score mode calls the value of `wl-score-mode-hook'."
   (setq major-mode 'wl-score-mode)
   (setq mode-name "Score")
   (lisp-mode-variables nil)
-  (make-local-variable 'wl-score-edit-exit-func)
+  (make-local-variable 'wl-score-edit-exit-function)
   (make-local-variable 'wl-score-edit-summary-buffer)
   (run-hooks 'emacs-lisp-mode-hook 'wl-score-mode-hook))
 
@@ -1386,8 +1386,8 @@ Entering Score mode calls the value of `wl-score-mode-hook'."
     (wl-as-mime-charset wl-score-mode-mime-charset
       (save-buffer)))
   (let ((buf (current-buffer)))
-    (when wl-score-edit-exit-func
-      (funcall wl-score-edit-exit-func))
+    (when wl-score-edit-exit-function
+      (funcall wl-score-edit-exit-function))
     (kill-buffer buf)))
 
 (defun wl-score-edit-kill ()
@@ -1395,8 +1395,8 @@ Entering Score mode calls the value of `wl-score-mode-hook'."
   (interactive)
   (let ((buf (current-buffer)))
     (set-buffer-modified-p nil)
-    (when wl-score-edit-exit-func
-      (funcall wl-score-edit-exit-func))
+    (when wl-score-edit-exit-function
+      (funcall wl-score-edit-exit-function))
     (kill-buffer buf)))
 
 (defun wl-score-edit-get-summary-buf ()
diff --git a/wl/wl-summary.el b/wl/wl-summary.el
index 8c7234a..cb1164e 100644
--- a/wl/wl-summary.el
+++ b/wl/wl-summary.el
@@ -103,9 +103,9 @@
 (defvar wl-summary-buffer-prev-refile-destination nil)
 (defvar wl-summary-buffer-prev-copy-destination nil)
 (defvar wl-summary-buffer-saved-message nil)
-(defvar wl-summary-buffer-prev-folder-func nil)
-(defvar wl-summary-buffer-next-folder-func nil)
-(defvar wl-summary-buffer-exit-func nil)
+(defvar wl-summary-buffer-prev-folder-function nil)
+(defvar wl-summary-buffer-next-folder-function nil)
+(defvar wl-summary-buffer-exit-function nil)
 (defvar wl-summary-buffer-number-list nil)
 (defvar wl-summary-buffer-msgdb nil)
 (defvar wl-summary-buffer-folder-name nil)
@@ -125,7 +125,7 @@
 (defvar wl-summary-delayed-update nil)
 (defvar wl-summary-search-buf-folder-name nil)
 
-(defvar wl-summary-get-petname-func 'wl-address-get-petname-1)
+(defvar wl-summary-get-petname-function 'wl-address-get-petname-1)
 
 (defvar wl-summary-message-regexp "^ *\\([0-9-]+\\)")
 
@@ -173,9 +173,9 @@
 (make-variable-buffer-local 'wl-thread-vertical-str-internal)
 (make-variable-buffer-local 'wl-thread-horizontal-str-internal)
 (make-variable-buffer-local 'wl-thread-space-str-internal)
-(make-variable-buffer-local 'wl-summary-buffer-prev-folder-func)
-(make-variable-buffer-local 'wl-summary-buffer-next-folder-func)
-(make-variable-buffer-local 'wl-summary-buffer-exit-func)
+(make-variable-buffer-local 'wl-summary-buffer-prev-folder-function)
+(make-variable-buffer-local 'wl-summary-buffer-next-folder-function)
+(make-variable-buffer-local 'wl-summary-buffer-exit-function)
 (make-variable-buffer-local 'wl-summary-buffer-number-list)
 (make-variable-buffer-local 'wl-summary-buffer-msgdb)
 (make-variable-buffer-local 'wl-summary-buffer-folder-name)
@@ -223,7 +223,7 @@
 				 (eword-decode-string
 				  (if wl-use-petname
 				      (or
-				       (funcall wl-summary-get-petname-func to)
+				       (funcall wl-summary-get-petname-function to)
 				       (car
 					(std11-extract-address-components to))
 				       to)
@@ -234,7 +234,7 @@
 			 entity "newsgroups"))
 	       (setq retval (concat "Ng:" ng)))))
       (if wl-use-petname
-	  (setq retval (or (funcall wl-summary-get-petname-func from)
+	  (setq retval (or (funcall wl-summary-get-petname-function from)
 			   (car (std11-extract-address-components from))
 			   from))
 	(setq retval from)))
@@ -242,7 +242,7 @@
 
 (defun wl-summary-simple-from (string)
   (if wl-use-petname
-      (or (funcall wl-summary-get-petname-func string)
+      (or (funcall wl-summary-get-petname-function string)
 	  (car (std11-extract-address-components string))
 	  string)
     string))
@@ -1012,8 +1012,8 @@ Entering Folder mode calls the value of `wl-summary-mode-hook'."
 	summary-win
 	message-buf message-win
 	folder-buf folder-win)
-    (if wl-summary-buffer-exit-func
-	(funcall wl-summary-buffer-exit-func)
+    (if wl-summary-buffer-exit-function
+	(funcall wl-summary-buffer-exit-function)
       (wl-summary-cleanup-temp-marks sticky)
       (unwind-protect
 	  ;; save summary status
@@ -3223,7 +3223,7 @@ If optional argument NUMBER is specified, mark message specified by NUMBER."
   (let ((fld (completing-read
 	      (format "Folder name %s(%s): " (or purpose "")
 		      default)
-	      (or wl-folder-completion-func
+	      (or wl-folder-completion-function
 		  (if (memq 'read-folder wl-use-folder-petname)
 		      (wl-folder-get-entity-with-petname)
 		    wl-folder-entity-hashtb))
@@ -5002,8 +5002,8 @@ Use function list is `wl-summary-write-current-folder-functions'."
 	  (if wl-summary-buffer-disp-msg
 	      (wl-summary-redisplay)))
       (if (or interactive (interactive-p))
-	  (if wl-summary-buffer-prev-folder-func
-	      (funcall wl-summary-buffer-prev-folder-func)
+	  (if wl-summary-buffer-prev-folder-function
+	      (funcall wl-summary-buffer-prev-folder-function)
 	    (when wl-auto-select-next
 	      (setq next-entity (wl-summary-get-prev-folder))
 	      (if next-entity
@@ -5041,8 +5041,8 @@ Use function list is `wl-summary-write-current-folder-functions'."
 	(if wl-summary-buffer-disp-msg
 	    (wl-summary-redisplay))
       (if (or interactive (interactive-p))
-	  (if wl-summary-buffer-next-folder-func
-	      (funcall wl-summary-buffer-next-folder-func)
+	  (if wl-summary-buffer-next-folder-function
+	      (funcall wl-summary-buffer-next-folder-function)
 	    (when wl-auto-select-next
 	      (setq next-entity (wl-summary-get-next-folder))
 	      (if next-entity
@@ -5063,8 +5063,8 @@ Use function list is `wl-summary-write-current-folder-functions'."
 	  (wl-summary-redisplay))
     (if (or interactive
 	    (interactive-p))
-	(if wl-summary-buffer-prev-folder-func
-	    (funcall wl-summary-buffer-prev-folder-func)
+	(if wl-summary-buffer-prev-folder-function
+	    (funcall wl-summary-buffer-prev-folder-function)
 	  (let (next-entity finfo)
 	    (when wl-auto-select-next
 	      (progn
@@ -5121,8 +5121,8 @@ Use function list is `wl-summary-write-current-folder-functions'."
 	  (wl-summary-redisplay))
     (if (or interactive
 	    (interactive-p))
-	(if wl-summary-buffer-next-folder-func
-	    (funcall wl-summary-buffer-next-folder-func)
+	(if wl-summary-buffer-next-folder-function
+	    (funcall wl-summary-buffer-next-folder-function)
 	  (let (next-entity finfo)
 	    (when wl-auto-select-next
 	      (setq next-entity (wl-summary-get-next-unread-folder)))
@@ -5435,7 +5435,7 @@ Use function list is `wl-summary-write-current-folder-functions'."
 	    (let ((buffer (generate-new-buffer " *print*")))
 	      (copy-to-buffer buffer (point-min) (point-max))
 	      (set-buffer buffer)
-	      (funcall wl-print-buffer-func)
+	      (funcall wl-print-buffer-function)
 	      (kill-buffer buffer)))
 	(message "")))))
 
@@ -5482,7 +5482,7 @@ Use function list is `wl-summary-write-current-folder-functions'."
 			 (list "/pagenumberstring load"
 			       (concat "(" wl-ps-date ")"))))
 		    (run-hooks 'wl-ps-print-hook)
-		    (funcall wl-ps-print-buffer-func filename))
+		    (funcall wl-ps-print-buffer-function filename))
 		(kill-buffer buffer)))))
       (message ""))))
 
diff --git a/wl/wl-template.el b/wl/wl-template.el
index ca8a42d..0129e5a 100644
--- a/wl/wl-template.el
+++ b/wl/wl-template.el
@@ -134,10 +134,9 @@ ARG is ignored."			; ARG ignored this version (?)
        (setq wl-template (car (nth wl-template-cur-num wl-template-alist)))
        mail-header-separator)
       (wl-highlight-message (point-min) (point-max) t)
-      (and wl-highlight-x-face-func
-	   (funcall
-	    wl-highlight-x-face-func
-	    (point-min) (re-search-forward mail-header-separator nil t)))
+      (when wl-highlight-x-face-function
+	(funcall wl-highlight-x-face-function
+		 (point-min) (re-search-forward mail-header-separator nil t)))
       (setq mode-line-process (concat ":" wl-template))
       (set-buffer-modified-p nil))))
 
diff --git a/wl/wl-util.el b/wl/wl-util.el
index 91d3cd9..486b742 100644
--- a/wl/wl-util.el
+++ b/wl/wl-util.el
@@ -645,15 +645,15 @@ that `read' can handle, whenever this is possible."
 	  ">"))
 
 ;;; Profile loading.
-(defvar wl-load-profile-func 'wl-local-load-profile)
+(defvar wl-load-profile-function 'wl-local-load-profile)
 (defun wl-local-load-profile ()
   "Load `wl-init-file'."
   (message "Initializing ...")
   (load wl-init-file 'noerror 'nomessage))
 
 (defun wl-load-profile ()
-  "Call `wl-load-profile-func' function."
-  (funcall wl-load-profile-func))
+  "Call `wl-load-profile-function' function."
+  (funcall wl-load-profile-function))
 
 ;;;
 
diff --git a/wl/wl-vars.el b/wl/wl-vars.el
index 898b2d6..75c189e 100644
--- a/wl/wl-vars.el
+++ b/wl/wl-vars.el
@@ -163,17 +163,17 @@ If you don't have multiple e-mail addresses, you don't have to set this."
 		 string)
   :group 'wl)
 
-(defcustom wl-summary-from-func 'wl-summary-default-from
+(defcustom wl-summary-from-function 'wl-summary-default-from
   "*A function for displaying sender (From: field) information."
   :type 'function
   :group 'wl-summary)
 
-(defcustom wl-summary-subject-func 'wl-summary-default-subject
+(defcustom wl-summary-subject-function 'wl-summary-default-subject
   "*A function for displaying subject."
   :type 'function
   :group 'wl-summary)
 
-(defcustom wl-summary-subject-filter-func 'wl-summary-default-subject-filter
+(defcustom wl-summary-subject-filter-function 'wl-summary-default-subject-filter
   "*A filter function for comparing subjects."
   :type 'function
   :group 'wl-summary)
@@ -303,7 +303,7 @@ If nil, don't authenticate."
   "*POP3 user name to send mail using POP-before-SMTP.
 If nil, `elmo-default-pop3-user' is used.
 To use POP-before-SMTP,
-(setq wl-draft-send-mail-func 'wl-draft-send-mail-with-pop-before-smtp)"
+(setq wl-draft-send-mail-function 'wl-draft-send-mail-with-pop-before-smtp)"
   :type '(choice (const :tag "none" nil)
                  string)
   :group 'wl)
@@ -513,17 +513,17 @@ reasons of system internal to accord facilities for the Emacs variants.")
   "A hook called when exit plugged mode.")
 
 ;;;; functions for draft
-(defcustom wl-draft-send-func 'wl-draft-normal-send-func
+(defcustom wl-draft-send-function 'wl-draft-normal-send-func
   "A function to send message."
   :type 'function
   :group 'wl-draft)
 
-(defcustom wl-draft-send-news-func 'wl-draft-elmo-nntp-send
+(defcustom wl-draft-send-news-function 'wl-draft-elmo-nntp-send
   "A function to send news."
   :type 'function
   :group 'wl-draft)
 
-(defcustom wl-draft-send-mail-func 'wl-draft-send-mail-with-smtp
+(defcustom wl-draft-send-mail-function 'wl-draft-send-mail-with-smtp
   "A function to send mail.
 Prepared candidates are 'wl-draft-send-mail-with-smtp,
 'wl-draft-send-mail-with-qmail and 'wl-draft-send-mail-with-pop-before-smtp."
@@ -1048,12 +1048,12 @@ Available if only `wl-summary-lazy-highlight' is nil."
   :type 'file
   :group 'wl-summary)
 
-(defcustom wl-print-buffer-func 'lpr-buffer
+(defcustom wl-print-buffer-function 'lpr-buffer
   "A function to print current buffer."
   :type 'function
   :group 'wl-pref)
 
-(defcustom wl-ps-print-buffer-func
+(defcustom wl-ps-print-buffer-function
   (if window-system 'ps-print-buffer-with-faces 'ps-print-buffer)
   "A function to print current buffer with ps-print."
   :type 'function
@@ -1263,7 +1263,7 @@ with wl-highlight-folder-many-face."
   :group 'wl-summary
   :group 'wl-pref)
 
-(defcustom wl-generate-mailer-string-func 'wl-generate-user-agent-string
+(defcustom wl-generate-mailer-string-function 'wl-generate-user-agent-string
   "A function to create X-Mailer field string ."
   :type 'function
   :group 'wl-draft)
@@ -1276,7 +1276,7 @@ with wl-highlight-folder-many-face."
 		(const light))
   :group 'wl-highlight)
 
-(defcustom wl-highlight-x-face-func nil
+(defcustom wl-highlight-x-face-function nil
   "A function to display X-Face."
   :type 'function
   :group 'wl-highlight)
@@ -1783,7 +1783,7 @@ ex.
   :type 'string
   :group 'wl-folder)
 
-(defcustom wl-fldmgr-sort-func 'wl-fldmgr-sort-standard
+(defcustom wl-fldmgr-sort-function 'wl-fldmgr-sort-standard
   "*A function to sort folder."
   :type 'function
   :group 'wl-folder)
@@ -1909,7 +1909,7 @@ list  : reserved specified permanent marks."
   :group 'wl-expire)
 
 ;; for wl-expire-archive-{number1|number2|date}
-(defcustom wl-expire-archive-get-folder-func
+(defcustom wl-expire-archive-get-folder-function
   'wl-expire-archive-get-folder
   "*A function to get archive folder name."
   :type 'function
@@ -2086,7 +2086,7 @@ If it is a number, only numbers will be highlighted."
 		 (const :tag "don't highlight" nil))
   :group 'wl-highlight)
 
-(defcustom wl-highlight-signature-search-func 'wl-highlight-signature-search
+(defcustom wl-highlight-signature-search-function 'wl-highlight-signature-search
   "Function to search signature area in the message body."
   :type 'function
   :group 'wl-highlight)
diff --git a/wl/wl-version.el b/wl/wl-version.el
index b870a6d..5986a94 100644
--- a/wl/wl-version.el
+++ b/wl/wl-version.el
@@ -90,7 +90,7 @@
 (defvar mime-editor/codename)
 
 (defun wl-generate-user-agent-string ()
-  "A candidate of `wl-generate-mailer-string-func'.
+  "A candidate of `wl-generate-mailer-string-function'.
 Insert User-Agent field instead of X-Mailer field."
   (concat "User-Agent: "
 	  (wl-generate-user-agent-string-1
diff --git a/wl/wl.el b/wl/wl.el
index 004a52f..e54b8eb 100644
--- a/wl/wl.el
+++ b/wl/wl.el
@@ -676,11 +676,11 @@ Entering Plugged mode calls the value of `wl-plugged-mode-hook'."
 	    ;; defined above.
 	    (wl-mime-setup)
 	    (fset 'wl-summary-from-func-internal
-		  (symbol-value 'wl-summary-from-func))
+		  (symbol-value 'wl-summary-from-function))
 	    (fset 'wl-summary-subject-func-internal
-		  (symbol-value 'wl-summary-subject-func))
+		  (symbol-value 'wl-summary-subject-function))
 	    (fset 'wl-summary-subject-filter-func-internal
-		  (symbol-value 'wl-summary-subject-filter-func))
+		  (symbol-value 'wl-summary-subject-filter-function))
 	    (setq elmo-no-from wl-summary-no-from-message)
 	    (setq elmo-no-subject wl-summary-no-subject-message)
 	    (setq succeed t)