 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
+index 43ff1e0fbed4..ea116965c308 100644
 --- a/runtime/defaults.vim
 +++ b/runtime/defaults.vim
-@@ -3,6 +3,14 @@
+@@ -3,6 +3,10 @@
  " Maintainer:	Bram Moolenaar <Bram@vim.org>
- " Last change:	2017 Jun 13
+ " Last change:	2016 Sep 02
  "
-+" 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
++" Modified:	Paul Gortmaker <paul.gortmaker@windriver.com>
++" Reason:	better alignment with "typical" distro settings.
++" Last change:	2017 Apr 03
 +"
  " 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
+@@ -39,12 +43,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.

-    au!
-
-    " When editing a file, always jump to the last known cursor position.
-    " Don't do it when the position is invalid, when inside an event handler
-    " (happens when dropping a file on gvim) and for a commit message (it's
-    " likely a different one than last time).
-    autocmd BufReadPost *
-      \ if line("'\"") >= 1 && line("'\"") <= line("$") && &ft !~# 'commit'
-      \ |   exe "normal! g`\""
-      \ | endif
-
-  augroup END
-

 " Don't use Ex mode, use Q for formatting
 map Q gq
-- 
2.7.4

