Merge branch 'release/v1.46.0'

* release/v1.46.0:
  Bump VERSION
  Strip generic greetings from quoted mail
  Make cursor start heuristics for mail smarter
  Use ^= instead of += for arbitrary text options
  Add explicit LC_COLLATE settings to plmu(1df)
  Remove markdown_autoformat.vim ftplugin
  Strip a trailing space
  Use pman as 'keywordprg' for PHP
  Remove surround.vim's insert mode maps
  Let's try leaving netrw on again for a bit

1 files changed, 8 insertions, 8 deletions

diff --git a/vim/vimrc b/vim/vimrc
index 6b181fa7..e9fbaf3f 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -49,8 +49,8 @@ set backup
 set backupdir^=~/.vim/cache/backup,~/vimfiles/cache/backup
 
 " Add some paths not to back up
-set backupskip+=/dev/shm/*
-set backupskip+=/var/tmp/*
+set backupskip^=/dev/shm/*
+set backupskip^=/var/tmp/*
 
 " Indent wrapped lines
 silent! set breakindent
@@ -113,11 +113,11 @@ set lazyredraw
 set linebreak
 
 " Define extra 'list' display characters
-set listchars+=extends:>       " Unwrapped text to screen right
-set listchars+=precedes:<      " Unwrapped text to screen left
-set listchars+=tab:>-          " Tab characters, preserve width
-set listchars+=trail:_         " Trailing spaces
-silent! set listchars+=nbsp:+  " Non-breaking spaces
+set listchars^=extends:>       " Unwrapped text to screen right
+set listchars^=precedes:<      " Unwrapped text to screen left
+set listchars^=tab:>-          " Tab characters, preserve width
+set listchars^=trail:_         " Trailing spaces
+silent! set listchars^=nbsp:+  " Non-breaking spaces
 
 " Don't allow setting options via buffer content
 set nomodeline
@@ -127,7 +127,7 @@ set nrformats-=octal
 
 " Options for file search with gf/:find
 set path-=/usr/include  " Let the C/C++ filetypes set that
-set path+=**            " Search current directory's whole tree
+set path^=**            " Search current directory's whole tree
 
 " Don't show startup splash screen (I donated)
 set shortmess+=I