runtime/ftplugin/python.vim | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 correct value of 'include' in ftplugin/python.vim
 'include' needs to be anchored to the beginning of the line as well as
 correctly escaping "\s" to prevent incorrect matches.

runtime/ftplugin/python.vim | 2 2 + 0 - 0 !
1 file changed, 2 insertions(+)

 set keywordprg=pydoc in ftplugin/python.vim

runtime/scripts.vim | 8 8 + 0 - 0 !
1 file changed, 8 insertions(+)

 detect rst filetype using contents of file
 Inspect the first 5 lines of the file to see if there's a leading ".. "
 or stand-alone "restindex".  If either are found, set the filetype to
 rst.

src/po/es.po | 3 2 + 1 - 0 !
1 file changed, 2 insertions(+), 1 deletion(-)

 correct spanish translation for swap file recovery

runtime/autoload/pythoncomplete.vim | 1 1 + 0 - 0 !
1 file changed, 1 insertion(+)

 ensure pyparser's parserline is initialized

runtime/syntax/debcontrol.vim | 5 3 + 2 - 0 !
1 file changed, 3 insertions(+), 2 deletions(-)

---

runtime/autoload/netrw.vim | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 fix syntax error in netread's ftp handling

src/Makefile | 8 0 + 8 - 0 !
src/auto/configure | 12 2 + 10 - 0 !
src/configure.in | 14 2 + 12 - 0 !
3 files changed, 4 insertions(+), 30 deletions(-)

---

src/if_py_both.h | 7 1 + 6 - 0 !
src/if_python.c | 14 11 + 3 - 0 !
src/if_python3.c | 13 10 + 3 - 0 !
3 files changed, 22 insertions(+), 12 deletions(-)

 fix a crash in python bindings when compiled with gcc 4.7

src/main.c | 14 13 + 1 - 0 !
src/os_unix.h | 3 3 + 0 - 0 !
2 files changed, 16 insertions(+), 1 deletion(-)

 support sourcing a vimrc.tiny when vim is invoked as vi
 This is used only in the vim-tiny package to allow a specific
 configuration for vim-tiny's vi.  The vim-tiny package is substantially

runtime/doc/options.txt | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 document debian's decision to disable modelines by default
 Modelines have historically been a source of vulnerabilities in Vim.
 As long it remains a "blacklist suspected/proven dangerous options"
 instead of a "whitelist allowed options" piece of functionality,
 Debian's system-wide vimrc will maintain this setting.  As such, the
 documentation needs to be updated to reflect the induced behavior.

runtime/filetype.vim | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 add recognition of more latex commands for tex filetype detection
 Since filetype detection of TeX files defaults to plaintex, we've added
 detection of some additional LaTeX commands to help sway the detection
 to LaTeX.