patch 8.2.4658: org-mode files are not recognized

Problem:    Org-mode files are not recognized.
Solution:   Add patterns to recognize "org" files. (closes #10046)

diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index ad6ddc65ef355ff1cf90626085b1b03f12615c81..b70b58de8cc50ded3a90caaea936872933b58e23 100644 (file)
--- 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 48229add2116a710e3000f1e0b8a043d2c9391d9..0096f5f5f7ffaf5392828adcbaa8f3f971303913 100644 (file)
--- 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 1e9c718506f2411ca2f80f2a86058bd94b91463c..f0240d244efb88713b779a35289a68f6cd5fcb5c 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    4658,
 /**/
     4657,
 /**/