[Emacs-diffs] Changes to emacs/lisp/mh-e/mh-alias.el

[Bill Wohler]

Index: emacs/lisp/mh-e/mh-alias.el
diff -c emacs/lisp/mh-e/mh-alias.el:1.1 emacs/lisp/mh-e/mh-alias.el:1.2
*** emacs/lisp/mh-e/mh-alias.el:1.1     Sat Jan 25 21:38:37 2003
--- emacs/lisp/mh-e/mh-alias.el Mon Feb  3 15:55:30 2003
***************
*** 91,96 ****
--- 91,100 ----
  ;;  `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.2 2003/02/03 20:55:30 wohler Exp $
+ 
  ;;; Code:
  
  (require 'mh-e)
***************
*** 283,289 ****
                    (multi-prompt "," nil prompt mh-alias-alist nil nil))
                   (t
                    (split-string
!                    (completing-read "To: " mh-alias-alist nil nil)
                     ","))))))
        (if (not mh-alias-expand-aliases-flag)
            (mapconcat 'identity the-answer ", ")
--- 287,293 ----
                    (multi-prompt "," nil prompt mh-alias-alist nil nil))
                   (t
                    (split-string
!                    (completing-read prompt mh-alias-alist nil nil)
                     ","))))))
        (if (not mh-alias-expand-aliases-flag)
            (mapconcat 'identity the-answer ", ")
***************
*** 447,460 ****
              (completing-read "Alias file [press Tab]: "
                               (mapcar 'list autolist) nil t))))))))
  
  (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.
        (car (delq nil (mapcar
                        (function
                         (lambda (alias)
--- 451,464 ----
              (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.
!       ;; 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,507 ****
                  ((string-match "^a" answer)
                   (forward-line 1))
                  (t
!                  error "Quitting."))))
         ;; No, so sort-in at the right place
         ;; search for "^alias", then "^alia", etc.
         ((eq mh-alias-insertion-location 'sorted)
--- 505,511 ----
                  ((string-match "^a" answer)
                   (forward-line 1))
                  (t
!                  (error "Quitting")))))
         ;; No, so sort-in at the right place
         ;; search for "^alias", then "^alia", etc.
         ((eq mh-alias-insertion-location 'sorted)