To: vim-dev@vim.org
Subject: Patch 5.6a.005
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
------------

Patch 5.6a.005
Problem:    'hlsearch' was not listed alphabetically.  The value of 'toolbar'
	    was changed when 'compatible' is set.
Solution:   Moved entry of 'hlsearch' in options[] table down.
	    Don't reset 'toolbar' option to the default value when
	    'compatible' is set.
Files:	    src/option.c


*** ../vim-5.6a.4/src/option.c	Mon Dec 20 09:59:08 1999
--- src/option.c	Tue Dec 21 16:05:23 1999
***************
*** 24,29 ****
--- 24,33 ----
   * - Add documentation!  One line in doc/help.txt, full description in
   *   options.txt, and any other related places.
   * - Add an entry in runtime/optwin.vim.
+  * When making changes:
+  * - Adjust the help for the option in doc/option.txt.
+  * - When an entry has the P_VIM flag, or is lacking the P_VI_DEF flag, add a
+  *   comment at the help for the 'compatible' option.
   */
  
  #include "vim.h"
***************
*** 556,564 ****
  			    (char_u *)&p_hl,
  			    {(char_u *)"8:SpecialKey,@:NonText,d:Directory,e:ErrorMsg,i:IncSearch,l:Search,m:MoreMsg,M:ModeMsg,n:LineNr,r:Question,s:StatusLine,S:StatusLineNC,t:Title,v:Visual,V:VisualNOS,w:WarningMsg,W:WildMenu",
  				(char_u *)0L}},
-     {"hlsearch",    "hls",  P_BOOL|P_VI_DEF|P_VIM|P_RALL,
- 			    (char_u *)&p_hls,
- 			    {(char_u *)FALSE, (char_u *)0L}},
      {"history",	    "hi",   P_NUM|P_VIM,
  			    (char_u *)&p_hi,
  			    {(char_u *)0L, (char_u *)20L}},
--- 560,565 ----
***************
*** 576,581 ****
--- 577,585 ----
  			    (char_u *)NULL,
  #endif
  			    {(char_u *)FALSE, (char_u *)0L}},
+     {"hlsearch",    "hls",  P_BOOL|P_VI_DEF|P_VIM|P_RALL,
+ 			    (char_u *)&p_hls,
+ 			    {(char_u *)FALSE, (char_u *)0L}},
      {"icon",	    NULL,   P_BOOL|P_VI_DEF,
  #ifdef WANT_TITLE
  			    (char_u *)&p_icon,
***************
*** 1243,1249 ****
  #endif
  			    {(char_u *)"", (char_u *)0L}},
  #if defined(USE_GUI_GTK) && defined(USE_TOOLBAR)
!     {"toolbar",     "tb",   P_STRING|P_COMMA|P_VI_DEF|P_VIM,
  			    (char_u *)&p_toolbar,
  			    {(char_u *)"icons,tooltips", (char_u *)0L}},
  #endif
--- 1247,1253 ----
  #endif
  			    {(char_u *)"", (char_u *)0L}},
  #if defined(USE_GUI_GTK) && defined(USE_TOOLBAR)
!     {"toolbar",     "tb",   P_STRING|P_COMMA|P_VI_DEF,
  			    (char_u *)&p_toolbar,
  			    {(char_u *)"icons,tooltips", (char_u *)0L}},
  #endif
*** ../vim-5.6a.4/src/version.c	Tue Dec 21 13:03:09 1999
--- src/version.c	Tue Dec 21 16:07:39 1999
***************
*** 420,421 ****
--- 420,423 ----
  {   /* Add new patch number below this line */
+ /**/
+     5,
  /**/

-- 
Beer & pretzels can't be served at the same time in any bar or restaurant.
		[real standing law in North Dakota, United States of America]

--/-/---- Bram Moolenaar ---- Bram@moolenaar.net ---- Bram@vim.org ---\-\--
  \ \    www.vim.org/iccf      www.moolenaar.net       www.vim.org    / /