updated for version 7.0162

diff --git a/runtime/compiler/bdf.vim b/runtime/compiler/bdf.vim
index 77f124c597d713237234a979073a3197b9049352..a30a9b6907a9b8cc1c6995127abc5b42a0f35935 100644 (file)
--- a/runtime/compiler/bdf.vim
+++ b/runtime/compiler/bdf.vim
@@ -11,9 +11,9 @@ let current_compiler = "bdf"
 let s:cpo_save = &cpo
 set cpo-=C
 
-setlocal makeprg=bdftopcf\ $*
+CompilerSet makeprg=bdftopcf\ $*
 
-setlocal errorformat=%ABDF\ %trror\ on\ line\ %l:\ %m,
+CompilerSet errorformat=%ABDF\ %trror\ on\ line\ %l:\ %m,
       \%-Z%p^,
       \%Cbdftopcf:\ bdf\ input\\,\ %f\\,\ corrupt,
       \%-G%.%#

diff --git a/runtime/doc/change.txt b/runtime/doc/change.txt
index 3476ab229c33477e1a0e433ab42de3196d68f872..218713a0d2f7f669be8253bb330ce2d0c8e2cdcd 100644 (file)
--- a/runtime/doc/change.txt
+++ b/runtime/doc/change.txt
@@ -1,4 +1,4 @@
-*change.txt*    For Vim version 7.0aa.  Last change: 2005 Aug 14
+*change.txt*    For Vim version 7.0aa.  Last change: 2005 Nov 30
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1087,7 +1087,8 @@ register.  {not in Vi}
 7. Selection and drop registers "*, "+ and "~ 
 Use these register for storing and retrieving the selected text for the GUI.
 See |quotestar| and |quoteplus|.  When the clipboard is not available or not
-working, the unnamed register is used instead.  {not in Vi}
+working, the unnamed register is used instead.  For Unix systems the clipboard
+is only available when the |+xterm_clipboard| feature is present.  {not in Vi}
 
 Note that there is only a distinction between "* and "+ for X11 systems.  For
 an explanation of the difference, see |x11-selection|.  Under MS-Windows, use

diff --git a/runtime/doc/help.txt b/runtime/doc/help.txt
index 5fa8cf1e4acddaef7c2e2ebd970374637d3c49c7..c2d4afee0e3de029f14668901d4aa3878cc2268c 100644 (file)
--- a/runtime/doc/help.txt
+++ b/runtime/doc/help.txt
@@ -1,4 +1,4 @@
-*help.txt*     For Vim version 7.0aa.  Last change: 2005 Sep 01
+*help.txt*     For Vim version 7.0aa.  Last change: 2005 Nov 30
 
                        VIM - main help file
                                                                         k
@@ -17,13 +17,13 @@ Get specific help:  It is possible to go directly to whatever you want help
                    It is possible to further specify the context:
                                                        *help-context*
                          WHAT                  PREPEND    EXAMPLE      ~
-                     Normal mode commands     (nothing)   :help x
-                     Visual mode commands        v_       :help v_u
-                     Insert mode commands        i_       :help i_<Esc>
-                     Command-line commands       :        :help :quit
+                     Normal mode command      (nothing)   :help x
+                     Visual mode command         v_       :help v_u
+                     Insert mode command         i_       :help i_<Esc>
+                     Command-line command        :        :help :quit
                      Command-line editing        c_       :help c_<Del>
-                     Vim command arguments       -        :help -r
-                     Options                     '        :help 'textwidth'
+                     Vim command argument        -        :help -r
+                     Option                      '        :help 'textwidth'
   Search for help:  Type ":help word", then hit CTRL-D to see matching
                    help entries for "word".
 
@@ -191,6 +191,13 @@ Standard plugins ~
 |pi_expl.txt|  File explorer
 
 LOCAL ADDITIONS:                               *local-additions*
+|cecutil.txt|  DrChip's Utilities                              Jun 11, 2004
+|engspchk.txt| English Spelling Checker   (v61)        Mar 14, 2005
+|example.txt|  Example for a locally added help file
+|matchit.txt|   Extended "%" matching
+|test.txt|     Testing the hélp cömmånd nôw
+|typecorr.txt| Plugin for correcting typing mistakes
+|helpp.txt|    Dummy line to avoid an error message
 
 ------------------------------------------------------------------------------
 *bars*         Bars example

