X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=wl%2Fwl-template.el;h=ddbf66ac99b65796512fb248c4c03aa04410541b;hb=98f38e5383840a86e4ebca5803d505110d0997f8;hp=bb4796304549dc117b723df4c562ef76b0abe8fd;hpb=806725e3db0748ddc973ba045053a6681e840287;p=elisp%2Fwanderlust.git

diff --git a/wl/wl-template.el b/wl/wl-template.el
index bb47963..ddbf66a 100644
--- a/wl/wl-template.el
+++ b/wl/wl-template.el
@@ -1,7 +1,7 @@
-;;; wl-template.el -- Draft template feature for Wanderlust.
+;;; wl-template.el --- Draft template feature for Wanderlust.
 
-;; Copyright 1998,1999,2000 Masahiro MURATA <muse@ba2.so-net.ne.jp>
-;;                          Yuuichi Teranishi <teranisi@gohome.org>
+;; Copyright (C) 1998,1999,2000 Masahiro MURATA <muse@ba2.so-net.ne.jp>
+;; Copyright (C) 1998,1999,2000 Yuuichi Teranishi <teranisi@gohome.org>
 
 ;; Author: Masahiro MURATA <muse@ba2.so-net.ne.jp>
 ;; Keywords: mail, net news
@@ -27,7 +27,7 @@
 ;;; Commentary:
 
 ;;; Code:
-;; 
+;;
 
 ;; Variables
 
@@ -52,6 +52,7 @@
   (define-key wl-template-mode-map "\n"    'wl-template-set))
 
 (defun wl-template-apply (name)
+  "Apply NAME template to draft."
   (let (template)
     (when name
       (if (string= name "")
@@ -76,7 +77,7 @@ See info under Wanderlust for full documentation.
 
 \\{wl-template-mode}
 
-Enterring WL-Template mode calls the value of `wl-template-mode-hook'."
+Entering WL-Template mode calls the value of `wl-template-mode-hook'."
   (kill-all-local-variables)
   (setq mode-name "Wl-Template"
 	major-mode 'wl-template-mode)
@@ -85,6 +86,7 @@ Enterring WL-Template mode calls the value of `wl-template-mode-hook'."
   (run-hooks 'wl-template-mode-hook))
 
 (defun wl-template-select ()
+  "Select template from `wl-template-alist'."
   (interactive)
   (if (not wl-template-visible-select)
       (wl-template-apply
@@ -120,7 +122,8 @@ Enterring WL-Template mode calls the value of `wl-template-mode-hook'."
       (wl-template-show))))
 
 (defun wl-template-show (&optional arg)
-  "Show reference INDEX in wl-template-alist."
+  "Show reference INDEX in `wl-template-alist'.
+ARG is ignored."			; ARG ignored this version (?)
   (save-excursion
     (set-buffer wl-template-buffer-name)
     (let ((buffer-read-only nil)
@@ -131,25 +134,24 @@ Enterring WL-Template mode calls the value of `wl-template-mode-hook'."
        (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))))
 
 (defun wl-template-next ()
   "Display next reference in other buffer."
   (interactive)
-  (if (eq wl-template-max-num
-	  (setq wl-template-cur-num (1+ wl-template-cur-num)))
+  (if (= wl-template-max-num
+	 (setq wl-template-cur-num (1+ wl-template-cur-num)))
       (setq wl-template-cur-num 0))
   (wl-template-show))
 
 (defun wl-template-prev ()
   "Display previous reference in other buffer."
   (interactive)
-  (setq wl-template-cur-num (if (eq wl-template-cur-num 0)
+  (setq wl-template-cur-num (if (zerop wl-template-cur-num)
 				(1- wl-template-max-num)
 			      (1- wl-template-cur-num)))
   (wl-template-show))
@@ -180,6 +182,8 @@ Enterring WL-Template mode calls the value of `wl-template-mode-hook'."
 	(if win (select-window win))))))
 
 (defun wl-template-insert (name &optional mail-header)
+  "Insert NAME template.
+Set header-separator is MAIL-HEADER."
   (let ((template (cdr (assoc name wl-template-alist)))
 	(mail-header-separator (or mail-header
 				   mail-header-separator)))