updated for version 7.0221

diff --git a/runtime/doc/windows.txt b/runtime/doc/windows.txt
index 96602c958527f7d47cc3b395a65a780002d8bd3d..93757a2eb5fbb57ea893317301b68ae65389bd5d 100644 (file)
--- 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 include file or definition of a
 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
index e464806672dd8f2ee0e4bc2d50ab3854df43238a..611f17119e6b6d9dfaab40f2b89e1a6dd5d0a235 100644 (file)
--- 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", "expr", "marker", "indent", "syntax",
 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
index 2d538a84290663cfa2276e97af99dcae03a68dd6..ba9833979c33bc64a2c25b68657bf45af2b561ad 100644 (file)
--- 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;