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

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

diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index f4f5df17bbaa312cf5f62a7c653e0f40576254b3..fec940c7254ad2e9e74914c02dfa8defd54e3bb1 100644 (file)
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -56,7 +56,10 @@ When t this still needs to be initialized.")
 (defcustom mail-complete-alist
   ;; Don't use backquote here; we don't want backquote to get loaded
   ;; just because of loading this file.
-  (cons (cons mail-address-field-regexp '(mail-get-names pattern))
+  ;; Don't refer to mail-address-field-regexp here;
+  ;; that confuses some things such as cus-dep.el.
+  (cons '("^\\(Resent-\\)?\\(To\\|From\\|CC\\|BCC\\|Reply-to\\):"
+         . (mail-get-names pattern))
        '(("Newsgroups:" . (if (boundp 'gnus-active-hashtb)
                               gnus-active-hashtb
                             (if (boundp news-group-article-assoc)
@@ -158,7 +161,7 @@ When t this still needs to be initialized.")
 ;;;###autoload
 (defun expand-mail-aliases (beg end &optional exclude)
   "Expand all mail aliases in suitable header fields found between BEG and END.
-If interactive, expand in header fields before `mail-header-separator'.
+If interactive, expand in header fields.
 Suitable header fields are `To', `From', `CC' and `BCC', `Reply-to', and
 their `Resent-' variants.
 
@@ -167,7 +170,7 @@ removed from alias expansions."
   (interactive
    (save-excursion
      (list (goto-char (point-min))
-          (search-forward (concat "\n" mail-header-separator "\n")))))
+          (mail-header-end))))
   (sendmail-sync-aliases)
   (when (eq mail-aliases t)
     (setq mail-aliases nil)
@@ -331,10 +334,14 @@ if it is quoted with double-quotes."
       ;; double-quotes.  Otherwise, addresses are separated by commas.
       (if from-mailrc-file
          (if (eq ?\" (aref definition start))
-             (progn (string-match "[^\\]\\(\\([\\][\\]\\)*\\)\"[ \t,]*" definition start)
-                    (setq start (1+ start)
-                          end (match-end 1)
-                          convert-backslash t))
+             ;; The following test on `found' compensates for a bug
+             ;; in match-end, which does not return nil when match
+             ;; failed.
+             (let ((found (string-match "[^\\]\\(\\([\\][\\]\\)*\\)\"[ \t,]*"
+                                        definition start)))
+               (setq start (1+ start)
+                     end (and found (match-end 1))
+                     convert-backslash t))
            (setq end (string-match "[ \t,]+" definition start)))
        (setq end (string-match "[ \t\n,]*,[ \t\n,]*" definition start)))
       (let ((temp (substring definition start end))
@@ -372,9 +379,7 @@ current header, calls `mail-complete-function' and passes prefix arg if any."
        (if (file-exists-p mail-personal-alias-file)
            (build-mail-aliases))))
   (let ((list mail-complete-alist))
-    (if (and (save-excursion (search-forward
-                             (concat "\n" mail-header-separator "\n")
-                             nil t))
+    (if (and (< 0 (mail-header-end))
             (save-excursion
               (if (re-search-backward "^[^\t]" nil t)
                   (while list