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, 11 insertions, 5 deletions

diff --git a/vim/indent/help.vim b/vim/indent/help.vim
index c49e1ced..78de85d0 100644
--- a/vim/indent/help.vim
+++ b/vim/indent/help.vim
@@ -4,11 +4,17 @@ if exists('b:did_indent')
 endif
 let b:did_indent = 1
 
-" Use hard tabs for editing Vim help files
+" Literal tabs
 setlocal noexpandtab
-setlocal shiftwidth=0
-let b:undo_indent = 'setlocal expandtab< shiftwidth<'
+let b:undo_indent = 'setlocal expandtab<'
+if v:version > 703
+      \ || v:version == 703 && has('patch629')
+  setlocal shiftwidth=0
+else
+  let &l:shiftwidth = &l:tabstop
+endif
+let b:undo_indent .= '|setlocal shiftwidth<'
 if &softtabstop != -1
-  let &softtabstop = &shiftwidth
-  let b:undo_indent = 'setlocal softtabstop<'
+  let &l:softtabstop = &l:shiftwidth
+  let b:undo_indent .= '|setlocal softtabstop<'
 endif