[vim/vim] diff: undo after :diffget into an empty buffer leaves a line behind (PR #20951)

----==_mimepart_6a7354e059e06_da11804055f8
Content-Type: text/plain; charset="UTF-8"

```
Problem:  After :diffget into an empty buffer, undo does not restore the
          empty buffer, the last line stays behind.
Solution: Include the empty line of the empty buffer in the undo
          information, it is deleted once the first line was obtained.
```

fixes: #20950
You can view, comment on, or merge this pull request online at:

  https://github.com/vim/vim/pull/20951

-- Commit Summary --

  * diff: undo after :diffget into an empty buffer leaves a line behind

-- File Changes --

    M src/diff.c (6)
    M src/testdir/test_diffmode.vim (18)

-- Patch Links --

https://github.com/vim/vim/pull/20951.patch
https://github.com/vim/vim/pull/20951.diff

-- 
Reply to this email directly or view it on GitHub:
https://github.com/vim/vim/pull/20951
You are receiving this because you are subscribed to this thread.

Message ID: <vim/vim/pull/[email protected]>

-- 
-- 
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php

--- 
You received this message because you are subscribed to the Google Groups "vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To view this discussion visit https://groups.google.com/d/msgid/vim_dev/vim/vim/pull/20951%40github.com.

----==_mimepart_6a7354e059e06_da11804055f8
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<pre class=3D"notranslate"><code class=3D"notranslate">Problem:  After :dif=
fget into an empty buffer, undo does not restore the
          empty buffer, the last line stays behind.
Solution: Include the empty line of the empty buffer in the undo
          information, it is deleted once the first line was obtained.
</code></pre>
<p dir=3D"auto"><span class=3D"issue-keyword tooltipped tooltipped-se" aria=
-label=3D"This pull request closes issue #20950.">fixes</span>: <a class=3D=
"issue-link js-issue-link" data-error-text=3D"Failed to load title" data-id=
=3D"5070093701" data-permission-text=3D"Title is private" data-url=3D"https=
://github.com/vim/vim/issues/20950" data-hovercard-type=3D"issue" data-hove=
rcard-url=3D"/vim/vim/issues/20950/hovercard" href=3D"https://github.com/vi=
m/vim/issues/20950">#20950</a></p>

<hr>

<h4>You can view, comment on, or merge this pull request online at:</h4>
<p>&nbsp;&nbsp;<a href=3D'https://github.com/vim/vim/pull/20951'>https://gi=
thub.com/vim/vim/pull/20951</a></p>

<h4>Commit Summary</h4>
<ul>
  <li><a href=3D"https://github.com/vim/vim/pull/20951/commits/2d9aaadc35a2=
9f5bbc2283b7d4eff8ae06b0d442" class=3D"commit-link">2d9aaad</a>  diff: undo=
 after :diffget into an empty buffer leaves a line behind</li>
</ul>

<h4 style=3D"display: inline-block">File Changes </h4> <p style=3D"display:=
 inline-block">(<a href=3D"https://github.com/vim/vim/pull/20951/files">2&n=
bsp;files</a>)</p>
<ul>
  <li>
    <strong>M</strong>
    <a href=3D"https://github.com/vim/vim/pull/20951/files#diff-5a9fee3643b=
c7e74a7f57d1a1643791bacc5159adae1b7c8aefcf7d32600193b">src/diff.c</a>
    (6)
  </li>
  <li>
    <strong>M</strong>
    <a href=3D"https://github.com/vim/vim/pull/20951/files#diff-7aab46ee612=
aeedd38fbb9a41268854479272cfd21cc3ccbb3342c5f3d3d1023">src/testdir/test_dif=
fmode.vim</a>
    (18)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href=3D'https://github.com/vim/vim/pull/20951.patch'>https://githu=
b.com/vim/vim/pull/20951.patch</a></li>
  <li><a href=3D'https://github.com/vim/vim/pull/20951.diff'>https://github=
.com/vim/vim/pull/20951.diff</a></li>
</ul>

