From 3c3d71d93c267ac1ffacddd4e47127fa9e33b11f Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Sun, 1 Feb 1998 23:56:13 +0000 Subject: [PATCH] (define-mail-alias): If FROM-MAILRC-FILE, don't call sendmail-sync-aliases. (build-mail-aliases): Clear mail-aliases to nil at the beginning. --- lisp/mail/mailalias.el | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/lisp/mail/mailalias.el b/lisp/mail/mailalias.el index 20d6004b4e2..f4f5df17bba 100644 --- a/lisp/mail/mailalias.el +++ b/lisp/mail/mailalias.el @@ -238,6 +238,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 @@ -302,7 +305,9 @@ 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) -- 2.39.5