updated for version 7.0153

28 files changed, 528 insertions, 44 deletions

diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index fa51c2a040..a06b6f65fc 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Sep 29
+*eval.txt*      For Vim version 7.0aa.  Last change: 2005 Oct 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1372,6 +1372,14 @@ v:progname	Contains the name (with path removed) with which Vim was
 v:register	The name of the register supplied to the last normal mode
 		command.  Empty if none were supplied. |getreg()| |setreg()|
 
+					*v:scrollstart* *scrollstart-variable*
+v:scrollstart	String describing the script or function that caused the
+		screen to scroll up.  It's only set when it is empty, thus the
+		first reason is remembered.  It is set to "Unknown" for a
+		typed command.
+		This can be used to find out why your script causes the
+		hit-enter prompt.
+
 					*v:servername* *servername-variable*
 v:servername	The resulting registered |x11-clientserver| name if any.
 		Read-only.
diff --git a/runtime/doc/insert.txt b/runtime/doc/insert.txt
index f668c00936..4b6d0eb6f5 100644
--- a/runtime/doc/insert.txt
+++ b/runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt*    For Vim version 7.0aa.  Last change: 2005 Sep 23
+*insert.txt*    For Vim version 7.0aa.  Last change: 2005 Oct 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -952,6 +952,27 @@ CTRL-P			Find previous match for words that start with the
 			other contexts unless a double CTRL-X is used.
 
 
+INSERT COMPLETION POPUP MENU				*ins-completion-menu*
+
+Vim can display the matches in a simplistic popup menu.
+
+The menu is used when:
+- The 'completeopt' option contains "menu".
+- The terminal supports at least 8 colors.
+- There are at least two matches.
+
+While the menu is displayed these keys have a special meaning:
+<CR> and <Enter>: Accept the currently selected match
+<Up>:             Select the previous match, as if CTRL-P was used
+<Down>:           Select the next match, as if CTRL-N was used
+
+The colors of the menu can be changed with these highlight groups:
+Pmenu		normal item  |hl-Pmenu|
+PmenuSel	selected item  |hl-PmenuSel|
+PmenuSbar	scrollbar  |hl-PmenuSbar|
+PmenuThumb	thumb of the scrollbar  |hl-PmenuThumb|
+
+
 Filetype-specific remarks for omni completion	    *compl-omni-filetypes*
 
 C							*ft-c-omni*
diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 34000948e4..50bae207d8 100644
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*	For Vim version 7.0aa.  Last change: 2005 Sep 28
+*options.txt*	For Vim version 7.0aa.  Last change: 2005 Oct 02
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -1683,6 +1683,18 @@ A jump table for the options with a short description can be found at |Q_op|.
 		set completefunc=CompleteMonths
 <
 
+						*'completeopt'* *'cot'*
+'completeopt' 'cot'	string	(default: "menu")
+			global
+			{not in Vi}
+	Options for Insert mode completion |ins-completion|.
+	Currently the only supported value is:
+
+	   menu	    Use a popup menu to show the possible completions.  The
+		    menu is only shown when there is more than one match and
+		    sufficient colors are available.  |ins-completion-menu|
+
+
 				*'confirm'* *'cf'* *'noconfirm'* *'nocf'*
 'confirm' 'cf'		boolean (default off)
 			global
@@ -3382,7 +3394,9 @@ A jump table for the options with a short description can be found at |Q_op|.
 				     f:Folded,F:FoldColumn,A:DiffAdd,
 				     C:DiffChange,D:DiffDelete,T:DiffText,
 				     >:SignColumn,B:SpellBad,P:SpellCap,
-				     R:SpellRare,L:SpellLocal")
+				     R:SpellRare,L:SpellLocal,
+				     +:Pmenu,=:PmenuSel,
+				     x:PmenuSbar,X:PmenuThumb")
 			global
 			{not in Vi}
 	This option can be used to set highlighting mode for various
