From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Tomas Nordin Newsgroups: gmane.emacs.bugs Subject: bug#72556: 29.1.90; vc-diff does not undo hunk in end of source file Date: Sat, 10 Aug 2024 12:11:08 +0000 Message-ID: <87ttfs60ir.fsf@posteo.net> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="40496"; mail-complaints-to="usenet@ciao.gmane.io" To: 72556@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Aug 10 14:11:50 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1sckwo-000AOT-HL for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 10 Aug 2024 14:11:50 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sckwY-0003aG-UA; Sat, 10 Aug 2024 08:11:35 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sckwW-0003Zo-UA for bug-gnu-emacs@gnu.org; Sat, 10 Aug 2024 08:11:32 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sckwW-0003Jz-Kz for bug-gnu-emacs@gnu.org; Sat, 10 Aug 2024 08:11:32 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:From:To:Subject; bh=O/EgKb/W8O4zD04mACVAIkALgWCsQbX+Vw5ty1kILqU=; b=oJOPiio0fhPWvypehf5yP+64RDNGIxx5/OD8xOS4JYiefmCAfJIgP5OATvIPnZE3RT/FqmBDl5K+pEqrdHgpyr7kccr4rTQ75lRVj8vBUFOrmcns9hnOcULFm87up3ddezDHxOEUYk8EG22dGCJ5ryk6CUF4UzMpQ7tl60hvUbhPrMS1wRjIuGUS4jVws61ujMsAQPGJT/NZ0QgHNclNpwWHGCGWgHblJDeD3jTy8tsStrmJTo6Rmlfgdzo6ZfRNqVvYya7GefZdonG74GI5Ar8stUjVmrbYSjv/A2gRdMpJde6r0hznCBhAWtc8JKwFPYtlIke/xCEKQAAJuI/X5A==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sckwz-0004Be-QB for bug-gnu-emacs@gnu.org; Sat, 10 Aug 2024 08:12:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Tomas Nordin Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 10 Aug 2024 12:12:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 72556 X-GNU-PR-Package: emacs X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.172329191116076 (code B ref -1); Sat, 10 Aug 2024 12:12:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 10 Aug 2024 12:11:51 +0000 Original-Received: from localhost ([127.0.0.1]:39152 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sckwo-0004BD-Pr for submit@debbugs.gnu.org; Sat, 10 Aug 2024 08:11:51 -0400 Original-Received: from lists.gnu.org ([209.51.188.17]:45872) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sckwm-0004B5-B8 for submit@debbugs.gnu.org; Sat, 10 Aug 2024 08:11:49 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sckwI-0003XD-Fg for bug-gnu-emacs@gnu.org; Sat, 10 Aug 2024 08:11:18 -0400 Original-Received: from mout01.posteo.de ([185.67.36.65]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sckwF-0003HC-0N for bug-gnu-emacs@gnu.org; Sat, 10 Aug 2024 08:11:18 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout01.posteo.de (Postfix) with ESMTPS id 9B88E240027 for ; Sat, 10 Aug 2024 14:11:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1723291869; bh=IXlxI6WYNnDwE5m9QkW/n0qyJpx950s08R4fCUI8V1A=; h=From:To:Subject:Date:Message-ID:MIME-Version:Content-Type:From; b=WHjS2vixKVP/4eUGc03AaeeeCRU/XCeZHfFX0h/JGW3sriA/wsqJS9fstAVX6T/PZ pmk1BVfj6vCJaF2kZEJ09KP1lKmp5OR+fql6rykfdbwgQYiFbdPAGUttd2sH1vmYet aZ0PdGwRrGyxKOhuLitxQQrOVtWbQ6hQYms80BaXd/nEu6DX3xAZJmazb0iXyunZ03 9V6mtLMGkFSBzq19MeLi9CMj+ZTX9y2Tf1T17ePG1i21sSeRSBge772D7p3Gabcp/1 HkRMMNy+JEmoTaf/ILcyKP5nBGDRj8pO1Fc7jGRHQg31CRHh/7bSoFz/66qvF0lcy2 9JXufeP071qMQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4Wh04F0mwrz6tsB for ; Sat, 10 Aug 2024 14:11:08 +0200 (CEST) Received-SPF: pass client-ip=185.67.36.65; envelope-from=tomasn@posteo.net; helo=mout01.posteo.de X-Spam_score_int: -43 X-Spam_score: -4.4 X-Spam_bar: ---- X-Spam_report: (-4.4 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001, RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:289998 Archived-At: Hello Emacs I have got used to the diff-mode feature of undoing hunks. I have noticed that if the diff hunk is an addition in the end of the source file, I dont get the expected question if I want to undo the hunk. Instead, the hunk is applied again. My example is with a git repo, some edits made (and saved to disk) in a file, and hitting C-x v = to view the diff. Move to one of the hunks. One can now diff-apply-hunk to reverse the hunk. But if that hunk is the last thing in the source file, the hunk is applied (again). This is not what I expect. To reproduce: $ mkdir apply $ cd apply $ echo "first line of code" > example.file $ git init $ git add . $ git commit -m 'init' $ echo "last line of code" >> example.file $ emacs -Q example.file C-x v = n C-c C-a The hunk is applied in the source buffer. In GNU Emacs 29.1.90 (build 1, x86_64-pc-linux-gnu, GTK+ Version 3.24.38, cairo version 1.16.0) of 2023-11-18 built on fliptop2 Repository revision: d9e43f2197fa1d5ade1d483b15cc50c6d705b969 Repository branch: emacs-29 Windowing system distributor 'The X.Org Foundation', version 11.0.12101007 System Description: Debian GNU/Linux 12 (bookworm) Configured features: ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG JSON LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 M17N_FLT MODULES NOTIFY INOTIFY PDUMPER PNG RSVG SECCOMP SOUND THREADS TIFF TOOLKIT_SCROLL_BARS WEBP X11 XDBE XIM XINPUT2 XPM GTK3 ZLIB Important settings: value of $LC_MONETARY: sv_SE.UTF-8 value of $LC_NUMERIC: sv_SE.UTF-8 value of $LC_TIME: sv_SE.UTF-8 value of $LANG: en_US.UTF-8 value of $XMODIFIERS: @im=ibus locale-coding-system: utf-8-unix Major mode: Fundamental Minor modes in effect: tooltip-mode: t global-eldoc-mode: t show-paren-mode: t electric-indent-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t line-number-mode: t indent-tabs-mode: t transient-mark-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t Load-path shadows: None found. Features: (shadow sort mail-extr emacsbug message mailcap yank-media puny dired dired-loaddefs rfc822 mml mml-sec password-cache epa derived epg rfc6068 epg-config gnus-util text-property-search mm-decode mm-bodies mm-encode mail-parse rfc2231 mailabbrev gmm-utils mailheader sendmail rfc2047 rfc2045 ietf-drums mm-util mail-prsvr mail-utils time-date subr-x smerge-mode diff vc vc-git diff-mode easy-mmode vc-dispatcher cl-loaddefs cl-lib rmc iso-transl tooltip cconv eldoc paren electric uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/x-win x-win term/common-win x-dnd tool-bar dnd fontset image regexp-opt fringe tabulated-list replace newcomment text-mode lisp-mode prog-mode register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors frame minibuffer nadvice seq simple cl-generic indonesian philippine cham georgian utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian cyrillic chinese composite emoji-zwj charscript charprop case-table epa-hook jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs theme-loaddefs faces cus-face macroexp files window text-properties overlay sha1 md5 base64 format env code-pages mule custom widget keymap hashtable-print-readable backquote threads dbusbind inotify lcms2 dynamic-setting system-font-setting font-render-setting cairo move-toolbar gtk x-toolkit xinput2 x multi-tty make-network-process emacs) Memory information: ((conses 16 44032 13907) (symbols 48 5959 0) (strings 32 16246 1269) (string-bytes 1 466537) (vectors 16 10894) (vector-slots 8 165303 14637) (floats 8 28 20) (intervals 56 226 0) (buffers 976 13))