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)
: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
(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))))
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."
(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))))
(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
(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...")
(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))))