(report-emacs-bug-text-prompt): New variable.

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

diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index 176bfd80163086adfcfead6371375785f52cddde..caef6bd670d0d24cc1243b43f28c9a19b91379fa 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)
 
@@ -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))))
@@ -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))
@@ -375,7 +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 (> 0 (mail-header-end))
+    (if (and (< 0 (mail-header-end))
             (save-excursion
               (if (re-search-backward "^[^\t]" nil t)
                   (while list
@@ -516,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))))