summaryrefslogtreecommitdiff
path: root/lisp/mail/mailabbrev.el
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1992-08-02 03:36:38 +0000
committerRoland McGrath <roland@gnu.org>1992-08-02 03:36:38 +0000
commitc41cbae54ed86979491c907e3826efa736f6dd72 (patch)
treefee796a31476889ef570947d02bf45e8e0bce893 /lisp/mail/mailabbrev.el
parent75d9e7fa9842904d965799148b7ffc71263bbebf (diff)
downloademacs-c41cbae54ed86979491c907e3826efa736f6dd72.tar.gz
*** empty log message ***
Diffstat (limited to 'lisp/mail/mailabbrev.el')
-rw-r--r--lisp/mail/mailabbrev.el10
1 files changed, 7 insertions, 3 deletions
diff --git a/lisp/mail/mailabbrev.el b/lisp/mail/mailabbrev.el
index 0ea8bf8d69d..27941351c49 100644
--- a/lisp/mail/mailabbrev.el
+++ b/lisp/mail/mailabbrev.el
@@ -3,11 +3,12 @@
;;; Copyright (C) 1985, 1986, 1987, 1992 Free Software Foundation, Inc.
;; Author: Jamie Zawinski <jwz@lucid.com>
-;; Roland McGrath <roland@gnu.ai.mit.edu>
+;; Maintainer: Jamie Zawinski <jwz@lucid.com>
;; Created: 19 Oct 90
;; Keywords: mail
;;; ??? We must get papers for this or delete it.
+
;;; This file is part of GNU Emacs.
;;; GNU Emacs is free software; you can redistribute it and/or modify
@@ -220,7 +221,7 @@ no aliases, which is represented by this being a table with no entries.)")
(forward-char 1)))
(goto-char (point-min))
(while (re-search-forward
- "^\\(a\\(lias\\|\\)\\|g\\(roup\\)\\|source\\)[ \t]+" nil t)
+ "^\\(a\\(lias\\)?\\|g\\(roup\\)?\\|source\\)[ \t]+" nil t)
(beginning-of-line)
(if (looking-at "source[ \t]+\\([^ \t\n]+\\)")
(progn
@@ -524,7 +525,10 @@ characters which may be a part of the name of a mail-alias.")
(defun mail-interactive-insert-alias (&optional alias)
"Prompt for and insert a mail alias."
- (interactive (list (completing-read "Expand alias: " mail-aliases nil t)))
+ (interactive (progn
+ (if (not (vectorp mail-aliases)) (mail-aliases-setup))
+ (list (completing-read "Expand alias: " mail-aliases nil t))))
+ (if (not (vectorp mail-aliases)) (mail-aliases-setup))
(insert (or (and alias (symbol-value (intern-soft alias mail-aliases))) "")))
(defun abbrev-hacking-next-line (&optional arg)