X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fx-compose.el;h=39fe43079b1bb2ae1d52af0b490591972ff6a916;hb=b0e1ca8aa8c5694e0067bbdc456b596dd371bf9c;hp=40df8e6200df4cbe744a56764db5e3702bc29625;hpb=afa9772e3fcbb4e80e3e4cfd1a40b4fccc6d08b8;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/x-compose.el b/lisp/x-compose.el
index 40df8e6..39fe430 100644
--- a/lisp/x-compose.el
+++ b/lisp/x-compose.el
@@ -521,7 +521,12 @@
 	    (eq 1 (length value))
 	    (null (lookup-key keymap value)))
        (define-key keymap value value))))
-   keymap))
+   keymap
+   ;; #### It is currently not safe to add definitions to a keymap in
+   ;; map-keymap, due to a bug in map-keymap (dangling pointer to freed
+   ;; memory on a rehash).  So we sort, which has the side effect of
+   ;; mapping over a copy of the original hash-table.
+   t))
 (xlib-input-method-bug-workaround compose-map)
 (unintern 'xlib-input-method-bug-workaround)
 
@@ -534,7 +539,12 @@
        (alias-colon-to-doublequote value))
      (when (eq key '\")
        (define-key keymap ":" value)))
-   keymap))
+   keymap
+   ;; #### It is currently not safe to add definitions to a keymap in
+   ;; map-keymap, due to a bug in map-keymap (dangling pointer to freed
+   ;; memory on a rehash).  So we sort, which has the side effect of
+   ;; mapping over a copy of the original hash-table.
+   t))
 (alias-colon-to-doublequote compose-map)
 (unintern 'alias-colon-to-doublequote)
 
@@ -696,7 +706,7 @@ which it understands) are:
 ;;     (define-key binding [(control h)] 'compose-help)
 ;;     (define-key binding [help]        'compose-help)
      ))
- compose-map nil)
+ compose-map)
 
 ;; Make redisplay display the accented letters
 (if (memq (default-value 'ctl-arrow) '(t nil))