jkunstle / rpms / vim

Forked from rpms/vim 3 years ago
Clone

Blame SOURCES/7.4.449

3ef2ca
To: vim_dev@googlegroups.com
3ef2ca
Subject: Patch 7.4.449
3ef2ca
Fcc: outbox
3ef2ca
From: Bram Moolenaar <Bram@moolenaar.net>
3ef2ca
Mime-Version: 1.0
3ef2ca
Content-Type: text/plain; charset=UTF-8
3ef2ca
Content-Transfer-Encoding: 8bit
3ef2ca
------------
3ef2ca
3ef2ca
Patch 7.4.449
3ef2ca
Problem:    Can't easily close the help window. (Chris Gaal)
3ef2ca
Solution:   Add ":helpclose". (Christian Brabandt)
3ef2ca
Files:	    runtime/doc/helphelp.txt, runtime/doc/index.txt, src/ex_cmds.c,
3ef2ca
	    src/ex_cmds.h, src/proto/ex_cmds.pro
3ef2ca
3ef2ca
3ef2ca
*** ../vim-7.4.448/runtime/doc/helphelp.txt	2013-08-10 13:24:54.000000000 +0200
3ef2ca
--- runtime/doc/helphelp.txt	2014-09-19 19:38:11.110445851 +0200
3ef2ca
***************
3ef2ca
*** 96,101 ****
3ef2ca
--- 96,104 ----
3ef2ca
  			find a tag in a file with the same language as the
3ef2ca
  			current file.  See |help-translated|.
3ef2ca
  
3ef2ca
+ 						 	*:helpc* *:helpclose*
3ef2ca
+ :helpc[lose]            Close one help window.
3ef2ca
+ 
3ef2ca
  							*:helpg* *:helpgrep*
3ef2ca
  :helpg[rep] {pattern}[@xx]
3ef2ca
  			Search all help text files and make a list of lines
3ef2ca
*** ../vim-7.4.448/runtime/doc/index.txt	2013-08-10 13:24:56.000000000 +0200
3ef2ca
--- runtime/doc/index.txt	2014-09-19 19:38:23.694445878 +0200
3ef2ca
***************
3ef2ca
*** 1244,1249 ****
3ef2ca
--- 1244,1250 ----
3ef2ca
  |:gvim|		:gv[im]		start the GUI
3ef2ca
  |:hardcopy|	:ha[rdcopy]	send text to the printer
3ef2ca
  |:help|		:h[elp]		open a help window
3ef2ca
+ |:helpclose|	:helpc[lose]	close one help window
3ef2ca
  |:helpfind|	:helpf[ind]	dialog to open a help window
3ef2ca
  |:helpgrep|	:helpg[rep]	like ":grep" but searches help files
3ef2ca
  |:helptags|	:helpt[ags]	generate help tags for a directory
3ef2ca
*** ../vim-7.4.448/src/ex_cmds.c	2014-08-29 09:02:23.886399246 +0200
3ef2ca
--- src/ex_cmds.c	2014-09-19 19:33:43.350445266 +0200
3ef2ca
***************
3ef2ca
*** 5899,5904 ****
3ef2ca
--- 5899,5922 ----
3ef2ca
      vim_free(tag);
3ef2ca
  }
3ef2ca
  
3ef2ca
+ /*
3ef2ca
+  * ":helpclose": Close the help window
3ef2ca
+  */
3ef2ca
+     void
3ef2ca
+ ex_helpclose(eap)
3ef2ca
+     exarg_T	*eap UNUSED;
3ef2ca
+ {
3ef2ca
+     win_T *win;
3ef2ca
+ 
3ef2ca
+     FOR_ALL_WINDOWS(win)
3ef2ca
+     {
3ef2ca
+ 	if (win->w_buffer->b_help)
3ef2ca
+ 	{
3ef2ca
+ 	    win_close(win, FALSE);
3ef2ca
+ 	    break;
3ef2ca
+ 	}
3ef2ca
+     }
3ef2ca
+ }
3ef2ca
  
3ef2ca
  #if defined(FEAT_MULTI_LANG) || defined(PROTO)
3ef2ca
  /*
3ef2ca
*** ../vim-7.4.448/src/ex_cmds.h	2014-03-23 16:03:56.163311626 +0100
3ef2ca
--- src/ex_cmds.h	2014-09-19 19:21:09.134443618 +0200
3ef2ca
***************
3ef2ca
*** 417,422 ****
3ef2ca
--- 417,424 ----
3ef2ca
  			BANG|FILES|EDITCMD|ARGOPT|TRLBAR|CMDWIN),
3ef2ca
  EX(CMD_help,		"help",		ex_help,
3ef2ca
  			BANG|EXTRA|NOTRLCOM),
3ef2ca
+ EX(CMD_helpclose,	"helpclose",	ex_helpclose,
3ef2ca
+ 			RANGE|NOTADR|COUNT|TRLBAR),
3ef2ca
  EX(CMD_helpfind,	"helpfind",	ex_helpfind,
3ef2ca
  			EXTRA|NOTRLCOM),
3ef2ca
  EX(CMD_helpgrep,	"helpgrep",	ex_helpgrep,
3ef2ca
*** ../vim-7.4.448/src/proto/ex_cmds.pro	2013-08-10 13:37:09.000000000 +0200
3ef2ca
--- src/proto/ex_cmds.pro	2014-09-19 19:21:09.134443618 +0200
3ef2ca
***************
3ef2ca
*** 44,49 ****
3ef2ca
--- 44,50 ----
3ef2ca
  void free_old_sub __ARGS((void));
3ef2ca
  int prepare_tagpreview __ARGS((int undo_sync));
3ef2ca
  void ex_help __ARGS((exarg_T *eap));
3ef2ca
+ void ex_helpclose __ARGS((exarg_T *eap));
3ef2ca
  char_u *check_help_lang __ARGS((char_u *arg));
3ef2ca
  int help_heuristic __ARGS((char_u *matched_string, int offset, int wrong_case));
3ef2ca
  int find_help_tags __ARGS((char_u *arg, int *num_matches, char_u ***matches, int keep_lang));
3ef2ca
*** ../vim-7.4.448/src/version.c	2014-09-19 16:13:48.358419065 +0200
3ef2ca
--- src/version.c	2014-09-19 18:06:13.718433799 +0200
3ef2ca
***************
3ef2ca
*** 743,744 ****
3ef2ca
--- 743,746 ----
3ef2ca
  {   /* Add new patch number below this line */
3ef2ca
+ /**/
3ef2ca
+     449,
3ef2ca
  /**/
3ef2ca
3ef2ca
-- 
3ef2ca
hundred-and-one symptoms of being an internet addict:
3ef2ca
165. You have a web page burned into your glasses
3ef2ca
3ef2ca
 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
3ef2ca
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
3ef2ca
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
3ef2ca
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///