(U-000278B8): Apply new conventions for glyph granularity.

[chise/xemacs-chise.git.1] / lisp / x-compose.el

diff --git a/lisp/x-compose.el b/lisp/x-compose.el
index 1500277..39fe430 100644 (file)
--- a/lisp/x-compose.el
+++ b/lisp/x-compose.el
@@ -2,7 +2,7 @@
 
 ;; Copyright (C) 1992, 1993, 1997 Free Software Foundation, Inc.
 
-;; Author: Jamie Zawinski <jwz@netscape.com>
+;; Author: Jamie Zawinski <jwz@jwz.org>
 ;; Maintainer: XEmacs Development Team
 ;; Rewritten by Martin Buchholz far too many times.
 ;;
@@ -73,7 +73,7 @@
 ;; work, depending on what system and keyboard you are using.  If it
 ;; doesn't, you'll have to read the man page for xmodmap.  You might want
 ;; to get the "xkeycaps" program from
-;; <URL:http://people.netscape.com/jwz/xkeycaps/>,
+;; <URL:http://www.jwz.org/xkeycaps/>,
 ;; which is a graphical front end to xmodmap
 ;; that hides xmodmap's arcane syntax from you.
 
@@ -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))