Merge branch 'dev'

This commit is contained in:
Chiel ten Brinke 2015-11-12 15:22:22 +01:00
commit a5013d1a6a
2 changed files with 8 additions and 14 deletions

View File

@ -214,17 +214,11 @@ Change log
----------
### June 2015
* *Backward incompatible patch!*
* Multiple formatters per filetype are now supported
* Configuration variable names changed
* `gq` no longer supported
* `:Autoformat` suppports ranges
* Composite filetypes are fully supported
### Dec 9 2014
* Added `rbeautify` to the defaults for formatting ruby files
### May 30 2014
* Added `css-beautify` to the defaults for formatting CSS files
* Multiple formatters per filetype are now supported.
* Configuration variable names changed.
* `gq` is no longer supported.
* `:Autoformat` now suppports ranges.
* Composite filetypes are fully supported.
### December 20 2013
* `html-beautify` is now the default for HTML since it seems to be better maintained, and seems to handle inline javascript neatly.
@ -251,7 +245,7 @@ The `dynamic_indent_width` branch has been merged into the master branch.
### March 9 2013
The `custom_config` branch has been merged into the master branch.
* Customization of formatprograms can be done easily now, as explained above.
* Customization of formatprograms can be done easily now, as explained in the readme.
* I set the default tabwidth to 4 for all formatprograms as well as for vim itself.
* The default parameters for astyle have been slightly modified: it will wrap spaces around operators.
* phpCB has been removed from the defaults, due to code-breaking behaviour.

View File

@ -129,7 +129,7 @@ python << EOF
import vim, subprocess, os
from subprocess import Popen, PIPE
text = os.linesep.join(vim.current.buffer[:])
text = os.linesep.join(vim.current.buffer[:]) + os.linesep
formatprg = vim.eval('&formatprg')
verbose = bool(int(vim.eval('verbose')))
env = os.environ.copy()
@ -177,7 +177,7 @@ python3 << EOF
import vim, subprocess, os
from subprocess import Popen, PIPE
text = bytes(os.linesep.join(vim.current.buffer[:]), 'utf-8')
text = bytes(os.linesep.join(vim.current.buffer[:]) + os.linesep, 'utf-8')
formatprg = vim.eval('&formatprg')
verbose = bool(int(vim.eval('verbose')))
env = os.environ.copy()