Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: vim-scripts/vim-json-bundle
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: jakar/vim-json
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 12 commits
  • 6 files changed
  • 2 contributors

Commits on Apr 29, 2012

  1. Removes shiftwidth setting overrides.

    @jakar
    jakar committed Apr 29, 2012
    Configuration menu
    Copy the full SHA
    9ec3180 View commit details
    Browse the repository at this point in the history

  2. Adds support for javascript-style comments. 

    While comments aren't part of the JSON spec, they are correctly handled
by many parsers and libraries. Plus, they are very useful for
configuration files.
    @jakar
    jakar committed Apr 29, 2012
    Configuration menu
    Copy the full SHA
    a060daf View commit details
    Browse the repository at this point in the history

  3. Fixes square bracket matching 

    Square brackets needed to be escaped for vim functions that interpret
their parameters as regex patterns.
    @jakar
    jakar committed Apr 29, 2012
    Configuration menu
    Copy the full SHA
    20b650e View commit details
    Browse the repository at this point in the history

  4. Added README

    @jakar
    jakar committed Apr 29, 2012
    Configuration menu
    Copy the full SHA
    726c0aa View commit details
    Browse the repository at this point in the history

Commits on Apr 30, 2012

  1. Update README.md

    @jakar
    jakar committed Apr 30, 2012
    Configuration menu
    Copy the full SHA
    332c906 View commit details
    Browse the repository at this point in the history

  2. Added links to README

    @jakar
    jakar committed Apr 30, 2012
    Configuration menu
    Copy the full SHA
    2aa7712 View commit details
    Browse the repository at this point in the history

Commits on May 7, 2012

  1. Replaced modeline to match usage

    @jakar
    jakar committed May 7, 2012
    Configuration menu
    Copy the full SHA
    f3024bf View commit details
    Browse the repository at this point in the history

  2. Update README.md

    @jakar
    jakar committed May 7, 2012
    Configuration menu
    Copy the full SHA
    da60b05 View commit details
    Browse the repository at this point in the history

  3. Removed javascript references

    @jakar
    jakar committed May 7, 2012
    Configuration menu
    Copy the full SHA
    ab09468 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/jakar/vim-json

    @jakar
    jakar committed May 7, 2012
    Configuration menu
    Copy the full SHA
    d018c36 View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2013

  1. - fixed VAM not work properly with setf use set filetype= instead

    @paynechu
    paynechu committed Jul 31, 2013
    Configuration menu
    Copy the full SHA
    20047af View commit details
    Browse the repository at this point in the history

  2. Set filetype for buffer only

    @jakar
    jakar committed Jul 31, 2013
    Configuration menu
    Copy the full SHA
    e955777 View commit details
    Browse the repository at this point in the history
Loading