<p style=3D"font-size:small;-webkit-text-size-adjust:none;color:#666;">&mda=
sh;<br />Reply to this email directly, <a href=3D"https://github.com/vim/vi=
m/pull/20951">view it on GitHub</a>, or <a href=3D"https://github.com/notif=
ications/unsubscribe-auth/ACY5DGGQEB32X5UT5UCMIID5INGGBAVCNFSNUABEKJSXA33TN=
F2G64TZHM2DAOJZG42DQMR3JFZXG5LFHM2TANZSGQ2DENRXG2QXMAQ">unsubscribe</a>.<br=
 />Triage notifications, keep track of coding agent tasks and review pull r=
equests on the go with GitHub Mobile for <a href=3D"https://github.com/noti=
fications/mobile/ios/ACY5DGAG6XZRG7BUCSHGUSD5INGGBA5CNFSNUABEM5UWIORPF5TWS5=
BNNB2WEL2QOVWGYUTFOF2WK43UF42DEMJTGUYDKMBVGWTHEZLBONXW5KTTOVRHGY3SNFRGKZFFM=
V3GK3TUVJTG633UMVZF62LPOM">iOS</a> and <a href=3D"https://github.com/notifi=
cations/mobile/android/ACY5DGB2EL7CXMCENMOHEWD5INGGBA5CNFSNUABEM5UWIORPF5TW=
S5BNNB2WEL2QOVWGYUTFOF2WK43UF42DEMJTGUYDKMBVGWTHEZLBONXW5KTTOVRHGY3SNFRGKZF=
FMV3GK3TUVZTG633UMVZF6YLOMRZG62LE">Android</a>. Download it today!
<br />You are receiving this because you are subscribed to this thread.<img=
 src=3D"https://github.com/notifications/beacon/ACY5DGGYSQU3OK427GADQV35ING=
GBBFCNFSM6AAAAAC446HZASWGG33NNVSW45C7OR4XAZNFJFZXG5LFVJRW63LNMVXHIX3JMTHQAA=
AAAEXFOVJUUZZGKYLTN5XKU43VMJZWG4TJMJSWI.gif" height=3D"1" width=3D"1" alt=
=3D"" /><span style=3D"color: transparent; font-size: 0; display: none; vis=
ibility: hidden; overflow: hidden; opacity: 0; width: 0; height: 0; max-wid=
th: 0; max-height: 0; mso-hide: all">Message ID: <span>&lt;vim/vim/pull/209=
51</span><span>@</span><span>github</span><span>.</span><span>com&gt;</span=
></span></p>
<script type=3D"application/ld+json">[
{
"@context": "http://schema.org",
"@type": "EmailMessage",
"potentialAction": {
"@type": "ViewAction",
"target": "https://github.com/vim/vim/pull/20951",
"url": "https://github.com/vim/vim/pull/20951",
"name": "View Pull Request"
},
"description": "View this Pull Request on GitHub",
"publisher": {
"@type": "Organization",
"name": "GitHub",
"url": "https://github.com"
}
}
]</script>

<p></p>

-- <br />
-- <br />
You received this message from the &quot;vim_dev&quot; maillist.<br />
Do not top-post! Type your reply below the text you are replying to.<br />
For more information, visit <a href=3D"http://www.vim.org/maillist.php">htt=
p://www.vim.org/maillist.php</a><br />
<br />
--- <br />
You received this message because you are subscribed to the Google Groups &=
quot;vim_dev&quot; group.<br />
To unsubscribe from this group and stop receiving emails from it, send an e=
mail to <a href=3D"mailto:[email protected]">vim_dev+uns=
[email protected]</a>.<br />
To view this discussion visit <a href=3D"https://groups.google.com/d/msgid/=
vim_dev/vim/vim/pull/20951%40github.com?utm_medium=3Demail&utm_source=3Dfoo=
ter">https://groups.google.com/d/msgid/vim_dev/vim/vim/pull/20951%40github.=
com</a>.<br />

----==_mimepart_6a7354e059e06_da11804055f8--