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)

diff --git a/src/ui.c b/src/ui.c
index c83530587490dde9eb9793cbfc73dccee28225df..49bc56b931f4f62fd13c99afb725e30a94fb627e 100644 (file)
--- a/src/ui.c
+++ b/src/ui.c
@@ -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;

diff --git a/src/version.c b/src/version.c
index 8acd839c9a215083fcbac0847a268548a60889f1..8605c5188bad71a6aadf94f9567f18a0dafb51b2 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -728,6 +728,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    886,
 /**/
     885,
 /**/