Merge branch 'release/v6.38.0'v6.38.0

* release/v6.38.0:
  Update paste_insert.vim to v0.3.0
  Use tr() over substitute() for character swap
  Fix up some pattern qualifiers
  Update digraph_search.vim to v1.1.0
  Correct indent settings
  Don't squeeze blanks by default in mail filetype
  Improve honesty of comment in mail ftplugin
  Move mail ftplugin function out into autoload
  Add local maps for normalising mail quotes
  Don't do :StrictQuote automatically on mail edit
  Make :StrictQuote command accept a range

1 files changed, 23 insertions, 0 deletions

diff --git a/vim/autoload/mail.vim b/vim/autoload/mail.vim
index 40b7fb7f..3fbba860 100644
--- a/vim/autoload/mail.vim
+++ b/vim/autoload/mail.vim
@@ -79,3 +79,26 @@ function! mail#NewBlank(count, up, visual) abort
   endif
 
 endfunction
+
+function! mail#StrictQuote(start, end) abort
+  let body = 0
+  for lnum in range(a:start, a:end)
+
+    " Get current line
+    let line = getline(lnum)
+
+    " Get the leading quote string, if any; skip if there isn't one
+    let quote = matchstr(line, '^>[> ]*')
+    if !strlen(quote)
+      continue
+    endif
+
+    " Normalise the quote with no spaces
+    let quote = substitute(quote, '[^>]', '', 'g')
+
+    " Re-set the line
+    let line = substitute(line, '^[> ]\+', quote, '')
+    call setline(lnum, line)
+
+  endfor
+endfunction