Fix Vim mode-line regexp

Author: zonuexe

magic-filetype.el

@@ -48,8 +48,8 @@
 (eval-when-compile
   (require 'rx))
 
-(defcustom magic-filetype-vim-filetype-line-re
-  "vim: *set +\\(?:ft\\|filetype\\)=\\(.+\\):"
+(defcustom  magic-filetype-vim-filetype-line-re
+  "vim: *set +\\(?:.*?\\)\\(?:ft\\|filetype\\)=\\([^ :]+\\)\\(?:.*?\\):$"
   "Regexp of Vim filetype line."
   :group 'magic-filetype
   :type  'regexp)

test/vim-filetype-test.el

@@ -16,7 +16,18 @@
   (let ((data
          (list
           (list :expected "javascript"
-                :header "// vim:set ft=javascript:"))))
+                :header "// vim:set ft=javascript:")
+          (list :expected "javascript"
+                :header "// vim:set ft=javascript :")
+          (list :expected "javascript"
+                :header "// vim:set expandtab ft=javascript:")
+          (list :expected "javascript"
+                :header "// vim:set ft=javascript expandtab:")
+          (list :expected "javascript"
+                :header "// vim:set fenc=cp932 ff=unix ft=javascript:")
+          (list :expected "javascript"
+                :header "// vim:set ff=unix ft=javascript fenc=cp932:")
+          )))
     (mapc
      (lambda (d)
        (let ((expected (plist-get d :expected))