0
0
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00

updated for version 7.3.886

Problem:    Can't build with multi-byte on Solaris 10.
Solution:   Add #ifdef X_HAVE_UTF8_STRING. (Laurent Blume)
This commit is contained in:
Bram Moolenaar
2013-04-12 12:27:30 +02:00
parent 644cf03b7e
commit 8185111125
2 changed files with 11 additions and 4 deletions

View File

@@ -1458,7 +1458,7 @@ clip_gen_request_selection(cbd)
int
clip_gen_owner_exists(cbd)
VimClipboard *cbd;
VimClipboard *cbd UNUSED;
{
#ifdef FEAT_XCLIPBOARD
# ifdef FEAT_GUI_GTK
@@ -2134,7 +2134,7 @@ clip_x11_request_selection_cb(w, success, sel_atom, type, value, length,
text_prop.encoding = *type;
text_prop.format = *format;
text_prop.nitems = len;
#ifdef FEAT_MBYTE
#if defined(FEAT_MBYTE) && defined(X_HAVE_UTF8_STRING)
if (*type == utf8_atom)
status = Xutf8TextPropertyToTextList(X_DISPLAY, &text_prop,
&text_list, &n_text);
@@ -2196,8 +2196,13 @@ clip_x11_request_selection(myShell, dpy, cbd)
default: type = XA_STRING;
}
#ifdef FEAT_MBYTE
if (type == utf8_atom && !enc_utf8)
/* Only request utf-8 when 'encoding' is utf8. */
if (type == utf8_atom
# if defined(X_HAVE_UTF8_STRING)
&& !enc_utf8
# endif
)
/* Only request utf-8 when 'encoding' is utf8 and
* Xutf8TextPropertyToTextList is available. */
continue;
#endif
success = MAYBE;