vim: syntax/msmtp.vim: sync with msmtp.vim in Debian package

diff --git a/vim/vim/syntax/msmtp.vim b/vim/vim/syntax/msmtp.vim
index 1b0f8df554e0800df68bf67c3da9976a10b32ec2..1fd05bc98783c7f20a3c4ed9964325551b1383a6 100644 (file)
--- a/vim/vim/syntax/msmtp.vim
+++ b/vim/vim/syntax/msmtp.vim
@@ -1,9 +1,10 @@
 " Vim syntax file
 " Language:     msmtp rc files
-" Maintainer:   Simon Ruderich <simon@ruderich.org>
-" Last Change:  2008-08-23
+" Maintainer:   Simon Ruderich <simon@ruderich.com>
+"               Eric Pruitt <eric.pruitt@gmail.com>
+" Last Change:  2014-12-11
 " Filenames:    msmtprc
-" Version:      0.1
+" Version:      0.3
 
 
 if version < 600
@@ -17,19 +18,18 @@ endif
 syn match msmtpComment /#.*$/ contains=@Spell
 
 " General commands.
-syntax match msmtpOption /\<\(defaults\|account\|host\|port\|timeout\|protocol\|domain\)\>/
+syntax match msmtpOption /\<\(defaults\|account\|host\|port\|proxy_host\|proxy_port\|timeout\|protocol\|domain\)\>/
 " Authentication commands.
 syntax match msmtpOption /\<\(auth\|user\|password\|passwordeval\|ntlmdomain\)\>/
 " TLS commands.
-syntax match msmtpOption /\<\(tls\|tls_trust_file\|tls_crl_file\|tls_fingerprint\|tls_key_file\|tls_cert_file\|tls_certcheck\|tls_starttls\|tls_force_sslv3\|tls_min_dh_prime_bits\|tls_priorities\)\>/
+syntax match msmtpOption /\<\(tls\|tls_trust_file\|tls_crl_file\|tls_fingerprint\|tls_key_file\|tls_cert_file\|tls_certcheck\|tls_starttls\|tls_min_dh_prime_bits\|tls_priorities\)\>/
 " Sendmail mode specific commands.
-syntax match msmtpOption /\<\(auto_from\|from\|maildomain\|dsn_notify\|dsn_return\|keepbcc\|logfile\|syslog\)\>/
-
+syntax match msmtpOption /\<\(auto_from\|from\|maildomain\|dsn_notify\|dsn_return\|add_missing_from_header\|add_missing_date_header\|remove_bcc_headers\|logfile\|syslog\)\>/
 
 " Options which accept only an on/off value.
-syn match msmtpWrongOption /\<\(tls\|tls_certcheck\|tls_starttls\|tls_force_sslv3\|auto_from\|keepbcc\) \(on$\|off$\)\@!.*$/
+syn match msmtpWrongOption /\<\(tls\|tls_certcheck\|tls_starttls\|auto_from\|add_missing_from_header\|add_missing_date_header\|remove_bcc_headers\) \(on$\|off$\)\@!.*$/
 " Option port accepts numeric values.
-syn match msmtpWrongOption /\<port \(\d\+$\)\@!.*$/
+syn match msmtpWrongOption /\<\(port\|proxy_port\) \(\d\+$\)\@!.*$/
 " Option timeout accepts off and numeric values.
 syn match msmtpWrongOption /\<timeout \(off$\|\d\+$\)\@!.*$/
 " Option protocol accepts smtp and lmtp.
@@ -45,8 +45,23 @@ syn match msmtpWrongOptionValue /\S* \zs.*$/ contained containedin=msmtpWrongOpt
 " Mark the option part as a normal option.
 highlight default link msmtpWrongOption msmtpOption
 
+"Email addresses (yanked from esmptrc)
+syntax match msmtpAddress /[a-z0-9_.-]*[a-z0-9]\+@[a-z0-9_.-]*[a-z0-9]\+\.[a-z]\+/
+" Host names
+syn match msmtpHost "\%(host\s*\)\@<=\h\%(\w\|\.\|-\)*"
+" Numeric values
+syn match msmtpNumber /\<\(\d\+$\)/
+"Strings
+syntax region msmtpString start=/"/ end=/"/
+syntax region msmtpString start=/'/ end=/'/
+
 highlight default link msmtpComment Comment
 highlight default link msmtpOption Type
 highlight default link msmtpWrongOptionValue Error
+highlight default link msmtpString String
+highlight default link msmtpAddress Constant
+highlight default link msmtpNumber Number
+highlight default link msmtpHost Identifier
+
 
 let b:current_syntax = "msmtp"