forked from aniani/vim
updated for version 7.0163
This commit is contained in:
@@ -1319,12 +1319,6 @@ x_error_handler(dpy, error_event)
|
||||
XErrorEvent *error_event;
|
||||
{
|
||||
XGetErrorText(dpy, error_event->error_code, (char *)IObuff, IOSIZE);
|
||||
#if defined(FEAT_GUI_KDE)
|
||||
/* KDE sometimes produces X error that we want to ignore */
|
||||
STRCAT(IObuff, _("\nVim: Got X error but we continue...\n"));
|
||||
mch_errmsg((char *)IObuff);
|
||||
return 0;
|
||||
#else
|
||||
STRCAT(IObuff, _("\nVim: Got X error\n"));
|
||||
|
||||
/* We cannot print a message and continue, because no X calls are allowed
|
||||
@@ -1333,7 +1327,6 @@ x_error_handler(dpy, error_event)
|
||||
preserve_exit(); /* preserve files and exit */
|
||||
|
||||
return 0; /* NOTREACHED */
|
||||
#endif
|
||||
}
|
||||
|
||||
/*
|
||||
@@ -1474,7 +1467,7 @@ get_x11_windis()
|
||||
did_set_error_handler = TRUE;
|
||||
}
|
||||
|
||||
#if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK) || defined(FEAT_GUI_KDE)
|
||||
#if defined(FEAT_GUI_X11) || defined(FEAT_GUI_GTK)
|
||||
if (gui.in_use)
|
||||
{
|
||||
/*
|
||||
@@ -1896,11 +1889,6 @@ mch_settitle(title, icon)
|
||||
* Note: if "t_TS" is set, title is set with escape sequence rather
|
||||
* than x11 calls, because the x11 calls don't always work
|
||||
*/
|
||||
#ifdef FEAT_GUI_KDE
|
||||
/* dont know why but KDE needs this one as we don't go through the next
|
||||
* function... */
|
||||
gui_mch_settitle(title, icon);
|
||||
#endif
|
||||
if ((type || *T_TS != NUL) && title != NULL)
|
||||
{
|
||||
if (oldtitle == NULL
|
||||
|
Reference in New Issue
Block a user