zeertzjq ee2fc31b36 vim-patch:9.1.1473: inconsistent range arg for :diffget/diffput (#34588) ...

Problem:  inconsistent range arg for :diffget/diffput
Solution: fix the range specification, place the cursor for :diffput and
          :diffget consistently on the last line (Yee Cheng Chin)

Previously, `:<range>diffget` only allowed using 1 or above in the range
value, making it impossible to use the command for a diff block at the
beginning of the file. Fix the range specification so the user can now
use 0 to specify the space before the first line. This allows
`:0,$+1diffget` to work to retrieve all the changes from the other file
instead of missing the first diff block. Also do this for `:diffput`.

Also, make `:diffput` work more similar to `:diffget`. Make it so that
if the cursor is on the last line and a new line is inserted in the
other file, doing `:diffput` will select that diff block below the line,
just like `:diffget` would.

Also clean up the logic a little bit for edge cases and for handling
line matched diff blocks better.

closes: vim/vim#17579

d75ab0cbf5

Co-authored-by: Yee Cheng Chin <ychin.git@gmail.com>

2025-06-22 08:00:17 +08:00

..

api.txt

docs: api, misc

2025-06-18 12:13:55 +02:00

arabic.txt

docs: remove trailing spaces #24455

2023-07-25 05:07:13 -07:00

autocmd.txt

vim-patch:476b65e: runtime(doc): mention using <script> instead of <sfile> in :autocmd (#34580)

2025-06-19 23:08:01 +00:00

change.txt

vim-patch:0bc8709: runtime(doc): Correct allowed flags after :substitute repeat (#34218)

2025-05-29 07:04:38 +08:00

channel.txt

docs: api, misc

2025-06-18 12:13:55 +02:00

cmdline.txt

docs: deprecate <sfile>

2025-06-18 12:12:23 +02:00

credits.txt

docs: graduate intro.txt to "flow layout" #31462

2024-12-05 07:18:27 -08:00

debug.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

deprecated.txt

docs: deprecate <sfile>

2025-06-18 12:12:23 +02:00

dev_arch.txt

docs: misc, help tags for neovim.io searches #31428

2024-12-03 09:44:28 -08:00

dev_style.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

dev_theme.txt

docs: news

2024-05-15 23:19:26 +02:00

dev_tools.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

dev_vimpatch.txt

docs: lsp, lua #33682

2025-04-27 15:44:11 -07:00

develop.txt

docs: vim.fs., diagnostics, lsp #34402

2025-06-13 07:49:21 -07:00

diagnostic.txt

docs: misc

2025-06-14 17:24:36 +02:00

diff.txt

vim-patch:9.1.1473: inconsistent range arg for :diffget/diffput (#34588)

2025-06-22 08:00:17 +08:00

digraph.txt

vim-patch:9.1.1065: no digraph for "Approaches the limit" (#32289)

2025-02-02 07:00:45 +08:00

editing.txt

vim-patch:dfed077: runtime(doc): fix small errors from rev 2090405de5bb66facc29c74

2025-06-05 06:32:13 +08:00

editorconfig.txt

feat(editorconfig): add support for spelling_language (#28638)

2024-06-06 09:16:43 -05:00

faq.txt

feat(runtime): revert cfilter, ccomplete to legacy Vim

2025-04-22 11:03:05 +02:00

filetype.txt

Don't set manwidth wider than the window (#34078)

2025-05-19 12:37:03 -05:00

fold.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

ft_ada.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

ft_hare.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

ft_ps1.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

ft_raku.txt

fix(docs): vimdoc syntax errors

2023-06-25 17:14:28 +02:00

ft_rust.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

ft_sql.txt

docs: fix more treesitter parsing errors

2024-06-09 13:54:34 +02:00

gui.txt

test: :restart works on Windows

2025-06-10 23:00:38 +08:00

health.txt

feat(checkhealth): trigger FileType event after showing report #33677

2025-04-27 10:32:25 -07:00

hebrew.txt

docs: remove remaining mentions of hkmap (#28038)

2024-03-26 18:30:17 +08:00

help.txt

fix(build): vimdoc tags are not validated #32801

2025-03-09 10:27:28 -07:00

helphelp.txt

vim-patch:2090405: runtime(doc): make examples verbatim to prevent conceal/tag parsing (#34299)

2025-06-04 05:55:24 +08:00

if_perl.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

if_pyth.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

if_ruby.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

indent.txt

vim-patch:5ca8f22: runtime(idris2): include filetype,indent+syntax plugins for (L)Idris2 + ipkg

2024-11-13 08:24:14 +01:00

index.txt

vim-patch:9.1.1426: completion: register contents not completed

2025-06-03 16:25:49 +08:00

insert.txt

vim-patch:053aee0: runtime(doc): add more pointers to 'completeopt' (#34460)

2025-06-12 07:32:07 +08:00

intro.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

job_control.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

lsp.txt

fix(lsp) type annotation for vim.lsp.Config.cmd #34574

2025-06-19 03:35:13 -07:00

lua-bit.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

lua-guide.txt

docs: vim_diff.txt #34502

2025-06-18 06:19:00 -07:00

lua.txt

docs(ui): type annotations for options #33983

2025-06-18 03:20:18 -07:00

luaref.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

luvref.txt

docs: misc

2025-06-14 17:24:36 +02:00

map.txt

feat(api): deprecate nvim_buf_add_highlight()

2025-01-20 13:59:29 +01:00

mbyte.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

message.txt

vim-patch:9.1.0908: not possible to configure :messages (#31492)

2024-12-07 02:17:36 +00:00

mlang.txt

docs: fix/remove invalid URLs #20647

2022-10-14 08:01:13 -07:00

motion.txt

docs: api, misc

2025-06-18 12:13:55 +02:00

news-0.9.txt

build(vim-patch.sh): don't ignore changes to version*.txt (#29425)

2024-06-20 20:16:53 +08:00

news-0.10.txt

docs: lsp config/commands #33122

2025-03-30 13:29:36 -07:00

news-0.11.txt

docs(ui): cmdline_hide parameters #34049

2025-05-27 06:50:20 -07:00

news.txt

feat(lsp): pass resolved config to cmd() #34550

2025-06-18 04:52:17 -07:00

nvim.txt

docs: news, intro, lsp, api #33687

2025-06-01 14:13:50 -07:00

options.txt

vim-patch:631a50c: runtime(doc): mention cannot ignored events in eventignorewin (#34522)

2025-06-16 02:14:20 +00:00

pattern.txt

vim-patch:9.1.1258: regexp: max \U and \%U value is limited by INT_MAX (#33156)

2025-03-29 13:05:03 +00:00

pi_gzip.txt

vim-patch:4783a2c: runtime(doc): mention bzip3 in gzip plugin documentation (#32742)

2025-03-05 23:38:33 +00:00

pi_msgpack.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

pi_paren.txt

vim-patch:59834ba: runtime(matchparen): Add matchparen_disable_cursor_hl config option

2024-11-05 08:31:19 +01:00

pi_spec.txt

docs: fix treesitter parsing errors

2023-01-01 15:05:13 +01:00

pi_tar.txt

docs: misc (#31138)

2024-11-21 06:50:30 +08:00

pi_tutor.txt

vim-patch:5a8f995: runtime(doc): remove outdated Contribution section in pi_tutor (#34094)

2025-05-20 00:21:30 +00:00

pi_zip.txt

vim-patch:a359c9c: runtime(zip): add *.whl to the list of zip extensions

2025-04-03 06:47:58 +08:00

provider.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

quickfix.txt

docs: default mappings #33706

2025-05-03 15:47:59 -07:00

quickref.txt

docs: deprecate <sfile>

2025-06-18 12:12:23 +02:00

recover.txt

docs: various #25289

2024-01-18 00:14:48 -08:00

remote_plugin.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

remote.txt

vim-patch:partial:938ae280c79b (#22356)

2023-02-21 23:50:29 +08:00

repeat.txt

docs: deprecate <sfile>

2025-06-18 12:12:23 +02:00

rileft.txt

docs: fix treesitter parsing errors

2023-01-01 15:05:13 +01:00

russian.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

scroll.txt

vim-patch:aaaa21b: runtime(doc): Remove wrong help tag CTRL-SHIFT-CR

2024-07-06 17:32:38 +08:00

sign.txt

docs: misc

2025-03-15 15:00:44 +01:00

spell.txt

vim-patch:partial:89872f5: runtime(doc): update formatting and syntax

2024-10-06 07:44:40 +08:00

starting.txt

docs: lsp, emoji, startup #33446

2025-04-27 13:40:46 -07:00

support.txt

ci(test): disable ubuntu arm

2025-02-15 14:55:25 +01:00

syntax.txt

docs: deprecate <sfile>

2025-06-18 12:12:23 +02:00

tabpage.txt

doc: clarify window-id, tab-id, nvim_set_current_x #32528

2025-02-27 02:05:00 -08:00

tagsrch.txt

docs: default mappings #33706

2025-05-03 15:47:59 -07:00

terminal.txt

docs: misc #32959

2025-03-18 06:18:37 -07:00

testing.txt

fix(lua): improve annotations for stricter luals diagnostics (#24609)

2023-08-09 11:06:13 +02:00

tips.txt

vim-patch:6a500661a9cb

2023-08-10 17:28:02 +08:00

treesitter.txt

docs: support overloads and async

2025-06-16 09:18:42 +01:00

tui.txt

docs: misc #31822

2025-01-03 08:29:36 -08:00

uganda.txt

vim-patch:f7a38650eaf6 (#28465)

2024-04-23 08:20:36 +08:00

ui.txt

fix(messages): add append parameter to history entries (#34467)

2025-06-15 23:36:41 +02:00

undo.txt

vim-patch:partial:624bb83: runtime(doc): Tweak documentation style a bit (#31148)

2024-11-10 09:11:06 +08:00

userfunc.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

usr_01.txt

vim-patch:1c5728e0c4a9 (#28703)

2024-05-11 18:14:03 +08:00

usr_02.txt

vim-patch:2090405: runtime(doc): make examples verbatim to prevent conceal/tag parsing (#34299)

2025-06-04 05:55:24 +08:00

usr_03.txt

vim-patch:71badf9547e8 (#23285)

2023-04-23 15:22:55 +02:00

usr_04.txt

docs: update explanation of Y to reflect new defaults

2022-02-24 18:13:44 +08:00

usr_05.txt

vim-patch:6f6c0db: runtime(doc): disable last-position-jump in diff mode (#33442)

2025-04-13 00:36:28 +00:00

usr_06.txt

feat!: remove hardcopy

2023-01-03 10:07:43 +00:00

usr_07.txt

docs: update explanation of Y to reflect new defaults

2022-02-24 18:13:44 +08:00

usr_08.txt

docs(manual): fix treesitter parsing errors

2023-01-01 15:05:21 +01:00

usr_09.txt

fix(docs): vimdoc syntax errors

2023-06-25 17:14:28 +02:00

usr_10.txt

feat(ui): more intuitive :substitute confirm prompt #31787

2025-01-02 06:40:39 -08:00

usr_11.txt

vim-patch:2090405: runtime(doc): make examples verbatim to prevent conceal/tag parsing (#34299)

2025-06-04 05:55:24 +08:00

usr_12.txt

fix(docs): vimdoc syntax errors

2023-06-25 17:14:28 +02:00

usr_20.txt

docs(manual): fix treesitter parsing errors

2023-01-01 15:05:21 +01:00

usr_21.txt

fix(gen_help_html): handle delimiter, heading #29415

2024-06-19 09:45:40 -07:00

usr_22.txt

vim-patch:dfed077: runtime(doc): fix small errors from rev 2090405de5bb66facc29c74

2025-06-05 06:32:13 +08:00

usr_23.txt

vim-patch:4072ba571bab

2021-05-01 22:29:03 -04:00

usr_24.txt

vim-patch:9.1.1426: completion: register contents not completed

2025-06-03 16:25:49 +08:00

usr_25.txt

vim-patch:bfa1636: runtime(doc): update documentation on tabstop settings (#34433)

2025-06-10 23:53:35 +00:00

usr_26.txt

vim-patch:d473c8c10126

2018-10-29 10:01:44 +01:00

usr_27.txt

vim-patch:2547aa930b59

2021-04-29 09:27:19 -04:00

usr_28.txt

fix(docs): vimdoc syntax errors

2023-06-25 17:14:28 +02:00

usr_29.txt

vim-patch:partial:89872f5: runtime(doc): update formatting and syntax

2024-10-06 07:44:40 +08:00

usr_30.txt

vim-patch:bfa1636: runtime(doc): update documentation on tabstop settings (#34433)

2025-06-10 23:53:35 +00:00

usr_31.txt

vim-patch:e7b1ea0276cc

2021-04-29 20:42:16 -04:00

usr_32.txt

docs(manual): fix treesitter parsing errors

2023-01-01 15:05:21 +01:00

usr_40.txt

fix(docs): vimdoc syntax errors

2023-06-26 11:29:12 +02:00

usr_41.txt

docs: deprecate <sfile>

2025-06-18 12:12:23 +02:00

usr_42.txt

docs(manual): fix treesitter parsing errors

2023-01-01 15:05:21 +01:00

usr_43.txt

docs: remove trailing spaces #24455

2023-07-25 05:07:13 -07:00

usr_44.txt

docs: deprecate <sfile>

2025-06-18 12:12:23 +02:00

usr_45.txt

docs #24061

2023-06-19 08:40:33 -07:00

usr_toc.txt

vim-patch:partial:738ebfe: runtime(doc): Fix style in documents

2024-10-06 07:44:34 +08:00

various.txt

docs: default mappings #33706

2025-05-03 15:47:59 -07:00

vi_diff.txt

vim-patch:9.1.1426: completion: register contents not completed

2025-06-03 16:25:49 +08:00

vietnamese.txt

docs: treesitter parse errors #33811

2025-05-03 10:08:53 -07:00

vim_diff.txt

docs: vim_diff.txt #34502

2025-06-18 06:19:00 -07:00

vimeval.txt

docs: rename builtin.txt, eval.txt #34212

2025-05-30 08:57:58 -07:00

vimfn.txt

docs: deprecate <sfile>

2025-06-18 12:12:23 +02:00

visual.txt

fix(defaults): only repeat macro for each selected line if linewise (#28289)

2024-04-15 03:43:33 +08:00

vvars.txt

docs: misc #32959

2025-03-18 06:18:37 -07:00

windows.txt

fix(eval): winnr('$') counts non-current hidden/unfocusable windows #34207

2025-06-01 15:12:12 -07:00