[Emacs-commit] emacs/lisp/mh-e mh-identity.el mh-alias.el mh-a...

[Bill Wohler]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Branch:         
Changes by:     Bill Wohler <address@hidden>    05/10/23 22:47:28

Modified files:
        lisp/mh-e      : mh-identity.el mh-alias.el mh-acros.el 
                         ChangeLog 

Log message:
        * 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.

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/mh-e/mh-identity.el.diff?tr1=1.17&tr2=1.18&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/mh-e/mh-alias.el.diff?tr1=1.13&tr2=1.14&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/mh-e/mh-acros.el.diff?tr1=1.8&tr2=1.9&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/emacs/emacs/lisp/mh-e/ChangeLog.diff?tr1=1.47&tr2=1.48&r1=text&r2=text

Patches:
Index: emacs/lisp/mh-e/ChangeLog
diff -u emacs/lisp/mh-e/ChangeLog:1.47 emacs/lisp/mh-e/ChangeLog:1.48
--- emacs/lisp/mh-e/ChangeLog:1.47      Sun Oct 23 22:34:33 2005
+++ emacs/lisp/mh-e/ChangeLog   Sun Oct 23 22:47:27 2005
@@ -1,3 +1,17 @@
+2005-10-23  Bill Wohler  <address@hidden>
+
+       * 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  <address@hidden>
 
        * mh-identity.el (mh-assoc-ignore-case): New macro that uses
Index: emacs/lisp/mh-e/mh-acros.el
diff -u emacs/lisp/mh-e/mh-acros.el:1.8 emacs/lisp/mh-e/mh-acros.el:1.9
--- emacs/lisp/mh-e/mh-acros.el:1.8     Mon Jul  4 17:15:52 2005
+++ emacs/lisp/mh-e/mh-acros.el Sun Oct 23 22:47:27 2005
@@ -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:
Index: emacs/lisp/mh-e/mh-alias.el
diff -u emacs/lisp/mh-e/mh-alias.el:1.13 emacs/lisp/mh-e/mh-alias.el:1.14
--- emacs/lisp/mh-e/mh-alias.el:1.13    Mon Oct 10 16:37:53 2005
+++ emacs/lisp/mh-e/mh-alias.el Sun Oct 23 22:47:27 2005
@@ -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
Index: emacs/lisp/mh-e/mh-identity.el
diff -u emacs/lisp/mh-e/mh-identity.el:1.17 emacs/lisp/mh-e/mh-identity.el:1.18
--- emacs/lisp/mh-e/mh-identity.el:1.17 Sun Oct 23 22:34:34 2005
+++ emacs/lisp/mh-e/mh-identity.el      Sun Oct 23 22:47:27 2005
@@ -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