(smtpmail-try-auth-methods): Pass port-name as defaultport to `netrc-machine'.

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

diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index 5916329f68a205a01e84ce308cc8389c1e00d9a1..18f52e6434fe68860cca2e870f2889ef6f13b6aa 100644 (file)
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -71,7 +71,7 @@ When t this still needs to be initialized.")
 The expression may reference the variable `pattern'
 which will hold the string being completed.
 If not on matching header, `mail-complete-function' gets called instead."
-  :type 'sexp
+  :type 'alist
   :group 'mailalias)
 (put 'mail-complete-alist 'risky-local-variable t)
 
@@ -93,14 +93,14 @@ If `angles', they look like:
   :group 'mailalias)
 
 (defcustom mail-directory-function nil
-  "*Function to get completions from directory service or `nil' for none.
+  "*Function to get completions from directory service or nil for none.
 See `mail-directory-requery'."
   :type '(choice function (const nil))
   :group 'mailalias)
 
 ;; This is for when the directory is huge, or changes frequently.
 (defcustom mail-directory-requery nil
-  "*When non-`nil' call `mail-directory-function' for each completion.
+  "*When non-nil call `mail-directory-function' for each completion.
 In that case, one argument gets passed to the function, the partial string
 entered so far."
   :type 'boolean
@@ -161,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.
 
@@ -170,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)
@@ -282,14 +282,14 @@ By default, this is the file specified by `mail-personal-alias-file'."
                  (t (setq file nil))))
          (goto-char (point-min))
          (while (re-search-forward
-                 "^\\(a\\|alias\\|g\\|group\\)[ \t]+\\([^ \t]+\\)" nil t)
+                 "^\\(a\\|alias\\|g\\|group\\)[ \t]+\\([^ \t\n]+\\)" nil t)
            (let* ((name (match-string 2))
-                  (start (progn (skip-chars-forward " \t") (point))))
+                  (start (progn (skip-chars-forward " \t") (point)))
+                  value)
              (end-of-line)
-             (define-mail-alias
-               name
-               (buffer-substring-no-properties start (point))
-               t)))
+             (setq value (buffer-substring-no-properties start (point)))
+             (unless (equal value "")
+               (define-mail-alias name value t))))
          mail-aliases)
       (if buffer (kill-buffer buffer))
       (set-buffer obuf))))
@@ -302,7 +302,7 @@ By default, this is the file specified by `mail-personal-alias-file'."
 This means that sending a message to NAME will actually send to DEFINITION.
 
 Normally, the addresses in DEFINITION must be separated by commas.
-If FROM-MAILRC-FILE is non-nil, then addresses in DEFINITION 
+If FROM-MAILRC-FILE is non-nil, then addresses in DEFINITION
 can be separated by spaces; an address can contain spaces
 if it is quoted with double-quotes."
 
@@ -334,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))
@@ -348,7 +352,7 @@ if it is quoted with double-quotes."
        (if convert-backslash
            (while (string-match "[\\]" temp pos)
              (setq temp (replace-match "" t t temp))
-             (if start 
+             (if start
                  (setq start (1- start)))
              (setq pos (match-end 0))))
        (setq result (cons temp result))))
@@ -375,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
@@ -476,7 +478,7 @@ PATTERN is the string we want to complete."
 
 
 (defun mail-directory (pattern)
-  "Call directory to get names matching PATTERN or all if `nil'.
+  "Call directory to get names matching PATTERN or all if nil.
 Calls `mail-directory-function' and applies `mail-directory-parser' to output."
   (save-excursion
     (message "Querying directory...")
@@ -518,7 +520,7 @@ See `mail-directory-stream'."
     (set-process-sentinel
      (apply 'open-network-stream "mailalias" (current-buffer)
            mail-directory-stream)
-     (lambda (x x)
+     (lambda (x y)
        (setq mailalias-done t)))
     (while (not mailalias-done)
       (sit-for .1))))
@@ -538,4 +540,5 @@ See `mail-directory-stream'."
 
 (provide 'mailalias)
 
+;;; arch-tag: 1d6a0f87-eb34-4d45-8816-60c1b952cf46
 ;;; mailalias.el ends here