5

In my vimrc I have <C-H>, <C-J>, <C-K> and <C-L> mapped to navigate between split windows in normal mode. When I use diff mode I only ever have windows in vertical splits, so I'd like to re-purpose <C-J> and <C-K> to jump to the previous/next diff.

:help diff mentions &diff when using vimdiff to determine whether you are in diff mode. It looks like this also gets set when you start a diff from an existing vim session, so I assume I should leverage this somehow to re-set the mappings, but I'm not exactly sure how. Based on my 2 second test just before posting this, I tried checking &diff in my vimrc and performing the mapping as needed, but as I suspected the vimrc doesn't get read in again when going into diff mode from an existing vim session.

What would be the best way to detect going to/from diff mode and re-setting the mappings accordingly?

14

You can create an expression mapping that checks &diff. This is done using the <expr> keyword.

Example

nnoremap <expr> <C-J> &diff ? ']c' : '<C-W>j'

With this, each time you type <C-J>, the expression &diff ? ']c' : '<C-W>h' is evaluated, and the result (a string) is used for your map. So, in diff-mode, <C-J> will be like ]c (jump to start of next change); otherwise, it will be like <C-W>j (move to window below).

2

I use this feature to change the highligting during diffs.

if &diff

    " Your setting you want to set when using diff mode.
    "

endif
  • 3
    You can execute this block regardless of the value of &diff. The Diff* syntax groups are only used for diff. Furthermore, there's no guarantee that this will be re-evaluated when diff mode is entered interactively. – tommcdo Mar 23 '15 at 20:57
  • @tommcdo: I removed the example stuff. But the re-evaluation stuff I was unaware of (mainly because I don't switch modes, I ether run as vim or as vimdiff). – Martin York Mar 23 '15 at 21:15

Your Answer

By clicking “Post Your Answer”, you agree to our terms of service, privacy policy and cookie policy

Not the answer you're looking for? Browse other questions tagged or ask your own question.