Merged in changes from CVS HEAD

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-1
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-2
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-3
   Update from CVS


git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-17

1 files changed, 5 insertions, 2 deletions

diff --git a/src/composite.c b/src/composite.c
index b4e931c6a20..f8e655a3685 100644
--- a/src/composite.c
+++ b/src/composite.c
@@ -842,9 +842,12 @@ syms_of_composite ()
 
     args[0] = QCtest;
     args[1] = Qequal;
+    /* We used to make the hash table weak so that unreferenced
+       compostions can be garbage-collected.  But, usually once
+       created compositions are repeatedly used in an Emacs session,
+       and thus it's not worth to save memory in such a way.  So, we
+       make the table not weak.  */
     args[2] = QCweakness;
-    /* Fixme: It seems that a weak hash table leads to segfault in GC,
-       but I have not yet found why.  -- handa@m17n.org */
     args[3] = Qnil;
     args[4] = QCsize;
     args[5] = make_number (311);