From unknown Sat Jun 14 03:47:12 2025 Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.509 (Entity 5.509) Content-Type: text/plain; charset=utf-8 From: bug#4342 <4342@debbugs.gnu.org> To: bug#4342 <4342@debbugs.gnu.org> Subject: Status: 23.1; smerge-next marks buffer as modified Reply-To: bug#4342 <4342@debbugs.gnu.org> Date: Sat, 14 Jun 2025 10:47:12 +0000 retitle 4342 23.1; smerge-next marks buffer as modified reassign 4342 emacs submitter 4342 Tom Tromey severity 4342 normal thanks From tromey@redhat.com Fri Sep 4 14:02:51 2009 Received: (at submit) by emacsbugs.donarmstrong.com; 4 Sep 2009 21:02:51 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-0.4 required=4.0 tests=AWL,FOURLA autolearn=no version=3.2.5-bugs.debian.org_2005_01_02 Received: from lists.gnu.org (lists.gnu.org [199.232.76.165]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n84L2oEr003428 for ; Fri, 4 Sep 2009 14:02:51 -0700 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Mjfvm-0002kl-02 for bug-gnu-emacs@gnu.org; Fri, 04 Sep 2009 17:02:50 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Mjfvh-0002j4-2h for bug-gnu-emacs@gnu.org; Fri, 04 Sep 2009 17:02:49 -0400 Received: from [199.232.76.173] (port=35740 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Mjfvg-0002iz-Vo for bug-gnu-emacs@gnu.org; Fri, 04 Sep 2009 17:02:45 -0400 Received: from mx1.redhat.com ([209.132.183.28]:16107) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Mjfvg-000738-8x for bug-gnu-emacs@gnu.org; Fri, 04 Sep 2009 17:02:44 -0400 Received: from int-mx02.intmail.prod.int.phx2.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) by mx1.redhat.com (8.13.8/8.13.8) with ESMTP id n84L2f9v011641 for ; Fri, 4 Sep 2009 17:02:41 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx02.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id n84L2eM8023826; Fri, 4 Sep 2009 17:02:41 -0400 Received: from opsy.redhat.com (ovpn01.gateway.prod.ext.phx2.redhat.com [10.5.9.1]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n84L2djH021897; Fri, 4 Sep 2009 17:02:40 -0400 Received: by opsy.redhat.com (Postfix, from userid 500) id 6EC4937820A; Fri, 4 Sep 2009 15:02:39 -0600 (MDT) From: Tom Tromey To: bug-gnu-emacs@gnu.org Subject: 23.1; smerge-next marks buffer as modified Reply-To: Tom Tromey X-Attribution: Tom Date: Fri, 04 Sep 2009 15:02:39 -0600 Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Scanned-By: MIMEDefang 2.67 on 10.5.11.12 X-detected-operating-system: by monty-python.gnu.org: Genre and OS details not recognized. Please write in English if possible, because the Emacs maintainers usually do not have translators to read other languages for them. Your bug report will be posted to the bug-gnu-emacs@gnu.org mailing list, and to the gnu.emacs.bug news group. Please describe exactly what actions triggered the bug and the precise symptoms of the bug: I did a cvs update and had some conflicts. I visited a file with a conflict and typed M-x smerge-mode. Then I did C-c ^ n (smerge-next) to go to the first conflict. This marked my buffer as modified. AFAICT, though, nothing actually changed. I think simply moving between conflicts should not modify the buffer. If Emacs crashed, and you have the Emacs process in the gdb debugger, please include the output from the following gdb commands: `bt full' and `xbacktrace'. If you would like to further debug the crash, please read the file /usr/share/emacs/23.1/etc/DEBUG for instructions. In GNU Emacs 23.1.1 (i386-redhat-linux-gnu, GTK+ Version 2.16.5) of 2009-08-24 on x86-2.fedora.phx.redhat.com Windowing system distributor `The X.Org Foundation', version 11.0.10601901 configured using `configure '--build=i386-redhat-linux-gnu' '--host=i386-redhat-linux-gnu' '--target=i586-redhat-linux-gnu' '--program-prefix=' '--prefix=/usr' '--exec-prefix=/usr' '--bindir=/usr/bin' '--sbindir=/usr/sbin' '--sysconfdir=/etc' '--datadir=/usr/share' '--includedir=/usr/include' '--libdir=/usr/lib' '--libexecdir=/usr/libexec' '--localstatedir=/var' '--sharedstatedir=/var/lib' '--mandir=/usr/share/man' '--infodir=/usr/share/info' '--with-dbus' '--with-gif' '--with-jpeg' '--with-png' '--with-rsvg' '--with-tiff' '--with-xft' '--with-xpm' '--with-x-toolkit=gtk' 'build_alias=i386-redhat-linux-gnu' 'host_alias=i386-redhat-linux-gnu' 'target_alias=i586-redhat-linux-gnu' 'CFLAGS=-DMAIL_USE_LOCKF -O2 -g -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector --param=ssp-buffer-size=4 -m32 -march=i586 -mtune=generic -fasynchronous-unwind-tables'' Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: en_US.UTF-8 value of $XMODIFIERS: nil locale-coding-system: utf-8-unix default-enable-multibyte-characters: t Major mode: Change Log Minor modes in effect: shell-dirtrack-mode: t diff-auto-refine-mode: t auto-fill-function: do-auto-fill erc-list-mode: t erc-menu-mode: t erc-autojoin-mode: t erc-ring-mode: t erc-pcomplete-mode: t erc-track-mode: t erc-track-minor-mode: t erc-match-mode: t erc-button-mode: t erc-fill-mode: t erc-stamp-mode: t erc-netsplit-mode: t erc-spelling-mode: t erc-truncate-mode: t flyspell-mode: t erc-status-mode: t erc-services-mode: t erc-networks-mode: t erc-irccontrols-mode: t erc-noncommands-mode: t erc-move-to-prompt-mode: t erc-readonly-mode: t tooltip-mode: t mouse-wheel-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t global-auto-composition-mode: t auto-composition-mode: t auto-encryption-mode: t auto-compression-mode: t line-number-mode: t transient-mark-mode: t Recent input: y C-u C-n n n n n n n SPC M-> q SPC M-> q SPC 5 0 M-> q C-l s C-r o t h e r C-a SPC 5 0 M-> C-u C-u C-p C-u C-p C-p p Q y s C-z o C-c b C-z n M-v M-> C-z o C-u C-u C-n p p SPC 5 0 M-> q s C-z o C-z o M-v C-l M-g M-g M-g M-g M-g p SPC C-u C-n C-u d C-p C-p SPC q s C-u C-n p SPC M-> q s C-z n C-z o M-v M-v M-< M-g M-g M-g M-g p SPC SPC q s C-u C-n C-u C-n C-u C-n C-p C-p C-p M-g M-g M-g M-g s C-z o C-z o C-u C-u C-n p M-g M-g M-g M-g s C-f C-z o C-z n C-x C-f C h y e s C-a C-p C-p C-p C-SPC C-u C-u C-n C-n C-n C-n C-n C-w M-< C-y C-c a C-p C-p C-f C-f C-SPC C-u C-n C-w C-x C-s n C-z o C-x C-f M-p d w l o c y e s C-s < < < < < C-a M-< M-x s m e r g e - m o d e C-c ^ n C-v C-v C-v C-v C-s C-s C-s C-a C-/ C-h c C-c ^ n C-c ^ n C-c ^ p C-l C-/ M-< C-c ^ n C-z o M-x e r e p o r t - e m b Recent messages: Wrote /home/tromey/gnu/baseline-gdb/src/gdb/ChangeLog Mark saved where search started Mark set Smerge mode enabled Mark saved where search started Undo! C-c ^ n runs the command smerge-next Undo! Mark set C-c ^ n runs the command smerge-next Quit Tom From monnier@IRO.UMontreal.CA Tue Sep 8 12:48:04 2009 Received: (at 4342-done) by emacsbugs.donarmstrong.com; 8 Sep 2009 19:48:04 +0000 X-Spam-Checker-Version: SpamAssassin 3.2.5-bugs.debian.org_2005_01_02 (2008-06-10) on rzlab.ucr.edu X-Spam-Level: X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. X-Spam-Status: No, score=-4.2 required=4.0 tests=AWL,HAS_BUG_NUMBER autolearn=ham version=3.2.5-bugs.debian.org_2005_01_02 Received: from pruche.dit.umontreal.ca (pruche.dit.umontreal.ca [132.204.246.22]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id n88Jm0EU024497 for <4342-done@emacsbugs.donarmstrong.com>; Tue, 8 Sep 2009 12:48:01 -0700 Received: from faina.iro.umontreal.ca (faina.iro.umontreal.ca [132.204.26.177]) by pruche.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id n88JlvBE026307; Tue, 8 Sep 2009 15:47:57 -0400 Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id 451363A8F3; Tue, 8 Sep 2009 15:47:57 -0400 (EDT) From: Stefan Monnier To: Tom Tromey Subject: Re: bug#4342: 23.1; smerge-next marks buffer as modified Message-ID: References: Date: Tue, 08 Sep 2009 15:47:57 -0400 In-Reply-To: (Tom Tromey's message of "Fri, 04 Sep 2009 15:02:39 -0600") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3358=0 > Then I did C-c ^ n (smerge-next) to go to the first conflict. > This marked my buffer as modified. I believe I've now fixed this bug on the trunk. Thank you, Stefan From unknown Sat Jun 14 03:47:12 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Wed, 07 Oct 2009 14:24:11 +0000 User-Agent: Fakemail v42.6.9 # A New Hope # A long time ago, in a galaxy far, far away # something happened. # # Magically this resulted in the following # action being taken, but this fake control # message doesn't tell you why it happened # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator