X-Git-Url: https://code.delx.au/gnu-emacs/blobdiff_plain/bd09e573fe6122343aacc099fbd21ee2cd404c1a..95754b9f0f21b64e83ea21f8efb9174b25cb1182:/lisp/mail/mailalias.el

diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el
index 2f120394f2..6d0c2e1212 100644
--- a/lisp/mail/mailalias.el
+++ b/lisp/mail/mailalias.el
@@ -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
@@ -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."
 
@@ -352,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))))
@@ -478,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...")
@@ -520,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))))