summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2013-04-12 12:27:30 +0200
committerBram Moolenaar <Bram@vim.org>2013-04-12 12:27:30 +0200
commit8185111125e4713831d4b6cfeb6f47138b0c83b2 (patch)
tree6b8fb40387e6b4db437b5bd7fe5e3f2f6d72094f /src
parent644cf03b7ec4c75c695de17286b3a99dd53184dd (diff)
downloadvim-git-8185111125e4713831d4b6cfeb6f47138b0c83b2.tar.gz
updated for version 7.3.886v7.3.886
Problem: Can't build with multi-byte on Solaris 10. Solution: Add #ifdef X_HAVE_UTF8_STRING. (Laurent Blume)
Diffstat (limited to 'src')
-rw-r--r--src/ui.c13
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 4 deletions
diff --git a/src/ui.c b/src/ui.c
index c83530587..49bc56b93 100644
--- 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 8acd839c9..8605c5188 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 886,
+/**/
885,
/**/
884,