- new

Changed files:
    6.3.042 -> 1.1
    6.3.043 -> 1.1
    6.3.044 -> 1.1
    6.3.045 -> 1.1
    6.3.046 -> 1.1
    6.3.047 -> 1.1

diff --git a/6.3.042 b/6.3.042
new file mode 100644 (file)
index 0000000..9e5fb51
--- /dev/null
+++ b/6.3.042
@@ -0,0 +1,57 @@
+To: vim-dev@vim.org
+Subject: Patch 6.3.042
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.042
+Problem:    When there is a closed fold at the top of the window, CTRL-X
+           CTRL-E in Insert mode reduces the size of the fold instead of
+           scrolling the text up. (Gautam)
+Solution:   Scroll over the closed fold.
+Files:     src/move.c
+
+
+*** ../vim-6.3.041/src/move.c  Wed Jun  9 14:56:26 2004
+--- src/move.c Mon Dec  6 11:49:22 2004
+***************
+*** 1551,1557 ****
+--- 1551,1562 ----
+           --curwin->w_topfill;
+       else
+  #endif
++      {
++ #ifdef FEAT_FOLDING
++          (void)hasFolding(curwin->w_topline, NULL, &curwin->w_topline);
++ #endif
+           ++curwin->w_topline;
++      }
+       ++curwin->w_botline;            /* approximate w_botline */
+       curwin->w_valid &= ~(VALID_WROW|VALID_CROW|VALID_BOTLINE);
+      }
+*** ../vim-6.3.041/src/version.c       Sun Dec  5 16:43:06 2004
+--- src/version.c      Mon Dec  6 11:48:43 2004
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     42,
+  /**/
+
+-- 
+A salesperson says:            Translation:
+"backward compatible"          Old technology
+"Premium"                      Overpriced
+"Can't keep it on the shelf"   Unavailable
+"Stands alone"                 Piece of shit
+"Proprietary"                  Incompatible
+                               (Scott Adams - The Dilbert principle)
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///

