Remove old emacsen from support environments.

*-func -> *-funtion.

diff --git a/doc/wl-ja.texi b/doc/wl-ja.texi
index 5b3bb9c..92bf40b 100644 (file)
--- a/doc/wl-ja.texi
+++ b/doc/wl-ja.texi
@@ -178,12 +178,8 @@ Wanderlust \e$B$N<g$JFCD'\e(B/\e$BFCD9$O0J2<$NDL$j$G$9!#\e(B
 @section \e$BF0:n4D6-\e(B
 
 Wanderlust \e$B$O0J2<$N\e(B Emacsen \e$B$GF0:n$9$k$3$H$,3NG'$5$l$F$$$^$9!#\e(B
-@c \e$B$5$i$K\e(B Nemacs 3.3.2 \e$B>e$G$b!"\e(B(\e$B;H$($k5!G=$O8BDj$5$l$k$b$N$N\e(B) \e$BF0:n$9$k$3$H\e(B
-@c \e$B$,3NG'$5$l$F$$$^$9!#\e(B
 
 @itemize @bullet
-@item Nemacs 3.3.2 (\e$BCm\e(B: \e$B;H$($k5!G=$O8BDj$5$l$^$9\e(B)
-@item Mule 2.3 based on Emacs 19.28
 @item Mule 2.3 based on Emacs 19.34
 @item Emacs 20.2 \e$B0J9_\e(B
 @item XEmacs 20.4 \e$B0J9_\e(B
@@ -2025,7 +2021,7 @@ Non-nil \e$B$J$i%5%^%j$K0\F0$7$?$H$-$K%U%)%k%@%P%C%U%!$N1&$K%5%^%j$N%P%C%U%!$,8=$
 
 @subsubsection \e$B%U%)%k%@$NJB$SBX$(\e(B
 
-\e$B%0%k!<%WFb$N%U%)%k%@$rJB$SBX$($9$k:]!"\e(B@code{wl-fldmgr-sort-func} \e$B$K;XDj\e(B
+\e$B%0%k!<%WFb$N%U%)%k%@$rJB$SBX$($9$k:]!"\e(B@code{wl-fldmgr-sort-function} \e$B$K;XDj\e(B
 \e$B$5$l$?4X?t$rMQ$$$^$9!#=i4|@_Dj$G$O\e(B @code{wl-fldmgr-sort-standard} \e$B$,;XDj\e(B
 \e$B$5$l$F$*$j!"$3$l$O%"%k%U%!%Y%C%H=g$KJB$SBX$(%0%k!<%W$O:G=i$K$9$k4X?t$G$9!#\e(B
 \e$BJB$SBX$($O;XDj$7$?%0%k!<%W$N$_9T$$!"2<0L$N%0%k!<%W$^$GJB$SBX$($O$7$^$;$s!#\e(B
@@ -2255,8 +2251,8 @@ wl-folders-file \e$B$K%;!<%V$9$k!#\e(B
 \e$B=i4|@_Dj$O\e(B @code{t}\e$B!#\e(BNon-nil \e$B$J$i!"%;!<%V$9$k:]$K\e(B @file{~/.folders.bak} 
 \e$B$K%P%C%/%"%C%W$r<h$j$^$9!#\e(B
 
-@item wl-fldmgr-sort-func
-@vindex wl-fldmgr-sort-func
+@item wl-fldmgr-sort-function
+@vindex wl-fldmgr-sort-function
 \e$B=i4|@_Dj$O\e(B @code{wl-fldmgr-sort-standard}\e$B!#\e(Bsort \e$B;~$K;HMQ$9$k4X?t$r;XDj$7\e(B
 \e$B$^$9!#=i4|@_Dj$O!"%"%k%U%!%Y%C%H=g$KJB$Y%0%k!<%W$O:G=i$K$9$k4X?t$G$9!#\e(B
 (@code{wl-fldmgr-sort-group-first} \e$B$,\e(B non-nil \e$B$N>l9g\e(B)\e$B!#\e(B
@@ -2915,11 +2911,11 @@ prefix argument \e$B$D$-$G<B9T$9$k$H!"G$0U$NF~NO%"%I%l%9$rEPO?\e(B/\e$BJQ99\e(B/\e$B:
 @kindex # (Summary)
 @findex wl-summary-print-message
 \e$B8=:_$N%a%C%;!<%8$NFbMF$r0u:~$7$^$9!#\e(BEmacs 20\e$B0J9_\e(B \e$B$G$O\e(B @code{ps-print} \e$B$r\e(B
-\e$B;H$$$^$9!#Gr9u%W%j%s%?$G$O!"\e(B@code{wl-ps-print-buffer-func} \e$B$r\e(B
+\e$B;H$$$^$9!#Gr9u%W%j%s%?$G$O!"\e(B@code{wl-ps-print-buffer-function} \e$B$r\e(B
 @code{ps-print-buffer} \e$B$K@_Dj$7$?$[$&$,NI$$$+$b$7$l$^$;$s!#\e(B
 
 @lisp
-(setq wl-ps-print-buffer-func 'ps-print-buffer)
+(setq wl-ps-print-buffer-function 'ps-print-buffer)
 @end lisp
 
 @noindent
@@ -3949,7 +3945,7 @@ POP-before-SMTP \e$B$K$h$k%a!<%k$NAw?.$,$G$-$^$9!#\e(B
 \e$B@_Dj$O!"\e(B
 
 @lisp
-(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)
 @end lisp
 
 @noindent
@@ -5053,8 +5049,8 @@ Non-nil \e$B$K$9$k$H!"\e(B
 \e$B;D$7$F$*$/%a%C%;!<%8?t$K\e(B @code{wl-summary-expire-reserve-marks} \e$B$G@_Dj$5\e(B
 \e$B$l$?%a%C%;!<%8$r4^$a$^$9!#\e(B
 
-@item wl-expire-archive-get-folder-func
-@vindex wl-expire-archive-get-folder-func
+@item wl-expire-archive-get-folder-function
+@vindex wl-expire-archive-get-folder-function
 \e$B=i4|@_Dj$O\e(B @code{wl-expire-archive-get-folder}\e$B!#\e(B
 
 \e$B:o=|@h$NI8=`4X?t$G%"!<%+%$%V%U%)%k%@L>$r<hF@$9$k4X?t$r;XDj$7$^$9!#\e(B
@@ -5222,7 +5218,7 @@ expire \e$B$J$I$NF0:n$K$O1F6A$O$"$j$^$;$s!#\e(B
 \e$B$9$k$@$1$K$J$j$^$9!#\e(B
 
 \e$B%G%U%)%k%H$G$O%3%T!<@h$N%"!<%+%$%V%U%)%k%@$O\e(B
-@code{wl-expire-archive-get-folder-func} \e$B$K=>$C$F<+F0E*$K7hDj$5$l$^$9$,!"\e(B
+@code{wl-expire-archive-get-folder-function} \e$B$K=>$C$F<+F0E*$K7hDj$5$l$^$9$,!"\e(B
 prefix argument \e$B$rIU$1$F\e(B @kbd{C-u M-x wl-summary-archive} \e$B$G<B9T$9$k$H!"\e(B
 \e$B;XDj$7$?%U%)%k%@$K%3%T!<$9$k$3$H$,$G$-$^$9!#\e(B
 
@@ -5236,7 +5232,7 @@ prefix argument \e$B$rIU$1$F\e(B @kbd{C-u M-x wl-summary-archive} \e$B$G<B9T$9$k$H!
 
 @itemize @bullet
 @item @code{wl-expire-archive-files}
-@item @code{wl-expire-archive-get-folder-func}
+@item @code{wl-expire-archive-get-folder-function}
 @item @code{wl-expire-archive-folder-name-fmt}
 @item @code{wl-expire-archive-folder-type}
 @item @code{wl-expire-archive-folder-prefix}
@@ -5792,7 +5788,7 @@ OK \e$B$G$9!#\e(B
 @lisp
 @group
 (autoload 'wl-draft-send-with-imput-async "im-wl")
-(setq wl-draft-send-func 'wl-draft-send-with-imput-async)
+(setq wl-draft-send-function 'wl-draft-send-with-imput-async)
 @end group
 @end lisp
 
@@ -5820,7 +5816,7 @@ OK \e$B$G$9!#\e(B
 (setq signature-use-bbdb t)
 (setq bbdb-north-american-phone-numbers-p nil)
 ;; @r{\e$B%5%^%j$K\e(B bbdb \e$B$NL>A0$rI=<(\e(B} :-)\e$B!#\e(B
-(setq wl-summary-from-func 'bbdb-wl-from-func)
+(setq wl-summary-from-function 'bbdb-wl-from-func)
 ;; @r{\e$B<+F0E*$K\e(B ML \e$B%U%#!<%k%I$r2C$($k\e(B}
 (add-hook 'bbdb-notice-hook 'bbdb-auto-notes-hook)
 (setq bbdb-auto-notes-alist '(("X-ML-Name" (".*$" ML 0))))
@@ -5886,7 +5882,7 @@ x-face-mule 0.19\e$B0JA0$N%P!<%8%g%s$r$*;H$$$J$i!"\e(B
 
 @lisp
 @group
-(setq wl-highlight-x-face-func
+(setq wl-highlight-x-face-function
       (function
        (lambda (&optional beg end)
          (x-face-mule:x-face-decode-message-header))))
@@ -5899,7 +5895,7 @@ x-face-mule 0.20 \e$B0J9_$N%P!<%8%g%s$r$*;H$$$J$i!"\e(B
 
 @lisp
 @group
-(setq wl-highlight-x-face-func
+(setq wl-highlight-x-face-function
       (function
        (lambda (&optional beg end)
          (x-face-mule-x-face-decode-message-header))))
@@ -5913,7 +5909,7 @@ bitmap-mule 8.0\e$B0J9_$KIUB0$N\e(B @file{x-face-mule.el}
 @lisp
 @group
 (autoload 'x-face-decode-message-header "x-face-mule")
-(setq wl-highlight-x-face-func 'x-face-decode-message-header)
+(setq wl-highlight-x-face-function 'x-face-decode-message-header)
 @end group
 @end lisp
 
@@ -6356,14 +6352,14 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 
 @samp{X-Mailer:} \e$B%U%#!<%k%I$d\e(B @samp{User-Agent:} \e$B%U%#!<%k%I$K6E$j$?$$$H\e(B
 \e$B$$$&JQ$o$C$??M$O!"J8;zNs$r@8@.$9$k4X?t$r<+J,$N9%$-$J$h$&$KDj5A$7$F!"JQ?t\e(B 
-@code{wl-generate-mailer-string-func} \e$B$K@_Dj$7$F$/$@$5$$!#\e(B
+@code{wl-generate-mailer-string-function} \e$B$K@_Dj$7$F$/$@$5$$!#\e(B
 
 @samp{User-Agent:} \e$B%U%#!<%k%I$rC;$/$7$?$$$N$G$"$l$P!"0J2<$N@_Dj$r$7$F$/\e(B
 \e$B$@$5$$!#\e(B
 
 @lisp
 @group
-(setq wl-generate-mailer-string-func
+(setq wl-generate-mailer-string-function
       (function
        (lambda ()
          (concat "User-Agent: "
@@ -6376,7 +6372,7 @@ face \e$B$N@_Dj$O\e(B @file{.emacs} \e$B$K=q$/$3$H$O$G$-$J$$$N$G\e(B @file{~/.wl} \e$
 @lisp
 @group
 (setq mime-edit-insert-user-agent-field nil)
-(setq wl-generate-mailer-string-func
+(setq wl-generate-mailer-string-function
       (function
        (lambda ()
          (format "X-Mailer: %s" (product-string-1 'wl-version)))))

diff --git a/doc/wl.texi b/doc/wl.texi
index ecba453..49025cf 100644 (file)
--- a/doc/wl.texi
+++ b/doc/wl.texi
@@ -152,13 +152,9 @@ The main features of Wanderlust:
 
 @section Environment
 
-Wanderlust is supposed to run on following Emacsen: 
-@c Wanderlust runs even on Nemacs 3.3.2 based on Emacs 18.55, 18.59 (with
-@c limited functionality).
+Wanderlust is supposed to run on following Emacsen:
 
 @itemize @bullet
-@item Nemacs 3.3.2 (Caution: limited functionality)
-@item Mule 2.3 based on Emacs 19.28
 @item Mule 2.3 based on Emacs 19.34
 @item Emacs 20.2 or later
 @item XEmacs 20.4 or later
@@ -2000,7 +1996,7 @@ filter can be specified while appending filter.  If you put
 @subsubsection Sort Folders
 
 Sorting of the folders is executed by the function specified by 
-@code{wl-fldmgr-sort-func}. 
+@code{wl-fldmgr-sort-function}. 
 The initial setting is @code{wl-fldmgr-sort-standard}, 
 which sorts alphabetically.
 Sorting affects only on the current folder group. It does not 
@@ -2234,8 +2230,8 @@ modified, confirm saving it before Wanderlust or Emacs exits.  If
 The initial setting is @code{t}.  If non-nil, @file{~/.folders.bak} is
 created before saving the folder status.
 
-@item wl-fldmgr-sort-func
-@vindex wl-fldmgr-sort-func
+@item wl-fldmgr-sort-function
+@vindex wl-fldmgr-sort-function
 The initial setting is @code{wl-fldmgr-sort-standard}.  A function to
 sort folders.  By default function, folders are sorted alphabetically
 and folder group is put on top (when @code{wl-fldmgr-sort-group-first}
@@ -2915,10 +2911,10 @@ Pipe current message's content to the external process.
 Print out current message's content.
 It uses @code{ps-print} module in Emacs 20.x.
 If you don't use color printer, you might want to set
-@code{wl-ps-print-buffer-func} to @code{ps-print-buffer}.
+@code{wl-ps-print-buffer-function} to @code{ps-print-buffer}.
 
 @lisp
-(setq wl-ps-print-buffer-func 'ps-print-buffer)
+(setq wl-ps-print-buffer-function 'ps-print-buffer)
 @end lisp
 
 (@code{wl-summary-print-message})
@@ -3964,7 +3960,7 @@ As shown in the example in @code{wl-draft-config-alist}, you can select
 You can send mail by POP-before-SMTP with this single line:
 
 @lisp
-(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)
 @end lisp
 
 @noindent
@@ -5097,8 +5093,8 @@ The initial setting is @code{nil}.
 If non-nil, if expiring messages are specified by @code{number},
 messages with @code{wl-summary-expire-reserve-marks} are also retained.
 
-@item wl-expire-archive-get-folder-func
-@vindex wl-expire-archive-get-folder-func
+@item wl-expire-archive-get-folder-function
+@vindex wl-expire-archive-get-folder-function
 The initial setting is @code{wl-expire-archive-get-folder}.
 
 This variable specifies a function that returns the name of an archiving 
@@ -5275,7 +5271,7 @@ If you try to re-file them after they are archived, they are deleted but
 not re-filed.
 
 Per default, the archiving folders to which messages are copied are
-determined automatically by @code{wl-expire-archive-get-folder-func}.
+determined automatically by @code{wl-expire-archive-get-folder-function}.
 You can copy to a specific folder by invoking with a prefix argument,
 i.e. @kbd{C-u M-x wl-summary-archive}.
 
@@ -5289,7 +5285,7 @@ relevant:
 
 @itemize @bullet
 @item @code{wl-expire-archive-files}
-@item @code{wl-expire-archive-get-folder-func}
+@item @code{wl-expire-archive-get-folder-function}
 @item @code{wl-expire-archive-folder-name-fmt}
 @item @code{wl-expire-archive-folder-type}
 @item @code{wl-expire-archive-folder-prefix}
@@ -5859,7 +5855,7 @@ If @command{imput} is on the @code{exec-path} at the installation,
 @lisp
 @group
 (autoload 'wl-draft-send-with-imput-async "im-wl")
-(setq wl-draft-send-func 'wl-draft-send-with-imput-async)
+(setq wl-draft-send-function 'wl-draft-send-with-imput-async)
 @end group
 @end lisp
 
@@ -5887,7 +5883,7 @@ byte-compiled and installed.
 (setq signature-use-bbdb t)
 (setq bbdb-north-american-phone-numbers-p nil)
 ;; @r{shows the name of bbdb in the summary} :-)
-(setq wl-summary-from-func 'bbdb-wl-from-func)
+(setq wl-summary-from-function 'bbdb-wl-from-func)
 ;; @r{automatically add mailing list fields}
 (add-hook 'bbdb-notice-hook 'bbdb-auto-notes-hook)
 (setq bbdb-auto-notes-alist '(("X-ML-Name" (".*$" ML 0))))
@@ -5950,7 +5946,7 @@ If you use x-face-mule 0.19 or older, do the following:
 
 @lisp
 @group
-(setq wl-highlight-x-face-func
+(setq wl-highlight-x-face-function
       (function
        (lambda (&optional beg end)
          (x-face-mule:x-face-decode-message-header))))
@@ -5962,7 +5958,7 @@ If you use x-face-mule 0.20 or later, try the following:
 
 @lisp
 @group
-(setq wl-highlight-x-face-func
+(setq wl-highlight-x-face-function
       (function
        (lambda (&optional beg end)
          (x-face-mule-x-face-decode-message-header))))
@@ -5976,7 +5972,7 @@ bitmap-mule 8.0 or later:
 @lisp
 @group
 (autoload 'x-face-decode-message-header "x-face-mule")
-(setq wl-highlight-x-face-func 'x-face-decode-message-header)
+(setq wl-highlight-x-face-function 'x-face-decode-message-header)
 @end group
 @end lisp
 
@@ -6424,13 +6420,13 @@ If you do not want to see branches, do the following:
 If you are eccentric enough to elaborate @samp{X-Mailer:} or
 @samp{User-Agent:} fields, define a function that generate appropriate
 strings as you like, and set it to variable
-@code{wl-generate-mailer-string-func}.
+@code{wl-generate-mailer-string-function}.
 
 If you do not want verbose @samp{User-Agent:} field, do the following:
 
 @lisp
 @group
-(setq wl-generate-mailer-string-func
+(setq wl-generate-mailer-string-function
       (function
        (lambda ()
          (concat "User-Agent: "
@@ -6443,7 +6439,7 @@ The following is a example:
 @lisp
 @group
 (setq mime-edit-insert-user-agent-field nil)
-(setq wl-generate-mailer-string-func
+(setq wl-generate-mailer-string-function
       (function
        (lambda ()
          (format "X-Mailer: %s" (product-string-1 'wl-version)))))