update to vim 4.4beta

1 files changed, 21 insertions, 8 deletions

diff --git a/usr.bin/vim/doc/vim_gui.txt b/usr.bin/vim/doc/vim_gui.txt
index 755240937a7..017f6f49e09 100644
--- a/usr.bin/vim/doc/vim_gui.txt
+++ b/usr.bin/vim/doc/vim_gui.txt
@@ -1,4 +1,4 @@
-*vim_gui.txt*   For Vim version 4.2.  Last modification: 1996 June 11
+*vim_gui.txt*   For Vim version 4.4.  Last modification: 1996 Sep 12
 
 
 		       Vim's Graphical User Interface
@@ -31,10 +31,23 @@ that waits for gvim to exit), start gvim with "gvim -f", "vim -gf" or use
 color.  If you want the GUI to run in the foreground always, include the 'f'
 flag in 'guioptions'.  |-f|.
 
-When the GUI starts up, the file ~/.gvimrc is sourced if it exists, and then
-the file ./.gvimrc.  This file may contain commands to set up your own
-customised menus (see |:menu|) and initialise other things that you may want
-to set up differently from the terminal version.
+							*gui_init*
+When the GUI starts up initializations are carried out, in this order:
+- If the system gvimrc exists, it is sourced.  The name if this file is
+  something like "/usr/local/share/vim/gvimrc".  You can check this with
+  ":version".
+- If the GVIMINIT environment variable exists and is not empty, it is
+  executed as an Ex command.  Otherwise, if the user gvimrc file exists, it
+  is sourced.  The name of this file is something like "$HOME/.gvimrc".  You
+  can check this with ":version".
+- If the 'exrc' option is set (which is NOT the default) the file ./.gvimrc
+  is sourced, if it exist and isn't the same file as the system or user
+  gvimrc file.  If this file is not owned by you, some security restrictions
+  apply.
+
+You can use the gvimrc files to set up your own customised menus (see |:menu|)
+and initialise other things that you may want to set up differently from the
+terminal version.
 
 There are a number of options which only have meaning in the GUI version of
 Vim.  These are 'guifont', 'guipty' and 'guioptions'.  They are documented
@@ -461,7 +474,7 @@ scrollbars will remain the same, because Vim has its own, which are already
 
     - Window should be redrawn when resizing at the hit-return prompt.
 
-    - Use different cursor and mouse shapes/colours for different modes.
+    - Use different cursor and mouse shapes/colors for different modes.
 
     - Scrollbars with Motif 1.1 are ordered upside down!  Do we care?
 
@@ -474,8 +487,8 @@ scrollbars will remain the same, because Vim has its own, which are already
       current Vim window.
 
     - Add a new command :highlight for specifying how various things should
-      be highlighted, allowing colours to be given.  Currently it's all hard
-      coded, the text colour, bg colour etc.
+      be highlighted, allowing colors to be given.  Currently it's all hard
+      coded, the text color, bg color etc.
 
     - We need a nice little picture to go on the icon :-)  But how do we do
       that?