[Emacs-diffs] /srv/bzr/emacs/trunk r100459: language/hebrew.el (hebrew-shape-gstring): Check if a glyph element of GSTRING is nil.

[Kenichi Handa]

------------------------------------------------------------
revno: 100459 [merge]
committer: Kenichi Handa <address@hidden>
branch nick: trunk
timestamp: Thu 2010-05-27 16:09:18 +0900
message:
  language/hebrew.el (hebrew-shape-gstring): Check if a glyph element of 
GSTRING is nil.
modified:
  lisp/ChangeLog
  lisp/language/hebrew.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2010-05-27 04:41:36 +0000
+++ b/lisp/ChangeLog    2010-05-27 07:08:37 +0000
@@ -1,3 +1,8 @@
+2010-05-27  Kenichi Handa  <address@hidden>
+
+       * language/hebrew.el (hebrew-shape-gstring): Check if a glyph
+       element of GSTRING is nil.
+
 2010-05-27  Stefan Monnier  <address@hidden>
 
        * emacs-lisp/smie.el (smie-forward-token-function)

=== modified file 'lisp/language/hebrew.el'
--- a/lisp/language/hebrew.el   2010-05-25 01:25:08 +0000
+++ b/lisp/language/hebrew.el   2010-05-27 04:24:30 +0000
@@ -92,6 +92,9 @@
        (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))