diff --git a/6.3.043 b/6.3.043
new file mode 100644 (file)
index 0000000..09a846d
--- /dev/null
+++ b/6.3.043
@@ -0,0 +1,277 @@
+To: vim-dev@vim.org
+Subject: Patch 6.3.043
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.043
+Problem:    'hlsearch' highlighting sometimes disappears when inserting text
+           in PHP code with syntax highlighting. (Marcel Svitalsky)
+Solution:   Don't use pointers to remember where a match was found, use an
+           index.  The pointers may become invalid when searching in other
+           lines.
+Files:     src/screen.c
+
+
+*** ../vim-6.3.042/src/screen.c        Sun Dec  5 14:57:15 2004
+--- src/screen.c       Tue Dec  7 13:09:09 2004
+***************
+*** 110,117 ****
+      int              attr;   /* attributes to be used for a match */
+      int              attr_cur; /* attributes currently active in win_line() */
+      linenr_T first_lnum;     /* first lnum to search for multi-line pat */
+!     char_u   *startp; /* in win_line() points to char where HL starts */
+!     char_u   *endp;   /* in win_line() points to char where HL ends */
+  } match_T;
+  
+  static match_T search_hl;    /* used for 'hlsearch' highlight matching */
+--- 110,117 ----
+      int              attr;   /* attributes to be used for a match */
+      int              attr_cur; /* attributes currently active in win_line() */
+      linenr_T first_lnum;     /* first lnum to search for multi-line pat */
+!     colnr_T  startcol; /* in win_line() points to char where HL starts */
+!     colnr_T  endcol;  /* in win_line() points to char where HL ends */
+  } match_T;
+  
+  static match_T search_hl;    /* used for 'hlsearch' highlight matching */
+***************
+*** 926,932 ****
+  
+       /* When a change starts above w_topline and the end is below
+        * w_topline, start redrawing at w_topline.
+!       * If the end of the change is above w_topline: do like no changes was
+        * made, but redraw the first line to find changes in syntax. */
+       if (mod_top != 0 && mod_top < wp->w_topline)
+       {
+--- 926,932 ----
+  
+       /* When a change starts above w_topline and the end is below
+        * w_topline, start redrawing at w_topline.
+!       * If the end of the change is above w_topline: do like no change was
+        * made, but redraw the first line to find changes in syntax. */
+       if (mod_top != 0 && mod_top < wp->w_topline)
+       {
+***************
+*** 2896,2903 ****
+      shl = &search_hl;
+      for (;;)
+      {
+!      shl->startp = NULL;
+!      shl->endp = NULL;
+       shl->attr_cur = 0;
+       if (shl->rm.regprog != NULL)
+       {
+--- 2896,2903 ----
+      shl = &search_hl;
+      for (;;)
+      {
+!      shl->startcol = MAXCOL;
+!      shl->endcol = MAXCOL;
+       shl->attr_cur = 0;
+       if (shl->rm.regprog != NULL)
+       {
+***************
+*** 2912,2936 ****
+           if (shl->lnum != 0 && shl->lnum <= lnum)
+           {
+               if (shl->lnum == lnum)
+!                  shl->startp = line + shl->rm.startpos[0].col;
+               else
+!                  shl->startp = line;
+               if (lnum == shl->lnum + shl->rm.endpos[0].lnum
+                                                 - shl->rm.startpos[0].lnum)
+!                  shl->endp = line + shl->rm.endpos[0].col;
+               else
+!                  shl->endp = line + MAXCOL;
+               /* Highlight one character for an empty match. */
+!              if (shl->startp == shl->endp)
+               {
+  #ifdef FEAT_MBYTE
+!                  if (has_mbyte && *shl->endp != NUL)
+!                      shl->endp += (*mb_ptr2len_check)(shl->endp);
+                   else
+  #endif
+!                      ++shl->endp;
+               }
+!              if (shl->startp < ptr)  /* match at leftcol */
+               {
+                   shl->attr_cur = shl->attr;
+                   search_attr = shl->attr;
+--- 2912,2936 ----
+           if (shl->lnum != 0 && shl->lnum <= lnum)
+           {
+               if (shl->lnum == lnum)
+!                  shl->startcol = shl->rm.startpos[0].col;
+               else
+!                  shl->startcol = 0;
+               if (lnum == shl->lnum + shl->rm.endpos[0].lnum
+                                                 - shl->rm.startpos[0].lnum)
+!                  shl->endcol = shl->rm.endpos[0].col;
+               else
+!                  shl->endcol = MAXCOL;
+               /* Highlight one character for an empty match. */
+!              if (shl->startcol == shl->endcol)
+               {
+  #ifdef FEAT_MBYTE
+!                  if (has_mbyte && line[shl->endcol] != NUL)
+!                      shl->endcol += (*mb_ptr2len_check)(line + shl->endcol);
+                   else
+  #endif
+!                      ++shl->endcol;
+               }
+!              if ((long)shl->startcol < v)  /* match at leftcol */
+               {
+                   shl->attr_cur = shl->attr;
+                   search_attr = shl->attr;
+***************
+*** 3193,3214 ****
+                * Do this first for search_hl, then for match_hl, so that
+                * ":match" overrules 'hlsearch'.
+                */
+               shl = &search_hl;
+               for (;;)
+               {
+                   while (shl->rm.regprog != NULL)
+                   {
+!                      if (shl->startp != NULL
+!                              && ptr >= shl->startp
+!                              && ptr < shl->endp)
+                       {
+                           shl->attr_cur = shl->attr;
+                       }
+!                      else if (ptr == shl->endp)
+                       {
+                           shl->attr_cur = 0;
+  
+-                          v = (long)(ptr - line);
+                           next_search_hl(wp, shl, lnum, (colnr_T)v);
+  
+                           /* Need to get the line again, a multi-line regexp
+--- 3193,3214 ----
+                * Do this first for search_hl, then for match_hl, so that
+                * ":match" overrules 'hlsearch'.
+                */
++              v = (long)(ptr - line);
+               shl = &search_hl;
+               for (;;)
+               {
+                   while (shl->rm.regprog != NULL)
+                   {
+!                      if (shl->startcol != MAXCOL
+!                              && v >= (long)shl->startcol
+!                              && v < (long)shl->endcol)
+                       {
+                           shl->attr_cur = shl->attr;
+                       }
+!                      else if (v == (long)shl->endcol)
+                       {
+                           shl->attr_cur = 0;
+  
+                           next_search_hl(wp, shl, lnum, (colnr_T)v);
+  
+                           /* Need to get the line again, a multi-line regexp
+***************
+*** 3218,3240 ****
+  
+                           if (shl->lnum == lnum)
+                           {
+!                              shl->startp = line + shl->rm.startpos[0].col;
+                               if (shl->rm.endpos[0].lnum == 0)
+!                                  shl->endp = line + shl->rm.endpos[0].col;
+                               else
+!                                  shl->endp = line + MAXCOL;
+  
+!                              if (shl->startp == shl->endp)
+                               {
+                                   /* highlight empty match, try again after
+                                    * it */
+  #ifdef FEAT_MBYTE
+                                   if (has_mbyte)
+!                                      shl->endp +=
+!                                             (*mb_ptr2len_check)(shl->endp);
+                                   else
+  #endif
+!                                      ++shl->endp;
+                               }
+  
+                               /* Loop to check if the match starts at the
+--- 3218,3240 ----
+  
+                           if (shl->lnum == lnum)
+                           {
+!                              shl->startcol = shl->rm.startpos[0].col;
+                               if (shl->rm.endpos[0].lnum == 0)
+!                                  shl->endcol = shl->rm.endpos[0].col;
+                               else
+!                                  shl->endcol = MAXCOL;
+  
+!                              if (shl->startcol == shl->endcol)
+                               {
+                                   /* highlight empty match, try again after
+                                    * it */
+  #ifdef FEAT_MBYTE
+                                   if (has_mbyte)
+!                                      shl->endcol += (*mb_ptr2len_check)(line
+!                                                             + shl->endcol);
+                                   else
+  #endif
+!                                      ++shl->endcol;
+                               }
+  
+                               /* Loop to check if the match starts at the
+***************
+*** 3868,3875 ****
+                   && ((area_attr != 0 && vcol == fromcol)
+  #ifdef FEAT_SEARCH_EXTRA
+                       /* highlight 'hlsearch' match at end of line */
+!                      || ptr - 1 == search_hl.startp
+!                      || ptr - 1 == match_hl.startp
+  #endif
+                      ))
+           {
+--- 3868,3875 ----
+                   && ((area_attr != 0 && vcol == fromcol)
+  #ifdef FEAT_SEARCH_EXTRA
+                       /* highlight 'hlsearch' match at end of line */
+!                      || (ptr - line) - 1 == (long)search_hl.startcol
+!                      || (ptr - line) - 1 == (long)match_hl.startcol
+  #endif
+                      ))
+           {
+***************
+*** 3906,3912 ****
+  #ifdef FEAT_SEARCH_EXTRA
+               if (area_attr == 0)
+               {
+!                  if (ptr - 1 == match_hl.startp)
+                       char_attr = match_hl.attr;
+                   else
+                       char_attr = search_hl.attr;
+--- 3906,3912 ----
+  #ifdef FEAT_SEARCH_EXTRA
+               if (area_attr == 0)
+               {
+!                  if ((ptr - line) - 1 == (long)match_hl.startcol)
+                       char_attr = match_hl.attr;
+                   else
+                       char_attr = search_hl.attr;
+*** ../vim-6.3.042/src/version.c       Mon Dec  6 11:51:12 2004
+--- src/version.c      Tue Dec  7 12:57:14 2004
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     43,
+  /**/
+
+-- 
+A)bort, R)etry, P)lease don't bother me again
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///

diff --git a/6.3.044 b/6.3.044
new file mode 100644 (file)
index 0000000..aefdf44
--- /dev/null
+++ b/6.3.044
@@ -0,0 +1,91 @@
+To: vim-dev@vim.org
+Subject: Patch 6.3.044 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.044 (extra)
+Problem:    Mac: When 'linespace' is non-zero the Insert mode cursor leaves
+           pixels behind. (Richard Sandilands)
+Solution:   Erase the character cell before drawing the text when needed.
+Files:     src/gui_mac.c
+
+
+*** ../vim-6.3.043/src/gui_mac.c       Wed Jun  9 14:56:27 2004
+--- src/gui_mac.c      Wed Dec  8 21:48:12 2004
+***************
+*** 3560,3565 ****
+--- 3560,3586 ----
+       (void)SwapQDTextFlags(qd_flags);
+      }
+  
++     /*
++      * When antialiasing we're using srcOr mode, we have to clear the block
++      * before drawing the text.
++      * Also needed when 'linespace' is non-zero to remove the cursor and
++      * underlining.
++      * But not when drawing transparently.
++      * The following is like calling gui_mch_clear_block(row, col, row, col +
++      * len - 1), but without setting the bg color to gui.back_pixel.
++      */
++     if (((sys_version >= 0x1020 && p_antialias) || p_linespace != 0)
++          && !(flags & DRAW_TRANSP))
++     {
++      Rect rc;
++ 
++      rc.left = FILL_X(col);
++      rc.top = FILL_Y(row);
++      rc.right = FILL_X(col + len) + (col + len == Columns);
++      rc.bottom = FILL_Y(row + 1);
++      EraseRect(&rc);
++     }
++ 
+      if (sys_version >= 0x1020 && p_antialias)
+      {
+       StyleParameter face;
+***************
+*** 3573,3594 ****
+  
+       /* Quartz antialiasing works only in srcOr transfer mode. */
+       TextMode(srcOr);
+- 
+-      if (!(flags & DRAW_TRANSP))
+-      {
+-          /*
+-           * Since we're using srcOr mode, we have to clear the block
+-           * before drawing the text.  The following is like calling
+-           * gui_mch_clear_block(row, col, row, col + len - 1),
+-           * but without setting the bg color to gui.back_pixel.
+-           */
+-          Rect rc;
+-          rc.left = FILL_X(col);
+-          rc.top = FILL_Y(row);
+-          rc.right = FILL_X(col + len) + (col + len == Columns);
+-          rc.bottom = FILL_Y(row + 1);
+-          EraseRect(&rc);
+-      }
+  
+       MoveTo(TEXT_X(col), TEXT_Y(row));
+       DrawText((char*)s, 0, len);
+--- 3594,3599 ----
+*** ../vim-6.3.043/src/version.c       Tue Dec  7 13:12:08 2004
+--- src/version.c      Wed Dec  8 21:50:21 2004
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     44,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+27. You refer to your age as 3.x.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///

diff --git a/6.3.045 b/6.3.045
new file mode 100644 (file)
index 0000000..3756a06
--- /dev/null
+++ b/6.3.045
@@ -0,0 +1,363 @@
+To: vim-dev@vim.org
+Subject: Patch 6.3.045
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.045
+Problem:    Unusual characters in an option value may cause unexpected
+           behavior, especially for a modeline. (Ciaran McCreesh)
+Solution:   Don't allow setting termcap options or 'printdevice' or
+           'titleold' in a modeline.  Don't list options for "termcap"
+           and "all" in a modeline.  Don't allow unusual characters in
+           'filetype', 'syntax', 'backupext', 'keymap', 'patchmode' and
+           'langmenu'.
+Files:     src/option.c, runtime/doc/options.txt
+
+
+*** ../vim-6.3.044/src/option.c        Mon Sep 13 16:36:12 2004
+--- src/option.c       Thu Dec  9 15:41:03 2004
+***************
+*** 293,298 ****
+--- 293,299 ----
+  #define P_SECURE     0x40000L/* cannot change in modeline or secure mode */
+  #define P_GETTEXT    0x80000L/* expand default value with _() */
+  #define P_NOGLOB       0x100000L/* do not use local value for global vimrc */
++ #define P_NFNAME       0x200000L/* only normal file name chars allowed */
+  
+  /*
+   * options[] is initialized here.
+***************
+*** 413,419 ****
+      {"backupdir",   "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE,
+                           (char_u *)&p_bdir, PV_NONE,
+                           {(char_u *)DFLT_BDIR, (char_u *)0L}},
+!     {"backupext",   "bex",  P_STRING|P_VI_DEF,
+                           (char_u *)&p_bex, PV_NONE,
+                           {
+  #ifdef VMS
+--- 414,420 ----
+      {"backupdir",   "bdir", P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP|P_SECURE,
+                           (char_u *)&p_bdir, PV_NONE,
+                           {(char_u *)DFLT_BDIR, (char_u *)0L}},
+!     {"backupext",   "bex",  P_STRING|P_VI_DEF|P_NFNAME,
+                           (char_u *)&p_bex, PV_NONE,
+                           {
+  #ifdef VMS
+***************
+*** 846,852 ****
+      {"fileformats", "ffs",  P_STRING|P_VIM|P_COMMA|P_NODUP,
+                           (char_u *)&p_ffs, PV_NONE,
+                           {(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM}},
+!     {"filetype",    "ft",   P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB,
+  #ifdef FEAT_AUTOCMD
+                           (char_u *)&p_ft, PV_FT,
+                           {(char_u *)"", (char_u *)0L}
+--- 847,853 ----
+      {"fileformats", "ffs",  P_STRING|P_VIM|P_COMMA|P_NODUP,
+                           (char_u *)&p_ffs, PV_NONE,
+                           {(char_u *)DFLT_FFS_VI, (char_u *)DFLT_FFS_VIM}},
+!     {"filetype",    "ft",   P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME,
+  #ifdef FEAT_AUTOCMD
+                           (char_u *)&p_ft, PV_FT,
+                           {(char_u *)"", (char_u *)0L}
+***************
+*** 1284,1290 ****
+                           {(char_u *)0L, (char_u *)0L}
+  #endif
+                           },
+!     {"keymap",           "kmp",  P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT,
+  #ifdef FEAT_KEYMAP
+                           (char_u *)&p_keymap, PV_KMAP,
+                           {(char_u *)"", (char_u *)0L}
+--- 1285,1291 ----
+                           {(char_u *)0L, (char_u *)0L}
+  #endif
+                           },
+!     {"keymap",           "kmp",  P_STRING|P_ALLOCED|P_VI_DEF|P_RBUF|P_RSTAT|P_NFNAME,
+  #ifdef FEAT_KEYMAP
+                           (char_u *)&p_keymap, PV_KMAP,
+                           {(char_u *)"", (char_u *)0L}
+***************
+*** 1330,1336 ****
+                           {(char_u *)NULL,
+  #endif
+                               (char_u *)0L}},
+!     {"langmenu",    "lm",   P_STRING|P_VI_DEF,
+  #if defined(FEAT_MENU) && defined(FEAT_MULTI_LANG)
+                           (char_u *)&p_lm, PV_NONE,
+  #else
+--- 1331,1337 ----
+                           {(char_u *)NULL,
+  #endif
+                               (char_u *)0L}},
+!     {"langmenu",    "lm",   P_STRING|P_VI_DEF|P_NFNAME,
+  #if defined(FEAT_MENU) && defined(FEAT_MULTI_LANG)
+                           (char_u *)&p_lm, PV_NONE,
+  #else
+***************
+*** 1562,1568 ****
+                           {(char_u *)0L, (char_u *)0L}
+  #endif
+                           },
+!     {"patchmode",   "pm",   P_STRING|P_VI_DEF,
+                           (char_u *)&p_pm, PV_NONE,
+                           {(char_u *)"", (char_u *)0L}},
+      {"path",     "pa",   P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
+--- 1563,1569 ----
+                           {(char_u *)0L, (char_u *)0L}
+  #endif
+                           },
+!     {"patchmode",   "pm",   P_STRING|P_VI_DEF|P_NFNAME,
+                           (char_u *)&p_pm, PV_NONE,
+                           {(char_u *)"", (char_u *)0L}},
+      {"path",     "pa",   P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
+***************
+*** 1595,1601 ****
+                           (char_u *)NULL, PV_NONE,
+  #endif
+                           {(char_u *)FALSE, (char_u *)0L}},
+!     {"printdevice", "pdev", P_STRING|P_VI_DEF,
+  #ifdef FEAT_PRINTER
+                           (char_u *)&p_pdev, PV_NONE,
+                           {(char_u *)"", (char_u *)0L}
+--- 1596,1602 ----
+                           (char_u *)NULL, PV_NONE,
+  #endif
+                           {(char_u *)FALSE, (char_u *)0L}},
+!     {"printdevice", "pdev", P_STRING|P_VI_DEF|P_SECURE,
+  #ifdef FEAT_PRINTER
+                           (char_u *)&p_pdev, PV_NONE,
+                           {(char_u *)"", (char_u *)0L}
+***************
+*** 1981,1987 ****
+      {"switchbuf",   "swb",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+                           (char_u *)&p_swb, PV_NONE,
+                           {(char_u *)"", (char_u *)0L}},
+!     {"syntax",           "syn",  P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB,
+  #ifdef FEAT_SYN_HL
+                           (char_u *)&p_syn, PV_SYN,
+                           {(char_u *)"", (char_u *)0L}
+--- 1982,1988 ----
+      {"switchbuf",   "swb",  P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+                           (char_u *)&p_swb, PV_NONE,
+                           {(char_u *)"", (char_u *)0L}},
+!     {"syntax",           "syn",  P_STRING|P_ALLOCED|P_VI_DEF|P_NOGLOB|P_NFNAME,
+  #ifdef FEAT_SYN_HL
+                           (char_u *)&p_syn, PV_SYN,
+                           {(char_u *)"", (char_u *)0L}
+***************
+*** 2086,2092 ****
+                           (char_u *)NULL, PV_NONE,
+  #endif
+                           {(char_u *)85L, (char_u *)0L}},
+!     {"titleold",    NULL,   P_STRING|P_VI_DEF|P_GETTEXT,
+  #ifdef FEAT_TITLE
+                           (char_u *)&p_titleold, PV_NONE,
+                           {(char_u *)N_("Thanks for flying Vim"),
+--- 2087,2093 ----
+                           (char_u *)NULL, PV_NONE,
+  #endif
+                           {(char_u *)85L, (char_u *)0L}},
+!     {"titleold",    NULL,   P_STRING|P_VI_DEF|P_GETTEXT|P_SECURE,
+  #ifdef FEAT_TITLE
+                           (char_u *)&p_titleold, PV_NONE,
+                           {(char_u *)N_("Thanks for flying Vim"),
+***************
+*** 2321,2327 ****
+                           {(char_u *)0L, (char_u *)0L}},
+  
+  /* terminal output codes */
+! #define p_term(sss, vvv)   {sss, NULL, P_STRING|P_VI_DEF|P_RALL, \
+                           (char_u *)&vvv, PV_NONE, \
+                           {(char_u *)"", (char_u *)0L}},
+  
+--- 2322,2328 ----
+                           {(char_u *)0L, (char_u *)0L}},
+  
+  /* terminal output codes */
+! #define p_term(sss, vvv)   {sss, NULL, P_STRING|P_VI_DEF|P_RALL|P_SECURE, \
+                           (char_u *)&vvv, PV_NONE, \
+                           {(char_u *)"", (char_u *)0L}},
+  
+***************
+*** 3310,3316 ****
+       errmsg = NULL;
+       startarg = arg;         /* remember for error message */
+  
+!      if (STRNCMP(arg, "all", 3) == 0 && !isalpha(arg[3]))
+       {
+           /*
+            * ":set all"  show all options.
+--- 3311,3318 ----
+       errmsg = NULL;
+       startarg = arg;         /* remember for error message */
+  
+!      if (STRNCMP(arg, "all", 3) == 0 && !isalpha(arg[3])
+!                                              && !(opt_flags & OPT_MODELINE))
+       {
+           /*
+            * ":set all"  show all options.
+***************
+*** 3326,3332 ****
+           else
+               showoptions(1, opt_flags);
+       }
+!      else if (STRNCMP(arg, "termcap", 7) == 0)
+       {
+           showoptions(2, opt_flags);
+           show_termcodes();
+--- 3328,3334 ----
+           else
+               showoptions(1, opt_flags);
+       }
+!      else if (STRNCMP(arg, "termcap", 7) == 0 && !(opt_flags & OPT_MODELINE))
+       {
+           showoptions(2, opt_flags);
+           show_termcodes();
+***************
+*** 4611,4616 ****
+--- 4613,4627 ----
+               ) && (options[opt_idx].flags & P_SECURE))
+      {
+       errmsg = e_secure;
++     }
++ 
++     /* Check for a "normal" file name in some options.  Disallow a path
++      * separator (slash and/or backslash), wildcards and characters that are
++      * often illegal in a file name. */
++     else if ((options[opt_idx].flags & P_NFNAME)
++                                 && vim_strpbrk(*varp, "/\\*?[|<>") != NULL)
++     {
++      errmsg = e_invarg;
+      }
+  
+      /* 'term' */
+*** ../vim-6.3.044/runtime/doc/options.txt     Wed Jun  9 14:56:28 2004
+--- runtime/doc/options.txt    Thu Dec  9 16:39:07 2004
+***************
+*** 1,4 ****
+! *options.txt*        For Vim version 6.3.  Last change: 2004 Jun 01
+  
+  
+                 VIM REFERENCE MANUAL    by Bram Moolenaar
+--- 1,4 ----
+! *options.txt*        For Vim version 6.3.  Last change: 2004 Dec 09
+  
+  
+                 VIM REFERENCE MANUAL    by Bram Moolenaar
+***************
+*** 139,144 ****
+--- 139,147 ----
+  (the ^[ is a real <Esc> here, use CTRL-V <Esc> to enter it)
+  The advantage over a mapping is that it works in all situations.
+  
++ The t_xx options cannot be set from a |modeline| or in the |sandbox|, for
++ security reasons.
++ 
+  The listing from ":set" looks different from Vi.  Long string options are put
+  at the end of the list.  The number of options is quite large.       The output of
+  "set all" probably does not fit on the screen, causing Vim to give the
+***************
+*** 945,950 ****
+--- 948,954 ----
+       accidentally overwriting existing files with a backup file.  You might
+       prefer using ".bak", but make sure that you don't have files with
+       ".bak" that you want to keep.
++      Only normal file name characters can be used, "/\*?[|<>" are illegal.
+  
+                                               *'backupskip'* *'bsk'*
+  'backupskip' 'bsk'   string  (default: "/tmp/*,$TMPDIR/*,$TMP/*,$TEMP/*")
+***************
+*** 2407,2412 ****
+--- 2411,2417 ----
+       type that is actually stored with the file.
+       This option is not copied to another buffer, independent of the 's' or
+       'S' flag in 'cpoptions'.
++      Only normal file name characters can be used, "/\*?[|<>" are illegal.
+  
+                                               *'fillchars'* *'fcs'*
+  'fillchars' 'fcs'    string  (default "vert:|,fold:-")
+***************
+*** 3599,3604 ****
+--- 3604,3610 ----
+       Setting this option to a valid keymap name has the side effect of
+       setting 'iminsert' to one, so that the keymap becomes effective.
+       'imsearch' is also set to one, unless it was -1
++      Only normal file name characters can be used, "/\*?[|<>" are illegal.
+  
+                                       *'keymodel'* *'km'*
+  'keymodel' 'km'              string  (default "")
+***************
+*** 3690,3695 ****
+--- 3696,3702 ----
+       matter what $LANG is set to: >
+               :set langmenu=nl_NL.ISO_8859-1
+  <    When 'langmenu' is empty, |v:lang| is used.
++      Only normal file name characters can be used, "/\*?[|<>" are illegal.
+       If your $LANG is set to a non-English language but you do want to use
+       the English menus: >
+               :set langmenu=none
+***************
+*** 4310,4315 ****
+--- 4317,4323 ----
+       Using 'patchmode' for compressed files appends the extension at the
+       end (e.g., "file.gz.orig"), thus the resulting name isn't always
+       recognized as a compressed file.
++      Only normal file name characters can be used, "/\*?[|<>" are illegal.
+  
+                                       *'path'* *'pa'* *E343* *E345* *E347*
+  'path' 'pa'          string  (default on Unix: ".,/usr/include,,"
+***************
+*** 4424,4429 ****
+--- 4432,4439 ----
+       in the standard printer dialog.
+       If the option is empty, then vim will use the system default printer
+       for ":hardcopy!"
++      This option cannot be set from a |modeline| or in the |sandbox|, for
++      security reasons.
+  
+                                       *'printencoding'* *'penc'* *E620*
+  'printencoding' 'penc'       String  (default empty, except for:
+***************
+*** 5711,5716 ****
+--- 5721,5727 ----
+       Syntax autocommand event is triggered with the value as argument.
+       This option is not copied to another buffer, independent of the 's' or
+       'S' flag in 'cpoptions'.
++      Only normal file name characters can be used, "/\*?[|<>" are illegal.
+  
+                                       *'tabstop'* *'ts'*
+  'tabstop' 'ts'               number  (default 8)
+***************
+*** 6089,6094 ****
+--- 6100,6107 ----
+       This option will be used for the window title when exiting Vim if the
+       original title cannot be restored.  Only happens if 'title' is on or
+       'titlestring' is not empty.
++      This option cannot be set from a |modeline| or in the |sandbox|, for
++      security reasons.
+                                               *'titlestring'*
+  'titlestring'                string  (default "")
+                       global
+*** ../vim-6.3.044/src/version.c       Wed Dec  8 21:51:39 2004
+--- src/version.c      Thu Dec  9 16:23:34 2004
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     45,
+  /**/
+
+-- 
+How To Keep A Healthy Level Of Insanity:
+7. Finish all your sentences with "in accordance with the prophecy".
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///

diff --git a/6.3.046 b/6.3.046
new file mode 100644 (file)
index 0000000..c6132b9
--- /dev/null
+++ b/6.3.046
@@ -0,0 +1,80 @@
+To: vim-dev@vim.org
+Subject: Patch 6.3.046
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.046
+Problem:    ":registers" doesn't show multi-byte characters properly.
+           (Valery Kondakoff)
+Solution:   Get the length of each character before displaying it.
+Files:     src/ops.c
+
+
+*** ../vim-6.3.045/src/ops.c   Fri Jul  9 22:21:01 2004
+--- src/ops.c  Sat Dec 11 16:11:42 2004
+***************
+*** 3698,3703 ****
+--- 3698,3708 ----
+      int                      name;
+      int                      attr;
+      char_u           *arg = eap->arg;
++ #ifdef FEAT_MBYTE
++     int                      clen;
++ #else
++ # define clen 1
++ #endif
+  
+      if (arg != NULL && *arg == NUL)
+       arg = NULL;
+***************
+*** 3745,3754 ****
+               }
+               for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p)
+               {
+-                  msg_outtrans_len(p, 1);
+  #ifdef FEAT_MBYTE
+!                  if (has_mbyte)
+!                      p += (*mb_ptr2len_check)(p) - 1;
+  #endif
+               }
+           }
+--- 3750,3761 ----
+               }
+               for (p = yb->y_array[j]; *p && (n -= ptr2cells(p)) >= 0; ++p)
+               {
+  #ifdef FEAT_MBYTE
+!                  clen = (*mb_ptr2len_check)(p);
+! #endif
+!                  msg_outtrans_len(p, clen);
+! #ifdef FEAT_MBYTE
+!                  p += clen - 1;
+  #endif
+               }
+           }
+*** ../vim-6.3.045/src/version.c       Thu Dec  9 16:41:39 2004
+--- src/version.c      Sat Dec 11 16:12:58 2004
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     46,
+  /**/
+
+-- 
+This planet has -- or rather had -- a problem, which was this: most
+of the people living on it were unhappy for pretty much of the time.
+Many solutions were suggested for this problem, but most of these
+were largely concerned with the movements of small green pieces of
+paper, which is odd because on the whole it wasn't the small green
+pieces of paper that were unhappy.
+               -- Douglas Adams, "The Hitchhiker's Guide to the Galaxy"
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///

diff --git a/6.3.047 b/6.3.047
new file mode 100644 (file)
index 0000000..2fc450b
--- /dev/null
+++ b/6.3.047
@@ -0,0 +1,77 @@
+To: vim-dev@vim.org
+Subject: Patch 6.3.047 (extra)
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.047 (extra)
+Problem:    Win32 with Borland C 5.5 on Windows XP: A new file is created with
+           read-only attributes. (Tony Mechelynck)
+Solution:   Don't use the _wopen() function for Borland.
+Files:     src/os_win32.c
+
+
+*** ../vim-6.3.046/src/os_win32.c      Wed Jun  9 14:56:26 2004
+--- src/os_win32.c     Wed Dec 15 15:35:41 2004
+***************
+*** 4460,4474 ****
+      int
+  mch_open(char *name, int flags, int mode)
+  {
+      WCHAR    *wn;
+      int              f;
+  
+!     if (enc_codepage >= 0 && (int)GetACP() != enc_codepage
+! # ifdef __BORLANDC__
+!          /* Wide functions of Borland C 5.5 do not work on Windows 98. */
+!          && g_PlatformId == VER_PLATFORM_WIN32_NT
+! # endif
+!        )
+      {
+       wn = enc_to_ucs2(name, NULL);
+       if (wn != NULL)
+--- 4460,4471 ----
+      int
+  mch_open(char *name, int flags, int mode)
+  {
++     /* _wopen() does not work with Borland C 5.5: creates a read-only file. */
++ # ifndef __BORLANDC__
+      WCHAR    *wn;
+      int              f;
+  
+!     if (enc_codepage >= 0 && (int)GetACP() != enc_codepage)
+      {
+       wn = enc_to_ucs2(name, NULL);
+       if (wn != NULL)
+***************
+*** 4482,4487 ****
+--- 4479,4485 ----
+            * the _wopen() fails for missing wide functions. */
+       }
+      }
++ # endif
+  
+      return open(name, flags, mode);
+  }
+*** ../vim-6.3.046/src/version.c       Sat Dec 11 16:14:41 2004
+--- src/version.c      Wed Dec 15 15:35:51 2004
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     47,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+60. As your car crashes through the guardrail on a mountain road, your first
+    instinct is to search for the "back" button.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///