summaryrefslogtreecommitdiff
path: root/lisp/mh-e/mh-alias.el
diff options
context:
space:
mode:
authorBill Wohler <wohler@newt.com>2003-02-03 20:55:30 +0000
committerBill Wohler <wohler@newt.com>2003-02-03 20:55:30 +0000
commitc04186f854feeb91c6dc4501816ff049111fb363 (patch)
tree6b257b0856ccb379350a11484811560a5cfd4cfe /lisp/mh-e/mh-alias.el
parent772890e5a7e6f45e40ea3f144220a19c4bb1deab (diff)
downloademacs-c04186f854feeb91c6dc4501816ff049111fb363.tar.gz
Upgraded to MH-E version 7.2.
See etc/MH-E-NEWS and lisp/mh-e/ChangeLog for details.
Diffstat (limited to 'lisp/mh-e/mh-alias.el')
-rw-r--r--lisp/mh-e/mh-alias.el14
1 files changed, 9 insertions, 5 deletions
diff --git a/lisp/mh-e/mh-alias.el b/lisp/mh-e/mh-alias.el
index b9f144fae02..0e45edf288a 100644
--- a/lisp/mh-e/mh-alias.el
+++ b/lisp/mh-e/mh-alias.el
@@ -91,6 +91,10 @@
;; `mh-alias-insert-file'). In particular, there is a tool-bar icon to grab
;; an alias from the From line of the current message.
+;;; Change Log:
+
+;; $Id: mh-alias.el,v 1.25 2003/01/27 04:16:47 wohler Exp $
+
;;; Code:
(require 'mh-e)
@@ -283,7 +287,7 @@ Blind aliases or users from /etc/passwd are not expanded."
(multi-prompt "," nil prompt mh-alias-alist nil nil))
(t
(split-string
- (completing-read "To: " mh-alias-alist nil nil)
+ (completing-read prompt mh-alias-alist nil nil)
","))))))
(if (not mh-alias-expand-aliases-flag)
(mapconcat 'identity the-answer ", ")
@@ -447,14 +451,14 @@ Set `mh-alias-insert-file' or set AliasFile in your .mh_profile file"))
(completing-read "Alias file [press Tab]: "
(mapcar 'list autolist) nil t))))))))
+;;;###mh-autoload
(defun mh-alias-address-to-alias (address)
"Return the ADDRESS alias if defined, or nil."
(let* ((aliases (mh-alias-ali address t)))
(if (string-equal aliases address)
nil ; ali returned same string -> no.
- ;; For the comma-separated aliases reyurned by ali, check that one of
- ;; them doesn't expand into a list. e.g. we do have an individual
- ;; alias for that adress.
+ ;; Double-check that we have an individual alias. This means that the
+ ;; alias doesn't expand into a list (of which this address is part).
(car (delq nil (mapcar
(function
(lambda (alias)
@@ -501,7 +505,7 @@ after it."
((string-match "^a" answer)
(forward-line 1))
(t
- error "Quitting."))))
+ (error "Quitting")))))
;; No, so sort-in at the right place
;; search for "^alias", then "^alia", etc.
((eq mh-alias-insertion-location 'sorted)