changeset 3742:f5bbe69b8bc5

(define-mail-abbrev): Renamed from define-mail-alias. (build-mail-abbrevs): Use new name.

--- a/lisp/mail/mailabbrev.el	Tue Jun 15 20:36:10 1993 +0000
+++ b/lisp/mail/mailabbrev.el	Tue Jun 15 20:50:11 1993 +0000
@@ -70,7 +70,7 @@
 ;;; (This is bogus because mail-delivery programs want commas, not spaces,
 ;;; but that's what the file format is, so we have to live with it.)
 ;;;
-;;; If you like, you can call the function define-mail-alias to define your
+;;; If you like, you can call the function define-mail-abbrev to define your
 ;;; mail aliases instead of using a .mailrc file.  When you call it in this
 ;;; way, addresses are separated by commas.
 ;;;
@@ -80,7 +80,7 @@
 ;;; this.  One solution to this, if you are on a system whose /bin/mail doesn't
 ;;; work that way, (and you still want to be able to /bin/mail to send mail in
 ;;; addition to emacs) is to define minimal aliases (without full names) in
-;;; your .mailrc file, and use define-mail-alias to redefine them when sending
+;;; your .mailrc file, and use define-mail-abbrev to redefine them when sending
 ;;; mail from emacs; this way, mail sent from /bin/mail will work, and mail
 ;;; sent from emacs will be pretty.
 ;;;
@@ -209,9 +209,10 @@
 		     (start (progn (skip-chars-forward " \t") (point))))
 		(end-of-line)
 ;		(message "** %s \"%s\"" name (buffer-substring start (point)))(sit-for 1)
-		(define-mail-alias
+		(define-mail-abbrev
 		    name
-		    (buffer-substring start (point))))))
+		    (buffer-substring start (point))
+		    t))))
 	  ;; Resolve forward references in .mailrc file.
 	  ;; This would happen automatically before the first abbrev was
 	  ;; expanded, but why not do it now.
@@ -226,7 +227,7 @@
 This has to contain a comma, so \", \" is a reasonable value.  You might 
 also want something like \",\\n    \" to get each address on its own line.")
 
-;; define-mail-alias sets this flag, which causes mail-resolve-all-aliases
+;; define-mail-abbrev sets this flag, which causes mail-resolve-all-aliases
 ;; to be called before expanding abbrevs if it's necessary.
 (defvar mail-abbrev-aliases-need-to-be-resolved t)
 
@@ -234,8 +235,8 @@
 ;; stuff parsed from the .mailrc file.
 ;;
 ;;;###autoload
-(defun define-mail-alias (name definition &optional from-mailrc-file)
-  "Define NAME as a mail-alias that translates to DEFINITION.
+(defun define-mail-abbrev (name definition &optional from-mailrc-file)
+  "Define NAME as a mail-abbrev that translates to DEFINITION.
 If DEFINITION contains multiple addresses, separate them with commas."
   ;; When this is called from build-mail-abbrevs, the third argument is
   ;; true, and we do some evil space->comma hacking like /bin/mail does.