[packages/vim.git] / 7.3.167

To: vim_dev@googlegroups.com
Subject: Patch 7.3.167
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 7.3.167
Problem:    When using the internal grep QuickFixCmdPost is not triggered.
	    (Yukihiro Nakadaira)
Solution:   Change the place where autocommands are triggered.
Files:	    src/quickfix.c


*** ../vim-7.3.166/src/quickfix.c	2011-04-11 21:35:03.000000000 +0200
--- src/quickfix.c	2011-04-28 13:28:03.000000000 +0200
***************
*** 2742,2747 ****
--- 2742,2754 ----
  #ifdef FEAT_AUTOCMD
      char_u	*au_name = NULL;
  
+     /* Redirect ":grep" to ":vimgrep" if 'grepprg' is "internal". */
+     if (grep_internal(eap->cmdidx))
+     {
+ 	ex_vimgrep(eap);
+ 	return;
+     }
+ 
      switch (eap->cmdidx)
      {
  	case CMD_make:	    au_name = (char_u *)"make"; break;
***************
*** 2763,2775 ****
      }
  #endif
  
-     /* Redirect ":grep" to ":vimgrep" if 'grepprg' is "internal". */
-     if (grep_internal(eap->cmdidx))
-     {
- 	ex_vimgrep(eap);
- 	return;
-     }
- 
      if (eap->cmdidx == CMD_lmake || eap->cmdidx == CMD_lgrep
  	|| eap->cmdidx == CMD_lgrepadd)
  	wp = curwin;
--- 2770,2775 ----
***************
*** 3057,3066 ****
  
      switch (eap->cmdidx)
      {
! 	case CMD_vimgrep: au_name = (char_u *)"vimgrep"; break;
! 	case CMD_lvimgrep: au_name = (char_u *)"lvimgrep"; break;
! 	case CMD_vimgrepadd: au_name = (char_u *)"vimgrepadd"; break;
  	case CMD_lvimgrepadd: au_name = (char_u *)"lvimgrepadd"; break;
  	default: break;
      }
      if (au_name != NULL)
--- 3057,3070 ----
  
      switch (eap->cmdidx)
      {
! 	case CMD_vimgrep:     au_name = (char_u *)"vimgrep"; break;
! 	case CMD_lvimgrep:    au_name = (char_u *)"lvimgrep"; break;
! 	case CMD_vimgrepadd:  au_name = (char_u *)"vimgrepadd"; break;
  	case CMD_lvimgrepadd: au_name = (char_u *)"lvimgrepadd"; break;
+ 	case CMD_grep:	      au_name = (char_u *)"grep"; break;
+ 	case CMD_lgrep:	      au_name = (char_u *)"lgrep"; break;
+ 	case CMD_grepadd:     au_name = (char_u *)"grepadd"; break;
+ 	case CMD_lgrepadd:    au_name = (char_u *)"lgrepadd"; break;
  	default: break;
      }
      if (au_name != NULL)
*** ../vim-7.3.166/src/version.c	2011-04-28 17:24:54.000000000 +0200
--- src/version.c	2011-04-28 17:26:17.000000000 +0200
***************
*** 716,717 ****
--- 716,719 ----
  {   /* Add new patch number below this line */
+ /**/
+     167,
  /**/

-- 
Micro$oft: where do you want to go today?
    Linux: where do you want to go tomorrow?
  FreeBSD: are you guys coming, or what?

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\  an exciting new programming language -- http://www.Zimbu.org        ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///
Commit	Line	Data
dd753707	1	To: vim_dev@googlegroups.com
	2	Subject: Patch 7.3.167
	3	Fcc: outbox
	4	From: Bram Moolenaar <Bram@moolenaar.net>
	5	Mime-Version: 1.0
	6	Content-Type: text/plain; charset=UTF-8
	7	Content-Transfer-Encoding: 8bit
	8	------------
	9
	10	Patch 7.3.167
	11	Problem: When using the internal grep QuickFixCmdPost is not triggered.
	12	(Yukihiro Nakadaira)
	13	Solution: Change the place where autocommands are triggered.
	14	Files: src/quickfix.c
	15
	16
	17	*** ../vim-7.3.166/src/quickfix.c 2011-04-11 21:35:03.000000000 +0200
	18	--- src/quickfix.c 2011-04-28 13:28:03.000000000 +0200
	19	***************
	20	* 2742,2747 **
	21	--- 2742,2754 ----
	22	#ifdef FEAT_AUTOCMD
	23	char_u *au_name = NULL;
	24
	25	+ /* Redirect ":grep" to ":vimgrep" if 'grepprg' is "internal". */
	26	+ if (grep_internal(eap->cmdidx))
	27	+ {
	28	+ ex_vimgrep(eap);
	29	+ return;
	30	+ }
	31	+
	32	switch (eap->cmdidx)
	33	{
	34	case CMD_make: au_name = (char_u *)"make"; break;
	35	***************
	36	* 2763,2775 **
	37	}
	38	#endif
	39
	40	- /* Redirect ":grep" to ":vimgrep" if 'grepprg' is "internal". */
	41	- if (grep_internal(eap->cmdidx))
	42	- {
	43	- ex_vimgrep(eap);
	44	- return;
	45	- }
	46	-
	47	if (eap->cmdidx == CMD_lmake \|\| eap->cmdidx == CMD_lgrep
	48	\|\| eap->cmdidx == CMD_lgrepadd)
	49	wp = curwin;
	50	--- 2770,2775 ----
	51	***************
	52	* 3057,3066 **
	53
	54	switch (eap->cmdidx)
	55	{
	56	! case CMD_vimgrep: au_name = (char_u *)"vimgrep"; break;
	57	! case CMD_lvimgrep: au_name = (char_u *)"lvimgrep"; break;
	58	! case CMD_vimgrepadd: au_name = (char_u *)"vimgrepadd"; break;
	59	case CMD_lvimgrepadd: au_name = (char_u *)"lvimgrepadd"; break;
	60	default: break;
	61	}
	62	if (au_name != NULL)
	63	--- 3057,3070 ----
	64
65	switch (eap->cmdidx)
66	{
67	! case CMD_vimgrep: au_name = (char_u *)"vimgrep"; break;
68	! case CMD_lvimgrep: au_name = (char_u *)"lvimgrep"; break;
69	! case CMD_vimgrepadd: au_name = (char_u *)"vimgrepadd"; break;
70	case CMD_lvimgrepadd: au_name = (char_u *)"lvimgrepadd"; break;
71	+ case CMD_grep: au_name = (char_u *)"grep"; break;
72	+ case CMD_lgrep: au_name = (char_u *)"lgrep"; break;
73	+ case CMD_grepadd: au_name = (char_u *)"grepadd"; break;
74	+ case CMD_lgrepadd: au_name = (char_u *)"lgrepadd"; break;
75	default: break;
76	}
77	if (au_name != NULL)
78	*** ../vim-7.3.166/src/version.c 2011-04-28 17:24:54.000000000 +0200
79	--- src/version.c 2011-04-28 17:26:17.000000000 +0200
80	***************
81	* 716,717 **
82	--- 716,719 ----
83	{ /* Add new patch number below this line */
84	+ /**/
85	+ 167,
86	/**/
87
88	--
89	Micro$oft: where do you want to go today?
90	Linux: where do you want to go tomorrow?
91	FreeBSD: are you guys coming, or what?
92
93	/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
94	/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
95	\\\ an exciting new programming language -- http://www.Zimbu.org ///
96	\\\ help me help AIDS victims -- http://ICCF-Holland.org ///