@@ -3423,6 +3437,10 @@ A jump table for the options with a short description can be found at |Q_op|.
 	|hl-SpellCap|	 P  word that should start with capital|spell|
 	|hl-SpellRare|	 R  rare word |spell|
 	|hl-SpellLocal|	 L  word from other region |spell|
+	|hl-Pmenu|       +  popup menu normal line
+	|hl-PmenuSel|    =  popup menu normal line
+	|hl-PmenuSbar|   x  popup menu scrollbar
+	|hl-PmenuThumb|  X  popup menu scrollbar thumb
 
 	The display modes are:
 		r	reverse		(termcap entry "mr" and "me")
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 7335d30a0d..dcd83b7872 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt*  For Vim version 7.0aa.  Last change: 2005 Jun 30
+*starting.txt*  For Vim version 7.0aa.  Last change: 2005 Oct 02
 
 
 		  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -789,10 +789,11 @@ accordingly.  Vim proceeds in this order:
 
 4. Load the plugin scripts.					*load-plugins*
 	This does the same as the command: >
-		:runtime! plugin/*.vim
+		:runtime! plugin/**/*.vim
 <	The result is that all directories in the 'runtimepath' option will be
 	searched for the "plugin" sub-directory and all files ending in ".vim"
-	will be sourced (in alphabetical order per directory).
+	will be sourced (in alphabetical order per directory), also in
+	subdirectories.
 	Loading plugins won't be done when:
 	- The 'loadplugins' option was reset in a vimrc file.
 	- The |--noplugin| command line argument is used.
diff --git a/runtime/doc/syntax.txt b/runtime/doc/syntax.txt
index 021a158af9..17bc63517e 100644
--- a/runtime/doc/syntax.txt
+++ b/runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt*	For Vim version 7.0aa.  Last change: 2005 Sep 27
+*syntax.txt*	For Vim version 7.0aa.  Last change: 2005 Oct 02
 
 
 		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@ -3926,6 +3926,14 @@ NonText		'~' and '@' at the end of the window, characters from
 		doesn't fit at the end of the line).
 							*hl-Normal*
 Normal		normal text
+							*hl-Pmenu*
+Pmenu		Popup menu: normal item.
+							*hl-PmenuSel*
+PmenuSel	Popup menu: selected item.
+							*hl-PmenuSbar*
+PmenuSbar	Popup menu: scrollbar.
+							*hl-PmenuThumb*
+PmenuThumb	Popup menu: Thumb of the scrollbar.
 							*hl-Question*
 Question	|hit-enter| prompt and yes/no questions
 							*hl-Search*
