Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 382-398)

   - Update from CVS
   - Update from erc--emacs--22
   - Fix ERC bug introduced in last patch
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 123-125)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-101

1 files changed, 7 insertions, 2 deletions

diff --git a/src/xterm.c b/src/xterm.c
index 126d954a3a4..9cd945ae63b 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -10362,8 +10362,8 @@ x_query_font (f, fontname)
 
   for (i = 0; i < dpyinfo->n_fonts; i++)
     if (dpyinfo->font_table[i].name
-        && (!strcmp (dpyinfo->font_table[i].name, fontname)
-            || !strcmp (dpyinfo->font_table[i].full_name, fontname)))
+        && (!strcasecmp (dpyinfo->font_table[i].name, fontname)
+            || !strcasecmp (dpyinfo->font_table[i].full_name, fontname)))
       return (dpyinfo->font_table + i);
   return NULL;
 }
@@ -11044,6 +11044,11 @@ x_term_init (display_name, xrm_option, resource_name)
 
   dpyinfo->cut_buffers_initialized = 0;
 
+  dpyinfo->x_dnd_atoms_size = 8;
+  dpyinfo->x_dnd_atoms_length = 0;
+  dpyinfo->x_dnd_atoms = xmalloc (sizeof (*dpyinfo->x_dnd_atoms)
+                                  * dpyinfo->x_dnd_atoms_size);
+
   connection = ConnectionNumber (dpyinfo->display);
   dpyinfo->connection = connection;