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
54a39ab
..
7967999
100644
(file)
--- a/
src/redisplay.c
+++ b/
src/redisplay.c
@@
-972,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);
@@
-997,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;
@@
-9178,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"))
{