Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 771-780)

   - Update from CVS
   - Merge from emacs--rel--22
   - Merge from emacs--rel--22, gnus--rel--5.10
   - Fix tq.el edge case

 * emacs--rel--22  (patch 26-32)

   - Update from CVS
   - lisp/vc-hooks.el (vc-find-root): Fix file attribute test

 * gnus--rel--5.10  (patch 224-225)

   - Merge from emacs--devo--0, emacs--rel--22
   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-18

2 files changed, 5 insertions, 1 deletions

diff --git a/oldXMenu/ChangeLog b/oldXMenu/ChangeLog
index c92563d3bc2..9a7f01ed901 100644
--- a/oldXMenu/ChangeLog
+++ b/oldXMenu/ChangeLog
@@ -1,3 +1,7 @@
+2007-05-30  Ulrich Mueller  <ulm@gentoo.org>  (tiny change)
+
+        * XMakeAssoc.c (XMakeAssoc): Use malloc rather than xmalloc.
+
 2007-02-27  Glenn Morris  <rgm@gnu.org>
 
         * Imakefile: Remove unused file with no explicit legal info.
diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c
index d443084ac13..cf039c8f3c1 100644
--- a/oldXMenu/XMakeAssoc.c
+++ b/oldXMenu/XMakeAssoc.c
@@ -81,7 +81,7 @@ XMakeAssoc(dpy, table, x_id, data)
         /* If we are here then the new entry should be inserted just */
         /* before the current value of "Entry". */
         /* Create a new XAssoc and load it with new provided data. */
-        new_entry = (XAssoc *) xmalloc(sizeof(XAssoc));
+        new_entry = (XAssoc *) malloc(sizeof(XAssoc));
         new_entry->display = dpy;
         new_entry->x_id = x_id;
         new_entry->data = data;