language/hebrew.el (hebrew-shape-gstring): Check if a glyph element of GSTRING is...

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fd5d16a710c5f7584e7cd1ef894dfd72c8f6624b..e72dfd2614b882cbdf3cb1555c27d577ffdb4038 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-27  Kenichi Handa  <handa@m17n.org>
+
+       * language/hebrew.el (hebrew-shape-gstring): Check if a glyph
+       element of GSTRING is nil.
+
 2010-05-25  Chong Yidong  <cyd@stupidchicken.com>
 
        * log-edit.el (log-edit-strip-single-file-name): Default to nil.

diff --git a/lisp/language/hebrew.el b/lisp/language/hebrew.el
index 5c39bb224161ac212f8e2d3cdc85d78f83f83a09..f024251c60b215b04769f0fc603618ee85baaf24 100644 (file)
--- a/lisp/language/hebrew.el
+++ b/lisp/language/hebrew.el
@@ -92,6 +92,9 @@ Bidirectional editing is supported.")))
        (nchars (lgstring-char-len gstring))
        (nglyphs (lgstring-glyph-len gstring))
        (base-width (lglyph-width (lgstring-glyph gstring 0))))
+    (while (and (> nglyphs 1)
+               (not (lgstring-glyph gstring (1- nglyphs))))
+      (setq nglyphs (1- nglyphs)))
     (while (> nglyphs 1)
       (setq nglyphs (1- nglyphs))
       (let* ((glyph (lgstring-glyph gstring nglyphs))