[Emacs-diffs] Changes to emacs/lisp/composite.el,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/05/14 01:56:08

Index: composite.el
===================================================================
RCS file: /cvsroot/emacs/emacs/lisp/composite.el,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- composite.el        8 May 2008 03:36:27 -0000       1.30
+++ composite.el        14 May 2008 01:56:07 -0000      1.31
@@ -341,7 +341,7 @@
        pattern func result)
     (or limit
        (setq limit (if (stringp object) (length object) (point-max))))
-    (when tail
+    (when (and font-obj tail)
       (save-match-data
        (save-excursion
          (while tail
@@ -495,8 +495,7 @@
                  (let* ((ch (aref string from))
                         (elt (aref table ch))
                         font-obj newpos)
-                   (when elt
-                     (if window
+                   (when (and elt
                          (setq font-obj (font-at from window string)))
                      (if (functionp elt)
                          (setq newpos (funcall elt from to font-obj string))
@@ -517,8 +516,7 @@
                  (let* ((ch (char-after from))
                         (elt (aref table ch))
                         func pattern font-obj newpos)
-                   (when elt
-                     (if window
+                   (when (and elt
                          (setq font-obj (font-at from window)))
                      (if (functionp elt)
                          (setq newpos (funcall elt from to font-obj nil))
@@ -659,7 +657,7 @@
                (font-obj (and (display-multi-font-p)
                               (font-at (point) (selected-window))))
                (pos (point)))
-           (if (functionp func)
+           (if (and (functionp func) font-obj)
                (goto-char (funcall func (point) to font-obj nil)))
            (if (<= (point) pos)
                (forward-char 1)))))