From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Alan Mackenzie Newsgroups: gmane.emacs.devel Subject: Re: Lisp primitives and their calling of the change hooks Date: Sun, 7 Jan 2018 21:10:55 +0000 Message-ID: <20180107211055.GF22254@ACM> References: <20180107113628.GA22254@ACM> <83o9m599du.fsf@gnu.org> <20180107120859.GB22254@ACM> <20180107135629.GC22254@ACM> <83mv1p8vki.fsf@gnu.org> <83bmi58sao.fsf@gnu.org> <20180107194845.GE22254@ACM> <838td98mqe.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: blaine.gmane.org 1515359643 15670 195.159.176.226 (7 Jan 2018 21:14:03 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 7 Jan 2018 21:14:03 +0000 (UTC) User-Agent: Mutt/1.7.2 (2016-11-26) Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Jan 07 22:13:58 2018 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1eYIGQ-0003Rw-KM for ged-emacs-devel@m.gmane.org; Sun, 07 Jan 2018 22:13:54 +0100 Original-Received: from localhost ([::1]:41471 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYIIN-0003VC-28 for ged-emacs-devel@m.gmane.org; Sun, 07 Jan 2018 16:15:55 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36206) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYIHy-0003Kn-VJ for emacs-devel@gnu.org; Sun, 07 Jan 2018 16:15:31 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYIHv-0001JL-RB for emacs-devel@gnu.org; Sun, 07 Jan 2018 16:15:30 -0500 Original-Received: from colin.muc.de ([193.149.48.1]:52819 helo=mail.muc.de) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1eYIHv-0001Gp-8T for emacs-devel@gnu.org; Sun, 07 Jan 2018 16:15:27 -0500 Original-Received: (qmail 67662 invoked by uid 3782); 7 Jan 2018 21:15:25 -0000 Original-Received: from acm.muc.de (p548C75D0.dip0.t-ipconnect.de [84.140.117.208]) by colin.muc.de (tmda-ofmipd) with ESMTP; Sun, 07 Jan 2018 22:15:24 +0100 Original-Received: (qmail 16949 invoked by uid 1000); 7 Jan 2018 21:10:55 -0000 Content-Disposition: inline In-Reply-To: <838td98mqe.fsf@gnu.org> X-Delivery-Agent: TMDA/1.1.12 (Macallan) X-Primary-Address: acm@muc.de X-detected-operating-system: by eggs.gnu.org: FreeBSD 9.x [fuzzy] X-Received-From: 193.149.48.1 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:221694 Archived-At: Hello, Eli. On Sun, Jan 07, 2018 at 21:58:33 +0200, Eli Zaretskii wrote: > > Date: Sun, 7 Jan 2018 19:48:45 +0000 > > Cc: Eli Zaretskii , emacs-devel@gnu.org > > From: Alan Mackenzie > > Anyhow, here's the patch, which appears to work as described above. Any > > comments? Otherwise I'll commit it. > Like I said, I think we should have only one pair of hooks, like we > have in replace_range. OK. This is slightly more awkward: del_range needs to be replaced by del_range_2, so as not to get an extra call to signal_after_change. There is also no a-c-f call if the decompression exits with an error. (It would be possible but a little awkward to do this.) diff --git a/src/decompress.c b/src/decompress.c index 41de6da1dd..f2dde7248e 100644 --- a/src/decompress.c +++ b/src/decompress.c @@ -141,6 +141,10 @@ This function can be called only in unibyte buffers. */) the same. */ istart = XINT (start); iend = XINT (end); + + /* Do the following before manipulating the gap. */ + modify_text (istart, iend); + move_gap_both (iend, iend); stream.zalloc = Z_NULL; @@ -196,7 +200,10 @@ This function can be called only in unibyte buffers. */) unwind_data.start = 0; /* Delete the compressed data. */ - del_range (istart, iend); + del_range_2 (istart, istart, /* byte and char offsets are the same. */ + iend, iend, 0); + + signal_after_change (istart, iend - istart, unwind_data.nbytes); return unbind_to (count, Qt); } -- Alan Mackenzie (Nuremberg, Germany).