Merge branch 'master' into highlight-nimscript

diff --cc runtime/syntax/nim.yaml
index ce2985c1d0c774c0c9d2ad6746b43e359fb6ef3a,94b37ce4e5a34dd8bf3ccd08b2f3f2f6b7e1cd22..2478774fe849462f9907c9e4d206a63227b85d43
--- 1/runtime/syntax/nim.yaml
--- 2/runtime/syntax/nim.yaml
+++ b/runtime/syntax/nim.yaml
@@@ -1,7 -1,7 +1,7 @@@
  filetype: nim
  
- detect:
-     filename: "\\.nims?$"
+ detect: 
 -    filename: "\\.nim$|\\.nims$|nim.cfg"
++    filename: "\\.nims?$|nim.cfg"
  
  rules:
      - preproc: "[\\{\\|]\\b(atom|lit|sym|ident|call|lvalue|sideeffect|nosideeffect|param|genericparam|module|type|let|var|const|result|proc|method|iterator|converter|macro|template|field|enumfield|forvar|label|nk[a-zA-Z]+|alias|noalias)\\b[\\}\\|]"