summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorranjithshegde <ranjithshegde@gmail.com>2022-03-31 20:24:35 +0100
committerBram Moolenaar <Bram@vim.org>2022-03-31 20:24:35 +0100
commit3a6f952cc87065a4cf1f6502b2054ba99fdf45ed (patch)
tree7b5ec3d7746a264e57c1a3fdd1b8e1f74607d3ce
parenta6c18d38ca2df0a92403f2265a480d9dba08290f (diff)
patch 8.2.4658: org-mode files are not recognizedv8.2.4658
Problem: Org-mode files are not recognized. Solution: Add patterns to recognize "org" files. (closes #10046)
-rw-r--r--runtime/filetype.vim5
-rw-r--r--src/testdir/test_filetype.vim1
-rw-r--r--src/version.c2
3 files changed, 7 insertions, 1 deletions
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index ad6ddc65ef..b70b58de8c 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1277,6 +1277,9 @@ au BufNewFile,BufRead *.[Oo][Pp][Ll] setf opl
" Oracle config file
au BufNewFile,BufRead *.ora setf ora
+" Org
+au BufNewFile,BufRead *.org,*.org_archive setf org
+
" Packet filter conf
au BufNewFile,BufRead pf.conf setf pf
@@ -1732,7 +1735,7 @@ au BufNewFile,BufRead .zshrc,.zshenv,.zlogin,.zlogout,.zcompdump setf zsh
au BufNewFile,BufRead *.zsh setf zsh
" Scheme
-au BufNewFile,BufRead *.scm,*.ss,*.sld,*.rkt,*.rktd,*.rktl setf scheme
+au BufNewFile,BufRead *.scm,*.ss,*.sld,*.rkt,*.rktd,*.rktl setf scheme
" Screen RC
au BufNewFile,BufRead .screenrc,screenrc setf screen
diff --git a/src/testdir/test_filetype.vim b/src/testdir/test_filetype.vim
index 48229add21..0096f5f5f7 100644
--- a/src/testdir/test_filetype.vim
+++ b/src/testdir/test_filetype.vim
@@ -382,6 +382,7 @@ let s:filename_checks = {
\ 'opam': ['opam', 'file.opam', 'file.opam.template'],
\ 'openroad': ['file.or'],
\ 'ora': ['file.ora'],
+ \ 'org': ['file.org', 'file.org_archive'],
\ 'pamconf': ['/etc/pam.conf', '/etc/pam.d/file', 'any/etc/pam.conf', 'any/etc/pam.d/file'],
\ 'pamenv': ['/etc/security/pam_env.conf', '/home/user/.pam_environment', '.pam_environment', 'pam_env.conf'],
\ 'papp': ['file.papp', 'file.pxml', 'file.pxsl'],
diff --git a/src/version.c b/src/version.c
index 1e9c718506..f0240d244e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -751,6 +751,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 4658,
+/**/
4657,
/**/
4656,