[Emacs-diffs] Changes to emacs/src/composite.c,v

[Kenichi Handa]

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Kenichi Handa <handa>   08/09/12 05:38:37

Index: composite.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/composite.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- composite.c 10 Sep 2008 12:02:20 -0000      1.59
+++ composite.c 12 Sep 2008 05:38:37 -0000      1.60
@@ -1093,7 +1093,7 @@
       cmp_it->nchars = end - start;
       cmp_it->nglyphs = composition_table[cmp_it->id]->glyph_len;
     }
-  else
+  else if (w)
     {
       Lisp_Object val, elt;
       int i;
@@ -1119,6 +1119,8 @@
          break;
       cmp_it->nglyphs = i;
     }
+  else
+    goto no_composition;
   cmp_it->from = 0;
   return 1;
 
@@ -1255,8 +1257,14 @@
   Lisp_Object check_val, val, elt;
   int check_lookback;
   int c;
+  Lisp_Object window;
   struct window *w;
 
+  window = Fget_buffer_create (Fcurrent_buffer ());
+  if (NILP (window))
+    return 0;
+  w = XWINDOW (window);
+
   orig.pos = pos;
   if (NILP (string))
     {
@@ -1279,7 +1287,6 @@
     {
       tail = min (tail, limit + 3);
     }
-  w = XWINDOW (selected_window);
   cur = orig;
 
  retry: