[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/indent.c,v
From: |
Kenichi Handa |
Subject: |
[Emacs-diffs] Changes to emacs/src/indent.c,v |
Date: |
Fri, 12 Sep 2008 06:13:36 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Changes by: Kenichi Handa <handa> 08/09/12 06:13:36
Index: indent.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/indent.c,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -b -r1.215 -r1.216
--- indent.c 8 Sep 2008 05:46:36 -0000 1.215
+++ indent.c 12 Sep 2008 06:13:36 -0000 1.216
@@ -533,6 +533,8 @@
register struct Lisp_Char_Table *dp = buffer_display_table ();
int multibyte = !NILP (current_buffer->enable_multibyte_characters);
struct composition_it cmp_it;
+ Lisp_Object window;
+ struct window *w;
/* Start the scan at the beginning of this line with column number 0. */
register EMACS_INT col = 0, prev_col = 0;
@@ -549,6 +551,9 @@
next_boundary = scan;
}
+ window = Fget_buffer_window (Fcurrent_buffer (), Qnil);
+ w = ! NILP (window) ? XWINDOW (window) : NULL;
+
if (tab_width <= 0 || tab_width > 1000) tab_width = 8;
bzero (&cmp_it, sizeof cmp_it);
cmp_it.id = -1;
@@ -597,7 +602,7 @@
if (cmp_it.id >= 0
|| (scan == cmp_it.stop_pos
&& composition_reseat_it (&cmp_it, scan, scan_byte, end,
- XWINDOW (selected_window), NULL, Qnil)))
+ w, NULL, Qnil)))
composition_update_it (&cmp_it, scan, scan_byte, Qnil);
if (cmp_it.id >= 0)
{
- [Emacs-diffs] Changes to emacs/src/indent.c,v, Chong Yidong, 2008/09/02
- [Emacs-diffs] Changes to emacs/src/indent.c,v, Kenichi Handa, 2008/09/08
- [Emacs-diffs] Changes to emacs/src/indent.c,v,
Kenichi Handa <=
- [Emacs-diffs] Changes to emacs/src/indent.c,v, Chong Yidong, 2008/09/17
- [Emacs-diffs] Changes to emacs/src/indent.c,v, Chong Yidong, 2008/09/17