diff --git a/src/MacVim/Info.plist b/src/MacVim/Info.plist
index cb5f7d1a7a..504f4c5c4d 100644
--- a/src/MacVim/Info.plist
+++ b/src/MacVim/Info.plist
@@ -1333,10 +1333,10 @@
UTTypeConformsTo
- public.plain-text
+ public.script
UTTypeDescription
- Vim Script File
+ Vim Script
UTTypeIdentifier
org.vim.vim-script
UTTypeTagSpecification
@@ -1350,41 +1350,55 @@
UTTypeConformsTo
- public.plain-text
+ public.archive
UTTypeDescription
- Plain Text File
+ Vimball archive
UTTypeIdentifier
- public.plain-text
+ org.vim.vimball-archive
UTTypeTagSpecification
public.filename-extension
- txt
- text
- utf8
+ vba
+
+ UTImportedTypeDeclarations
+
UTTypeConformsTo
+ public.text
public.plain-text
UTTypeDescription
- TeX File
+ TeX source
UTTypeIdentifier
- org.vim.tex-file
+ org.tug.tex
UTTypeTagSpecification
public.filename-extension
tex
+
+
+
+
+ UTTypeConformsTo
+
+ public.plain-text
+
+ UTTypeDescription
+ LaTeX Package source
+ UTTypeIdentifier
+ org.tug.sty
+ UTTypeTagSpecification
+
+ public.filename-extension
+
sty
- cls
- ltx
- ins
- dtx
@@ -1394,7 +1408,44 @@
public.plain-text
UTTypeDescription
- C Header Source File
+ LaTeX Class source
+ UTTypeIdentifier
+ org.tug.cls
+ UTTypeTagSpecification
+
+ public.filename-extension
+
+ cls
+
+
+
+
+ UTTypeConformsTo
+
+ public.text
+
+ UTTypeDescription
+ Plain text document
+ UTTypeIdentifier
+ public.plain-text
+ UTTypeTagSpecification
+
+ public.filename-extension
+
+ text
+ txt
+
+ public.mime-type
+ text/plain
+
+
+
+ UTTypeConformsTo
+
+ public.source-code
+
+ UTTypeDescription
+ C header code
UTTypeIdentifier
public.c-header
UTTypeTagSpecification
@@ -1408,12 +1459,12 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- C Precompiled Header Source File
+ precompiled C header
UTTypeIdentifier
- org.vim.pch-file
+ public.precompiled-c-header
UTTypeTagSpecification
public.filename-extension
@@ -1425,10 +1476,10 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- C++ Header Source File
+ C++ header code
UTTypeIdentifier
public.c-plus-plus-header
UTTypeTagSpecification
@@ -1436,7 +1487,6 @@
public.filename-extension
hh
- hp
hpp
hxx
h++
@@ -1446,12 +1496,12 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- C++ Precompiled Header Source File
+ precompiled C++ header
UTTypeIdentifier
- org.vim.pch++-file
+ public.precompiled-c-plus-plus-header
UTTypeTagSpecification
public.filename-extension
@@ -1463,10 +1513,10 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- C Source File
+ C source
UTTypeIdentifier
public.c-source
UTTypeTagSpecification
@@ -1480,65 +1530,65 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Objective-C Source File
+ C++ source
UTTypeIdentifier
- public.objective-c-source
+ public.c-plus-plus-source
UTTypeTagSpecification
public.filename-extension
- m
+ cc
+ cp
+ cpp
+ cxx
+ c++
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Objective-C++ Source File
+ Objective-C source
UTTypeIdentifier
- public.objective-c-plus-plus-source
+ public.objective-c-source
UTTypeTagSpecification
public.filename-extension
- mm
+ m
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- C++ Source File
+ Objective-C++ source
UTTypeIdentifier
- public.c-plus-plus-source
+ public.objective-c-plus-plus-source
UTTypeTagSpecification
public.filename-extension
- cc
- cp
- cpp
- cxx
- c++
+ mm
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Assembly Source File
+ Assembly source
UTTypeIdentifier
public.assembly-source
UTTypeTagSpecification
@@ -1553,10 +1603,10 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Rez Source File
+ Rez source
UTTypeIdentifier
com.apple.rez-source
UTTypeTagSpecification
@@ -1570,10 +1620,10 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Java Source File
+ Java source
UTTypeIdentifier
com.sun.java-source
UTTypeTagSpecification
@@ -1588,12 +1638,12 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Lex Source File
+ Lex source
UTTypeIdentifier
- com.apple.xcode.lex-source
+ public.lex-source
UTTypeTagSpecification
public.filename-extension
@@ -1603,6 +1653,7 @@
lmm
lpp
lxx
+ ll
@@ -1612,9 +1663,9 @@
public.plain-text
UTTypeDescription
- Yacc Source File
+ Yacc source
UTTypeIdentifier
- com.apple.xcode.yacc-source
+ public.yacc-source
UTTypeTagSpecification
public.filename-extension
@@ -1624,16 +1675,17 @@
ymm
ypp
yxx
+ yy
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Mig Definition File
+ Mach Interface Generator source
UTTypeIdentifier
public.mig-source
UTTypeTagSpecification
@@ -1641,6 +1693,7 @@
public.filename-extension
defs
+ mig
@@ -1650,7 +1703,7 @@
public.plain-text
UTTypeDescription
- Symbol Export File
+ Symbol Export
UTTypeIdentifier
com.apple.symbol-export
UTTypeTagSpecification
@@ -1664,21 +1717,68 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Fortran Source File
+ Fortran source
UTTypeIdentifier
- com.apple.xcode.fortran-source
+ public.fortran-source
UTTypeTagSpecification
public.filename-extension
f
for
- fpp
+
+
+
+
+ UTTypeConformsTo
+
+ public.source-code
+
+ UTTypeDescription
+ Fortran 77 source
+ UTTypeIdentifier
+ public.fortran-77-source
+ UTTypeTagSpecification
+
+ public.filename-extension
+
f77
+
+
+
+
+ UTTypeConformsTo
+
+ public.source-code
+
+ UTTypeDescription
+ Fortran 90 source
+ UTTypeIdentifier
+ public.fortran-90-source
+ UTTypeTagSpecification
+
+ public.filename-extension
+
f90
+
+
+
+
+ UTTypeConformsTo
+
+ public.source-code
+
+ UTTypeDescription
+ Fortran 95 source
+ UTTypeIdentifier
+ public.fortran-95-source
+ UTTypeTagSpecification
+
+ public.filename-extension
+
f95
@@ -1686,12 +1786,12 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Pascal Source file
+ Pascal source
UTTypeIdentifier
- com.apple.xcode.pascal-source
+ public.pascal-source
UTTypeTagSpecification
public.filename-extension
@@ -1703,12 +1803,12 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Ada Source File
+ Ada source
UTTypeIdentifier
- com.apple.xcode.ada-source
+ public.ada-source
UTTypeTagSpecification
public.filename-extension
@@ -1725,7 +1825,7 @@
public.plain-text
UTTypeDescription
- HTML Source File
+ HTML document
UTTypeIdentifier
public.html
UTTypeTagSpecification
@@ -1752,7 +1852,7 @@
public.plain-text
UTTypeDescription
- XML Source File
+ XML text
UTTypeIdentifier
public.xml
UTTypeTagSpecification
@@ -1760,21 +1860,17 @@
public.filename-extension
xml
- rss
- tld
- pt
- cpt
- dtml
UTTypeConformsTo
- public.plain-text
+ public.script
+ public.executable
UTTypeDescription
- JavaScript Source File
+ JavaScript
UTTypeIdentifier
com.netscape.javascript-source
UTTypeTagSpecification
@@ -1791,10 +1887,10 @@
UTTypeConformsTo
- public.plain-text
+ public.shell-script
UTTypeDescription
- Perl Source File
+ Perl script
UTTypeIdentifier
public.perl-script
UTTypeTagSpecification
@@ -1806,15 +1902,17 @@
pod
perl
+ public.mime-type
+ text/x-perl-script
UTTypeConformsTo
- public.plain-text
+ public.shell-script
UTTypeDescription
- Python Source File
+ Python script
UTTypeIdentifier
public.python-script
UTTypeTagSpecification
@@ -1822,19 +1920,18 @@
public.filename-extension
py
- rpy
- cpy
- python
+ public.mime-type
+ text/x-python-script
UTTypeConformsTo
- public.plain-text
+ public.shell-script
UTTypeDescription
- PHP Source File
+ PHP script
UTTypeIdentifier
public.php-script
UTTypeTagSpecification
@@ -1849,15 +1946,17 @@
ph4
phtml
+ public.mime-type
+ text/php, text/x-php-script, application/php
UTTypeConformsTo
- public.plain-text
+ public.shell-script
UTTypeDescription
- Ruby Source File
+ Ruby script
UTTypeIdentifier
public.ruby-script
UTTypeTagSpecification
@@ -1870,12 +1969,14 @@
rjs
rxml
+ public.mime-type
+ text/x-ruby-script
UTTypeConformsTo
- public.plain-text
+ public.script
UTTypeDescription
Shell script
@@ -1886,13 +1987,26 @@
public.filename-extension
sh
- csh
- command
- ss
+
+
+
+
+ UTTypeConformsTo
+
+ public.shell-script
+
+ UTTypeDescription
+ Bourne-Again Shell script
+ UTTypeIdentifier
+ public.bash-script
+ UTTypeTagSpecification
+
+ public.filename-extension
+
+ bash
bashrc
bash_profile
bash_login
- profile
bash_logout
@@ -1900,10 +2014,84 @@
UTTypeConformsTo
- public.plain-text
+ public.shell-script
UTTypeDescription
- Java Class File
+ Z Shell script
+ UTTypeIdentifier
+ public.zsh-script
+ UTTypeTagSpecification
+
+ public.filename-extension
+
+ zsh
+ zshrc
+ zshenv
+ zprofile
+ zlogin
+ zlogout
+
+
+
+
+ UTTypeConformsTo
+
+ public.shell-script
+
+ UTTypeDescription
+ C Shell script
+ UTTypeIdentifier
+ public.csh-script
+ UTTypeTagSpecification
+
+ public.filename-extension
+
+ csh
+
+
+
+
+ UTTypeConformsTo
+
+ public.shell-script
+
+ UTTypeDescription
+ Korn Shell script
+ UTTypeIdentifier
+ public.ksh-script
+ UTTypeTagSpecification
+
+ public.filename-extension
+
+ ksh
+
+
+
+
+ UTTypeConformsTo
+
+ public.shell-script
+
+ UTTypeDescription
+ Tenex C Shell script
+ UTTypeIdentifier
+ public.tcsh-script
+ UTTypeTagSpecification
+
+ public.filename-extension
+
+ tcsh
+
+
+
+
+ UTTypeConformsTo
+
+ public.data
+ public.executable
+
+ UTTypeDescription
+ Java Class
UTTypeIdentifier
com.sun.java-class
UTTypeTagSpecification
@@ -1920,9 +2108,9 @@
public.plain-text
UTTypeDescription
- Patch File
+ Patch file
UTTypeIdentifier
- org.vim.patch-file
+ public.patch-file
UTTypeTagSpecification
public.filename-extension
@@ -1935,10 +2123,10 @@
UTTypeConformsTo
- public.plain-text
+ public.text
UTTypeDescription
- Strings File
+ Localizable Strings
UTTypeIdentifier
com.apple.xcode.strings-text
UTTypeTagSpecification
@@ -1952,10 +2140,10 @@
UTTypeConformsTo
- public.plain-text
+ public.script
UTTypeDescription
- AppleScript Source File
+ AppleScript text
UTTypeIdentifier
com.apple.applescript.text
UTTypeTagSpecification
@@ -1969,29 +2157,31 @@
UTTypeConformsTo
- public.plain-text
+ public.script
UTTypeDescription
- ActionScript Source File
+ ActionScript
UTTypeIdentifier
- org.vim.as-file
+ com.adobe.actionscript
UTTypeTagSpecification
public.filename-extension
as
+ public.mime-type
+ application/ecmascript
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- ASP document
+ Active Server Pages document
UTTypeIdentifier
- org.vim.asp-file
+ com.microsoft.asp
UTTypeTagSpecification
public.filename-extension
@@ -2004,12 +2194,12 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
ASP.NET document
UTTypeIdentifier
- org.vim.aspx-file
+ com.microsoft.aspx
UTTypeTagSpecification
public.filename-extension
@@ -2024,12 +2214,12 @@
UTTypeConformsTo
- public.plain-text
+ public.text
UTTypeDescription
- BibTeX bibliography
+ BibTeX database
UTTypeIdentifier
- org.vim.bib-file
+ org.tug.tex.bibtex
UTTypeTagSpecification
public.filename-extension
@@ -2041,12 +2231,12 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- C# Source File
+ C# source
UTTypeIdentifier
- org.vim.cs-file
+ com.microsoft.c-sharp
UTTypeTagSpecification
public.filename-extension
@@ -2058,12 +2248,12 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Context Free Design Grammar
+ ContextFree Design Grammar
UTTypeIdentifier
- org.vim.cfdg-file
+ org.contextfreeart.contextfree
UTTypeTagSpecification
public.filename-extension
@@ -2076,11 +2266,12 @@
UTTypeConformsTo
public.plain-text
+ public.delimited-values-text
UTTypeDescription
- Comma separated values
+ comma-seperated values
UTTypeIdentifier
- org.vim.csv-file
+ public.comma-seperated-values-text
UTTypeTagSpecification
public.filename-extension
@@ -2093,11 +2284,12 @@
UTTypeConformsTo
public.plain-text
+ public.delimited-values-text
UTTypeDescription
- Tab separated values
+ tab-seperated values
UTTypeIdentifier
- org.vim.tsv-file
+ public.tab-seperated-values-text
UTTypeTagSpecification
public.filename-extension
@@ -2109,12 +2301,12 @@
UTTypeConformsTo
- public.plain-text
+ public.script
UTTypeDescription
CGI script
UTTypeIdentifier
- org.vim.cgi-file
+ org.vim.cgi-script
UTTypeTagSpecification
public.filename-extension
@@ -2127,12 +2319,12 @@
UTTypeConformsTo
- public.plain-text
+ public.text
UTTypeDescription
Configuration file
UTTypeIdentifier
- org.vim.cfg-file
+ org.vim.config-file
UTTypeTagSpecification
public.filename-extension
@@ -2147,12 +2339,12 @@
UTTypeConformsTo
- public.plain-text
+ public.text
UTTypeDescription
- Cascading style sheet
+ Cascading Style Sheet
UTTypeIdentifier
- org.vim.css-file
+ org.w3.css
UTTypeTagSpecification
public.filename-extension
@@ -2164,29 +2356,31 @@
UTTypeConformsTo
- public.plain-text
+ public.text
UTTypeDescription
Document Type Definition
UTTypeIdentifier
- org.vim.dtd-file
+ org.w3.xml-dtd
UTTypeTagSpecification
public.filename-extension
dtd
+ public.mime-type
+ application/xml-dtd
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Dylan Source File
+ Dylan Source
UTTypeIdentifier
- org.vim.dylan-file
+ public.dylan-source
UTTypeTagSpecification
public.filename-extension
@@ -2198,12 +2392,12 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Erlang Source File
+ Erlang source
UTTypeIdentifier
- org.vim.erl-file
+ org.erlang.erlang
UTTypeTagSpecification
public.filename-extension
@@ -2216,12 +2410,12 @@
UTTypeConformsTo
- public.plain-text
+ public.script
UTTypeDescription
- F-Script Source File
+ F-Script
UTTypeIdentifier
- org.vim.fscript-file
+ org.fscript.fscript
UTTypeTagSpecification
public.filename-extension
@@ -2233,12 +2427,12 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Haskell Source File
+ Haskell source
UTTypeIdentifier
- org.vim.hs-file
+ org.haskell.haskell
UTTypeTagSpecification
public.filename-extension
@@ -2251,12 +2445,12 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
Include file
UTTypeIdentifier
- org.vim.inc-file
+ org.vim.include-file
UTTypeTagSpecification
public.filename-extension
@@ -2273,24 +2467,26 @@
UTTypeDescription
iCalendar schedule
UTTypeIdentifier
- org.vim.ics-file
+ com.apple.ical.ics
UTTypeTagSpecification
public.filename-extension
ics
+ public.mime-type
+ text/calendar
UTTypeConformsTo
- public.plain-text
+ public.text
UTTypeDescription
MS Windows initialization file
UTTypeIdentifier
- org.vim.ini-file
+ com.microsoft.ini
UTTypeTagSpecification
public.filename-extension
@@ -2302,12 +2498,12 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Io Source File
+ Io source
UTTypeIdentifier
- org.vim.io-file
+ org.iolanguage.io
UTTypeTagSpecification
public.filename-extension
@@ -2319,12 +2515,12 @@
UTTypeConformsTo
- public.plain-text
+ public.script
UTTypeDescription
BeanShell script
UTTypeIdentifier
- org.vim.bsh-file
+ org.beanshell.beanshell
UTTypeTagSpecification
public.filename-extension
@@ -2336,12 +2532,12 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
Java properties file
UTTypeIdentifier
- org.vim.properties-file
+ com.sun.java-properties
UTTypeTagSpecification
public.filename-extension
@@ -2353,12 +2549,12 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
Java Server Page
UTTypeIdentifier
- org.vim.jsp-file
+ com.sun.java-server-pages
UTTypeTagSpecification
public.filename-extension
@@ -2370,12 +2566,12 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- LISP Source File
+ LISP source
UTTypeIdentifier
- org.vim.lisp-file
+ org.vim.lisp-source
UTTypeTagSpecification
public.filename-extension
@@ -2393,11 +2589,12 @@
UTTypeConformsTo
public.plain-text
+ public.log
UTTypeDescription
Log file
UTTypeIdentifier
- org.vim.log-file
+ com.apple.log
UTTypeTagSpecification
public.filename-extension
@@ -2409,12 +2606,12 @@
UTTypeConformsTo
- public.plain-text
+ public.text
UTTypeDescription
Mediawiki document
UTTypeIdentifier
- org.vim.wiki-file
+ org.mediawiki.wiki-source
UTTypeTagSpecification
public.filename-extension
@@ -2428,10 +2625,10 @@
UTTypeConformsTo
- public.plain-text
+ public.data
UTTypeDescription
- PostScript Source File
+ PostScript
UTTypeIdentifier
com.adobe.postscript
UTTypeTagSpecification
@@ -2441,17 +2638,19 @@
ps
eps
+ public.mime-type
+ application/postscript
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Scheme Source File
+ Scheme source
UTTypeIdentifier
- org.vim.scm-file
+ org.vim.scheme-source
UTTypeTagSpecification
public.filename-extension
@@ -2464,46 +2663,50 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- SQL Source File
+ SQL source
UTTypeIdentifier
- org.vim.sql-file
+ org.iso.sql
UTTypeTagSpecification
public.filename-extension
sql
+ public.mime-type
+ application/sql
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Tcl Source File
+ Tcl source
UTTypeIdentifier
- org.vim.tcl-file
+ tk.tcl.tcl
UTTypeTagSpecification
public.filename-extension
tcl
+ public.mime-type
+ application/x-tcl
UTTypeConformsTo
- public.plain-text
+ public.xml
UTTypeDescription
XSL stylesheet
UTTypeIdentifier
- org.vim.xsl-file
+ org.w3.xsl
UTTypeTagSpecification
public.filename-extension
@@ -2516,7 +2719,8 @@
UTTypeConformsTo
- public.plain-text
+ public.text
+ public.contact
UTTypeDescription
Electronic business card
@@ -2529,17 +2733,19 @@
vcf
vcard
+ public.mime-type
+ text/directory, text/vcard, text/x-vcard
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Visual Basic Source File
+ Visual Basic source
UTTypeIdentifier
- org.vim.vb-file
+ com.microsoft.visual-basic
UTTypeTagSpecification
public.filename-extension
@@ -2551,12 +2757,12 @@
UTTypeConformsTo
- public.plain-text
+ public.text
UTTypeDescription
YAML document
UTTypeIdentifier
- org.vim.yaml-file
+ org.yaml.yaml
UTTypeTagSpecification
public.filename-extension
@@ -2574,7 +2780,7 @@
UTTypeDescription
GTD document
UTTypeIdentifier
- org.vim.gtd-file
+ org.vim.gtd
UTTypeTagSpecification
public.filename-extension
@@ -2612,7 +2818,7 @@
UTTypeDescription
reStructuredText document
UTTypeIdentifier
- org.vim.rst-file
+ org.python.restructuredtext
UTTypeTagSpecification
public.filename-extension
@@ -2624,47 +2830,12 @@
UTTypeConformsTo
- public.plain-text
-
- UTTypeDescription
- Vimball Archive
- UTTypeIdentifier
- org.vim.vba-file
- UTTypeTagSpecification
-
- public.filename-extension
-
- vba
-
-
-
-
- UTTypeConformsTo
-
- public.plain-text
-
- UTTypeDescription
- VHDL Source File
- UTTypeIdentifier
- org.vim.vhdl-file
- UTTypeTagSpecification
-
- public.filename-extension
-
- vhdl
- vhd
-
-
-
-
- UTTypeConformsTo
-
- public.plain-text
+ public.source-code
UTTypeDescription
- Lua Source File
+ Lua source
UTTypeIdentifier
- org.lua.lua-source
+ org.lua.lua
UTTypeTagSpecification
public.filename-extension
@@ -2676,29 +2847,31 @@
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Verilog HDL Source File
+ Verilog HDL source
UTTypeIdentifier
- org.vim.v-file
+ org.ieee.vhdl
UTTypeTagSpecification
public.filename-extension
v
+ vhdl
+ vhd
UTTypeConformsTo
- public.plain-text
+ public.source-code
UTTypeDescription
- Verilog HDL Header Source File
+ Verilog HDL header
UTTypeIdentifier
- org.vim.vh-file
+ org.ieee.vhdl-header
UTTypeTagSpecification
public.filename-extension