This commit merges the two very differing vim and textmate versions of the sparkup.py file, when they should be the same [issue #79]. It then symbolically links the vim and textmate versions of the file to the sparkup.py in the root of the repo. It also tidies up the file a bit, for example removing trailing whitespace.
NOTE: I don't have a Mac so I can't test with Textmate. It shouldn't break anything, but apologies if it does. Also, I don't have Windows so hopefully the symlinking business works with Windows.
The following pull requests have been added in to this pull request, and therefore these pull requests should be closed.
#78 - add HTML5 self closing tag support
#59 - allow tab indentation rather than using spaces. I also made it so in vim, this option is automatically set if the user's configuration is to use tabs. Need a textmate person to add this to textmate too.
#56, kinda, but with the latest jQuery version as of now.
#71 - replace -- with --filetype=. This makes it work with PHP etc.
Major repo cleanups.
Make HTML5 the default
I won't have time to do this merge manually, I doubt @rstacruz will either. If you could jump through whatever hoops are required to allow a clean merge with master, I'd love to hit that green button.
No conflicts fetching from upstream. Wondering where the merge is?
Merge branch 'master' of https://github.com/rstacruz/sparkup
Major cleanup of code [Fix merge conflict]
Major cleanup of code [Final merge fix]
Sorry, been a while since using git. Should be good to merge now.