(comint-postoutput-scroll-to-bottom): Cope with unset

[gnu-emacs] / lisp / mail / mail-extr.el

diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 5f30245daeb852198df998e787afbc08ca75a4f0..ab3545b66dfc576186a9d1a79c251495e9ac5bae 100644 (file)
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -208,36 +208,51 @@
 ;;; Code:
 \f
 
+(defgroup mail-extr nil
+  "Extract full name and address from RFC 822 mail header."
+  :prefix "mail-extr-"
+  :group 'mail)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;
 ;; User configuration variable definitions.
 ;;
 
-(defvar mail-extr-guess-middle-initial nil
+(defcustom mail-extr-guess-middle-initial nil
   "*Whether to try to guess middle initial from mail address.
 If true, then when we see an address like \"John Smith <jqs@host.com>\"
-we will assume that \"John Q. Smith\" is the fellow's name.")
+we will assume that \"John Q. Smith\" is the fellow's name."
+  :type 'boolean
+  :group 'mail-extr)
 
-(defvar mail-extr-ignore-single-names t
+(defcustom mail-extr-ignore-single-names t
   "*Whether to ignore a name that is just a single word.
 If true, then when we see an address like \"Idiot <dumb@stupid.com>\"
-we will act as though we couldn't find a full name in the address.")
+we will act as though we couldn't find a full name in the address."
+  :type 'boolean
+  :group 'mail-extr)
 
 ;; Matches a leading title that is not part of the name (does not
 ;; contribute to uniquely identifying the person).
-(defvar mail-extr-full-name-prefixes
+(defcustom mail-extr-full-name-prefixes
   (purecopy
    "\\(Prof\\|D[Rr]\\|Mrs?\\|Rev\\|Rabbi\\|SysOp\\|LCDR\\)\\.?[ \t\n]")
   "*Matches prefixes to the full name that identify a person's position.
 These are stripped from the full name because they do not contribute to
-uniquely identifying the person.")
+uniquely identifying the person."
+  :type 'regexp
+  :group 'mail-extr)
 
-(defvar mail-extr-@-binds-tighter-than-! nil
-  "*Whether the local mail transport agent looks at ! before @.")
+(defcustom mail-extr-@-binds-tighter-than-! nil
+  "*Whether the local mail transport agent looks at ! before @."
+  :type 'boolean
+  :group 'mail-extr)
 
-(defvar mail-extr-mangle-uucp nil
+(defcustom mail-extr-mangle-uucp nil
   "*Whether to throw away information in UUCP addresses
-by translating things like \"foo!bar!baz@host\" into \"baz@bar.UUCP\".")
+by translating things like \"foo!bar!baz@host\" into \"baz@bar.UUCP\"."
+  :type 'boolean
+  :group 'mail-extr)
 
 ;;----------------------------------------------------------------------
 ;; what orderings are meaningful?????
@@ -771,7 +786,7 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
                         (not (eobp))))
        (let (char
              end-of-address
-             <-pos >-pos @-pos :-pos comma-pos !-pos %-pos \;-pos
+             <-pos >-pos @-pos colon-pos comma-pos !-pos %-pos \;-pos
              group-:-pos group-\;-pos route-addr-:-pos
              record-pos-symbol
              first-real-pos last-real-pos
@@ -866,7 +881,7 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
             ((setq record-pos-symbol
                    (cdr (assq char
                               '((?< . <-pos) (?> . >-pos) (?@ . @-pos)
-                                (?: . :-pos) (?, . comma-pos) (?! . !-pos)
+                                (?: . colon-pos) (?, . comma-pos) (?! . !-pos)
                                 (?% . %-pos) (?\; . \;-pos)))))
              (set record-pos-symbol
                   (cons (point) (symbol-value record-pos-symbol)))
@@ -906,7 +921,7 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
          ;; Example: @foo.bar.dom,@xxx.yyy.zzz:mailbox@aaa.bbb.ccc
          ;; This commonly happens on the UUCP "From " line.  Ugh.
          (cond ((and (> (length @-pos) 1)
-                     (eq 1 (length :-pos))     ;TODO: check if between last two @s
+                     (eq 1 (length colon-pos)) ;TODO: check if between last two @s
                      (not \;-pos)
                      (not <-pos))
                 (goto-char (point-min))
@@ -946,9 +961,9 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
          ;; Check for : that indicates GROUP list and for : part of
          ;; ROUTE-ADDR spec.
          ;; Can't possibly be more than two :.  Nuke any extra.
-         (while :-pos
-           (setq temp (car :-pos)
-                 :-pos (cdr :-pos))
+         (while colon-pos
+           (setq temp (car colon-pos)
+                 colon-pos (cdr colon-pos))
            (cond ((and <-pos >-pos
                        (> temp <-pos)
                        (< temp >-pos))