diff options
| author | Doug Kearns <dougkearns@gmail.com> | 2021-11-26 13:01:41 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-11-26 13:01:41 +0000 |
| commit | 7329cfab36356c48edab7ed68f6244eb9e20a5b1 (patch) | |
| tree | 37ab0d73609d20da0d46922056272c1299473dda /src | |
| parent | 85be8563fe5aff686e9e30d6afff401ccd976f2a (diff) | |
patch 8.2.3679: objc file detected as Octavev8.2.3679
Problem: objc file detected as Octave. (Antony Lee)
Solution: Detect objc by preprocessor lines. (Doug Kearns, closes #9223,
closes #9220)
Diffstat (limited to 'src')
| -rw-r--r-- | src/testdir/test_filetype.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim index 6134b328d9..81ddbe9ea8 100644 --- a/src/testdir/test_filetype.vim +++ b/src/testdir/test_filetype.vim @@ -891,6 +891,16 @@ func Test_m_file() call assert_equal('objc', &filetype) bwipe! + call writefile(['#include <header.h>'], 'Xfile.m') + split Xfile.m + call assert_equal('objc', &filetype) + bwipe! + + call writefile(['#define FORTY_TWO'], 'Xfile.m') + split Xfile.m + call assert_equal('objc', &filetype) + bwipe! + " Octave call writefile(['# Octave line comment'], 'Xfile.m') diff --git a/src/version.c b/src/version.c index b7a93edbb2..ca0f16fcd0 100644 --- a/src/version.c +++ b/src/version.c @@ -758,6 +758,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 3679, +/**/ 3678, /**/ 3677, |