[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/xdisp.c
From: |
Kim F . Storm |
Subject: |
[Emacs-diffs] Changes to emacs/src/xdisp.c |
Date: |
Sun, 21 Nov 2004 07:39:21 -0500 |
Index: emacs/src/xdisp.c
diff -c emacs/src/xdisp.c:1.937 emacs/src/xdisp.c:1.938
*** emacs/src/xdisp.c:1.937 Wed Nov 17 01:38:17 2004
--- emacs/src/xdisp.c Sun Nov 21 12:33:35 2004
***************
*** 18269,18274 ****
--- 18269,18287 ----
return x_reached;
}
+ /* Expand row matrix if too narrow. Don't expand if area
+ is not present. */
+
+ #define IT_EXPAND_MATRIX_WIDTH(it, area) \
+ { \
+ if (!fonts_changed_p \
+ && (it->glyph_row->glyphs[area] \
+ < it->glyph_row->glyphs[area + 1])) \
+ { \
+ it->w->ncols_scale_factor++; \
+ fonts_changed_p = 1; \
+ } \
+ }
/* Store one glyph for IT->char_to_display in IT->glyph_row.
Called from x_produce_glyphs when IT->glyph_row is non-null. */
***************
*** 18306,18316 ****
glyph->font_type = FONT_TYPE_UNKNOWN;
++it->glyph_row->used[area];
}
! else if (!fonts_changed_p)
! {
! it->w->ncols_scale_factor++;
! fonts_changed_p = 1;
! }
}
/* Store one glyph for the composition IT->cmp_id in IT->glyph_row.
--- 18319,18326 ----
glyph->font_type = FONT_TYPE_UNKNOWN;
++it->glyph_row->used[area];
}
! else
! IT_EXPAND_MATRIX_WIDTH (it, area);
}
/* Store one glyph for the composition IT->cmp_id in IT->glyph_row.
***************
*** 18348,18358 ****
glyph->font_type = FONT_TYPE_UNKNOWN;
++it->glyph_row->used[area];
}
! else if (!fonts_changed_p)
! {
! it->w->ncols_scale_factor++;
! fonts_changed_p = 1;
! }
}
--- 18358,18365 ----
glyph->font_type = FONT_TYPE_UNKNOWN;
++it->glyph_row->used[area];
}
! else
! IT_EXPAND_MATRIX_WIDTH (it, area);
}
***************
*** 18522,18532 ****
glyph->font_type = FONT_TYPE_UNKNOWN;
++it->glyph_row->used[area];
}
! else if (!fonts_changed_p)
! {
! it->w->ncols_scale_factor++;
! fonts_changed_p = 1;
! }
}
}
--- 18529,18536 ----
glyph->font_type = FONT_TYPE_UNKNOWN;
++it->glyph_row->used[area];
}
! else
! IT_EXPAND_MATRIX_WIDTH (it, area);
}
}
***************
*** 18570,18580 ****
glyph->font_type = FONT_TYPE_UNKNOWN;
++it->glyph_row->used[area];
}
! else if (!fonts_changed_p)
! {
! it->w->ncols_scale_factor++;
! fonts_changed_p = 1;
! }
}
--- 18574,18581 ----
glyph->font_type = FONT_TYPE_UNKNOWN;
++it->glyph_row->used[area];
}
! else
! IT_EXPAND_MATRIX_WIDTH (it, area);
}
***************
*** 20947,20959 ****
/* If we're on a string with `help-echo' text property, arrange
for the help to be displayed. This is done by setting the
global variable help_echo_string to the help string. */
! help = Fget_text_property (pos, Qhelp_echo, string);
! if (!NILP (help))
{
! help_echo_string = help;
! XSETWINDOW (help_echo_window, w);
! help_echo_object = string;
! help_echo_pos = charpos;
}
if (NILP (pointer))
--- 20948,20963 ----
/* If we're on a string with `help-echo' text property, arrange
for the help to be displayed. This is done by setting the
global variable help_echo_string to the help string. */
! if (NILP (help))
{
! help = Fget_text_property (pos, Qhelp_echo, string);
! if (!NILP (help))
! {
! help_echo_string = help;
! XSETWINDOW (help_echo_window, w);
! help_echo_object = string;
! help_echo_pos = charpos;
! }
}
if (NILP (pointer))
- [Emacs-diffs] Changes to emacs/src/xdisp.c, (continued)
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/12
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/12
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Richard M . Stallman, 2004/11/13
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Richard M . Stallman, 2004/11/15
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/15
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kenichi Handa, 2004/11/15
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Stefan Monnier, 2004/11/16
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/16
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Luc Teirlinck, 2004/11/16
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/18
- [Emacs-diffs] Changes to emacs/src/xdisp.c,
Kim F . Storm <=
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/21
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/21
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/22
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/24
- [Emacs-diffs] Changes to emacs/src/xdisp.c, Kim F . Storm, 2004/11/26