X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/94955307b698421b7de187078b48fdb17ff24896..dbfa9ed49fe7fbe53fd45df861e7a86f171bf2fd:/lisp/mail/mailalias.el diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el index fb62673ef7..18f52e6434 100644 --- a/lisp/mail/mailalias.el +++ b/lisp/mail/mailalias.el @@ -54,19 +54,24 @@ When t this still needs to be initialized.") "^\\(Resent-\\)?\\(To\\|From\\|CC\\|BCC\\|Reply-to\\):") (defcustom mail-complete-alist - `((,mail-address-field-regexp mail-get-names pattern) - ("Newsgroups:" . (if (boundp 'gnus-active-hashtb) - gnus-active-hashtb - (if (boundp news-group-article-assoc) - news-group-article-assoc))) - ("Followup-To:" . (mail-sentto-newsgroups)) - ;;("Distribution:" ???) - ) + ;; Don't use backquote here; we don't want backquote to get loaded + ;; just because of loading this file. + ;; 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) + news-group-article-assoc))) + ("Followup-To:" . (mail-sentto-newsgroups)) + ;;("Distribution:" ???) + )) "*Alist of header field and expression to return alist for completion. 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) @@ -88,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 @@ -156,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. @@ -165,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) @@ -236,6 +241,9 @@ removed from alias expansions." "Read mail aliases from personal aliases file and set `mail-aliases'. By default, this is the file specified by `mail-personal-alias-file'." (setq file (expand-file-name (or file mail-personal-alias-file))) + ;; In case mail-aliases is t, make sure define-mail-alias + ;; does not recursively call build-mail-aliases. + (setq mail-aliases nil) (let ((buffer nil) (obuf (current-buffer))) (unwind-protect @@ -274,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)))) @@ -294,13 +302,15 @@ 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." (interactive "sDefine mail alias: \nsDefine %s as mail alias for: ") ;; Read the defaults first, if we have not done so. - (sendmail-sync-aliases) + ;; But not if we are doing that already right now. + (unless from-mailrc-file + (sendmail-sync-aliases)) (if (eq mail-aliases t) (progn (setq mail-aliases nil) @@ -315,21 +325,37 @@ if it is quoted with double-quotes." ;; If DEFINITION is null string, avoid looping even once. (start (and (not (equal definition "")) 0)) (L (length definition)) + convert-backslash end tem) (while start + (setq convert-backslash nil) ;; If we're reading from the mailrc file, then addresses are delimited ;; by spaces, and addresses with embedded spaces must be surrounded by ;; double-quotes. Otherwise, addresses are separated by commas. (if from-mailrc-file (if (eq ?\" (aref definition start)) - (setq start (1+ start) - end (string-match "\"[ \t,]*" definition start)) + ;; 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))) - (setq result (cons (substring definition start end) result)) - (setq start (and end - (/= (match-end 0) L) - (match-end 0)))) + (let ((temp (substring definition start end)) + (pos 0)) + (setq start (and end + (/= (match-end 0) L) + (match-end 0))) + (if convert-backslash + (while (string-match "[\\]" temp pos) + (setq temp (replace-match "" t t temp)) + (if start + (setq start (1- start))) + (setq pos (match-end 0)))) + (setq result (cons temp result)))) (setq definition (mapconcat (function identity) (nreverse result) ", ")) @@ -353,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 @@ -454,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...") @@ -496,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)))) @@ -516,4 +540,5 @@ See `mail-directory-stream'." (provide 'mailalias) +;;; arch-tag: 1d6a0f87-eb34-4d45-8816-60c1b952cf46 ;;; mailalias.el ends here