components/vim/patches/si_id.patch
changeset 7049 e8d705cba87d
parent 5238 ac8017f29145
equal deleted inserted replaced
7048:c1d43e41adeb 7049:e8d705cba87d
     2 build.  This is a nasty hack to undo those effects, and should not go
     2 build.  This is a nasty hack to undo those effects, and should not go
     3 upstream.  The right fix may be to get vim to stop using the "si_" prefix,
     3 upstream.  The right fix may be to get vim to stop using the "si_" prefix,
     4 since that appears to be "reserved for the implementation", per the
     4 since that appears to be "reserved for the implementation", per the
     5 OpenGroup specs.
     5 OpenGroup specs.
     6 
     6 
     7 --- src/syntax.c	Sat Aug 10 06:00:24 2013
     7 --- a/src/syntax.c	Sat Aug 10 06:00:24 2013
     8 +++ src/syntax.c	Wed Jan  6 10:34:12 2016
     8 +++ b/src/syntax.c	Wed Jan  6 10:34:12 2016
     9 @@ -279,6 +279,7 @@
     9 @@ -283,6 +283,7 @@
    10   * When si_m_endpos.lnum is 0, the items other than si_idx are unknown.
    10   * When si_m_endpos.lnum is 0, the items other than si_idx are unknown.
    11   * (The end positions have the column number of the next char)
    11   * (The end positions have the column number of the next char)
    12   */
    12   */
    13 +#undef si_id
    13 +#undef si_id
    14  typedef struct state_item
    14  typedef struct state_item