To: vim-dev@vim.org

Subject: patch 7.1.013

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 7.1.013

Problem:    ":syn include" only loads the first file, while it is documented

	    as doing the equivalent of ":runtime!".

Solution:   Change the argument to source_runtime(). (James Vega)

Files:	    src/syntax.c

*** ../vim-7.1.012/src/syntax.c	Thu May 10 20:54:33 2007

--- src/syntax.c	Sun Jun 17 22:03:30 2007

***************

*** 4460,4467 ****

      current_syn_inc_tag = ++running_syn_inc_tag;

      prev_toplvl_grp = curbuf->b_syn_topgrp;

      curbuf->b_syn_topgrp = sgl_id;

!     if (source ? do_source(eap->arg, FALSE, FALSE) == FAIL

! 				: source_runtime(eap->arg, DOSO_NONE) == FAIL)

  	EMSG2(_(e_notopen), eap->arg);

      curbuf->b_syn_topgrp = prev_toplvl_grp;

      current_syn_inc_tag = prev_syn_inc_tag;

--- 4460,4467 ----

      current_syn_inc_tag = ++running_syn_inc_tag;

      prev_toplvl_grp = curbuf->b_syn_topgrp;

      curbuf->b_syn_topgrp = sgl_id;

!     if (source ? do_source(eap->arg, FALSE, DOSO_NONE) == FAIL

! 				: source_runtime(eap->arg, TRUE) == FAIL)

  	EMSG2(_(e_notopen), eap->arg);

      curbuf->b_syn_topgrp = prev_toplvl_grp;

      current_syn_inc_tag = prev_syn_inc_tag;

*** ../vim-7.1.012/src/version.c	Tue Jun 19 20:56:52 2007

--- src/version.c	Thu Jun 28 11:58:25 2007

***************

*** 668,669 ****

--- 668,671 ----

  {   /* Add new patch number below this line */

+ /**/

+     13,

  /**/

-- 

MORTICIAN:    What?

CUSTOMER:     Nothing -- here's your nine pence.

DEAD PERSON:  I'm not dead!

MORTICIAN:    Here -- he says he's not dead!

CUSTOMER:     Yes, he is.

DEAD PERSON:  I'm not!

                                  The Quest for the Holy Grail (Monty Python)

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\

///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\

\\\        download, build and distribute -- http://www.A-A-P.org        ///

 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///