# HG changeset patch
# User vimboss
# Date 1142112581 0
# Node ID 02c12b042aec7eee674ddb6dc04c3cbdb2a19b3a
# Parent  44348703ab1bfe920d44d4ec89f3bd4962781e9f
updated for version 7.0221

diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
--- a/runtime/doc/windows.txt
+++ b/runtime/doc/windows.txt
@@ -1,4 +1,4 @@
-*windows.txt*   For Vim version 7.0aa.  Last change: 2006 Mar 01
+*windows.txt*   For Vim version 7.0aa.  Last change: 2006 Mar 11
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -732,11 +732,12 @@ normally a small window used to show an 
 function.
 {not available when compiled without the |+quickfix| feature}
 
-There can be only one preview window.  It is created with one of the commands
-below.  The 'previewheight' option can be set to specify the height of the
-preview window when it's opened.  The 'previewwindow' option is set in the
-preview window to be able to recognize it.  The 'winfixheight' option is set
-to have it keep the same height when opening/closing other windows.
+There can be only one preview window (per tab page).  It is created with one
+of the commands below.  The 'previewheight' option can be set to specify the
+height of the preview window when it's opened.  The 'previewwindow' option is
+set in the preview window to be able to recognize it.  The 'winfixheight'
+option is set to have it keep the same height when opening/closing other
+windows.
 
 						*:pta* *:ptag*
 :pta[g][!] [tagname]
diff --git a/src/option.c b/src/option.c
--- a/src/option.c
+++ b/src/option.c
@@ -768,7 +768,7 @@ static struct vimoption
     {"completeopt",   "cot",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
 #ifdef FEAT_INS_EXPAND
 			    (char_u *)&p_cot, PV_NONE,
-			    {(char_u *)"menu", (char_u *)0L}
+			    {(char_u *)"menu,preview", (char_u *)0L}
 #else
 			    (char_u *)NULL, PV_NONE,
 			    {(char_u *)0L, (char_u *)0L}
@@ -2778,7 +2778,7 @@ static char *(p_fdm_values[]) = {"manual
 static char *(p_fcl_values[]) = {"all", NULL};
 #endif
 #ifdef FEAT_INS_EXPAND
-static char *(p_cot_values[]) = {"menu", "menuone", "longest", NULL};
+static char *(p_cot_values[]) = {"menu", "menuone", "longest", "preview", NULL};
 #endif
 
 static void set_option_default __ARGS((int, int opt_flags, int compatible));
diff --git a/src/structs.h b/src/structs.h
--- a/src/structs.h
+++ b/src/structs.h
@@ -2244,6 +2244,7 @@ typedef struct
 typedef struct
 {
     char_u	*pum_text;	/* main menu text */
+    char_u	*pum_kind;	/* extra kind text (may be truncated) */
     char_u	*pum_extra;	/* extra menu text (may be truncated) */
     char_u	*pum_info;	/* extra info */
 } pumitem_T;