Use defcustom.

2 files changed, 24 insertions, 10 deletions

diff --git a/lisp/mail/rmailout.el b/lisp/mail/rmailout.el
index 90ee095a46b..fc2bf545208 100644
--- a/lisp/mail/rmailout.el
+++ b/lisp/mail/rmailout.el
@@ -27,13 +27,18 @@
 (require 'rmail)
 
 ;;;###autoload
-(defvar rmail-output-file-alist nil
+(defcustom rmail-output-file-alist nil
   "*Alist matching regexps to suggested output Rmail files.
 This is a list of elements of the form (REGEXP . NAME-EXP).
 The suggestion is taken if REGEXP matches anywhere in the message buffer.
 NAME-EXP may be a string constant giving the file name to use,
 or more generally it may be any kind of expression that returns
-a file name as a string.")
+a file name as a string."
+  :type '(repeat (cons regexp
+                       (choice :value ""
+                               (string :tag "File Name")
+                               sexp)))
+  :group 'rmail-output)
 
 ;;; There are functions elsewhere in Emacs that use this function; check
 ;;; them out before you change the calling method.
@@ -172,8 +177,11 @@ starting with the current one.  Deleted messages are skipped and don't count."
             (rmail-next-undeleted-message 1))))))
 
 ;;;###autoload
-(defvar rmail-fields-not-to-output nil
-  "*Regexp describing fields to exclude when outputting a message to a file.")
+(defcustom rmail-fields-not-to-output nil
+  "*Regexp describing fields to exclude when outputting a message to a file."
+  :type '(choice (const :tag "None" nil)
+                 regexp)
+  :group 'rmail-output)
 
 ;; Delete from the buffer header fields we don't want output.
 ;; NOT-RMAIL if t means this buffer does not have the full header
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index 076a3d26aff..4a7dd67b082 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -34,12 +34,16 @@
 (require 'rmail)
 
 ;;;###autoload
-(defvar rmail-summary-scroll-between-messages t
-  "*Non-nil means Rmail summary scroll commands move between messages.")
+(defcustom rmail-summary-scroll-between-messages t
+  "*Non-nil means Rmail summary scroll commands move between messages."
+  :type 'boolean
+  :group 'rmail-summary)
 
 ;;;###autoload
-(defvar rmail-summary-line-count-flag t
-  "*Non-nil if Rmail summary should show the number of lines in each message.")
+(defcustom rmail-summary-line-count-flag t
+  "*Non-nil if Rmail summary should show the number of lines in each message."
+  :type 'boolean
+  :group 'rmail-summary)
 
 (defvar rmail-summary-font-lock-keywords
   '(("^....D.*" . font-lock-string-face)                        ; Deleted.
@@ -267,10 +271,12 @@ nil for FUNCTION means all messages."
     line))
 
 ;;;###autoload
-(defvar rmail-summary-line-decoder (function identity)
+(defcustom rmail-summary-line-decoder (function identity)
   "*Function to decode summary-line.
 
-By default, `identity' is set.")
+By default, `identity' is set."
+  :type 'function
+  :group 'rmail-summary)
 
 (defun rmail-make-summary-line-1 (msg)
   (goto-char (rmail-msgbeg msg))