From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#34720: 26.1; Reverting a GPG buffer moves all markers to the end of the file Date: Tue, 27 Aug 2019 10:23:28 +0200 Message-ID: <87ftln2f0f.fsf@gnus.org> References: <87a7ic9due.fsf@gnu.org> <87muhnrwvs.fsf@mouse.gnus.org> <875zmk5r5u.fsf@gnus.org> <83sgpofjc9.fsf@gnu.org> <87k1b04a3x.fsf@gnus.org> <83pnksfel0.fsf@gnu.org> <87v9uj2i7l.fsf@gnus.org> <83mufvdomu.fsf@gnu.org> Mime-Version: 1.0 Content-Type: text/plain Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="169422"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: 34720@debbugs.gnu.org, dunni@gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Aug 27 10:24:16 2019 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1i2Wly-000hx5-Py for geb-bug-gnu-emacs@m.gmane.org; Tue, 27 Aug 2019 10:24:14 +0200 Original-Received: from localhost ([::1]:48046 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2Wlx-0004Co-F3 for geb-bug-gnu-emacs@m.gmane.org; Tue, 27 Aug 2019 04:24:13 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:36465) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i2Wlo-0004CN-37 for bug-gnu-emacs@gnu.org; Tue, 27 Aug 2019 04:24:05 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i2Wlm-0007XX-P7 for bug-gnu-emacs@gnu.org; Tue, 27 Aug 2019 04:24:04 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:38832) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i2Wlm-0007XS-Ln for bug-gnu-emacs@gnu.org; Tue, 27 Aug 2019 04:24:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1i2Wlm-0007vw-Fg for bug-gnu-emacs@gnu.org; Tue, 27 Aug 2019 04:24:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Tue, 27 Aug 2019 08:24:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 34720 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: confirmed Original-Received: via spool by 34720-submit@debbugs.gnu.org id=B34720.156689421930467 (code B ref 34720); Tue, 27 Aug 2019 08:24:02 +0000 Original-Received: (at 34720) by debbugs.gnu.org; 27 Aug 2019 08:23:39 +0000 Original-Received: from localhost ([127.0.0.1]:47653 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i2WlO-0007vL-TV for submit@debbugs.gnu.org; Tue, 27 Aug 2019 04:23:39 -0400 Original-Received: from quimby.gnus.org ([80.91.231.51]:38656) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1i2WlK-0007v8-Hy for 34720@debbugs.gnu.org; Tue, 27 Aug 2019 04:23:34 -0400 Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=marnie) by quimby.gnus.org with esmtpsa (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.89) (envelope-from ) id 1i2WlF-0006z3-Ct; Tue, 27 Aug 2019 10:23:32 +0200 In-Reply-To: <83mufvdomu.fsf@gnu.org> (Eli Zaretskii's message of "Tue, 27 Aug 2019 11:00:09 +0300") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.51.188.43 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.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:165946 Archived-At: Eli Zaretskii writes: > These just restore a single marker: the point marker. That's a far > cry from restoring all the markers. I don't think the latter is > possible in all cases without violating the principle of least > astonishment (by placing the markers at locations that have nothing in > comm on with where they have been before the editing operation). Hm. Doesn't the code below restore all markers (that it can restore)? static void restore_window_points (Lisp_Object window_markers, ptrdiff_t inserted, ptrdiff_t same_at_start, ptrdiff_t same_at_end) { for (; CONSP (window_markers); window_markers = XCDR (window_markers)) if (CONSP (XCAR (window_markers))) { Lisp_Object car = XCAR (window_markers); Lisp_Object marker = XCAR (car); Lisp_Object oldpos = XCDR (car); if (MARKERP (marker) && FIXNUMP (oldpos) && XFIXNUM (oldpos) > same_at_start && XFIXNUM (oldpos) < same_at_end) { ptrdiff_t oldsize = same_at_end - same_at_start; ptrdiff_t newsize = inserted; double growth = newsize / (double)oldsize; ptrdiff_t newpos = same_at_start + growth * (XFIXNUM (oldpos) - same_at_start); Fset_marker (marker, make_fixnum (newpos), Qnil); } } } And I just tested with the test case in this bug report, which is (progn (setq test-marker (make-marker)) (move-marker test-marker (point))) append to the file, and then `M-x revert-buffer': test-marker remains at the same position. So I think Finsert_file_contents really restores (for some value of "restores") all the markers? -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no