Mercurial > emacs
changeset 66357:f5ade15d46f2
* mh-identity.el (mh-assoc-ignore-case): Merge with version in
mh-alias.el and move to mh-acros.el
* mh-alias.el (mh-assoc-ignore-case): Merge with version in
mh-identity.el and move to mh-acros.el
* mh-acros.el (mh-assoc-ignore-case): Merge of function from
mh-identity.el and mh-alias.el.
| author | Bill Wohler <wohler@newt.com> |
|---|---|
| date | Sun, 23 Oct 2005 22:47:27 +0000 |
| parents | 131366a2e19b |
| children | 9f52d5da9ca6 |
| files | lisp/mh-e/ChangeLog lisp/mh-e/mh-acros.el lisp/mh-e/mh-alias.el lisp/mh-e/mh-identity.el |
| diffstat | 4 files changed, 22 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/mh-e/ChangeLog Sun Oct 23 22:34:34 2005 +0000 +++ b/lisp/mh-e/ChangeLog Sun Oct 23 22:47:27 2005 +0000 @@ -1,3 +1,17 @@ +2005-10-23 Bill Wohler <wohler@newt.com> + + * mh-identity.el (mh-assoc-ignore-case): Merge with version in + mh-alias.el and move to mh-acros.el + + * mh-alias.el (mh-assoc-ignore-case): Merge with version in + mh-identity.el and move to mh-acros.el + + * mh-acros.el (mh-assoc-ignore-case): Merge of function from + mh-identity.el and mh-alias.el. + + * mh-mime.el: Autoload mm-uu for mm-uu-dissect to avoid compiler + warning in Emacs 22. + 2005-10-23 Satyaki Das <satyaki@theforce.stanford.edu> * mh-identity.el (mh-assoc-ignore-case): New macro that uses
--- a/lisp/mh-e/mh-acros.el Sun Oct 23 22:34:34 2005 +0000 +++ b/lisp/mh-e/mh-acros.el Sun Oct 23 22:47:27 2005 +0000 @@ -134,6 +134,14 @@ (load (format "%s.el" (ad-get-arg 0)) t t)) ad-do-it)) +(defmacro mh-assoc-ignore-case (key alist) + "Check if KEY is present in ALIST while ignoring case to do the comparison. +Compatibility macro for Emacs versions that lack `assoc-string', introduced in +Emacs 22." + (if (fboundp 'assoc-string) + `(assoc-string ,key ,alist t) + `(assoc-ignore-case ,key ,alist))) + (provide 'mh-acros) ;;; Local Variables:
--- a/lisp/mh-e/mh-alias.el Sun Oct 23 22:34:34 2005 +0000 +++ b/lisp/mh-e/mh-alias.el Sun Oct 23 22:47:27 2005 +0000 @@ -73,14 +73,6 @@ ;;; Alias Loading -(defmacro mh-assoc-ignore-case (key alist) - "Search for string KEY in ALIST. -This is a wrapper around `assoc-string' or `assoc-ignore-case'. Avoid -`assoc-ignore-case' which is now an obsolete function." - (cond ((fboundp 'assoc-string) `(assoc-string ,key ,alist t)) - ((fboundp 'assoc-ignore-case) `(assoc-ignore-case ,key ,alist)) - (t (error "The macro mh-assoc-ignore-case not implemented properly")))) - (defun mh-alias-tstamp (arg) "Check whether alias files have been modified. Return t if any file listed in the Aliasfile MH profile component has been
--- a/lisp/mh-e/mh-identity.el Sun Oct 23 22:34:34 2005 +0000 +++ b/lisp/mh-e/mh-identity.el Sun Oct 23 22:47:27 2005 +0000 @@ -118,13 +118,6 @@ (defvar mh-identity-signature-end nil "Marker for the end of a signature inserted by `mh-insert-identity'.") -(defmacro mh-assoc-ignore-case (key alist) - "Compatibility macro for emacs versions that lack `assoc-string'. -Check if KEY is present in ALIST while ignoring case to do the comparison." - (if (fboundp 'assoc-string) - `(assoc-string ,key ,alist t) - `(assoc-ignore-case ,key ,alist))) - (defun mh-identity-field-handler (field) "Return the handler for header FIELD or nil if none set. The field name is downcased. If the FIELD begins with the character