projects
/
chise
/
xemacs-chise.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
XEmacs 21.2.47 (Zephir).
[chise/xemacs-chise.git]
/
src
/
redisplay.c
diff --git
a/src/redisplay.c
b/src/redisplay.c
index
6f71812
..
7967999
100644
(file)
--- a/
src/redisplay.c
+++ b/
src/redisplay.c
@@
-300,7
+300,7
@@
static Bytecount_dynarr *formatted_string_extent_end_dynarr;
/* #### probably temporary */
/* #### probably temporary */
-int cache_adjustment;
+Fixnum cache_adjustment;
/* This holds a string representing the text corresponding to a single
modeline % spec. */
/* This holds a string representing the text corresponding to a single
modeline % spec. */
@@
-315,10
+315,10
@@
int disable_preemption; /* Used for debugging redisplay and for
static int preemption_count;
/* Minimum pixel height of clipped bottom display line. */
static int preemption_count;
/* Minimum pixel height of clipped bottom display line. */
-int vertical_clip;
+Fixnum vertical_clip;
/* Minimum visible pixel width of clipped glyphs at right margin. */
/* Minimum visible pixel width of clipped glyphs at right margin. */
-int horizontal_clip;
+Fixnum horizontal_clip;
/* Nonzero means reading single-character input with prompt
so put cursor on minibuffer after the prompt. */
/* Nonzero means reading single-character input with prompt
so put cursor on minibuffer after the prompt. */
@@
-425,10
+425,10
@@
Lisp_Object Vglobal_mode_string;
/* The number of lines scroll a window by when point leaves the window; if
it is <=0 then point is centered in the window */
/* The number of lines scroll a window by when point leaves the window; if
it is <=0 then point is centered in the window */
-int scroll_step;
+Fixnum scroll_step;
/* Scroll up to this many lines, to bring point back on screen. */
/* Scroll up to this many lines, to bring point back on screen. */
-int scroll_conservatively;
+Fixnum scroll_conservatively;
/* Marker for where to display an arrow on top of the buffer text. */
Lisp_Object Voverlay_arrow_position;
/* Marker for where to display an arrow on top of the buffer text. */
Lisp_Object Voverlay_arrow_position;
@@
-451,7
+451,8
@@
Lisp_Object Vpre_redisplay_hook, Vpost_redisplay_hook;
Lisp_Object Qpre_redisplay_hook, Qpost_redisplay_hook;
#endif /* INHIBIT_REDISPLAY_HOOKS */
Lisp_Object Qpre_redisplay_hook, Qpost_redisplay_hook;
#endif /* INHIBIT_REDISPLAY_HOOKS */
-static int last_display_warning_tick, display_warning_tick;
+static Fixnum last_display_warning_tick;
+static Fixnum display_warning_tick;
Lisp_Object Qdisplay_warning_buffer;
int inhibit_warning_display;
Lisp_Object Qdisplay_warning_buffer;
int inhibit_warning_display;
@@
-971,6
+972,8
@@
add_bufbyte_string_runes (pos_data *data, Bufbyte *c_string,
for (pos = c_string; pos < end;)
{
for (pos = c_string; pos < end;)
{
+ Bufbyte *old_pos = pos;
+
data->ch = charptr_emchar (pos);
prop = add_emchar_rune (data);
data->ch = charptr_emchar (pos);
prop = add_emchar_rune (data);
@@
-996,6
+999,9
@@
add_bufbyte_string_runes (pos_data *data, Bufbyte *c_string,
}
INC_CHARPTR (pos);
assert (pos <= end);
}
INC_CHARPTR (pos);
assert (pos <= end);
+ /* #### Duplicate code from add_string_to_fstring_db_runes
+ should we do more?*/
+ data->bytepos += pos - old_pos;
}
return NULL;
}
return NULL;
@@
-9177,6
+9183,15
@@
init_redisplay (void)
}
#endif /* HAVE_X_WINDOWS */
}
#endif /* HAVE_X_WINDOWS */
+#ifdef HAVE_GTK
+ if (!strcmp (display_use, "gtk"))
+ {
+ Vwindow_system = Qgtk;
+ Vinitial_window_system = Qgtk;
+ return;
+ }
+#endif
+
#ifdef HAVE_MS_WINDOWS
if (!strcmp (display_use, "mswindows"))
{
#ifdef HAVE_MS_WINDOWS
if (!strcmp (display_use, "mswindows"))
{