(get-charset-property): If CHARSET is

composition, return nil.
(put-charset-property): If CHARSET is composition, do nothing.

1 files changed, 5 insertions, 3 deletions

diff --git a/lisp/international/mule-cmds.el b/lisp/international/mule-cmds.el
index 7c71193f5f3..875fa90e424 100644
--- a/lisp/international/mule-cmds.el
+++ b/lisp/international/mule-cmds.el
@@ -1329,13 +1329,15 @@ specifies the character set for the major languages of Western Europe."
   "Return the value of CHARSET's PROPNAME property.
 This is the last value stored with
  (put-charset-property CHARSET PROPNAME VALUE)."
-  (plist-get (charset-plist charset) propname))
+  (or (eq charset 'composition)
+      (plist-get (charset-plist charset) propname)))
 
 (defsubst put-charset-property (charset propname value)
   "Store CHARSETS's PROPNAME property with value VALUE.
 It can be retrieved with `(get-charset-property CHARSET PROPNAME)'."
-  (set-charset-plist charset
-                     (plist-put (charset-plist charset) propname value)))
+  (or (eq charset 'composition)
+      (set-charset-plist charset
+                         (plist-put (charset-plist charset) propname value))))
 
 ;;; Character code property
 (put 'char-code-property-table 'char-table-extra-slots 0)