23 Commits
Author SHA1 Message Date
zeertzjqandBogdan Barbu 139ffd91de vim-patch:8c93e2d: runtime(make): variables in make target lists use wrong highlighting (#41183)
Problem:  Variables in make target lists are highlighted as targets when
          the prerequisite list is non-empty.
Solution: Match target lists separately from prerequisite regions so
          that contained identifiers are highlighted correctly.  Add
          regression test.

closes: vim/vim#20947

https://github.com/vim/vim/commit/8c93e2d50dacabcd66cc4cb9573da497e98d3c26

Co-authored-by: Bogdan Barbu <l4b.bogdan.barbu@gmail.com>
2026-08-06 08:06:25 +08:00
eb569a695f vim-patch:450895d: runtime(make): fix wrong highlighting with $ inside double quotes (#39177)
fixes: vim/vim#19986

https://github.com/vim/vim/commit/450895d86b7b22fb730c27dbd3dfe089b66c7d5c

Co-authored-by: Christian Brabandt <cb@256bit.org>
Co-authored-by: Anton Khirnov <anton@khirnov.net>
2026-04-18 00:06:56 +00:00
zeertzjqandRoland Hieber 80788dc9db vim-patch:b73565d: runtime(make): Declare syntax file orphaned
closes: vim/vim#19267

https://github.com/vim/vim/commit/b73565d89dc2d4c37b70cd801408f78394137033

Co-authored-by: Roland Hieber <rohieb@rohieb.name>
2026-01-29 08:22:15 +08:00
zeertzjqandChristian Brabandt ab20681c52 vim-patch:62d8f3d: runtime: Revert several "mark invalid contact addresses" commits (#37192)
This reverts commits:
- 6b652a785033fd4164e049492a7327c1ed7c3e5f
- 2f689d5abde0ccddca9e20d8c93a0299bd054e32
- a025a46d4169587145fb54f04af349cd05cb6122

Several email addresses that are known to be valid caused bounces
due to an issue with my email setup. The previous commits incorrectly
marked these addresses as invalid. So revert the whole thing again.

https://github.com/vim/vim/commit/62d8f3dab5a0b30c31a8df86a973c5e59821a3f0

N/A patch:
vim-patch:2f689d5: runtime: mark more invalid email addresses

Co-authored-by: Christian Brabandt <cb@256bit.org>
2026-01-02 06:53:44 +08:00
zeertzjqandChristian Brabandt 65e7aa9255 vim-patch:partial:2f689d5: runtime: mark more invalid email addresses
https://github.com/vim/vim/commit/2f689d5abde0ccddca9e20d8c93a0299bd054e32

Skip colors/ and syntax/help_ru.vim: missing previous changes.

Co-authored-by: Christian Brabandt <cb@256bit.org>
2026-01-01 08:17:57 +08:00
zeertzjqandBeleswar Prasad Padhi 5681315b82 vim-patch:519dc39: runtime(make): Makefile highlighting breaks with ')' in string
Problem:  Makefile syntax highlighting incorrectly ends function calls
          when encountering ')' inside double or single quoted strings,
          causing incorrect highlighting for the remainder of the line.
Solution: Add makeDString and makeSString to the contains list for
          makeIdent regions. This allows strings to be recognized inside
          variable references and function calls.

fixes:  vim/vim#18687
closes: vim/vim#18818

https://github.com/vim/vim/commit/519dc391d8fe2f2182160027d2cecc154ea749d0

Co-authored-by: Beleswar Prasad Padhi <beleswarprasad@gmail.com>
2025-12-24 08:45:21 +08:00
zeertzjqandYiyang Wu 081feae3a3 vim-patch:aded554: runtime(make): Move target greedy match after $() to avoid region matching overflow
Partially revert 2a33b499a3d7f46dc307234847a6562cef6cf1d8, where all
syn match makeIdent are moved before syn region makeIdent to match $()
(reason: see https://github.com/vim/vim/pull/18403#issuecomment-3341161566)

However this results in https://github.com/vim/vim/issues/18890 ,
because lines like
`$(a) =`
will first start a region search beginning with `$(`
but then the whole target including `)` will be matched by
`syn match makeIdent "^ *[^:#= \t]*\s*="me=e-1`
which leaves the region search for the never-found `)` and let the
region matching overflow.

Same for

`$(a) ::`
`$(a) +=`

The solution is to move those greedy target match back, so they take
priority and prevents region match from happening.

fixes:  vim/vim#18890
closes: vim/vim#18938

https://github.com/vim/vim/commit/aded55463a150bc9c77852f8e2c931535bedad3e

Co-authored-by: Yiyang Wu <xgreenlandforwyy@gmail.com>
2025-12-24 08:45:05 +08:00
zeertzjqandYiyang Wu a121ede1bf vim-patch:7193cab: runtime(make): Prevent makeTargetinDefine matching extra line
This fixes a bug introduced in 2a33b499a3d7f46dc307234847a6562cef6cf1d8:
When makeTargetinDefine ends with makeIdent, makeSpecTarget or
makeComment, the following line is also matched as makeTargetinDefine.

So, add keepend to prevent that just as makeTarget does.

related: vim/vim#18403
closes: vim/vim#18570

https://github.com/vim/vim/commit/7193cab6c88a6d81c9f302bf7f97810765e6d2be

Co-authored-by: Yiyang Wu <xgreenlandforwyy@gmail.com>
2025-10-26 07:22:59 +08:00
zeertzjqandYiyang Wu 446161ae08 vim-patch:2a33b49: runtime(make): syntax highlighting update for makeDefine (#36158)
Previously contents in makeDefine are nearly highlighted as Define, so
comments and targets shares the same color as Define, making it hard to
distinguish if someone write large block of targets-recipes as defined
function.

Such scenario is common in building data analysis pipeline. Recipes are
reused and targets may have multiple variables, and a single % implicit
rule is not enough.

closes: vim/vim#18403

https://github.com/vim/vim/commit/2a33b499a3d7f46dc307234847a6562cef6cf1d8

Co-authored-by: Yiyang Wu <xgreenlandforwyy@gmail.com>
2025-10-13 08:57:59 +08:00
e3e8dfe99c vim-patch:9.1.1307: make syntax does not reliably detect different flavors (#33498)
Problem:  GNU extensions, such as `ifeq` and `wildcard` function, are
          highlighted in BSDmakefile
Solution: detect BSD, GNU, or Microsoft implementation according to
	  filename, user-defined global variables, or file contents

closes: vim/vim#17089

https://github.com/vim/vim/commit/f35bd76b31e6cd62bcc47e401887059b8503c5cc

Co-authored-by: Eisuke Kawashima <e-kwsm@users.noreply.github.com>
Co-authored-by: Roland Hieber <rohieb@users.noreply.github.com>
2025-04-17 07:13:05 +08:00
zeertzjqandKen Takata 60967cd9aa vim-patch:9.1.0616: filetype: Make syntax highlighting off for MS Makefiles (#29874)
Problem:  filetype: Make syntax highlighting off for MS Makefiles
Solution: Try to detect MS Makefiles and adjust syntax rules to it.
          (Ken Takata)

Highlighting of variable expansion in Microsoft Makefile can be broken.
E.g.:
https://github.com/vim/vim/blob/2979cfc2627d76a9c09cad46a1647dcd4aa73f5f/src/Make_mvc.mak#L1331

Don't use backslash as escape characters if `make_microsoft` is set.
Also fix that `make_no_comments` was not considered if `make_microsoft`
was set.

Also add description for `make_microsoft` and `make_no_comments` to the
documentation and include a very simple filetype test

closes: vim/vim#15341

https://github.com/vim/vim/commit/eb4b903c9b238ebcc1d14cfcb207129b4931a33d

Co-authored-by: Ken Takata <kentkt@csc.jp>
2024-07-27 16:48:29 +08:00
Sean DewarandBram Moolenaar befae73044 vim-patch:76db9e076318 (#21013)
Update runtime files

https://github.com/vim/vim/commit/76db9e076318cb0ae846f43b7549ad4f2d234c0b

- `col()`'s example was changed to use `:echowin` so that the message can be
  seen with `showmode`. Use "\n" to force a hit-enter instead as `:echowin`
  isn't ported.
- Replace interpolated string usage in syntax/modula3.vim (not ported).
- Add a space after the `wincmd =` examples in `*CTRL-W_=*` so that the inlined
  code is highlighted properly when followed by a full stop.

Co-authored-by: Bram Moolenaar <Bram@vim.org>
2022-11-10 09:05:25 +00:00
Christian Clason 4cbeedf57b vim-patch:b529cfbd04c0 (#19501)
Update runtime files
https://github.com/vim/vim/commit/b529cfbd04c02e31cfa88f2c8d88b5ff532d4f7d
2022-07-26 11:26:23 +02:00
Jan Edmund Lazo 3d86857f28 vim-patch:2cfb4a2a7248
Update runtime files
https://github.com/vim/vim/commit/2cfb4a2a7248eeb40112bb482ab5b15f01b20433
2021-04-28 21:29:56 -04:00
Jan Edmund Lazo e7f6c52014 vim-patch:b17893aa940d
Update runtime files
https://github.com/vim/vim/commit/b17893aa940dc7d45421f875f5d90855880aad27

Omit feedkeys() changes.
2021-04-27 21:25:35 -04:00
Jan Edmund Lazo d112db157c vim-patch:ade0d3946801
Update runtime files.
https://github.com/vim/vim/commit/ade0d39468014fd55d30f7647a1ac104baff4bc5
2021-04-27 09:21:34 -04:00
Jan Edmund Lazo 5426785541 vim-patch:9834b96820be
Update version 8.2 notes and make syntax.
https://github.com/vim/vim/commit/9834b96820bec95d6858229d6fb256310365efff
2021-04-27 09:21:31 -04:00
Justin M. Keyes 31a5ec23eb vim-patch:723dd946f948
Update runtime files.
https://github.com/vim/vim/commit/723dd946f94856be94a943876945fb1bd8169059
2019-08-01 22:52:42 +02:00
Justin M. Keyes 47b4eb110d vim-patch:4c92e75dd4dd
Update runtime files.
https://github.com/vim/vim/commit/4c92e75dd4ddb68dd92a86dd02d53c70dd4af33a

vim-patch:c854898881c0
Revert change accidentally included in runtime file updates.  Closes vim/vim#3998.
https://github.com/vim/vim/commit/c854898881c02259f90170f210bf65bbd20cc1fc
2019-08-01 16:51:53 +02:00
Justin M. Keyes 86b596dc7a vim-patch:f37506f60f87
Updated runtime files.  Remove HiLink commands.

https://github.com/vim/vim/commit/f37506f60f87d52a9e8850e30067645e2b13783c
2017-04-28 21:25:15 +02:00
Justin M. Keyes a53409b564 vim-patch:89bcfda6834a
Updated runtime files.  Remove version checks for Vim older than 6.0.

https://github.com/vim/vim/commit/89bcfda6834aba724d12554a34b9ed49f5789fd5
2017-04-28 21:13:55 +02:00
Justin Gassner cf0ff1dd0f vim-patch:2b8388b
Updated runtime files.

https://github.com/vim/vim/commit/2b8388bd0175835eb751e6c58cd0b0b69465f0d9
2016-01-14 17:58:15 +01:00
Justin M. Keyes a98a6996c2 re-integrate runtime/ vim-patch:0 #938
Vim runtime files based on 7.4.384 / hg changeset 7090d7f160f7

Excluding:
  Amiga icons (*.info, icons/)
  doc/hangulin.txt
  tutor/
  spell/
  lang/ (only used for menu translations)
  macros/maze/, macros/hanoi/, macros/life/, macros/urm/
      These were used to test vi compatibility.
  termcap
      "Demonstration of a termcap file (for the Amiga and Archimedes)"

Helped-by: Rich Wareham <rjw57@cam.ac.uk>
Helped-by: John <john.schmidt.h@gmail.com>
Helped-by: Yann <yann@yann-salaun.com>
Helped-by: Christophe Badoit <c.badoit@lesiteimmo.com>
Helped-by: drasill <github@tof2k.com>
Helped-by: Tae Sandoval Murgan <taecilla@gmail.com>
Helped-by: Lowe Thiderman <lowe.thiderman@gmail.com>
2014-07-29 02:12:31 +00:00