From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.bugs,gmane.emacs.pretest.bugs Subject: bug#4851: 23.1.50; narrowing, indirect buffers and set-buffer Date: Tue, 03 Nov 2009 16:34:20 -0500 Message-ID: References: <87hbtd0yny.fsf@escher.local.home> Reply-To: Stefan Monnier , 4851@emacsbugs.donarmstrong.com NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1257284904 18352 80.91.229.12 (3 Nov 2009 21:48:24 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 3 Nov 2009 21:48:24 +0000 (UTC) Cc: emacs-pretest-bug@gnu.org, 4851@emacsbugs.donarmstrong.com To: Stephen Berman Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Tue Nov 03 22:48:16 2009 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1N5REe-00026u-2w for geb-bug-gnu-emacs@m.gmane.org; Tue, 03 Nov 2009 22:48:16 +0100 Original-Received: from localhost ([127.0.0.1]:33277 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N5REd-0005td-Mh for geb-bug-gnu-emacs@m.gmane.org; Tue, 03 Nov 2009 16:48:15 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1N5RDo-0005Nl-0C for bug-gnu-emacs@gnu.org; Tue, 03 Nov 2009 16:47:24 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1N5RDj-0005LR-F0 for bug-gnu-emacs@gnu.org; Tue, 03 Nov 2009 16:47:23 -0500 Original-Received: from [199.232.76.173] (port=47604 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1N5RDj-0005LN-5e for bug-gnu-emacs@gnu.org; Tue, 03 Nov 2009 16:47:19 -0500 Original-Received: from rzlab.ucr.edu ([138.23.92.77]:56647) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.60) (envelope-from ) id 1N5RDi-0003zq-FS for bug-gnu-emacs@gnu.org; Tue, 03 Nov 2009 16:47:18 -0500 Original-Received: from rzlab.ucr.edu (rzlab.ucr.edu [127.0.0.1]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id nA3LlGMN031469; Tue, 3 Nov 2009 13:47:16 -0800 Original-Received: (from debbugs@localhost) by rzlab.ucr.edu (8.14.3/8.14.3/Submit) id nA3Le7LD030894; Tue, 3 Nov 2009 13:40:07 -0800 Resent-Date: Tue, 3 Nov 2009 13:40:07 -0800 X-Loop: owner@emacsbugs.donarmstrong.com Resent-From: Stefan Monnier Resent-To: bug-submit-list@donarmstrong.com Resent-CC: Emacs Bugs 2Resent-Date: Tue, 03 Nov 2009 21:40:07 +0000 Resent-Message-ID: Resent-Sender: owner@emacsbugs.donarmstrong.com X-Emacs-PR-Message: followup 4851 X-Emacs-PR-Package: emacs X-Emacs-PR-Keywords: Original-Received: via spool by 4851-submit@emacsbugs.donarmstrong.com id=B4851.125728406430369 (code B ref 4851); Tue, 03 Nov 2009 21:40:07 +0000 Original-Received: (at 4851) by emacsbugs.donarmstrong.com; 3 Nov 2009 21:34:24 +0000 X-Spam-Bayes: score:0.5 Bayes not run. spammytokens:Tokens not available. hammytokens:Tokens not available. Original-Received: from chene.dit.umontreal.ca (chene.dit.umontreal.ca [132.204.246.20]) by rzlab.ucr.edu (8.14.3/8.14.3/Debian-5) with ESMTP id nA3LYLms030366 for <4851@emacsbugs.donarmstrong.com>; Tue, 3 Nov 2009 13:34:23 -0800 Original-Received: from faina.iro.umontreal.ca (faina.iro.umontreal.ca [132.204.26.177]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id nA3LYKFQ020024; Tue, 3 Nov 2009 16:34:20 -0500 Original-Received: by faina.iro.umontreal.ca (Postfix, from userid 20848) id B34C13A036; Tue, 3 Nov 2009 16:34:20 -0500 (EST) In-Reply-To: <87hbtd0yny.fsf@escher.local.home> (Stephen Berman's message of "Mon, 02 Nov 2009 15:49:37 +0100") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.1.50 (gnu/linux) X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV3398=0 X-detected-operating-system: by monty-python.gnu.org: GNU/Linux 2.6 (newer, 2) Resent-Date: Tue, 03 Nov 2009 16:47:23 -0500 X-BeenThere: bug-gnu-emacs@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:32395 gmane.emacs.pretest.bugs:25165 Archived-At: > 1. emacs -Q > 2. C-x b bla RET > 3. M-: (insert "This is a test.") > 4. M-: (narrow-to-region 5 10) > => buffer "bla" now displays " is a" > 5. M-: (make-indirect-buffer (current-buffer) "blip") > 6. M-: (save-restriction > (widen) > (set-buffer (get-buffer-create "bloop"))) > => buffer "bla" now displays "This is a test." Thanks! I finally tracked this bug down. Sadly, I think this points out a more general problem, so while the patch below fixes it, we probably have several other related bugs. Stefan --- src/editfns.c 19 Oct 2009 04:27:14 -0000 1.473 +++ src/editfns.c 3 Nov 2009 21:32:41 -0000 @@ -3275,12 +3275,26 @@ save_restriction_restore (data) Lisp_Object data; { + struct buffer *cur = NULL; + struct buffer *buf = (CONSP (data) + ? XMARKER (XCAR (data))->buffer + : XBUFFER (data)); + + if (buf && buf != current_buffer && !NILP (buf->pt_marker)) + { /* If `buf' uses markers to keep track of PT, BEGV, and ZV (as + is the case if it is or has an indirect buffer), then make + sure it is current before we update BEGV, so + set_buffer_internal takes care of managing those markers. */ + cur = current_buffer; + set_buffer_internal (buf); + } + if (CONSP (data)) /* A pair of marks bounding a saved restriction. */ { struct Lisp_Marker *beg = XMARKER (XCAR (data)); struct Lisp_Marker *end = XMARKER (XCDR (data)); - struct buffer *buf = beg->buffer; /* END should have the same buffer. */ + eassert (buf == end->buffer); if (buf /* Verify marker still points to a buffer. */ && (beg->charpos != BUF_BEGV (buf) || end->charpos != BUF_ZV (buf))) @@ -3305,8 +3319,6 @@ else /* A buffer, which means that there was no old restriction. */ { - struct buffer *buf = XBUFFER (data); - if (buf /* Verify marker still points to a buffer. */ && (BUF_BEGV (buf) != BUF_BEG (buf) || BUF_ZV (buf) != BUF_Z (buf))) /* The buffer has been narrowed, get rid of the narrowing. */ @@ -3318,6 +3330,9 @@ } } + if (cur) + set_buffer_internal (cur); + return Qnil; }