-From 863924c83be97fea7a721892e81f82f5331f72fa Mon Sep 17 00:00:00 2001
+From 8ae0f886b7abded65a0268a0496ff6e016a5e868 Mon Sep 17 00:00:00 2001
 From: Paul Gortmaker <paul.gortmaker@windriver.com>
 Date: Mon, 3 Apr 2017 22:58:39 -0400
 Subject: [PATCH] vim: Make text mode editing Great again.

vim default, so offended people can direct their complaints accordingly.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
[ywei: rebased to 8.0.0983]
Signed-off-by: Yunguo Wei <yunguo.wei@windriver.com>
---
 runtime/defaults.vim | 44 ++++++++++++++++++--------------------------
 runtime/evim.vim     | 16 ++++++++--------
 2 files changed, 26 insertions(+), 34 deletions(-)

diff --git a/runtime/defaults.vim b/runtime/defaults.vim
index 0dcb92245..43fbcec77 100644
--- a/runtime/defaults.vim
+++ b/runtime/defaults.vim
@@ -3,6 +3,14 @@
 " Maintainer:	Bram Moolenaar <Bram@vim.org>
 " Last change:	2017 Jun 13
 "
+" Modified:    Paul Gortmaker <paul.gortmaker@windriver.com>
+" Reason:      better alignment with "typical" distro settings.
+" Last change: 2017 Apr 03
+"
+" Modified:     Yunguo Wei <yunguo.wei@windriver.com>
+" Reason:       Rebase Paul's patch to 8.0.0983
+" Last change:  2017 Aug 28
+"
 " This is loaded if no vimrc file was found.
 " Except when Vim is run with "-u NONE" or "-C".
 " Individual settings can be reverted with ":set option&".
@@ -48,12 +56,12 @@ set display=truncate
 
 " Show a few lines of context around the cursor.  Note that this makes the
 " text scroll if you mouse-click near the start or end of the window.

 
 " Convenient command to see the difference between the current buffer and the
diff --git a/runtime/evim.vim b/runtime/evim.vim
index f80b3c03b627..c9de16371457 100644
--- a/runtime/evim.vim
+++ b/runtime/evim.vim
@@ -2,6 +2,10 @@
