Re: address@hidden: strange Emacs 22.1 failure due to utf-8-compose-scripts when --no-window-system used]

[Kenichi Handa]

In article <address@hidden>, Kenichi Handa <address@hidden> writes:

> Thank you investigating this problem.  I now can reproduce
> the bug, and I think I found a solution.  Please wait for a
> while.  I'll let you know when it is fixed.

I've just installed the attached change.  Could you try it?

---
Kenichi Handa
address@hidden

Index: utf-8.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/international/utf-8.el,v
retrieving revision 1.54
diff -u -r1.54 utf-8.el
--- utf-8.el    24 Feb 2007 01:25:37 -0000      1.54
+++ utf-8.el    20 Jul 2007 01:51:33 -0000
@@ -991,16 +991,20 @@
            (set-buffer-multibyte nil)))
 
       (when (and utf-8-compose-scripts (> length 1))
-       ;; These currently have definitions which cover the relevant
-       ;; unicodes.  We could avoid loading thai-util &c by checking
-       ;; whether the region contains any characters with the appropriate
-       ;; categories.  There aren't yet Unicode-based rules for Tibetan.
-       (diacritic-compose-region (point-max) (point-min))
-       (thai-compose-region (point-max) (point-min))
-       (lao-compose-region (point-max) (point-min))
-       (devanagari-compose-region (point-max) (point-min))
-       (malayalam-compose-region (point-max) (point-min))
-       (tamil-compose-region (point-max) (point-min)))
+       ;; This let-binding avoids recursive auto-loading.  And, we
+       ;; anyway don't have to run the following code while
+       ;; auto-loading.
+       (let ((utf-8-compose-scripts nil))
+         ;; These currently have definitions which cover the relevant
+         ;; unicodes.  We could avoid loading thai-util &c by checking
+         ;; whether the region contains any characters with the appropriate
+         ;; categories.  There aren't yet Unicode-based rules for Tibetan.
+         (diacritic-compose-region (point-max) (point-min))
+         (thai-compose-region (point-max) (point-min))
+         (lao-compose-region (point-max) (point-min))
+         (devanagari-compose-region (point-max) (point-min))
+         (malayalam-compose-region (point-max) (point-min))
+         (tamil-compose-region (point-max) (point-min))))
       (- (point-max) (point-min)))))
 
 (defun utf-8-pre-write-conversion (beg end)