diff --git a/runtime/doc/options.txt b/runtime/doc/options.txt
index 0631d454ce4120bd699b4ecf96a4698699b8452a..cbce4f9ae0a1aabd325332c764233461a547e907 100644 (file)
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt*  For Vim version 7.0aa.  Last change: 2005 Nov 23
+*options.txt*  For Vim version 7.0aa.  Last change: 2005 Nov 30
 
 
                  VIM REFERENCE MANUAL    by Bram Moolenaar
@@ -1436,6 +1436,7 @@ A jump table for the options with a short description can be found at |Q_op|.
        to use the size for the GUI, put the command in your |gvimrc| file.
        When you set this option and Vim is unable to change the physical
        number of columns of the display, the display may be messed up.
+       Mimimum value is 12, maximum value is 10000.
 
                                        *'comments'* *'com'* *E524* *E525*
 'comments' 'com'       string  (default
@@ -4091,7 +4092,8 @@ A jump table for the options with a short description can be found at |Q_op|.
        Vim limits the number of lines to what fits on the screen.  You can
        use this command to get the tallest window possible: >
                :set lines=999
-<      If you get less lines than expected, check the 'guiheadroom' option.
+<      Minimum value is 2, maximum value is 1000.
+       If you get less lines than expected, check the 'guiheadroom' option.
        When you set this option and Vim is unable to change the physical
        number of lines of the display, the display may be messed up.
 

diff --git a/src/ex_getln.c b/src/ex_getln.c
index f92140adb49233960f82d797232ee8a7c2825559..b355257f4e6817f74b4255039c0cabc2670643e1 100644 (file)
--- a/src/ex_getln.c
+++ b/src/ex_getln.c
@@ -301,6 +301,10 @@ getcmdline(firstc, count, indent)
     ui_cursor_shape();         /* may show different cursor shape */
 #endif
 
+    /* When inside an autocommand for writing "exiting" may be set and
+     * terminal mode set to cooked.  Need to set raw mode here then. */
+    settmode(TMODE_RAW);
+
 #ifdef FEAT_CMDHIST
     init_history();
     hiscnt = hislen;           /* set hiscnt to impossible history value */
@@ -1050,7 +1054,7 @@ getcmdline(firstc, count, indent)
 
        case ESC:       /* get here if p_wc != ESC or when ESC typed twice */
        case Ctrl_C:
-               /* In exmode it doesn't make sense to return. Except when
+               /* In exmode it doesn't make sense to return.  Except when
                 * ":normal" runs out of characters. */
                if (exmode_active
 #ifdef FEAT_EX_EXTRA

diff --git a/src/screen.c b/src/screen.c
index d184865e39f3a2398dd1019f3eea7d189effb78b..ccc7cecdbaeaa4137a494baa8888026df296f2fa 100644 (file)
--- a/src/screen.c
+++ b/src/screen.c
@@ -6884,7 +6884,7 @@ screenalloc(clear)
                    else
                        len = Columns;
 #ifdef FEAT_MBYTE
-                   /* When switching to utf-8 dont copy characters, they
+                   /* When switching to utf-8 don't copy characters, they
                     * may be invalid now. */
                    if (!(enc_utf8 && ScreenLinesUC == NULL))
 #endif

diff --git a/src/version.h b/src/version.h
index f4ac30b81ef0cd82c0540c7c372739425197bc6b..d1c888bcbcc1aceeed6405d8ca4e837619c24878 100644 (file)
--- a/src/version.h
+++ b/src/version.h
@@ -36,5 +36,5 @@
 #define VIM_VERSION_NODOT      "vim70aa"
 #define VIM_VERSION_SHORT      "7.0aa"
 #define VIM_VERSION_MEDIUM     "7.0aa ALPHA"
-#define VIM_VERSION_LONG       "VIM - Vi IMproved 7.0aa ALPHA (2005 Nov 28)"
-#define VIM_VERSION_LONG_DATE  "VIM - Vi IMproved 7.0aa ALPHA (2005 Nov 28, compiled "
+#define VIM_VERSION_LONG       "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 1)"
+#define VIM_VERSION_LONG_DATE  "VIM - Vi IMproved 7.0aa ALPHA (2005 Dec 1, compiled "