(fontset_get_font_group): Return 0 if no font-group is

[gnu-emacs] / oldXMenu / XMakeAssoc.c

diff --git a/oldXMenu/XMakeAssoc.c b/oldXMenu/XMakeAssoc.c
index ffe19adc41036be1907d0b504aaeddce0425f3f8..cf039c8f3c1f3f206be3e3ea2223219e4239d778 100644 (file)
--- a/oldXMenu/XMakeAssoc.c
+++ b/oldXMenu/XMakeAssoc.c
@@ -1,16 +1,7 @@
 /* Copyright    Massachusetts Institute of Technology    1985  */
 
-/*
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation, and that the name of M.I.T. not be used in advertising or
-publicity pertaining to distribution of the software without specific,
-written prior permission.  M.I.T. makes no representations about the
-suitability of this software for any purpose.  It is provided "as is"
-without express or implied warranty.
-*/
+#include "copyright.h"
+
 
 #include <config.h>
 #include <X11/Xlib.h>
@@ -90,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;