diff --git a/runtime/doc/tags b/runtime/doc/tags
index 44e189a3f8..31c5f161d9 100644
--- a/runtime/doc/tags
+++ b/runtime/doc/tags
@@ -120,10 +120,12 @@ $VIMRUNTIME	starting.txt	/*$VIMRUNTIME*
 'compatible'	options.txt	/*'compatible'*
 'complete'	options.txt	/*'complete'*
 'completefunc'	options.txt	/*'completefunc'*
+'completeopt'	options.txt	/*'completeopt'*
 'confirm'	options.txt	/*'confirm'*
 'consk'	options.txt	/*'consk'*
 'conskey'	options.txt	/*'conskey'*
 'copyindent'	options.txt	/*'copyindent'*
+'cot'	options.txt	/*'cot'*
 'cp'	options.txt	/*'cp'*
 'cpo'	options.txt	/*'cpo'*
 'cpoptions'	options.txt	/*'cpoptions'*
@@ -5353,6 +5355,10 @@ hl-ModeMsg	syntax.txt	/*hl-ModeMsg*
 hl-MoreMsg	syntax.txt	/*hl-MoreMsg*
 hl-NonText	syntax.txt	/*hl-NonText*
 hl-Normal	syntax.txt	/*hl-Normal*
+hl-Pmenu	syntax.txt	/*hl-Pmenu*
+hl-PmenuSbar	syntax.txt	/*hl-PmenuSbar*
+hl-PmenuSel	syntax.txt	/*hl-PmenuSel*
+hl-PmenuThumb	syntax.txt	/*hl-PmenuThumb*
 hl-Question	syntax.txt	/*hl-Question*
 hl-Scrollbar	syntax.txt	/*hl-Scrollbar*
 hl-Search	syntax.txt	/*hl-Search*
@@ -5546,6 +5552,7 @@ inputrestore()	eval.txt	/*inputrestore()*
 inputsave()	eval.txt	/*inputsave()*
 inputsecret()	eval.txt	/*inputsecret()*
 ins-completion	insert.txt	/*ins-completion*
+ins-completion-menu	insert.txt	/*ins-completion-menu*
 ins-expandtab	insert.txt	/*ins-expandtab*
 ins-reverse	rileft.txt	/*ins-reverse*
 ins-smarttab	insert.txt	/*ins-smarttab*
@@ -6363,6 +6370,7 @@ scroll.txt	scroll.txt	/*scroll.txt*
 scrollbind-quickadj	scroll.txt	/*scrollbind-quickadj*
 scrollbind-relative	scroll.txt	/*scrollbind-relative*
 scrolling	scroll.txt	/*scrolling*
+scrollstart-variable	eval.txt	/*scrollstart-variable*
 sdl.vim	syntax.txt	/*sdl.vim*
 search()	eval.txt	/*search()*
 search-commands	pattern.txt	/*search-commands*
@@ -6948,6 +6956,7 @@ v:prevcount	eval.txt	/*v:prevcount*
 v:profiling	eval.txt	/*v:profiling*
 v:progname	eval.txt	/*v:progname*
 v:register	eval.txt	/*v:register*
+v:scrollstart	eval.txt	/*v:scrollstart*
 v:servername	eval.txt	/*v:servername*
 v:shell_error	eval.txt	/*v:shell_error*
 v:statusmsg	eval.txt	/*v:statusmsg*
@@ -7324,6 +7333,13 @@ zf	fold.txt	/*zf*
 zg	spell.txt	/*zg*
 zh	scroll.txt	/*zh*
 zi	fold.txt	/*zi*
+zip	zip.txt	/*zip*
+zip-contents	zip.txt	/*zip-contents*
+zip-copyright	zip.txt	/*zip-copyright*
+zip-history	zip.txt	/*zip-history*
+zip-manual	zip.txt	/*zip-manual*
+zip-usage	zip.txt	/*zip-usage*
+zip.txt	zip.txt	/*zip.txt*
 zj	fold.txt	/*zj*
 zk	fold.txt	/*zk*
 zl	scroll.txt	/*zl*
diff --git a/runtime/menu.vim b/runtime/menu.vim
index f4ed1b5283..1a221bff35 100644
--- a/runtime/menu.vim
+++ b/runtime/menu.vim
@@ -2,7 +2,7 @@
 " You can also use this as a start for your own set of menus.
 "
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
-" Last Change:	2005 Aug 16
+" Last Change:	2005 Oct 01
 
 " Note that ":an" (short for ":anoremenu") is often used to make a menu work
 " in all modes and avoid side effects from mappings defined by the user.
@@ -902,7 +902,7 @@ if has("spell")
     endif
 
     let curcol = col('.')
-    let w = spellbadword()
+    let [w, a] = spellbadword()
     if col('.') > curcol		" don't use word after the cursor
       let w = ''
       call cursor(0, curcol)	" put the cursor back where it was
diff --git a/src/Make_bc3.mak b/src/Make_bc3.mak
index 207b861a8b..20a9b1fee3 100644
--- a/src/Make_bc3.mak
+++ b/src/Make_bc3.mak
@@ -80,6 +80,7 @@ EXE_dependencies = \
 	normal.obj \
 	ops.obj \
 	option.obj \
+	popupmenu.obj \
 	quickfix.obj \
 	regexp.obj \
 	screen.obj \
diff --git a/src/Make_cyg.mak b/src/Make_cyg.mak
index 880f292340..5879f1ddb6 100644
--- a/src/Make_cyg.mak
+++ b/src/Make_cyg.mak
@@ -1,6 +1,6 @@
 #
 # Makefile for VIM on Win32, using Cygnus gcc
-# Last updated by Dan Sharp.  Last Change: 2005 Jul 23
+# Last updated by Dan Sharp.  Last Change: 2005 Oct 01
 #
 # Also read INSTALLpc.txt!
 #
@@ -421,6 +421,7 @@ OBJ = \
 	$(OUTDIR)/os_win32.o \
 	$(OUTDIR)/os_mswin.o \
 	$(OUTDIR)/pathdef.o \
+	$(OUTDIR)/popupmenu.o \
 	$(OUTDIR)/quickfix.o \
 	$(OUTDIR)/regexp.o \
 	$(OUTDIR)/screen.o \
diff --git a/src/Make_dice.mak b/src/Make_dice.mak
index fe74f520ed..b4e1709ec8 100644
--- a/src/Make_dice.mak
+++ b/src/Make_dice.mak
@@ -56,6 +56,7 @@ SRC = \
 	ops.c \
 	option.c \
 	os_amiga.c \
+	popupmenu.c \
 	quickfix.c \
 	regexp.c \
 	screen.c \
@@ -99,6 +100,7 @@ OBJ =	o/buffer.o \
 	o/ops.o \
 	o/option.o \
 	o/os_amiga.o \
+	o/popupmenu.o \
 	o/quickfix.o \
 	o/regexp.o \
 	o/screen.o \
@@ -196,6 +198,8 @@ o/option.o:	option.c  $(SYMS)
 
 o/os_amiga.o:	os_amiga.c  $(SYMS) os_amiga.h
 
+o/popupmenu.o:	popupmenu.c  $(SYMS)
+
 o/quickfix.o:	quickfix.c  $(SYMS)
 
 o/regexp.o:	regexp.c  $(SYMS) regexp.h
diff --git a/src/Make_manx.mak b/src/Make_manx.mak
index 52b9e48336..46c001575c 100644
--- a/src/Make_manx.mak
+++ b/src/Make_manx.mak
@@ -64,6 +64,7 @@ SRC =	buffer.c \
 	ops.c \
 	option.c \
 	os_amiga.c \
+	popupmenu.c \
 	quickfix.c \
 	regexp.c \
 	screen.c \
@@ -109,6 +110,7 @@ OBJ =	obj/buffer.o \
 	obj/ops.o \
 	obj/option.o \
 	obj/os_amiga.o \
+	obj/popupmenu.o \
 	obj/quickfix.o \
 	obj/regexp.o \
 	obj/screen.o \
@@ -152,6 +154,7 @@ PRO =	proto/buffer.pro \
 	proto/ops.pro \
 	proto/option.pro \
 	proto/os_amiga.pro \
+	proto/popupmenu.pro \
 	proto/quickfix.pro \
 	proto/regexp.pro \
 	proto/screen.pro \
@@ -303,6 +306,9 @@ obj/option.o:	option.c
 obj/os_amiga.o:	os_amiga.c
 	$(CCSYM) $@ os_amiga.c
 
+obj/popupmenu.o:	popupmenu.c
+	$(CCSYM) $@ popupmenu.c
+
 obj/quickfix.o:	quickfix.c
 	$(CCSYM) $@ quickfix.c
 
diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index 9d78da56c1..7b601cc681 100644
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -389,6 +389,7 @@ OBJ = \
 	$(OUTDIR)/os_win32.o \
 	$(OUTDIR)/os_mswin.o \
 	$(OUTDIR)/pathdef.o \
+	$(OUTDIR)/popupmenu.o \
 	$(OUTDIR)/quickfix.o \
 	$(OUTDIR)/regexp.o \
 	$(OUTDIR)/screen.o \
diff --git a/src/Make_mpw.mak b/src/Make_mpw.mak
index 5be703a73a..5955a60d97 100644
--- a/src/Make_mpw.mak
+++ b/src/Make_mpw.mak
@@ -52,6 +52,7 @@ SrcFiles	=  ¶
 				  :src:option.c ¶
 				  :src:os_mac.c ¶
 				  :src:pty.c ¶
+				  :src:popupmenu.c ¶
 				  :src:quickfix.c ¶
 				  :src:regexp.c ¶
 				  :src:screen.c ¶
@@ -105,6 +106,7 @@ ObjFiles-PPC    =  ¶
 				  "{ObjDir}option.c.x" ¶
 				  "{ObjDir}os_mac.c.x" ¶
 				  "{ObjDir}pty.c.x" ¶
+				  "{ObjDir}popupmenu.c.x" ¶
 				  "{ObjDir}quickfix.c.x" ¶
 				  "{ObjDir}regexp.c.x" ¶
 				  "{ObjDir}screen.c.x" ¶
@@ -189,6 +191,7 @@ VIm  ÄÄ  {ObjFiles-PPC} {LibFiles-PPC} {¥MondoBuild¥}
 "{ObjDir}option.c.x"  Ä  :src:option.c
 "{ObjDir}os_mac.c.x"  Ä  :src:os_mac.c
 "{ObjDir}pty.c.x"  Ä  :src:pty.c
+"{ObjDir}popupmenu.c.x"  Ä  :src:popupmenu.c
 "{ObjDir}quickfix.c.x"  Ä  :src:quickfix.c
 "{ObjDir}regexp.c.x"  Ä  :src:regexp.c
 "{ObjDir}screen.c.x"  Ä  :src:screen.c
@@ -276,6 +279,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -359,6 +363,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -442,6 +447,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -525,6 +531,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -608,6 +615,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -692,6 +700,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -775,6 +784,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -858,6 +868,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -941,6 +952,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -1024,6 +1036,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -1107,6 +1120,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -1190,6 +1204,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -1273,6 +1288,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -1354,6 +1370,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -1437,6 +1454,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -1520,6 +1538,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -1603,6 +1622,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -1686,6 +1706,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -1795,6 +1816,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -1879,6 +1901,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -1962,6 +1985,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -2045,6 +2069,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -2128,6 +2153,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -2211,6 +2237,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -2294,6 +2321,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -2378,6 +2406,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -2461,6 +2490,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -2544,6 +2574,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -2627,6 +2658,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -2710,6 +2742,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -2793,6 +2826,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -2876,6 +2910,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -2959,6 +2994,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -3042,6 +3078,91 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
+	:src:proto:quickfix.pro ¶
+	:src:proto:regexp.pro ¶
+	:src:proto:screen.pro ¶
+	:src:proto:search.pro ¶
+	:src:proto:spell.pro ¶
+	:src:proto:syntax.pro ¶
+	:src:proto:tag.pro ¶
+	:src:proto:term.pro ¶
+	:src:proto:termlib.pro ¶
+	:src:proto:ui.pro ¶
+	:src:proto:undo.pro ¶
+	:src:proto:version.pro ¶
+	:src:proto:window.pro ¶
+	:src:proto:if_python.pro ¶
+	:src:proto:if_tcl.pro ¶
+	:src:proto:if_ruby.pro ¶
+	:src:proto:gui.pro ¶
+	:src:proto:pty.pro ¶
+	:src:proto:gui_gtk.pro ¶
+	:src:proto:gui_gtk_x11.pro ¶
+	:src:proto:gui_motif.pro ¶
+	:src:proto:gui_athena.pro ¶
+	:src:proto:gui_mac.pro ¶
+	:src:proto:gui_x11.pro ¶
+	:src:proto:workshop.pro ¶
+	:src:proto:if_perl.pro ¶
+	:src:proto:if_perlsfio.pro
+
+:obj:popupmenu.c.x	Ä  ¶
+	:src:popupmenu.c ¶
+	:src:vim.h ¶
+	:src:auto:config.h ¶
+	:src:feature.h ¶
+	:src:os_unix.h ¶
+	:src:os_mac.h ¶
+	:src:workshop.h ¶
+	:src:ascii.h ¶
+	:src:keymap.h ¶
+	:src:term.h ¶
+	:src:macros.h ¶
+	:src:structs.h ¶
+	:src:globals.h ¶
+	:src:option.h ¶
+	:src:ex_cmds.h ¶
+	:src:proto.h ¶
+	:src:integration.h ¶
+	:src:wsdebug.h ¶
+	:src:regexp.h ¶
+	:src:gui.h ¶
+	:src:farsi.h ¶
+	:src:proto:os_unix.pro ¶
+	:src:proto:os_mac.pro ¶
+	:src:proto:buffer.pro ¶
+	:src:proto:charset.pro ¶
+	:src:proto:if_cscope.pro ¶
+	:src:proto:diff.pro ¶
+	:src:proto:digraph.pro ¶
+	:src:proto:edit.pro ¶
+	:src:proto:eval.pro ¶
+	:src:proto:ex_cmds.pro ¶
+	:src:proto:ex_cmds2.pro ¶
+	:src:proto:ex_docmd.pro ¶
+	:src:proto:ex_eval.pro ¶
+	:src:proto:ex_getln.pro ¶
+	:src:proto:fileio.pro ¶
+	:src:proto:fold.pro ¶
+	:src:proto:getchar.pro ¶
+	:src:proto:hardcopy.pro ¶
+	:src:proto:hashtable.pro ¶
+	:src:proto:hangulin.pro ¶
+	:src:proto:main.pro ¶
+	:src:proto:mark.pro ¶
+	:src:proto:memfile.pro ¶
+	:src:proto:memline.pro ¶
+	:src:proto:menu.pro ¶
+	:src:proto:message.pro ¶
+	:src:proto:misc1.pro ¶
+	:src:proto:misc2.pro ¶
+	:src:proto:move.pro ¶
+	:src:proto:multibyte.pro ¶
+	:src:proto:normal.pro ¶
+	:src:proto:ops.pro ¶
+	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -3125,6 +3246,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -3208,6 +3330,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -3291,6 +3414,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -3374,6 +3498,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -3457,6 +3582,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -3540,6 +3666,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -3623,6 +3750,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -3706,6 +3834,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -3790,6 +3919,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -3872,6 +4002,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -3955,6 +4086,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -4039,6 +4171,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -4122,6 +4255,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
@@ -4205,6 +4339,7 @@ Dependencies  Ä  $OutOfDate
 	:src:proto:normal.pro ¶
 	:src:proto:ops.pro ¶
 	:src:proto:option.pro ¶
+	:src:proto:popupmenu.pro ¶
 	:src:proto:quickfix.pro ¶
 	:src:proto:regexp.pro ¶
 	:src:proto:screen.pro ¶
diff --git a/src/Make_os2.mak b/src/Make_os2.mak
index 2c4cdaf9e0..1a64c113d4 100644
--- a/src/Make_os2.mak
+++ b/src/Make_os2.mak
@@ -68,6 +68,7 @@ OBJ = \
 	normal.o \
 	ops.o \
 	option.o \
+	popupmenu.o \
 	quickfix.o \
 	regexp.o \
 	screen.o \
@@ -140,6 +141,7 @@ mbyte.o:	mbyte.c  $(INCL)
 normal.o:	normal.c  $(INCL)
 ops.o:		ops.c  $(INCL)
 option.o:	option.c  $(INCL)
+popupmenu.o:	popupmenu.c  $(INCL)
 quickfix.o:	quickfix.c  $(INCL)
 regexp.o:	regexp.c  $(INCL)
 screen.o:	screen.c  $(INCL)
diff --git a/src/Make_ro.mak b/src/Make_ro.mak
index 38e6324b03..1577409a1f 100644
--- a/src/Make_ro.mak
+++ b/src/Make_ro.mak