summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--runtime/filetype.vim3
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
3 files changed, 6 insertions, 0 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 9dc4811053..81764c1b59 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1407,6 +1407,9 @@ au BufNewFile,BufRead *.ninja setf ninja
" Nix
au BufRead,BufNewFile *.nix setf nix
+" Norg
+au BufNewFile,BufRead *.norg setf norg
+
" NPM RC file
au BufNewFile,BufRead npmrc,.npmrc setf dosini
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 4fdbac5dcc..0bd6453be7 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -482,6 +482,7 @@ def s:GetFilenameChecks(): dict<list<string>>
nim: ['file.nim', 'file.nims', 'file.nimble'],
ninja: ['file.ninja'],
nix: ['file.nix'],
+ norg: ['file.norg'],
nqc: ['file.nqc'],
nroff: ['file.tr', 'file.nr', 'file.roff', 'file.tmac', 'file.mom', 'tmac.file'],
nsis: ['file.nsi', 'file.nsh'],
diff --git a/src/version.c b/src/version.c
index 39afebd664..08fcbeb4e9 100644
--- a/src/version.c
+++ b/src/version.c
@@ -700,6 +700,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1803,
+/**/
1802,
/**/
1801,