From ee3f9a1e03a93ab2a75a6f7a2f3bb2f4c6b4e736 Mon Sep 17 00:00:00 2001 From: zeertzjq Date: Sun, 13 Apr 2025 08:36:28 +0800 Subject: [PATCH] vim-patch:6f6c0db: runtime(doc): disable last-position-jump in diff mode (#33442) This has been bothering me quite for some time and I never knew why it happened. Just today it occurred to me this might have been because of the last-position-jump. So I figured, let's fix it for everybody, not just me. closes: vim/vim#17092 https://github.com/vim/vim/commit/6f6c0dba9f578787af0f259a832c972807a884cd Co-authored-by: Christian Brabandt --- runtime/doc/usr_05.txt | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/runtime/doc/usr_05.txt b/runtime/doc/usr_05.txt index d75438cd22..d3f1f9b479 100644 --- a/runtime/doc/usr_05.txt +++ b/runtime/doc/usr_05.txt @@ -117,23 +117,27 @@ This switches on three very clever mechanisms: filetypes. See |:filetype-indent-on| and 'indentexpr'. - *restore-cursor* *last-position-jump* > + *restore-cursor* *last-position-jump* >vim augroup RestoreCursor autocmd! autocmd BufReadPre * autocmd FileType ++once \ let s:line = line("'\"") \ | if s:line >= 1 && s:line <= line("$") && &filetype !~# 'commit' \ && index(['xxd', 'gitrebase'], &filetype) == -1 + \ && !&diff \ | execute "normal! g`\"" \ | endif augroup END Another autocommand. This time it is used after reading any file. The complicated stuff after it checks if the '" mark is defined, and jumps to it -if so. It doesn't do that for a commit or rebase message, which are likely -a different one than last time, and when using xxd(1) to filter and edit -binary files, which transforms input files back and forth, causing them to -have dual nature, so to speak. See also |using-xxd|. +if so. It doesn't do that when: + - editing a commit or rebase message, which are likely a different one than + last time, + - using xxd(1) to filter and edit binary files, which transforms input files + back and forth, causing them to have dual nature, so to speak (see also + |using-xxd|) and + - Vim is in diff mode The backslash at the start of a line is used to continue the command from the previous line. That avoids a line getting very long. See |line-continuation|.