Eliminate compilation warnings due to `rfc822-addresses'.

(rmail-dont-reply-to): Eliminate `pos' as a free variable for a
warning free compile.

2 files changed, 12 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 673a52a6d53..c71fc737db2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2002-03-20  pmr-sav  <pmr-sav@hamm.pajato.com>
+
+        * mail-utils.el:
+        Eliminate compilation warnings due to `rfc822-addresses'.
+        (rmail-dont-reply-to): Eliminate `pos' as a free variable for a
+        warning free compile.
+
 2002-03-20  Michael Kifer  <kifer@cs.stonybrook.edu>
         
         * ediff-diff.el (ediff-install-fine-diff-if-necessary): take
diff --git a/lisp/mail/mail-utils.el b/lisp/mail/mail-utils.el
index fb5c7d1330e..db31f3d4064 100644
--- a/lisp/mail/mail-utils.el
+++ b/lisp/mail/mail-utils.el
@@ -133,6 +133,8 @@ we expect to find and remove the wrapper characters =?ISO-8859-1?Q?....?=."
                               (char-after (1+ (match-beginning 1)))))))
            t t))))))
 
+(eval-when-compile (require 'rfc822))
+
 (defun mail-strip-quoted-names (address)
   "Delete comments and quoted strings in an address list ADDRESS.
 Also delete leading/trailing whitespace and replace FOO <BAR> with just BAR.
@@ -244,8 +246,9 @@ the comma-separated list.  The pruned list is returned."
             (setq cur-pos (and cur-pos (1+ cur-pos))
                   start-pos cur-pos))))))
   ;; get rid of any trailing commas
-  (if (setq pos (string-match "[ ,\t\n]*\\'" destinations))
-      (setq destinations (substring destinations 0 pos)))
+  (let ((pos (string-match "[ ,\t\n]*\\'" destinations)))
+    (if pos
+        (setq destinations (substring destinations 0 pos))))
   ;; remove leading spaces. they bother me.
   (if (string-match "\\(\\s \\|,\\)*" destinations)
       (substring destinations (match-end 0))