aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2015-12-17 04:57:53 -0500
committerJustin M. Keyes <justinkz@gmail.com>2015-12-17 04:57:53 -0500
commit7581046b606d455ab0ff03ac74e517a2ae310594 (patch)
tree548b0a1dfab296a4c25efbbdeb80505297b1c5e9
parent9d64d7503189e81d8b703a9f4502d06a694b4ecd (diff)
parentaa4cc17bb0819ae4b8461e8a2a6f2f78ed53c576 (diff)
downloadrneovim-7581046b606d455ab0ff03ac74e517a2ae310594.tar.gz
rneovim-7581046b606d455ab0ff03ac74e517a2ae310594.tar.bz2
rneovim-7581046b606d455ab0ff03ac74e517a2ae310594.zip
Merge pull request #3858 from justinmk/vim-9da7ff7
vim-patch:9da7ff7
-rw-r--r--runtime/indent/html.vim4
-rw-r--r--runtime/syntax/rpcgen.vim14
-rw-r--r--runtime/syntax/sm.vim16
-rw-r--r--runtime/syntax/yacc.vim4
4 files changed, 15 insertions, 23 deletions
diff --git a/runtime/indent/html.vim b/runtime/indent/html.vim
index d64a0e5cd3..b97a905988 100644
--- a/runtime/indent/html.vim
+++ b/runtime/indent/html.vim
@@ -2,7 +2,7 @@
" Header: "{{{
" Maintainer: Bram Moolenaar
" Original Author: Andy Wokula <anwoku@yahoo.de>
-" Last Change: 2014 Aug 23
+" Last Change: 2015 Jan 11
" Version: 1.0
" Description: HTML indent script with cached state for faster indenting on a
" range of lines.
@@ -883,7 +883,7 @@ endfunc "}}}
" THE MAIN INDENT FUNCTION. Return the amount of indent for v:lnum.
func! HtmlIndent()
"{{{
- if prevnonblank(v:lnum - 1) <= 1
+ if prevnonblank(v:lnum - 1) < 1
" First non-blank line has no indent.
return 0
endif
diff --git a/runtime/syntax/rpcgen.vim b/runtime/syntax/rpcgen.vim
index 548f8c807f..85036dc049 100644
--- a/runtime/syntax/rpcgen.vim
+++ b/runtime/syntax/rpcgen.vim
@@ -1,15 +1,11 @@
" Vim syntax file
" Language: rpcgen
-" Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change: Sep 06, 2005
-" Version: 8
-" URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
+" Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
+" Last Change: Jan 13, 2015
+" Version: 10
+" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_RPCGEN
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
+if exists("b:current_syntax")
finish
endif
diff --git a/runtime/syntax/sm.vim b/runtime/syntax/sm.vim
index 2f9e6d7d01..ad96cdb3b5 100644
--- a/runtime/syntax/sm.vim
+++ b/runtime/syntax/sm.vim
@@ -1,15 +1,11 @@
" Vim syntax file
" Language: sendmail
-" Maintainer: Dr. Charles E. Campbell, Jr. <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change: Sep 06, 2005
-" Version: 4
-" URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
-
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
- syntax clear
-elseif exists("b:current_syntax")
+" Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
+" Last Change: Jan 13, 2015
+" Version: 6
+" URL: http://www.drchip.org/astronaut/vim/index.html#SYNTAX_SM
+
+if exists("b:current_syntax")
finish
endif
diff --git a/runtime/syntax/yacc.vim b/runtime/syntax/yacc.vim
index 17a1cab6b7..714432be9d 100644
--- a/runtime/syntax/yacc.vim
+++ b/runtime/syntax/yacc.vim
@@ -1,8 +1,8 @@
" Vim syntax file
" Language: Yacc
" Maintainer: Charles E. Campbell <NdrOchipS@PcampbellAfamily.Mbiz>
-" Last Change: Mar 20, 2014
-" Version: 11
+" Last Change: Jan 14, 2015
+" Version: 12
" URL: http://mysite.verizon.net/astronaut/vim/index.html#vimlinks_syntax
"
" Options: {{{1